Ruby: Compile for overlay mode.

.github/workflows/go-tests-other-os.yml

@@ -26,8 +26,9 @@ jobs:
         uses: ./go/actions/test
 
   test-win:
+    if: github.repository_owner == 'github'
     name: Test Windows
-    runs-on: windows-latest
+    runs-on: windows-latest-xl
     steps:
       - name: Check out code
         uses: actions/checkout@v4

.gitignore

@@ -62,7 +62,6 @@ node_modules/
 
 # Temporary folders for working with generated models
 .model-temp
-/mad-generation-build
 
 # bazel-built in-tree extractor packs
 /*/extractor-pack
@@ -72,7 +71,3 @@ node_modules/
 
 # cargo build directory
 /target
-
-# some upgrade/downgrade checks create these files
-**/upgrades/*/*.dbscheme.stats
-**/downgrades/*/*.dbscheme.stats

Cargo.toml

@@ -10,7 +10,6 @@ members = [
     "rust/ast-generator",
     "rust/autobuild",
 ]
-exclude = ["mad-generation-build"]
 
 [patch.crates-io]
 # patch for build script bug preventing bazel build

actions/ql/lib/ext/config/actions_permissions.yml

@@ -22,21 +22,16 @@ extensions:
       - ["actions/stale", "pull-requests: write"]
       - ["actions/attest-build-provenance", "id-token: write"]
       - ["actions/attest-build-provenance", "attestations: write"]
-      - ["actions/deploy-pages", "pages: write"]
-      - ["actions/deploy-pages", "id-token: write"]
-      - ["actions/delete-package-versions", "packages: write"]
       - ["actions/jekyll-build-pages", "contents: read"]
       - ["actions/jekyll-build-pages", "pages: write"]
       - ["actions/jekyll-build-pages", "id-token: write"]
       - ["actions/publish-action", "contents: write"]
-      - ["actions/versions-package-tools", "contents: read"]
+      - ["actions/versions-package-tools", "contents: read"]      
       - ["actions/versions-package-tools", "actions: read"]
-      - ["actions/reusable-workflows", "contents: read"]
+      - ["actions/reusable-workflows", "contents: read"]      
       - ["actions/reusable-workflows", "actions: read"]
-      - ["actions/ai-inference", "contents: read"]
-      - ["actions/ai-inference", "models: read"]
       # TODO: Add permissions for actions/download-artifact
       # TODO: Add permissions for actions/upload-artifact
-      # No permissions needed for actions/upload-pages-artifact
       # TODO: Add permissions for actions/cache
-      # No permissions needed for actions/configure-pages
+
+      

actions/ql/src/change-notes/2025-05-14-minimal-permission-for-add-to-project.md

@@ -1,4 +0,0 @@
----
-category: minorAnalysis
----
-* The query `actions/missing-workflow-permissions` is now aware of the minimal permissions needed for the actions `deploy-pages`, `delete-package-versions`, `ai-inference`. This should lead to better alert messages and better fix suggestions.

actions/ql/test/query-tests/Security/CWE-275/.github/workflows/perms10.yml

@@ -1,10 +0,0 @@
-on:
-  workflow_call:
-  workflow_dispatch:
-
-jobs:
-  build:
-    name: Build and test
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/ai-inference

actions/ql/test/query-tests/Security/CWE-275/.github/workflows/perms8.yml

@@ -1,10 +0,0 @@
-on:
-  workflow_call:
-  workflow_dispatch:
-
-jobs:
-  build:
-    name: Build and test
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/deploy-pages

actions/ql/test/query-tests/Security/CWE-275/.github/workflows/perms9.yml

@@ -1,10 +0,0 @@
-on:
-  workflow_call:
-  workflow_dispatch:
-
-jobs:
-  build:
-    name: Build and test
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/delete-package-versions

actions/ql/test/query-tests/Security/CWE-275/MissingActionsPermissions.expected

@@ -3,6 +3,3 @@
 | .github/workflows/perms5.yml:7:5:10:32 | Job: build | Actions job or workflow does not limit the permissions of the GITHUB_TOKEN. Consider setting an explicit permissions block, using the following as a minimal starting point: {contents: read} |
 | .github/workflows/perms6.yml:7:5:11:39 | Job: build | Actions job or workflow does not limit the permissions of the GITHUB_TOKEN. Consider setting an explicit permissions block, using the following as a minimal starting point: {contents: read, id-token: write, pages: write} |
 | .github/workflows/perms7.yml:7:5:10:38 | Job: build | Actions job or workflow does not limit the permissions of the GITHUB_TOKEN. Consider setting an explicit permissions block, using the following as a minimal starting point: {} |
-| .github/workflows/perms8.yml:7:5:10:33 | Job: build | Actions job or workflow does not limit the permissions of the GITHUB_TOKEN. Consider setting an explicit permissions block, using the following as a minimal starting point: {id-token: write, pages: write} |
-| .github/workflows/perms9.yml:7:5:10:44 | Job: build | Actions job or workflow does not limit the permissions of the GITHUB_TOKEN. Consider setting an explicit permissions block, using the following as a minimal starting point: {packages: write} |
-| .github/workflows/perms10.yml:7:5:10:33 | Job: build | Actions job or workflow does not limit the permissions of the GITHUB_TOKEN. Consider setting an explicit permissions block, using the following as a minimal starting point: {contents: read, models: read} |

config/annotate-overlay-local.py

@@ -1,175 +0,0 @@
-# This script is used to annotate .qll files with overlay[local?] annotations.
-# It will walk the directory tree and annotate most .qll files, skipping only
-# some specific cases (e.g., empty files, files that configure dataflow for queries).
-# It will also add overlay[caller] annotations to predicates that are pragma[inline]
-# and either not private or in a hardcoded list of predicates.
-
-# The script takes a list of languages and processes the corresponding directories.
-
-# Usage: python3 annotate-overlay-local.py <language1> <language2> ...
-
-# The script will modify the files in place and print the changes made.
-# The script is designed to be run from the root of the repository.
-
-#!/usr/bin/python3
-import sys
-import os
-from difflib import *
-
-# These are the only two predicates that are pragma[inline], private, and must be
-# overlay[caller] in order to successfully compile our internal java queries.
-hardcoded_overlay_caller_preds = [
-    "fwdFlowInCand", "fwdFlowInCandTypeFlowDisabled"]
-
-
-def filter_out_annotations(filename):
-    '''
-    Read the file and strip all existing overlay[...] annotations from the contents.
-    Return the file modified file content as a list of lines.
-    '''
-    overlays = ["local?", "caller"]
-    annotations = [f"overlay[{t}]" for t in overlays]
-    with open(filename, 'r') as file_in:
-        lines = [l for l in file_in if not l.strip() in annotations]
-    for ann in annotations:
-        if any(line for line in lines if ann in line):
-            raise Exception(f"Failed to filter out {ann} from {filename}.")
-    return lines
-
-
-def insert_toplevel_maybe_local_anntotation(filename, lines):
-    '''
-    Find a suitable place to insert an overlay[local?] annotation at the top of the file.
-    Return a pair: (string describing action taken, modified content as list of lines).
-    '''
-    out_lines = []
-    status = 0
-
-    for line in lines:
-        if status == 0 and line.rstrip().endswith("module;"):
-            out_lines.append("overlay[local?]\n")
-            status = 1
-        out_lines.append(line)
-
-    if status == 1:
-        return (f"Annotating \"{filename}\" via existing file-level module statement", out_lines)
-
-    out_lines = []
-    empty_line_buffer = []
-    status = 0
-    for line in lines:
-        trimmed = line.strip()
-        if not trimmed:
-            empty_line_buffer.append(line)
-            continue
-        if status <= 1 and trimmed.endswith("*/"):
-            status = 2
-        elif status == 0 and trimmed.startswith("/**"):
-            status = 1
-        elif status == 0 and not trimmed.startswith("/*"):
-            out_lines.append("overlay[local?]\n")
-            out_lines.append("module;\n")
-            out_lines.append("\n")
-            status = 3
-        elif status == 2 and (trimmed.startswith("import ") or trimmed.startswith("private import ")):
-            out_lines.append("overlay[local?]\n")
-            out_lines.append("module;\n")
-            status = 3
-        elif status == 2 and (trimmed.startswith("class ") or trimmed.startswith("predicate ")
-                              or trimmed.startswith("module ") or trimmed.startswith("signature ")):
-            out_lines = ["overlay[local?]\n", "module;\n", "\n"] + out_lines
-            status = 3
-        elif status == 2 and trimmed.startswith("/*"):
-            out_lines.append("overlay[local?]\n")
-            out_lines.append("module;\n")
-            status = 3
-        elif status == 2:
-            status = 4
-        if empty_line_buffer:
-            out_lines += empty_line_buffer
-            empty_line_buffer = []
-        out_lines.append(line)
-    if status == 3:
-        out_lines += empty_line_buffer
-
-    if status == 3:
-        return (f"Annotating \"{filename}\" after file-level module qldoc", out_lines)
-
-    raise Exception(f"Failed to annotate \"{filename}\" as overlay[local?].")
-
-
-def insert_overlay_caller_annotations(lines):
-    '''
-    Mark pragma[inline] predicates as overlay[caller] if they are not declared private
-    or if they are private but are in the list of hardcoded_overlay_caller_preds.
-    '''
-    out_lines = []
-    for i, line in enumerate(lines):
-        trimmed = line.strip()
-        if trimmed == "pragma[inline]":
-            if (not "private" in lines[i+1] or
-                    any(pred in lines[i+1] for pred in hardcoded_overlay_caller_preds)):
-                whitespace = line[0: line.find(trimmed)]
-                out_lines.append(f"{whitespace}overlay[caller]\n")
-        out_lines.append(line)
-    return out_lines
-
-
-def annotate_as_appropriate(filename):
-    '''
-    Read file and strip all existing overlay[...] annotations from the contents;
-    then insert new overlay[...] annotations according to heuristics.
-    Return a pair: (string describing action taken, modified content as list of lines).
-    '''
-    lines = filter_out_annotations(filename)
-    lines = insert_overlay_caller_annotations(lines)
-
-    # These simple heuristics filter out those .qll files that we no _not_ want to annotate
-    # as overlay[local?].  It is not clear that these heuristics are exactly what we want,
-    # but they seem to work well enough for now (as determined by speed and accuracy numbers).
-    if (filename.endswith("Test.qll") or
-        ((filename.endswith("Query.qll") or filename.endswith("Config.qll")) and
-         any("implements DataFlow::ConfigSig" in line for line in lines))):
-        return (f"Keeping \"{filename}\" global because it configures dataflow for a query", lines)
-    elif not any(line for line in lines if line.strip()):
-        return (f"Keeping \"{filename}\" global because it is empty", lines)
-
-    return insert_toplevel_maybe_local_anntotation(filename, lines)
-
-
-def process_single_file(filename):
-    '''
-    Process a single file, annotating it as appropriate and writing the changes back to the file.
-    '''
-    annotate_result = annotate_as_appropriate(filename)
-
-    old = [line for line in open(filename)]
-    new = annotate_result[1]
-
-    if old != new:
-        diff = context_diff(old, new, fromfile=filename, tofile=filename)
-        diff = [line for line in diff]
-        if diff:
-            print(annotate_result[0])
-            for line in diff:
-                print(line.rstrip())
-            with open(filename, "w") as out_file:
-                for line in new:
-                    out_file.write(line)
-
-
-dirs = []
-for lang in sys.argv[1:]:
-    if lang in ["cpp", "go", "csharp", "java", "javascript", "python", "ruby", "rust", "swift"]:
-        dirs.append(f"{lang}/ql/lib")
-    else:
-        raise Exception(f"Unknown language \"{lang}\".")
-
-if dirs:
-    dirs.append("shared")
-
-for roots in dirs:
-    for dirpath, dirnames, filenames in os.walk(roots):
-        for filename in filenames:
-            if filename.endswith(".qll") and not dirpath.endswith("tutorial"):
-                process_single_file(os.path.join(dirpath, filename))

cpp/ql/lib/change-notes/2025-05-15-class-aggregate-literals.md

@@ -1,4 +0,0 @@
----
-category: fix
----
-* Fixed a problem where `asExpr()` on `DataFlow::Node` would never return `ClassAggregateLiteral`s.

cpp/ql/lib/change-notes/2025-05-16-array-aggregate-literals.md

@@ -1,4 +0,0 @@
----
-category: fix
----
-* Fixed a problem where `asExpr()` on `DataFlow::Node` would never return `ArrayAggregateLiteral`s.

cpp/ql/lib/change-notes/2025-05-16-wmain-support.md

@@ -1,4 +0,0 @@
----
-category: feature
----
-* Added support for `wmain` as part of the ArgvSource model.

cpp/ql/lib/change-notes/2025-05-18-2025-May-outdated-deprecations.md

@@ -1,9 +0,0 @@
----
-category: breaking
----
-* Deleted the deprecated `userInputArgument` predicate and its convenience accessor from the `Security.qll`.
-* Deleted the deprecated `userInputReturned` predicate and its convenience accessor from the `Security.qll`.
-* Deleted the deprecated `userInputReturn` predicate from the `Security.qll`.
-* Deleted the deprecated `isUserInput` predicate and its convenience accessor from the `Security.qll`.
-* Deleted the deprecated `userInputArgument` predicate from the `SecurityOptions.qll`.
-* Deleted the deprecated `userInputReturned` predicate from the `SecurityOptions.qll`.

cpp/ql/lib/experimental/quantum/Language.qll

@@ -1,7 +1,6 @@
 private import cpp as Language
-import semmle.code.cpp.dataflow.new.TaintTracking
+import semmle.code.cpp.dataflow.new.DataFlow
 import codeql.quantum.experimental.Model
-private import OpenSSL.GenericSourceCandidateLiteral
 
 module CryptoInput implements InputSig<Language::Location> {
   class DataFlowNode = DataFlow::Node;
@@ -87,21 +86,6 @@ module GenericDataSourceFlowConfig implements DataFlow::ConfigSig {
   }
 }
 
-module GenericDataSourceFlow = TaintTracking::Global<GenericDataSourceFlowConfig>;
-
-private class ConstantDataSource extends Crypto::GenericConstantSourceInstance instanceof Literal {
-  ConstantDataSource() { this instanceof OpenSSLGenericSourceCandidateLiteral }
-
-  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() }
-}
-
 module ArtifactUniversalFlowConfig implements DataFlow::ConfigSig {
   predicate isSource(DataFlow::Node source) {
     source = any(Crypto::ArtifactInstance artifact).getOutputNode()

cpp/ql/lib/experimental/quantum/OpenSSL/AlgorithmInstances/AlgToAVCFlow.qll

@@ -1,9 +1,7 @@
 import cpp
-private import experimental.quantum.Language
-private import semmle.code.cpp.dataflow.new.DataFlow
-private import experimental.quantum.OpenSSL.AlgorithmInstances.KnownAlgorithmConstants
-private import experimental.quantum.OpenSSL.AlgorithmValueConsumers.OpenSSLAlgorithmValueConsumers
-private import PaddingAlgorithmInstance
+import semmle.code.cpp.dataflow.new.DataFlow
+import experimental.quantum.OpenSSL.AlgorithmInstances.KnownAlgorithmConstants
+import experimental.quantum.OpenSSL.AlgorithmValueConsumers.OpenSSLAlgorithmValueConsumers
 
 /**
  * Traces 'known algorithms' to AVCs, specifically
@@ -20,9 +18,6 @@ module KnownOpenSSLAlgorithmToAlgorithmValueConsumerConfig implements DataFlow::
   predicate isSink(DataFlow::Node sink) {
     exists(OpenSSLAlgorithmValueConsumer c |
       c.getInputNode() = sink and
-      // exclude padding algorithm consumers, since
-      // these consumers take in different constant values
-      // not in the typical "known algorithm" set
       not c instanceof PaddingAlgorithmValueConsumer
     )
   }
@@ -47,7 +42,9 @@ module KnownOpenSSLAlgorithmToAlgorithmValueConsumerFlow =
   DataFlow::Global<KnownOpenSSLAlgorithmToAlgorithmValueConsumerConfig>;
 
 module RSAPaddingAlgorithmToPaddingAlgorithmValueConsumerConfig implements DataFlow::ConfigSig {
-  predicate isSource(DataFlow::Node source) { source.asExpr() instanceof OpenSSLPaddingLiteral }
+  predicate isSource(DataFlow::Node source) {
+    source.asExpr() instanceof KnownOpenSSLAlgorithmConstant
+  }
 
   predicate isSink(DataFlow::Node sink) {
     exists(PaddingAlgorithmValueConsumer c | c.getInputNode() = sink)

cpp/ql/lib/experimental/quantum/OpenSSL/AlgorithmInstances/BlockAlgorithmInstance.qll

@@ -1,14 +1,13 @@
 import cpp
-private import experimental.quantum.Language
-private import OpenSSLAlgorithmInstanceBase
-private import experimental.quantum.OpenSSL.AlgorithmInstances.KnownAlgorithmConstants
-private import experimental.quantum.OpenSSL.AlgorithmValueConsumers.DirectAlgorithmValueConsumer
-private import experimental.quantum.OpenSSL.AlgorithmValueConsumers.OpenSSLAlgorithmValueConsumerBase
-private import AlgToAVCFlow
+import experimental.quantum.Language
+import OpenSSLAlgorithmInstanceBase
+import experimental.quantum.OpenSSL.AlgorithmInstances.KnownAlgorithmConstants
+import experimental.quantum.OpenSSL.AlgorithmValueConsumers.DirectAlgorithmValueConsumer
+import AlgToAVCFlow
 
 /**
  * Given a `KnownOpenSSLBlockModeAlgorithmConstant`, converts this to a block family type.
- * Does not bind if there is no mapping (no mapping to 'unknown' or 'other').
+ * Does not bind if there is know mapping (no mapping to 'unknown' or 'other').
  */
 predicate knownOpenSSLConstantToBlockModeFamilyType(
   KnownOpenSSLBlockModeAlgorithmConstant e, Crypto::TBlockCipherModeOfOperationType type

cpp/ql/lib/experimental/quantum/OpenSSL/AlgorithmInstances/CipherAlgorithmInstance.qll

@@ -1,17 +1,16 @@
 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 AlgToAVCFlow
-private import BlockAlgorithmInstance
+import experimental.quantum.Language
+import KnownAlgorithmConstants
+import Crypto::KeyOpAlg as KeyOpAlg
+import OpenSSLAlgorithmInstanceBase
+import PaddingAlgorithmInstance
+import experimental.quantum.OpenSSL.AlgorithmValueConsumers.OpenSSLAlgorithmValueConsumers
+import AlgToAVCFlow
+import BlockAlgorithmInstance
 
 /**
  * Given a `KnownOpenSSLCipherAlgorithmConstant`, converts this to a cipher family type.
- * Does not bind if there is no mapping (no mapping to 'unknown' or 'other').
+ * Does not bind if there is know mapping (no mapping to 'unknown' or 'other').
  */
 predicate knownOpenSSLConstantToCipherFamilyType(
   KnownOpenSSLCipherAlgorithmConstant e, Crypto::KeyOpAlg::TAlgorithm type
@@ -104,8 +103,11 @@ class KnownOpenSSLCipherConstantAlgorithmInstance extends OpenSSLAlgorithmInstan
 
   override string getRawAlgorithmName() { result = this.(Literal).getValue().toString() }
 
-  override int getKeySizeFixed() {
-    this.(KnownOpenSSLCipherAlgorithmConstant).getExplicitKeySize() = result
+  override string getKeySizeFixed() {
+    exists(int keySize |
+      this.(KnownOpenSSLCipherAlgorithmConstant).getExplicitKeySize() = keySize and
+      result = keySize.toString()
+    )
   }
 
   override Crypto::KeyOpAlg::Algorithm getAlgorithmType() {

cpp/ql/lib/experimental/quantum/OpenSSL/AlgorithmInstances/EllipticCurveAlgorithmInstance.qll

@@ -1,49 +0,0 @@
-import cpp
-private import experimental.quantum.Language
-private import KnownAlgorithmConstants
-private import OpenSSLAlgorithmInstanceBase
-private import experimental.quantum.OpenSSL.AlgorithmValueConsumers.OpenSSLAlgorithmValueConsumerBase
-private import experimental.quantum.OpenSSL.AlgorithmValueConsumers.DirectAlgorithmValueConsumer
-private import AlgToAVCFlow
-
-class KnownOpenSSLEllipticCurveConstantAlgorithmInstance extends OpenSSLAlgorithmInstance,
-  Crypto::EllipticCurveInstance instanceof KnownOpenSSLEllipticCurveAlgorithmConstant
-{
-  OpenSSLAlgorithmValueConsumer getterCall;
-
-  KnownOpenSSLEllipticCurveConstantAlgorithmInstance() {
-    // Two possibilities:
-    // 1) The source is a literal and flows to a getter, then we know we have an instance
-    // 2) The source is a KnownOpenSSLAlgorithm is call, and we know we have an instance immediately from that
-    // Possibility 1:
-    this instanceof Literal 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
-      // This traces to a getter
-      KnownOpenSSLAlgorithmToAlgorithmValueConsumerFlow::flow(src, sink)
-    )
-    or
-    // Possibility 2:
-    this instanceof DirectAlgorithmValueConsumer and getterCall = this
-  }
-
-  override OpenSSLAlgorithmValueConsumer getAVC() { result = getterCall }
-
-  override string getRawEllipticCurveName() { result = this.(Literal).getValue().toString() }
-
-  override Crypto::TEllipticCurveType getEllipticCurveType() {
-    Crypto::ellipticCurveNameToKeySizeAndFamilyMapping(this.getParsedEllipticCurveName(), _, result)
-  }
-
-  override string getParsedEllipticCurveName() {
-    result = this.(KnownOpenSSLEllipticCurveAlgorithmConstant).getNormalizedName()
-  }
-
-  override int getKeySize() {
-    Crypto::ellipticCurveNameToKeySizeAndFamilyMapping(this.(KnownOpenSSLEllipticCurveAlgorithmConstant)
-          .getNormalizedName(), result, _)
-  }
-}

cpp/ql/lib/experimental/quantum/OpenSSL/AlgorithmInstances/HashAlgorithmInstance.qll

@@ -1,9 +1,8 @@
 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 AlgToAVCFlow
+import experimental.quantum.Language
+import KnownAlgorithmConstants
+import experimental.quantum.OpenSSL.AlgorithmValueConsumers.OpenSSLAlgorithmValueConsumers
+import AlgToAVCFlow
 
 predicate knownOpenSSLConstantToHashFamilyType(
   KnownOpenSSLHashAlgorithmConstant e, Crypto::THashType type

cpp/ql/lib/experimental/quantum/OpenSSL/AlgorithmInstances/KnownAlgorithmConstants.qll

@@ -1,5 +1,5 @@
 import cpp
-import experimental.quantum.OpenSSL.GenericSourceCandidateLiteral
+import experimental.quantum.OpenSSL.LibraryDetector
 
 predicate resolveAlgorithmFromExpr(Expr e, string normalizedName, string algType) {
   resolveAlgorithmFromCall(e, normalizedName, algType)
@@ -20,7 +20,7 @@ class KnownOpenSSLCipherAlgorithmConstant extends KnownOpenSSLAlgorithmConstant
 
   KnownOpenSSLCipherAlgorithmConstant() {
     resolveAlgorithmFromExpr(this, _, algType) and
-    algType.matches("%ENCRYPTION")
+    algType.toLowerCase().matches("%encryption")
   }
 
   int getExplicitKeySize() {
@@ -33,20 +33,30 @@ class KnownOpenSSLCipherAlgorithmConstant extends KnownOpenSSLAlgorithmConstant
 }
 
 class KnownOpenSSLPaddingAlgorithmConstant extends KnownOpenSSLAlgorithmConstant {
+  string algType;
+
   KnownOpenSSLPaddingAlgorithmConstant() {
-    exists(string algType |
-      resolveAlgorithmFromExpr(this, _, algType) and
-      algType.matches("%PADDING")
-    )
+    resolveAlgorithmFromExpr(this, _, algType) and
+    algType.toLowerCase().matches("%padding")
   }
 }
 
 class KnownOpenSSLBlockModeAlgorithmConstant extends KnownOpenSSLAlgorithmConstant {
-  KnownOpenSSLBlockModeAlgorithmConstant() { resolveAlgorithmFromExpr(this, _, "BLOCK_MODE") }
+  string algType;
+
+  KnownOpenSSLBlockModeAlgorithmConstant() {
+    resolveAlgorithmFromExpr(this, _, algType) and
+    algType.toLowerCase().matches("%block_mode")
+  }
 }
 
 class KnownOpenSSLHashAlgorithmConstant extends KnownOpenSSLAlgorithmConstant {
-  KnownOpenSSLHashAlgorithmConstant() { resolveAlgorithmFromExpr(this, _, "HASH") }
+  string algType;
+
+  KnownOpenSSLHashAlgorithmConstant() {
+    resolveAlgorithmFromExpr(this, _, algType) and
+    algType.toLowerCase().matches("%hash")
+  }
 
   int getExplicitDigestLength() {
     exists(string name |
@@ -57,16 +67,6 @@ class KnownOpenSSLHashAlgorithmConstant extends KnownOpenSSLAlgorithmConstant {
   }
 }
 
-class KnownOpenSSLEllipticCurveAlgorithmConstant extends KnownOpenSSLAlgorithmConstant {
-  KnownOpenSSLEllipticCurveAlgorithmConstant() {
-    resolveAlgorithmFromExpr(this, _, "ELLIPTIC_CURVE")
-  }
-}
-
-class KnownOpenSSLSignatureAlgorithmConstant extends KnownOpenSSLAlgorithmConstant {
-  KnownOpenSSLSignatureAlgorithmConstant() { resolveAlgorithmFromExpr(this, _, "SIGNATURE") }
-}
-
 /**
  * Resolves a call to a 'direct algorithm getter', e.g., EVP_MD5()
  * This approach to fetching algorithms was used in OpenSSL 1.0.2.
@@ -80,6 +80,7 @@ class KnownOpenSSLSignatureAlgorithmConstant extends KnownOpenSSLAlgorithmConsta
  *  alias = "dss1" and target = "dsaWithSHA1"
  */
 predicate resolveAlgorithmFromCall(Call c, string normalized, string algType) {
+  isPossibleOpenSSLFunction(c.getTarget()) and
   exists(string name, string parsedTargetName |
     parsedTargetName =
       c.getTarget().getName().replaceAll("EVP_", "").toLowerCase().replaceAll("_", "-") and
@@ -93,10 +94,10 @@ predicate resolveAlgorithmFromCall(Call c, string normalized, string algType) {
  * if `e` resolves to a known algorithm.
  * If this predicate does not hold, then `e` can be interpreted as being of `UNKNOWN` type.
  */
-predicate resolveAlgorithmFromLiteral(
-  OpenSSLGenericSourceCandidateLiteral e, string normalized, string algType
-) {
-  knownOpenSSLAlgorithmLiteral(_, e.getValue().toInt(), normalized, algType)
+predicate resolveAlgorithmFromLiteral(Literal e, string normalized, string algType) {
+  exists(int nid |
+    nid = getPossibleNidFromLiteral(e) and knownOpenSSLAlgorithmLiteral(_, nid, normalized, algType)
+  )
   or
   exists(string name |
     name = resolveAlgorithmAlias(e.getValue()) and
@@ -115,6 +116,30 @@ string resolveAlgorithmAlias(string name) {
   )
 }
 
+private int getPossibleNidFromLiteral(Literal e) {
+  result = e.getValue().toInt() and
+  not e instanceof CharLiteral and
+  not e instanceof StringLiteral and
+  // ASSUMPTION, no negative numbers are allowed
+  // RATIONALE: this is a performance improvement to avoid having to trace every number
+  not exists(UnaryMinusExpr u | u.getOperand() = e) and
+  //  OPENSSL has a special macro for getting every line, ignore it
+  not exists(MacroInvocation mi | mi.getExpr() = e and mi.getMacroName() = "OPENSSL_LINE") and
+  // Filter out cases where an int is assigned into a pointer, e.g., char* x = NULL;
+  not exists(Assignment a |
+    a.getRValue() = e and a.getLValue().getType().getUnspecifiedType() instanceof PointerType
+  ) and
+  not exists(Initializer i |
+    i.getExpr() = e and
+    i.getDeclaration().getADeclarationEntry().getUnspecifiedType() instanceof PointerType
+  ) and
+  // Filter out cases where an int is returned into a pointer, e.g., return NULL;
+  not exists(ReturnStmt r |
+    r.getExpr() = e and
+    r.getEnclosingFunction().getType().getUnspecifiedType() instanceof PointerType
+  )
+}
+
 string getAlgorithmAlias(string alias) {
   customAliases(result, alias)
   or
@@ -228,6 +253,11 @@ predicate defaultAliases(string target, string alias) {
   alias = "ssl3-sha1" and target = "sha1"
 }
 
+predicate tbd(string normalized, string algType) {
+  knownOpenSSLAlgorithmLiteral(_, _, normalized, algType) and
+  algType = "HASH"
+}
+
 /**
  * Enumeration of all known crypto algorithms for openSSL
  * `name` is all lower case (caller's must ensure they pass in lower case)
@@ -254,12 +284,8 @@ predicate knownOpenSSLAlgorithmLiteral(string name, int nid, string normalized,
   or
   name = "ed25519" and nid = 1087 and normalized = "ED25519" and algType = "ELLIPTIC_CURVE"
   or
-  name = "ed25519" and nid = 1087 and normalized = "ED25519" and algType = "SIGNATURE"
-  or
   name = "ed448" and nid = 1088 and normalized = "ED448" and algType = "ELLIPTIC_CURVE"
   or
-  name = "ed448" and nid = 1088 and normalized = "ED448" and algType = "SIGNATURE"
-  or
   name = "md2" and nid = 3 and normalized = "MD2" and algType = "HASH"
   or
   name = "sha" and nid = 41 and normalized = "SHA" and algType = "HASH"
@@ -1679,12 +1705,8 @@ predicate knownOpenSSLAlgorithmLiteral(string name, int nid, string normalized,
   or
   name = "x448" and nid = 1035 and normalized = "X448" and algType = "ELLIPTIC_CURVE"
   or
-  name = "x448" and nid = 1035 and normalized = "X448" and algType = "KEY_EXCHANGE"
-  or
   name = "x25519" and nid = 1034 and normalized = "X25519" and algType = "ELLIPTIC_CURVE"
   or
-  name = "x25519" and nid = 1034 and normalized = "X25519" and algType = "KEY_EXCHANGE"
-  or
   name = "authecdsa" and nid = 1047 and normalized = "ECDSA" and algType = "SIGNATURE"
   or
   name = "authgost01" and nid = 1050 and normalized = "GOST" and algType = "SYMMETRIC_ENCRYPTION"

cpp/ql/lib/experimental/quantum/OpenSSL/AlgorithmInstances/OpenSSLAlgorithmInstanceBase.qll

@@ -1,5 +1,5 @@
-private import experimental.quantum.Language
-private import experimental.quantum.OpenSSL.AlgorithmValueConsumers.OpenSSLAlgorithmValueConsumerBase
+import experimental.quantum.Language
+import experimental.quantum.OpenSSL.AlgorithmValueConsumers.OpenSSLAlgorithmValueConsumerBase
 
 abstract class OpenSSLAlgorithmInstance extends Crypto::AlgorithmInstance {
   abstract OpenSSLAlgorithmValueConsumer getAVC();

cpp/ql/lib/experimental/quantum/OpenSSL/AlgorithmInstances/OpenSSLAlgorithmInstances.qll

@@ -3,4 +3,3 @@ import CipherAlgorithmInstance
 import PaddingAlgorithmInstance
 import BlockAlgorithmInstance
 import HashAlgorithmInstance
-import EllipticCurveAlgorithmInstance

cpp/ql/lib/experimental/quantum/OpenSSL/AlgorithmInstances/PaddingAlgorithmInstance.qll

@@ -1,31 +1,13 @@
 import cpp
-private import experimental.quantum.Language
-private import OpenSSLAlgorithmInstanceBase
-private import experimental.quantum.OpenSSL.AlgorithmInstances.KnownAlgorithmConstants
-private import AlgToAVCFlow
-private import experimental.quantum.OpenSSL.AlgorithmValueConsumers.DirectAlgorithmValueConsumer
-private import experimental.quantum.OpenSSL.AlgorithmValueConsumers.OpenSSLAlgorithmValueConsumerBase
-
-/**
- * A class to define padding specific integer values.
- * 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
- *     # define RSA_PKCS1_PSS_PADDING      6
- *     # define RSA_PKCS1_WITH_TLS_PADDING 7
- *     # define RSA_PKCS1_NO_IMPLICIT_REJECT_PADDING 8
- */
-class OpenSSLPaddingLiteral 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] }
-}
+import experimental.quantum.Language
+import OpenSSLAlgorithmInstanceBase
+import experimental.quantum.OpenSSL.AlgorithmInstances.KnownAlgorithmConstants
+import AlgToAVCFlow
+import experimental.quantum.OpenSSL.AlgorithmValueConsumers.DirectAlgorithmValueConsumer
 
 /**
  * Given a `KnownOpenSSLPaddingAlgorithmConstant`, converts this to a padding family type.
- * Does not bind if there is no mapping (no mapping to 'unknown' or 'other').
+ * Does not bind if there is know mapping (no mapping to 'unknown' or 'other').
  */
 predicate knownOpenSSLConstantToPaddingFamilyType(
   KnownOpenSSLPaddingAlgorithmConstant e, Crypto::TPaddingType type
@@ -77,8 +59,19 @@ class KnownOpenSSLPaddingConstantAlgorithmInstance extends OpenSSLAlgorithmInsta
     this instanceof KnownOpenSSLPaddingAlgorithmConstant and
     isPaddingSpecificConsumer = false
     or
-    // Possibility 3: padding-specific literal
-    this instanceof OpenSSLPaddingLiteral and
+    // Possibility 3:
+    // 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] and
     exists(DataFlow::Node src, DataFlow::Node sink |
       // Sink is an argument to a CipherGetterCall
       sink = getterCall.(OpenSSLAlgorithmValueConsumer).getInputNode() and
@@ -94,24 +87,24 @@ class KnownOpenSSLPaddingConstantAlgorithmInstance extends OpenSSLAlgorithmInsta
 
   override OpenSSLAlgorithmValueConsumer getAVC() { result = getterCall }
 
-  Crypto::TPaddingType getKnownPaddingType() {
-    this.(Literal).getValue().toInt() in [1, 7, 8] and result = Crypto::PKCS1_v1_5()
-    or
-    this.(Literal).getValue().toInt() = 3 and result = Crypto::NoPadding()
-    or
-    this.(Literal).getValue().toInt() = 4 and result = Crypto::OAEP()
-    or
-    this.(Literal).getValue().toInt() = 5 and result = Crypto::ANSI_X9_23()
-    or
-    this.(Literal).getValue().toInt() = 6 and result = Crypto::PSS()
-  }
-
   override Crypto::TPaddingType getPaddingType() {
     isPaddingSpecificConsumer = true and
     (
-      result = this.getKnownPaddingType()
-      or
-      not exists(this.getKnownPaddingType()) and result = Crypto::OtherPadding()
+      if this.(Literal).getValue().toInt() in [1, 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
+              if this.(Literal).getValue().toInt() = 6
+              then result = Crypto::PSS()
+              else result = Crypto::OtherPadding()
     )
     or
     isPaddingSpecificConsumer = false and

cpp/ql/lib/experimental/quantum/OpenSSL/AlgorithmValueConsumers/CipherAlgorithmValueConsumer.qll

@@ -1,8 +1,9 @@
 import cpp
-private import experimental.quantum.Language
-private import experimental.quantum.OpenSSL.AlgorithmInstances.KnownAlgorithmConstants
-private import experimental.quantum.OpenSSL.AlgorithmInstances.OpenSSLAlgorithmInstanceBase
-private import OpenSSLAlgorithmValueConsumerBase
+import experimental.quantum.Language
+import experimental.quantum.OpenSSL.LibraryDetector
+import experimental.quantum.OpenSSL.AlgorithmInstances.KnownAlgorithmConstants
+import experimental.quantum.OpenSSL.AlgorithmInstances.OpenSSLAlgorithmInstanceBase
+import OpenSSLAlgorithmValueConsumerBase
 
 abstract class CipherAlgorithmValueConsumer extends OpenSSLAlgorithmValueConsumer { }
 
@@ -13,6 +14,7 @@ class EVPCipherAlgorithmValueConsumer extends CipherAlgorithmValueConsumer {
 
   EVPCipherAlgorithmValueConsumer() {
     resultNode.asExpr() = this and
+    isPossibleOpenSSLFunction(this.(Call).getTarget()) and
     (
       this.(Call).getTarget().getName() in [
           "EVP_get_cipherbyname", "EVP_get_cipherbyobj", "EVP_get_cipherbynid"

cpp/ql/lib/experimental/quantum/OpenSSL/AlgorithmValueConsumers/DirectAlgorithmValueConsumer.qll

@@ -1,8 +1,9 @@
 import cpp
-private import experimental.quantum.Language
-private import experimental.quantum.OpenSSL.AlgorithmInstances.KnownAlgorithmConstants
-private import experimental.quantum.OpenSSL.AlgorithmValueConsumers.OpenSSLAlgorithmValueConsumerBase
+import experimental.quantum.Language
+import experimental.quantum.OpenSSL.AlgorithmInstances.KnownAlgorithmConstants
+import experimental.quantum.OpenSSL.AlgorithmValueConsumers.OpenSSLAlgorithmValueConsumerBase
 
+// TODO: can self referential to itself, which is also an algorithm (Known algorithm)
 /**
  * Cases like EVP_MD5(),
  * there is no input, rather it directly gets an algorithm

cpp/ql/lib/experimental/quantum/OpenSSL/AlgorithmValueConsumers/EllipticCurveAlgorithmValueConsumer.qll

@@ -1,34 +0,0 @@
-import cpp
-private import experimental.quantum.Language
-private import experimental.quantum.OpenSSL.AlgorithmInstances.KnownAlgorithmConstants
-private import experimental.quantum.OpenSSL.AlgorithmValueConsumers.OpenSSLAlgorithmValueConsumerBase
-private import experimental.quantum.OpenSSL.AlgorithmInstances.OpenSSLAlgorithmInstances
-
-abstract class EllipticCurveValueConsumer extends OpenSSLAlgorithmValueConsumer { }
-
-//https://docs.openssl.org/3.0/man3/EC_KEY_new/#name
-class EVPEllipticCurveAlgorithmConsumer extends EllipticCurveValueConsumer {
-  DataFlow::Node valueArgNode;
-  DataFlow::Node resultNode;
-
-  EVPEllipticCurveAlgorithmConsumer() {
-    resultNode.asExpr() = 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
-      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
-      valueArgNode.asExpr() = this.(Call).getArgument(2)
-    )
-  }
-
-  override Crypto::AlgorithmInstance getAKnownAlgorithmSource() {
-    exists(OpenSSLAlgorithmInstance i | i.getAVC() = this and result = i)
-  }
-
-  override DataFlow::Node getResultNode() { result = resultNode }
-
-  override Crypto::ConsumerInputDataFlowNode getInputNode() { result = valueArgNode }
-}

cpp/ql/lib/experimental/quantum/OpenSSL/AlgorithmValueConsumers/HashAlgorithmValueConsumer.qll

@@ -1,9 +1,12 @@
+// import EVPHashInitializer
+// import EVPHashOperation
+// import EVPHashAlgorithmSource
 import cpp
-private import experimental.quantum.Language
-private import semmle.code.cpp.dataflow.new.DataFlow
-private import experimental.quantum.OpenSSL.AlgorithmValueConsumers.OpenSSLAlgorithmValueConsumerBase
-private import experimental.quantum.OpenSSL.AlgorithmInstances.OpenSSLAlgorithmInstances
-private import experimental.quantum.OpenSSL.LibraryDetector
+import experimental.quantum.Language
+import semmle.code.cpp.dataflow.new.DataFlow
+import experimental.quantum.OpenSSL.AlgorithmValueConsumers.OpenSSLAlgorithmValueConsumerBase
+import experimental.quantum.OpenSSL.AlgorithmInstances.OpenSSLAlgorithmInstances
+import experimental.quantum.OpenSSL.LibraryDetector
 
 abstract class HashAlgorithmValueConsumer extends OpenSSLAlgorithmValueConsumer { }
 
@@ -30,34 +33,3 @@ class EVP_Q_Digest_Algorithm_Consumer extends OpenSSLAlgorithmValueConsumer {
     none()
   }
 }
-
-/**
- * The EVP digest algorithm getters
- * https://docs.openssl.org/3.0/man3/EVP_DigestInit/#synopsis
- */
-class EVPDigestAlgorithmValueConsumer extends OpenSSLAlgorithmValueConsumer {
-  DataFlow::Node valueArgNode;
-  DataFlow::Node resultNode;
-
-  EVPDigestAlgorithmValueConsumer() {
-    resultNode.asExpr() = this and
-    isPossibleOpenSSLFunction(this.(Call).getTarget()) and
-    (
-      this.(Call).getTarget().getName() in [
-          "EVP_get_digestbyname", "EVP_get_digestbynid", "EVP_get_digestbyobj"
-        ] and
-      valueArgNode.asExpr() = this.(Call).getArgument(0)
-      or
-      this.(Call).getTarget().getName() = "EVP_MD_fetch" and
-      valueArgNode.asExpr() = this.(Call).getArgument(1)
-    )
-  }
-
-  override DataFlow::Node getResultNode() { result = resultNode }
-
-  override Crypto::ConsumerInputDataFlowNode getInputNode() { result = valueArgNode }
-
-  override Crypto::AlgorithmInstance getAKnownAlgorithmSource() {
-    exists(OpenSSLAlgorithmInstance i | i.getAVC() = this and result = i)
-  }
-}

cpp/ql/lib/experimental/quantum/OpenSSL/AlgorithmValueConsumers/OpenSSLAlgorithmValueConsumerBase.qll

@@ -1,4 +1,5 @@
-private import experimental.quantum.Language
+import experimental.quantum.Language
+import semmle.code.cpp.dataflow.new.DataFlow
 
 abstract class OpenSSLAlgorithmValueConsumer extends Crypto::AlgorithmValueConsumer instanceof Call {
   /**

cpp/ql/lib/experimental/quantum/OpenSSL/AlgorithmValueConsumers/OpenSSLAlgorithmValueConsumers.qll

@@ -3,5 +3,3 @@ import CipherAlgorithmValueConsumer
 import DirectAlgorithmValueConsumer
 import PaddingAlgorithmValueConsumer
 import HashAlgorithmValueConsumer
-import EllipticCurveAlgorithmValueConsumer
-import PKeyAlgorithmValueConsumer

cpp/ql/lib/experimental/quantum/OpenSSL/AlgorithmValueConsumers/PKeyAlgorithmValueConsumer.qll

@@ -1,55 +0,0 @@
-import cpp
-private import experimental.quantum.Language
-private import experimental.quantum.OpenSSL.AlgorithmInstances.KnownAlgorithmConstants
-private import experimental.quantum.OpenSSL.AlgorithmValueConsumers.OpenSSLAlgorithmValueConsumerBase
-private import experimental.quantum.OpenSSL.AlgorithmInstances.OpenSSLAlgorithmInstances
-
-abstract class PKeyValueConsumer extends OpenSSLAlgorithmValueConsumer { }
-
-class EVPPKeyAlgorithmConsumer extends PKeyValueConsumer {
-  DataFlow::Node valueArgNode;
-  DataFlow::Node resultNode;
-
-  EVPPKeyAlgorithmConsumer() {
-    resultNode.asExpr() = 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.
-      this.(Call).getTarget().getName() in [
-          "EVP_PKEY_CTX_new_id", "EVP_PKEY_new_raw_private_key", "EVP_PKEY_new_raw_public_key",
-          "EVP_PKEY_new_mac_key"
-        ] and
-      valueArgNode.asExpr() = this.(Call).getArgument(0)
-      or
-      this.(Call).getTarget().getName() in [
-          "EVP_PKEY_CTX_new_from_name", "EVP_PKEY_new_raw_private_key_ex",
-          "EVP_PKEY_new_raw_public_key_ex", "EVP_PKEY_CTX_ctrl", "EVP_PKEY_CTX_set_group_name"
-        ] and
-      valueArgNode.asExpr() = 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
-      // In all other cases there is no argInd 3, and argInd 2 is the algorithm.
-      // Since this is a key gen operation, handling the key size should be handled
-      // when the operation is again modeled as a key gen operation.
-      this.(Call).getTarget().getName() = "EVP_PKEY_Q_keygen" and
-      (
-        // 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)
-        else
-          // All other cases
-          valueArgNode.asExpr() = this.(Call).getArgument(2)
-      )
-    )
-  }
-
-  override Crypto::AlgorithmInstance getAKnownAlgorithmSource() {
-    exists(OpenSSLAlgorithmInstance i | i.getAVC() = this and result = i)
-  }
-
-  override DataFlow::Node getResultNode() { result = resultNode }
-
-  override Crypto::ConsumerInputDataFlowNode getInputNode() { result = valueArgNode }
-}

cpp/ql/lib/experimental/quantum/OpenSSL/AlgorithmValueConsumers/PaddingAlgorithmValueConsumer.qll

@@ -1,8 +1,9 @@
 import cpp
-private import experimental.quantum.Language
-private import experimental.quantum.OpenSSL.AlgorithmInstances.KnownAlgorithmConstants
-private import experimental.quantum.OpenSSL.AlgorithmInstances.OpenSSLAlgorithmInstanceBase
-private import OpenSSLAlgorithmValueConsumerBase
+import experimental.quantum.Language
+import experimental.quantum.OpenSSL.LibraryDetector
+import experimental.quantum.OpenSSL.AlgorithmInstances.KnownAlgorithmConstants
+import experimental.quantum.OpenSSL.AlgorithmInstances.OpenSSLAlgorithmInstanceBase
+import OpenSSLAlgorithmValueConsumerBase
 
 abstract class PaddingAlgorithmValueConsumer extends OpenSSLAlgorithmValueConsumer { }
 
@@ -15,8 +16,11 @@ class EVP_PKEY_CTX_set_rsa_padding_AlgorithmValueConsumer extends PaddingAlgorit
 
   EVP_PKEY_CTX_set_rsa_padding_AlgorithmValueConsumer() {
     resultNode.asExpr() = this and
-    this.(Call).getTarget().getName() = "EVP_PKEY_CTX_set_rsa_padding" and
-    valueArgNode.asExpr() = this.(Call).getArgument(1)
+    isPossibleOpenSSLFunction(this.(Call).getTarget()) and
+    (
+      this.(Call).getTarget().getName() in ["EVP_PKEY_CTX_set_rsa_padding"] and
+      valueArgNode.asExpr() = this.(Call).getArgument(1)
+    )
   }
 
   override DataFlow::Node getResultNode() { result = resultNode }

cpp/ql/lib/experimental/quantum/OpenSSL/CtxFlow.qll

@@ -20,107 +20,79 @@
 
 import semmle.code.cpp.dataflow.new.DataFlow
 
-/**
- * An openSSL CTX type, which is type for which the stripped underlying type
- * matches the pattern 'evp_%ctx_%st'.
- * This includes types like:
- * - EVP_CIPHER_CTX
- * - EVP_MD_CTX
- * - EVP_PKEY_CTX
- */
-private class CtxType extends Type {
-  CtxType() { this.getUnspecifiedType().stripType().getName().matches("evp_%ctx_%st") }
+class CTXType extends Type {
+  CTXType() {
+    // TODO: should we limit this to an openssl path?
+    this.getUnspecifiedType().stripType().getName().matches("evp_%ctx_%st")
+  }
 }
 
-/**
- * A pointer to a CtxType
- */
-private class CtxPointerExpr extends Expr {
-  CtxPointerExpr() {
-    this.getType() instanceof CtxType and
+class CTXPointerExpr extends Expr {
+  CTXPointerExpr() {
+    this.getType() instanceof CTXType and
     this.getType() instanceof PointerType
   }
 }
 
-/**
- * A call argument of type CtxPointerExpr.
- */
-private class CtxPointerArgument extends CtxPointerExpr {
-  CtxPointerArgument() { exists(Call c | c.getAnArgument() = this) }
+class CTXPointerArgument extends CTXPointerExpr {
+  CTXPointerArgument() { exists(Call c | c.getAnArgument() = this) }
 
   Call getCall() { result.getAnArgument() = this }
 }
 
-/**
- * A call whose target contains 'free' or 'reset' and has an argument of type
- * CtxPointerArgument.
- */
-private class CtxClearCall extends Call {
-  CtxClearCall() {
+class CTXClearCall extends Call {
+  CTXClearCall() {
     this.getTarget().getName().toLowerCase().matches(["%free%", "%reset%"]) and
-    this.getAnArgument() instanceof CtxPointerArgument
+    this.getAnArgument() instanceof CTXPointerArgument
   }
 }
 
-/**
- * A call whose target contains 'copy' and has an argument of type
- * CtxPointerArgument.
- */
-private class CtxCopyOutArgCall extends Call {
-  CtxCopyOutArgCall() {
-    this.getTarget().getName().toLowerCase().matches("%copy%") and
-    this.getAnArgument() instanceof CtxPointerArgument
+class CTXCopyOutArgCall extends Call {
+  CTXCopyOutArgCall() {
+    this.getTarget().getName().toLowerCase().matches(["%copy%"]) and
+    this.getAnArgument() instanceof CTXPointerArgument
   }
 }
 
-/**
- * A call whose target contains 'dup' and has an argument of type
- * CtxPointerArgument.
- */
-private class CtxCopyReturnCall extends Call, CtxPointerExpr {
-  CtxCopyReturnCall() {
-    this.getTarget().getName().toLowerCase().matches("%dup%") and
-    this.getAnArgument() instanceof CtxPointerArgument
+class CTXCopyReturnCall extends Call {
+  CTXCopyReturnCall() {
+    this.getTarget().getName().toLowerCase().matches(["%dup%"]) and
+    this.getAnArgument() instanceof CTXPointerArgument and
+    this instanceof CTXPointerExpr
   }
 }
 
-/**
- * Flow from any CtxPointerArgument to any other CtxPointerArgument
- */
-module OpenSSLCtxArgumentFlowConfig implements DataFlow::ConfigSig {
-  predicate isSource(DataFlow::Node source) { source.asExpr() instanceof CtxPointerArgument }
+module OpenSSLCTXArgumentFlowConfig implements DataFlow::ConfigSig {
+  predicate isSource(DataFlow::Node source) { source.asExpr() instanceof CTXPointerArgument }
 
-  predicate isSink(DataFlow::Node sink) { sink.asExpr() instanceof CtxPointerArgument }
+  predicate isSink(DataFlow::Node sink) { sink.asExpr() instanceof CTXPointerArgument }
 
   predicate isBarrier(DataFlow::Node node) {
-    exists(CtxClearCall c | c.getAnArgument() = node.asExpr())
+    exists(CTXClearCall c | c.getAnArgument() = node.asExpr())
   }
 
   predicate isAdditionalFlowStep(DataFlow::Node node1, DataFlow::Node node2) {
-    exists(CtxCopyOutArgCall c |
+    exists(CTXCopyOutArgCall c |
       c.getAnArgument() = node1.asExpr() and
       c.getAnArgument() = node2.asExpr() and
       node1.asExpr() != node2.asExpr() and
-      node2.asExpr().getType() instanceof CtxType
+      node2.asExpr().getType() instanceof CTXType
     )
     or
-    exists(CtxCopyReturnCall c |
+    exists(CTXCopyReturnCall c |
       c.getAnArgument() = node1.asExpr() and
       c = node2.asExpr() and
       node1.asExpr() != node2.asExpr() and
-      node2.asExpr().getType() instanceof CtxType
+      node2.asExpr().getType() instanceof CTXType
     )
   }
 }
 
-module OpenSSLCtxArgumentFlow = DataFlow::Global<OpenSSLCtxArgumentFlowConfig>;
+module OpenSSLCTXArgumentFlow = DataFlow::Global<OpenSSLCTXArgumentFlowConfig>;
 
-/**
- * Holds if there is a context flow from the source to the sink.
- */
-predicate ctxArgFlowsToCtxArg(CtxPointerArgument source, CtxPointerArgument sink) {
+predicate ctxArgFlowsToCtxArg(CTXPointerArgument source, CTXPointerArgument sink) {
   exists(DataFlow::Node a, DataFlow::Node b |
-    OpenSSLCtxArgumentFlow::flow(a, b) and
+    OpenSSLCTXArgumentFlow::flow(a, b) and
     a.asExpr() = source and
     b.asExpr() = sink
   )

cpp/ql/lib/experimental/quantum/OpenSSL/GenericSourceCandidateLiteral.qll

@@ -1,122 +0,0 @@
-import cpp
-private import semmle.code.cpp.models.Models
-private import semmle.code.cpp.models.interfaces.FormattingFunction
-
-private class IntLiteral extends Literal {
-  IntLiteral() {
-    //Heuristics for distinguishing int literals from other literals
-    exists(this.getValue().toInt()) and
-    not this instanceof CharLiteral and
-    not this instanceof StringLiteral
-  }
-}
-
-/**
- * Holds if a StringLiteral could conceivably be used in some way for cryptography.
- * Note: this predicate should only consider restrictions with respect to strings only.
- * General restrictions are in the OpenSSLGenericSourceCandidateLiteral class.
- */
-private predicate isOpenSSLStringLiteralGenericSourceCandidate(StringLiteral s) {
-  // '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) curve is used.
-  s.getValue() != "EC" and
-  // Ignore empty strings
-  s.getValue() != "" and
-  // Filter out strings with "%", to filter out format strings
-  not s.getValue().matches("%\\%%") and
-  // Filter out strings in brackets or braces (commonly seen strings not relevant for crypto)
-  not s.getValue().matches(["[%]", "(%)"]) and
-  // Filter out all strings of length 1, since these are not algorithm names
-  // NOTE/ASSUMPTION: If a user legitimately passes a string of length 1 to some configuration
-  // we will assume this is generally unknown. We may need to reassess this in the future.
-  s.getValue().length() > 1 and
-  // Ignore all strings that are in format string calls outputing to a stream (e.g., stdout)
-  not exists(FormattingFunctionCall f |
-    exists(f.getOutputArgument(true)) and s = f.(Call).getAnArgument()
-  ) and
-  // Ignore all format string calls where there is no known out param (resulting string)
-  // i.e., ignore printf, since it will just output a string and not produce a new string
-  not exists(FormattingFunctionCall f |
-    // Note: using two ways of determining if there is an out param, since I'm not sure
-    // which way is canonical
-    not exists(f.getOutputArgument(false)) and
-    not f.getTarget().hasTaintFlow(_, _) and
-    f.(Call).getAnArgument() = s
-  )
-}
-
-/**
- * Holds if a StringLiteral could conceivably be used in some way for cryptography.
- * Note: this predicate should only consider restrictions with respect to integers only.
- * General restrictions are in the OpenSSLGenericSourceCandidateLiteral class.
- */
-private predicate isOpenSSLIntLiteralGenericSourceCandidate(IntLiteral l) {
-  // Ignore integer values of 0, commonly referring to NULL only (no known algorithm 0)
-  l.getValue().toInt() != 0 and
-  // ASSUMPTION, no negative numbers are allowed
-  // RATIONALE: this is a performance improvement to avoid having to trace every number
-  not exists(UnaryMinusExpr u | u.getOperand() = l) and
-  //  OPENSSL has a special macro for getting every line, ignore it
-  not exists(MacroInvocation mi | mi.getExpr() = l and mi.getMacroName() = "OPENSSL_LINE") and
-  // Filter out cases where an int is returned into a pointer, e.g., return NULL;
-  not exists(ReturnStmt r |
-    r.getExpr() = l and
-    r.getEnclosingFunction().getType().getUnspecifiedType() instanceof DerivedType
-  ) and
-  // A literal as an array index should not be relevant for crypo
-  not exists(ArrayExpr op | op.getArrayOffset() = l) and
-  // A literal used in a bitwise should not be relevant for crypto
-  not exists(BinaryBitwiseOperation op | op.getAnOperand() = l) and
-  not exists(AssignBitwiseOperation op | op.getAnOperand() = l) and
-  //Filter out cases where an int is assigned or initialized into a pointer, e.g., char* x = NULL;
-  not exists(Assignment a |
-    a.getRValue() = l and
-    a.getLValue().getType().getUnspecifiedType() instanceof DerivedType
-  ) and
-  not exists(Initializer i |
-    i.getExpr() = l and
-    i.getDeclaration().getADeclarationEntry().getUnspecifiedType() instanceof DerivedType
-  ) and
-  // Filter out cases where the literal is used in any kind of arithmetic operation
-  not exists(BinaryArithmeticOperation op | op.getAnOperand() = l) and
-  not exists(UnaryArithmeticOperation op | op.getOperand() = l) and
-  not exists(AssignArithmeticOperation op | op.getAnOperand() = l) and
-  // If a literal has no parent ignore it, this is a workaround for the current inability
-  // to find a literal in an array declaration: int x[100];
-  // NOTE/ASSUMPTION: this value might actually be relevant for finding hard coded sizes
-  // consider size as inferred through the allocation of a buffer.
-  // In these cases, we advise that the source is not generic and must be traced explicitly.
-  exists(l.getParent())
-}
-
-/**
- * Any literal that may be conceivably be used in some way for cryptography.
- * The set of all literals is restricted by this class to cases where there is higher
- * plausibility that the literal could be used as a source of configuration.
- * Literals are filtered, for example, if they are used in a way no indicative of an algorithm use
- * such as in an array index, bitwise operation, or logical operation.
- * Note a case like this:
- *      if(algVal == "AES")
- *
- * "AES" may be a legitimate algorithm literal, but the literal will not be used for an operation directly
- * since it is in a equality comparison, hence this case would also be filtered.
- */
-class OpenSSLGenericSourceCandidateLiteral extends Literal {
-  OpenSSLGenericSourceCandidateLiteral() {
-    (
-      isOpenSSLIntLiteralGenericSourceCandidate(this) or
-      isOpenSSLStringLiteralGenericSourceCandidate(this)
-    ) and
-    // ********* General filters beyond what is filtered for strings and ints *********
-    // An algorithm literal in a switch case will not be directly applied to an operation.
-    not exists(SwitchCase sc | sc.getExpr() = this) and
-    // A literal in a logical operation may be an algorithm, but not a candidate
-    // for the purposes of finding applied algorithms
-    not exists(BinaryLogicalOperation op | op.getAnOperand() = this) and
-    not exists(UnaryLogicalOperation op | op.getOperand() = this) and
-    // A literal in a comparison operation may be an algorithm, but not a candidate
-    // for the purposes of finding applied algorithms
-    not exists(ComparisonOperation op | op.getAnOperand() = this)
-  }
-}

cpp/ql/lib/experimental/quantum/OpenSSL/OpenSSL.qll

@@ -1,7 +1,9 @@
+import cpp
+import semmle.code.cpp.dataflow.new.DataFlow
+
 module OpenSSLModel {
-  import AlgorithmInstances.OpenSSLAlgorithmInstances
-  import AlgorithmValueConsumers.OpenSSLAlgorithmValueConsumers
-  import Operations.OpenSSLOperations
-  import Random
-  import GenericSourceCandidateLiteral
+  import experimental.quantum.Language
+  import experimental.quantum.OpenSSL.AlgorithmInstances.OpenSSLAlgorithmInstances
+  import experimental.quantum.OpenSSL.AlgorithmValueConsumers.OpenSSLAlgorithmValueConsumers
+  import experimental.quantum.OpenSSL.Operations.OpenSSLOperations
 }

cpp/ql/lib/experimental/quantum/OpenSSL/Operations/ECKeyGenOperation.qll

@@ -1,61 +0,0 @@
-private import experimental.quantum.Language
-private import experimental.quantum.OpenSSL.CtxFlow as CTXFlow
-private import OpenSSLOperationBase
-private import experimental.quantum.OpenSSL.AlgorithmValueConsumers.OpenSSLAlgorithmValueConsumers
-private import semmle.code.cpp.dataflow.new.DataFlow
-
-private module AlgGetterToAlgConsumerConfig implements DataFlow::ConfigSig {
-  predicate isSource(DataFlow::Node source) {
-    exists(OpenSSLAlgorithmValueConsumer c | c.getResultNode() = source)
-  }
-
-  predicate isSink(DataFlow::Node sink) {
-    exists(ECKeyGenOperation c | c.getAlgorithmArg() = sink.asExpr())
-  }
-}
-
-private module AlgGetterToAlgConsumerFlow = DataFlow::Global<AlgGetterToAlgConsumerConfig>;
-
-class ECKeyGenOperation extends OpenSSLOperation, Crypto::KeyGenerationOperationInstance {
-  ECKeyGenOperation() { this.(Call).getTarget().getName() = "EC_KEY_generate_key" }
-
-  override Expr getOutputArg() {
-    result = this.(Call) // return value of call
-  }
-
-  Expr getAlgorithmArg() { result = this.(Call).getArgument(0) }
-
-  override Expr getInputArg() {
-    // there is no 'input', in the sense that no data is being manipulated by the operation.
-    // There is an input of an algorithm, but that is not the intention of the operation input arg.
-    none()
-  }
-
-  override Crypto::KeyArtifactType getOutputKeyType() { result = Crypto::TAsymmetricKeyType() }
-
-  override Crypto::ArtifactOutputDataFlowNode getOutputKeyArtifact() {
-    result = this.getOutputNode()
-  }
-
-  override Crypto::AlgorithmValueConsumer getAnAlgorithmValueConsumer() {
-    AlgGetterToAlgConsumerFlow::flow(result.(OpenSSLAlgorithmValueConsumer).getResultNode(),
-      DataFlow::exprNode(this.getAlgorithmArg()))
-  }
-
-  override Crypto::ConsumerInputDataFlowNode getKeySizeConsumer() {
-    none() // no explicit key size, inferred from algorithm
-  }
-
-  override int getKeySizeFixed() {
-    none()
-    // TODO: marked as none as the operation itself has no key size, it
-    // comes from the algorithm source, but note we could grab the
-    // algorithm source and get the key size (see below).
-    // We may need to reconsider what is the best approach here.
-    // result =
-    //   this.getAnAlgorithmValueConsumer()
-    //       .getAKnownAlgorithmSource()
-    //       .(Crypto::EllipticCurveInstance)
-    //       .getKeySize()
-  }
-}

cpp/ql/lib/experimental/quantum/OpenSSL/Operations/EVPCipherInitializer.qll

@@ -3,8 +3,8 @@
  * Models cipher initialization for EVP cipher operations.
  */
 
-private import experimental.quantum.Language
-private import experimental.quantum.OpenSSL.CtxFlow as CTXFlow
+import experimental.quantum.Language
+import experimental.quantum.OpenSSL.CtxFlow as CTXFlow
 
 module EncValToInitEncArgConfig implements DataFlow::ConfigSig {
   predicate isSource(DataFlow::Node source) { source.asExpr().getValue().toInt() in [0, 1] }

cpp/ql/lib/experimental/quantum/OpenSSL/Operations/EVPCipherOperation.qll

@@ -1,8 +1,8 @@
-private import experimental.quantum.Language
-private import experimental.quantum.OpenSSL.CtxFlow as CTXFlow
-private import EVPCipherInitializer
-private import OpenSSLOperationBase
-private import experimental.quantum.OpenSSL.AlgorithmValueConsumers.OpenSSLAlgorithmValueConsumers
+import experimental.quantum.Language
+import experimental.quantum.OpenSSL.CtxFlow as CTXFlow
+import EVPCipherInitializer
+import OpenSSLOperationBase
+import experimental.quantum.OpenSSL.AlgorithmValueConsumers.OpenSSLAlgorithmValueConsumers
 
 private module AlgGetterToAlgConsumerConfig implements DataFlow::ConfigSig {
   predicate isSource(DataFlow::Node source) {
@@ -67,42 +67,37 @@ abstract class EVP_Cipher_Operation extends OpenSSLOperation, Crypto::KeyOperati
   }
 }
 
+// abstract class EVP_Update_Call extends EVP_Cipher_Operation { }
+abstract class EVP_Final_Call extends EVP_Cipher_Operation {
+  override Expr getInputArg() { none() }
+}
+
+// TODO: only model Final (model final as operation and model update but not as an operation)
+// Updates are multiple input consumers (most important)
+// TODO: assuming update doesn't ouput, otherwise it outputs artifacts, but is not an operation
 class EVP_Cipher_Call extends EVP_Cipher_Operation {
   EVP_Cipher_Call() { this.(Call).getTarget().getName() = "EVP_Cipher" }
 
   override Expr getInputArg() { result = this.(Call).getArgument(2) }
 }
 
-// NOTE: not modeled as cipher operations, these are intermediate calls
-class EVP_Cipher_Update_Call extends Call {
-  EVP_Cipher_Update_Call() {
-    this.(Call).getTarget().getName() in [
-        "EVP_EncryptUpdate", "EVP_DecryptUpdate", "EVP_CipherUpdate"
-      ]
-  }
-
-  Expr getInputArg() { result = this.(Call).getArgument(3) }
-
-  DataFlow::Node getInputNode() { result.asExpr() = this.getInputArg() }
-
-  Expr getContextArg() { result = this.(Call).getArgument(0) }
-}
-
-class EVP_Cipher_Final_Call extends EVP_Cipher_Operation {
-  EVP_Cipher_Final_Call() {
+// ******* TODO: model UPDATE but not as the core operation, rather a step towards final
+// see the JCA
+// class EVP_Encrypt_Decrypt_or_Cipher_Update_Call extends EVP_Update_Call {
+//   EVP_Encrypt_Decrypt_or_Cipher_Update_Call() {
+//     this.(Call).getTarget().getName() in [
+//         "EVP_EncryptUpdate", "EVP_DecryptUpdate", "EVP_CipherUpdate"
+//       ]
+//   }
+//   override Expr getInputArg() { result = this.(Call).getArgument(3) }
+// }
+class EVP_Encrypt_Decrypt_or_Cipher_Final_Call extends EVP_Final_Call {
+  EVP_Encrypt_Decrypt_or_Cipher_Final_Call() {
     this.(Call).getTarget().getName() in [
         "EVP_EncryptFinal_ex", "EVP_DecryptFinal_ex", "EVP_CipherFinal_ex", "EVP_EncryptFinal",
         "EVP_DecryptFinal", "EVP_CipherFinal"
       ]
   }
-
-  EVP_Cipher_Update_Call getUpdateCalls() {
-    CTXFlow::ctxArgFlowsToCtxArg(result.getContextArg(), this.getContextArg())
-  }
-
-  override Expr getInputArg() { result = this.getUpdateCalls().getInputArg() }
-
-  override Crypto::ConsumerInputDataFlowNode getInputConsumer() { result = this.getInputNode() }
 }
 
 class EVP_PKEY_Operation extends EVP_Cipher_Operation {

cpp/ql/lib/experimental/quantum/OpenSSL/Operations/EVPHashOperation.qll

@@ -2,11 +2,12 @@
  * https://docs.openssl.org/3.0/man3/EVP_DigestInit/#synopsis
  */
 
-private import experimental.quantum.Language
-private import experimental.quantum.OpenSSL.CtxFlow as CTXFlow
-private import OpenSSLOperationBase
-private import EVPHashInitializer
-private import experimental.quantum.OpenSSL.AlgorithmValueConsumers.OpenSSLAlgorithmValueConsumers
+import experimental.quantum.Language
+import experimental.quantum.OpenSSL.CtxFlow as CTXFlow
+import experimental.quantum.OpenSSL.LibraryDetector
+import OpenSSLOperationBase
+import EVPHashInitializer
+import experimental.quantum.OpenSSL.AlgorithmValueConsumers.OpenSSLAlgorithmValueConsumers
 
 // import EVPHashConsumers
 abstract class EVP_Hash_Operation extends OpenSSLOperation, Crypto::HashOperationInstance {
@@ -15,16 +16,6 @@ abstract class EVP_Hash_Operation extends OpenSSLOperation, Crypto::HashOperatio
   EVP_Hash_Initializer getInitCall() {
     CTXFlow::ctxArgFlowsToCtxArg(result.getContextArg(), this.getContextArg())
   }
-
-  /**
-   * By default, the algorithm value comes from the init call.
-   * There are variants where this isn't true, in which case the
-   * subclass should override this method.
-   */
-  override Crypto::AlgorithmValueConsumer getAnAlgorithmValueConsumer() {
-    AlgGetterToAlgConsumerFlow::flow(result.(OpenSSLAlgorithmValueConsumer).getResultNode(),
-      DataFlow::exprNode(this.getInitCall().getAlgorithmArg()))
-  }
 }
 
 private module AlgGetterToAlgConsumerConfig implements DataFlow::ConfigSig {
@@ -41,7 +32,10 @@ private module AlgGetterToAlgConsumerFlow = DataFlow::Global<AlgGetterToAlgConsu
 
 //https://docs.openssl.org/3.0/man3/EVP_DigestInit/#synopsis
 class EVP_Q_Digest_Operation extends EVP_Hash_Operation {
-  EVP_Q_Digest_Operation() { this.(Call).getTarget().getName() = "EVP_Q_digest" }
+  EVP_Q_Digest_Operation() {
+    this.(Call).getTarget().getName() = "EVP_Q_digest" and
+    isPossibleOpenSSLFunction(this.(Call).getTarget())
+  }
 
   //override Crypto::AlgorithmConsumer getAlgorithmConsumer() {  }
   override EVP_Hash_Initializer getInitCall() {
@@ -67,7 +61,10 @@ class EVP_Q_Digest_Operation extends EVP_Hash_Operation {
 }
 
 class EVP_Digest_Operation extends EVP_Hash_Operation {
-  EVP_Digest_Operation() { this.(Call).getTarget().getName() = "EVP_Digest" }
+  EVP_Digest_Operation() {
+    this.(Call).getTarget().getName() = "EVP_Digest" and
+    isPossibleOpenSSLFunction(this.(Call).getTarget())
+  }
 
   // There is no context argument for this function
   override Expr getContextArg() { none() }
@@ -91,34 +88,30 @@ class EVP_Digest_Operation extends EVP_Hash_Operation {
 
   override Crypto::ConsumerInputDataFlowNode getInputConsumer() { result = this.getInputNode() }
 }
-
-// NOTE: not modeled as hash operations, these are intermediate calls
-class EVP_Digest_Update_Call extends Call {
-  EVP_Digest_Update_Call() { this.(Call).getTarget().getName() in ["EVP_DigestUpdate"] }
-
-  Expr getInputArg() { result = this.(Call).getArgument(1) }
-
-  DataFlow::Node getInputNode() { result.asExpr() = this.getInputArg() }
-
-  Expr getContextArg() { result = this.(Call).getArgument(0) }
-}
-
-class EVP_Digest_Final_Call extends EVP_Hash_Operation {
-  EVP_Digest_Final_Call() {
-    this.(Call).getTarget().getName() in [
-        "EVP_DigestFinal", "EVP_DigestFinal_ex", "EVP_DigestFinalXOF"
-      ]
-  }
-
-  EVP_Digest_Update_Call getUpdateCalls() {
-    CTXFlow::ctxArgFlowsToCtxArg(result.getContextArg(), this.getContextArg())
-  }
-
-  override Expr getInputArg() { result = this.getUpdateCalls().getInputArg() }
-
-  override Crypto::ConsumerInputDataFlowNode getInputConsumer() { result = this.getInputNode() }
-
-  override Expr getOutputArg() { result = this.(Call).getArgument(1) }
-
-  override Crypto::ArtifactOutputDataFlowNode getOutputArtifact() { result = this.getOutputNode() }
-}
+// // override Crypto::AlgorithmValueConsumer getAnAlgorithmValueConsumer() {
+// //   AlgGetterToAlgConsumerFlow::flow(result.(OpenSSLAlgorithmValueConsumer).getResultNode(),
+// //     DataFlow::exprNode(this.getInitCall().getAlgorithmArg()))
+// // }
+// // ***** TODO *** complete modelinlg for hash operations, but have consideration for terminal and non-terminal (non intermedaite) steps
+// // see the JCA. May need to update the cipher operations similarly
+// // ALSO SEE cipher for how we currently model initialization of the algorithm through an init call
+// class EVP_DigestUpdate_Operation extends EVP_Hash_Operation {
+//   EVP_DigestUpdate_Operation() {
+//     this.(Call).getTarget().getName() = "EVP_DigestUpdate" and
+//     isPossibleOpenSSLFunction(this.(Call).getTarget())
+//   }
+//   override Crypto::AlgorithmConsumer getAlgorithmConsumer() {
+//     this.getInitCall().getAlgorithmArg() = result
+//   }
+// }
+// class EVP_DigestFinal_Variants_Operation extends EVP_Hash_Operation {
+//   EVP_DigestFinal_Variants_Operation() {
+//     this.(Call).getTarget().getName() in [
+//         "EVP_DigestFinal", "EVP_DigestFinal_ex", "EVP_DigestFinalXOF"
+//       ] and
+//     isPossibleOpenSSLFunction(this.(Call).getTarget())
+//   }
+//   override Crypto::AlgorithmConsumer getAlgorithmConsumer() {
+//     this.getInitCall().getAlgorithmArg() = result
+//   }
+// }

cpp/ql/lib/experimental/quantum/OpenSSL/Operations/OpenSSLOperationBase.qll

@@ -1,4 +1,4 @@
-private import experimental.quantum.Language
+import experimental.quantum.Language
 
 abstract class OpenSSLOperation extends Crypto::OperationInstance instanceof Call {
   abstract Expr getInputArg();

cpp/ql/lib/experimental/quantum/OpenSSL/Operations/OpenSSLOperations.qll

@@ -1,4 +1,3 @@
 import OpenSSLOperationBase
 import EVPCipherOperation
 import EVPHashOperation
-import ECKeyGenOperation

cpp/ql/lib/ext/generated/sqlite.model.yml

@@ -1,948 +0,0 @@
-# THIS FILE IS AN AUTO-GENERATED MODELS AS DATA FILE. DO NOT EDIT.
-extensions:
-  - addsTo:
-      pack: codeql/cpp-all
-      extensible: summaryModel
-    data:
-      - ["", "", True, "Action_add", "(action **,e_action,symbol *,char *)", "", "Argument[**0]", "Argument[**0].Field[**next]", "value", "dfc-generated"]
-      - ["", "", True, "Action_add", "(action **,e_action,symbol *,char *)", "", "Argument[*0]", "Argument[**0].Field[*next]", "value", "dfc-generated"]
-      - ["", "", True, "Action_add", "(action **,e_action,symbol *,char *)", "", "Argument[0]", "Argument[**0].Field[*next]", "taint", "dfc-generated"]
-      - ["", "", True, "Action_add", "(action **,e_action,symbol *,char *)", "", "Argument[0]", "Argument[*0]", "taint", "dfc-generated"]
-      - ["", "", True, "Configcmp", "(const char *,const char *)", "", "Argument[*0].Field[**rp].Field[*index]", "ReturnValue", "taint", "dfc-generated"]
-      - ["", "", True, "Configcmp", "(const char *,const char *)", "", "Argument[*0].Field[*dot]", "ReturnValue", "taint", "dfc-generated"]
-      - ["", "", True, "Configcmp", "(const char *,const char *)", "", "Argument[*1].Field[**rp].Field[*index]", "ReturnValue", "taint", "dfc-generated"]
-      - ["", "", True, "Configcmp", "(const char *,const char *)", "", "Argument[*1].Field[*dot]", "ReturnValue", "taint", "dfc-generated"]
-      - ["", "", True, "Configlist_add", "(rule *,int)", "", "Argument[*0]", "ReturnValue[*].Field[**rp]", "value", "dfc-generated"]
-      - ["", "", True, "Configlist_add", "(rule *,int)", "", "Argument[0]", "ReturnValue[*].Field[*rp]", "value", "dfc-generated"]
-      - ["", "", True, "Configlist_add", "(rule *,int)", "", "Argument[1]", "ReturnValue[*].Field[*dot]", "value", "dfc-generated"]
-      - ["", "", True, "Configlist_addbasis", "(rule *,int)", "", "Argument[*0]", "ReturnValue[*].Field[**rp]", "value", "dfc-generated"]
-      - ["", "", True, "Configlist_addbasis", "(rule *,int)", "", "Argument[0]", "ReturnValue[*].Field[*rp]", "value", "dfc-generated"]
-      - ["", "", True, "Configlist_addbasis", "(rule *,int)", "", "Argument[1]", "ReturnValue[*].Field[*dot]", "value", "dfc-generated"]
-      - ["", "", True, "JimDefaultAllocator", "(void *,size_t)", "", "Argument[**0]", "ReturnValue[**]", "value", "dfc-generated"]
-      - ["", "", True, "JimDefaultAllocator", "(void *,size_t)", "", "Argument[*0]", "ReturnValue[**]", "value", "dfc-generated"]
-      - ["", "", True, "JimDefaultAllocator", "(void *,size_t)", "", "Argument[*0]", "ReturnValue[*]", "value", "dfc-generated"]
-      - ["", "", True, "JimDefaultAllocator", "(void *,size_t)", "", "Argument[0]", "ReturnValue[**]", "taint", "dfc-generated"]
-      - ["", "", True, "JimDefaultAllocator", "(void *,size_t)", "", "Argument[0]", "ReturnValue[*]", "taint", "dfc-generated"]
-      - ["", "", True, "JimStringReplaceObj", "(Jim_Interp *,Jim_Obj *,Jim_Obj *,Jim_Obj *,Jim_Obj *)", "", "Argument[*1]", "ReturnValue[*]", "value", "df-generated"]
-      - ["", "", True, "JimStringReplaceObj", "(Jim_Interp *,Jim_Obj *,Jim_Obj *,Jim_Obj *,Jim_Obj *)", "", "Argument[1]", "ReturnValue", "value", "dfc-generated"]
-      - ["", "", True, "Jim_AioFilehandle", "(Jim_Interp *,Jim_Obj *)", "", "Argument[1]", "Argument[*0].Field[**freeList].Field[*prevObjPtr]", "value", "dfc-generated"]
-      - ["", "", True, "Jim_AioFilehandle", "(Jim_Interp *,Jim_Obj *)", "", "Argument[1]", "Argument[*0].Field[*freeList]", "value", "dfc-generated"]
-      - ["", "", True, "Jim_AppendObj", "(Jim_Interp *,Jim_Obj *,Jim_Obj *)", "", "Argument[*2]", "Argument[*1]", "taint", "df-generated"]
-      - ["", "", True, "Jim_AppendString", "(Jim_Interp *,Jim_Obj *,const char *,int)", "", "Argument[*2]", "Argument[*1].Field[**bytes]", "value", "dfc-generated"]
-      - ["", "", True, "Jim_AppendString", "(Jim_Interp *,Jim_Obj *,const char *,int)", "", "Argument[2]", "Argument[*1].Field[**bytes]", "taint", "dfc-generated"]
-      - ["", "", True, "Jim_AppendString", "(Jim_Interp *,Jim_Obj *,const char *,int)", "", "Argument[3]", "Argument[*1].Field[*length]", "taint", "dfc-generated"]
-      - ["", "", True, "Jim_CallSubCmd", "(Jim_Interp *,const jim_subcmd_type *,int,Jim_Obj *const *)", "", "Argument[*3]", "Argument[**3]", "taint", "dfc-generated"]
-      - ["", "", True, "Jim_CheckShowCommands", "(Jim_Interp *,Jim_Obj *,const char *const *)", "", "Argument[**2]", "Argument[*0].Field[**freeList].Field[**bytes]", "taint", "dfc-generated"]
-      - ["", "", True, "Jim_CheckShowCommands", "(Jim_Interp *,Jim_Obj *,const char *const *)", "", "Argument[**2]", "Argument[*0].Field[**liveList].Field[**bytes]", "taint", "dfc-generated"]
-      - ["", "", True, "Jim_CheckShowCommands", "(Jim_Interp *,Jim_Obj *,const char *const *)", "", "Argument[*2]", "Argument[**2]", "value", "dfc-generated"]
-      - ["", "", True, "Jim_CheckShowCommands", "(Jim_Interp *,Jim_Obj *,const char *const *)", "", "Argument[*2]", "Argument[*0].Field[**freeList].Field[**bytes]", "taint", "dfc-generated"]
-      - ["", "", True, "Jim_CheckShowCommands", "(Jim_Interp *,Jim_Obj *,const char *const *)", "", "Argument[*2]", "Argument[*0].Field[**liveList].Field[**bytes]", "taint", "dfc-generated"]
-      - ["", "", True, "Jim_CheckShowCommands", "(Jim_Interp *,Jim_Obj *,const char *const *)", "", "Argument[2]", "Argument[**2]", "taint", "dfc-generated"]
-      - ["", "", True, "Jim_CheckShowCommands", "(Jim_Interp *,Jim_Obj *,const char *const *)", "", "Argument[2]", "Argument[*0].Field[**freeList].Field[**bytes]", "taint", "dfc-generated"]
-      - ["", "", True, "Jim_CheckShowCommands", "(Jim_Interp *,Jim_Obj *,const char *const *)", "", "Argument[2]", "Argument[*0].Field[**liveList].Field[**bytes]", "taint", "dfc-generated"]
-      - ["", "", True, "Jim_CommandMatchObj", "(Jim_Interp *,Jim_Obj *,Jim_Obj *,Jim_Obj *,int)", "", "Argument[*0]", "Argument[*1]", "taint", "df-generated"]
-      - ["", "", True, "Jim_CommandMatchObj", "(Jim_Interp *,Jim_Obj *,Jim_Obj *,Jim_Obj *,int)", "", "Argument[*0]", "Argument[*2]", "taint", "df-generated"]
-      - ["", "", True, "Jim_CommandMatchObj", "(Jim_Interp *,Jim_Obj *,Jim_Obj *,Jim_Obj *,int)", "", "Argument[*0]", "Argument[*3]", "taint", "df-generated"]
-      - ["", "", True, "Jim_CommandMatchObj", "(Jim_Interp *,Jim_Obj *,Jim_Obj *,Jim_Obj *,int)", "", "Argument[*0]", "ReturnValue", "taint", "df-generated"]
-      - ["", "", True, "Jim_CommandMatchObj", "(Jim_Interp *,Jim_Obj *,Jim_Obj *,Jim_Obj *,int)", "", "Argument[*1]", "Argument[*0]", "taint", "df-generated"]
-      - ["", "", True, "Jim_CommandMatchObj", "(Jim_Interp *,Jim_Obj *,Jim_Obj *,Jim_Obj *,int)", "", "Argument[*1]", "Argument[*2]", "value", "df-generated"]
-      - ["", "", True, "Jim_CommandMatchObj", "(Jim_Interp *,Jim_Obj *,Jim_Obj *,Jim_Obj *,int)", "", "Argument[*1]", "Argument[*3]", "value", "df-generated"]
-      - ["", "", True, "Jim_CommandMatchObj", "(Jim_Interp *,Jim_Obj *,Jim_Obj *,Jim_Obj *,int)", "", "Argument[*2]", "Argument[*0]", "taint", "df-generated"]
-      - ["", "", True, "Jim_CommandMatchObj", "(Jim_Interp *,Jim_Obj *,Jim_Obj *,Jim_Obj *,int)", "", "Argument[*2]", "Argument[*1]", "value", "df-generated"]
-      - ["", "", True, "Jim_CommandMatchObj", "(Jim_Interp *,Jim_Obj *,Jim_Obj *,Jim_Obj *,int)", "", "Argument[*2]", "Argument[*3]", "value", "df-generated"]
-      - ["", "", True, "Jim_CommandMatchObj", "(Jim_Interp *,Jim_Obj *,Jim_Obj *,Jim_Obj *,int)", "", "Argument[*3]", "Argument[*0]", "taint", "df-generated"]
-      - ["", "", True, "Jim_CommandMatchObj", "(Jim_Interp *,Jim_Obj *,Jim_Obj *,Jim_Obj *,int)", "", "Argument[*3]", "Argument[*1]", "value", "df-generated"]
-      - ["", "", True, "Jim_CommandMatchObj", "(Jim_Interp *,Jim_Obj *,Jim_Obj *,Jim_Obj *,int)", "", "Argument[*3]", "Argument[*2]", "value", "df-generated"]
-      - ["", "", True, "Jim_CommandMatchObj", "(Jim_Interp *,Jim_Obj *,Jim_Obj *,Jim_Obj *,int)", "", "Argument[1]", "Argument[*0]", "taint", "df-generated"]
-      - ["", "", True, "Jim_CommandMatchObj", "(Jim_Interp *,Jim_Obj *,Jim_Obj *,Jim_Obj *,int)", "", "Argument[1]", "Argument[*1]", "value", "df-generated"]
-      - ["", "", True, "Jim_CommandMatchObj", "(Jim_Interp *,Jim_Obj *,Jim_Obj *,Jim_Obj *,int)", "", "Argument[1]", "Argument[*2]", "value", "df-generated"]
-      - ["", "", True, "Jim_CommandMatchObj", "(Jim_Interp *,Jim_Obj *,Jim_Obj *,Jim_Obj *,int)", "", "Argument[1]", "Argument[*3]", "value", "df-generated"]
-      - ["", "", True, "Jim_CommandMatchObj", "(Jim_Interp *,Jim_Obj *,Jim_Obj *,Jim_Obj *,int)", "", "Argument[2]", "Argument[*0]", "taint", "df-generated"]
-      - ["", "", True, "Jim_CommandMatchObj", "(Jim_Interp *,Jim_Obj *,Jim_Obj *,Jim_Obj *,int)", "", "Argument[2]", "Argument[*1]", "value", "df-generated"]
-      - ["", "", True, "Jim_CommandMatchObj", "(Jim_Interp *,Jim_Obj *,Jim_Obj *,Jim_Obj *,int)", "", "Argument[2]", "Argument[*2]", "value", "df-generated"]
-      - ["", "", True, "Jim_CommandMatchObj", "(Jim_Interp *,Jim_Obj *,Jim_Obj *,Jim_Obj *,int)", "", "Argument[2]", "Argument[*3]", "value", "df-generated"]
-      - ["", "", True, "Jim_CommandMatchObj", "(Jim_Interp *,Jim_Obj *,Jim_Obj *,Jim_Obj *,int)", "", "Argument[3]", "Argument[*0]", "taint", "df-generated"]
-      - ["", "", True, "Jim_CommandMatchObj", "(Jim_Interp *,Jim_Obj *,Jim_Obj *,Jim_Obj *,int)", "", "Argument[3]", "Argument[*1]", "value", "df-generated"]
-      - ["", "", True, "Jim_CommandMatchObj", "(Jim_Interp *,Jim_Obj *,Jim_Obj *,Jim_Obj *,int)", "", "Argument[3]", "Argument[*2]", "value", "df-generated"]
-      - ["", "", True, "Jim_CommandMatchObj", "(Jim_Interp *,Jim_Obj *,Jim_Obj *,Jim_Obj *,int)", "", "Argument[3]", "Argument[*3]", "value", "df-generated"]
-      - ["", "", True, "Jim_CompareStringImmediate", "(Jim_Interp *,Jim_Obj *,const char *)", "", "Argument[*2]", "Argument[*1].Field[*internalRep].Union[**(unnamed class/struct/union)]", "value", "dfc-generated"]
-      - ["", "", True, "Jim_CompareStringImmediate", "(Jim_Interp *,Jim_Obj *,const char *)", "", "Argument[2]", "Argument[*1].Field[*internalRep].Union[*(unnamed class/struct/union)]", "value", "dfc-generated"]
-      - ["", "", True, "Jim_ConcatObj", "(Jim_Interp *,int,Jim_Obj *const *)", "", "Argument[**2].Field[*length]", "ReturnValue[*].Field[*length]", "taint", "dfc-generated"]
-      - ["", "", True, "Jim_ConcatObj", "(Jim_Interp *,int,Jim_Obj *const *)", "", "Argument[*2]", "Argument[**2]", "taint", "dfc-generated"]
-      - ["", "", True, "Jim_ConcatObj", "(Jim_Interp *,int,Jim_Obj *const *)", "", "Argument[1]", "ReturnValue[*].Field[*length]", "taint", "dfc-generated"]
-      - ["", "", True, "Jim_CreateCommand", "(Jim_Interp *,const char *,Jim_CmdProc *,void *,Jim_DelCmdProc *)", "", "Argument[*1]", "Argument[*0].Field[**freeList].Field[**bytes]", "value", "dfc-generated"]
-      - ["", "", True, "Jim_CreateCommand", "(Jim_Interp *,const char *,Jim_CmdProc *,void *,Jim_DelCmdProc *)", "", "Argument[*1]", "Argument[*0].Field[**liveList].Field[**bytes]", "value", "dfc-generated"]
-      - ["", "", True, "Jim_CreateCommand", "(Jim_Interp *,const char *,Jim_CmdProc *,void *,Jim_DelCmdProc *)", "", "Argument[1]", "Argument[*0].Field[**freeList].Field[**bytes]", "taint", "dfc-generated"]
-      - ["", "", True, "Jim_CreateCommand", "(Jim_Interp *,const char *,Jim_CmdProc *,void *,Jim_DelCmdProc *)", "", "Argument[1]", "Argument[*0].Field[**liveList].Field[**bytes]", "taint", "dfc-generated"]
-      - ["", "", True, "Jim_CreateCommandObj", "(Jim_Interp *,Jim_Obj *,Jim_CmdProc *,void *,Jim_DelCmdProc *)", "", "Argument[1]", "Argument[*0].Field[**freeList].Field[*prevObjPtr]", "value", "dfc-generated"]
-      - ["", "", True, "Jim_CreateCommandObj", "(Jim_Interp *,Jim_Obj *,Jim_CmdProc *,void *,Jim_DelCmdProc *)", "", "Argument[1]", "Argument[*0].Field[*freeList]", "value", "dfc-generated"]
-      - ["", "", True, "Jim_DeleteCommand", "(Jim_Interp *,Jim_Obj *)", "", "Argument[1]", "Argument[*0].Field[**freeList].Field[*prevObjPtr]", "value", "dfc-generated"]
-      - ["", "", True, "Jim_DeleteCommand", "(Jim_Interp *,Jim_Obj *)", "", "Argument[1]", "Argument[*0].Field[*freeList]", "value", "dfc-generated"]
-      - ["", "", True, "Jim_DictAddElement", "(Jim_Interp *,Jim_Obj *,Jim_Obj *,Jim_Obj *)", "", "Argument[*0]", "Argument[*1]", "taint", "df-generated"]
-      - ["", "", True, "Jim_DictAddElement", "(Jim_Interp *,Jim_Obj *,Jim_Obj *,Jim_Obj *)", "", "Argument[*2]", "Argument[*0]", "taint", "df-generated"]
-      - ["", "", True, "Jim_DictInfo", "(Jim_Interp *,Jim_Obj *)", "", "Argument[*0]", "Argument[*1]", "taint", "df-generated"]
-      - ["", "", True, "Jim_DictKey", "(Jim_Interp *,Jim_Obj *,Jim_Obj *,Jim_Obj **,int)", "", "Argument[*0]", "Argument[**3]", "taint", "df-generated"]
-      - ["", "", True, "Jim_DictKey", "(Jim_Interp *,Jim_Obj *,Jim_Obj *,Jim_Obj **,int)", "", "Argument[*0]", "Argument[*1]", "taint", "df-generated"]
-      - ["", "", True, "Jim_DictKey", "(Jim_Interp *,Jim_Obj *,Jim_Obj *,Jim_Obj **,int)", "", "Argument[*0]", "Argument[*3]", "taint", "df-generated"]
-      - ["", "", True, "Jim_DictKey", "(Jim_Interp *,Jim_Obj *,Jim_Obj *,Jim_Obj **,int)", "", "Argument[*2]", "Argument[*3]", "taint", "df-generated"]
-      - ["", "", True, "Jim_DictKeysVector", "(Jim_Interp *,Jim_Obj *,Jim_Obj *const *,int,Jim_Obj **,int)", "", "Argument[*1]", "Argument[**4]", "value", "dfc-generated"]
-      - ["", "", True, "Jim_DictKeysVector", "(Jim_Interp *,Jim_Obj *,Jim_Obj *const *,int,Jim_Obj **,int)", "", "Argument[*2]", "Argument[**2]", "taint", "dfc-generated"]
-      - ["", "", True, "Jim_DictKeysVector", "(Jim_Interp *,Jim_Obj *,Jim_Obj *const *,int,Jim_Obj **,int)", "", "Argument[1]", "Argument[*4]", "value", "dfc-generated"]
-      - ["", "", True, "Jim_DictMatchTypes", "(Jim_Interp *,Jim_Obj *,Jim_Obj *,int,int)", "", "Argument[*0]", "Argument[*1]", "taint", "df-generated"]
-      - ["", "", True, "Jim_DictMerge", "(Jim_Interp *,int,Jim_Obj *const *)", "", "Argument[*2]", "Argument[**2]", "taint", "dfc-generated"]
-      - ["", "", True, "Jim_DictPairs", "(Jim_Interp *,Jim_Obj *,int *)", "", "Argument[2]", "Argument[*2]", "taint", "dfc-generated"]
-      - ["", "", True, "Jim_DictSize", "(Jim_Interp *,Jim_Obj *)", "", "Argument[*0]", "Argument[*1]", "taint", "df-generated"]
-      - ["", "", True, "Jim_DuplicateObj", "(Jim_Interp *,Jim_Obj *)", "", "Argument[*0]", "ReturnValue", "taint", "df-generated"]
-      - ["", "", True, "Jim_DuplicateObj", "(Jim_Interp *,Jim_Obj *)", "", "Argument[*0]", "ReturnValue[*]", "taint", "df-generated"]
-      - ["", "", True, "Jim_DuplicateObj", "(Jim_Interp *,Jim_Obj *)", "", "Argument[*1]", "ReturnValue[*]", "taint", "df-generated"]
-      - ["", "", True, "Jim_Eval", "(Jim_Interp *,const char *)", "", "Argument[*0]", "ReturnValue", "taint", "df-generated"]
-      - ["", "", True, "Jim_Eval", "(Jim_Interp *,const char *)", "", "Argument[*1]", "Argument[*0]", "taint", "df-generated"]
-      - ["", "", True, "Jim_Eval", "(Jim_Interp *,const char *)", "", "Argument[1]", "Argument[*0]", "taint", "df-generated"]
-      - ["", "", True, "Jim_EvalExpression", "(Jim_Interp *,Jim_Obj *)", "", "Argument[1]", "Argument[*0].Field[**freeList].Field[*prevObjPtr]", "value", "dfc-generated"]
-      - ["", "", True, "Jim_EvalExpression", "(Jim_Interp *,Jim_Obj *)", "", "Argument[1]", "Argument[*0].Field[*freeList]", "value", "dfc-generated"]
-      - ["", "", True, "Jim_EvalFile", "(Jim_Interp *,const char *)", "", "Argument[*1]", "Argument[*0].Field[**currentFilenameObj].Field[**bytes]", "value", "dfc-generated"]
-      - ["", "", True, "Jim_EvalFile", "(Jim_Interp *,const char *)", "", "Argument[*1]", "Argument[*0].Field[**freeList].Field[**bytes]", "value", "dfc-generated"]
-      - ["", "", True, "Jim_EvalFile", "(Jim_Interp *,const char *)", "", "Argument[1]", "Argument[*0].Field[**currentFilenameObj].Field[**bytes]", "taint", "dfc-generated"]
-      - ["", "", True, "Jim_EvalFile", "(Jim_Interp *,const char *)", "", "Argument[1]", "Argument[*0].Field[**freeList].Field[**bytes]", "taint", "dfc-generated"]
-      - ["", "", True, "Jim_EvalFileGlobal", "(Jim_Interp *,const char *)", "", "Argument[*1]", "Argument[*0].Field[**currentFilenameObj].Field[**bytes]", "value", "dfc-generated"]
-      - ["", "", True, "Jim_EvalFileGlobal", "(Jim_Interp *,const char *)", "", "Argument[*1]", "Argument[*0].Field[**freeList].Field[**bytes]", "value", "dfc-generated"]
-      - ["", "", True, "Jim_EvalFileGlobal", "(Jim_Interp *,const char *)", "", "Argument[1]", "Argument[*0].Field[**currentFilenameObj].Field[**bytes]", "taint", "dfc-generated"]
-      - ["", "", True, "Jim_EvalFileGlobal", "(Jim_Interp *,const char *)", "", "Argument[1]", "Argument[*0].Field[**freeList].Field[**bytes]", "taint", "dfc-generated"]
-      - ["", "", True, "Jim_EvalGlobal", "(Jim_Interp *,const char *)", "", "Argument[*0]", "ReturnValue", "taint", "df-generated"]
-      - ["", "", True, "Jim_EvalGlobal", "(Jim_Interp *,const char *)", "", "Argument[*1]", "Argument[*0]", "taint", "df-generated"]
-      - ["", "", True, "Jim_EvalGlobal", "(Jim_Interp *,const char *)", "", "Argument[1]", "Argument[*0]", "taint", "df-generated"]
-      - ["", "", True, "Jim_EvalObj", "(Jim_Interp *,Jim_Obj *)", "", "Argument[1]", "Argument[*0].Field[**evalFrame].Field[*scriptObj]", "value", "dfc-generated"]
-      - ["", "", True, "Jim_EvalObj", "(Jim_Interp *,Jim_Obj *)", "", "Argument[1]", "Argument[*0].Field[**freeList].Field[*prevObjPtr]", "value", "dfc-generated"]
-      - ["", "", True, "Jim_EvalObj", "(Jim_Interp *,Jim_Obj *)", "", "Argument[1]", "Argument[*0].Field[*freeList]", "value", "dfc-generated"]
-      - ["", "", True, "Jim_EvalObjList", "(Jim_Interp *,Jim_Obj *)", "", "Argument[1]", "Argument[*0].Field[**freeList].Field[*prevObjPtr]", "value", "dfc-generated"]
-      - ["", "", True, "Jim_EvalObjList", "(Jim_Interp *,Jim_Obj *)", "", "Argument[1]", "Argument[*0].Field[*freeList]", "value", "dfc-generated"]
-      - ["", "", True, "Jim_EvalObjPrefix", "(Jim_Interp *,Jim_Obj *,int,Jim_Obj *const *)", "", "Argument[**3]", "Argument[*0]", "taint", "df-generated"]
-      - ["", "", True, "Jim_EvalObjPrefix", "(Jim_Interp *,Jim_Obj *,int,Jim_Obj *const *)", "", "Argument[**3]", "Argument[*1]", "value", "df-generated"]
-      - ["", "", True, "Jim_EvalObjPrefix", "(Jim_Interp *,Jim_Obj *,int,Jim_Obj *const *)", "", "Argument[*0]", "Argument[*1]", "taint", "df-generated"]
-      - ["", "", True, "Jim_EvalObjPrefix", "(Jim_Interp *,Jim_Obj *,int,Jim_Obj *const *)", "", "Argument[*0]", "ReturnValue", "taint", "df-generated"]
-      - ["", "", True, "Jim_EvalObjPrefix", "(Jim_Interp *,Jim_Obj *,int,Jim_Obj *const *)", "", "Argument[*1]", "Argument[*0]", "taint", "df-generated"]
-      - ["", "", True, "Jim_EvalObjPrefix", "(Jim_Interp *,Jim_Obj *,int,Jim_Obj *const *)", "", "Argument[*3]", "Argument[**3]", "value", "df-generated"]
-      - ["", "", True, "Jim_EvalObjPrefix", "(Jim_Interp *,Jim_Obj *,int,Jim_Obj *const *)", "", "Argument[*3]", "Argument[*0]", "taint", "df-generated"]
-      - ["", "", True, "Jim_EvalObjPrefix", "(Jim_Interp *,Jim_Obj *,int,Jim_Obj *const *)", "", "Argument[*3]", "Argument[*1]", "value", "df-generated"]
-      - ["", "", True, "Jim_EvalObjPrefix", "(Jim_Interp *,Jim_Obj *,int,Jim_Obj *const *)", "", "Argument[1]", "Argument[**3]", "value", "df-generated"]
-      - ["", "", True, "Jim_EvalObjPrefix", "(Jim_Interp *,Jim_Obj *,int,Jim_Obj *const *)", "", "Argument[1]", "Argument[*0]", "taint", "df-generated"]
-      - ["", "", True, "Jim_EvalObjPrefix", "(Jim_Interp *,Jim_Obj *,int,Jim_Obj *const *)", "", "Argument[1]", "Argument[*1]", "value", "df-generated"]
-      - ["", "", True, "Jim_EvalObjPrefix", "(Jim_Interp *,Jim_Obj *,int,Jim_Obj *const *)", "", "Argument[2]", "Argument[**3]", "taint", "df-generated"]
-      - ["", "", True, "Jim_EvalObjPrefix", "(Jim_Interp *,Jim_Obj *,int,Jim_Obj *const *)", "", "Argument[2]", "Argument[*0]", "taint", "df-generated"]
-      - ["", "", True, "Jim_EvalObjPrefix", "(Jim_Interp *,Jim_Obj *,int,Jim_Obj *const *)", "", "Argument[2]", "Argument[*1]", "taint", "df-generated"]
-      - ["", "", True, "Jim_EvalObjPrefix", "(Jim_Interp *,Jim_Obj *,int,Jim_Obj *const *)", "", "Argument[3]", "Argument[**3]", "taint", "df-generated"]
-      - ["", "", True, "Jim_EvalObjPrefix", "(Jim_Interp *,Jim_Obj *,int,Jim_Obj *const *)", "", "Argument[3]", "Argument[*0]", "taint", "df-generated"]
-      - ["", "", True, "Jim_EvalObjPrefix", "(Jim_Interp *,Jim_Obj *,int,Jim_Obj *const *)", "", "Argument[3]", "Argument[*1]", "taint", "df-generated"]
-      - ["", "", True, "Jim_EvalObjVector", "(Jim_Interp *,int,Jim_Obj *const *)", "", "Argument[**2]", "Argument[*0]", "taint", "df-generated"]
-      - ["", "", True, "Jim_EvalObjVector", "(Jim_Interp *,int,Jim_Obj *const *)", "", "Argument[*0]", "Argument[**2]", "taint", "df-generated"]
-      - ["", "", True, "Jim_EvalObjVector", "(Jim_Interp *,int,Jim_Obj *const *)", "", "Argument[*0]", "ReturnValue", "taint", "df-generated"]
-      - ["", "", True, "Jim_EvalObjVector", "(Jim_Interp *,int,Jim_Obj *const *)", "", "Argument[*2]", "Argument[**2]", "value", "df-generated"]
-      - ["", "", True, "Jim_EvalObjVector", "(Jim_Interp *,int,Jim_Obj *const *)", "", "Argument[*2]", "Argument[*0]", "taint", "df-generated"]
-      - ["", "", True, "Jim_EvalObjVector", "(Jim_Interp *,int,Jim_Obj *const *)", "", "Argument[1]", "Argument[**2]", "taint", "df-generated"]
-      - ["", "", True, "Jim_EvalObjVector", "(Jim_Interp *,int,Jim_Obj *const *)", "", "Argument[1]", "Argument[*0]", "taint", "df-generated"]
-      - ["", "", True, "Jim_EvalObjVector", "(Jim_Interp *,int,Jim_Obj *const *)", "", "Argument[1]", "Argument[*2]", "taint", "df-generated"]
-      - ["", "", True, "Jim_EvalObjVector", "(Jim_Interp *,int,Jim_Obj *const *)", "", "Argument[2]", "Argument[**2]", "taint", "df-generated"]
-      - ["", "", True, "Jim_EvalObjVector", "(Jim_Interp *,int,Jim_Obj *const *)", "", "Argument[2]", "Argument[*0]", "taint", "df-generated"]
-      - ["", "", True, "Jim_EvalObjVector", "(Jim_Interp *,int,Jim_Obj *const *)", "", "Argument[2]", "Argument[*2]", "taint", "df-generated"]
-      - ["", "", True, "Jim_EvalSource", "(Jim_Interp *,const char *,int,const char *)", "", "Argument[*3]", "Argument[*0].Field[**freeList].Field[**bytes]", "value", "dfc-generated"]
-      - ["", "", True, "Jim_EvalSource", "(Jim_Interp *,const char *,int,const char *)", "", "Argument[3]", "Argument[*0].Field[**freeList].Field[**bytes]", "taint", "dfc-generated"]
-      - ["", "", True, "Jim_FileStoreStatData", "(Jim_Interp *,Jim_Obj *,const jim_stat_t *)", "", "Argument[1]", "Argument[*1]", "taint", "dfc-generated"]
-      - ["", "", True, "Jim_FindHashEntry", "(Jim_HashTable *,const void *)", "", "Argument[*0]", "ReturnValue", "taint", "df-generated"]
-      - ["", "", True, "Jim_FindHashEntry", "(Jim_HashTable *,const void *)", "", "Argument[*0]", "ReturnValue[*]", "taint", "df-generated"]
-      - ["", "", True, "Jim_FormatString", "(Jim_Interp *,Jim_Obj *,int,Jim_Obj *const *)", "", "Argument[*3]", "Argument[**3]", "taint", "dfc-generated"]
-      - ["", "", True, "Jim_FreeObj", "(Jim_Interp *,Jim_Obj *)", "", "Argument[1]", "Argument[*0].Field[**freeList].Field[*prevObjPtr]", "value", "dfc-generated"]
-      - ["", "", True, "Jim_FreeObj", "(Jim_Interp *,Jim_Obj *)", "", "Argument[1]", "Argument[*0].Field[*freeList]", "value", "dfc-generated"]
-      - ["", "", True, "Jim_GenHashFunction", "(const unsigned char *,int)", "", "Argument[*0]", "ReturnValue", "taint", "dfc-generated"]
-      - ["", "", True, "Jim_GenHashFunction", "(const unsigned char *,int)", "", "Argument[0]", "ReturnValue", "taint", "dfc-generated"]
-      - ["", "", True, "Jim_GenHashFunction", "(const unsigned char *,int)", "", "Argument[1]", "ReturnValue", "taint", "dfc-generated"]
-      - ["", "", True, "Jim_GetBoolFromExpr", "(Jim_Interp *,Jim_Obj *,int *)", "", "Argument[*0]", "Argument[*1]", "taint", "df-generated"]
-      - ["", "", True, "Jim_GetBoolFromExpr", "(Jim_Interp *,Jim_Obj *,int *)", "", "Argument[*0]", "ReturnValue", "taint", "df-generated"]
-      - ["", "", True, "Jim_GetBoolFromExpr", "(Jim_Interp *,Jim_Obj *,int *)", "", "Argument[*1]", "Argument[*0]", "taint", "df-generated"]
-      - ["", "", True, "Jim_GetBoolFromExpr", "(Jim_Interp *,Jim_Obj *,int *)", "", "Argument[1]", "Argument[*0]", "taint", "df-generated"]
-      - ["", "", True, "Jim_GetBoolean", "(Jim_Interp *,Jim_Obj *,int *)", "", "Argument[*1].Field[*internalRep].Union[*(unnamed class/struct/union)]", "Argument[*2]", "value", "dfc-generated"]
-      - ["", "", True, "Jim_GetCallFrameByLevel", "(Jim_Interp *,Jim_Obj *)", "", "Argument[*1].Field[**bytes]", "Argument[*1].Field[*internalRep].Union[*(unnamed class/struct/union)]", "taint", "dfc-generated"]
-      - ["", "", True, "Jim_GetCallFrameByLevel", "(Jim_Interp *,Jim_Obj *)", "", "Argument[*1].Field[*bytes]", "Argument[*1].Field[*internalRep].Union[*(unnamed class/struct/union)]", "taint", "dfc-generated"]
-      - ["", "", True, "Jim_GetCommand", "(Jim_Interp *,Jim_Obj *,int)", "", "Argument[1]", "Argument[*0].Field[**freeList].Field[*prevObjPtr]", "value", "dfc-generated"]
-      - ["", "", True, "Jim_GetCommand", "(Jim_Interp *,Jim_Obj *,int)", "", "Argument[1]", "Argument[*0].Field[*freeList]", "value", "dfc-generated"]
-      - ["", "", True, "Jim_GetDouble", "(Jim_Interp *,Jim_Obj *,double *)", "", "Argument[*1]", "Argument[*2]", "taint", "df-generated"]
-      - ["", "", True, "Jim_GetEnum", "(Jim_Interp *,Jim_Obj *,const char *const *,int *,const char *,int)", "", "Argument[**2]", "Argument[*1].Field[*internalRep].Union[**(unnamed class/struct/union)]", "value", "dfc-generated"]
-      - ["", "", True, "Jim_GetEnum", "(Jim_Interp *,Jim_Obj *,const char *const *,int *,const char *,int)", "", "Argument[*2]", "Argument[*1].Field[*internalRep].Union[*(unnamed class/struct/union)]", "value", "dfc-generated"]
-      - ["", "", True, "Jim_GetEnum", "(Jim_Interp *,Jim_Obj *,const char *const *,int *,const char *,int)", "", "Argument[*2]", "Argument[*1].Field[*internalRep].Union[**(unnamed class/struct/union)]", "taint", "dfc-generated"]
-      - ["", "", True, "Jim_GetEnum", "(Jim_Interp *,Jim_Obj *,const char *const *,int *,const char *,int)", "", "Argument[2]", "Argument[*1].Field[*internalRep].Union[*(unnamed class/struct/union)]", "taint", "dfc-generated"]
-      - ["", "", True, "Jim_GetEnum", "(Jim_Interp *,Jim_Obj *,const char *const *,int *,const char *,int)", "", "Argument[2]", "Argument[*1].Field[*internalRep].Union[**(unnamed class/struct/union)]", "taint", "dfc-generated"]
-      - ["", "", True, "Jim_GetExitCode", "(Jim_Interp *)", "", "Argument[*0].Field[*exitCode]", "ReturnValue", "value", "dfc-generated"]
-      - ["", "", True, "Jim_GetGlobalVariable", "(Jim_Interp *,Jim_Obj *,int)", "", "Argument[*1]", "ReturnValue[*]", "value", "df-generated"]
-      - ["", "", True, "Jim_GetGlobalVariable", "(Jim_Interp *,Jim_Obj *,int)", "", "Argument[1]", "ReturnValue", "value", "dfc-generated"]
-      - ["", "", True, "Jim_GetGlobalVariableStr", "(Jim_Interp *,const char *,int)", "", "Argument[*0]", "ReturnValue", "taint", "df-generated"]
-      - ["", "", True, "Jim_GetGlobalVariableStr", "(Jim_Interp *,const char *,int)", "", "Argument[*0]", "ReturnValue[*]", "taint", "df-generated"]
-      - ["", "", True, "Jim_GetGlobalVariableStr", "(Jim_Interp *,const char *,int)", "", "Argument[*1]", "Argument[*0]", "taint", "df-generated"]
-      - ["", "", True, "Jim_GetGlobalVariableStr", "(Jim_Interp *,const char *,int)", "", "Argument[*1]", "ReturnValue", "taint", "df-generated"]
-      - ["", "", True, "Jim_GetGlobalVariableStr", "(Jim_Interp *,const char *,int)", "", "Argument[*1]", "ReturnValue[*]", "taint", "df-generated"]
-      - ["", "", True, "Jim_GetGlobalVariableStr", "(Jim_Interp *,const char *,int)", "", "Argument[1]", "Argument[*0]", "taint", "df-generated"]
-      - ["", "", True, "Jim_GetGlobalVariableStr", "(Jim_Interp *,const char *,int)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
-      - ["", "", True, "Jim_GetGlobalVariableStr", "(Jim_Interp *,const char *,int)", "", "Argument[1]", "ReturnValue[*]", "taint", "df-generated"]
-      - ["", "", True, "Jim_GetHashTableIterator", "(Jim_HashTable *)", "", "Argument[*0]", "ReturnValue[*].Field[**ht]", "value", "dfc-generated"]
-      - ["", "", True, "Jim_GetHashTableIterator", "(Jim_HashTable *)", "", "Argument[0]", "ReturnValue[*].Field[*ht]", "value", "dfc-generated"]
-      - ["", "", True, "Jim_GetIndex", "(Jim_Interp *,Jim_Obj *,int *)", "", "Argument[*0]", "Argument[*1]", "taint", "df-generated"]
-      - ["", "", True, "Jim_GetIndex", "(Jim_Interp *,Jim_Obj *,int *)", "", "Argument[*0]", "Argument[*2]", "taint", "df-generated"]
-      - ["", "", True, "Jim_GetIndex", "(Jim_Interp *,Jim_Obj *,int *)", "", "Argument[*1]", "Argument[*0]", "taint", "df-generated"]
-      - ["", "", True, "Jim_GetIndex", "(Jim_Interp *,Jim_Obj *,int *)", "", "Argument[*1]", "Argument[*2]", "taint", "df-generated"]
-      - ["", "", True, "Jim_GetIndex", "(Jim_Interp *,Jim_Obj *,int *)", "", "Argument[1]", "Argument[*0]", "taint", "df-generated"]
-      - ["", "", True, "Jim_GetLong", "(Jim_Interp *,Jim_Obj *,long *)", "", "Argument[*1]", "Argument[*2]", "taint", "df-generated"]
-      - ["", "", True, "Jim_GetReturnCode", "(Jim_Interp *,Jim_Obj *,int *)", "", "Argument[*1]", "Argument[*2]", "taint", "df-generated"]
-      - ["", "", True, "Jim_GetSourceInfo", "(Jim_Interp *,Jim_Obj *,int *)", "", "Argument[*0]", "Argument[*1]", "taint", "df-generated"]
-      - ["", "", True, "Jim_GetSourceInfo", "(Jim_Interp *,Jim_Obj *,int *)", "", "Argument[*0]", "ReturnValue", "taint", "df-generated"]
-      - ["", "", True, "Jim_GetSourceInfo", "(Jim_Interp *,Jim_Obj *,int *)", "", "Argument[*0]", "ReturnValue[*]", "taint", "df-generated"]
-      - ["", "", True, "Jim_GetString", "(Jim_Obj *,int *)", "", "Argument[*0]", "Argument[*1]", "taint", "df-generated"]
-      - ["", "", True, "Jim_GetString", "(Jim_Obj *,int *)", "", "Argument[*0]", "ReturnValue", "taint", "df-generated"]
-      - ["", "", True, "Jim_GetString", "(Jim_Obj *,int *)", "", "Argument[*0]", "ReturnValue[*]", "taint", "df-generated"]
-      - ["", "", True, "Jim_GetVariable", "(Jim_Interp *,Jim_Obj *,int)", "", "Argument[*1]", "ReturnValue[*]", "value", "df-generated"]
-      - ["", "", True, "Jim_GetVariable", "(Jim_Interp *,Jim_Obj *,int)", "", "Argument[1]", "ReturnValue", "value", "dfc-generated"]
-      - ["", "", True, "Jim_GetVariableStr", "(Jim_Interp *,const char *,int)", "", "Argument[*0]", "ReturnValue", "taint", "df-generated"]
-      - ["", "", True, "Jim_GetVariableStr", "(Jim_Interp *,const char *,int)", "", "Argument[*0]", "ReturnValue[*]", "taint", "df-generated"]
-      - ["", "", True, "Jim_GetVariableStr", "(Jim_Interp *,const char *,int)", "", "Argument[*1]", "Argument[*0]", "taint", "df-generated"]
-      - ["", "", True, "Jim_GetVariableStr", "(Jim_Interp *,const char *,int)", "", "Argument[*1]", "ReturnValue", "taint", "df-generated"]
-      - ["", "", True, "Jim_GetVariableStr", "(Jim_Interp *,const char *,int)", "", "Argument[*1]", "ReturnValue[*]", "taint", "df-generated"]
-      - ["", "", True, "Jim_GetVariableStr", "(Jim_Interp *,const char *,int)", "", "Argument[1]", "Argument[*0]", "taint", "df-generated"]
-      - ["", "", True, "Jim_GetVariableStr", "(Jim_Interp *,const char *,int)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
-      - ["", "", True, "Jim_GetVariableStr", "(Jim_Interp *,const char *,int)", "", "Argument[1]", "ReturnValue[*]", "taint", "df-generated"]
-      - ["", "", True, "Jim_GetWide", "(Jim_Interp *,Jim_Obj *,long *)", "", "Argument[*1]", "Argument[*2]", "taint", "df-generated"]
-      - ["", "", True, "Jim_GetWideExpr", "(Jim_Interp *,Jim_Obj *,long *)", "", "Argument[*0]", "Argument[*1]", "taint", "df-generated"]
-      - ["", "", True, "Jim_GetWideExpr", "(Jim_Interp *,Jim_Obj *,long *)", "", "Argument[*0]", "Argument[*2]", "taint", "df-generated"]
-      - ["", "", True, "Jim_GetWideExpr", "(Jim_Interp *,Jim_Obj *,long *)", "", "Argument[*0]", "ReturnValue", "taint", "df-generated"]
-      - ["", "", True, "Jim_GetWideExpr", "(Jim_Interp *,Jim_Obj *,long *)", "", "Argument[*1]", "Argument[*0]", "taint", "df-generated"]
-      - ["", "", True, "Jim_GetWideExpr", "(Jim_Interp *,Jim_Obj *,long *)", "", "Argument[*1]", "Argument[*2]", "taint", "df-generated"]
-      - ["", "", True, "Jim_GetWideExpr", "(Jim_Interp *,Jim_Obj *,long *)", "", "Argument[1]", "Argument[*0]", "taint", "df-generated"]
-      - ["", "", True, "Jim_InitHashTable", "(Jim_HashTable *,const Jim_HashTableType *,void *)", "", "Argument[**2]", "Argument[*0].Field[***privdata]", "value", "dfc-generated"]
-      - ["", "", True, "Jim_InitHashTable", "(Jim_HashTable *,const Jim_HashTableType *,void *)", "", "Argument[*1]", "Argument[*0].Field[**type]", "value", "dfc-generated"]
-      - ["", "", True, "Jim_InitHashTable", "(Jim_HashTable *,const Jim_HashTableType *,void *)", "", "Argument[*2]", "Argument[*0].Field[**privdata]", "value", "dfc-generated"]
-      - ["", "", True, "Jim_InitHashTable", "(Jim_HashTable *,const Jim_HashTableType *,void *)", "", "Argument[1]", "Argument[*0].Field[*type]", "value", "dfc-generated"]
-      - ["", "", True, "Jim_InitHashTable", "(Jim_HashTable *,const Jim_HashTableType *,void *)", "", "Argument[2]", "Argument[*0].Field[*privdata]", "value", "dfc-generated"]
-      - ["", "", True, "Jim_IntHashFunction", "(unsigned int)", "", "Argument[0]", "ReturnValue", "taint", "dfc-generated"]
-      - ["", "", True, "Jim_InteractivePrompt", "(Jim_Interp *)", "", "Argument[*0]", "ReturnValue", "taint", "df-generated"]
-      - ["", "", True, "Jim_Length", "(Jim_Obj *)", "", "Argument[*0].Field[*length]", "ReturnValue", "value", "dfc-generated"]
-      - ["", "", True, "Jim_ListAppendElement", "(Jim_Interp *,Jim_Obj *,Jim_Obj *)", "", "Argument[*0]", "Argument[*1]", "taint", "df-generated"]
-      - ["", "", True, "Jim_ListAppendElement", "(Jim_Interp *,Jim_Obj *,Jim_Obj *)", "", "Argument[2]", "Argument[*2]", "taint", "df-generated"]
-      - ["", "", True, "Jim_ListAppendList", "(Jim_Interp *,Jim_Obj *,Jim_Obj *)", "", "Argument[*0]", "Argument[*1]", "taint", "df-generated"]
-      - ["", "", True, "Jim_ListAppendList", "(Jim_Interp *,Jim_Obj *,Jim_Obj *)", "", "Argument[*0]", "Argument[*2]", "taint", "df-generated"]
-      - ["", "", True, "Jim_ListGetIndex", "(Jim_Interp *,Jim_Obj *,int)", "", "Argument[2]", "ReturnValue", "taint", "dfc-generated"]
-      - ["", "", True, "Jim_ListIndex", "(Jim_Interp *,Jim_Obj *,int,Jim_Obj **,int)", "", "Argument[2]", "Argument[*3]", "taint", "dfc-generated"]
-      - ["", "", True, "Jim_ListIndex", "(Jim_Interp *,Jim_Obj *,int,Jim_Obj **,int)", "", "Argument[3]", "Argument[*3]", "taint", "dfc-generated"]
-      - ["", "", True, "Jim_ListInsertElements", "(Jim_Interp *,Jim_Obj *,int,int,Jim_Obj *const *)", "", "Argument[*0]", "Argument[*1]", "taint", "df-generated"]
-      - ["", "", True, "Jim_ListInsertElements", "(Jim_Interp *,Jim_Obj *,int,int,Jim_Obj *const *)", "", "Argument[*4]", "Argument[**4]", "taint", "df-generated"]
-      - ["", "", True, "Jim_ListInsertElements", "(Jim_Interp *,Jim_Obj *,int,int,Jim_Obj *const *)", "", "Argument[2]", "Argument[**4]", "taint", "df-generated"]
-      - ["", "", True, "Jim_ListInsertElements", "(Jim_Interp *,Jim_Obj *,int,int,Jim_Obj *const *)", "", "Argument[3]", "Argument[**4]", "taint", "df-generated"]
-      - ["", "", True, "Jim_ListInsertElements", "(Jim_Interp *,Jim_Obj *,int,int,Jim_Obj *const *)", "", "Argument[4]", "Argument[**4]", "taint", "df-generated"]
-      - ["", "", True, "Jim_ListJoin", "(Jim_Interp *,Jim_Obj *,const char *,int)", "", "Argument[*2]", "ReturnValue[*].Field[**bytes]", "value", "dfc-generated"]
-      - ["", "", True, "Jim_ListJoin", "(Jim_Interp *,Jim_Obj *,const char *,int)", "", "Argument[2]", "ReturnValue[*].Field[**bytes]", "taint", "dfc-generated"]
-      - ["", "", True, "Jim_ListJoin", "(Jim_Interp *,Jim_Obj *,const char *,int)", "", "Argument[3]", "ReturnValue[*].Field[*length]", "taint", "dfc-generated"]
-      - ["", "", True, "Jim_ListLength", "(Jim_Interp *,Jim_Obj *)", "", "Argument[*0]", "Argument[*1]", "taint", "df-generated"]
-      - ["", "", True, "Jim_ListRange", "(Jim_Interp *,Jim_Obj *,Jim_Obj *,Jim_Obj *)", "", "Argument[*1]", "ReturnValue[*]", "value", "dfc-generated"]
-      - ["", "", True, "Jim_ListRange", "(Jim_Interp *,Jim_Obj *,Jim_Obj *,Jim_Obj *)", "", "Argument[1]", "ReturnValue", "value", "dfc-generated"]
-      - ["", "", True, "Jim_ListSetIndex", "(Jim_Interp *,Jim_Obj *,Jim_Obj *const *,int,Jim_Obj *)", "", "Argument[1]", "Argument[*0].Field[**freeList].Field[*prevObjPtr]", "value", "dfc-generated"]
-      - ["", "", True, "Jim_ListSetIndex", "(Jim_Interp *,Jim_Obj *,Jim_Obj *const *,int,Jim_Obj *)", "", "Argument[1]", "Argument[*0].Field[*freeList]", "value", "dfc-generated"]
-      - ["", "", True, "Jim_ListSetIndex", "(Jim_Interp *,Jim_Obj *,Jim_Obj *const *,int,Jim_Obj *)", "", "Argument[1]", "Argument[*0].Field[*result]", "value", "dfc-generated"]
-      - ["", "", True, "Jim_MakeGlobalNamespaceName", "(Jim_Interp *,Jim_Obj *)", "", "Argument[*1]", "ReturnValue[*]", "value", "dfc-generated"]
-      - ["", "", True, "Jim_MakeGlobalNamespaceName", "(Jim_Interp *,Jim_Obj *)", "", "Argument[1]", "ReturnValue", "value", "dfc-generated"]
-      - ["", "", True, "Jim_MakeTempFile", "(Jim_Interp *,const char *,int)", "", "Argument[*1]", "Argument[*0].Field[**freeList].Field[**bytes]", "value", "dfc-generated"]
-      - ["", "", True, "Jim_MakeTempFile", "(Jim_Interp *,const char *,int)", "", "Argument[*1]", "Argument[*0].Field[**result].Field[**bytes]", "value", "dfc-generated"]
-      - ["", "", True, "Jim_MakeTempFile", "(Jim_Interp *,const char *,int)", "", "Argument[1]", "Argument[*0].Field[**freeList].Field[**bytes]", "taint", "dfc-generated"]
-      - ["", "", True, "Jim_MakeTempFile", "(Jim_Interp *,const char *,int)", "", "Argument[1]", "Argument[*0].Field[**result].Field[**bytes]", "taint", "dfc-generated"]
-      - ["", "", True, "Jim_NewDictObj", "(Jim_Interp *,Jim_Obj *const *,int)", "", "Argument[*1]", "Argument[**1]", "taint", "dfc-generated"]
-      - ["", "", True, "Jim_NewDoubleObj", "(Jim_Interp *,double)", "", "Argument[1]", "ReturnValue[*].Field[*internalRep].Union[*(unnamed class/struct/union)]", "value", "dfc-generated"]
-      - ["", "", True, "Jim_NewIntObj", "(Jim_Interp *,long)", "", "Argument[1]", "ReturnValue[*].Field[*internalRep].Union[*(unnamed class/struct/union)]", "value", "dfc-generated"]
-      - ["", "", True, "Jim_NewListObj", "(Jim_Interp *,Jim_Obj *const *,int)", "", "Argument[*0]", "ReturnValue", "taint", "df-generated"]
-      - ["", "", True, "Jim_NewListObj", "(Jim_Interp *,Jim_Obj *const *,int)", "", "Argument[*0]", "ReturnValue[*]", "taint", "df-generated"]
-      - ["", "", True, "Jim_NewListObj", "(Jim_Interp *,Jim_Obj *const *,int)", "", "Argument[*1]", "Argument[**1]", "taint", "df-generated"]
-      - ["", "", True, "Jim_NewListObj", "(Jim_Interp *,Jim_Obj *const *,int)", "", "Argument[1]", "Argument[**1]", "taint", "df-generated"]
-      - ["", "", True, "Jim_NewListObj", "(Jim_Interp *,Jim_Obj *const *,int)", "", "Argument[2]", "Argument[**1]", "taint", "df-generated"]
-      - ["", "", True, "Jim_NewObj", "(Jim_Interp *)", "", "Argument[*0]", "ReturnValue", "taint", "df-generated"]
-      - ["", "", True, "Jim_NewObj", "(Jim_Interp *)", "", "Argument[*0]", "ReturnValue[*]", "taint", "df-generated"]
-      - ["", "", True, "Jim_NewStringObj", "(Jim_Interp *,const char *,int)", "", "Argument[*1]", "ReturnValue[*].Field[**bytes]", "value", "dfc-generated"]
-      - ["", "", True, "Jim_NewStringObj", "(Jim_Interp *,const char *,int)", "", "Argument[1]", "ReturnValue[*].Field[**bytes]", "taint", "dfc-generated"]
-      - ["", "", True, "Jim_NewStringObj", "(Jim_Interp *,const char *,int)", "", "Argument[2]", "ReturnValue[*].Field[*length]", "value", "dfc-generated"]
-      - ["", "", True, "Jim_NewStringObjNoAlloc", "(Jim_Interp *,char *,int)", "", "Argument[*1]", "ReturnValue[*].Field[**bytes]", "value", "dfc-generated"]
-      - ["", "", True, "Jim_NewStringObjNoAlloc", "(Jim_Interp *,char *,int)", "", "Argument[1]", "ReturnValue[*].Field[*bytes]", "value", "dfc-generated"]
-      - ["", "", True, "Jim_NewStringObjNoAlloc", "(Jim_Interp *,char *,int)", "", "Argument[2]", "ReturnValue[*].Field[*length]", "value", "dfc-generated"]
-      - ["", "", True, "Jim_NewStringObjUtf8", "(Jim_Interp *,const char *,int)", "", "Argument[*1]", "ReturnValue[*].Field[**bytes]", "value", "dfc-generated"]
-      - ["", "", True, "Jim_NewStringObjUtf8", "(Jim_Interp *,const char *,int)", "", "Argument[1]", "ReturnValue[*].Field[**bytes]", "taint", "dfc-generated"]
-      - ["", "", True, "Jim_NewStringObjUtf8", "(Jim_Interp *,const char *,int)", "", "Argument[2]", "ReturnValue[*].Field[*length]", "value", "dfc-generated"]
-      - ["", "", True, "Jim_NextHashEntry", "(Jim_HashTableIterator *)", "", "Argument[*0]", "ReturnValue", "taint", "df-generated"]
-      - ["", "", True, "Jim_NextHashEntry", "(Jim_HashTableIterator *)", "", "Argument[*0]", "ReturnValue[*]", "taint", "df-generated"]
-      - ["", "", True, "Jim_ParseSubCmd", "(Jim_Interp *,const jim_subcmd_type *,int,Jim_Obj *const *)", "", "Argument[*1]", "ReturnValue[*]", "value", "df-generated"]
-      - ["", "", True, "Jim_ParseSubCmd", "(Jim_Interp *,const jim_subcmd_type *,int,Jim_Obj *const *)", "", "Argument[*3]", "Argument[**3]", "taint", "dfc-generated"]
-      - ["", "", True, "Jim_ParseSubCmd", "(Jim_Interp *,const jim_subcmd_type *,int,Jim_Obj *const *)", "", "Argument[1]", "Argument[*1]", "taint", "dfc-generated"]
-      - ["", "", True, "Jim_ParseSubCmd", "(Jim_Interp *,const jim_subcmd_type *,int,Jim_Obj *const *)", "", "Argument[1]", "ReturnValue", "value", "dfc-generated"]
-      - ["", "", True, "Jim_ParseSubCmd", "(Jim_Interp *,const jim_subcmd_type *,int,Jim_Obj *const *)", "", "Argument[1]", "ReturnValue[*]", "taint", "dfc-generated"]
-      - ["", "", True, "Jim_ReaddirCmd", "(Jim_Interp *,int,Jim_Obj *const *)", "", "Argument[*2]", "Argument[**2]", "taint", "dfc-generated"]
-      - ["", "", True, "Jim_RegexpCmd", "(Jim_Interp *,int,Jim_Obj *const *)", "", "Argument[**2]", "Argument[*0]", "taint", "df-generated"]
-      - ["", "", True, "Jim_RegexpCmd", "(Jim_Interp *,int,Jim_Obj *const *)", "", "Argument[*0]", "Argument[**2]", "taint", "df-generated"]
-      - ["", "", True, "Jim_RegexpCmd", "(Jim_Interp *,int,Jim_Obj *const *)", "", "Argument[*2]", "Argument[**2]", "taint", "df-generated"]
-      - ["", "", True, "Jim_RegexpCmd", "(Jim_Interp *,int,Jim_Obj *const *)", "", "Argument[*2]", "Argument[*0]", "taint", "df-generated"]
-      - ["", "", True, "Jim_RegexpCmd", "(Jim_Interp *,int,Jim_Obj *const *)", "", "Argument[2]", "Argument[**2]", "taint", "df-generated"]
-      - ["", "", True, "Jim_RegexpCmd", "(Jim_Interp *,int,Jim_Obj *const *)", "", "Argument[2]", "Argument[*0]", "taint", "df-generated"]
-      - ["", "", True, "Jim_RegsubCmd", "(Jim_Interp *,int,Jim_Obj *const *)", "", "Argument[**2]", "Argument[*0]", "taint", "df-generated"]
-      - ["", "", True, "Jim_RegsubCmd", "(Jim_Interp *,int,Jim_Obj *const *)", "", "Argument[*0]", "Argument[**2]", "taint", "df-generated"]
-      - ["", "", True, "Jim_RegsubCmd", "(Jim_Interp *,int,Jim_Obj *const *)", "", "Argument[*0]", "ReturnValue", "taint", "df-generated"]
-      - ["", "", True, "Jim_RegsubCmd", "(Jim_Interp *,int,Jim_Obj *const *)", "", "Argument[*2]", "Argument[**2]", "taint", "df-generated"]
-      - ["", "", True, "Jim_RegsubCmd", "(Jim_Interp *,int,Jim_Obj *const *)", "", "Argument[*2]", "Argument[*0]", "taint", "df-generated"]
-      - ["", "", True, "Jim_RegsubCmd", "(Jim_Interp *,int,Jim_Obj *const *)", "", "Argument[2]", "Argument[**2]", "taint", "df-generated"]
-      - ["", "", True, "Jim_RegsubCmd", "(Jim_Interp *,int,Jim_Obj *const *)", "", "Argument[2]", "Argument[*0]", "taint", "df-generated"]
-      - ["", "", True, "Jim_RenameCommand", "(Jim_Interp *,Jim_Obj *,Jim_Obj *)", "", "Argument[2]", "Argument[*0].Field[**freeList].Field[*prevObjPtr]", "value", "dfc-generated"]
-      - ["", "", True, "Jim_RenameCommand", "(Jim_Interp *,Jim_Obj *,Jim_Obj *)", "", "Argument[2]", "Argument[*0].Field[*freeList]", "value", "dfc-generated"]
-      - ["", "", True, "Jim_ReturnCode", "(int)", "", "Argument[0]", "ReturnValue", "taint", "dfc-generated"]
-      - ["", "", True, "Jim_ScanString", "(Jim_Interp *,Jim_Obj *,Jim_Obj *,int)", "", "Argument[*0]", "ReturnValue", "taint", "df-generated"]
-      - ["", "", True, "Jim_ScanString", "(Jim_Interp *,Jim_Obj *,Jim_Obj *,int)", "", "Argument[*0]", "ReturnValue[*]", "taint", "df-generated"]
-      - ["", "", True, "Jim_ScanString", "(Jim_Interp *,Jim_Obj *,Jim_Obj *,int)", "", "Argument[*1]", "Argument[*0]", "taint", "df-generated"]
-      - ["", "", True, "Jim_ScriptIsComplete", "(Jim_Interp *,Jim_Obj *,char *)", "", "Argument[*0]", "Argument[*1]", "taint", "df-generated"]
-      - ["", "", True, "Jim_SetDictKeysVector", "(Jim_Interp *,Jim_Obj *,Jim_Obj *const *,int,Jim_Obj *,int)", "", "Argument[*2]", "Argument[**2]", "taint", "dfc-generated"]
-      - ["", "", True, "Jim_SetDictKeysVector", "(Jim_Interp *,Jim_Obj *,Jim_Obj *const *,int,Jim_Obj *,int)", "", "Argument[1]", "Argument[*0].Field[**freeList].Field[*prevObjPtr]", "value", "dfc-generated"]
-      - ["", "", True, "Jim_SetDictKeysVector", "(Jim_Interp *,Jim_Obj *,Jim_Obj *const *,int,Jim_Obj *,int)", "", "Argument[1]", "Argument[*0].Field[*freeList]", "value", "dfc-generated"]
-      - ["", "", True, "Jim_SetDictKeysVector", "(Jim_Interp *,Jim_Obj *,Jim_Obj *const *,int,Jim_Obj *,int)", "", "Argument[1]", "Argument[*0].Field[*result]", "value", "dfc-generated"]
-      - ["", "", True, "Jim_SetGlobalVariableStr", "(Jim_Interp *,const char *,Jim_Obj *)", "", "Argument[*1]", "Argument[*0].Field[**freeList].Field[**bytes]", "value", "dfc-generated"]
-      - ["", "", True, "Jim_SetGlobalVariableStr", "(Jim_Interp *,const char *,Jim_Obj *)", "", "Argument[*1]", "Argument[*0].Field[**liveList].Field[**bytes]", "value", "dfc-generated"]
-      - ["", "", True, "Jim_SetGlobalVariableStr", "(Jim_Interp *,const char *,Jim_Obj *)", "", "Argument[*1]", "Argument[*0].Field[**result].Field[**bytes]", "value", "dfc-generated"]
-      - ["", "", True, "Jim_SetGlobalVariableStr", "(Jim_Interp *,const char *,Jim_Obj *)", "", "Argument[1]", "Argument[*0].Field[**freeList].Field[**bytes]", "taint", "dfc-generated"]
-      - ["", "", True, "Jim_SetGlobalVariableStr", "(Jim_Interp *,const char *,Jim_Obj *)", "", "Argument[1]", "Argument[*0].Field[**liveList].Field[**bytes]", "taint", "dfc-generated"]
-      - ["", "", True, "Jim_SetGlobalVariableStr", "(Jim_Interp *,const char *,Jim_Obj *)", "", "Argument[1]", "Argument[*0].Field[**result].Field[**bytes]", "taint", "dfc-generated"]
-      - ["", "", True, "Jim_SetResultFormatted", "(Jim_Interp *,const char *,...)", "", "Argument[*1]", "Argument[*0].Field[**result].Field[**bytes]", "taint", "dfc-generated"]
-      - ["", "", True, "Jim_SetResultFormatted", "(Jim_Interp *,const char *,...)", "", "Argument[1]", "Argument[*0].Field[**result].Field[**bytes]", "taint", "dfc-generated"]
-      - ["", "", True, "Jim_SetVariable", "(Jim_Interp *,Jim_Obj *,Jim_Obj *)", "", "Argument[*1]", "Argument[*0]", "taint", "df-generated"]
-      - ["", "", True, "Jim_SetVariableLink", "(Jim_Interp *,Jim_Obj *,Jim_Obj *,Jim_CallFrame *)", "", "Argument[2]", "Argument[*0].Field[**freeList].Field[*prevObjPtr]", "value", "dfc-generated"]
-      - ["", "", True, "Jim_SetVariableLink", "(Jim_Interp *,Jim_Obj *,Jim_Obj *,Jim_CallFrame *)", "", "Argument[2]", "Argument[*0].Field[*freeList]", "value", "dfc-generated"]
-      - ["", "", True, "Jim_SetVariableStr", "(Jim_Interp *,const char *,Jim_Obj *)", "", "Argument[*1]", "Argument[*0].Field[**freeList].Field[**bytes]", "value", "dfc-generated"]
-      - ["", "", True, "Jim_SetVariableStr", "(Jim_Interp *,const char *,Jim_Obj *)", "", "Argument[*1]", "Argument[*0].Field[**liveList].Field[**bytes]", "value", "dfc-generated"]
-      - ["", "", True, "Jim_SetVariableStr", "(Jim_Interp *,const char *,Jim_Obj *)", "", "Argument[*1]", "Argument[*0].Field[**result].Field[**bytes]", "value", "dfc-generated"]
-      - ["", "", True, "Jim_SetVariableStr", "(Jim_Interp *,const char *,Jim_Obj *)", "", "Argument[1]", "Argument[*0].Field[**freeList].Field[**bytes]", "taint", "dfc-generated"]
-      - ["", "", True, "Jim_SetVariableStr", "(Jim_Interp *,const char *,Jim_Obj *)", "", "Argument[1]", "Argument[*0].Field[**liveList].Field[**bytes]", "taint", "dfc-generated"]
-      - ["", "", True, "Jim_SetVariableStr", "(Jim_Interp *,const char *,Jim_Obj *)", "", "Argument[1]", "Argument[*0].Field[**result].Field[**bytes]", "taint", "dfc-generated"]
-      - ["", "", True, "Jim_SetVariableStrWithStr", "(Jim_Interp *,const char *,const char *)", "", "Argument[*1]", "Argument[*0].Field[**freeList].Field[**bytes]", "value", "dfc-generated"]
-      - ["", "", True, "Jim_SetVariableStrWithStr", "(Jim_Interp *,const char *,const char *)", "", "Argument[*1]", "Argument[*0].Field[**liveList].Field[**bytes]", "value", "dfc-generated"]
-      - ["", "", True, "Jim_SetVariableStrWithStr", "(Jim_Interp *,const char *,const char *)", "", "Argument[*1]", "Argument[*0].Field[**result].Field[**bytes]", "value", "dfc-generated"]
-      - ["", "", True, "Jim_SetVariableStrWithStr", "(Jim_Interp *,const char *,const char *)", "", "Argument[*2]", "Argument[*0].Field[**freeList].Field[**bytes]", "value", "dfc-generated"]
-      - ["", "", True, "Jim_SetVariableStrWithStr", "(Jim_Interp *,const char *,const char *)", "", "Argument[1]", "Argument[*0].Field[**freeList].Field[**bytes]", "taint", "dfc-generated"]
-      - ["", "", True, "Jim_SetVariableStrWithStr", "(Jim_Interp *,const char *,const char *)", "", "Argument[1]", "Argument[*0].Field[**liveList].Field[**bytes]", "taint", "dfc-generated"]
-      - ["", "", True, "Jim_SetVariableStrWithStr", "(Jim_Interp *,const char *,const char *)", "", "Argument[1]", "Argument[*0].Field[**result].Field[**bytes]", "taint", "dfc-generated"]
-      - ["", "", True, "Jim_SetVariableStrWithStr", "(Jim_Interp *,const char *,const char *)", "", "Argument[2]", "Argument[*0].Field[**freeList].Field[**bytes]", "taint", "dfc-generated"]
-      - ["", "", True, "Jim_SignalId", "(int)", "", "Argument[0]", "ReturnValue[*]", "taint", "dfc-generated"]
-      - ["", "", True, "Jim_StackLen", "(Jim_Stack *)", "", "Argument[*0].Field[*len]", "ReturnValue", "value", "dfc-generated"]
-      - ["", "", True, "Jim_StackPeek", "(Jim_Stack *)", "", "Argument[*0]", "ReturnValue", "taint", "df-generated"]
-      - ["", "", True, "Jim_StackPeek", "(Jim_Stack *)", "", "Argument[*0]", "ReturnValue[**]", "taint", "df-generated"]
-      - ["", "", True, "Jim_StackPeek", "(Jim_Stack *)", "", "Argument[*0]", "ReturnValue[*]", "taint", "df-generated"]
-      - ["", "", True, "Jim_StackPop", "(Jim_Stack *)", "", "Argument[*0]", "ReturnValue", "taint", "df-generated"]
-      - ["", "", True, "Jim_StackPop", "(Jim_Stack *)", "", "Argument[*0]", "ReturnValue[**]", "taint", "df-generated"]
-      - ["", "", True, "Jim_StackPop", "(Jim_Stack *)", "", "Argument[*0]", "ReturnValue[*]", "taint", "df-generated"]
-      - ["", "", True, "Jim_StackPush", "(Jim_Stack *,void *)", "", "Argument[*1]", "Argument[*0].Field[***vector]", "value", "dfc-generated"]
-      - ["", "", True, "Jim_StackPush", "(Jim_Stack *,void *)", "", "Argument[1]", "Argument[*0].Field[**vector]", "value", "dfc-generated"]
-      - ["", "", True, "Jim_StrDup", "(const char *)", "", "Argument[*0]", "ReturnValue[*]", "value", "dfc-generated"]
-      - ["", "", True, "Jim_StrDup", "(const char *)", "", "Argument[0]", "ReturnValue[*]", "taint", "dfc-generated"]
-      - ["", "", True, "Jim_StrDupLen", "(const char *,int)", "", "Argument[*0]", "ReturnValue[*]", "value", "dfc-generated"]
-      - ["", "", True, "Jim_StrDupLen", "(const char *,int)", "", "Argument[0]", "ReturnValue[*]", "taint", "dfc-generated"]
-      - ["", "", True, "Jim_String", "(Jim_Obj *)", "", "Argument[*0].Field[**bytes]", "ReturnValue[*]", "value", "dfc-generated"]
-      - ["", "", True, "Jim_String", "(Jim_Obj *)", "", "Argument[*0].Field[*bytes]", "ReturnValue", "value", "dfc-generated"]
-      - ["", "", True, "Jim_StringByteRangeObj", "(Jim_Interp *,Jim_Obj *,Jim_Obj *,Jim_Obj *)", "", "Argument[*1]", "ReturnValue[*]", "value", "df-generated"]
-      - ["", "", True, "Jim_StringByteRangeObj", "(Jim_Interp *,Jim_Obj *,Jim_Obj *,Jim_Obj *)", "", "Argument[1]", "ReturnValue", "value", "dfc-generated"]
-      - ["", "", True, "Jim_StringRangeObj", "(Jim_Interp *,Jim_Obj *,Jim_Obj *,Jim_Obj *)", "", "Argument[*1]", "ReturnValue[*]", "value", "df-generated"]
-      - ["", "", True, "Jim_StringRangeObj", "(Jim_Interp *,Jim_Obj *,Jim_Obj *,Jim_Obj *)", "", "Argument[1]", "ReturnValue", "value", "dfc-generated"]
-      - ["", "", True, "Jim_StringToDouble", "(const char *,double *)", "", "Argument[*0]", "Argument[*1]", "taint", "dfc-generated"]
-      - ["", "", True, "Jim_StringToDouble", "(const char *,double *)", "", "Argument[0]", "Argument[*1]", "taint", "dfc-generated"]
-      - ["", "", True, "Jim_StringToWide", "(const char *,long *,int)", "", "Argument[*0]", "Argument[*1]", "taint", "dfc-generated"]
-      - ["", "", True, "Jim_StringToWide", "(const char *,long *,int)", "", "Argument[0]", "Argument[*1]", "taint", "dfc-generated"]
-      - ["", "", True, "Jim_SubCmdProc", "(Jim_Interp *,int,Jim_Obj *const *)", "", "Argument[*2]", "Argument[**2]", "taint", "dfc-generated"]
-      - ["", "", True, "Jim_SubstObj", "(Jim_Interp *,Jim_Obj *,Jim_Obj **,int)", "", "Argument[1]", "Argument[*0].Field[**freeList].Field[*prevObjPtr]", "value", "dfc-generated"]
-      - ["", "", True, "Jim_SubstObj", "(Jim_Interp *,Jim_Obj *,Jim_Obj **,int)", "", "Argument[1]", "Argument[*0].Field[*freeList]", "value", "dfc-generated"]
-      - ["", "", True, "Jim_SubstObj", "(Jim_Interp *,Jim_Obj *,Jim_Obj **,int)", "", "Argument[2]", "Argument[*2]", "taint", "dfc-generated"]
-      - ["", "", True, "Jim_UnsetVariable", "(Jim_Interp *,Jim_Obj *,int)", "", "Argument[*1]", "Argument[*0]", "taint", "df-generated"]
-      - ["", "", True, "Jim_Utf8Length", "(Jim_Interp *,Jim_Obj *)", "", "Argument[*1].Field[*length]", "ReturnValue", "value", "dfc-generated"]
-      - ["", "", True, "Jim_WrongNumArgs", "(Jim_Interp *,int,Jim_Obj *const *,const char *)", "", "Argument[*3]", "Argument[*0].Field[**freeList].Field[**bytes]", "value", "dfc-generated"]
-      - ["", "", True, "Jim_WrongNumArgs", "(Jim_Interp *,int,Jim_Obj *const *,const char *)", "", "Argument[*3]", "Argument[*0].Field[**liveList].Field[**bytes]", "value", "dfc-generated"]
-      - ["", "", True, "Jim_WrongNumArgs", "(Jim_Interp *,int,Jim_Obj *const *,const char *)", "", "Argument[*3]", "Argument[*0].Field[**result].Field[**bytes]", "value", "dfc-generated"]
-      - ["", "", True, "Jim_WrongNumArgs", "(Jim_Interp *,int,Jim_Obj *const *,const char *)", "", "Argument[3]", "Argument[*0].Field[**freeList].Field[**bytes]", "taint", "dfc-generated"]
-      - ["", "", True, "Jim_WrongNumArgs", "(Jim_Interp *,int,Jim_Obj *const *,const char *)", "", "Argument[3]", "Argument[*0].Field[**liveList].Field[**bytes]", "taint", "dfc-generated"]
-      - ["", "", True, "Jim_WrongNumArgs", "(Jim_Interp *,int,Jim_Obj *const *,const char *)", "", "Argument[3]", "Argument[*0].Field[**result].Field[**bytes]", "taint", "dfc-generated"]
-      - ["", "", True, "Jim_bootstrapInit", "(Jim_Interp *)", "", "Argument[*0]", "ReturnValue", "taint", "df-generated"]
-      - ["", "", True, "Jim_globInit", "(Jim_Interp *)", "", "Argument[*0]", "ReturnValue", "taint", "df-generated"]
-      - ["", "", True, "Jim_initjimshInit", "(Jim_Interp *)", "", "Argument[*0]", "ReturnValue", "taint", "df-generated"]
-      - ["", "", True, "Jim_stdlibInit", "(Jim_Interp *)", "", "Argument[*0]", "ReturnValue", "taint", "df-generated"]
-      - ["", "", True, "Jim_tclcompatInit", "(Jim_Interp *)", "", "Argument[*0]", "ReturnValue", "taint", "df-generated"]
-      - ["", "", True, "OptInit", "(char **,s_options *,FILE *)", "", "Argument[**0]", "Argument[*2]", "taint", "dfc-generated"]
-      - ["", "", True, "OptInit", "(char **,s_options *,FILE *)", "", "Argument[*0]", "Argument[*2]", "taint", "dfc-generated"]
-      - ["", "", True, "OptInit", "(char **,s_options *,FILE *)", "", "Argument[0]", "Argument[*0]", "taint", "dfc-generated"]
-      - ["", "", True, "OptInit", "(char **,s_options *,FILE *)", "", "Argument[0]", "Argument[*2]", "taint", "dfc-generated"]
-      - ["", "", True, "Plink_add", "(plink **,config *)", "", "Argument[**0]", "Argument[**0].Field[**next]", "value", "dfc-generated"]
-      - ["", "", True, "Plink_add", "(plink **,config *)", "", "Argument[*0]", "Argument[**0].Field[*next]", "value", "dfc-generated"]
-      - ["", "", True, "Plink_add", "(plink **,config *)", "", "Argument[0]", "Argument[**0].Field[*next]", "taint", "dfc-generated"]
-      - ["", "", True, "Plink_add", "(plink **,config *)", "", "Argument[0]", "Argument[*0]", "taint", "dfc-generated"]
-      - ["", "", True, "Plink_copy", "(plink **,plink *)", "", "Argument[**0]", "Argument[*1]", "taint", "df-generated"]
-      - ["", "", True, "Plink_copy", "(plink **,plink *)", "", "Argument[*0]", "Argument[**0]", "taint", "df-generated"]
-      - ["", "", True, "Plink_copy", "(plink **,plink *)", "", "Argument[*0]", "Argument[*1]", "taint", "df-generated"]
-      - ["", "", True, "Plink_copy", "(plink **,plink *)", "", "Argument[*1]", "Argument[**0]", "value", "df-generated"]
-      - ["", "", True, "Plink_copy", "(plink **,plink *)", "", "Argument[*1]", "Argument[*0]", "taint", "df-generated"]
-      - ["", "", True, "Plink_copy", "(plink **,plink *)", "", "Argument[0]", "Argument[**0]", "taint", "df-generated"]
-      - ["", "", True, "Plink_copy", "(plink **,plink *)", "", "Argument[0]", "Argument[*0]", "taint", "df-generated"]
-      - ["", "", True, "Plink_copy", "(plink **,plink *)", "", "Argument[0]", "Argument[*1]", "taint", "df-generated"]
-      - ["", "", True, "Plink_copy", "(plink **,plink *)", "", "Argument[1]", "Argument[**0]", "taint", "df-generated"]
-      - ["", "", True, "Plink_copy", "(plink **,plink *)", "", "Argument[1]", "Argument[*0]", "value", "df-generated"]
-      - ["", "", True, "Plink_copy", "(plink **,plink *)", "", "Argument[1]", "Argument[*1]", "taint", "df-generated"]
-      - ["", "", True, "Plink_delete", "(plink *)", "", "Argument[0]", "Argument[*0].Field[**next].Field[*next]", "value", "dfc-generated"]
-      - ["", "", True, "Plink_delete", "(plink *)", "", "Argument[0]", "Argument[*0].Field[*next]", "value", "dfc-generated"]
-      - ["", "", True, "PrintAction", "(action *,FILE *,int)", "", "Argument[2]", "Argument[*1]", "taint", "dfc-generated"]
-      - ["", "", True, "ResortStates", "(lemon *)", "", "Argument[*0].Field[*nstate]", "Argument[*0].Field[*nxstate]", "value", "dfc-generated"]
-      - ["", "", True, "RulePrint", "(FILE *,rule *,int)", "", "Argument[*1]", "Argument[*0]", "taint", "df-generated"]
-      - ["", "", True, "SHA1Transform", "(unsigned int[5],const unsigned char[64])", "", "Argument[*1]", "Argument[*0]", "taint", "dfc-generated"]
-      - ["", "", True, "SHA1Transform", "(unsigned int[5],const unsigned char[64])", "", "Argument[0]", "Argument[*0]", "taint", "dfc-generated"]
-      - ["", "", True, "SHA1Transform", "(unsigned int[5],const unsigned char[64])", "", "Argument[1]", "Argument[*0]", "taint", "dfc-generated"]
-      - ["", "", True, "State_find", "(config *)", "", "Argument[*0].Field[**bp].Field[**bp]", "Argument[*0]", "value", "dfc-generated"]
-      - ["", "", True, "State_find", "(config *)", "", "Argument[*0].Field[**bp]", "Argument[*0]", "value", "dfc-generated"]
-      - ["", "", True, "State_insert", "(state *,config *)", "", "Argument[*1].Field[**bp].Field[**bp]", "Argument[*1]", "value", "dfc-generated"]
-      - ["", "", True, "State_insert", "(state *,config *)", "", "Argument[*1].Field[**bp]", "Argument[*1]", "value", "dfc-generated"]
-      - ["", "", True, "Strsafe", "(const char *)", "", "Argument[*0]", "ReturnValue[*]", "value", "dfc-generated"]
-      - ["", "", True, "Strsafe", "(const char *)", "", "Argument[0]", "ReturnValue[*]", "taint", "dfc-generated"]
-      - ["", "", True, "Symbol_Nth", "(int)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["", "", True, "Symbol_Nth", "(int)", "", "Argument[0]", "ReturnValue[*]", "taint", "df-generated"]
-      - ["", "", True, "Symbol_new", "(const char *)", "", "Argument[*0]", "ReturnValue[*].Field[**name]", "value", "dfc-generated"]
-      - ["", "", True, "Symbol_new", "(const char *)", "", "Argument[0]", "ReturnValue[*].Field[**name]", "taint", "dfc-generated"]
-      - ["", "", True, "Symbolcmpp", "(const void *,const void *)", "", "Argument[**0].Field[*index]", "ReturnValue", "taint", "dfc-generated"]
-      - ["", "", True, "Symbolcmpp", "(const void *,const void *)", "", "Argument[**1].Field[*index]", "ReturnValue", "taint", "dfc-generated"]
-      - ["", "", True, "acttab_action", "(acttab *,int,int)", "", "Argument[1]", "Argument[*0].Field[**aLookahead].Field[*lookahead]", "value", "dfc-generated"]
-      - ["", "", True, "acttab_action", "(acttab *,int,int)", "", "Argument[1]", "Argument[*0].Field[*mnLookahead]", "value", "dfc-generated"]
-      - ["", "", True, "acttab_action", "(acttab *,int,int)", "", "Argument[1]", "Argument[*0].Field[*mxLookahead]", "value", "dfc-generated"]
-      - ["", "", True, "acttab_action", "(acttab *,int,int)", "", "Argument[2]", "Argument[*0].Field[**aLookahead].Field[*action]", "value", "dfc-generated"]
-      - ["", "", True, "acttab_action", "(acttab *,int,int)", "", "Argument[2]", "Argument[*0].Field[*mnAction]", "value", "dfc-generated"]
-      - ["", "", True, "acttab_action_size", "(acttab *)", "", "Argument[*0].Field[*nAction]", "ReturnValue", "value", "dfc-generated"]
-      - ["", "", True, "acttab_alloc", "(int,int)", "", "Argument[0]", "ReturnValue[*].Field[*nsymbol]", "value", "dfc-generated"]
-      - ["", "", True, "acttab_alloc", "(int,int)", "", "Argument[1]", "ReturnValue[*].Field[*nterminal]", "value", "dfc-generated"]
-      - ["", "", True, "acttab_insert", "(acttab *,int)", "", "Argument[*0]", "ReturnValue", "taint", "df-generated"]
-      - ["", "", True, "append_str", "(const char *,int,int,int)", "", "Argument[*0]", "ReturnValue[*]", "value", "dfc-generated"]
-      - ["", "", True, "append_str", "(const char *,int,int,int)", "", "Argument[0]", "ReturnValue[*]", "taint", "dfc-generated"]
-      - ["", "", True, "append_str", "(const char *,int,int,int)", "", "Argument[1]", "ReturnValue[*].Field[*sz]", "taint", "dfc-generated"]
-      - ["", "", True, "append_str", "(const char *,int,int,int)", "", "Argument[1]", "ReturnValue[*]", "taint", "dfc-generated"]
-      - ["", "", True, "close_db", "(sqlite3 *)", "", "Argument[0]", "Argument[*0].Field[**pErr].Field[*db]", "value", "dfc-generated"]
-      - ["", "", True, "compute_action", "(lemon *,action *)", "", "Argument[*0]", "ReturnValue", "taint", "df-generated"]
-      - ["", "", True, "confighash", "(config *)", "", "Argument[*0].Field[**rp].Field[*index]", "ReturnValue", "taint", "dfc-generated"]
-      - ["", "", True, "confighash", "(config *)", "", "Argument[*0].Field[*dot]", "ReturnValue", "taint", "dfc-generated"]
-      - ["", "", True, "defossilize", "(char *)", "", "Argument[0]", "Argument[*0]", "taint", "dfc-generated"]
-      - ["", "", True, "emit_code", "(FILE *,rule *,lemon *,int *)", "", "Argument[*3]", "Argument[*0]", "taint", "dfc-generated"]
-      - ["", "", True, "emit_code", "(FILE *,rule *,lemon *,int *)", "", "Argument[3]", "Argument[*0]", "taint", "dfc-generated"]
-      - ["", "", True, "emit_code", "(FILE *,rule *,lemon *,int *)", "", "Argument[3]", "Argument[*3]", "taint", "dfc-generated"]
-      - ["", "", True, "emit_destructor_code", "(FILE *,symbol *,lemon *,int *)", "", "Argument[3]", "Argument[*3]", "taint", "dfc-generated"]
-      - ["", "", True, "file_makename", "(lemon *,const char *)", "", "Argument[*0].Field[**filename]", "ReturnValue[*]", "value", "dfc-generated"]
-      - ["", "", True, "file_makename", "(lemon *,const char *)", "", "Argument[*0].Field[*filename]", "ReturnValue[*]", "taint", "dfc-generated"]
-      - ["", "", True, "file_makename", "(lemon *,const char *)", "", "Argument[*1]", "ReturnValue[*]", "value", "dfc-generated"]
-      - ["", "", True, "file_makename", "(lemon *,const char *)", "", "Argument[1]", "ReturnValue[*]", "taint", "dfc-generated"]
-      - ["", "", True, "file_open", "(lemon *,const char *,const char *)", "", "Argument[*1]", "Argument[*0].Field[**outname]", "value", "dfc-generated"]
-      - ["", "", True, "file_open", "(lemon *,const char *,const char *)", "", "Argument[*1]", "ReturnValue[*]", "taint", "dfc-generated"]
-      - ["", "", True, "file_open", "(lemon *,const char *,const char *)", "", "Argument[1]", "Argument[*0].Field[**outname]", "taint", "dfc-generated"]
-      - ["", "", True, "file_open", "(lemon *,const char *,const char *)", "", "Argument[1]", "ReturnValue[*]", "taint", "dfc-generated"]
-      - ["", "", True, "getstate", "(lemon *)", "", "Argument[*0]", "ReturnValue[*]", "taint", "df-generated"]
-      - ["", "", True, "has_destructor", "(symbol *,lemon *)", "", "Argument[*1].Field[*tokendest]", "ReturnValue", "taint", "dfc-generated"]
-      - ["", "", True, "jim_regcomp", "(regex_t *,const char *,int)", "", "Argument[*1]", "Argument[*0].Field[**regparse]", "value", "dfc-generated"]
-      - ["", "", True, "jim_regcomp", "(regex_t *,const char *,int)", "", "Argument[1]", "Argument[*0].Field[*regparse]", "value", "dfc-generated"]
-      - ["", "", True, "jim_regcomp", "(regex_t *,const char *,int)", "", "Argument[2]", "Argument[*0].Field[*cflags]", "value", "dfc-generated"]
-      - ["", "", True, "jim_regerror", "(int,const regex_t *,char *,size_t)", "", "Argument[0]", "Argument[*2]", "taint", "dfc-generated"]
-      - ["", "", True, "jim_regexec", "(regex_t *,const char *,size_t,regmatch_t[],int)", "", "Argument[*1]", "Argument[*0].Field[**regbol]", "value", "dfc-generated"]
-      - ["", "", True, "jim_regexec", "(regex_t *,const char *,size_t,regmatch_t[],int)", "", "Argument[*1]", "Argument[*0].Field[**reginput]", "value", "dfc-generated"]
-      - ["", "", True, "jim_regexec", "(regex_t *,const char *,size_t,regmatch_t[],int)", "", "Argument[*1]", "Argument[*0].Field[**start]", "value", "dfc-generated"]
-      - ["", "", True, "jim_regexec", "(regex_t *,const char *,size_t,regmatch_t[],int)", "", "Argument[*3]", "Argument[*0].Field[**pmatch]", "value", "dfc-generated"]
-      - ["", "", True, "jim_regexec", "(regex_t *,const char *,size_t,regmatch_t[],int)", "", "Argument[2]", "Argument[*0].Field[*nmatch]", "value", "dfc-generated"]
-      - ["", "", True, "jim_regexec", "(regex_t *,const char *,size_t,regmatch_t[],int)", "", "Argument[3]", "Argument[*0].Field[*pmatch]", "value", "dfc-generated"]
-      - ["", "", True, "jim_regexec", "(regex_t *,const char *,size_t,regmatch_t[],int)", "", "Argument[4]", "Argument[*0].Field[*eflags]", "value", "dfc-generated"]
-      - ["", "", True, "print_stack_union", "(FILE *,lemon *,int *,int)", "", "Argument[2]", "Argument[*2]", "taint", "dfc-generated"]
-      - ["", "", True, "recoverInit", "(sqlite3 *,const char *,const char *,..(*)(..),void *)", "", "Argument[**4]", "ReturnValue[*].Field[***pSqlCtx]", "value", "dfc-generated"]
-      - ["", "", True, "recoverInit", "(sqlite3 *,const char *,const char *,..(*)(..),void *)", "", "Argument[*1]", "ReturnValue[*].Field[**zDb]", "value", "dfc-generated"]
-      - ["", "", True, "recoverInit", "(sqlite3 *,const char *,const char *,..(*)(..),void *)", "", "Argument[*2]", "ReturnValue[*].Field[**zUri]", "value", "dfc-generated"]
-      - ["", "", True, "recoverInit", "(sqlite3 *,const char *,const char *,..(*)(..),void *)", "", "Argument[*4]", "ReturnValue[*].Field[**pSqlCtx]", "value", "dfc-generated"]
-      - ["", "", True, "recoverInit", "(sqlite3 *,const char *,const char *,..(*)(..),void *)", "", "Argument[0]", "ReturnValue[*].Field[**zDb].Field[*dbIn]", "value", "dfc-generated"]
-      - ["", "", True, "recoverInit", "(sqlite3 *,const char *,const char *,..(*)(..),void *)", "", "Argument[0]", "ReturnValue[*].Field[**zUri].Field[*dbIn]", "value", "dfc-generated"]
-      - ["", "", True, "recoverInit", "(sqlite3 *,const char *,const char *,..(*)(..),void *)", "", "Argument[0]", "ReturnValue[*].Field[*dbIn]", "value", "dfc-generated"]
-      - ["", "", True, "recoverInit", "(sqlite3 *,const char *,const char *,..(*)(..),void *)", "", "Argument[1]", "ReturnValue[*].Field[**zDb]", "taint", "dfc-generated"]
-      - ["", "", True, "recoverInit", "(sqlite3 *,const char *,const char *,..(*)(..),void *)", "", "Argument[2]", "ReturnValue[*].Field[**zUri]", "taint", "dfc-generated"]
-      - ["", "", True, "recoverInit", "(sqlite3 *,const char *,const char *,..(*)(..),void *)", "", "Argument[3]", "ReturnValue[*].Field[*xSql]", "value", "dfc-generated"]
-      - ["", "", True, "recoverInit", "(sqlite3 *,const char *,const char *,..(*)(..),void *)", "", "Argument[4]", "ReturnValue[*].Field[*pSqlCtx]", "value", "dfc-generated"]
-      - ["", "", True, "registerUDFs", "(sqlite3 *,sqlite3 *)", "", "Argument[0]", "Argument[*0].Field[**pErr].Field[*db]", "value", "dfc-generated"]
-      - ["", "", True, "registerUDFs", "(sqlite3 *,sqlite3 *)", "", "Argument[1]", "Argument[*1].Field[**pErr].Field[*db]", "value", "dfc-generated"]
-      - ["", "", True, "rule_print", "(FILE *,rule *)", "", "Argument[*1]", "Argument[*0]", "taint", "df-generated"]
-      - ["", "", True, "sha1sum_file", "(const char *,char *)", "", "Argument[1]", "Argument[*1]", "taint", "dfc-generated"]
-      - ["", "", True, "sha3sum_file", "(const char *,char *)", "", "Argument[1]", "Argument[*1]", "taint", "dfc-generated"]
-      - ["", "", True, "shellReset", "(int *,sqlite3_stmt *)", "", "Argument[0]", "Argument[*0]", "taint", "dfc-generated"]
-      - ["", "", True, "sqlite3CompletionVtabInit", "(sqlite3 *)", "", "Argument[*0]", "ReturnValue", "taint", "df-generated"]
-      - ["", "", True, "sqlite3_aggregate_context", "(sqlite3_context *,int)", "", "Argument[*0]", "ReturnValue", "taint", "df-generated"]
-      - ["", "", True, "sqlite3_aggregate_context", "(sqlite3_context *,int)", "", "Argument[*0]", "ReturnValue[*]", "taint", "df-generated"]
-      - ["", "", True, "sqlite3_aggregate_count", "(sqlite3_context *)", "", "Argument[*0].Field[**pMem].Field[*n]", "ReturnValue", "value", "dfc-generated"]
-      - ["", "", True, "sqlite3_autovacuum_pages", "(sqlite3 *,..(*)(..),void *,..(*)(..))", "", "Argument[**2]", "Argument[*0].Field[***pAutovacPagesArg]", "value", "dfc-generated"]
-      - ["", "", True, "sqlite3_autovacuum_pages", "(sqlite3 *,..(*)(..),void *,..(*)(..))", "", "Argument[*2]", "Argument[*0].Field[**pAutovacPagesArg]", "value", "dfc-generated"]
-      - ["", "", True, "sqlite3_autovacuum_pages", "(sqlite3 *,..(*)(..),void *,..(*)(..))", "", "Argument[1]", "Argument[*0].Field[*xAutovacPages]", "value", "dfc-generated"]
-      - ["", "", True, "sqlite3_autovacuum_pages", "(sqlite3 *,..(*)(..),void *,..(*)(..))", "", "Argument[2]", "Argument[*0].Field[*pAutovacPagesArg]", "value", "dfc-generated"]
-      - ["", "", True, "sqlite3_autovacuum_pages", "(sqlite3 *,..(*)(..),void *,..(*)(..))", "", "Argument[3]", "Argument[*0].Field[*xAutovacDestr]", "value", "dfc-generated"]
-      - ["", "", True, "sqlite3_backup_finish", "(sqlite3_backup *)", "", "Argument[*0]", "ReturnValue", "taint", "df-generated"]
-      - ["", "", True, "sqlite3_backup_init", "(sqlite3 *,const char *,sqlite3 *,const char *)", "", "Argument[0]", "Argument[*0].Field[**pErr].Field[*db]", "value", "dfc-generated"]
-      - ["", "", True, "sqlite3_backup_init", "(sqlite3 *,const char *,sqlite3 *,const char *)", "", "Argument[0]", "ReturnValue[*].Field[*pDestDb]", "value", "dfc-generated"]
-      - ["", "", True, "sqlite3_backup_init", "(sqlite3 *,const char *,sqlite3 *,const char *)", "", "Argument[2]", "ReturnValue[*].Field[*pSrcDb]", "value", "dfc-generated"]
-      - ["", "", True, "sqlite3_backup_pagecount", "(sqlite3_backup *)", "", "Argument[*0].Field[*nPagecount]", "ReturnValue", "value", "dfc-generated"]
-      - ["", "", True, "sqlite3_backup_remaining", "(sqlite3_backup *)", "", "Argument[*0].Field[*nRemaining]", "ReturnValue", "value", "dfc-generated"]
-      - ["", "", True, "sqlite3_backup_step", "(sqlite3_backup *,int)", "", "Argument[*0]", "ReturnValue", "taint", "df-generated"]
-      - ["", "", True, "sqlite3_base64_init", "(sqlite3 *,char **,const sqlite3_api_routines *)", "", "Argument[0]", "Argument[*0].Field[**pErr].Field[*db]", "value", "dfc-generated"]
-      - ["", "", True, "sqlite3_base85_init", "(sqlite3 *,char **,const sqlite3_api_routines *)", "", "Argument[0]", "Argument[*0].Field[**pErr].Field[*db]", "value", "dfc-generated"]
-      - ["", "", True, "sqlite3_bind_blob64", "(sqlite3_stmt *,int,const void *,sqlite3_uint64,..(*)(..))", "", "Argument[*0]", "ReturnValue", "taint", "df-generated"]
-      - ["", "", True, "sqlite3_bind_blob", "(sqlite3_stmt *,int,const void *,int,..(*)(..))", "", "Argument[*0]", "ReturnValue", "taint", "df-generated"]
-      - ["", "", True, "sqlite3_bind_double", "(sqlite3_stmt *,int,double)", "", "Argument[1]", "Argument[*0].Field[**aVar]", "taint", "dfc-generated"]
-      - ["", "", True, "sqlite3_bind_int64", "(sqlite3_stmt *,int,sqlite3_int64,sqlite_int64)", "", "Argument[1]", "Argument[*0].Field[**aVar]", "taint", "dfc-generated"]
-      - ["", "", True, "sqlite3_bind_int", "(sqlite3_stmt *,int,int)", "", "Argument[1]", "Argument[*0].Field[**aVar]", "taint", "dfc-generated"]
-      - ["", "", True, "sqlite3_bind_parameter_count", "(sqlite3_stmt *)", "", "Argument[*0].Field[*nVar]", "ReturnValue", "value", "dfc-generated"]
-      - ["", "", True, "sqlite3_bind_parameter_index", "(sqlite3_stmt *,const char *)", "", "Argument[*0]", "ReturnValue", "taint", "df-generated"]
-      - ["", "", True, "sqlite3_bind_parameter_name", "(sqlite3_stmt *,int)", "", "Argument[*0]", "ReturnValue", "taint", "df-generated"]
-      - ["", "", True, "sqlite3_bind_parameter_name", "(sqlite3_stmt *,int)", "", "Argument[*0]", "ReturnValue[*]", "taint", "df-generated"]
-      - ["", "", True, "sqlite3_bind_pointer", "(sqlite3_stmt *,int,void *,const char *,..(*)(..))", "", "Argument[*2]", "Argument[*0].Field[**aVar].Field[**z]", "value", "dfc-generated"]
-      - ["", "", True, "sqlite3_bind_pointer", "(sqlite3_stmt *,int,void *,const char *,..(*)(..))", "", "Argument[1]", "Argument[*0].Field[**aVar]", "taint", "dfc-generated"]
-      - ["", "", True, "sqlite3_bind_pointer", "(sqlite3_stmt *,int,void *,const char *,..(*)(..))", "", "Argument[2]", "Argument[*0].Field[**aVar].Field[*z]", "value", "dfc-generated"]
-      - ["", "", True, "sqlite3_bind_pointer", "(sqlite3_stmt *,int,void *,const char *,..(*)(..))", "", "Argument[4]", "Argument[*0].Field[**aVar].Field[*xDel]", "value", "dfc-generated"]
-      - ["", "", True, "sqlite3_bind_text16", "(sqlite3_stmt *,int,const void *,int,..(*)(..))", "", "Argument[*0]", "ReturnValue", "taint", "df-generated"]
-      - ["", "", True, "sqlite3_bind_text64", "(sqlite3_stmt *,int,const char *,sqlite3_uint64,..(*)(..),unsigned char)", "", "Argument[*0]", "ReturnValue", "taint", "df-generated"]
-      - ["", "", True, "sqlite3_bind_text", "(sqlite3_stmt *,int,const char *,int,..(*)(..))", "", "Argument[*0]", "ReturnValue", "taint", "df-generated"]
-      - ["", "", True, "sqlite3_bind_value", "(sqlite3_stmt *,int,const sqlite3_value *)", "", "Argument[1]", "Argument[*0].Field[**aVar]", "taint", "dfc-generated"]
-      - ["", "", True, "sqlite3_bind_zeroblob64", "(sqlite3_stmt *,int,sqlite3_uint64)", "", "Argument[1]", "Argument[*0].Field[**aVar]", "taint", "dfc-generated"]
-      - ["", "", True, "sqlite3_bind_zeroblob", "(sqlite3_stmt *,int,int)", "", "Argument[1]", "Argument[*0].Field[**aVar]", "taint", "dfc-generated"]
-      - ["", "", True, "sqlite3_blob_bytes", "(sqlite3_blob *)", "", "Argument[*0].Field[*nByte]", "ReturnValue", "value", "dfc-generated"]
-      - ["", "", True, "sqlite3_blob_close", "(sqlite3_blob *)", "", "Argument[*0].Field[**pStmt].Field[*rc]", "ReturnValue", "taint", "dfc-generated"]
-      - ["", "", True, "sqlite3_blob_open", "(sqlite3 *,const char *,const char *,const char *,sqlite3_int64,sqlite_int64,int,sqlite3_blob **)", "", "Argument[*2]", "Argument[**6].Field[**pTab].Field[**zName]", "value", "dfc-generated"]
-      - ["", "", True, "sqlite3_blob_open", "(sqlite3 *,const char *,const char *,const char *,sqlite3_int64,sqlite_int64,int,sqlite3_blob **)", "", "Argument[*3]", "Argument[**6].Field[*iCol]", "taint", "dfc-generated"]
-      - ["", "", True, "sqlite3_blob_open", "(sqlite3 *,const char *,const char *,const char *,sqlite3_int64,sqlite_int64,int,sqlite3_blob **)", "", "Argument[*3]", "Argument[**6].Field[*iOffset]", "taint", "dfc-generated"]
-      - ["", "", True, "sqlite3_blob_open", "(sqlite3 *,const char *,const char *,const char *,sqlite3_int64,sqlite_int64,int,sqlite3_blob **)", "", "Argument[*3]", "Argument[**6].Field[*nByte]", "taint", "dfc-generated"]
-      - ["", "", True, "sqlite3_blob_open", "(sqlite3 *,const char *,const char *,const char *,sqlite3_int64,sqlite_int64,int,sqlite3_blob **)", "", "Argument[2]", "Argument[**6].Field[**pTab].Field[**zName]", "taint", "dfc-generated"]
-      - ["", "", True, "sqlite3_blob_open", "(sqlite3 *,const char *,const char *,const char *,sqlite3_int64,sqlite_int64,int,sqlite3_blob **)", "", "Argument[3]", "Argument[**6].Field[*iCol]", "taint", "dfc-generated"]
-      - ["", "", True, "sqlite3_blob_open", "(sqlite3 *,const char *,const char *,const char *,sqlite3_int64,sqlite_int64,int,sqlite3_blob **)", "", "Argument[3]", "Argument[**6].Field[*iOffset]", "taint", "dfc-generated"]
-      - ["", "", True, "sqlite3_blob_open", "(sqlite3 *,const char *,const char *,const char *,sqlite3_int64,sqlite_int64,int,sqlite3_blob **)", "", "Argument[3]", "Argument[**6].Field[*nByte]", "taint", "dfc-generated"]
-      - ["", "", True, "sqlite3_blob_read", "(sqlite3_blob *,void *,int,int)", "", "Argument[1]", "Argument[*1]", "taint", "dfc-generated"]
-      - ["", "", True, "sqlite3_blob_read", "(sqlite3_blob *,void *,int,int)", "", "Argument[2]", "Argument[*1]", "taint", "dfc-generated"]
-      - ["", "", True, "sqlite3_blob_read", "(sqlite3_blob *,void *,int,int)", "", "Argument[3]", "Argument[*0].Field[**pCsr].Field[**aOverflow]", "taint", "dfc-generated"]
-      - ["", "", True, "sqlite3_blob_read", "(sqlite3_blob *,void *,int,int)", "", "Argument[3]", "Argument[*1]", "taint", "dfc-generated"]
-      - ["", "", True, "sqlite3_blob_reopen", "(sqlite3_blob *,sqlite3_int64)", "", "Argument[*0]", "ReturnValue", "taint", "df-generated"]
-      - ["", "", True, "sqlite3_blob_write", "(sqlite3_blob *,const void *,int,int)", "", "Argument[1]", "Argument[*1]", "taint", "dfc-generated"]
-      - ["", "", True, "sqlite3_blob_write", "(sqlite3_blob *,const void *,int,int)", "", "Argument[2]", "Argument[*1]", "taint", "dfc-generated"]
-      - ["", "", True, "sqlite3_blob_write", "(sqlite3_blob *,const void *,int,int)", "", "Argument[3]", "Argument[*0].Field[**pCsr].Field[**aOverflow]", "taint", "dfc-generated"]
-      - ["", "", True, "sqlite3_blob_write", "(sqlite3_blob *,const void *,int,int)", "", "Argument[3]", "Argument[*1]", "taint", "dfc-generated"]
-      - ["", "", True, "sqlite3_busy_handler", "(sqlite3 *,..(*)(..),void *)", "", "Argument[**2]", "Argument[*0].Field[*busyHandler].Field[***pBusyArg]", "value", "dfc-generated"]
-      - ["", "", True, "sqlite3_busy_handler", "(sqlite3 *,..(*)(..),void *)", "", "Argument[*2]", "Argument[*0].Field[*busyHandler].Field[**pBusyArg]", "value", "dfc-generated"]
-      - ["", "", True, "sqlite3_busy_handler", "(sqlite3 *,..(*)(..),void *)", "", "Argument[1]", "Argument[*0].Field[*busyHandler].Field[*xBusyHandler]", "value", "dfc-generated"]
-      - ["", "", True, "sqlite3_busy_handler", "(sqlite3 *,..(*)(..),void *)", "", "Argument[2]", "Argument[*0].Field[*busyHandler].Field[*pBusyArg]", "value", "dfc-generated"]
-      - ["", "", True, "sqlite3_busy_timeout", "(sqlite3 *,int)", "", "Argument[*0]", "Argument[*0].Field[*busyHandler].Field[**pBusyArg]", "value", "dfc-generated"]
-      - ["", "", True, "sqlite3_busy_timeout", "(sqlite3 *,int)", "", "Argument[0]", "Argument[*0].Field[*busyHandler].Field[*pBusyArg]", "value", "dfc-generated"]
-      - ["", "", True, "sqlite3_busy_timeout", "(sqlite3 *,int)", "", "Argument[1]", "Argument[*0].Field[*busyTimeout]", "value", "dfc-generated"]
-      - ["", "", True, "sqlite3_changes64", "(sqlite3 *)", "", "Argument[*0].Field[*nChange]", "ReturnValue", "value", "dfc-generated"]
-      - ["", "", True, "sqlite3_changes", "(sqlite3 *)", "", "Argument[*0].Field[*nChange]", "ReturnValue", "value", "dfc-generated"]
-      - ["", "", True, "sqlite3_close", "(sqlite3 *)", "", "Argument[0]", "Argument[*0].Field[**pErr].Field[*db]", "value", "dfc-generated"]
-      - ["", "", True, "sqlite3_collation_needed16", "(sqlite3 *,void *,..(*)(..))", "", "Argument[**1]", "Argument[*0].Field[***pCollNeededArg]", "value", "dfc-generated"]
-      - ["", "", True, "sqlite3_collation_needed16", "(sqlite3 *,void *,..(*)(..))", "", "Argument[*1]", "Argument[*0].Field[**pCollNeededArg]", "value", "dfc-generated"]
-      - ["", "", True, "sqlite3_collation_needed16", "(sqlite3 *,void *,..(*)(..))", "", "Argument[1]", "Argument[*0].Field[*pCollNeededArg]", "value", "dfc-generated"]
-      - ["", "", True, "sqlite3_collation_needed16", "(sqlite3 *,void *,..(*)(..))", "", "Argument[2]", "Argument[*0].Field[*xCollNeeded16]", "value", "dfc-generated"]
-      - ["", "", True, "sqlite3_collation_needed", "(sqlite3 *,void *,..(*)(..))", "", "Argument[**1]", "Argument[*0].Field[***pCollNeededArg]", "value", "dfc-generated"]
-      - ["", "", True, "sqlite3_collation_needed", "(sqlite3 *,void *,..(*)(..))", "", "Argument[*1]", "Argument[*0].Field[**pCollNeededArg]", "value", "dfc-generated"]
-      - ["", "", True, "sqlite3_collation_needed", "(sqlite3 *,void *,..(*)(..))", "", "Argument[1]", "Argument[*0].Field[*pCollNeededArg]", "value", "dfc-generated"]
-      - ["", "", True, "sqlite3_collation_needed", "(sqlite3 *,void *,..(*)(..))", "", "Argument[2]", "Argument[*0].Field[*xCollNeeded]", "value", "dfc-generated"]
-      - ["", "", True, "sqlite3_column_blob", "(sqlite3_stmt *,int)", "", "Argument[1]", "Argument[*0].Field[**pResultRow]", "taint", "dfc-generated"]
-      - ["", "", True, "sqlite3_column_bytes16", "(sqlite3_stmt *,int)", "", "Argument[1]", "Argument[*0].Field[**pResultRow]", "taint", "dfc-generated"]
-      - ["", "", True, "sqlite3_column_bytes", "(sqlite3_stmt *,int)", "", "Argument[1]", "Argument[*0].Field[**pResultRow]", "taint", "dfc-generated"]
-      - ["", "", True, "sqlite3_column_count", "(sqlite3_stmt *)", "", "Argument[*0].Field[*nResColumn]", "ReturnValue", "value", "dfc-generated"]
-      - ["", "", True, "sqlite3_column_decltype16", "(sqlite3_stmt *,int)", "", "Argument[1]", "Argument[*0].Field[**aColName]", "taint", "dfc-generated"]
-      - ["", "", True, "sqlite3_column_decltype", "(sqlite3_stmt *,int)", "", "Argument[1]", "Argument[*0].Field[**aColName]", "taint", "dfc-generated"]
-      - ["", "", True, "sqlite3_column_double", "(sqlite3_stmt *,int)", "", "Argument[1]", "Argument[*0].Field[**pResultRow]", "taint", "dfc-generated"]
-      - ["", "", True, "sqlite3_column_int64", "(sqlite3_stmt *,int)", "", "Argument[1]", "Argument[*0].Field[**pResultRow]", "taint", "dfc-generated"]
-      - ["", "", True, "sqlite3_column_int", "(sqlite3_stmt *,int)", "", "Argument[1]", "Argument[*0].Field[**pResultRow]", "taint", "dfc-generated"]
-      - ["", "", True, "sqlite3_column_name16", "(sqlite3_stmt *,int)", "", "Argument[1]", "Argument[*0].Field[**aColName]", "taint", "dfc-generated"]
-      - ["", "", True, "sqlite3_column_name16", "(sqlite3_stmt *,int)", "", "Argument[1]", "ReturnValue", "taint", "dfc-generated"]
-      - ["", "", True, "sqlite3_column_name16", "(sqlite3_stmt *,int)", "", "Argument[1]", "ReturnValue[*]", "taint", "dfc-generated"]
-      - ["", "", True, "sqlite3_column_name", "(sqlite3_stmt *,int)", "", "Argument[1]", "Argument[*0].Field[**aColName]", "taint", "dfc-generated"]
-      - ["", "", True, "sqlite3_column_name", "(sqlite3_stmt *,int)", "", "Argument[1]", "ReturnValue", "taint", "dfc-generated"]
-      - ["", "", True, "sqlite3_column_text16", "(sqlite3_stmt *,int)", "", "Argument[1]", "Argument[*0].Field[**pResultRow]", "taint", "dfc-generated"]
-      - ["", "", True, "sqlite3_column_text", "(sqlite3_stmt *,int)", "", "Argument[1]", "Argument[*0].Field[**pResultRow]", "taint", "dfc-generated"]
-      - ["", "", True, "sqlite3_column_type", "(sqlite3_stmt *,int)", "", "Argument[1]", "Argument[*0].Field[**pResultRow]", "taint", "dfc-generated"]
-      - ["", "", True, "sqlite3_column_value", "(sqlite3_stmt *,int)", "", "Argument[1]", "ReturnValue", "taint", "dfc-generated"]
-      - ["", "", True, "sqlite3_column_value", "(sqlite3_stmt *,int)", "", "Argument[1]", "ReturnValue[*]", "taint", "dfc-generated"]
-      - ["", "", True, "sqlite3_commit_hook", "(sqlite3 *,..(*)(..),void *)", "", "Argument[**2]", "Argument[*0].Field[***pCommitArg]", "value", "dfc-generated"]
-      - ["", "", True, "sqlite3_commit_hook", "(sqlite3 *,..(*)(..),void *)", "", "Argument[*2]", "Argument[*0].Field[**pCommitArg]", "value", "dfc-generated"]
-      - ["", "", True, "sqlite3_commit_hook", "(sqlite3 *,..(*)(..),void *)", "", "Argument[1]", "Argument[*0].Field[*xCommitCallback]", "value", "dfc-generated"]
-      - ["", "", True, "sqlite3_commit_hook", "(sqlite3 *,..(*)(..),void *)", "", "Argument[2]", "Argument[*0].Field[*pCommitArg]", "value", "dfc-generated"]
-      - ["", "", True, "sqlite3_compileoption_get", "(int)", "", "Argument[0]", "ReturnValue", "taint", "dfc-generated"]
-      - ["", "", True, "sqlite3_completion_init", "(sqlite3 *,char **,const sqlite3_api_routines *)", "", "Argument[*0]", "ReturnValue", "taint", "df-generated"]
-      - ["", "", True, "sqlite3_context_db_handle", "(sqlite3_context *)", "", "Argument[*0].Field[**pOut].Field[**db]", "ReturnValue[*]", "value", "dfc-generated"]
-      - ["", "", True, "sqlite3_context_db_handle", "(sqlite3_context *)", "", "Argument[*0].Field[**pOut].Field[*db]", "ReturnValue", "value", "dfc-generated"]
-      - ["", "", True, "sqlite3_create_collation16", "(sqlite3 *,const void *,int,void *,..(*)(..))", "", "Argument[0]", "Argument[*0].Field[**pErr].Field[*db]", "value", "dfc-generated"]
-      - ["", "", True, "sqlite3_create_collation", "(sqlite3 *,const char *,int,void *,..(*)(..))", "", "Argument[0]", "Argument[*0].Field[**pErr].Field[*db]", "value", "dfc-generated"]
-      - ["", "", True, "sqlite3_create_collation_v2", "(sqlite3 *,const char *,int,void *,..(*)(..),..(*)(..))", "", "Argument[0]", "Argument[*0].Field[**pErr].Field[*db]", "value", "dfc-generated"]
-      - ["", "", True, "sqlite3_create_function16", "(sqlite3 *,const void *,int,int,void *,..(*)(..),..(*)(..),..(*)(..))", "", "Argument[0]", "Argument[*0].Field[**pErr].Field[*db]", "value", "dfc-generated"]
-      - ["", "", True, "sqlite3_create_function", "(sqlite3 *,const char *,int,int,void *,..(*)(..),..(*)(..),..(*)(..))", "", "Argument[0]", "Argument[*0].Field[**pErr].Field[*db]", "value", "dfc-generated"]
-      - ["", "", True, "sqlite3_create_function", "(sqlite3 *,const char *,int,int,void *,..(*)(..),..(*)(..),..(*)(..))", "", "Argument[1]", "Argument[*0].Field[*lookaside].Field[**pFree]", "taint", "dfc-generated"]
-      - ["", "", True, "sqlite3_create_function", "(sqlite3 *,const char *,int,int,void *,..(*)(..),..(*)(..),..(*)(..))", "", "Argument[1]", "Argument[*0].Field[*lookaside].Field[**pSmallFree]", "taint", "dfc-generated"]
-      - ["", "", True, "sqlite3_create_function_v2", "(sqlite3 *,const char *,int,int,void *,..(*)(..),..(*)(..),..(*)(..),..(*)(..))", "", "Argument[0]", "Argument[*0].Field[**pErr].Field[*db]", "value", "dfc-generated"]
-      - ["", "", True, "sqlite3_create_function_v2", "(sqlite3 *,const char *,int,int,void *,..(*)(..),..(*)(..),..(*)(..),..(*)(..))", "", "Argument[1]", "Argument[*0].Field[*lookaside].Field[**pFree]", "taint", "dfc-generated"]
-      - ["", "", True, "sqlite3_create_function_v2", "(sqlite3 *,const char *,int,int,void *,..(*)(..),..(*)(..),..(*)(..),..(*)(..))", "", "Argument[1]", "Argument[*0].Field[*lookaside].Field[**pSmallFree]", "taint", "dfc-generated"]
-      - ["", "", True, "sqlite3_create_module", "(sqlite3 *,const char *,const sqlite3_module *,void *)", "", "Argument[*0]", "ReturnValue", "taint", "df-generated"]
-      - ["", "", True, "sqlite3_create_module", "(sqlite3 *,const char *,const sqlite3_module *,void *)", "", "Argument[*1]", "Argument[*0]", "taint", "df-generated"]
-      - ["", "", True, "sqlite3_create_module", "(sqlite3 *,const char *,const sqlite3_module *,void *)", "", "Argument[1]", "Argument[*0]", "taint", "df-generated"]
-      - ["", "", True, "sqlite3_create_module_v2", "(sqlite3 *,const char *,const sqlite3_module *,void *,..(*)(..))", "", "Argument[*0]", "ReturnValue", "taint", "df-generated"]
-      - ["", "", True, "sqlite3_create_module_v2", "(sqlite3 *,const char *,const sqlite3_module *,void *,..(*)(..))", "", "Argument[*1]", "Argument[*0]", "taint", "df-generated"]
-      - ["", "", True, "sqlite3_create_module_v2", "(sqlite3 *,const char *,const sqlite3_module *,void *,..(*)(..))", "", "Argument[1]", "Argument[*0]", "taint", "df-generated"]
-      - ["", "", True, "sqlite3_create_window_function", "(sqlite3 *,const char *,int,int,void *,..(*)(..),..(*)(..),..(*)(..),..(*)(..),..(*)(..))", "", "Argument[0]", "Argument[*0].Field[**pErr].Field[*db]", "value", "dfc-generated"]
-      - ["", "", True, "sqlite3_create_window_function", "(sqlite3 *,const char *,int,int,void *,..(*)(..),..(*)(..),..(*)(..),..(*)(..),..(*)(..))", "", "Argument[1]", "Argument[*0].Field[*lookaside].Field[**pFree]", "taint", "dfc-generated"]
-      - ["", "", True, "sqlite3_create_window_function", "(sqlite3 *,const char *,int,int,void *,..(*)(..),..(*)(..),..(*)(..),..(*)(..),..(*)(..))", "", "Argument[1]", "Argument[*0].Field[*lookaside].Field[**pSmallFree]", "taint", "dfc-generated"]
-      - ["", "", True, "sqlite3_data_count", "(sqlite3_stmt *)", "", "Argument[*0].Field[*nResColumn]", "ReturnValue", "value", "dfc-generated"]
-      - ["", "", True, "sqlite3_db_handle", "(sqlite3_stmt *)", "", "Argument[*0].Field[**db]", "ReturnValue[*]", "value", "dfc-generated"]
-      - ["", "", True, "sqlite3_db_handle", "(sqlite3_stmt *)", "", "Argument[*0].Field[*db]", "ReturnValue", "value", "dfc-generated"]
-      - ["", "", True, "sqlite3_db_mutex", "(sqlite3 *)", "", "Argument[*0].Field[**mutex]", "ReturnValue[*]", "value", "dfc-generated"]
-      - ["", "", True, "sqlite3_db_mutex", "(sqlite3 *)", "", "Argument[*0].Field[*mutex]", "ReturnValue", "value", "dfc-generated"]
-      - ["", "", True, "sqlite3_db_name", "(sqlite3 *,int)", "", "Argument[*0].Field[**aDb].Field[**zDbSName]", "ReturnValue[*]", "value", "dfc-generated"]
-      - ["", "", True, "sqlite3_db_name", "(sqlite3 *,int)", "", "Argument[*0].Field[**aDb].Field[*zDbSName]", "ReturnValue", "value", "dfc-generated"]
-      - ["", "", True, "sqlite3_db_status", "(sqlite3 *,int,int *,int *,int)", "", "Argument[1]", "Argument[*2]", "taint", "dfc-generated"]
-      - ["", "", True, "sqlite3_db_status", "(sqlite3 *,int,int *,int *,int)", "", "Argument[1]", "Argument[*3]", "taint", "dfc-generated"]
-      - ["", "", True, "sqlite3_dbdata_init", "(sqlite3 *,char **,const sqlite3_api_routines *)", "", "Argument[*0]", "ReturnValue", "taint", "df-generated"]
-      - ["", "", True, "sqlite3_decimal_init", "(sqlite3 *,char **,const sqlite3_api_routines *)", "", "Argument[0]", "Argument[*0].Field[**pErr].Field[*db]", "value", "dfc-generated"]
-      - ["", "", True, "sqlite3_declare_vtab", "(sqlite3 *,const char *)", "", "Argument[0]", "Argument[*0].Field[**pErr].Field[*db]", "value", "dfc-generated"]
-      - ["", "", True, "sqlite3_deserialize", "(sqlite3 *,const char *,unsigned char *,sqlite3_int64,sqlite3_int64,unsigned int)", "", "Argument[0]", "Argument[*0].Field[**pErr].Field[*db]", "value", "dfc-generated"]
-      - ["", "", True, "sqlite3_errcode", "(sqlite3 *)", "", "Argument[*0].Field[*errCode]", "ReturnValue", "taint", "dfc-generated"]
-      - ["", "", True, "sqlite3_errcode", "(sqlite3 *)", "", "Argument[*0].Field[*errMask]", "ReturnValue", "taint", "dfc-generated"]
-      - ["", "", True, "sqlite3_errmsg16", "(sqlite3 *)", "", "Argument[0]", "Argument[*0].Field[**pErr].Field[*db]", "value", "dfc-generated"]
-      - ["", "", True, "sqlite3_errmsg", "(sqlite3 *)", "", "Argument[*0]", "ReturnValue", "taint", "df-generated"]
-      - ["", "", True, "sqlite3_errmsg", "(sqlite3 *)", "", "Argument[*0]", "ReturnValue[*]", "taint", "df-generated"]
-      - ["", "", True, "sqlite3_error_offset", "(sqlite3 *)", "", "Argument[*0].Field[*errByteOffset]", "ReturnValue", "value", "dfc-generated"]
-      - ["", "", True, "sqlite3_errstr", "(int)", "", "Argument[0]", "ReturnValue", "taint", "dfc-generated"]
-      - ["", "", True, "sqlite3_exec", "(sqlite3 *,const char *,..(*)(..),sqlite3_callback,void *,char **)", "", "Argument[*1]", "Argument[*0].Field[*lookaside].Field[**pFree]", "value", "dfc-generated"]
-      - ["", "", True, "sqlite3_exec", "(sqlite3 *,const char *,..(*)(..),sqlite3_callback,void *,char **)", "", "Argument[*1]", "Argument[*0].Field[*lookaside].Field[**pSmallFree]", "value", "dfc-generated"]
-      - ["", "", True, "sqlite3_exec", "(sqlite3 *,const char *,..(*)(..),sqlite3_callback,void *,char **)", "", "Argument[0]", "Argument[*0].Field[**pErr].Field[*db]", "value", "dfc-generated"]
-      - ["", "", True, "sqlite3_exec", "(sqlite3 *,const char *,..(*)(..),sqlite3_callback,void *,char **)", "", "Argument[1]", "Argument[*0].Field[*lookaside].Field[**pFree]", "taint", "dfc-generated"]
-      - ["", "", True, "sqlite3_exec", "(sqlite3 *,const char *,..(*)(..),sqlite3_callback,void *,char **)", "", "Argument[1]", "Argument[*0].Field[*lookaside].Field[**pSmallFree]", "taint", "dfc-generated"]
-      - ["", "", True, "sqlite3_exec", "(sqlite3 *,const char *,..(*)(..),sqlite3_callback,void *,char **)", "", "Argument[3]", "Argument[*3]", "taint", "dfc-generated"]
-      - ["", "", True, "sqlite3_exec", "(sqlite3 *,const char *,..(*)(..),sqlite3_callback,void *,char **)", "", "Argument[4]", "Argument[*4]", "taint", "dfc-generated"]
-      - ["", "", True, "sqlite3_expanded_sql", "(sqlite3_stmt *)", "", "Argument[*0]", "ReturnValue[*]", "taint", "df-generated"]
-      - ["", "", True, "sqlite3_expert_analyze", "(sqlite3expert *,char **)", "", "Argument[1]", "Argument[*1]", "taint", "dfc-generated"]
-      - ["", "", True, "sqlite3_expert_count", "(sqlite3expert *)", "", "Argument[*0].Field[**pStatement].Field[*iId]", "ReturnValue", "taint", "dfc-generated"]
-      - ["", "", True, "sqlite3_expert_new", "(sqlite3 *,char **)", "", "Argument[0]", "ReturnValue[*].Field[*db]", "value", "dfc-generated"]
-      - ["", "", True, "sqlite3_expert_new", "(sqlite3 *,char **)", "", "Argument[1]", "Argument[*1]", "taint", "dfc-generated"]
-      - ["", "", True, "sqlite3_expert_report", "(sqlite3expert *,int,int)", "", "Argument[*0]", "ReturnValue", "taint", "df-generated"]
-      - ["", "", True, "sqlite3_expert_report", "(sqlite3expert *,int,int)", "", "Argument[*0]", "ReturnValue[*]", "taint", "df-generated"]
-      - ["", "", True, "sqlite3_expert_sql", "(sqlite3expert *,const char *,char **)", "", "Argument[*1]", "Argument[*0].Field[**pStatement].Field[**zSql]", "value", "dfc-generated"]
-      - ["", "", True, "sqlite3_expert_sql", "(sqlite3expert *,const char *,char **)", "", "Argument[1]", "Argument[*0].Field[**pStatement].Field[**zSql]", "taint", "dfc-generated"]
-      - ["", "", True, "sqlite3_expert_sql", "(sqlite3expert *,const char *,char **)", "", "Argument[1]", "Argument[*1]", "taint", "dfc-generated"]
-      - ["", "", True, "sqlite3_extended_errcode", "(sqlite3 *)", "", "Argument[*0].Field[*errCode]", "ReturnValue", "value", "dfc-generated"]
-      - ["", "", True, "sqlite3_file_control", "(sqlite3 *,const char *,int,void *)", "", "Argument[3]", "Argument[*3]", "taint", "dfc-generated"]
-      - ["", "", True, "sqlite3_fileio_init", "(sqlite3 *,char **,const sqlite3_api_routines *)", "", "Argument[0]", "Argument[*0].Field[**pErr].Field[*db]", "value", "dfc-generated"]
-      - ["", "", True, "sqlite3_filename_database", "(const char *,sqlite3_filename)", "", "Argument[*0]", "ReturnValue[*]", "value", "dfc-generated"]
-      - ["", "", True, "sqlite3_filename_database", "(const char *,sqlite3_filename)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
-      - ["", "", True, "sqlite3_filename_database", "(const char *,sqlite3_filename)", "", "Argument[0]", "ReturnValue[*]", "taint", "dfc-generated"]
-      - ["", "", True, "sqlite3_filename_journal", "(const char *,sqlite3_filename)", "", "Argument[*0]", "ReturnValue[*]", "value", "dfc-generated"]
-      - ["", "", True, "sqlite3_filename_journal", "(const char *,sqlite3_filename)", "", "Argument[0]", "ReturnValue", "taint", "dfc-generated"]
-      - ["", "", True, "sqlite3_filename_journal", "(const char *,sqlite3_filename)", "", "Argument[0]", "ReturnValue[*]", "taint", "dfc-generated"]
-      - ["", "", True, "sqlite3_filename_wal", "(const char *,sqlite3_filename)", "", "Argument[*0]", "ReturnValue[*]", "value", "dfc-generated"]
-      - ["", "", True, "sqlite3_filename_wal", "(const char *,sqlite3_filename)", "", "Argument[0]", "ReturnValue", "taint", "dfc-generated"]
-      - ["", "", True, "sqlite3_filename_wal", "(const char *,sqlite3_filename)", "", "Argument[0]", "ReturnValue[*]", "taint", "dfc-generated"]
-      - ["", "", True, "sqlite3_finalize", "(sqlite3_stmt *)", "", "Argument[*0]", "ReturnValue", "taint", "df-generated"]
-      - ["", "", True, "sqlite3_free_filename", "(const char *,sqlite3_filename)", "", "Argument[0]", "Argument[*0]", "taint", "dfc-generated"]
-      - ["", "", True, "sqlite3_free_table", "(char **)", "", "Argument[*0]", "Argument[**0]", "taint", "dfc-generated"]
-      - ["", "", True, "sqlite3_free_table", "(char **)", "", "Argument[0]", "Argument[**0]", "taint", "dfc-generated"]
-      - ["", "", True, "sqlite3_free_table", "(char **)", "", "Argument[0]", "Argument[*0]", "taint", "dfc-generated"]
-      - ["", "", True, "sqlite3_get_autocommit", "(sqlite3 *)", "", "Argument[*0].Field[*autoCommit]", "ReturnValue", "value", "dfc-generated"]
-      - ["", "", True, "sqlite3_get_clientdata", "(sqlite3 *,const char *)", "", "Argument[*0]", "ReturnValue", "taint", "df-generated"]
-      - ["", "", True, "sqlite3_get_clientdata", "(sqlite3 *,const char *)", "", "Argument[*0]", "ReturnValue[**]", "taint", "df-generated"]
-      - ["", "", True, "sqlite3_get_clientdata", "(sqlite3 *,const char *)", "", "Argument[*0]", "ReturnValue[*]", "taint", "df-generated"]
-      - ["", "", True, "sqlite3_get_table", "(sqlite3 *,const char *,char ***,int *,int *,char **)", "", "Argument[*1]", "Argument[*0].Field[*lookaside].Field[**pFree]", "value", "dfc-generated"]
-      - ["", "", True, "sqlite3_get_table", "(sqlite3 *,const char *,char ***,int *,int *,char **)", "", "Argument[*1]", "Argument[*0].Field[*lookaside].Field[**pSmallFree]", "value", "dfc-generated"]
-      - ["", "", True, "sqlite3_get_table", "(sqlite3 *,const char *,char ***,int *,int *,char **)", "", "Argument[0]", "Argument[*0].Field[**pErr].Field[*db]", "value", "dfc-generated"]
-      - ["", "", True, "sqlite3_get_table", "(sqlite3 *,const char *,char ***,int *,int *,char **)", "", "Argument[1]", "Argument[*0].Field[*lookaside].Field[**pFree]", "taint", "dfc-generated"]
-      - ["", "", True, "sqlite3_get_table", "(sqlite3 *,const char *,char ***,int *,int *,char **)", "", "Argument[1]", "Argument[*0].Field[*lookaside].Field[**pSmallFree]", "taint", "dfc-generated"]
-      - ["", "", True, "sqlite3_get_table", "(sqlite3 *,const char *,char ***,int *,int *,char **)", "", "Argument[5]", "Argument[*5]", "taint", "dfc-generated"]
-      - ["", "", True, "sqlite3_ieee_init", "(sqlite3 *,char **,const sqlite3_api_routines *)", "", "Argument[0]", "Argument[*0].Field[**pErr].Field[*db]", "value", "dfc-generated"]
-      - ["", "", True, "sqlite3_intck_error", "(sqlite3_intck *,const char **)", "", "Argument[*0]", "Argument[**1]", "taint", "df-generated"]
-      - ["", "", True, "sqlite3_intck_error", "(sqlite3_intck *,const char **)", "", "Argument[*0]", "Argument[*1]", "taint", "df-generated"]
-      - ["", "", True, "sqlite3_intck_error", "(sqlite3_intck *,const char **)", "", "Argument[*0]", "ReturnValue", "taint", "df-generated"]
-      - ["", "", True, "sqlite3_intck_message", "(sqlite3_intck *)", "", "Argument[*0]", "ReturnValue", "taint", "df-generated"]
-      - ["", "", True, "sqlite3_intck_message", "(sqlite3_intck *)", "", "Argument[*0]", "ReturnValue[*]", "taint", "df-generated"]
-      - ["", "", True, "sqlite3_intck_open", "(sqlite3 *,const char *,sqlite3_intck **)", "", "Argument[*1]", "Argument[**2]", "value", "dfc-generated"]
-      - ["", "", True, "sqlite3_intck_open", "(sqlite3 *,const char *,sqlite3_intck **)", "", "Argument[0]", "Argument[**2].Field[**zDb].Field[*db]", "value", "dfc-generated"]
-      - ["", "", True, "sqlite3_intck_open", "(sqlite3 *,const char *,sqlite3_intck **)", "", "Argument[0]", "Argument[**2].Field[*db]", "value", "dfc-generated"]
-      - ["", "", True, "sqlite3_intck_open", "(sqlite3 *,const char *,sqlite3_intck **)", "", "Argument[0]", "Argument[*0].Field[**pErr].Field[*db]", "value", "dfc-generated"]
-      - ["", "", True, "sqlite3_intck_open", "(sqlite3 *,const char *,sqlite3_intck **)", "", "Argument[1]", "Argument[**2]", "taint", "dfc-generated"]
-      - ["", "", True, "sqlite3_intck_step", "(sqlite3_intck *)", "", "Argument[*0]", "ReturnValue", "taint", "df-generated"]
-      - ["", "", True, "sqlite3_intck_test_sql", "(sqlite3_intck *,const char *)", "", "Argument[*0]", "ReturnValue", "taint", "df-generated"]
-      - ["", "", True, "sqlite3_intck_test_sql", "(sqlite3_intck *,const char *)", "", "Argument[*0]", "ReturnValue[*]", "taint", "df-generated"]
-      - ["", "", True, "sqlite3_intck_unlock", "(sqlite3_intck *)", "", "Argument[*0]", "ReturnValue", "taint", "df-generated"]
-      - ["", "", True, "sqlite3_keyword_name", "(int,const char **,int *)", "", "Argument[0]", "Argument[**1]", "taint", "dfc-generated"]
-      - ["", "", True, "sqlite3_keyword_name", "(int,const char **,int *)", "", "Argument[0]", "Argument[*1]", "taint", "dfc-generated"]
-      - ["", "", True, "sqlite3_keyword_name", "(int,const char **,int *)", "", "Argument[0]", "Argument[*2]", "taint", "dfc-generated"]
-      - ["", "", True, "sqlite3_last_insert_rowid", "(sqlite3 *)", "", "Argument[*0].Field[*lastRowid]", "ReturnValue", "value", "dfc-generated"]
-      - ["", "", True, "sqlite3_limit", "(sqlite3 *,int,int)", "", "Argument[*0].Field[*aLimit]", "ReturnValue", "value", "dfc-generated"]
-      - ["", "", True, "sqlite3_limit", "(sqlite3 *,int,int)", "", "Argument[1]", "Argument[*0].Field[*aLimit]", "taint", "dfc-generated"]
-      - ["", "", True, "sqlite3_limit", "(sqlite3 *,int,int)", "", "Argument[1]", "ReturnValue", "taint", "dfc-generated"]
-      - ["", "", True, "sqlite3_limit", "(sqlite3 *,int,int)", "", "Argument[2]", "Argument[*0].Field[*aLimit]", "value", "dfc-generated"]
-      - ["", "", True, "sqlite3_load_extension", "(sqlite3 *,const char *,const char *,char **)", "", "Argument[*0]", "ReturnValue", "taint", "df-generated"]
-      - ["", "", True, "sqlite3_next_stmt", "(sqlite3 *,sqlite3_stmt *)", "", "Argument[*1].Field[**pVNext]", "ReturnValue[*]", "value", "dfc-generated"]
-      - ["", "", True, "sqlite3_next_stmt", "(sqlite3 *,sqlite3_stmt *)", "", "Argument[*1].Field[*pVNext]", "ReturnValue", "value", "dfc-generated"]
-      - ["", "", True, "sqlite3_open16", "(const void *,sqlite3 **)", "", "Argument[1]", "Argument[*1]", "taint", "dfc-generated"]
-      - ["", "", True, "sqlite3_open_v2", "(const char *,sqlite3 **,int,const char *)", "", "Argument[2]", "Argument[**1].Field[*openFlags]", "taint", "dfc-generated"]
-      - ["", "", True, "sqlite3_overload_function", "(sqlite3 *,const char *,int)", "", "Argument[0]", "Argument[*0].Field[**pErr].Field[*db]", "value", "dfc-generated"]
-      - ["", "", True, "sqlite3_overload_function", "(sqlite3 *,const char *,int)", "", "Argument[1]", "Argument[*0].Field[*lookaside].Field[**pFree]", "taint", "dfc-generated"]
-      - ["", "", True, "sqlite3_overload_function", "(sqlite3 *,const char *,int)", "", "Argument[1]", "Argument[*0].Field[*lookaside].Field[**pSmallFree]", "taint", "dfc-generated"]
-      - ["", "", True, "sqlite3_percentile_init", "(sqlite3 *,char **,const sqlite3_api_routines *)", "", "Argument[0]", "Argument[*0].Field[**pErr].Field[*db]", "value", "dfc-generated"]
-      - ["", "", True, "sqlite3_prepare16", "(sqlite3 *,const void *,int,sqlite3_stmt **,const void **)", "", "Argument[*1]", "Argument[**4]", "value", "dfc-generated"]
-      - ["", "", True, "sqlite3_prepare16", "(sqlite3 *,const void *,int,sqlite3_stmt **,const void **)", "", "Argument[0]", "Argument[*0].Field[**pErr].Field[*db]", "value", "dfc-generated"]
-      - ["", "", True, "sqlite3_prepare16", "(sqlite3 *,const void *,int,sqlite3_stmt **,const void **)", "", "Argument[1]", "Argument[**4]", "taint", "dfc-generated"]
-      - ["", "", True, "sqlite3_prepare16", "(sqlite3 *,const void *,int,sqlite3_stmt **,const void **)", "", "Argument[1]", "Argument[*4]", "taint", "dfc-generated"]
-      - ["", "", True, "sqlite3_prepare16_v2", "(sqlite3 *,const void *,int,sqlite3_stmt **,const void **)", "", "Argument[*1]", "Argument[**4]", "value", "dfc-generated"]
-      - ["", "", True, "sqlite3_prepare16_v2", "(sqlite3 *,const void *,int,sqlite3_stmt **,const void **)", "", "Argument[0]", "Argument[*0].Field[**pErr].Field[*db]", "value", "dfc-generated"]
-      - ["", "", True, "sqlite3_prepare16_v2", "(sqlite3 *,const void *,int,sqlite3_stmt **,const void **)", "", "Argument[1]", "Argument[**4]", "taint", "dfc-generated"]
-      - ["", "", True, "sqlite3_prepare16_v2", "(sqlite3 *,const void *,int,sqlite3_stmt **,const void **)", "", "Argument[1]", "Argument[*4]", "taint", "dfc-generated"]
-      - ["", "", True, "sqlite3_prepare16_v3", "(sqlite3 *,const void *,int,unsigned int,sqlite3_stmt **,const void **)", "", "Argument[*1]", "Argument[**5]", "value", "dfc-generated"]
-      - ["", "", True, "sqlite3_prepare16_v3", "(sqlite3 *,const void *,int,unsigned int,sqlite3_stmt **,const void **)", "", "Argument[0]", "Argument[*0].Field[**pErr].Field[*db]", "value", "dfc-generated"]
-      - ["", "", True, "sqlite3_prepare16_v3", "(sqlite3 *,const void *,int,unsigned int,sqlite3_stmt **,const void **)", "", "Argument[1]", "Argument[**5]", "taint", "dfc-generated"]
-      - ["", "", True, "sqlite3_prepare16_v3", "(sqlite3 *,const void *,int,unsigned int,sqlite3_stmt **,const void **)", "", "Argument[1]", "Argument[*5]", "taint", "dfc-generated"]
-      - ["", "", True, "sqlite3_prepare16_v3", "(sqlite3 *,const void *,int,unsigned int,sqlite3_stmt **,const void **)", "", "Argument[3]", "Argument[**4].Field[*prepFlags]", "taint", "dfc-generated"]
-      - ["", "", True, "sqlite3_prepare", "(sqlite3 *,const char *,int,sqlite3_stmt **,const char **)", "", "Argument[*1]", "Argument[**4]", "value", "df-generated"]
-      - ["", "", True, "sqlite3_prepare", "(sqlite3 *,const char *,int,sqlite3_stmt **,const char **)", "", "Argument[0]", "Argument[*0].Field[**pErr].Field[*db]", "value", "dfc-generated"]
-      - ["", "", True, "sqlite3_prepare", "(sqlite3 *,const char *,int,sqlite3_stmt **,const char **)", "", "Argument[2]", "Argument[**4]", "taint", "dfc-generated"]
-      - ["", "", True, "sqlite3_prepare", "(sqlite3 *,const char *,int,sqlite3_stmt **,const char **)", "", "Argument[2]", "Argument[*4]", "taint", "dfc-generated"]
-      - ["", "", True, "sqlite3_prepare_v2", "(sqlite3 *,const char *,int,sqlite3_stmt **,const char **)", "", "Argument[*1]", "Argument[**4]", "value", "df-generated"]
-      - ["", "", True, "sqlite3_prepare_v2", "(sqlite3 *,const char *,int,sqlite3_stmt **,const char **)", "", "Argument[0]", "Argument[*0].Field[**pErr].Field[*db]", "value", "dfc-generated"]
-      - ["", "", True, "sqlite3_prepare_v2", "(sqlite3 *,const char *,int,sqlite3_stmt **,const char **)", "", "Argument[2]", "Argument[**4]", "taint", "dfc-generated"]
-      - ["", "", True, "sqlite3_prepare_v2", "(sqlite3 *,const char *,int,sqlite3_stmt **,const char **)", "", "Argument[2]", "Argument[*4]", "taint", "dfc-generated"]
-      - ["", "", True, "sqlite3_prepare_v3", "(sqlite3 *,const char *,int,unsigned int,sqlite3_stmt **,const char **)", "", "Argument[*1]", "Argument[**5]", "value", "df-generated"]
-      - ["", "", True, "sqlite3_prepare_v3", "(sqlite3 *,const char *,int,unsigned int,sqlite3_stmt **,const char **)", "", "Argument[0]", "Argument[*0].Field[**pErr].Field[*db]", "value", "dfc-generated"]
-      - ["", "", True, "sqlite3_prepare_v3", "(sqlite3 *,const char *,int,unsigned int,sqlite3_stmt **,const char **)", "", "Argument[2]", "Argument[**5]", "taint", "dfc-generated"]
-      - ["", "", True, "sqlite3_prepare_v3", "(sqlite3 *,const char *,int,unsigned int,sqlite3_stmt **,const char **)", "", "Argument[2]", "Argument[*5]", "taint", "dfc-generated"]
-      - ["", "", True, "sqlite3_prepare_v3", "(sqlite3 *,const char *,int,unsigned int,sqlite3_stmt **,const char **)", "", "Argument[3]", "Argument[**4].Field[*prepFlags]", "taint", "dfc-generated"]
-      - ["", "", True, "sqlite3_profile", "(sqlite3 *,..(*)(..),void *)", "", "Argument[**2]", "Argument[*0].Field[***pProfileArg]", "value", "dfc-generated"]
-      - ["", "", True, "sqlite3_profile", "(sqlite3 *,..(*)(..),void *)", "", "Argument[*2]", "Argument[*0].Field[**pProfileArg]", "value", "dfc-generated"]
-      - ["", "", True, "sqlite3_profile", "(sqlite3 *,..(*)(..),void *)", "", "Argument[1]", "Argument[*0].Field[*xProfile]", "value", "dfc-generated"]
-      - ["", "", True, "sqlite3_profile", "(sqlite3 *,..(*)(..),void *)", "", "Argument[2]", "Argument[*0].Field[*pProfileArg]", "value", "dfc-generated"]
-      - ["", "", True, "sqlite3_progress_handler", "(sqlite3 *,int,..(*)(..),void *)", "", "Argument[**3]", "Argument[*0].Field[***pProgressArg]", "value", "dfc-generated"]
-      - ["", "", True, "sqlite3_progress_handler", "(sqlite3 *,int,..(*)(..),void *)", "", "Argument[*3]", "Argument[*0].Field[**pProgressArg]", "value", "dfc-generated"]
-      - ["", "", True, "sqlite3_progress_handler", "(sqlite3 *,int,..(*)(..),void *)", "", "Argument[1]", "Argument[*0].Field[*nProgressOps]", "value", "dfc-generated"]
-      - ["", "", True, "sqlite3_progress_handler", "(sqlite3 *,int,..(*)(..),void *)", "", "Argument[2]", "Argument[*0].Field[*xProgress]", "value", "dfc-generated"]
-      - ["", "", True, "sqlite3_progress_handler", "(sqlite3 *,int,..(*)(..),void *)", "", "Argument[3]", "Argument[*0].Field[*pProgressArg]", "value", "dfc-generated"]
-      - ["", "", True, "sqlite3_randomness", "(int,void *)", "", "Argument[0]", "Argument[*1]", "taint", "dfc-generated"]
-      - ["", "", True, "sqlite3_realloc64", "(void *,sqlite3_uint64)", "", "Argument[**0]", "ReturnValue[**]", "value", "dfc-generated"]
-      - ["", "", True, "sqlite3_realloc64", "(void *,sqlite3_uint64)", "", "Argument[*0]", "ReturnValue[*]", "value", "dfc-generated"]
-      - ["", "", True, "sqlite3_realloc64", "(void *,sqlite3_uint64)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
-      - ["", "", True, "sqlite3_realloc", "(void *,int)", "", "Argument[**0]", "ReturnValue[**]", "value", "dfc-generated"]
-      - ["", "", True, "sqlite3_realloc", "(void *,int)", "", "Argument[*0]", "ReturnValue[*]", "value", "dfc-generated"]
-      - ["", "", True, "sqlite3_realloc", "(void *,int)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
-      - ["", "", True, "sqlite3_recover_config", "(sqlite3_recover *,int,void *)", "", "Argument[*2]", "Argument[*0]", "taint", "df-generated"]
-      - ["", "", True, "sqlite3_recover_config", "(sqlite3_recover *,int,void *)", "", "Argument[2]", "Argument[*0]", "taint", "df-generated"]
-      - ["", "", True, "sqlite3_recover_config", "(sqlite3_recover *,int,void *)", "", "Argument[2]", "Argument[*2]", "taint", "df-generated"]
-      - ["", "", True, "sqlite3_recover_errcode", "(sqlite3_recover *)", "", "Argument[*0].Field[*errCode]", "ReturnValue", "value", "dfc-generated"]
-      - ["", "", True, "sqlite3_recover_errmsg", "(sqlite3_recover *)", "", "Argument[*0].Field[**zErrMsg]", "ReturnValue[*]", "value", "dfc-generated"]
-      - ["", "", True, "sqlite3_recover_errmsg", "(sqlite3_recover *)", "", "Argument[*0].Field[*zErrMsg]", "ReturnValue", "value", "dfc-generated"]
-      - ["", "", True, "sqlite3_recover_finish", "(sqlite3_recover *)", "", "Argument[*0]", "ReturnValue", "taint", "df-generated"]
-      - ["", "", True, "sqlite3_recover_init", "(sqlite3 *,const char *,const char *)", "", "Argument[*1]", "ReturnValue[*].Field[**zDb]", "value", "dfc-generated"]
-      - ["", "", True, "sqlite3_recover_init", "(sqlite3 *,const char *,const char *)", "", "Argument[*2]", "ReturnValue[*].Field[**zUri]", "value", "dfc-generated"]
-      - ["", "", True, "sqlite3_recover_init", "(sqlite3 *,const char *,const char *)", "", "Argument[0]", "ReturnValue[*].Field[**zDb].Field[*dbIn]", "value", "dfc-generated"]
-      - ["", "", True, "sqlite3_recover_init", "(sqlite3 *,const char *,const char *)", "", "Argument[0]", "ReturnValue[*].Field[**zUri].Field[*dbIn]", "value", "dfc-generated"]
-      - ["", "", True, "sqlite3_recover_init", "(sqlite3 *,const char *,const char *)", "", "Argument[0]", "ReturnValue[*].Field[*dbIn]", "value", "dfc-generated"]
-      - ["", "", True, "sqlite3_recover_init", "(sqlite3 *,const char *,const char *)", "", "Argument[1]", "ReturnValue[*].Field[**zDb]", "taint", "dfc-generated"]
-      - ["", "", True, "sqlite3_recover_init", "(sqlite3 *,const char *,const char *)", "", "Argument[2]", "ReturnValue[*].Field[**zUri]", "taint", "dfc-generated"]
-      - ["", "", True, "sqlite3_recover_init_sql", "(sqlite3 *,const char *,..(*)(..),void *)", "", "Argument[**3]", "ReturnValue[*].Field[***pSqlCtx]", "value", "dfc-generated"]
-      - ["", "", True, "sqlite3_recover_init_sql", "(sqlite3 *,const char *,..(*)(..),void *)", "", "Argument[*1]", "ReturnValue[*].Field[**zDb]", "value", "dfc-generated"]
-      - ["", "", True, "sqlite3_recover_init_sql", "(sqlite3 *,const char *,..(*)(..),void *)", "", "Argument[*3]", "ReturnValue[*].Field[**pSqlCtx]", "value", "dfc-generated"]
-      - ["", "", True, "sqlite3_recover_init_sql", "(sqlite3 *,const char *,..(*)(..),void *)", "", "Argument[0]", "ReturnValue[*].Field[**zDb].Field[*dbIn]", "value", "dfc-generated"]
-      - ["", "", True, "sqlite3_recover_init_sql", "(sqlite3 *,const char *,..(*)(..),void *)", "", "Argument[0]", "ReturnValue[*].Field[**zUri].Field[*dbIn]", "value", "dfc-generated"]
-      - ["", "", True, "sqlite3_recover_init_sql", "(sqlite3 *,const char *,..(*)(..),void *)", "", "Argument[0]", "ReturnValue[*].Field[*dbIn]", "value", "dfc-generated"]
-      - ["", "", True, "sqlite3_recover_init_sql", "(sqlite3 *,const char *,..(*)(..),void *)", "", "Argument[1]", "ReturnValue[*].Field[**zDb]", "taint", "dfc-generated"]
-      - ["", "", True, "sqlite3_recover_init_sql", "(sqlite3 *,const char *,..(*)(..),void *)", "", "Argument[2]", "ReturnValue[*].Field[*xSql]", "value", "dfc-generated"]
-      - ["", "", True, "sqlite3_recover_init_sql", "(sqlite3 *,const char *,..(*)(..),void *)", "", "Argument[3]", "ReturnValue[*].Field[*pSqlCtx]", "value", "dfc-generated"]
-      - ["", "", True, "sqlite3_recover_run", "(sqlite3_recover *)", "", "Argument[*0]", "ReturnValue", "taint", "df-generated"]
-      - ["", "", True, "sqlite3_recover_step", "(sqlite3_recover *)", "", "Argument[*0]", "ReturnValue", "taint", "df-generated"]
-      - ["", "", True, "sqlite3_regexp_init", "(sqlite3 *,char **,const sqlite3_api_routines *)", "", "Argument[0]", "Argument[*0].Field[**pErr].Field[*db]", "value", "dfc-generated"]
-      - ["", "", True, "sqlite3_reset", "(sqlite3_stmt *)", "", "Argument[*0]", "ReturnValue", "taint", "df-generated"]
-      - ["", "", True, "sqlite3_result_error16", "(sqlite3_context *,const void *,int)", "", "Argument[*1]", "Argument[*0].Field[**pOut].Field[**zMalloc]", "value", "dfc-generated"]
-      - ["", "", True, "sqlite3_result_error16", "(sqlite3_context *,const void *,int)", "", "Argument[*1]", "Argument[*0].Field[**pOut].Field[**z]", "value", "dfc-generated"]
-      - ["", "", True, "sqlite3_result_error16", "(sqlite3_context *,const void *,int)", "", "Argument[1]", "Argument[*0].Field[**pOut].Field[**z]", "taint", "dfc-generated"]
-      - ["", "", True, "sqlite3_result_error16", "(sqlite3_context *,const void *,int)", "", "Argument[1]", "Argument[*0].Field[**pOut].Field[*zMalloc]", "value", "dfc-generated"]
-      - ["", "", True, "sqlite3_result_error16", "(sqlite3_context *,const void *,int)", "", "Argument[1]", "Argument[*0].Field[**pOut].Field[*z]", "value", "dfc-generated"]
-      - ["", "", True, "sqlite3_result_error16", "(sqlite3_context *,const void *,int)", "", "Argument[2]", "Argument[*0].Field[**pOut].Field[**z]", "taint", "dfc-generated"]
-      - ["", "", True, "sqlite3_result_error16", "(sqlite3_context *,const void *,int)", "", "Argument[2]", "Argument[*0].Field[**pOut].Field[*n]", "taint", "dfc-generated"]
-      - ["", "", True, "sqlite3_result_error", "(sqlite3_context *,const char *,int)", "", "Argument[*1]", "Argument[*0].Field[**pOut].Field[**zMalloc]", "value", "dfc-generated"]
-      - ["", "", True, "sqlite3_result_error", "(sqlite3_context *,const char *,int)", "", "Argument[*1]", "Argument[*0].Field[**pOut].Field[**z]", "value", "dfc-generated"]
-      - ["", "", True, "sqlite3_result_error", "(sqlite3_context *,const char *,int)", "", "Argument[1]", "Argument[*0].Field[**pOut].Field[**z]", "taint", "dfc-generated"]
-      - ["", "", True, "sqlite3_result_error", "(sqlite3_context *,const char *,int)", "", "Argument[1]", "Argument[*0].Field[**pOut].Field[*zMalloc]", "value", "dfc-generated"]
-      - ["", "", True, "sqlite3_result_error", "(sqlite3_context *,const char *,int)", "", "Argument[1]", "Argument[*0].Field[**pOut].Field[*z]", "value", "dfc-generated"]
-      - ["", "", True, "sqlite3_result_error", "(sqlite3_context *,const char *,int)", "", "Argument[2]", "Argument[*0].Field[**pOut].Field[**z]", "taint", "dfc-generated"]
-      - ["", "", True, "sqlite3_result_error", "(sqlite3_context *,const char *,int)", "", "Argument[2]", "Argument[*0].Field[**pOut].Field[*n]", "taint", "dfc-generated"]
-      - ["", "", True, "sqlite3_result_error_code", "(sqlite3_context *,int)", "", "Argument[1]", "Argument[*0].Field[*isError]", "value", "dfc-generated"]
-      - ["", "", True, "sqlite3_rollback_hook", "(sqlite3 *,..(*)(..),void *)", "", "Argument[**2]", "Argument[*0].Field[***pRollbackArg]", "value", "dfc-generated"]
-      - ["", "", True, "sqlite3_rollback_hook", "(sqlite3 *,..(*)(..),void *)", "", "Argument[*2]", "Argument[*0].Field[**pRollbackArg]", "value", "dfc-generated"]
-      - ["", "", True, "sqlite3_rollback_hook", "(sqlite3 *,..(*)(..),void *)", "", "Argument[1]", "Argument[*0].Field[*xRollbackCallback]", "value", "dfc-generated"]
-      - ["", "", True, "sqlite3_rollback_hook", "(sqlite3 *,..(*)(..),void *)", "", "Argument[2]", "Argument[*0].Field[*pRollbackArg]", "value", "dfc-generated"]
-      - ["", "", True, "sqlite3_rtree_geometry_callback", "(sqlite3 *,const char *,..(*)(..),void *)", "", "Argument[0]", "Argument[*0].Field[**pErr].Field[*db]", "value", "dfc-generated"]
-      - ["", "", True, "sqlite3_rtree_geometry_callback", "(sqlite3 *,const char *,..(*)(..),void *)", "", "Argument[1]", "Argument[*0].Field[*lookaside].Field[**pFree]", "taint", "dfc-generated"]
-      - ["", "", True, "sqlite3_rtree_geometry_callback", "(sqlite3 *,const char *,..(*)(..),void *)", "", "Argument[1]", "Argument[*0].Field[*lookaside].Field[**pSmallFree]", "taint", "dfc-generated"]
-      - ["", "", True, "sqlite3_rtree_query_callback", "(sqlite3 *,const char *,..(*)(..),void *,..(*)(..))", "", "Argument[0]", "Argument[*0].Field[**pErr].Field[*db]", "value", "dfc-generated"]
-      - ["", "", True, "sqlite3_rtree_query_callback", "(sqlite3 *,const char *,..(*)(..),void *,..(*)(..))", "", "Argument[1]", "Argument[*0].Field[*lookaside].Field[**pFree]", "taint", "dfc-generated"]
-      - ["", "", True, "sqlite3_rtree_query_callback", "(sqlite3 *,const char *,..(*)(..),void *,..(*)(..))", "", "Argument[1]", "Argument[*0].Field[*lookaside].Field[**pSmallFree]", "taint", "dfc-generated"]
-      - ["", "", True, "sqlite3_serialize", "(sqlite3 *,const char *,sqlite3_int64 *,unsigned int)", "", "Argument[0]", "Argument[*0].Field[**pErr].Field[*db]", "value", "dfc-generated"]
-      - ["", "", True, "sqlite3_series_init", "(sqlite3 *,char **,const sqlite3_api_routines *)", "", "Argument[*0]", "ReturnValue", "taint", "df-generated"]
-      - ["", "", True, "sqlite3_set_authorizer", "(sqlite3 *,..(*)(..),void *)", "", "Argument[**2]", "Argument[*0].Field[***pAuthArg]", "value", "dfc-generated"]
-      - ["", "", True, "sqlite3_set_authorizer", "(sqlite3 *,..(*)(..),void *)", "", "Argument[*2]", "Argument[*0].Field[**pAuthArg]", "value", "dfc-generated"]
-      - ["", "", True, "sqlite3_set_authorizer", "(sqlite3 *,..(*)(..),void *)", "", "Argument[1]", "Argument[*0].Field[*xAuth]", "value", "dfc-generated"]
-      - ["", "", True, "sqlite3_set_authorizer", "(sqlite3 *,..(*)(..),void *)", "", "Argument[2]", "Argument[*0].Field[*pAuthArg]", "value", "dfc-generated"]
-      - ["", "", True, "sqlite3_set_clientdata", "(sqlite3 *,const char *,void *,..(*)(..))", "", "Argument[*1]", "Argument[*0].Field[**pDbData].Field[*zName]", "value", "dfc-generated"]
-      - ["", "", True, "sqlite3_set_clientdata", "(sqlite3 *,const char *,void *,..(*)(..))", "", "Argument[1]", "Argument[*0].Field[**pDbData].Field[*zName]", "taint", "dfc-generated"]
-      - ["", "", True, "sqlite3_set_last_insert_rowid", "(sqlite3 *,sqlite3_int64)", "", "Argument[1]", "Argument[*0].Field[*lastRowid]", "value", "dfc-generated"]
-      - ["", "", True, "sqlite3_sha_init", "(sqlite3 *,char **,const sqlite3_api_routines *)", "", "Argument[0]", "Argument[*0].Field[**pErr].Field[*db]", "value", "dfc-generated"]
-      - ["", "", True, "sqlite3_shathree_init", "(sqlite3 *,char **,const sqlite3_api_routines *)", "", "Argument[0]", "Argument[*0].Field[**pErr].Field[*db]", "value", "dfc-generated"]
-      - ["", "", True, "sqlite3_snprintf", "(int,char *,const char *,...)", "", "Argument[*1]", "ReturnValue[*]", "value", "dfc-generated"]
-      - ["", "", True, "sqlite3_snprintf", "(int,char *,const char *,...)", "", "Argument[1]", "ReturnValue", "value", "dfc-generated"]
-      - ["", "", True, "sqlite3_sql", "(sqlite3_stmt *)", "", "Argument[*0].Field[**zSql]", "ReturnValue[*]", "value", "dfc-generated"]
-      - ["", "", True, "sqlite3_sql", "(sqlite3_stmt *)", "", "Argument[*0].Field[*zSql]", "ReturnValue", "value", "dfc-generated"]
-      - ["", "", True, "sqlite3_sqlar_init", "(sqlite3 *,char **,const sqlite3_api_routines *)", "", "Argument[0]", "Argument[*0].Field[**pErr].Field[*db]", "value", "dfc-generated"]
-      - ["", "", True, "sqlite3_status64", "(int,sqlite3_int64 *,sqlite3_int64 *,int)", "", "Argument[0]", "Argument[*1]", "taint", "dfc-generated"]
-      - ["", "", True, "sqlite3_status64", "(int,sqlite3_int64 *,sqlite3_int64 *,int)", "", "Argument[0]", "Argument[*2]", "taint", "dfc-generated"]
-      - ["", "", True, "sqlite3_status", "(int,int *,int *,int)", "", "Argument[0]", "Argument[*1]", "taint", "dfc-generated"]
-      - ["", "", True, "sqlite3_status", "(int,int *,int *,int)", "", "Argument[0]", "Argument[*2]", "taint", "dfc-generated"]
-      - ["", "", True, "sqlite3_step", "(sqlite3_stmt *)", "", "Argument[*0]", "ReturnValue", "taint", "df-generated"]
-      - ["", "", True, "sqlite3_step", "(sqlite3_stmt *)", "", "Argument[0]", "Argument[*0]", "taint", "df-generated"]
-      - ["", "", True, "sqlite3_step", "(sqlite3_stmt *)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["", "", True, "sqlite3_stmt_explain", "(sqlite3_stmt *,int)", "", "Argument[0]", "Argument[*0]", "taint", "dfc-generated"]
-      - ["", "", True, "sqlite3_stmt_explain", "(sqlite3_stmt *,int)", "", "Argument[1]", "Argument[*0].Field[*explain]", "value", "dfc-generated"]
-      - ["", "", True, "sqlite3_stmt_explain", "(sqlite3_stmt *,int)", "", "Argument[1]", "Argument[*0].Field[*nResColumn]", "taint", "dfc-generated"]
-      - ["", "", True, "sqlite3_stmt_isexplain", "(sqlite3_stmt *)", "", "Argument[*0].Field[*explain]", "ReturnValue", "value", "dfc-generated"]
-      - ["", "", True, "sqlite3_stmt_readonly", "(sqlite3_stmt *)", "", "Argument[*0].Field[*readOnly]", "ReturnValue", "value", "dfc-generated"]
-      - ["", "", True, "sqlite3_stmt_status", "(sqlite3_stmt *,int,int)", "", "Argument[1]", "ReturnValue", "taint", "dfc-generated"]
-      - ["", "", True, "sqlite3_stmtrand_init", "(sqlite3 *,char **,const sqlite3_api_routines *)", "", "Argument[0]", "Argument[*0].Field[**pErr].Field[*db]", "value", "dfc-generated"]
-      - ["", "", True, "sqlite3_str_append", "(sqlite3_str *,const char *,int)", "", "Argument[*1]", "Argument[*0].Field[**zText]", "value", "dfc-generated"]
-      - ["", "", True, "sqlite3_str_append", "(sqlite3_str *,const char *,int)", "", "Argument[1]", "Argument[*0].Field[**zText]", "taint", "dfc-generated"]
-      - ["", "", True, "sqlite3_str_append", "(sqlite3_str *,const char *,int)", "", "Argument[2]", "Argument[*0].Field[*nAlloc]", "taint", "dfc-generated"]
-      - ["", "", True, "sqlite3_str_append", "(sqlite3_str *,const char *,int)", "", "Argument[2]", "Argument[*0].Field[*nChar]", "taint", "dfc-generated"]
-      - ["", "", True, "sqlite3_str_appendall", "(sqlite3_str *,const char *)", "", "Argument[*1]", "Argument[*0].Field[**zText]", "value", "dfc-generated"]
-      - ["", "", True, "sqlite3_str_appendall", "(sqlite3_str *,const char *)", "", "Argument[1]", "Argument[*0].Field[**zText]", "taint", "dfc-generated"]
-      - ["", "", True, "sqlite3_str_appendchar", "(sqlite3_str *,int,char)", "", "Argument[1]", "Argument[*0].Field[*nAlloc]", "taint", "dfc-generated"]
-      - ["", "", True, "sqlite3_str_appendchar", "(sqlite3_str *,int,char)", "", "Argument[2]", "Argument[*0].Field[**zText]", "value", "dfc-generated"]
-      - ["", "", True, "sqlite3_str_appendf", "(StrAccum *,sqlite3_str *,const char *,...)", "", "Argument[*1]", "Argument[*0].Field[**zText]", "value", "dfc-generated"]
-      - ["", "", True, "sqlite3_str_appendf", "(StrAccum *,sqlite3_str *,const char *,...)", "", "Argument[*1]", "Argument[*0].Field[*nAlloc]", "taint", "dfc-generated"]
-      - ["", "", True, "sqlite3_str_appendf", "(StrAccum *,sqlite3_str *,const char *,...)", "", "Argument[*1]", "Argument[*0].Field[*nChar]", "taint", "dfc-generated"]
-      - ["", "", True, "sqlite3_str_appendf", "(StrAccum *,sqlite3_str *,const char *,...)", "", "Argument[1]", "Argument[*0].Field[**zText]", "taint", "dfc-generated"]
-      - ["", "", True, "sqlite3_str_appendf", "(StrAccum *,sqlite3_str *,const char *,...)", "", "Argument[1]", "Argument[*0].Field[*nAlloc]", "taint", "dfc-generated"]
-      - ["", "", True, "sqlite3_str_appendf", "(StrAccum *,sqlite3_str *,const char *,...)", "", "Argument[1]", "Argument[*0].Field[*nChar]", "taint", "dfc-generated"]
-      - ["", "", True, "sqlite3_str_errcode", "(sqlite3_str *)", "", "Argument[*0].Field[*accError]", "ReturnValue", "value", "dfc-generated"]
-      - ["", "", True, "sqlite3_str_finish", "(sqlite3_str *)", "", "Argument[*0]", "ReturnValue", "taint", "df-generated"]
-      - ["", "", True, "sqlite3_str_finish", "(sqlite3_str *)", "", "Argument[*0]", "ReturnValue[*]", "taint", "df-generated"]
-      - ["", "", True, "sqlite3_str_length", "(sqlite3_str *)", "", "Argument[*0].Field[*nChar]", "ReturnValue", "value", "dfc-generated"]
-      - ["", "", True, "sqlite3_str_new", "(sqlite3 *)", "", "Argument[*0].Field[*aLimit]", "ReturnValue[*].Field[*mxAlloc]", "value", "dfc-generated"]
-      - ["", "", True, "sqlite3_str_value", "(sqlite3_str *)", "", "Argument[*0].Field[**zText]", "ReturnValue[*]", "value", "dfc-generated"]
-      - ["", "", True, "sqlite3_str_value", "(sqlite3_str *)", "", "Argument[*0].Field[*zText]", "ReturnValue", "value", "dfc-generated"]
-      - ["", "", True, "sqlite3_str_vappendf", "(sqlite3_str *,const char *,va_list)", "", "Argument[*1]", "Argument[*0].Field[**zText]", "value", "dfc-generated"]
-      - ["", "", True, "sqlite3_str_vappendf", "(sqlite3_str *,const char *,va_list)", "", "Argument[*1]", "Argument[*0].Field[*nAlloc]", "taint", "dfc-generated"]
-      - ["", "", True, "sqlite3_str_vappendf", "(sqlite3_str *,const char *,va_list)", "", "Argument[*1]", "Argument[*0].Field[*nChar]", "taint", "dfc-generated"]
-      - ["", "", True, "sqlite3_str_vappendf", "(sqlite3_str *,const char *,va_list)", "", "Argument[1]", "Argument[*0].Field[**zText]", "taint", "dfc-generated"]
-      - ["", "", True, "sqlite3_str_vappendf", "(sqlite3_str *,const char *,va_list)", "", "Argument[1]", "Argument[*0].Field[*nAlloc]", "taint", "dfc-generated"]
-      - ["", "", True, "sqlite3_str_vappendf", "(sqlite3_str *,const char *,va_list)", "", "Argument[1]", "Argument[*0].Field[*nChar]", "taint", "dfc-generated"]
-      - ["", "", True, "sqlite3_strglob", "(const char *,const char *)", "", "Argument[0]", "ReturnValue", "taint", "dfc-generated"]
-      - ["", "", True, "sqlite3_stricmp", "(const char *,const char *)", "", "Argument[*0]", "ReturnValue", "value", "dfc-generated"]
-      - ["", "", True, "sqlite3_stricmp", "(const char *,const char *)", "", "Argument[*1]", "ReturnValue", "taint", "dfc-generated"]
-      - ["", "", True, "sqlite3_stricmp", "(const char *,const char *)", "", "Argument[0]", "ReturnValue", "taint", "dfc-generated"]
-      - ["", "", True, "sqlite3_stricmp", "(const char *,const char *)", "", "Argument[1]", "ReturnValue", "taint", "dfc-generated"]
-      - ["", "", True, "sqlite3_strlike", "(const char *,const char *,unsigned int)", "", "Argument[0]", "ReturnValue", "taint", "dfc-generated"]
-      - ["", "", True, "sqlite3_strnicmp", "(const char *,const char *,int)", "", "Argument[*0]", "ReturnValue", "taint", "dfc-generated"]
-      - ["", "", True, "sqlite3_strnicmp", "(const char *,const char *,int)", "", "Argument[*1]", "ReturnValue", "taint", "dfc-generated"]
-      - ["", "", True, "sqlite3_strnicmp", "(const char *,const char *,int)", "", "Argument[0]", "ReturnValue", "taint", "dfc-generated"]
-      - ["", "", True, "sqlite3_strnicmp", "(const char *,const char *,int)", "", "Argument[1]", "ReturnValue", "taint", "dfc-generated"]
-      - ["", "", True, "sqlite3_system_errno", "(sqlite3 *)", "", "Argument[*0].Field[*iSysErrno]", "ReturnValue", "value", "dfc-generated"]
-      - ["", "", True, "sqlite3_table_column_metadata", "(sqlite3 *,const char *,const char *,const char *,const char **,const char **,int *,int *,int *)", "", "Argument[0]", "Argument[*0].Field[**pErr].Field[*db]", "value", "dfc-generated"]
-      - ["", "", True, "sqlite3_total_changes64", "(sqlite3 *)", "", "Argument[*0].Field[*nTotalChange]", "ReturnValue", "value", "dfc-generated"]
-      - ["", "", True, "sqlite3_total_changes", "(sqlite3 *)", "", "Argument[*0].Field[*nTotalChange]", "ReturnValue", "value", "dfc-generated"]
-      - ["", "", True, "sqlite3_trace", "(sqlite3 *,..(*)(..),void *)", "", "Argument[**2]", "Argument[*0].Field[***pTraceArg]", "value", "dfc-generated"]
-      - ["", "", True, "sqlite3_trace", "(sqlite3 *,..(*)(..),void *)", "", "Argument[*2]", "Argument[*0].Field[**pTraceArg]", "value", "dfc-generated"]
-      - ["", "", True, "sqlite3_trace", "(sqlite3 *,..(*)(..),void *)", "", "Argument[1]", "Argument[*0].Field[*trace].Union[*(unnamed class/struct/union)]", "value", "dfc-generated"]
-      - ["", "", True, "sqlite3_trace", "(sqlite3 *,..(*)(..),void *)", "", "Argument[2]", "Argument[*0].Field[*pTraceArg]", "value", "dfc-generated"]
-      - ["", "", True, "sqlite3_trace_v2", "(sqlite3 *,unsigned int,..(*)(..),void *)", "", "Argument[**3]", "Argument[*0].Field[***pTraceArg]", "value", "dfc-generated"]
-      - ["", "", True, "sqlite3_trace_v2", "(sqlite3 *,unsigned int,..(*)(..),void *)", "", "Argument[*3]", "Argument[*0].Field[**pTraceArg]", "value", "dfc-generated"]
-      - ["", "", True, "sqlite3_trace_v2", "(sqlite3 *,unsigned int,..(*)(..),void *)", "", "Argument[1]", "Argument[*0].Field[*mTrace]", "value", "dfc-generated"]
-      - ["", "", True, "sqlite3_trace_v2", "(sqlite3 *,unsigned int,..(*)(..),void *)", "", "Argument[2]", "Argument[*0].Field[*trace].Union[*(unnamed class/struct/union)]", "value", "dfc-generated"]
-      - ["", "", True, "sqlite3_trace_v2", "(sqlite3 *,unsigned int,..(*)(..),void *)", "", "Argument[3]", "Argument[*0].Field[*pTraceArg]", "value", "dfc-generated"]
-      - ["", "", True, "sqlite3_transfer_bindings", "(sqlite3_stmt *,sqlite3_stmt *)", "", "Argument[*0]", "Argument[*1]", "taint", "df-generated"]
-      - ["", "", True, "sqlite3_uint_init", "(sqlite3 *,char **,const sqlite3_api_routines *)", "", "Argument[0]", "Argument[*0].Field[**pErr].Field[*db]", "value", "dfc-generated"]
-      - ["", "", True, "sqlite3_update_hook", "(sqlite3 *,..(*)(..),void *)", "", "Argument[**2]", "Argument[*0].Field[***pUpdateArg]", "value", "dfc-generated"]
-      - ["", "", True, "sqlite3_update_hook", "(sqlite3 *,..(*)(..),void *)", "", "Argument[*2]", "Argument[*0].Field[**pUpdateArg]", "value", "dfc-generated"]
-      - ["", "", True, "sqlite3_update_hook", "(sqlite3 *,..(*)(..),void *)", "", "Argument[1]", "Argument[*0].Field[*xUpdateCallback]", "value", "dfc-generated"]
-      - ["", "", True, "sqlite3_update_hook", "(sqlite3 *,..(*)(..),void *)", "", "Argument[2]", "Argument[*0].Field[*pUpdateArg]", "value", "dfc-generated"]
-      - ["", "", True, "sqlite3_uri_boolean", "(const char *,sqlite3_filename,const char *,int)", "", "Argument[*0]", "ReturnValue", "taint", "dfc-generated"]
-      - ["", "", True, "sqlite3_uri_boolean", "(const char *,sqlite3_filename,const char *,int)", "", "Argument[0]", "ReturnValue", "taint", "dfc-generated"]
-      - ["", "", True, "sqlite3_uri_boolean", "(const char *,sqlite3_filename,const char *,int)", "", "Argument[2]", "ReturnValue", "taint", "dfc-generated"]
-      - ["", "", True, "sqlite3_uri_int64", "(const char *,sqlite3_filename,const char *,sqlite3_int64)", "", "Argument[*0]", "ReturnValue", "taint", "dfc-generated"]
-      - ["", "", True, "sqlite3_uri_int64", "(const char *,sqlite3_filename,const char *,sqlite3_int64)", "", "Argument[0]", "ReturnValue", "taint", "dfc-generated"]
-      - ["", "", True, "sqlite3_uri_int64", "(const char *,sqlite3_filename,const char *,sqlite3_int64)", "", "Argument[2]", "ReturnValue", "value", "dfc-generated"]
-      - ["", "", True, "sqlite3_uri_key", "(const char *,sqlite3_filename,int)", "", "Argument[*0]", "ReturnValue[*]", "value", "dfc-generated"]
-      - ["", "", True, "sqlite3_uri_key", "(const char *,sqlite3_filename,int)", "", "Argument[0]", "ReturnValue", "taint", "dfc-generated"]
-      - ["", "", True, "sqlite3_uri_key", "(const char *,sqlite3_filename,int)", "", "Argument[0]", "ReturnValue[*]", "taint", "dfc-generated"]
-      - ["", "", True, "sqlite3_uri_parameter", "(const char *,sqlite3_filename,const char *)", "", "Argument[*0]", "ReturnValue[*]", "value", "dfc-generated"]
-      - ["", "", True, "sqlite3_uri_parameter", "(const char *,sqlite3_filename,const char *)", "", "Argument[0]", "ReturnValue", "taint", "dfc-generated"]
-      - ["", "", True, "sqlite3_uri_parameter", "(const char *,sqlite3_filename,const char *)", "", "Argument[0]", "ReturnValue[*]", "taint", "dfc-generated"]
-      - ["", "", True, "sqlite3_user_data", "(sqlite3_context *)", "", "Argument[*0]", "ReturnValue", "taint", "df-generated"]
-      - ["", "", True, "sqlite3_user_data", "(sqlite3_context *)", "", "Argument[*0]", "ReturnValue[**]", "taint", "df-generated"]
-      - ["", "", True, "sqlite3_user_data", "(sqlite3_context *)", "", "Argument[*0]", "ReturnValue[*]", "taint", "df-generated"]
-      - ["", "", True, "sqlite3_value_blob", "(sqlite3_value *)", "", "Argument[*0]", "ReturnValue", "taint", "df-generated"]
-      - ["", "", True, "sqlite3_value_blob", "(sqlite3_value *)", "", "Argument[*0]", "ReturnValue[*]", "taint", "df-generated"]
-      - ["", "", True, "sqlite3_value_bytes16", "(sqlite3_value *)", "", "Argument[*0]", "ReturnValue", "taint", "df-generated"]
-      - ["", "", True, "sqlite3_value_bytes", "(sqlite3_value *)", "", "Argument[*0]", "ReturnValue", "taint", "df-generated"]
-      - ["", "", True, "sqlite3_value_double", "(sqlite3_value *)", "", "Argument[*0]", "ReturnValue", "taint", "df-generated"]
-      - ["", "", True, "sqlite3_value_dup", "(const sqlite3_value *)", "", "Argument[*0]", "ReturnValue[*]", "value", "df-generated"]
-      - ["", "", True, "sqlite3_value_dup", "(const sqlite3_value *)", "", "Argument[0]", "ReturnValue[*]", "taint", "dfc-generated"]
-      - ["", "", True, "sqlite3_value_encoding", "(sqlite3_value *)", "", "Argument[*0].Field[*enc]", "ReturnValue", "value", "dfc-generated"]
-      - ["", "", True, "sqlite3_value_frombind", "(sqlite3_value *)", "", "Argument[*0].Field[*flags]", "ReturnValue", "taint", "dfc-generated"]
-      - ["", "", True, "sqlite3_value_int64", "(sqlite3_value *)", "", "Argument[*0]", "ReturnValue", "taint", "df-generated"]
-      - ["", "", True, "sqlite3_value_int", "(sqlite3_value *)", "", "Argument[*0]", "ReturnValue", "taint", "df-generated"]
-      - ["", "", True, "sqlite3_value_numeric_type", "(sqlite3_value *)", "", "Argument[*0]", "ReturnValue", "taint", "df-generated"]
-      - ["", "", True, "sqlite3_value_pointer", "(sqlite3_value *,const char *)", "", "Argument[*0].Field[**z]", "ReturnValue[*]", "value", "dfc-generated"]
-      - ["", "", True, "sqlite3_value_pointer", "(sqlite3_value *,const char *)", "", "Argument[*0].Field[*z]", "ReturnValue", "value", "dfc-generated"]
-      - ["", "", True, "sqlite3_value_subtype", "(sqlite3_value *)", "", "Argument[*0].Field[*eSubtype]", "ReturnValue", "value", "dfc-generated"]
-      - ["", "", True, "sqlite3_value_text16", "(sqlite3_value *)", "", "Argument[*0]", "ReturnValue", "taint", "df-generated"]
-      - ["", "", True, "sqlite3_value_text16", "(sqlite3_value *)", "", "Argument[*0]", "ReturnValue[*]", "taint", "df-generated"]
-      - ["", "", True, "sqlite3_value_text16be", "(sqlite3_value *)", "", "Argument[*0]", "ReturnValue", "taint", "df-generated"]
-      - ["", "", True, "sqlite3_value_text16be", "(sqlite3_value *)", "", "Argument[*0]", "ReturnValue[*]", "taint", "df-generated"]
-      - ["", "", True, "sqlite3_value_text16le", "(sqlite3_value *)", "", "Argument[*0]", "ReturnValue", "taint", "df-generated"]
-      - ["", "", True, "sqlite3_value_text16le", "(sqlite3_value *)", "", "Argument[*0]", "ReturnValue[*]", "taint", "df-generated"]
-      - ["", "", True, "sqlite3_value_text", "(sqlite3_value *)", "", "Argument[*0]", "ReturnValue", "taint", "df-generated"]
-      - ["", "", True, "sqlite3_value_text", "(sqlite3_value *)", "", "Argument[*0]", "ReturnValue[*]", "taint", "df-generated"]
-      - ["", "", True, "sqlite3_value_type", "(sqlite3_value *)", "", "Argument[*0].Field[*flags]", "ReturnValue", "taint", "dfc-generated"]
-      - ["", "", True, "sqlite3_vmprintf", "(const char *,va_list)", "", "Argument[1]", "Argument[*1]", "taint", "dfc-generated"]
-      - ["", "", True, "sqlite3_vsnprintf", "(int,char *,const char *,va_list)", "", "Argument[*1]", "ReturnValue[*]", "value", "dfc-generated"]
-      - ["", "", True, "sqlite3_vsnprintf", "(int,char *,const char *,va_list)", "", "Argument[1]", "ReturnValue", "value", "dfc-generated"]
-      - ["", "", True, "sqlite3_vsnprintf", "(int,char *,const char *,va_list)", "", "Argument[3]", "Argument[*3]", "taint", "dfc-generated"]
-      - ["", "", True, "sqlite3_vtab_collation", "(sqlite3_index_info *,int)", "", "Argument[0]", "Argument[*0]", "taint", "df-generated"]
-      - ["", "", True, "sqlite3_vtab_distinct", "(sqlite3_index_info *)", "", "Argument[*0].Field[*eDistinct]", "ReturnValue", "value", "dfc-generated"]
-      - ["", "", True, "sqlite3_vtab_in", "(sqlite3_index_info *,int,int)", "", "Argument[1]", "Argument[*0].Field[*mHandleIn]", "taint", "dfc-generated"]
-      - ["", "", True, "sqlite3_vtab_in_first", "(sqlite3_value *,sqlite3_value **)", "", "Argument[*0].Field[**z].Field[**pOut]", "Argument[**1]", "value", "dfc-generated"]
-      - ["", "", True, "sqlite3_vtab_in_first", "(sqlite3_value *,sqlite3_value **)", "", "Argument[*0].Field[**z].Field[*pOut]", "Argument[*1]", "value", "dfc-generated"]
-      - ["", "", True, "sqlite3_vtab_in_next", "(sqlite3_value *,sqlite3_value **)", "", "Argument[*0].Field[**z].Field[**pOut]", "Argument[**1]", "value", "dfc-generated"]
-      - ["", "", True, "sqlite3_vtab_in_next", "(sqlite3_value *,sqlite3_value **)", "", "Argument[*0].Field[**z].Field[*pOut]", "Argument[*1]", "value", "dfc-generated"]
-      - ["", "", True, "sqlite3_vtab_on_conflict", "(sqlite3 *)", "", "Argument[*0].Field[*vtabOnConflict]", "ReturnValue", "taint", "dfc-generated"]
-      - ["", "", True, "sqlite3_vtab_rhs_value", "(sqlite3_index_info *,int,sqlite3_value **)", "", "Argument[1]", "Argument[*0].Field[*aRhs]", "taint", "dfc-generated"]
-      - ["", "", True, "sqlite3_vtab_rhs_value", "(sqlite3_index_info *,int,sqlite3_value **)", "", "Argument[1]", "Argument[*2]", "taint", "dfc-generated"]
-      - ["", "", True, "sqlite3_wal_autocheckpoint", "(sqlite3 *,int)", "", "Argument[1]", "Argument[*0].Field[*pWalArg]", "value", "dfc-generated"]
-      - ["", "", True, "sqlite3_wal_checkpoint", "(sqlite3 *,const char *)", "", "Argument[0]", "Argument[*0].Field[**pErr].Field[*db]", "value", "dfc-generated"]
-      - ["", "", True, "sqlite3_wal_checkpoint_v2", "(sqlite3 *,const char *,int,int *,int *)", "", "Argument[0]", "Argument[*0].Field[**pErr].Field[*db]", "value", "dfc-generated"]
-      - ["", "", True, "sqlite3_wal_hook", "(sqlite3 *,..(*)(..),void *)", "", "Argument[**2]", "Argument[*0].Field[***pWalArg]", "value", "dfc-generated"]
-      - ["", "", True, "sqlite3_wal_hook", "(sqlite3 *,..(*)(..),void *)", "", "Argument[*2]", "Argument[*0].Field[**pWalArg]", "value", "dfc-generated"]
-      - ["", "", True, "sqlite3_wal_hook", "(sqlite3 *,..(*)(..),void *)", "", "Argument[1]", "Argument[*0].Field[*xWalCallback]", "value", "dfc-generated"]
-      - ["", "", True, "sqlite3_wal_hook", "(sqlite3 *,..(*)(..),void *)", "", "Argument[2]", "Argument[*0].Field[*pWalArg]", "value", "dfc-generated"]
-      - ["", "", True, "sqlite3_zipfile_init", "(sqlite3 *,char **,const sqlite3_api_routines *)", "", "Argument[0]", "Argument[*0].Field[**pErr].Field[*db]", "value", "dfc-generated"]
-      - ["", "", True, "statecmp", "(config *,config *)", "", "Argument[*0]", "ReturnValue", "taint", "df-generated"]
-      - ["", "", True, "statecmp", "(config *,config *)", "", "Argument[*1]", "ReturnValue", "taint", "df-generated"]
-      - ["", "", True, "statehash", "(config *)", "", "Argument[*0]", "ReturnValue", "taint", "df-generated"]
-      - ["", "", True, "strhash", "(const char *)", "", "Argument[*0]", "ReturnValue", "taint", "dfc-generated"]
-      - ["", "", True, "strhash", "(const char *)", "", "Argument[0]", "ReturnValue", "taint", "dfc-generated"]
-      - ["", "", True, "tplt_linedir", "(FILE *,int,char *)", "", "Argument[1]", "Argument[*0]", "taint", "dfc-generated"]
-      - ["", "", True, "tplt_linedir", "(FILE *,int,char *)", "", "Argument[2]", "Argument[*2]", "taint", "dfc-generated"]
-      - ["", "", True, "tplt_print", "(FILE *,lemon *,char *,int *)", "", "Argument[*1].Field[*outname]", "Argument[*1].Field[**outname]", "taint", "dfc-generated"]
-      - ["", "", True, "tplt_print", "(FILE *,lemon *,char *,int *)", "", "Argument[*3]", "Argument[*0]", "taint", "dfc-generated"]
-      - ["", "", True, "tplt_print", "(FILE *,lemon *,char *,int *)", "", "Argument[2]", "Argument[*2]", "taint", "dfc-generated"]
-      - ["", "", True, "tplt_print", "(FILE *,lemon *,char *,int *)", "", "Argument[3]", "Argument[*0]", "taint", "dfc-generated"]
-      - ["", "", True, "tplt_print", "(FILE *,lemon *,char *,int *)", "", "Argument[3]", "Argument[*3]", "taint", "dfc-generated"]
-      - ["", "", True, "tplt_skip_header", "(FILE *,int *)", "", "Argument[1]", "Argument[*1]", "taint", "dfc-generated"]
-      - ["", "", True, "tplt_xfer", "(char *,FILE *,FILE *,int *)", "", "Argument[*0]", "Argument[*2]", "taint", "dfc-generated"]
-      - ["", "", True, "tplt_xfer", "(char *,FILE *,FILE *,int *)", "", "Argument[*1]", "Argument[*2]", "taint", "dfc-generated"]
-      - ["", "", True, "tplt_xfer", "(char *,FILE *,FILE *,int *)", "", "Argument[0]", "Argument[*2]", "taint", "dfc-generated"]
-      - ["", "", True, "tplt_xfer", "(char *,FILE *,FILE *,int *)", "", "Argument[1]", "Argument[*2]", "taint", "dfc-generated"]
-      - ["", "", True, "tplt_xfer", "(char *,FILE *,FILE *,int *)", "", "Argument[3]", "Argument[*3]", "taint", "dfc-generated"]
-      - ["", "", True, "useDummyCS", "(void *,sqlite3 *,int,const char *)", "", "Argument[1]", "Argument[*1].Field[**pErr].Field[*db]", "value", "dfc-generated"]
-      - ["", "", True, "utf8_fromunicode", "(char *,unsigned int)", "", "Argument[0]", "Argument[*0]", "taint", "dfc-generated"]
-      - ["", "", True, "utf8_fromunicode", "(char *,unsigned int)", "", "Argument[1]", "Argument[*0]", "value", "dfc-generated"]
-      - ["", "", True, "zSkipValidUtf8", "(const char *,int,long)", "", "Argument[*0]", "ReturnValue[*]", "value", "dfc-generated"]
-      - ["", "", True, "zSkipValidUtf8", "(const char *,int,long)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
-      - ["", "", True, "zSkipValidUtf8", "(const char *,int,long)", "", "Argument[0]", "ReturnValue[*]", "taint", "dfc-generated"]

cpp/ql/lib/semmle/code/cpp/dataflow/internal/DataFlowUtil.qll

@@ -98,6 +98,19 @@ class Node extends TNode {
   /** Gets the location of this element. */
   Location getLocation() { none() } // overridden by subclasses
 
+  /**
+   * 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/).
+   */
+  deprecated predicate hasLocationInfo(
+    string filepath, int startline, int startcolumn, int endline, int endcolumn
+  ) {
+    this.getLocation().hasLocationInfo(filepath, startline, startcolumn, endline, endcolumn)
+  }
+
   /**
    * Gets an upper bound on the type of this node.
    */

cpp/ql/lib/semmle/code/cpp/dataflow/internal/FlowSummaryImpl.qll

@@ -22,11 +22,7 @@ module Input implements InputSig<Location, DataFlowImplSpecific::CppDataFlow> {
 
   ArgumentPosition callbackSelfParameterPosition() { result = TDirectPosition(-1) }
 
-  ReturnKind getStandardReturnValueKind() { result = getReturnValueKind("") }
-
-  ReturnKind getReturnValueKind(string arg) {
-    arg = repeatStars(result.(NormalReturnKind).getIndirectionIndex())
-  }
+  ReturnKind getStandardReturnValueKind() { result.(NormalReturnKind).getIndirectionIndex() = 0 }
 
   string encodeParameterPosition(ParameterPosition pos) { result = pos.toString() }
 

cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/DataFlowPrivate.qll

@@ -1143,10 +1143,6 @@ private newtype TDataFlowCall =
     FlowSummaryImpl::Private::summaryCallbackRange(c, receiver)
   }
 
-private predicate summarizedCallableIsManual(SummarizedCallable sc) {
-  sc.asSummarizedCallable().applyManualModel()
-}
-
 /**
  * A function call relevant for data flow. This includes calls from source
  * code and calls inside library callables with a flow summary.
@@ -1168,27 +1164,15 @@ class DataFlowCall extends TDataFlowCall {
   Function getStaticCallSourceTarget() { none() }
 
   /**
-   * Gets the target of this call. We use the following strategy for deciding
-   * between the source callable and a summarized callable:
-   * - If there is a manual summary then we always use the manual summary.
-   * - If there is a source callable and we only have generated summaries
-   * we use the source callable.
-   * - If there is no source callable then we use the summary regardless of
-   * whether is it manual or generated.
+   * Gets the target of this call. If a summarized callable exists for the
+   * target this is chosen, and otherwise the callable is the implementation
+   * from the source code.
    */
-  final DataFlowCallable getStaticCallTarget() {
+  DataFlowCallable getStaticCallTarget() {
     exists(Function target | target = this.getStaticCallSourceTarget() |
-      // Don't use the source callable if there is a manual model for the
-      // target
-      not exists(SummarizedCallable sc |
-        sc.asSummarizedCallable() = target and
-        summarizedCallableIsManual(sc)
-      ) and
+      not exists(TSummarizedCallable(target)) and
       result.asSourceCallable() = target
       or
-      // When there is no function body, or when we have a manual model then
-      // we dispatch to the summary.
-      (not target.hasDefinition() or summarizedCallableIsManual(result)) and
       result.asSummarizedCallable() = target
     )
   }
@@ -1903,10 +1887,6 @@ module IteratorFlow {
     predicate allowFlowIntoUncertainDef(IteratorSsa::UncertainWriteDefinition def) { any() }
 
     class Guard extends Void {
-      predicate hasBranchEdge(SsaInput::BasicBlock bb1, SsaInput::BasicBlock bb2, boolean branch) {
-        none()
-      }
-
       predicate controlsBranchEdge(
         SsaInput::BasicBlock bb1, SsaInput::BasicBlock bb2, boolean branch
       ) {

cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/DataFlowUtil.qll

@@ -538,6 +538,19 @@ class Node extends TIRDataFlowNode {
     none() // overridden by subclasses
   }
 
+  /**
+   * 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/).
+   */
+  deprecated predicate hasLocationInfo(
+    string filepath, int startline, int startcolumn, int endline, int endcolumn
+  ) {
+    this.getLocation().hasLocationInfo(filepath, startline, startcolumn, endline, endcolumn)
+  }
+
   /** Gets a textual representation of this element. */
   cached
   final string toString() {

cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/ExprNodes.qll

@@ -45,28 +45,6 @@ private module Cached {
     )
   }
 
-  private Expr getRankedElementExpr(ArrayAggregateLiteral aggr, int rnk) {
-    result =
-      rank[rnk + 1](Expr e, int elementIndex, int position |
-        e = aggr.getElementExpr(elementIndex, position)
-      |
-        e order by elementIndex, position
-      )
-  }
-
-  private class LastArrayAggregateStore extends StoreInstruction {
-    ArrayAggregateLiteral aggr;
-
-    LastArrayAggregateStore() {
-      exists(int rnk |
-        this.getSourceValue().getUnconvertedResultExpression() = getRankedElementExpr(aggr, rnk) and
-        not exists(getRankedElementExpr(aggr, rnk + 1))
-      )
-    }
-
-    ArrayAggregateLiteral getArrayAggregateLiteral() { result = aggr }
-  }
-
   private Expr getConvertedResultExpressionImpl0(Instruction instr) {
     // IR construction inserts an additional cast to a `size_t` on the extent
     // of a `new[]` expression. The resulting `ConvertInstruction` doesn't have
@@ -117,16 +95,6 @@ private module Cached {
       tco.producesExprResult() and
       result = asDefinitionImpl0(instr)
     )
-    or
-    // IR construction breaks an array aggregate literal `{1, 2, 3}` into a
-    // sequence of `StoreInstruction`s. So there's no instruction `i` for which
-    // `i.getUnconvertedResultExpression() instanceof ArrayAggregateLiteral`.
-    // So we map the instruction node corresponding to the last `Store`
-    // instruction of the sequence to the result of the array aggregate
-    // literal. This makes sense since this store will immediately flow into
-    // the indirect node representing the array. So this node does represent
-    // the array after it has been fully initialized.
-    result = instr.(LastArrayAggregateStore).getArrayAggregateLiteral()
   }
 
   private Expr getConvertedResultExpressionImpl(Instruction instr) {
@@ -296,41 +264,6 @@ private module Cached {
     e = getConvertedResultExpression(node.asInstruction(), n)
   }
 
-  /**
-   * The IR doesn't have an instruction `i` for which this holds:
-   * ```
-   * i.getUnconvertedResultExpression() instanceof ClassAggregateLiteral
-   * ```
-   * and thus we don't automatically get a dataflow node for which:
-   * ```
-   * node.asExpr() instanceof ClassAggregateLiteral
-   * ```
-   * This is because the IR represents a `ClassAggregateLiteral` as a sequence
-   * of field writes. To work around this we map `asExpr` on the
-   * `PostUpdateNode` for the last field write to the class aggregate literal.
-   */
-  private class ClassAggregateInitializerPostUpdateNode extends PostFieldUpdateNode {
-    ClassAggregateLiteral aggr;
-
-    ClassAggregateInitializerPostUpdateNode() {
-      exists(Node node1, FieldContent fc, int position, StoreInstruction store |
-        store.getSourceValue().getUnconvertedResultExpression() =
-          aggr.getFieldExpr(fc.getField(), position) and
-        node1.asInstruction() = store and
-        // This is the last field write from the aggregate initialization.
-        not exists(aggr.getFieldExpr(_, position + 1)) and
-        storeStep(node1, fc, this)
-      )
-    }
-
-    ClassAggregateLiteral getClassAggregateLiteral() { result = aggr }
-  }
-
-  private predicate exprNodeShouldBePostUpdateNode(Node node, Expr e, int n) {
-    node.(ClassAggregateInitializerPostUpdateNode).getClassAggregateLiteral() = e and
-    n = 0
-  }
-
   /** Holds if `node` should be an `IndirectInstruction` that maps `node.asIndirectExpr()` to `e`. */
   private predicate indirectExprNodeShouldBeIndirectInstruction(
     IndirectInstruction node, Expr e, int n, int indirectionIndex
@@ -361,8 +294,7 @@ private module Cached {
     exprNodeShouldBeInstruction(_, e, n) or
     exprNodeShouldBeOperand(_, e, n) or
     exprNodeShouldBeIndirectOutNode(_, e, n) or
-    exprNodeShouldBeIndirectOperand(_, e, n) or
-    exprNodeShouldBePostUpdateNode(_, e, n)
+    exprNodeShouldBeIndirectOperand(_, e, n)
   }
 
   private class InstructionExprNode extends ExprNodeBase, InstructionNode {
@@ -510,12 +442,6 @@ private module Cached {
     final override Expr getConvertedExpr(int n) { exprNodeShouldBeIndirectOperand(this, result, n) }
   }
 
-  private class PostUpdateExprNode extends ExprNodeBase instanceof PostUpdateNode {
-    PostUpdateExprNode() { exprNodeShouldBePostUpdateNode(this, _, _) }
-
-    final override Expr getConvertedExpr(int n) { exprNodeShouldBePostUpdateNode(this, result, n) }
-  }
-
   /**
    * An expression, viewed as a node in a data flow graph.
    */

cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/SsaInternals.qll

@@ -991,17 +991,13 @@ private module DataFlowIntegrationInput implements SsaImpl::DataFlowIntegrationI
   class Guard instanceof IRGuards::IRGuardCondition {
     string toString() { result = super.toString() }
 
-    predicate hasBranchEdge(SsaInput::BasicBlock bb1, SsaInput::BasicBlock bb2, boolean branch) {
+    predicate controlsBranchEdge(SsaInput::BasicBlock bb1, SsaInput::BasicBlock bb2, boolean branch) {
       exists(EdgeKind kind |
         super.getBlock() = bb1 and
         kind = getConditionalEdge(branch) and
         bb1.getSuccessor(kind) = bb2
       )
     }
-
-    predicate controlsBranchEdge(SsaInput::BasicBlock bb1, SsaInput::BasicBlock bb2, boolean branch) {
-      this.hasBranchEdge(bb1, bb2, branch)
-    }
   }
 
   predicate guardDirectlyControlsBlock(Guard guard, SsaInput::BasicBlock bb, boolean branch) {

cpp/ql/lib/semmle/code/cpp/rangeanalysis/new/internal/semantic/SemanticCFG.qll

@@ -10,7 +10,7 @@ private import SemanticExprSpecific::SemanticExprConfig as Specific
  */
 class SemBasicBlock extends Specific::BasicBlock {
   /** Holds if this block (transitively) dominates `otherblock`. */
-  final predicate dominates(SemBasicBlock otherBlock) { Specific::bbDominates(this, otherBlock) }
+  final predicate bbDominates(SemBasicBlock otherBlock) { Specific::bbDominates(this, otherBlock) }
 
   /** Gets an expression that is evaluated in this basic block. */
   final SemExpr getAnExpr() { result.getBasicBlock() = this }

cpp/ql/lib/semmle/code/cpp/rangeanalysis/new/internal/semantic/SemanticExprSpecific.qll

@@ -264,6 +264,10 @@ module SemanticExprConfig {
 
   Guard comparisonGuard(Expr e) { getSemanticExpr(result) = e }
 
+  predicate implies_v2(Guard g1, boolean b1, Guard g2, boolean b2) {
+    none() // TODO
+  }
+
   /** Gets the expression associated with `instr`. */
   SemExpr getSemanticExpr(IR::Instruction instr) { result = instr }
 }

cpp/ql/lib/semmle/code/cpp/rangeanalysis/new/internal/semantic/SemanticGuard.qll

@@ -18,11 +18,11 @@ class SemGuard instanceof Specific::Guard {
     Specific::equalityGuard(this, e1, e2, polarity)
   }
 
-  final predicate controls(SemBasicBlock controlled, boolean branch) {
+  final predicate directlyControls(SemBasicBlock controlled, boolean branch) {
     Specific::guardDirectlyControlsBlock(this, controlled, branch)
   }
 
-  final predicate controlsBranchEdge(SemBasicBlock bb1, SemBasicBlock bb2, boolean branch) {
+  final predicate hasBranchEdge(SemBasicBlock bb1, SemBasicBlock bb2, boolean branch) {
     Specific::guardHasBranchEdge(this, bb1, bb2, branch)
   }
 
@@ -31,4 +31,8 @@ class SemGuard instanceof Specific::Guard {
   final SemExpr asExpr() { result = Specific::getGuardAsExpr(this) }
 }
 
+predicate semImplies_v2(SemGuard g1, boolean b1, SemGuard g2, boolean b2) {
+  Specific::implies_v2(g1, b1, g2, b2)
+}
+
 SemGuard semGetComparisonGuard(SemRelationalExpr e) { result = Specific::comparisonGuard(e) }

cpp/ql/lib/semmle/code/cpp/rangeanalysis/new/internal/semantic/analysis/RangeAnalysisImpl.qll

@@ -77,6 +77,8 @@ module Sem implements Semantic<SemLocation> {
 
   class Guard = SemGuard;
 
+  predicate implies_v2 = semImplies_v2/4;
+
   class Type = SemType;
 
   class IntegerType = SemIntegerType;

cpp/ql/lib/semmle/code/cpp/security/FlowSources.qll

@@ -55,12 +55,12 @@ private class LocalModelSource extends LocalFlowSource {
 }
 
 /**
- * A local data flow source that the `argv` parameter to `main` or `wmain`.
+ * A local data flow source that the `argv` parameter to `main`.
  */
 private class ArgvSource extends LocalFlowSource {
   ArgvSource() {
     exists(Function main, Parameter argv |
-      main.hasGlobalName(["main", "wmain"]) and
+      main.hasGlobalName("main") and
       main.getParameter(1) = argv and
       this.asParameter(2) = argv
     )

cpp/ql/lib/semmle/code/cpp/security/Security.qll

@@ -42,6 +42,58 @@ class SecurityOptions extends string {
     )
   }
 
+  /**
+   * The argument of the given function is filled in from user input.
+   */
+  deprecated predicate userInputArgument(FunctionCall functionCall, int arg) {
+    exists(string fname |
+      functionCall.getTarget().hasGlobalOrStdName(fname) and
+      exists(functionCall.getArgument(arg)) and
+      (
+        fname = ["fread", "fgets", "fgetws", "gets"] and arg = 0
+        or
+        fname = "scanf" and arg >= 1
+        or
+        fname = "fscanf" and arg >= 2
+      )
+      or
+      functionCall.getTarget().hasGlobalName(fname) and
+      exists(functionCall.getArgument(arg)) and
+      fname = "getaddrinfo" and
+      arg = 3
+    )
+    or
+    exists(RemoteFlowSourceFunction remote, FunctionOutput output |
+      functionCall.getTarget() = remote and
+      output.isParameterDerefOrQualifierObject(arg) and
+      remote.hasRemoteFlowSource(output, _)
+    )
+  }
+
+  /**
+   * The return value of the given function is filled in from user input.
+   */
+  deprecated predicate userInputReturned(FunctionCall functionCall) {
+    exists(string fname |
+      functionCall.getTarget().getName() = fname and
+      (
+        fname = ["fgets", "gets"] or
+        this.userInputReturn(fname)
+      )
+    )
+    or
+    exists(RemoteFlowSourceFunction remote, FunctionOutput output |
+      functionCall.getTarget() = remote and
+      (output.isReturnValue() or output.isReturnValueDeref()) and
+      remote.hasRemoteFlowSource(output, _)
+    )
+  }
+
+  /**
+   * DEPRECATED: Users should override `userInputReturned()` instead.
+   */
+  deprecated predicate userInputReturn(string function) { none() }
+
   /**
    * The argument of the given function is used for running a process or loading
    * a library.
@@ -56,6 +108,29 @@ class SecurityOptions extends string {
     function = ["LoadLibrary", "LoadLibraryA", "LoadLibraryW"] and arg = 0
   }
 
+  /**
+   * This predicate should hold if the expression is directly
+   * computed from user input. Such expressions are treated as
+   * sources of taint.
+   */
+  deprecated predicate isUserInput(Expr expr, string cause) {
+    exists(FunctionCall fc, int i |
+      this.userInputArgument(fc, i) and
+      expr = fc.getArgument(i) and
+      cause = fc.getTarget().getName()
+    )
+    or
+    exists(FunctionCall fc |
+      this.userInputReturned(fc) and
+      expr = fc and
+      cause = fc.getTarget().getName()
+    )
+    or
+    commandLineArg(expr) and cause = "argv"
+    or
+    expr.(EnvironmentRead).getSourceDescription() = cause
+  }
+
   /**
    * This predicate should hold if the expression raises privilege for the
    * current session. The default definition only holds true for some
@@ -77,6 +152,16 @@ class SecurityOptions extends string {
   }
 }
 
+/**
+ * An access to the argv argument to main().
+ */
+private predicate commandLineArg(Expr e) {
+  exists(Parameter argv |
+    argv(argv) and
+    argv.getAnAccess() = e
+  )
+}
+
 /** The argv parameter to the main function */
 predicate argv(Parameter argv) {
   exists(Function f |
@@ -88,6 +173,21 @@ predicate argv(Parameter argv) {
 /** Convenience accessor for SecurityOptions.isPureFunction */
 predicate isPureFunction(string name) { exists(SecurityOptions opts | opts.isPureFunction(name)) }
 
+/** Convenience accessor for SecurityOptions.userInputArgument */
+deprecated predicate userInputArgument(FunctionCall functionCall, int arg) {
+  exists(SecurityOptions opts | opts.userInputArgument(functionCall, arg))
+}
+
+/** Convenience accessor for SecurityOptions.userInputReturn */
+deprecated predicate userInputReturned(FunctionCall functionCall) {
+  exists(SecurityOptions opts | opts.userInputReturned(functionCall))
+}
+
+/** Convenience accessor for SecurityOptions.isUserInput */
+deprecated predicate isUserInput(Expr expr, string cause) {
+  exists(SecurityOptions opts | opts.isUserInput(expr, cause))
+}
+
 /** Convenience accessor for SecurityOptions.isProcessOperationArgument */
 predicate isProcessOperationArgument(string function, int arg) {
   exists(SecurityOptions opts | opts.isProcessOperationArgument(function, arg))

cpp/ql/lib/semmle/code/cpp/security/SecurityOptions.qll

@@ -22,4 +22,28 @@ class CustomSecurityOptions extends SecurityOptions {
     // for example: (function = "MySpecialSqlFunction" and arg = 0)
     none() // rules to match custom functions replace this line
   }
+
+  deprecated override predicate userInputArgument(FunctionCall functionCall, int arg) {
+    SecurityOptions.super.userInputArgument(functionCall, arg)
+    or
+    exists(string fname |
+      functionCall.getTarget().hasGlobalName(fname) and
+      exists(functionCall.getArgument(arg)) and
+      // --- custom functions that return user input via one of their arguments:
+      // 'arg' is the 0-based index of the argument that is used to return user input
+      // for example: (fname = "readXmlInto" and arg = 1)
+      none() // rules to match custom functions replace this line
+    )
+  }
+
+  deprecated override predicate userInputReturned(FunctionCall functionCall) {
+    SecurityOptions.super.userInputReturned(functionCall)
+    or
+    exists(string fname |
+      functionCall.getTarget().hasGlobalName(fname) and
+      // --- custom functions that return user input via their return value:
+      // for example: fname = "xmlReadAttribute"
+      none() // rules to match custom functions replace this line
+    )
+  }
 }

cpp/ql/lib/utils/test/dataflow/FlowTestCommon.qll

@@ -26,7 +26,7 @@ module IRFlowTest<IRDataFlow::GlobalFlowSig Flow> implements TestSig {
       n =
         strictcount(int line, int column |
           Flow::flow(any(IRDataFlow::Node otherSource |
-              otherSource.getLocation().hasLocationInfo(_, line, column, _, _)
+              otherSource.hasLocationInfo(_, line, column, _, _)
             ), sink)
         ) and
       (
@@ -55,7 +55,7 @@ module AstFlowTest<AstDataFlow::GlobalFlowSig Flow> implements TestSig {
       n =
         strictcount(int line, int column |
           Flow::flow(any(AstDataFlow::Node otherSource |
-              otherSource.getLocation().hasLocationInfo(_, line, column, _, _)
+              otherSource.hasLocationInfo(_, line, column, _, _)
             ), sink)
         ) and
       (

cpp/ql/src/change-notes/2025-05-14-openssl-sqlite-models.md

@@ -1,4 +0,0 @@
----
-category: minorAnalysis
----
-* Added flow model for the `SQLite` and `OpenSSL` libraries. This may result in more alerts when running queries on codebases that use these libraries.

cpp/ql/src/utils/modelgenerator/internal/CaptureModels.qll

@@ -13,8 +13,6 @@ private import semmle.code.cpp.ir.dataflow.internal.TaintTrackingImplSpecific
 private import semmle.code.cpp.dataflow.new.TaintTracking as Tt
 private import semmle.code.cpp.dataflow.new.DataFlow as Df
 private import codeql.mad.modelgenerator.internal.ModelGeneratorImpl
-private import semmle.code.cpp.models.interfaces.Taint as Taint
-private import semmle.code.cpp.models.interfaces.DataFlow as DataFlow
 
 /**
  * Holds if `f` is a "private" function.
@@ -47,26 +45,6 @@ private predicate isUninterestingForModels(Callable api) {
   api = any(Cpp::LambdaExpression lambda).getLambdaFunction()
   or
   api.isFromUninstantiatedTemplate(_)
-  or
-  // No need to generate models for functions modeled by hand in QL
-  api instanceof Taint::TaintFunction
-  or
-  api instanceof DataFlow::DataFlowFunction
-  or
-  // Don't generate models for main functions
-  api.hasGlobalName("main")
-  or
-  // Don't generate models for system-provided functions. If we want to
-  // generate models for these we should use a database containing the
-  // implementations of those system-provided functions in the source root.
-  not exists(api.getLocation().getFile().getRelativePath())
-  or
-  // Exclude functions in test directories (but not the ones in the CodeQL test directory)
-  exists(Cpp::File f |
-    f = api.getFile() and
-    f.getAbsolutePath().matches("%test%") and
-    not f.getAbsolutePath().matches("%test/library-tests/dataflow/modelgenerator/dataflow/%")
-  )
 }
 
 private predicate relevant(Callable api) {

cpp/ql/test/library-tests/dataflow/asExpr/test.cpp

@@ -21,20 +21,3 @@ A& get_ref();
 void test2() {
   take_ref(get_ref()); // $ asExpr="call to get_ref" asIndirectExpr="call to get_ref"
 }
-
-struct S {
-  int a;
-  int b;
-};
-
-void test_aggregate_literal() {
-  S s1 = {1, 2}; // $ asExpr=1 asExpr=2 asExpr={...}
-  const S s2 = {3, 4}; // $ asExpr=3 asExpr=4 asExpr={...}
-  S s3 = (S){5, 6}; // $ asExpr=5 asExpr=6 asExpr={...}
-  const S s4 = (S){7, 8}; // $ asExpr=7 asExpr=8 asExpr={...}
-
-  S s5 = {.a = 1, .b = 2}; // $ asExpr=1 asExpr=2 asExpr={...}
-
-  int xs[] = {1, 2, 3}; // $ asExpr=1 asExpr=2 asExpr=3 asExpr={...}
-  const int ys[] = {[0] = 4, [1] = 5, [0] = 6}; // $ asExpr=4 asExpr=5 asExpr=6 asExpr={...}
-}

cpp/ql/test/library-tests/dataflow/dataflow-tests/localFlow-ir.expected

@@ -17,6 +17,7 @@
 | example.c:17:11:17:16 | *definition of coords | example.c:17:11:17:16 | *definition of coords |
 | example.c:17:11:17:16 | *definition of coords | example.c:17:11:17:16 | *definition of coords |
 | example.c:17:11:17:16 | *definition of coords | example.c:24:13:24:18 | *coords |
+| example.c:17:11:17:16 | *definition of coords [post update] | example.c:17:11:17:16 | *definition of coords |
 | example.c:17:11:17:16 | *definition of coords [post update] | example.c:24:13:24:18 | *coords |
 | example.c:17:11:17:16 | definition of coords | example.c:17:11:17:16 | *definition of coords |
 | example.c:17:11:17:16 | definition of coords | example.c:17:11:17:16 | definition of coords |
@@ -26,7 +27,6 @@
 | example.c:17:11:17:16 | definition of coords | example.c:24:13:24:18 | coords |
 | example.c:17:11:17:16 | definition of coords [post update] | example.c:17:11:17:16 | definition of coords |
 | example.c:17:11:17:16 | definition of coords [post update] | example.c:24:13:24:18 | coords |
-| example.c:17:11:17:16 | {...} | example.c:17:11:17:16 | *definition of coords |
 | example.c:17:19:17:22 | {...} | example.c:17:19:17:22 | {...} |
 | example.c:17:21:17:21 | 0 | example.c:17:21:17:21 | 0 |
 | example.c:19:6:19:6 | *b | example.c:15:37:15:37 | *b |

cpp/ql/test/library-tests/dataflow/external-models/flow.expected

@@ -10,33 +10,14 @@ edges
 | asio_streams.cpp:100:44:100:62 | call to buffer | asio_streams.cpp:103:29:103:39 | *send_buffer | provenance | Sink:MaD:6 |
 | asio_streams.cpp:100:64:100:71 | *send_str | asio_streams.cpp:56:18:56:23 | [summary param] *0 in buffer | provenance |  |
 | asio_streams.cpp:100:64:100:71 | *send_str | asio_streams.cpp:100:44:100:62 | call to buffer | provenance | MaD:10 |
-| test.cpp:4:5:4:17 | [summary param] 0 in ymlStepManual | test.cpp:4:5:4:17 | [summary] to write: ReturnValue in ymlStepManual | provenance | MaD:23489 |
-| test.cpp:5:5:5:20 | [summary param] 0 in ymlStepGenerated | test.cpp:5:5:5:20 | [summary] to write: ReturnValue in ymlStepGenerated | provenance | MaD:23490 |
-| test.cpp:6:5:6:27 | [summary param] 0 in ymlStepManual_with_body | test.cpp:6:5:6:27 | [summary] to write: ReturnValue in ymlStepManual_with_body | provenance | MaD:23491 |
-| test.cpp:7:47:7:52 | value2 | test.cpp:7:64:7:69 | value2 | provenance |  |
-| test.cpp:7:64:7:69 | value2 | test.cpp:7:5:7:30 | *ymlStepGenerated_with_body | provenance |  |
-| test.cpp:10:10:10:18 | call to ymlSource | test.cpp:10:10:10:18 | call to ymlSource | provenance | Src:MaD:23487  |
-| test.cpp:10:10:10:18 | call to ymlSource | test.cpp:14:10:14:10 | x | provenance | Sink:MaD:23488 |
-| test.cpp:10:10:10:18 | call to ymlSource | test.cpp:17:24:17:24 | x | provenance |  |
-| test.cpp:10:10:10:18 | call to ymlSource | test.cpp:21:27:21:27 | x | provenance |  |
-| test.cpp:10:10:10:18 | call to ymlSource | test.cpp:25:35:25:35 | x | provenance |  |
-| test.cpp:10:10:10:18 | call to ymlSource | test.cpp:32:41:32:41 | x | provenance |  |
-| test.cpp:17:10:17:22 | call to ymlStepManual | test.cpp:17:10:17:22 | call to ymlStepManual | provenance |  |
-| test.cpp:17:10:17:22 | call to ymlStepManual | test.cpp:18:10:18:10 | y | provenance | Sink:MaD:23488 |
-| test.cpp:17:24:17:24 | x | test.cpp:4:5:4:17 | [summary param] 0 in ymlStepManual | provenance |  |
-| test.cpp:17:24:17:24 | x | test.cpp:17:10:17:22 | call to ymlStepManual | provenance | MaD:23489 |
-| test.cpp:21:10:21:25 | call to ymlStepGenerated | test.cpp:21:10:21:25 | call to ymlStepGenerated | provenance |  |
-| test.cpp:21:10:21:25 | call to ymlStepGenerated | test.cpp:22:10:22:10 | z | provenance | Sink:MaD:23488 |
-| test.cpp:21:27:21:27 | x | test.cpp:5:5:5:20 | [summary param] 0 in ymlStepGenerated | provenance |  |
-| test.cpp:21:27:21:27 | x | test.cpp:21:10:21:25 | call to ymlStepGenerated | provenance | MaD:23490 |
-| test.cpp:25:11:25:33 | call to ymlStepManual_with_body | test.cpp:25:11:25:33 | call to ymlStepManual_with_body | provenance |  |
-| test.cpp:25:11:25:33 | call to ymlStepManual_with_body | test.cpp:26:10:26:11 | y2 | provenance | Sink:MaD:23488 |
-| test.cpp:25:35:25:35 | x | test.cpp:6:5:6:27 | [summary param] 0 in ymlStepManual_with_body | provenance |  |
-| test.cpp:25:35:25:35 | x | test.cpp:25:11:25:33 | call to ymlStepManual_with_body | provenance | MaD:23491 |
-| test.cpp:32:11:32:36 | call to ymlStepGenerated_with_body | test.cpp:32:11:32:36 | call to ymlStepGenerated_with_body | provenance |  |
-| test.cpp:32:11:32:36 | call to ymlStepGenerated_with_body | test.cpp:33:10:33:11 | z2 | provenance | Sink:MaD:23488 |
-| test.cpp:32:41:32:41 | x | test.cpp:7:47:7:52 | value2 | provenance |  |
-| test.cpp:32:41:32:41 | x | test.cpp:32:11:32:36 | call to ymlStepGenerated_with_body | provenance |  |
+| test.cpp:4:5:4:11 | [summary param] 0 in ymlStep | test.cpp:4:5:4:11 | [summary] to write: ReturnValue in ymlStep | provenance | MaD:969 |
+| test.cpp:7:10:7:18 | call to ymlSource | test.cpp:7:10:7:18 | call to ymlSource | provenance | Src:MaD:967  |
+| test.cpp:7:10:7:18 | call to ymlSource | test.cpp:11:10:11:10 | x | provenance | Sink:MaD:968 |
+| test.cpp:7:10:7:18 | call to ymlSource | test.cpp:13:18:13:18 | x | provenance |  |
+| test.cpp:13:10:13:16 | call to ymlStep | test.cpp:13:10:13:16 | call to ymlStep | provenance |  |
+| test.cpp:13:10:13:16 | call to ymlStep | test.cpp:15:10:15:10 | y | provenance | Sink:MaD:968 |
+| test.cpp:13:18:13:18 | x | test.cpp:4:5:4:11 | [summary param] 0 in ymlStep | provenance |  |
+| test.cpp:13:18:13:18 | x | test.cpp:13:10:13:16 | call to ymlStep | provenance | MaD:969 |
 nodes
 | asio_streams.cpp:56:18:56:23 | [summary param] *0 in buffer | semmle.label | [summary param] *0 in buffer |
 | asio_streams.cpp:56:18:56:23 | [summary] to write: ReturnValue in buffer | semmle.label | [summary] to write: ReturnValue in buffer |
@@ -50,37 +31,15 @@ nodes
 | asio_streams.cpp:100:64:100:71 | *send_str | semmle.label | *send_str |
 | asio_streams.cpp:101:7:101:17 | send_buffer | semmle.label | send_buffer |
 | asio_streams.cpp:103:29:103:39 | *send_buffer | semmle.label | *send_buffer |
-| test.cpp:4:5:4:17 | [summary param] 0 in ymlStepManual | semmle.label | [summary param] 0 in ymlStepManual |
-| test.cpp:4:5:4:17 | [summary] to write: ReturnValue in ymlStepManual | semmle.label | [summary] to write: ReturnValue in ymlStepManual |
-| test.cpp:5:5:5:20 | [summary param] 0 in ymlStepGenerated | semmle.label | [summary param] 0 in ymlStepGenerated |
-| test.cpp:5:5:5:20 | [summary] to write: ReturnValue in ymlStepGenerated | semmle.label | [summary] to write: ReturnValue in ymlStepGenerated |
-| test.cpp:6:5:6:27 | [summary param] 0 in ymlStepManual_with_body | semmle.label | [summary param] 0 in ymlStepManual_with_body |
-| test.cpp:6:5:6:27 | [summary] to write: ReturnValue in ymlStepManual_with_body | semmle.label | [summary] to write: ReturnValue in ymlStepManual_with_body |
-| test.cpp:7:5:7:30 | *ymlStepGenerated_with_body | semmle.label | *ymlStepGenerated_with_body |
-| test.cpp:7:47:7:52 | value2 | semmle.label | value2 |
-| test.cpp:7:64:7:69 | value2 | semmle.label | value2 |
-| test.cpp:10:10:10:18 | call to ymlSource | semmle.label | call to ymlSource |
-| test.cpp:10:10:10:18 | call to ymlSource | semmle.label | call to ymlSource |
-| test.cpp:14:10:14:10 | x | semmle.label | x |
-| test.cpp:17:10:17:22 | call to ymlStepManual | semmle.label | call to ymlStepManual |
-| test.cpp:17:10:17:22 | call to ymlStepManual | semmle.label | call to ymlStepManual |
-| test.cpp:17:24:17:24 | x | semmle.label | x |
-| test.cpp:18:10:18:10 | y | semmle.label | y |
-| test.cpp:21:10:21:25 | call to ymlStepGenerated | semmle.label | call to ymlStepGenerated |
-| test.cpp:21:10:21:25 | call to ymlStepGenerated | semmle.label | call to ymlStepGenerated |
-| test.cpp:21:27:21:27 | x | semmle.label | x |
-| test.cpp:22:10:22:10 | z | semmle.label | z |
-| test.cpp:25:11:25:33 | call to ymlStepManual_with_body | semmle.label | call to ymlStepManual_with_body |
-| test.cpp:25:11:25:33 | call to ymlStepManual_with_body | semmle.label | call to ymlStepManual_with_body |
-| test.cpp:25:35:25:35 | x | semmle.label | x |
-| test.cpp:26:10:26:11 | y2 | semmle.label | y2 |
-| test.cpp:32:11:32:36 | call to ymlStepGenerated_with_body | semmle.label | call to ymlStepGenerated_with_body |
-| test.cpp:32:11:32:36 | call to ymlStepGenerated_with_body | semmle.label | call to ymlStepGenerated_with_body |
-| test.cpp:32:41:32:41 | x | semmle.label | x |
-| test.cpp:33:10:33:11 | z2 | semmle.label | z2 |
+| test.cpp:4:5:4:11 | [summary param] 0 in ymlStep | semmle.label | [summary param] 0 in ymlStep |
+| test.cpp:4:5:4:11 | [summary] to write: ReturnValue in ymlStep | semmle.label | [summary] to write: ReturnValue in ymlStep |
+| test.cpp:7:10:7:18 | call to ymlSource | semmle.label | call to ymlSource |
+| test.cpp:7:10:7:18 | call to ymlSource | semmle.label | call to ymlSource |
+| test.cpp:11:10:11:10 | x | semmle.label | x |
+| test.cpp:13:10:13:16 | call to ymlStep | semmle.label | call to ymlStep |
+| test.cpp:13:10:13:16 | call to ymlStep | semmle.label | call to ymlStep |
+| test.cpp:13:18:13:18 | x | semmle.label | x |
+| test.cpp:15:10:15:10 | y | semmle.label | y |
 subpaths
 | asio_streams.cpp:100:64:100:71 | *send_str | asio_streams.cpp:56:18:56:23 | [summary param] *0 in buffer | asio_streams.cpp:56:18:56:23 | [summary] to write: ReturnValue in buffer | asio_streams.cpp:100:44:100:62 | call to buffer |
-| test.cpp:17:24:17:24 | x | test.cpp:4:5:4:17 | [summary param] 0 in ymlStepManual | test.cpp:4:5:4:17 | [summary] to write: ReturnValue in ymlStepManual | test.cpp:17:10:17:22 | call to ymlStepManual |
-| test.cpp:21:27:21:27 | x | test.cpp:5:5:5:20 | [summary param] 0 in ymlStepGenerated | test.cpp:5:5:5:20 | [summary] to write: ReturnValue in ymlStepGenerated | test.cpp:21:10:21:25 | call to ymlStepGenerated |
-| test.cpp:25:35:25:35 | x | test.cpp:6:5:6:27 | [summary param] 0 in ymlStepManual_with_body | test.cpp:6:5:6:27 | [summary] to write: ReturnValue in ymlStepManual_with_body | test.cpp:25:11:25:33 | call to ymlStepManual_with_body |
-| test.cpp:32:41:32:41 | x | test.cpp:7:47:7:52 | value2 | test.cpp:7:5:7:30 | *ymlStepGenerated_with_body | test.cpp:32:11:32:36 | call to ymlStepGenerated_with_body |
+| test.cpp:13:18:13:18 | x | test.cpp:4:5:4:11 | [summary param] 0 in ymlStep | test.cpp:4:5:4:11 | [summary] to write: ReturnValue in ymlStep | test.cpp:13:10:13:16 | call to ymlStep |

cpp/ql/test/library-tests/dataflow/external-models/flow.ext.yml

@@ -13,7 +13,4 @@ extensions:
       pack: codeql/cpp-all
       extensible: summaryModel
     data: # namespace, type, subtypes, name, signature, ext, input, output, kind, provenance
-      - ["", "", False, "ymlStepManual", "", "", "Argument[0]", "ReturnValue", "taint", "manual"]
-      - ["", "", False, "ymlStepGenerated", "", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["", "", False, "ymlStepManual_with_body", "", "", "Argument[0]", "ReturnValue", "taint", "manual"]
-      - ["", "", False, "ymlStepGenerated_with_body", "", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["", "", False, "ymlStep", "", "", "Argument[0]", "ReturnValue", "taint", "manual"]

cpp/ql/test/library-tests/dataflow/external-models/sinks.expected

@@ -1,10 +1,5 @@
 | asio_streams.cpp:93:29:93:39 | *recv_buffer | remote-sink |
 | asio_streams.cpp:103:29:103:39 | *send_buffer | remote-sink |
-| test.cpp:12:10:12:10 | 0 | test-sink |
-| test.cpp:14:10:14:10 | x | test-sink |
-| test.cpp:18:10:18:10 | y | test-sink |
-| test.cpp:22:10:22:10 | z | test-sink |
-| test.cpp:26:10:26:11 | y2 | test-sink |
-| test.cpp:29:10:29:11 | y3 | test-sink |
-| test.cpp:33:10:33:11 | z2 | test-sink |
-| test.cpp:36:10:36:11 | z3 | test-sink |
+| test.cpp:9:10:9:10 | 0 | test-sink |
+| test.cpp:11:10:11:10 | x | test-sink |
+| test.cpp:15:10:15:10 | y | test-sink |

cpp/ql/test/library-tests/dataflow/external-models/sources.expected

@@ -1,2 +1,2 @@
 | asio_streams.cpp:87:34:87:44 | read_until output argument | remote |
-| test.cpp:10:10:10:18 | call to ymlSource | local |
+| test.cpp:7:10:7:18 | call to ymlSource | local |

cpp/ql/test/library-tests/dataflow/external-models/steps.expected

@@ -1,7 +1,2 @@
 | asio_streams.cpp:100:64:100:71 | *send_str | asio_streams.cpp:100:44:100:62 | call to buffer |
-| test.cpp:17:24:17:24 | x | test.cpp:17:10:17:22 | call to ymlStepManual |
-| test.cpp:21:27:21:27 | x | test.cpp:21:10:21:25 | call to ymlStepGenerated |
-| test.cpp:25:35:25:35 | x | test.cpp:25:11:25:33 | call to ymlStepManual_with_body |
-| test.cpp:28:35:28:35 | 0 | test.cpp:28:11:28:33 | call to ymlStepManual_with_body |
-| test.cpp:32:38:32:38 | 0 | test.cpp:32:11:32:36 | call to ymlStepGenerated_with_body |
-| test.cpp:35:38:35:38 | x | test.cpp:35:11:35:36 | call to ymlStepGenerated_with_body |
+| test.cpp:13:18:13:18 | x | test.cpp:13:10:13:16 | call to ymlStep |

cpp/ql/test/library-tests/dataflow/external-models/steps.ext.yml

@@ -3,7 +3,4 @@ extensions:
       pack: codeql/cpp-all
       extensible: summaryModel
     data: # namespace, type, subtypes, name, signature, ext, input, output, kind, provenance
-      - ["", "", False, "ymlStepManual", "", "", "Argument[0]", "ReturnValue", "taint", "manual"]
-      - ["", "", False, "ymlStepGenerated", "", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["", "", False, "ymlStepManual_with_body", "", "", "Argument[0]", "ReturnValue", "taint", "manual"]
-      - ["", "", False, "ymlStepGenerated_with_body", "", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["", "", False, "ymlStep", "", "", "Argument[0]", "ReturnValue", "taint", "manual"]

cpp/ql/test/library-tests/dataflow/external-models/test.cpp

@@ -1,10 +1,7 @@
 
 int ymlSource();
 void ymlSink(int value);
-int ymlStepManual(int value);
-int ymlStepGenerated(int value);
-int ymlStepManual_with_body(int value1, int value2) { return value2; }
-int ymlStepGenerated_with_body(int value, int value2) { return value2; }
+int ymlStep(int value);
 
 void test() {
 	int x = ymlSource();
@@ -13,25 +10,7 @@ void test() {
 
 	ymlSink(x); // $ ir
 
-	// ymlStepManual is manually modeled so we should always use the model
-	int y = ymlStepManual(x);
+	int y = ymlStep(x);
+
 	ymlSink(y); // $ ir
-
-	// ymlStepGenerated is modeled by the model generator so we should use the model only if there is no body
-	int z = ymlStepGenerated(x);
-	ymlSink(z); // $ ir
-
-	// ymlStepManual_with_body is manually modeled so we should always use the model
-	int y2 = ymlStepManual_with_body(x, 0);
-	ymlSink(y2); // $ ir
-
-	int y3 = ymlStepManual_with_body(0, x);
-	ymlSink(y3); // clean
-
-	// ymlStepGenerated_with_body is modeled by the model generator so we should use the model only if there is no body
-	int z2 = ymlStepGenerated_with_body(0, x);
-	ymlSink(z2); // $ ir
-
-	int z3 = ymlStepGenerated_with_body(x, 0);
-	ymlSink(z3); // clean
 }

cpp/ql/test/library-tests/dataflow/fields/ir-path-flow.expected

@@ -863,12 +863,12 @@ edges
 | struct_init.c:24:10:24:12 | absink output argument [a] | struct_init.c:28:5:28:7 | *& ... [a] | provenance |  |
 | struct_init.c:26:16:26:20 | *definition of outer [nestedAB, a] | struct_init.c:31:8:31:12 | *outer [nestedAB, a] | provenance |  |
 | struct_init.c:26:16:26:20 | *definition of outer [nestedAB, a] | struct_init.c:36:11:36:15 | *outer [nestedAB, a] | provenance |  |
+| struct_init.c:26:16:26:20 | *definition of outer [post update] [*pointerAB, a] | struct_init.c:33:8:33:12 | *outer [*pointerAB, a] | provenance |  |
 | struct_init.c:26:16:26:20 | *definition of outer [post update] [nestedAB, a] | struct_init.c:26:16:26:20 | *definition of outer [nestedAB, a] | provenance |  |
-| struct_init.c:26:16:26:20 | {...} [*pointerAB, a] | struct_init.c:33:8:33:12 | *outer [*pointerAB, a] | provenance |  |
 | struct_init.c:26:23:29:3 | *{...} [post update] [a] | struct_init.c:26:16:26:20 | *definition of outer [post update] [nestedAB, a] | provenance |  |
 | struct_init.c:27:7:27:16 | call to user_input | struct_init.c:26:23:29:3 | *{...} [post update] [a] | provenance |  |
 | struct_init.c:27:7:27:16 | call to user_input | struct_init.c:27:7:27:16 | call to user_input | provenance |  |
-| struct_init.c:28:5:28:7 | *& ... [a] | struct_init.c:26:16:26:20 | {...} [*pointerAB, a] | provenance |  |
+| struct_init.c:28:5:28:7 | *& ... [a] | struct_init.c:26:16:26:20 | *definition of outer [post update] [*pointerAB, a] | provenance |  |
 | struct_init.c:31:8:31:12 | *outer [nestedAB, a] | struct_init.c:31:14:31:21 | *nestedAB [a] | provenance |  |
 | struct_init.c:31:14:31:21 | *nestedAB [a] | struct_init.c:31:23:31:23 | a | provenance |  |
 | struct_init.c:33:8:33:12 | *outer [*pointerAB, a] | struct_init.c:33:14:33:22 | *pointerAB [a] | provenance |  |
@@ -879,8 +879,8 @@ edges
 | struct_init.c:40:13:40:14 | *definition of ab [post update] [a] | struct_init.c:40:13:40:14 | *definition of ab [a] | provenance |  |
 | struct_init.c:40:20:40:29 | call to user_input | struct_init.c:40:13:40:14 | *definition of ab [post update] [a] | provenance |  |
 | struct_init.c:40:20:40:29 | call to user_input | struct_init.c:40:20:40:29 | call to user_input | provenance |  |
-| struct_init.c:41:16:41:20 | {...} [*pointerAB, a] | struct_init.c:46:10:46:14 | *outer [*pointerAB, a] | provenance |  |
-| struct_init.c:43:5:43:7 | *& ... [a] | struct_init.c:41:16:41:20 | {...} [*pointerAB, a] | provenance |  |
+| struct_init.c:41:16:41:20 | *definition of outer [post update] [*pointerAB, a] | struct_init.c:46:10:46:14 | *outer [*pointerAB, a] | provenance |  |
+| struct_init.c:43:5:43:7 | *& ... [a] | struct_init.c:41:16:41:20 | *definition of outer [post update] [*pointerAB, a] | provenance |  |
 | struct_init.c:46:10:46:14 | *outer [*pointerAB, a] | struct_init.c:46:16:46:24 | *pointerAB [a] | provenance |  |
 | struct_init.c:46:16:46:24 | *pointerAB [a] | struct_init.c:14:24:14:25 | *ab [a] | provenance |  |
 nodes
@@ -1773,8 +1773,8 @@ nodes
 | struct_init.c:24:10:24:12 | *& ... [a] | semmle.label | *& ... [a] |
 | struct_init.c:24:10:24:12 | absink output argument [a] | semmle.label | absink output argument [a] |
 | struct_init.c:26:16:26:20 | *definition of outer [nestedAB, a] | semmle.label | *definition of outer [nestedAB, a] |
+| struct_init.c:26:16:26:20 | *definition of outer [post update] [*pointerAB, a] | semmle.label | *definition of outer [post update] [*pointerAB, a] |
 | struct_init.c:26:16:26:20 | *definition of outer [post update] [nestedAB, a] | semmle.label | *definition of outer [post update] [nestedAB, a] |
-| struct_init.c:26:16:26:20 | {...} [*pointerAB, a] | semmle.label | {...} [*pointerAB, a] |
 | struct_init.c:26:23:29:3 | *{...} [post update] [a] | semmle.label | *{...} [post update] [a] |
 | struct_init.c:27:7:27:16 | call to user_input | semmle.label | call to user_input |
 | struct_init.c:27:7:27:16 | call to user_input | semmle.label | call to user_input |
@@ -1791,7 +1791,7 @@ nodes
 | struct_init.c:40:13:40:14 | *definition of ab [post update] [a] | semmle.label | *definition of ab [post update] [a] |
 | struct_init.c:40:20:40:29 | call to user_input | semmle.label | call to user_input |
 | struct_init.c:40:20:40:29 | call to user_input | semmle.label | call to user_input |
-| struct_init.c:41:16:41:20 | {...} [*pointerAB, a] | semmle.label | {...} [*pointerAB, a] |
+| struct_init.c:41:16:41:20 | *definition of outer [post update] [*pointerAB, a] | semmle.label | *definition of outer [post update] [*pointerAB, a] |
 | struct_init.c:43:5:43:7 | *& ... [a] | semmle.label | *& ... [a] |
 | struct_init.c:46:10:46:14 | *outer [*pointerAB, a] | semmle.label | *outer [*pointerAB, a] |
 | struct_init.c:46:16:46:24 | *pointerAB [a] | semmle.label | *pointerAB [a] |

cpp/ql/test/library-tests/dataflow/models-as-data/tests.cpp

@@ -56,9 +56,9 @@ void test_sources() {
 	sink(v_direct); // $ ir
 
 	sink(remoteMadSourceIndirect());
-	sink(*remoteMadSourceIndirect()); // $ ir
+	sink(*remoteMadSourceIndirect()); // $ MISSING: ir
 	sink(*remoteMadSourceDoubleIndirect());
-	sink(**remoteMadSourceDoubleIndirect()); // $ ir
+	sink(**remoteMadSourceDoubleIndirect()); // $ MISSING: ir
 
 	int a, b, c, d;
 
@@ -124,7 +124,7 @@ void test_sinks() {
 	// test sources + sinks together
 
 	madSinkArg0(localMadSource()); // $ ir
-	madSinkIndirectArg0(remoteMadSourceIndirect()); // $ ir
+	madSinkIndirectArg0(remoteMadSourceIndirect()); // $ MISSING: ir
 	madSinkVar = remoteMadSourceVar; // $ ir
 	*madSinkVarIndirect = remoteMadSourceVar; // $ MISSING: ir
 }

cpp/ql/test/library-tests/structs/compatible_c/c1_gnu.c

@@ -7,4 +7,4 @@ struct Kiwi {
 struct Lemon {
   unsigned int __attribute__ ((vector_size (16))) lemon_x;
 };
-// semmle-extractor-options: -std=c99 --clang --gnu_version 40700
+// semmle-extractor-options: -std=c99 --clang --edg --clang_vector_types --gnu_version 40700

cpp/ql/test/library-tests/structs/compatible_c/c2_gnu.c

@@ -7,4 +7,4 @@ struct Kiwi {
 struct Lemon {
   signed int __attribute__ ((vector_size (16))) lemon_x;
 };
-// semmle-extractor-options: -std=c99 --clang --gnu_version 40700
+// semmle-extractor-options: -std=c99 --clang --edg --clang_vector_types --gnu_version 40700

cpp/ql/test/library-tests/vector_types/options

@@ -0,0 +1 @@
+semmle-extractor-options: --clang --edg --clang_builtin_functions --edg --clang_vector_types --gnu_version 40600

cpp/ql/test/query-tests/Security/CWE/CWE-134/semmle/consts/NonConstantFormat.expected

@@ -2,8 +2,8 @@ edges
 | consts.cpp:24:7:24:9 | **gv1 | consts.cpp:25:2:25:4 | *a | provenance |  |
 | consts.cpp:24:7:24:9 | **gv1 | consts.cpp:30:9:30:14 | *access to array | provenance |  |
 | consts.cpp:24:7:24:9 | **gv1 | consts.cpp:123:2:123:12 | *... = ... | provenance |  |
-| consts.cpp:25:2:25:4 | *a | consts.cpp:26:2:26:4 | *{...} | provenance |  |
-| consts.cpp:26:2:26:4 | *{...} | consts.cpp:24:7:24:9 | **gv1 | provenance |  |
+| consts.cpp:25:2:25:4 | *a | consts.cpp:26:2:26:4 | *b | provenance |  |
+| consts.cpp:26:2:26:4 | *b | consts.cpp:24:7:24:9 | **gv1 | provenance |  |
 | consts.cpp:29:7:29:25 | **nonConstFuncToArray | consts.cpp:126:9:126:30 | *call to nonConstFuncToArray | provenance |  |
 | consts.cpp:30:9:30:14 | *access to array | consts.cpp:29:7:29:25 | **nonConstFuncToArray | provenance |  |
 | consts.cpp:85:7:85:8 | gets output argument | consts.cpp:86:9:86:10 | *v1 | provenance |  |
@@ -14,7 +14,7 @@ edges
 | consts.cpp:85:7:85:8 | gets output argument | consts.cpp:129:19:129:20 | *v1 | provenance |  |
 | consts.cpp:85:7:85:8 | gets output argument | consts.cpp:135:9:135:11 | *v10 | provenance | TaintFunction |
 | consts.cpp:90:2:90:14 | *... = ... | consts.cpp:91:9:91:10 | *v2 | provenance |  |
-| consts.cpp:90:2:90:14 | *... = ... | consts.cpp:115:21:115:22 | *{...} | provenance |  |
+| consts.cpp:90:2:90:14 | *... = ... | consts.cpp:115:21:115:22 | *v2 | provenance |  |
 | consts.cpp:90:7:90:10 | *call to gets | consts.cpp:90:2:90:14 | *... = ... | provenance |  |
 | consts.cpp:90:12:90:13 | gets output argument | consts.cpp:94:13:94:14 | *v1 | provenance |  |
 | consts.cpp:90:12:90:13 | gets output argument | consts.cpp:99:2:99:8 | *... = ... | provenance |  |
@@ -28,9 +28,9 @@ edges
 | consts.cpp:106:13:106:19 | *call to varFunc | consts.cpp:107:9:107:10 | *v5 | provenance |  |
 | consts.cpp:111:2:111:15 | *... = ... | consts.cpp:112:9:112:10 | *v6 | provenance |  |
 | consts.cpp:111:7:111:13 | *call to varFunc | consts.cpp:111:2:111:15 | *... = ... | provenance |  |
-| consts.cpp:115:17:115:18 | *v1 | consts.cpp:115:21:115:22 | *{...} | provenance |  |
-| consts.cpp:115:21:115:22 | *{...} | consts.cpp:116:9:116:13 | *access to array | provenance |  |
-| consts.cpp:115:21:115:22 | *{...} | consts.cpp:120:2:120:11 | *... = ... | provenance |  |
+| consts.cpp:115:17:115:18 | *v1 | consts.cpp:115:21:115:22 | *v2 | provenance |  |
+| consts.cpp:115:21:115:22 | *v2 | consts.cpp:116:9:116:13 | *access to array | provenance |  |
+| consts.cpp:115:21:115:22 | *v2 | consts.cpp:120:2:120:11 | *... = ... | provenance |  |
 | consts.cpp:120:2:120:11 | *... = ... | consts.cpp:121:9:121:10 | *v8 | provenance |  |
 | consts.cpp:123:2:123:12 | *... = ... | consts.cpp:24:7:24:9 | **gv1 | provenance |  |
 | consts.cpp:129:19:129:20 | *v1 | consts.cpp:130:9:130:10 | *v9 | provenance |  |
@@ -39,7 +39,7 @@ edges
 nodes
 | consts.cpp:24:7:24:9 | **gv1 | semmle.label | **gv1 |
 | consts.cpp:25:2:25:4 | *a | semmle.label | *a |
-| consts.cpp:26:2:26:4 | *{...} | semmle.label | *{...} |
+| consts.cpp:26:2:26:4 | *b | semmle.label | *b |
 | consts.cpp:29:7:29:25 | **nonConstFuncToArray | semmle.label | **nonConstFuncToArray |
 | consts.cpp:30:9:30:14 | *access to array | semmle.label | *access to array |
 | consts.cpp:85:7:85:8 | gets output argument | semmle.label | gets output argument |
@@ -60,7 +60,7 @@ nodes
 | consts.cpp:111:7:111:13 | *call to varFunc | semmle.label | *call to varFunc |
 | consts.cpp:112:9:112:10 | *v6 | semmle.label | *v6 |
 | consts.cpp:115:17:115:18 | *v1 | semmle.label | *v1 |
-| consts.cpp:115:21:115:22 | *{...} | semmle.label | *{...} |
+| consts.cpp:115:21:115:22 | *v2 | semmle.label | *v2 |
 | consts.cpp:116:9:116:13 | *access to array | semmle.label | *access to array |
 | consts.cpp:120:2:120:11 | *... = ... | semmle.label | *... = ... |
 | consts.cpp:121:9:121:10 | *v8 | semmle.label | *v8 |

cpp/ql/test/query-tests/Security/CWE/CWE-319/UseOfHttp/UseOfHttp.expected

@@ -6,8 +6,8 @@ edges
 | test.cpp:28:10:28:29 | *http://example.com | test.cpp:11:26:11:28 | *url | provenance |  |
 | test.cpp:35:23:35:42 | *http://example.com | test.cpp:35:23:35:42 | *http://example.com | provenance |  |
 | test.cpp:35:23:35:42 | *http://example.com | test.cpp:39:11:39:15 | *url_l | provenance |  |
-| test.cpp:36:26:36:45 | *http://example.com | test.cpp:36:26:36:45 | *{...} | provenance |  |
-| test.cpp:36:26:36:45 | *{...} | test.cpp:40:11:40:17 | *access to array | provenance |  |
+| test.cpp:36:26:36:45 | *http://example.com | test.cpp:36:26:36:45 | *http://example.com | provenance |  |
+| test.cpp:36:26:36:45 | *http://example.com | test.cpp:40:11:40:17 | *access to array | provenance |  |
 | test.cpp:38:11:38:15 | *url_g | test.cpp:11:26:11:28 | *url | provenance |  |
 | test.cpp:39:11:39:15 | *url_l | test.cpp:11:26:11:28 | *url | provenance |  |
 | test.cpp:40:11:40:17 | *access to array | test.cpp:11:26:11:28 | *url | provenance |  |
@@ -29,7 +29,7 @@ nodes
 | test.cpp:35:23:35:42 | *http://example.com | semmle.label | *http://example.com |
 | test.cpp:35:23:35:42 | *http://example.com | semmle.label | *http://example.com |
 | test.cpp:36:26:36:45 | *http://example.com | semmle.label | *http://example.com |
-| test.cpp:36:26:36:45 | *{...} | semmle.label | *{...} |
+| test.cpp:36:26:36:45 | *http://example.com | semmle.label | *http://example.com |
 | test.cpp:38:11:38:15 | *url_g | semmle.label | *url_g |
 | test.cpp:39:11:39:15 | *url_l | semmle.label | *url_l |
 | test.cpp:40:11:40:17 | *access to array | semmle.label | *access to array |

csharp/documentation/library-coverage/coverage.csv

@@ -4,11 +4,11 @@ Amazon.Lambda.Core,10,,,,,,,,,,,10,,,,,,,,,,,
 Dapper,55,42,1,,,,,,,,,,55,,42,,,,,,,,1
 ILCompiler,,,121,,,,,,,,,,,,,,,,,,,77,44
 ILLink.RoslynAnalyzer,,,107,,,,,,,,,,,,,,,,,,,31,76
-ILLink.Shared,,,37,,,,,,,,,,,,,,,,,,,9,28
+ILLink.Shared,,,37,,,,,,,,,,,,,,,,,,,11,26
 ILLink.Tasks,,,5,,,,,,,,,,,,,,,,,,,4,1
 Internal.IL,,,54,,,,,,,,,,,,,,,,,,,28,26
 Internal.Pgo,,,9,,,,,,,,,,,,,,,,,,,2,7
-Internal.TypeSystem,,,343,,,,,,,,,,,,,,,,,,,197,146
+Internal.TypeSystem,,,342,,,,,,,,,,,,,,,,,,,205,137
 Microsoft.ApplicationBlocks.Data,28,,,,,,,,,,,,28,,,,,,,,,,
 Microsoft.AspNetCore.Components,2,4,2,,,,,,,2,,,,,,,,,4,,,1,1
 Microsoft.AspNetCore.Http,,,1,,,,,,,,,,,,,,,,,,,1,
@@ -21,7 +21,7 @@ Microsoft.DotNet.PlatformAbstractions,,,1,,,,,,,,,,,,,,,,,,,1,
 Microsoft.EntityFrameworkCore,6,,12,,,,,,,,,,6,,,,,,,,,,12
 Microsoft.Extensions.Caching.Distributed,,,3,,,,,,,,,,,,,,,,,,,,3
 Microsoft.Extensions.Caching.Memory,,,37,,,,,,,,,,,,,,,,,,,5,32
-Microsoft.Extensions.Configuration,,3,118,,,,,,,,,,,,,3,,,,,,39,79
+Microsoft.Extensions.Configuration,,3,118,,,,,,,,,,,,,3,,,,,,41,77
 Microsoft.Extensions.DependencyInjection,,,209,,,,,,,,,,,,,,,,,,,15,194
 Microsoft.Extensions.DependencyModel,,1,57,,,,,,,,,,,,,1,,,,,,13,44
 Microsoft.Extensions.Diagnostics.Metrics,,,14,,,,,,,,,,,,,,,,,,,1,13
@@ -37,10 +37,10 @@ Microsoft.JSInterop,2,,,,,,,,,,2,,,,,,,,,,,,
 Microsoft.NET.Build.Tasks,,,5,,,,,,,,,,,,,,,,,,,3,2
 Microsoft.VisualBasic,,,6,,,,,,,,,,,,,,,,,,,1,5
 Microsoft.Win32,,4,2,,,,,,,,,,,,,,,,,,4,,2
-Mono.Linker,,,278,,,,,,,,,,,,,,,,,,,127,151
+Mono.Linker,,,278,,,,,,,,,,,,,,,,,,,130,148
 MySql.Data.MySqlClient,48,,,,,,,,,,,,48,,,,,,,,,,
 Newtonsoft.Json,,,91,,,,,,,,,,,,,,,,,,,73,18
 ServiceStack,194,,7,27,,,,,75,,,,92,,,,,,,,,7,
 SourceGenerators,,,5,,,,,,,,,,,,,,,,,,,,5
-System,54,47,12139,,6,5,5,,,4,1,,33,2,,6,15,17,4,3,,5903,6236
+System,54,47,12111,,6,5,5,,,4,1,,33,2,,6,15,17,4,3,,5993,6118
 Windows.Security.Cryptography.Core,1,,,,,,,1,,,,,,,,,,,,,,,

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,12139,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.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,2253,152,4
-   Totals,,107,14399,400,9
+   System,"``System.*``, ``System``",47,12111,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.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,2252,152,4
+   Totals,,107,14370,400,9
 

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.100"
     }
 }

csharp/ql/integration-tests/all-platforms/blazor_build_mode_none/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 | test-db/working/razor/AC613014E59A413B9538FF8068364499/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 |
-| test-db/working/razor/AC613014E59A413B9538FF8068364499/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 |
+| BlazorTest/Components/Pages/TestPage.razor:85:23:85:32 | access to property QueryParam : String | test-db/working/razor/AC613014E59A413B9538FF8068364499/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 |
+| test-db/working/razor/AC613014E59A413B9538FF8068364499/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 |
 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 |
-| test-db/working/razor/AC613014E59A413B9538FF8068364499/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 |
+| test-db/working/razor/AC613014E59A413B9538FF8068364499/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 |
 subpaths

csharp/ql/integration-tests/posix/query-suite/csharp-security-and-quality.qls.expected

@@ -38,6 +38,7 @@ 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/Configuration/EmptyPasswordInConfigurationFile.ql
+ql/csharp/ql/src/Configuration/PasswordInConfigurationFile.ql
 ql/csharp/ql/src/Dead Code/DeadStoreOfLocal.ql
 ql/csharp/ql/src/Diagnostics/CompilerError.ql
 ql/csharp/ql/src/Diagnostics/CompilerMessage.ql
@@ -145,6 +146,8 @@ ql/csharp/ql/src/Security Features/CWE-639/InsecureDirectObjectReference.ql
 ql/csharp/ql/src/Security Features/CWE-643/XPathInjection.ql
 ql/csharp/ql/src/Security Features/CWE-730/ReDoS.ql
 ql/csharp/ql/src/Security Features/CWE-730/RegexInjection.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-807/ConditionalBypass.ql
 ql/csharp/ql/src/Security Features/CookieWithOverlyBroadDomain.ql
 ql/csharp/ql/src/Security Features/CookieWithOverlyBroadPath.ql

csharp/ql/integration-tests/posix/query-suite/csharp-security-extended.qls.expected

@@ -1,4 +1,5 @@
 ql/csharp/ql/src/Configuration/EmptyPasswordInConfigurationFile.ql
+ql/csharp/ql/src/Configuration/PasswordInConfigurationFile.ql
 ql/csharp/ql/src/Diagnostics/CompilerError.ql
 ql/csharp/ql/src/Diagnostics/CompilerMessage.ql
 ql/csharp/ql/src/Diagnostics/DiagnosticExtractionErrors.ql
@@ -48,6 +49,8 @@ ql/csharp/ql/src/Security Features/CWE-639/InsecureDirectObjectReference.ql
 ql/csharp/ql/src/Security Features/CWE-643/XPathInjection.ql
 ql/csharp/ql/src/Security Features/CWE-730/ReDoS.ql
 ql/csharp/ql/src/Security Features/CWE-730/RegexInjection.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-807/ConditionalBypass.ql
 ql/csharp/ql/src/Security Features/CookieWithOverlyBroadDomain.ql
 ql/csharp/ql/src/Security Features/CookieWithOverlyBroadPath.ql

csharp/ql/integration-tests/posix/query-suite/not_included_in_qls.expected

@@ -26,7 +26,6 @@ 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
 ql/csharp/ql/src/Dead Code/UnusedField.ql
@@ -90,8 +89,6 @@ ql/csharp/ql/src/Security Features/CWE-321/HardcodedSymmetricEncryptionKey.ql
 ql/csharp/ql/src/Security Features/CWE-327/DontInstallRootCert.ql
 ql/csharp/ql/src/Security Features/CWE-502/UnsafeDeserialization.ql
 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

csharp/ql/lib/change-notes/2025-05-14-dotnet-models.md

@@ -1,4 +0,0 @@
----
-category: minorAnalysis
----
-* The generated Models as Data (MaD) models for .NET 9 Runtime have been updated and are now more precise (due to a recent model generator improvement).

csharp/ql/lib/ext/generated/ILLink.Shared.DataFlow.model.yml

@@ -28,8 +28,8 @@ extensions:
       - ["ILLink.Shared.DataFlow", "ValueSet<TValue>", False, "DeepCopy", "()", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
       - ["ILLink.Shared.DataFlow", "ValueSet<TValue>", False, "GetKnownValues", "()", "", "Argument[this].SyntheticField[ILLink.Shared.DataFlow.ValueSet`1._values]", "ReturnValue.SyntheticField[ILLink.Shared.DataFlow.ValueSet`1+Enumerable._values]", "value", "dfc-generated"]
       - ["ILLink.Shared.DataFlow", "ValueSet<TValue>", False, "ValueSet", "(TValue)", "", "Argument[0]", "Argument[this].SyntheticField[ILLink.Shared.DataFlow.ValueSet`1._values]", "value", "dfc-generated"]
-      - ["ILLink.Shared.DataFlow", "ValueSetLattice<TValue>", False, "Meet", "(ILLink.Shared.DataFlow.ValueSet<TValue>,ILLink.Shared.DataFlow.ValueSet<TValue>)", "", "Argument[0]", "ReturnValue", "value", "df-generated"]
-      - ["ILLink.Shared.DataFlow", "ValueSetLattice<TValue>", False, "Meet", "(ILLink.Shared.DataFlow.ValueSet<TValue>,ILLink.Shared.DataFlow.ValueSet<TValue>)", "", "Argument[1]", "ReturnValue", "value", "df-generated"]
+      - ["ILLink.Shared.DataFlow", "ValueSetLattice<TValue>", False, "Meet", "(ILLink.Shared.DataFlow.ValueSet<TValue>,ILLink.Shared.DataFlow.ValueSet<TValue>)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["ILLink.Shared.DataFlow", "ValueSetLattice<TValue>", False, "Meet", "(ILLink.Shared.DataFlow.ValueSet<TValue>,ILLink.Shared.DataFlow.ValueSet<TValue>)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
   - addsTo:
       pack: codeql/csharp-all
       extensible: neutralModel

csharp/ql/lib/ext/generated/Internal.TypeSystem.model.yml

@@ -13,7 +13,7 @@ extensions:
       - ["Internal.TypeSystem", "CanonBaseType", False, "get_Context", "()", "", "Argument[this].SyntheticField[Internal.TypeSystem.CanonBaseType._context]", "ReturnValue", "value", "dfc-generated"]
       - ["Internal.TypeSystem", "CanonBaseType", True, "get_MetadataBaseType", "()", "", "Argument[this].Property[Internal.TypeSystem.MetadataType.BaseType]", "ReturnValue", "value", "dfc-generated"]
       - ["Internal.TypeSystem", "CanonBaseType", True, "get_Module", "()", "", "Argument[this].SyntheticField[Internal.TypeSystem.CanonBaseType._context].Property[Internal.TypeSystem.TypeSystemContext.SystemModule]", "ReturnValue", "value", "dfc-generated"]
-      - ["Internal.TypeSystem", "ConstructedTypeRewritingHelpers", False, "ReplaceTypesInConstructionOfMethod", "(Internal.TypeSystem.MethodDesc,Internal.TypeSystem.TypeDesc[],Internal.TypeSystem.TypeDesc[])", "", "Argument[0]", "ReturnValue", "value", "df-generated"]
+      - ["Internal.TypeSystem", "ConstructedTypeRewritingHelpers", False, "ReplaceTypesInConstructionOfMethod", "(Internal.TypeSystem.MethodDesc,Internal.TypeSystem.TypeDesc[],Internal.TypeSystem.TypeDesc[])", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["Internal.TypeSystem", "ConstructedTypeRewritingHelpers", False, "ReplaceTypesInConstructionOfMethod", "(Internal.TypeSystem.MethodDesc,Internal.TypeSystem.TypeDesc[],Internal.TypeSystem.TypeDesc[])", "", "Argument[2].Element", "ReturnValue", "taint", "df-generated"]
       - ["Internal.TypeSystem", "ConstructedTypeRewritingHelpers", False, "ReplaceTypesInConstructionOfType", "(Internal.TypeSystem.TypeDesc,Internal.TypeSystem.TypeDesc[],Internal.TypeSystem.TypeDesc[])", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
       - ["Internal.TypeSystem", "ConstructedTypeRewritingHelpers", False, "ReplaceTypesInConstructionOfType", "(Internal.TypeSystem.TypeDesc,Internal.TypeSystem.TypeDesc[],Internal.TypeSystem.TypeDesc[])", "", "Argument[2].Element", "ReturnValue", "value", "dfc-generated"]
@@ -108,7 +108,7 @@ extensions:
       - ["Internal.TypeSystem", "MetadataTypeSystemContext", True, "SetSystemModule", "(Internal.TypeSystem.ModuleDesc)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["Internal.TypeSystem", "MetadataVirtualMethodAlgorithm", False, "EnumAllVirtualSlots", "(Internal.TypeSystem.MetadataType)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["Internal.TypeSystem", "MetadataVirtualMethodAlgorithm", False, "FindSlotDefiningMethodForVirtualMethod", "(Internal.TypeSystem.MethodDesc)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
-      - ["Internal.TypeSystem", "MetadataVirtualMethodAlgorithm", False, "ResolveVariantInterfaceMethodToDefaultImplementationOnType", "(Internal.TypeSystem.MethodDesc,Internal.TypeSystem.MetadataType,Internal.TypeSystem.MethodDesc)", "", "Argument[0]", "Argument[2]", "value", "df-generated"]
+      - ["Internal.TypeSystem", "MetadataVirtualMethodAlgorithm", False, "ResolveVariantInterfaceMethodToDefaultImplementationOnType", "(Internal.TypeSystem.MethodDesc,Internal.TypeSystem.MetadataType,Internal.TypeSystem.MethodDesc)", "", "Argument[0]", "Argument[2]", "taint", "df-generated"]
       - ["Internal.TypeSystem", "MetadataVirtualMethodAlgorithm", False, "ResolveVariantInterfaceMethodToDefaultImplementationOnType", "(Internal.TypeSystem.MethodDesc,Internal.TypeSystem.MetadataType,Internal.TypeSystem.MethodDesc)", "", "Argument[1]", "Argument[2]", "taint", "df-generated"]
       - ["Internal.TypeSystem", "MetadataVirtualMethodAlgorithm", False, "ResolveVariantInterfaceMethodToVirtualMethodOnType", "(Internal.TypeSystem.MethodDesc,Internal.TypeSystem.MetadataType)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
       - ["Internal.TypeSystem", "MethodDelegator", False, "MethodDelegator", "(Internal.TypeSystem.MethodDesc)", "", "Argument[0]", "Argument[this].Field[Internal.TypeSystem.MethodDelegator._wrappedMethod]", "value", "dfc-generated"]
@@ -133,7 +133,6 @@ extensions:
       - ["Internal.TypeSystem", "MethodSignature+SignatureEnumerator", False, "get_Current", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["Internal.TypeSystem", "MethodSignature", False, "ApplySubstitution", "(Internal.TypeSystem.Instantiation)", "", "Argument[0].SyntheticField[Internal.TypeSystem.Instantiation._genericParameters].Element", "ReturnValue.SyntheticField[Internal.TypeSystem.MethodSignature._parameters].Element", "value", "dfc-generated"]
       - ["Internal.TypeSystem", "MethodSignature", False, "ApplySubstitution", "(Internal.TypeSystem.Instantiation)", "", "Argument[0].SyntheticField[Internal.TypeSystem.Instantiation._genericParameters].Element", "ReturnValue.SyntheticField[Internal.TypeSystem.MethodSignature._returnType]", "value", "dfc-generated"]
-      - ["Internal.TypeSystem", "MethodSignature", False, "ApplySubstitution", "(Internal.TypeSystem.Instantiation)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
       - ["Internal.TypeSystem", "MethodSignature", False, "GetEmbeddedSignatureData", "()", "", "Argument[this].SyntheticField[Internal.TypeSystem.MethodSignature._embeddedSignatureData].Element", "ReturnValue.Element", "value", "dfc-generated"]
       - ["Internal.TypeSystem", "MethodSignature", False, "GetEmbeddedSignatureData", "(System.ReadOnlySpan<Internal.TypeSystem.EmbeddedSignatureDataKind>)", "", "Argument[this].SyntheticField[Internal.TypeSystem.MethodSignature._embeddedSignatureData].Element", "ReturnValue.Element", "value", "dfc-generated"]
       - ["Internal.TypeSystem", "MethodSignature", False, "GetEnumerator", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
@@ -184,7 +183,7 @@ extensions:
       - ["Internal.TypeSystem", "ResolutionFailure", False, "GetTypeLoadResolutionFailure", "(System.String,System.String,System.String)", "", "Argument[2]", "ReturnValue", "taint", "df-generated"]
       - ["Internal.TypeSystem", "RuntimeDeterminedCanonicalizationAlgorithm", False, "ConvertInstantiationToCanonForm", "(Internal.TypeSystem.Instantiation,Internal.TypeSystem.CanonicalFormKind,System.Boolean)", "", "Argument[0].SyntheticField[Internal.TypeSystem.Instantiation._genericParameters].Element", "ReturnValue.SyntheticField[Internal.TypeSystem.Instantiation._genericParameters].Element", "value", "dfc-generated"]
       - ["Internal.TypeSystem", "RuntimeDeterminedCanonicalizationAlgorithm", False, "ConvertInstantiationToCanonForm", "(Internal.TypeSystem.Instantiation,Internal.TypeSystem.CanonicalFormKind,System.Boolean)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
-      - ["Internal.TypeSystem", "RuntimeDeterminedCanonicalizationAlgorithm", False, "ConvertToCanon", "(Internal.TypeSystem.TypeDesc,Internal.TypeSystem.CanonicalFormKind)", "", "Argument[0]", "ReturnValue", "value", "df-generated"]
+      - ["Internal.TypeSystem", "RuntimeDeterminedCanonicalizationAlgorithm", False, "ConvertToCanon", "(Internal.TypeSystem.TypeDesc,Internal.TypeSystem.CanonicalFormKind)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["Internal.TypeSystem", "RuntimeDeterminedType", False, "GetNonRuntimeDeterminedTypeFromRuntimeDeterminedSubtypeViaSubstitution", "(Internal.TypeSystem.Instantiation,Internal.TypeSystem.Instantiation)", "", "Argument[0].SyntheticField[Internal.TypeSystem.Instantiation._genericParameters].Element", "ReturnValue", "value", "dfc-generated"]
       - ["Internal.TypeSystem", "RuntimeDeterminedType", False, "GetNonRuntimeDeterminedTypeFromRuntimeDeterminedSubtypeViaSubstitution", "(Internal.TypeSystem.Instantiation,Internal.TypeSystem.Instantiation)", "", "Argument[1].SyntheticField[Internal.TypeSystem.Instantiation._genericParameters].Element", "ReturnValue", "value", "dfc-generated"]
       - ["Internal.TypeSystem", "RuntimeDeterminedType", False, "RuntimeDeterminedType", "(Internal.TypeSystem.DefType,Internal.TypeSystem.GenericParameterDesc)", "", "Argument[0]", "Argument[this].SyntheticField[Internal.TypeSystem.RuntimeDeterminedType._rawCanonType]", "value", "dfc-generated"]
@@ -200,8 +199,8 @@ extensions:
       - ["Internal.TypeSystem", "SimpleArrayOfTRuntimeInterfacesAlgorithm", False, "SimpleArrayOfTRuntimeInterfacesAlgorithm", "(Internal.TypeSystem.ModuleDesc)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["Internal.TypeSystem", "StandardCanonicalizationAlgorithm", False, "ConvertInstantiationToCanonForm", "(Internal.TypeSystem.Instantiation,Internal.TypeSystem.CanonicalFormKind,System.Boolean)", "", "Argument[0].SyntheticField[Internal.TypeSystem.Instantiation._genericParameters].Element", "ReturnValue.SyntheticField[Internal.TypeSystem.Instantiation._genericParameters].Element", "value", "dfc-generated"]
       - ["Internal.TypeSystem", "StandardCanonicalizationAlgorithm", False, "ConvertInstantiationToCanonForm", "(Internal.TypeSystem.Instantiation,Internal.TypeSystem.CanonicalFormKind,System.Boolean)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
-      - ["Internal.TypeSystem", "StandardCanonicalizationAlgorithm", False, "ConvertToCanon", "(Internal.TypeSystem.TypeDesc,Internal.TypeSystem.CanonicalFormKind)", "", "Argument[0]", "ReturnValue", "value", "df-generated"]
-      - ["Internal.TypeSystem", "TypeDesc", False, "ConvertToCanonForm", "(Internal.TypeSystem.CanonicalFormKind)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["Internal.TypeSystem", "StandardCanonicalizationAlgorithm", False, "ConvertToCanon", "(Internal.TypeSystem.TypeDesc,Internal.TypeSystem.CanonicalFormKind)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["Internal.TypeSystem", "TypeDesc", False, "ConvertToCanonForm", "(Internal.TypeSystem.CanonicalFormKind)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["Internal.TypeSystem", "TypeDesc", False, "GetMethod", "(System.String,Internal.TypeSystem.MethodSignature)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["Internal.TypeSystem", "TypeDesc", False, "get_RuntimeInterfaces", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["Internal.TypeSystem", "TypeDesc", True, "ConvertToCanonFormImpl", "(Internal.TypeSystem.CanonicalFormKind)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
@@ -261,7 +260,7 @@ extensions:
       - ["Internal.TypeSystem", "TypeSystemException", False, "get_Arguments", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["Internal.TypeSystem", "TypeSystemHelpers", False, "EnumAllVirtualSlots", "(Internal.TypeSystem.TypeDesc)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["Internal.TypeSystem", "TypeSystemHelpers", False, "FindMethodOnTypeWithMatchingTypicalMethod", "(Internal.TypeSystem.TypeDesc,Internal.TypeSystem.MethodDesc)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["Internal.TypeSystem", "TypeSystemHelpers", False, "FindMethodOnTypeWithMatchingTypicalMethod", "(Internal.TypeSystem.TypeDesc,Internal.TypeSystem.MethodDesc)", "", "Argument[1]", "ReturnValue", "value", "df-generated"]
+      - ["Internal.TypeSystem", "TypeSystemHelpers", False, "FindMethodOnTypeWithMatchingTypicalMethod", "(Internal.TypeSystem.TypeDesc,Internal.TypeSystem.MethodDesc)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
       - ["Internal.TypeSystem", "TypeSystemHelpers", False, "FindVirtualFunctionTargetMethodOnObjectType", "(Internal.TypeSystem.TypeDesc,Internal.TypeSystem.MethodDesc)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["Internal.TypeSystem", "TypeSystemHelpers", False, "GetAllMethods", "(Internal.TypeSystem.TypeDesc)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["Internal.TypeSystem", "TypeSystemHelpers", False, "GetAllVirtualMethods", "(Internal.TypeSystem.TypeDesc)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
@@ -277,7 +276,7 @@ extensions:
       - ["Internal.TypeSystem", "TypeSystemHelpers", False, "ResolveInterfaceMethodToDefaultImplementationOnType", "(Internal.TypeSystem.TypeDesc,Internal.TypeSystem.MethodDesc,Internal.TypeSystem.MethodDesc)", "", "Argument[1]", "Argument[2]", "value", "dfc-generated"]
       - ["Internal.TypeSystem", "TypeSystemHelpers", False, "ResolveInterfaceMethodToVirtualMethodOnType", "(Internal.TypeSystem.TypeDesc,Internal.TypeSystem.MethodDesc)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["Internal.TypeSystem", "TypeSystemHelpers", False, "ResolveVariantInterfaceMethodToDefaultImplementationOnType", "(Internal.TypeSystem.TypeDesc,Internal.TypeSystem.MethodDesc,Internal.TypeSystem.MethodDesc)", "", "Argument[0]", "Argument[2]", "taint", "df-generated"]
-      - ["Internal.TypeSystem", "TypeSystemHelpers", False, "ResolveVariantInterfaceMethodToDefaultImplementationOnType", "(Internal.TypeSystem.TypeDesc,Internal.TypeSystem.MethodDesc,Internal.TypeSystem.MethodDesc)", "", "Argument[1]", "Argument[2]", "value", "df-generated"]
+      - ["Internal.TypeSystem", "TypeSystemHelpers", False, "ResolveVariantInterfaceMethodToDefaultImplementationOnType", "(Internal.TypeSystem.TypeDesc,Internal.TypeSystem.MethodDesc,Internal.TypeSystem.MethodDesc)", "", "Argument[1]", "Argument[2]", "taint", "df-generated"]
       - ["Internal.TypeSystem", "TypeSystemHelpers", False, "ResolveVariantInterfaceMethodToVirtualMethodOnType", "(Internal.TypeSystem.TypeDesc,Internal.TypeSystem.MethodDesc)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["Internal.TypeSystem", "TypeWithRepeatedFields", False, "TypeWithRepeatedFields", "(Internal.TypeSystem.MetadataType)", "", "Argument[0]", "Argument[this].SyntheticField[Internal.TypeSystem.TypeWithRepeatedFields.MetadataType]", "value", "dfc-generated"]
       - ["Internal.TypeSystem", "TypeWithRepeatedFields", False, "get_ContainingType", "()", "", "Argument[this].SyntheticField[Internal.TypeSystem.TypeWithRepeatedFields.MetadataType].Property[Internal.TypeSystem.MetadataType.ContainingType]", "ReturnValue", "value", "dfc-generated"]
@@ -290,7 +289,7 @@ extensions:
       - ["Internal.TypeSystem", "VirtualMethodAlgorithm", True, "FindVirtualFunctionTargetMethodOnObjectType", "(Internal.TypeSystem.MethodDesc,Internal.TypeSystem.TypeDesc)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
       - ["Internal.TypeSystem", "VirtualMethodAlgorithm", True, "ResolveInterfaceMethodToDefaultImplementationOnType", "(Internal.TypeSystem.MethodDesc,Internal.TypeSystem.TypeDesc,Internal.TypeSystem.MethodDesc)", "", "Argument[0]", "Argument[2]", "value", "dfc-generated"]
       - ["Internal.TypeSystem", "VirtualMethodAlgorithm", True, "ResolveInterfaceMethodToVirtualMethodOnType", "(Internal.TypeSystem.MethodDesc,Internal.TypeSystem.TypeDesc)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
-      - ["Internal.TypeSystem", "VirtualMethodAlgorithm", True, "ResolveVariantInterfaceMethodToDefaultImplementationOnType", "(Internal.TypeSystem.MethodDesc,Internal.TypeSystem.TypeDesc,Internal.TypeSystem.MethodDesc)", "", "Argument[0]", "Argument[2]", "value", "df-generated"]
+      - ["Internal.TypeSystem", "VirtualMethodAlgorithm", True, "ResolveVariantInterfaceMethodToDefaultImplementationOnType", "(Internal.TypeSystem.MethodDesc,Internal.TypeSystem.TypeDesc,Internal.TypeSystem.MethodDesc)", "", "Argument[0]", "Argument[2]", "taint", "df-generated"]
       - ["Internal.TypeSystem", "VirtualMethodAlgorithm", True, "ResolveVariantInterfaceMethodToDefaultImplementationOnType", "(Internal.TypeSystem.MethodDesc,Internal.TypeSystem.TypeDesc,Internal.TypeSystem.MethodDesc)", "", "Argument[1]", "Argument[2]", "taint", "df-generated"]
       - ["Internal.TypeSystem", "VirtualMethodAlgorithm", True, "ResolveVariantInterfaceMethodToVirtualMethodOnType", "(Internal.TypeSystem.MethodDesc,Internal.TypeSystem.TypeDesc)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
   - addsTo:

csharp/ql/lib/ext/generated/Microsoft.Extensions.Configuration.model.yml

@@ -9,8 +9,8 @@ extensions:
       - ["Microsoft.Extensions.Configuration", "ChainedConfigurationProvider", False, "ChainedConfigurationProvider", "(Microsoft.Extensions.Configuration.ChainedConfigurationSource)", "", "Argument[0].Property[Microsoft.Extensions.Configuration.ChainedConfigurationSource.Configuration]", "Argument[this].SyntheticField[Microsoft.Extensions.Configuration.ChainedConfigurationProvider._config]", "value", "dfc-generated"]
       - ["Microsoft.Extensions.Configuration", "ChainedConfigurationProvider", False, "TryGet", "(System.String,System.String)", "", "Argument[this].SyntheticField[Microsoft.Extensions.Configuration.ChainedConfigurationProvider._config]", "Argument[1]", "taint", "dfc-generated"]
       - ["Microsoft.Extensions.Configuration", "ChainedConfigurationProvider", False, "get_Configuration", "()", "", "Argument[this].SyntheticField[Microsoft.Extensions.Configuration.ChainedConfigurationProvider._config]", "ReturnValue", "value", "dfc-generated"]
-      - ["Microsoft.Extensions.Configuration", "ConfigurationBinder", False, "Get", "(Microsoft.Extensions.Configuration.IConfiguration,System.Type)", "", "Argument[0]", "ReturnValue", "value", "df-generated"]
-      - ["Microsoft.Extensions.Configuration", "ConfigurationBinder", False, "Get<T>", "(Microsoft.Extensions.Configuration.IConfiguration)", "", "Argument[0]", "ReturnValue", "value", "df-generated"]
+      - ["Microsoft.Extensions.Configuration", "ConfigurationBinder", False, "Get", "(Microsoft.Extensions.Configuration.IConfiguration,System.Type)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["Microsoft.Extensions.Configuration", "ConfigurationBinder", False, "Get<T>", "(Microsoft.Extensions.Configuration.IConfiguration)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["Microsoft.Extensions.Configuration", "ConfigurationBinder", False, "GetValue", "(Microsoft.Extensions.Configuration.IConfiguration,System.Type,System.String,System.Object)", "", "Argument[3]", "ReturnValue", "value", "dfc-generated"]
       - ["Microsoft.Extensions.Configuration", "ConfigurationBinder", False, "GetValue<T>", "(Microsoft.Extensions.Configuration.IConfiguration,System.String,T)", "", "Argument[2]", "ReturnValue", "value", "dfc-generated"]
       - ["Microsoft.Extensions.Configuration", "ConfigurationBuilder", False, "Add", "(Microsoft.Extensions.Configuration.IConfigurationSource)", "", "Argument[0]", "Argument[this].SyntheticField[Microsoft.Extensions.Configuration.ConfigurationBuilder._sources].Element", "value", "dfc-generated"]

csharp/ql/lib/ext/generated/Mono.Linker.Steps.model.yml

@@ -54,11 +54,11 @@ extensions:
       - ["Mono.Linker.Steps", "MarkStep", True, "MarkInstruction", "(Mono.Cecil.Cil.Instruction,Mono.Cecil.MethodDefinition,System.Boolean,Mono.Linker.MessageOrigin)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["Mono.Linker.Steps", "MarkStep", True, "MarkInterfaceImplementation", "(Mono.Cecil.InterfaceImplementation,Mono.Linker.MessageOrigin,System.Nullable<Mono.Linker.DependencyInfo>)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["Mono.Linker.Steps", "MarkStep", True, "MarkMethod", "(Mono.Cecil.MethodReference,Mono.Linker.DependencyInfo,Mono.Linker.MessageOrigin)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["Mono.Linker.Steps", "MarkStep", True, "MarkMethod", "(Mono.Cecil.MethodReference,Mono.Linker.DependencyInfo,Mono.Linker.MessageOrigin)", "", "Argument[0]", "ReturnValue", "value", "df-generated"]
+      - ["Mono.Linker.Steps", "MarkStep", True, "MarkMethod", "(Mono.Cecil.MethodReference,Mono.Linker.DependencyInfo,Mono.Linker.MessageOrigin)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["Mono.Linker.Steps", "MarkStep", True, "MarkRequirementsForInstantiatedTypes", "(Mono.Cecil.TypeDefinition)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["Mono.Linker.Steps", "MarkStep", True, "MarkSecurityAttribute", "(Mono.Cecil.SecurityAttribute,Mono.Linker.DependencyInfo,Mono.Linker.MessageOrigin)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["Mono.Linker.Steps", "MarkStep", True, "MarkType", "(Mono.Cecil.TypeReference,Mono.Linker.DependencyInfo,Mono.Linker.MessageOrigin)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["Mono.Linker.Steps", "MarkStep", True, "MarkType", "(Mono.Cecil.TypeReference,Mono.Linker.DependencyInfo,Mono.Linker.MessageOrigin)", "", "Argument[0]", "ReturnValue", "value", "df-generated"]
+      - ["Mono.Linker.Steps", "MarkStep", True, "MarkType", "(Mono.Cecil.TypeReference,Mono.Linker.DependencyInfo,Mono.Linker.MessageOrigin)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["Mono.Linker.Steps", "MarkStep", True, "MarkTypeVisibleToReflection", "(Mono.Cecil.TypeReference,Mono.Linker.DependencyInfo,Mono.Linker.MessageOrigin)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["Mono.Linker.Steps", "MarkStep", True, "MarkUserDependency", "(Mono.Cecil.IMemberDefinition,Mono.Cecil.CustomAttribute,Mono.Linker.MessageOrigin)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["Mono.Linker.Steps", "MarkStep", True, "Process", "(Mono.Linker.LinkContext)", "", "Argument[0]", "Argument[this].SyntheticField[Mono.Linker.Steps.MarkStep._context]", "value", "dfc-generated"]

csharp/ql/lib/ext/generated/Mono.Linker.model.yml

@@ -157,7 +157,7 @@ extensions:
       - ["Mono.Linker", "UnconditionalSuppressMessageAttributeState+Suppression", False, "Suppression", "(Mono.Linker.SuppressMessageInfo,Mono.Cecil.CustomAttribute,Mono.Cecil.ICustomAttributeProvider)", "", "Argument[1]", "Argument[this].Property[Mono.Linker.UnconditionalSuppressMessageAttributeState+Suppression.OriginAttribute]", "value", "dfc-generated"]
       - ["Mono.Linker", "UnconditionalSuppressMessageAttributeState+Suppression", False, "Suppression", "(Mono.Linker.SuppressMessageInfo,Mono.Cecil.CustomAttribute,Mono.Cecil.ICustomAttributeProvider)", "", "Argument[2]", "Argument[this].Property[Mono.Linker.UnconditionalSuppressMessageAttributeState+Suppression.Provider]", "value", "dfc-generated"]
       - ["Mono.Linker", "UnconditionalSuppressMessageAttributeState", False, "GatherSuppressions", "(Mono.Cecil.ICustomAttributeProvider)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["Mono.Linker", "UnconditionalSuppressMessageAttributeState", False, "GetModuleFromProvider", "(Mono.Cecil.ICustomAttributeProvider)", "", "Argument[0]", "ReturnValue", "value", "df-generated"]
+      - ["Mono.Linker", "UnconditionalSuppressMessageAttributeState", False, "GetModuleFromProvider", "(Mono.Cecil.ICustomAttributeProvider)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["Mono.Linker", "UnconditionalSuppressMessageAttributeState", False, "IsSuppressed", "(System.Int32,Mono.Linker.MessageOrigin,Mono.Linker.SuppressMessageInfo)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
       - ["Mono.Linker", "UnconditionalSuppressMessageAttributeState", False, "UnconditionalSuppressMessageAttributeState", "(Mono.Linker.LinkContext)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["Mono.Linker", "UnintializedContextFactory", True, "CreateAnnotationStore", "(Mono.Linker.LinkContext)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]

csharp/ql/lib/ext/generated/System.Collections.Frozen.model.yml

@@ -4,7 +4,7 @@ extensions:
       pack: codeql/csharp-all
       extensible: summaryModel
     data:
-      - ["System.Collections.Frozen", "FrozenDictionary", False, "ToFrozenDictionary<TKey,TValue>", "(System.Collections.Generic.IEnumerable<System.Collections.Generic.KeyValuePair<TKey,TValue>>,System.Collections.Generic.IEqualityComparer<TKey>)", "", "Argument[0]", "ReturnValue", "value", "df-generated"]
+      - ["System.Collections.Frozen", "FrozenDictionary", False, "ToFrozenDictionary<TKey,TValue>", "(System.Collections.Generic.IEnumerable<System.Collections.Generic.KeyValuePair<TKey,TValue>>,System.Collections.Generic.IEqualityComparer<TKey>)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
       - ["System.Collections.Frozen", "FrozenDictionary<TKey,TValue>+AlternateLookup<TAlternateKey>", False, "ContainsKey", "(TAlternateKey)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.Collections.Frozen", "FrozenDictionary<TKey,TValue>+AlternateLookup<TAlternateKey>", False, "TryGetValue", "(TAlternateKey,TValue)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.Collections.Frozen", "FrozenDictionary<TKey,TValue>+AlternateLookup<TAlternateKey>", False, "get_Item", "(TAlternateKey)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
@@ -16,7 +16,7 @@ extensions:
       - ["System.Collections.Frozen", "FrozenDictionary<TKey,TValue>", False, "get_Values", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Collections.Frozen", "FrozenSet", False, "Create<T>", "(System.Collections.Generic.IEqualityComparer<T>,System.ReadOnlySpan<T>)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
       - ["System.Collections.Frozen", "FrozenSet", False, "Create<T>", "(System.ReadOnlySpan<T>)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Collections.Frozen", "FrozenSet", False, "ToFrozenSet<T>", "(System.Collections.Generic.IEnumerable<T>,System.Collections.Generic.IEqualityComparer<T>)", "", "Argument[0]", "ReturnValue", "value", "df-generated"]
+      - ["System.Collections.Frozen", "FrozenSet", False, "ToFrozenSet<T>", "(System.Collections.Generic.IEnumerable<T>,System.Collections.Generic.IEqualityComparer<T>)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
       - ["System.Collections.Frozen", "FrozenSet<T>+AlternateLookup<TAlternate>", False, "Contains", "(TAlternate)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.Collections.Frozen", "FrozenSet<T>+AlternateLookup<TAlternate>", False, "TryGetValue", "(TAlternate,T)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.Collections.Frozen", "FrozenSet<T>+AlternateLookup<TAlternate>", False, "TryGetValue", "(TAlternate,T)", "", "Argument[this]", "Argument[1]", "taint", "df-generated"]

csharp/ql/lib/ext/generated/System.Collections.Generic.model.yml

@@ -47,12 +47,8 @@ extensions:
       - ["System.Collections.Generic", "KeyValuePair<TKey,TValue>", False, "get_Value", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Collections.Generic", "LinkedList<T>+Enumerator", False, "get_Current", "()", "", "Argument[this].Property[System.Collections.Generic.LinkedList`1+Enumerator.Current]", "ReturnValue", "value", "dfc-generated"]
       - ["System.Collections.Generic", "LinkedList<T>+Enumerator", False, "get_Current", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Collections.Generic", "LinkedList<T>", False, "AddAfter", "(System.Collections.Generic.LinkedListNode<T>,System.Collections.Generic.LinkedListNode<T>)", "", "Argument[0].SyntheticField[System.Collections.Generic.LinkedListNode`1.next].SyntheticField[System.Collections.Generic.LinkedListNode`1.prev]", "Argument[1].SyntheticField[System.Collections.Generic.LinkedListNode`1.prev]", "value", "dfc-generated"]
       - ["System.Collections.Generic", "LinkedList<T>", False, "AddAfter", "(System.Collections.Generic.LinkedListNode<T>,System.Collections.Generic.LinkedListNode<T>)", "", "Argument[0].SyntheticField[System.Collections.Generic.LinkedListNode`1.next]", "Argument[1].SyntheticField[System.Collections.Generic.LinkedListNode`1.next]", "value", "dfc-generated"]
-      - ["System.Collections.Generic", "LinkedList<T>", False, "AddAfter", "(System.Collections.Generic.LinkedListNode<T>,System.Collections.Generic.LinkedListNode<T>)", "", "Argument[1]", "Argument[0].SyntheticField[System.Collections.Generic.LinkedListNode`1.next].SyntheticField[System.Collections.Generic.LinkedListNode`1.prev]", "value", "dfc-generated"]
-      - ["System.Collections.Generic", "LinkedList<T>", False, "AddAfter", "(System.Collections.Generic.LinkedListNode<T>,T)", "", "Argument[0].SyntheticField[System.Collections.Generic.LinkedListNode`1.next].SyntheticField[System.Collections.Generic.LinkedListNode`1.prev]", "ReturnValue.SyntheticField[System.Collections.Generic.LinkedListNode`1.prev]", "value", "dfc-generated"]
       - ["System.Collections.Generic", "LinkedList<T>", False, "AddAfter", "(System.Collections.Generic.LinkedListNode<T>,T)", "", "Argument[0].SyntheticField[System.Collections.Generic.LinkedListNode`1.next]", "ReturnValue.SyntheticField[System.Collections.Generic.LinkedListNode`1.next]", "value", "dfc-generated"]
-      - ["System.Collections.Generic", "LinkedList<T>", False, "AddBefore", "(System.Collections.Generic.LinkedListNode<T>,System.Collections.Generic.LinkedListNode<T>)", "", "Argument[1]", "Argument[0].SyntheticField[System.Collections.Generic.LinkedListNode`1.prev]", "value", "dfc-generated"]
       - ["System.Collections.Generic", "LinkedList<T>", False, "AddBefore", "(System.Collections.Generic.LinkedListNode<T>,System.Collections.Generic.LinkedListNode<T>)", "", "Argument[1]", "Argument[this].SyntheticField[System.Collections.Generic.LinkedList`1.head]", "value", "dfc-generated"]
       - ["System.Collections.Generic", "LinkedList<T>", False, "AddBefore", "(System.Collections.Generic.LinkedListNode<T>,T)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.Collections.Generic", "LinkedList<T>", False, "AddBefore", "(System.Collections.Generic.LinkedListNode<T>,T)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
@@ -64,7 +60,6 @@ extensions:
       - ["System.Collections.Generic", "LinkedList<T>", False, "AddFirst", "(T)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.Collections.Generic", "LinkedList<T>", False, "AddFirst", "(T)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["System.Collections.Generic", "LinkedList<T>", False, "AddFirst", "(T)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Collections.Generic", "LinkedList<T>", False, "AddLast", "(System.Collections.Generic.LinkedListNode<T>)", "", "Argument[this].SyntheticField[System.Collections.Generic.LinkedList`1.head].SyntheticField[System.Collections.Generic.LinkedListNode`1.prev]", "Argument[0].SyntheticField[System.Collections.Generic.LinkedListNode`1.prev]", "value", "dfc-generated"]
       - ["System.Collections.Generic", "LinkedList<T>", False, "AddLast", "(System.Collections.Generic.LinkedListNode<T>)", "", "Argument[this].SyntheticField[System.Collections.Generic.LinkedList`1.head]", "Argument[0].SyntheticField[System.Collections.Generic.LinkedListNode`1.next]", "value", "dfc-generated"]
       - ["System.Collections.Generic", "LinkedList<T>", False, "AddLast", "(T)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.Collections.Generic", "LinkedList<T>", False, "AddLast", "(T)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
@@ -72,9 +67,8 @@ extensions:
       - ["System.Collections.Generic", "LinkedList<T>", False, "LinkedList", "(System.Collections.Generic.IEnumerable<T>)", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
       - ["System.Collections.Generic", "LinkedList<T>", False, "LinkedList", "(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.Collections.Generic", "LinkedList<T>", False, "Remove", "(System.Collections.Generic.LinkedListNode<T>)", "", "Argument[0].SyntheticField[System.Collections.Generic.LinkedListNode`1.next]", "Argument[this].SyntheticField[System.Collections.Generic.LinkedList`1.head]", "value", "dfc-generated"]
-      - ["System.Collections.Generic", "LinkedList<T>", False, "Remove", "(System.Collections.Generic.LinkedListNode<T>)", "", "Argument[0].SyntheticField[System.Collections.Generic.LinkedListNode`1.prev]", "Argument[this].SyntheticField[System.Collections.Generic.LinkedList`1.head].SyntheticField[System.Collections.Generic.LinkedListNode`1.prev]", "value", "dfc-generated"]
       - ["System.Collections.Generic", "LinkedList<T>", False, "get_First", "()", "", "Argument[this].SyntheticField[System.Collections.Generic.LinkedList`1.head]", "ReturnValue", "value", "dfc-generated"]
-      - ["System.Collections.Generic", "LinkedList<T>", False, "get_Last", "()", "", "Argument[this].SyntheticField[System.Collections.Generic.LinkedList`1.head].SyntheticField[System.Collections.Generic.LinkedListNode`1.prev]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Collections.Generic", "LinkedList<T>", False, "get_Last", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Collections.Generic", "LinkedListNode<T>", False, "LinkedListNode", "(T)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.Collections.Generic", "LinkedListNode<T>", False, "get_List", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Collections.Generic", "LinkedListNode<T>", False, "get_Next", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]

csharp/ql/lib/ext/generated/System.Collections.Immutable.model.yml

@@ -106,10 +106,10 @@ extensions:
       - ["System.Collections.Immutable", "ImmutableArray<T>", False, "Slice", "(System.Int32,System.Int32)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
       - ["System.Collections.Immutable", "ImmutableArray<T>", False, "Sort", "()", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
       - ["System.Collections.Immutable", "ImmutableArray<T>", False, "Sort", "(System.Collections.Generic.IComparer<T>)", "", "Argument[this]", "Argument[0]", "taint", "df-generated"]
-      - ["System.Collections.Immutable", "ImmutableArray<T>", False, "Sort", "(System.Collections.Generic.IComparer<T>)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["System.Collections.Immutable", "ImmutableArray<T>", False, "Sort", "(System.Collections.Generic.IComparer<T>)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Collections.Immutable", "ImmutableArray<T>", False, "Sort", "(System.Comparison<T>)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
       - ["System.Collections.Immutable", "ImmutableArray<T>", False, "Sort", "(System.Int32,System.Int32,System.Collections.Generic.IComparer<T>)", "", "Argument[this]", "Argument[2]", "taint", "df-generated"]
-      - ["System.Collections.Immutable", "ImmutableArray<T>", False, "Sort", "(System.Int32,System.Int32,System.Collections.Generic.IComparer<T>)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["System.Collections.Immutable", "ImmutableArray<T>", False, "Sort", "(System.Int32,System.Int32,System.Collections.Generic.IComparer<T>)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Collections.Immutable", "ImmutableArray<T>", False, "ToBuilder", "()", "", "Argument[this].Element", "ReturnValue.Element", "value", "dfc-generated"]
       - ["System.Collections.Immutable", "ImmutableArray<T>", False, "get_Item", "(System.Int32)", "", "Argument[this].SyntheticField[System.Collections.Immutable.ImmutableArray`1.array].Element", "ReturnValue", "value", "dfc-generated"]
       - ["System.Collections.Immutable", "ImmutableDictionary", False, "Create<TKey,TValue>", "(System.Collections.Generic.IEqualityComparer<TKey>)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
@@ -146,14 +146,13 @@ extensions:
       - ["System.Collections.Immutable", "ImmutableDictionary<TKey,TValue>+Enumerator", False, "get_Current", "()", "", "Argument[this].Property[System.Collections.Immutable.ImmutableDictionary`2+Enumerator.Current]", "ReturnValue", "value", "dfc-generated"]
       - ["System.Collections.Immutable", "ImmutableDictionary<TKey,TValue>+Enumerator", False, "get_Current", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Collections.Immutable", "ImmutableDictionary<TKey,TValue>", False, "Clear", "()", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
-      - ["System.Collections.Immutable", "ImmutableDictionary<TKey,TValue>", False, "Remove", "(TKey)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
-      - ["System.Collections.Immutable", "ImmutableDictionary<TKey,TValue>", False, "RemoveRange", "(System.Collections.Generic.IEnumerable<TKey>)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
-      - ["System.Collections.Immutable", "ImmutableDictionary<TKey,TValue>", False, "SetItem", "(TKey,TValue)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
-      - ["System.Collections.Immutable", "ImmutableDictionary<TKey,TValue>", False, "SetItems", "(System.Collections.Generic.IEnumerable<System.Collections.Generic.KeyValuePair<TKey,TValue>>)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["System.Collections.Immutable", "ImmutableDictionary<TKey,TValue>", False, "Remove", "(TKey)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Collections.Immutable", "ImmutableDictionary<TKey,TValue>", False, "RemoveRange", "(System.Collections.Generic.IEnumerable<TKey>)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Collections.Immutable", "ImmutableDictionary<TKey,TValue>", False, "SetItem", "(TKey,TValue)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Collections.Immutable", "ImmutableDictionary<TKey,TValue>", False, "SetItems", "(System.Collections.Generic.IEnumerable<System.Collections.Generic.KeyValuePair<TKey,TValue>>)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Collections.Immutable", "ImmutableDictionary<TKey,TValue>", False, "ToBuilder", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Collections.Immutable", "ImmutableDictionary<TKey,TValue>", False, "TryGetKey", "(TKey,TKey)", "", "Argument[0]", "Argument[1]", "value", "dfc-generated"]
       - ["System.Collections.Immutable", "ImmutableDictionary<TKey,TValue>", False, "WithComparers", "(System.Collections.Generic.IEqualityComparer<TKey>)", "", "Argument[0]", "ReturnValue.SyntheticField[System.Collections.Immutable.ImmutableDictionary`2._comparers].SyntheticField[System.Collections.Immutable.ImmutableDictionary`2+Comparers._keyComparer]", "value", "dfc-generated"]
-      - ["System.Collections.Immutable", "ImmutableDictionary<TKey,TValue>", False, "WithComparers", "(System.Collections.Generic.IEqualityComparer<TKey>)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
       - ["System.Collections.Immutable", "ImmutableDictionary<TKey,TValue>", False, "WithComparers", "(System.Collections.Generic.IEqualityComparer<TKey>,System.Collections.Generic.IEqualityComparer<TValue>)", "", "Argument[0]", "ReturnValue.SyntheticField[System.Collections.Immutable.ImmutableDictionary`2._comparers].SyntheticField[System.Collections.Immutable.ImmutableDictionary`2+Comparers._keyComparer]", "value", "dfc-generated"]
       - ["System.Collections.Immutable", "ImmutableDictionary<TKey,TValue>", False, "WithComparers", "(System.Collections.Generic.IEqualityComparer<TKey>,System.Collections.Generic.IEqualityComparer<TValue>)", "", "Argument[1]", "ReturnValue.SyntheticField[System.Collections.Immutable.ImmutableDictionary`2._comparers].SyntheticField[System.Collections.Immutable.ImmutableDictionary`2+Comparers._valueComparer]", "value", "dfc-generated"]
       - ["System.Collections.Immutable", "ImmutableDictionary<TKey,TValue>", False, "WithComparers", "(System.Collections.Generic.IEqualityComparer<TKey>,System.Collections.Generic.IEqualityComparer<TValue>)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
@@ -173,14 +172,13 @@ extensions:
       - ["System.Collections.Immutable", "ImmutableHashSet<T>+Builder", False, "TryGetValue", "(T,T)", "", "Argument[0]", "Argument[1]", "value", "dfc-generated"]
       - ["System.Collections.Immutable", "ImmutableHashSet<T>+Enumerator", False, "get_Current", "()", "", "Argument[this].Property[System.Collections.Immutable.ImmutableHashSet`1+Enumerator.Current]", "ReturnValue", "value", "dfc-generated"]
       - ["System.Collections.Immutable", "ImmutableHashSet<T>+Enumerator", False, "get_Current", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Collections.Immutable", "ImmutableHashSet<T>", False, "Except", "(System.Collections.Generic.IEnumerable<T>)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["System.Collections.Immutable", "ImmutableHashSet<T>", False, "Except", "(System.Collections.Generic.IEnumerable<T>)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Collections.Immutable", "ImmutableHashSet<T>", False, "Intersect", "(System.Collections.Generic.IEnumerable<T>)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
-      - ["System.Collections.Immutable", "ImmutableHashSet<T>", False, "Remove", "(T)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["System.Collections.Immutable", "ImmutableHashSet<T>", False, "Remove", "(T)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Collections.Immutable", "ImmutableHashSet<T>", False, "SymmetricExcept", "(System.Collections.Generic.IEnumerable<T>)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
       - ["System.Collections.Immutable", "ImmutableHashSet<T>", False, "ToBuilder", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Collections.Immutable", "ImmutableHashSet<T>", False, "TryGetValue", "(T,T)", "", "Argument[0]", "Argument[1]", "value", "dfc-generated"]
       - ["System.Collections.Immutable", "ImmutableHashSet<T>", False, "Union", "(System.Collections.Generic.IEnumerable<T>)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
-      - ["System.Collections.Immutable", "ImmutableHashSet<T>", False, "Union", "(System.Collections.Generic.IEnumerable<T>)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
       - ["System.Collections.Immutable", "ImmutableHashSet<T>", False, "WithComparer", "(System.Collections.Generic.IEqualityComparer<T>)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
       - ["System.Collections.Immutable", "ImmutableHashSet<T>", False, "get_KeyComparer", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Collections.Immutable", "ImmutableInterlocked", False, "AddOrUpdate<TKey,TValue>", "(System.Collections.Immutable.ImmutableDictionary<TKey,TValue>,TKey,System.Func<TKey,TValue>,System.Func<TKey,TValue,TValue>)", "", "Argument[1]", "Argument[2].Parameter[0]", "value", "dfc-generated"]
@@ -201,17 +199,17 @@ extensions:
       - ["System.Collections.Immutable", "ImmutableList", False, "Create<T>", "(System.ReadOnlySpan<T>)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["System.Collections.Immutable", "ImmutableList", False, "Create<T>", "(T)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["System.Collections.Immutable", "ImmutableList", False, "Create<T>", "(T[])", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
-      - ["System.Collections.Immutable", "ImmutableList", False, "CreateRange<T>", "(System.Collections.Generic.IEnumerable<T>)", "", "Argument[0]", "ReturnValue", "value", "df-generated"]
+      - ["System.Collections.Immutable", "ImmutableList", False, "CreateRange<T>", "(System.Collections.Generic.IEnumerable<T>)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
       - ["System.Collections.Immutable", "ImmutableList", False, "IndexOf<T>", "(System.Collections.Immutable.IImmutableList<T>,T,System.Collections.Generic.IEqualityComparer<T>)", "", "Argument[0].Element", "Argument[2]", "taint", "df-generated"]
       - ["System.Collections.Immutable", "ImmutableList", False, "IndexOf<T>", "(System.Collections.Immutable.IImmutableList<T>,T,System.Collections.Generic.IEqualityComparer<T>)", "", "Argument[1]", "Argument[2]", "taint", "df-generated"]
       - ["System.Collections.Immutable", "ImmutableList", False, "LastIndexOf<T>", "(System.Collections.Immutable.IImmutableList<T>,T,System.Collections.Generic.IEqualityComparer<T>)", "", "Argument[0].Element", "Argument[2]", "taint", "df-generated"]
       - ["System.Collections.Immutable", "ImmutableList", False, "LastIndexOf<T>", "(System.Collections.Immutable.IImmutableList<T>,T,System.Collections.Generic.IEqualityComparer<T>)", "", "Argument[1]", "Argument[2]", "taint", "df-generated"]
-      - ["System.Collections.Immutable", "ImmutableList", False, "Remove<T>", "(System.Collections.Immutable.IImmutableList<T>,T)", "", "Argument[0]", "ReturnValue", "value", "df-generated"]
-      - ["System.Collections.Immutable", "ImmutableList", False, "RemoveRange<T>", "(System.Collections.Immutable.IImmutableList<T>,System.Collections.Generic.IEnumerable<T>)", "", "Argument[0]", "ReturnValue", "value", "df-generated"]
-      - ["System.Collections.Immutable", "ImmutableList", False, "Replace<T>", "(System.Collections.Immutable.IImmutableList<T>,T,T)", "", "Argument[0]", "ReturnValue", "value", "df-generated"]
+      - ["System.Collections.Immutable", "ImmutableList", False, "Remove<T>", "(System.Collections.Immutable.IImmutableList<T>,T)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
+      - ["System.Collections.Immutable", "ImmutableList", False, "RemoveRange<T>", "(System.Collections.Immutable.IImmutableList<T>,System.Collections.Generic.IEnumerable<T>)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
+      - ["System.Collections.Immutable", "ImmutableList", False, "Replace<T>", "(System.Collections.Immutable.IImmutableList<T>,T,T)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
       - ["System.Collections.Immutable", "ImmutableList", False, "Replace<T>", "(System.Collections.Immutable.IImmutableList<T>,T,T)", "", "Argument[2]", "Argument[0].Element", "taint", "df-generated"]
       - ["System.Collections.Immutable", "ImmutableList", False, "Replace<T>", "(System.Collections.Immutable.IImmutableList<T>,T,T)", "", "Argument[2]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Collections.Immutable", "ImmutableList", False, "ToImmutableList<TSource>", "(System.Collections.Generic.IEnumerable<TSource>)", "", "Argument[0]", "ReturnValue", "value", "df-generated"]
+      - ["System.Collections.Immutable", "ImmutableList", False, "ToImmutableList<TSource>", "(System.Collections.Generic.IEnumerable<TSource>)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
       - ["System.Collections.Immutable", "ImmutableList<T>+Builder", False, "BinarySearch", "(System.Int32,System.Int32,T,System.Collections.Generic.IComparer<T>)", "", "Argument[2]", "Argument[3]", "taint", "df-generated"]
       - ["System.Collections.Immutable", "ImmutableList<T>+Builder", False, "BinarySearch", "(System.Int32,System.Int32,T,System.Collections.Generic.IComparer<T>)", "", "Argument[this]", "Argument[3]", "taint", "df-generated"]
       - ["System.Collections.Immutable", "ImmutableList<T>+Builder", False, "BinarySearch", "(T,System.Collections.Generic.IComparer<T>)", "", "Argument[0]", "Argument[1]", "taint", "df-generated"]
@@ -234,23 +232,24 @@ extensions:
       - ["System.Collections.Immutable", "ImmutableList<T>", False, "ForEach", "(System.Action<T>)", "", "Argument[this].Element", "Argument[0].Parameter[0]", "value", "dfc-generated"]
       - ["System.Collections.Immutable", "ImmutableList<T>", False, "IndexOf", "(T,System.Int32,System.Int32,System.Collections.Generic.IEqualityComparer<T>)", "", "Argument[0]", "Argument[3]", "taint", "df-generated"]
       - ["System.Collections.Immutable", "ImmutableList<T>", False, "LastIndexOf", "(T,System.Int32,System.Int32,System.Collections.Generic.IEqualityComparer<T>)", "", "Argument[0]", "Argument[3]", "taint", "df-generated"]
-      - ["System.Collections.Immutable", "ImmutableList<T>", False, "Remove", "(T)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["System.Collections.Immutable", "ImmutableList<T>", False, "Remove", "(T)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Collections.Immutable", "ImmutableList<T>", False, "Remove", "(T,System.Collections.Generic.IEqualityComparer<T>)", "", "Argument[0]", "Argument[1]", "taint", "df-generated"]
-      - ["System.Collections.Immutable", "ImmutableList<T>", False, "Remove", "(T,System.Collections.Generic.IEqualityComparer<T>)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
-      - ["System.Collections.Immutable", "ImmutableList<T>", False, "RemoveAt", "(System.Int32)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
-      - ["System.Collections.Immutable", "ImmutableList<T>", False, "RemoveRange", "(System.Collections.Generic.IEnumerable<T>)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["System.Collections.Immutable", "ImmutableList<T>", False, "Remove", "(T,System.Collections.Generic.IEqualityComparer<T>)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Collections.Immutable", "ImmutableList<T>", False, "RemoveAt", "(System.Int32)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Collections.Immutable", "ImmutableList<T>", False, "RemoveRange", "(System.Collections.Generic.IEnumerable<T>)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Collections.Immutable", "ImmutableList<T>", False, "RemoveRange", "(System.Collections.Generic.IEnumerable<T>,System.Collections.Generic.IEqualityComparer<T>)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Collections.Immutable", "ImmutableList<T>", False, "RemoveRange", "(System.Collections.Generic.IEnumerable<T>,System.Collections.Generic.IEqualityComparer<T>)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
-      - ["System.Collections.Immutable", "ImmutableList<T>", False, "RemoveRange", "(System.Int32,System.Int32)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["System.Collections.Immutable", "ImmutableList<T>", False, "RemoveRange", "(System.Int32,System.Int32)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Collections.Immutable", "ImmutableList<T>", False, "Replace", "(T,T)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
       - ["System.Collections.Immutable", "ImmutableList<T>", False, "Replace", "(T,T)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Collections.Immutable", "ImmutableList<T>", False, "Replace", "(T,T)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["System.Collections.Immutable", "ImmutableList<T>", False, "Replace", "(T,T)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Collections.Immutable", "ImmutableList<T>", False, "Replace", "(T,T,System.Collections.Generic.IEqualityComparer<T>)", "", "Argument[0]", "Argument[2]", "taint", "df-generated"]
       - ["System.Collections.Immutable", "ImmutableList<T>", False, "Replace", "(T,T,System.Collections.Generic.IEqualityComparer<T>)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
       - ["System.Collections.Immutable", "ImmutableList<T>", False, "Replace", "(T,T,System.Collections.Generic.IEqualityComparer<T>)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Collections.Immutable", "ImmutableList<T>", False, "Replace", "(T,T,System.Collections.Generic.IEqualityComparer<T>)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["System.Collections.Immutable", "ImmutableList<T>", False, "Replace", "(T,T,System.Collections.Generic.IEqualityComparer<T>)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Collections.Immutable", "ImmutableList<T>", False, "SetItem", "(System.Int32,T)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
       - ["System.Collections.Immutable", "ImmutableList<T>", False, "SetItem", "(System.Int32,T)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Collections.Immutable", "ImmutableList<T>", False, "SetItem", "(System.Int32,T)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["System.Collections.Immutable", "ImmutableList<T>", False, "SetItem", "(System.Int32,T)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Collections.Immutable", "ImmutableList<T>", False, "Sort", "()", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
       - ["System.Collections.Immutable", "ImmutableList<T>", False, "Sort", "(System.Collections.Generic.IComparer<T>)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
       - ["System.Collections.Immutable", "ImmutableList<T>", False, "Sort", "(System.Comparison<T>)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
@@ -275,15 +274,15 @@ extensions:
       - ["System.Collections.Immutable", "ImmutableSortedDictionary", False, "CreateBuilder<TKey,TValue>", "(System.Collections.Generic.IComparer<TKey>,System.Collections.Generic.IEqualityComparer<TValue>)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["System.Collections.Immutable", "ImmutableSortedDictionary", False, "CreateBuilder<TKey,TValue>", "(System.Collections.Generic.IComparer<TKey>,System.Collections.Generic.IEqualityComparer<TValue>)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
       - ["System.Collections.Immutable", "ImmutableSortedDictionary", False, "CreateRange<TKey,TValue>", "(System.Collections.Generic.IComparer<TKey>,System.Collections.Generic.IEnumerable<System.Collections.Generic.KeyValuePair<TKey,TValue>>)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Collections.Immutable", "ImmutableSortedDictionary", False, "CreateRange<TKey,TValue>", "(System.Collections.Generic.IComparer<TKey>,System.Collections.Generic.IEnumerable<System.Collections.Generic.KeyValuePair<TKey,TValue>>)", "", "Argument[1]", "ReturnValue", "value", "df-generated"]
+      - ["System.Collections.Immutable", "ImmutableSortedDictionary", False, "CreateRange<TKey,TValue>", "(System.Collections.Generic.IComparer<TKey>,System.Collections.Generic.IEnumerable<System.Collections.Generic.KeyValuePair<TKey,TValue>>)", "", "Argument[1].Element", "ReturnValue", "taint", "df-generated"]
       - ["System.Collections.Immutable", "ImmutableSortedDictionary", False, "CreateRange<TKey,TValue>", "(System.Collections.Generic.IComparer<TKey>,System.Collections.Generic.IEqualityComparer<TValue>,System.Collections.Generic.IEnumerable<System.Collections.Generic.KeyValuePair<TKey,TValue>>)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["System.Collections.Immutable", "ImmutableSortedDictionary", False, "CreateRange<TKey,TValue>", "(System.Collections.Generic.IComparer<TKey>,System.Collections.Generic.IEqualityComparer<TValue>,System.Collections.Generic.IEnumerable<System.Collections.Generic.KeyValuePair<TKey,TValue>>)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Collections.Immutable", "ImmutableSortedDictionary", False, "CreateRange<TKey,TValue>", "(System.Collections.Generic.IComparer<TKey>,System.Collections.Generic.IEqualityComparer<TValue>,System.Collections.Generic.IEnumerable<System.Collections.Generic.KeyValuePair<TKey,TValue>>)", "", "Argument[2]", "ReturnValue", "value", "df-generated"]
-      - ["System.Collections.Immutable", "ImmutableSortedDictionary", False, "CreateRange<TKey,TValue>", "(System.Collections.Generic.IEnumerable<System.Collections.Generic.KeyValuePair<TKey,TValue>>)", "", "Argument[0]", "ReturnValue", "value", "df-generated"]
-      - ["System.Collections.Immutable", "ImmutableSortedDictionary", False, "ToImmutableSortedDictionary<TKey,TValue>", "(System.Collections.Generic.IEnumerable<System.Collections.Generic.KeyValuePair<TKey,TValue>>)", "", "Argument[0]", "ReturnValue", "value", "df-generated"]
-      - ["System.Collections.Immutable", "ImmutableSortedDictionary", False, "ToImmutableSortedDictionary<TKey,TValue>", "(System.Collections.Generic.IEnumerable<System.Collections.Generic.KeyValuePair<TKey,TValue>>,System.Collections.Generic.IComparer<TKey>)", "", "Argument[0]", "ReturnValue", "value", "df-generated"]
+      - ["System.Collections.Immutable", "ImmutableSortedDictionary", False, "CreateRange<TKey,TValue>", "(System.Collections.Generic.IComparer<TKey>,System.Collections.Generic.IEqualityComparer<TValue>,System.Collections.Generic.IEnumerable<System.Collections.Generic.KeyValuePair<TKey,TValue>>)", "", "Argument[2].Element", "ReturnValue", "taint", "df-generated"]
+      - ["System.Collections.Immutable", "ImmutableSortedDictionary", False, "CreateRange<TKey,TValue>", "(System.Collections.Generic.IEnumerable<System.Collections.Generic.KeyValuePair<TKey,TValue>>)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
+      - ["System.Collections.Immutable", "ImmutableSortedDictionary", False, "ToImmutableSortedDictionary<TKey,TValue>", "(System.Collections.Generic.IEnumerable<System.Collections.Generic.KeyValuePair<TKey,TValue>>)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
+      - ["System.Collections.Immutable", "ImmutableSortedDictionary", False, "ToImmutableSortedDictionary<TKey,TValue>", "(System.Collections.Generic.IEnumerable<System.Collections.Generic.KeyValuePair<TKey,TValue>>,System.Collections.Generic.IComparer<TKey>)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
       - ["System.Collections.Immutable", "ImmutableSortedDictionary", False, "ToImmutableSortedDictionary<TKey,TValue>", "(System.Collections.Generic.IEnumerable<System.Collections.Generic.KeyValuePair<TKey,TValue>>,System.Collections.Generic.IComparer<TKey>)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Collections.Immutable", "ImmutableSortedDictionary", False, "ToImmutableSortedDictionary<TKey,TValue>", "(System.Collections.Generic.IEnumerable<System.Collections.Generic.KeyValuePair<TKey,TValue>>,System.Collections.Generic.IComparer<TKey>,System.Collections.Generic.IEqualityComparer<TValue>)", "", "Argument[0]", "ReturnValue", "value", "df-generated"]
+      - ["System.Collections.Immutable", "ImmutableSortedDictionary", False, "ToImmutableSortedDictionary<TKey,TValue>", "(System.Collections.Generic.IEnumerable<System.Collections.Generic.KeyValuePair<TKey,TValue>>,System.Collections.Generic.IComparer<TKey>,System.Collections.Generic.IEqualityComparer<TValue>)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
       - ["System.Collections.Immutable", "ImmutableSortedDictionary", False, "ToImmutableSortedDictionary<TKey,TValue>", "(System.Collections.Generic.IEnumerable<System.Collections.Generic.KeyValuePair<TKey,TValue>>,System.Collections.Generic.IComparer<TKey>,System.Collections.Generic.IEqualityComparer<TValue>)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
       - ["System.Collections.Immutable", "ImmutableSortedDictionary", False, "ToImmutableSortedDictionary<TKey,TValue>", "(System.Collections.Generic.IEnumerable<System.Collections.Generic.KeyValuePair<TKey,TValue>>,System.Collections.Generic.IComparer<TKey>,System.Collections.Generic.IEqualityComparer<TValue>)", "", "Argument[2]", "ReturnValue", "taint", "df-generated"]
       - ["System.Collections.Immutable", "ImmutableSortedDictionary", False, "ToImmutableSortedDictionary<TSource,TKey,TValue>", "(System.Collections.Generic.IEnumerable<TSource>,System.Func<TSource,TKey>,System.Func<TSource,TValue>)", "", "Argument[0].Element", "Argument[1].Parameter[0]", "value", "dfc-generated"]
@@ -304,20 +303,17 @@ extensions:
       - ["System.Collections.Immutable", "ImmutableSortedDictionary<TKey,TValue>", False, "Clear", "()", "", "Argument[this].SyntheticField[System.Collections.Immutable.ImmutableSortedDictionary`2._keyComparer]", "ReturnValue.SyntheticField[System.Collections.Immutable.ImmutableSortedDictionary`2._keyComparer]", "value", "dfc-generated"]
       - ["System.Collections.Immutable", "ImmutableSortedDictionary<TKey,TValue>", False, "Clear", "()", "", "Argument[this].SyntheticField[System.Collections.Immutable.ImmutableSortedDictionary`2._valueComparer]", "ReturnValue.SyntheticField[System.Collections.Immutable.ImmutableSortedDictionary`2._valueComparer]", "value", "dfc-generated"]
       - ["System.Collections.Immutable", "ImmutableSortedDictionary<TKey,TValue>", False, "Clear", "()", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
-      - ["System.Collections.Immutable", "ImmutableSortedDictionary<TKey,TValue>", False, "Remove", "(TKey)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
-      - ["System.Collections.Immutable", "ImmutableSortedDictionary<TKey,TValue>", False, "RemoveRange", "(System.Collections.Generic.IEnumerable<TKey>)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["System.Collections.Immutable", "ImmutableSortedDictionary<TKey,TValue>", False, "Remove", "(TKey)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Collections.Immutable", "ImmutableSortedDictionary<TKey,TValue>", False, "RemoveRange", "(System.Collections.Generic.IEnumerable<TKey>)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Collections.Immutable", "ImmutableSortedDictionary<TKey,TValue>", False, "SetItem", "(TKey,TValue)", "", "Argument[0]", "ReturnValue.SyntheticField[System.Collections.Immutable.ImmutableSortedDictionary`2._root].SyntheticField[System.Collections.Immutable.ImmutableSortedDictionary`2+Node._key]", "value", "dfc-generated"]
-      - ["System.Collections.Immutable", "ImmutableSortedDictionary<TKey,TValue>", False, "SetItem", "(TKey,TValue)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
-      - ["System.Collections.Immutable", "ImmutableSortedDictionary<TKey,TValue>", False, "SetItems", "(System.Collections.Generic.IEnumerable<System.Collections.Generic.KeyValuePair<TKey,TValue>>)", "", "Argument[0]", "ReturnValue", "value", "df-generated"]
-      - ["System.Collections.Immutable", "ImmutableSortedDictionary<TKey,TValue>", False, "SetItems", "(System.Collections.Generic.IEnumerable<System.Collections.Generic.KeyValuePair<TKey,TValue>>)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["System.Collections.Immutable", "ImmutableSortedDictionary<TKey,TValue>", False, "SetItems", "(System.Collections.Generic.IEnumerable<System.Collections.Generic.KeyValuePair<TKey,TValue>>)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
+      - ["System.Collections.Immutable", "ImmutableSortedDictionary<TKey,TValue>", False, "SetItems", "(System.Collections.Generic.IEnumerable<System.Collections.Generic.KeyValuePair<TKey,TValue>>)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Collections.Immutable", "ImmutableSortedDictionary<TKey,TValue>", False, "ToBuilder", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Collections.Immutable", "ImmutableSortedDictionary<TKey,TValue>", False, "TryGetKey", "(TKey,TKey)", "", "Argument[0]", "Argument[1]", "value", "dfc-generated"]
       - ["System.Collections.Immutable", "ImmutableSortedDictionary<TKey,TValue>", False, "TryGetKey", "(TKey,TKey)", "", "Argument[this].SyntheticField[System.Collections.Immutable.ImmutableSortedDictionary`2._root].SyntheticField[System.Collections.Immutable.ImmutableSortedDictionary`2+Node._key]", "Argument[1]", "value", "dfc-generated"]
       - ["System.Collections.Immutable", "ImmutableSortedDictionary<TKey,TValue>", False, "WithComparers", "(System.Collections.Generic.IComparer<TKey>)", "", "Argument[0]", "ReturnValue.SyntheticField[System.Collections.Immutable.ImmutableSortedDictionary`2._keyComparer]", "value", "dfc-generated"]
-      - ["System.Collections.Immutable", "ImmutableSortedDictionary<TKey,TValue>", False, "WithComparers", "(System.Collections.Generic.IComparer<TKey>)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
       - ["System.Collections.Immutable", "ImmutableSortedDictionary<TKey,TValue>", False, "WithComparers", "(System.Collections.Generic.IComparer<TKey>,System.Collections.Generic.IEqualityComparer<TValue>)", "", "Argument[0]", "ReturnValue.SyntheticField[System.Collections.Immutable.ImmutableSortedDictionary`2._keyComparer]", "value", "dfc-generated"]
       - ["System.Collections.Immutable", "ImmutableSortedDictionary<TKey,TValue>", False, "WithComparers", "(System.Collections.Generic.IComparer<TKey>,System.Collections.Generic.IEqualityComparer<TValue>)", "", "Argument[1]", "ReturnValue.SyntheticField[System.Collections.Immutable.ImmutableSortedDictionary`2._valueComparer]", "value", "dfc-generated"]
-      - ["System.Collections.Immutable", "ImmutableSortedDictionary<TKey,TValue>", False, "WithComparers", "(System.Collections.Generic.IComparer<TKey>,System.Collections.Generic.IEqualityComparer<TValue>)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
       - ["System.Collections.Immutable", "ImmutableSortedDictionary<TKey,TValue>", False, "get_KeyComparer", "()", "", "Argument[this].SyntheticField[System.Collections.Immutable.ImmutableSortedDictionary`2._keyComparer]", "ReturnValue", "value", "dfc-generated"]
       - ["System.Collections.Immutable", "ImmutableSortedDictionary<TKey,TValue>", False, "get_ValueComparer", "()", "", "Argument[this].SyntheticField[System.Collections.Immutable.ImmutableSortedDictionary`2._valueComparer]", "ReturnValue", "value", "dfc-generated"]
       - ["System.Collections.Immutable", "ImmutableSortedSet", False, "Create<T>", "(System.Collections.Generic.IComparer<T>)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
@@ -332,10 +328,10 @@ extensions:
       - ["System.Collections.Immutable", "ImmutableSortedSet", False, "Create<T>", "(T[])", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
       - ["System.Collections.Immutable", "ImmutableSortedSet", False, "CreateBuilder<T>", "(System.Collections.Generic.IComparer<T>)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["System.Collections.Immutable", "ImmutableSortedSet", False, "CreateRange<T>", "(System.Collections.Generic.IComparer<T>,System.Collections.Generic.IEnumerable<T>)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Collections.Immutable", "ImmutableSortedSet", False, "CreateRange<T>", "(System.Collections.Generic.IComparer<T>,System.Collections.Generic.IEnumerable<T>)", "", "Argument[1]", "ReturnValue", "value", "df-generated"]
-      - ["System.Collections.Immutable", "ImmutableSortedSet", False, "CreateRange<T>", "(System.Collections.Generic.IEnumerable<T>)", "", "Argument[0]", "ReturnValue", "value", "df-generated"]
-      - ["System.Collections.Immutable", "ImmutableSortedSet", False, "ToImmutableSortedSet<TSource>", "(System.Collections.Generic.IEnumerable<TSource>)", "", "Argument[0]", "ReturnValue", "value", "df-generated"]
-      - ["System.Collections.Immutable", "ImmutableSortedSet", False, "ToImmutableSortedSet<TSource>", "(System.Collections.Generic.IEnumerable<TSource>,System.Collections.Generic.IComparer<TSource>)", "", "Argument[0]", "ReturnValue", "value", "df-generated"]
+      - ["System.Collections.Immutable", "ImmutableSortedSet", False, "CreateRange<T>", "(System.Collections.Generic.IComparer<T>,System.Collections.Generic.IEnumerable<T>)", "", "Argument[1].Element", "ReturnValue", "taint", "df-generated"]
+      - ["System.Collections.Immutable", "ImmutableSortedSet", False, "CreateRange<T>", "(System.Collections.Generic.IEnumerable<T>)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
+      - ["System.Collections.Immutable", "ImmutableSortedSet", False, "ToImmutableSortedSet<TSource>", "(System.Collections.Generic.IEnumerable<TSource>)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
+      - ["System.Collections.Immutable", "ImmutableSortedSet", False, "ToImmutableSortedSet<TSource>", "(System.Collections.Generic.IEnumerable<TSource>,System.Collections.Generic.IComparer<TSource>)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
       - ["System.Collections.Immutable", "ImmutableSortedSet", False, "ToImmutableSortedSet<TSource>", "(System.Collections.Generic.IEnumerable<TSource>,System.Collections.Generic.IComparer<TSource>)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
       - ["System.Collections.Immutable", "ImmutableSortedSet<T>+Builder", False, "IntersectWith", "(System.Collections.Generic.IEnumerable<T>)", "", "Argument[0].Element", "Argument[this].SyntheticField[System.Collections.Immutable.ImmutableSortedSet`1+Builder._root].SyntheticField[System.Collections.Immutable.ImmutableSortedSet`1+Node._key]", "value", "dfc-generated"]
       - ["System.Collections.Immutable", "ImmutableSortedSet<T>+Builder", False, "SymmetricExceptWith", "(System.Collections.Generic.IEnumerable<T>)", "", "Argument[0].Element", "Argument[this].SyntheticField[System.Collections.Immutable.ImmutableSortedSet`1+Builder._root].SyntheticField[System.Collections.Immutable.ImmutableSortedSet`1+Node._key]", "value", "dfc-generated"]
@@ -348,19 +344,18 @@ extensions:
       - ["System.Collections.Immutable", "ImmutableSortedSet<T>+Enumerator", False, "get_Current", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Collections.Immutable", "ImmutableSortedSet<T>", False, "Clear", "()", "", "Argument[this].SyntheticField[System.Collections.Immutable.ImmutableSortedSet`1._comparer]", "ReturnValue.SyntheticField[System.Collections.Immutable.ImmutableSortedSet`1._comparer]", "value", "dfc-generated"]
       - ["System.Collections.Immutable", "ImmutableSortedSet<T>", False, "Clear", "()", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
-      - ["System.Collections.Immutable", "ImmutableSortedSet<T>", False, "Except", "(System.Collections.Generic.IEnumerable<T>)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
-      - ["System.Collections.Immutable", "ImmutableSortedSet<T>", False, "Intersect", "(System.Collections.Generic.IEnumerable<T>)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
-      - ["System.Collections.Immutable", "ImmutableSortedSet<T>", False, "Remove", "(T)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["System.Collections.Immutable", "ImmutableSortedSet<T>", False, "Except", "(System.Collections.Generic.IEnumerable<T>)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Collections.Immutable", "ImmutableSortedSet<T>", False, "Intersect", "(System.Collections.Generic.IEnumerable<T>)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Collections.Immutable", "ImmutableSortedSet<T>", False, "Remove", "(T)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Collections.Immutable", "ImmutableSortedSet<T>", False, "SymmetricExcept", "(System.Collections.Generic.IEnumerable<T>)", "", "Argument[0].Element", "Argument[this].Element", "value", "dfc-generated"]
       - ["System.Collections.Immutable", "ImmutableSortedSet<T>", False, "SymmetricExcept", "(System.Collections.Generic.IEnumerable<T>)", "", "Argument[0].Element", "ReturnValue.SyntheticField[System.Collections.Immutable.ImmutableSortedSet`1._root].SyntheticField[System.Collections.Immutable.ImmutableSortedSet`1+Node._key]", "value", "dfc-generated"]
-      - ["System.Collections.Immutable", "ImmutableSortedSet<T>", False, "SymmetricExcept", "(System.Collections.Generic.IEnumerable<T>)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
       - ["System.Collections.Immutable", "ImmutableSortedSet<T>", False, "ToBuilder", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Collections.Immutable", "ImmutableSortedSet<T>", False, "TryGetValue", "(T,T)", "", "Argument[0]", "Argument[1]", "value", "dfc-generated"]
       - ["System.Collections.Immutable", "ImmutableSortedSet<T>", False, "TryGetValue", "(T,T)", "", "Argument[this].SyntheticField[System.Collections.Immutable.ImmutableSortedSet`1._root].SyntheticField[System.Collections.Immutable.ImmutableSortedSet`1+Node._key]", "Argument[1]", "value", "dfc-generated"]
-      - ["System.Collections.Immutable", "ImmutableSortedSet<T>", False, "Union", "(System.Collections.Generic.IEnumerable<T>)", "", "Argument[0]", "ReturnValue", "value", "df-generated"]
+      - ["System.Collections.Immutable", "ImmutableSortedSet<T>", False, "Union", "(System.Collections.Generic.IEnumerable<T>)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
+      - ["System.Collections.Immutable", "ImmutableSortedSet<T>", False, "Union", "(System.Collections.Generic.IEnumerable<T>)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Collections.Immutable", "ImmutableSortedSet<T>", False, "Union", "(System.Collections.Generic.IEnumerable<T>)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
       - ["System.Collections.Immutable", "ImmutableSortedSet<T>", False, "WithComparer", "(System.Collections.Generic.IComparer<T>)", "", "Argument[0]", "ReturnValue.SyntheticField[System.Collections.Immutable.ImmutableSortedSet`1._comparer]", "value", "dfc-generated"]
-      - ["System.Collections.Immutable", "ImmutableSortedSet<T>", False, "WithComparer", "(System.Collections.Generic.IComparer<T>)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
       - ["System.Collections.Immutable", "ImmutableSortedSet<T>", False, "get_KeyComparer", "()", "", "Argument[this].SyntheticField[System.Collections.Immutable.ImmutableSortedSet`1._comparer]", "ReturnValue", "value", "dfc-generated"]
       - ["System.Collections.Immutable", "ImmutableSortedSet<T>", False, "get_Max", "()", "", "Argument[this].SyntheticField[System.Collections.Immutable.ImmutableSortedSet`1._root].SyntheticField[System.Collections.Immutable.ImmutableSortedSet`1+Node._key]", "ReturnValue", "value", "dfc-generated"]
       - ["System.Collections.Immutable", "ImmutableSortedSet<T>", False, "get_Min", "()", "", "Argument[this].SyntheticField[System.Collections.Immutable.ImmutableSortedSet`1._root].SyntheticField[System.Collections.Immutable.ImmutableSortedSet`1+Node._key]", "ReturnValue", "value", "dfc-generated"]

csharp/ql/lib/ext/generated/System.ComponentModel.DataAnnotations.model.yml

@@ -47,15 +47,10 @@ extensions:
       - ["System.ComponentModel.DataAnnotations", "UIHintAttribute", False, "get_ControlParameters", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.ComponentModel.DataAnnotations", "UIHintAttribute", False, "get_PresentationLayer", "()", "", "Argument[this].SyntheticField[System.ComponentModel.DataAnnotations.UIHintAttribute._implementation].SyntheticField[System.ComponentModel.DataAnnotations.UIHintAttribute+UIHintImplementation.PresentationLayer]", "ReturnValue", "value", "dfc-generated"]
       - ["System.ComponentModel.DataAnnotations", "UIHintAttribute", False, "get_UIHint", "()", "", "Argument[this].SyntheticField[System.ComponentModel.DataAnnotations.UIHintAttribute._implementation].SyntheticField[System.ComponentModel.DataAnnotations.UIHintAttribute+UIHintImplementation.UIHint]", "ReturnValue", "value", "dfc-generated"]
-      - ["System.ComponentModel.DataAnnotations", "ValidationAttribute", False, "GetValidationResult", "(System.Object,System.ComponentModel.DataAnnotations.ValidationContext)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.ComponentModel.DataAnnotations", "ValidationAttribute", False, "Validate", "(System.Object,System.ComponentModel.DataAnnotations.ValidationContext)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.ComponentModel.DataAnnotations", "ValidationAttribute", False, "Validate", "(System.Object,System.String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.ComponentModel.DataAnnotations", "ValidationAttribute", False, "ValidationAttribute", "(System.Func<System.String>)", "", "Argument[0]", "Argument[this].SyntheticField[System.ComponentModel.DataAnnotations.ValidationAttribute._errorMessageResourceAccessor]", "value", "dfc-generated"]
       - ["System.ComponentModel.DataAnnotations", "ValidationAttribute", False, "get_ErrorMessageString", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.ComponentModel.DataAnnotations", "ValidationAttribute", True, "FormatErrorMessage", "(System.String)", "", "Argument[0]", "ReturnValue", "taint", "dfc-generated"]
       - ["System.ComponentModel.DataAnnotations", "ValidationAttribute", True, "FormatErrorMessage", "(System.String)", "", "Argument[this].Property[System.ComponentModel.DataAnnotations.ValidationAttribute.ErrorMessageString]", "ReturnValue", "taint", "dfc-generated"]
-      - ["System.ComponentModel.DataAnnotations", "ValidationAttribute", True, "IsValid", "(System.Object)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.ComponentModel.DataAnnotations", "ValidationAttribute", True, "IsValid", "(System.Object,System.ComponentModel.DataAnnotations.ValidationContext)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.ComponentModel.DataAnnotations", "ValidationContext", False, "InitializeServiceProvider", "(System.Func<System.Type,System.Object>)", "", "Argument[0]", "Argument[this].SyntheticField[System.ComponentModel.DataAnnotations.ValidationContext._serviceProvider]", "value", "dfc-generated"]
       - ["System.ComponentModel.DataAnnotations", "ValidationContext", False, "ValidationContext", "(System.Object,System.IServiceProvider,System.Collections.Generic.IDictionary<System.Object,System.Object>)", "", "Argument[0]", "Argument[this].Property[System.ComponentModel.DataAnnotations.ValidationContext.ObjectInstance]", "value", "dfc-generated"]
       - ["System.ComponentModel.DataAnnotations", "ValidationContext", False, "get_Items", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
@@ -71,20 +66,26 @@ extensions:
       pack: codeql/csharp-all
       extensible: neutralModel
     data:
+      - ["System.ComponentModel.DataAnnotations", "AllowedValuesAttribute", "IsValid", "(System.Object)", "summary", "df-generated"]
       - ["System.ComponentModel.DataAnnotations", "AllowedValuesAttribute", "get_Values", "()", "summary", "df-generated"]
       - ["System.ComponentModel.DataAnnotations", "AssociatedMetadataTypeTypeDescriptionProvider", "AssociatedMetadataTypeTypeDescriptionProvider", "(System.Type)", "summary", "df-generated"]
       - ["System.ComponentModel.DataAnnotations", "AssociatedMetadataTypeTypeDescriptionProvider", "AssociatedMetadataTypeTypeDescriptionProvider", "(System.Type,System.Type)", "summary", "df-generated"]
       - ["System.ComponentModel.DataAnnotations", "AssociationAttribute", "get_Name", "()", "summary", "df-generated"]
       - ["System.ComponentModel.DataAnnotations", "AssociationAttribute", "get_OtherKey", "()", "summary", "df-generated"]
       - ["System.ComponentModel.DataAnnotations", "AssociationAttribute", "get_ThisKey", "()", "summary", "df-generated"]
+      - ["System.ComponentModel.DataAnnotations", "Base64StringAttribute", "IsValid", "(System.Object)", "summary", "df-generated"]
       - ["System.ComponentModel.DataAnnotations", "CompareAttribute", "get_OtherProperty", "()", "summary", "df-generated"]
       - ["System.ComponentModel.DataAnnotations", "CompareAttribute", "get_RequiresValidationContext", "()", "summary", "df-generated"]
+      - ["System.ComponentModel.DataAnnotations", "CreditCardAttribute", "IsValid", "(System.Object)", "summary", "df-generated"]
+      - ["System.ComponentModel.DataAnnotations", "CustomValidationAttribute", "IsValid", "(System.Object,System.ComponentModel.DataAnnotations.ValidationContext)", "summary", "df-generated"]
       - ["System.ComponentModel.DataAnnotations", "CustomValidationAttribute", "get_Method", "()", "summary", "df-generated"]
       - ["System.ComponentModel.DataAnnotations", "CustomValidationAttribute", "get_RequiresValidationContext", "()", "summary", "df-generated"]
       - ["System.ComponentModel.DataAnnotations", "CustomValidationAttribute", "get_ValidatorType", "()", "summary", "df-generated"]
       - ["System.ComponentModel.DataAnnotations", "DataTypeAttribute", "DataTypeAttribute", "(System.ComponentModel.DataAnnotations.DataType)", "summary", "df-generated"]
+      - ["System.ComponentModel.DataAnnotations", "DataTypeAttribute", "IsValid", "(System.Object)", "summary", "df-generated"]
       - ["System.ComponentModel.DataAnnotations", "DataTypeAttribute", "get_CustomDataType", "()", "summary", "df-generated"]
       - ["System.ComponentModel.DataAnnotations", "DataTypeAttribute", "get_DataType", "()", "summary", "df-generated"]
+      - ["System.ComponentModel.DataAnnotations", "DeniedValuesAttribute", "IsValid", "(System.Object)", "summary", "df-generated"]
       - ["System.ComponentModel.DataAnnotations", "DeniedValuesAttribute", "get_Values", "()", "summary", "df-generated"]
       - ["System.ComponentModel.DataAnnotations", "DisplayColumnAttribute", "DisplayColumnAttribute", "(System.String)", "summary", "df-generated"]
       - ["System.ComponentModel.DataAnnotations", "DisplayColumnAttribute", "DisplayColumnAttribute", "(System.String,System.String)", "summary", "df-generated"]
@@ -93,35 +94,52 @@ extensions:
       - ["System.ComponentModel.DataAnnotations", "DisplayColumnAttribute", "get_SortDescending", "()", "summary", "df-generated"]
       - ["System.ComponentModel.DataAnnotations", "EditableAttribute", "EditableAttribute", "(System.Boolean)", "summary", "df-generated"]
       - ["System.ComponentModel.DataAnnotations", "EditableAttribute", "get_AllowEdit", "()", "summary", "df-generated"]
+      - ["System.ComponentModel.DataAnnotations", "EmailAddressAttribute", "IsValid", "(System.Object)", "summary", "df-generated"]
       - ["System.ComponentModel.DataAnnotations", "EnumDataTypeAttribute", "EnumDataTypeAttribute", "(System.Type)", "summary", "df-generated"]
+      - ["System.ComponentModel.DataAnnotations", "EnumDataTypeAttribute", "IsValid", "(System.Object)", "summary", "df-generated"]
       - ["System.ComponentModel.DataAnnotations", "EnumDataTypeAttribute", "get_EnumType", "()", "summary", "df-generated"]
+      - ["System.ComponentModel.DataAnnotations", "FileExtensionsAttribute", "IsValid", "(System.Object)", "summary", "df-generated"]
       - ["System.ComponentModel.DataAnnotations", "FilterUIHintAttribute", "Equals", "(System.Object)", "summary", "df-generated"]
       - ["System.ComponentModel.DataAnnotations", "FilterUIHintAttribute", "FilterUIHintAttribute", "(System.String)", "summary", "df-generated"]
       - ["System.ComponentModel.DataAnnotations", "FilterUIHintAttribute", "FilterUIHintAttribute", "(System.String,System.String)", "summary", "df-generated"]
       - ["System.ComponentModel.DataAnnotations", "FilterUIHintAttribute", "GetHashCode", "()", "summary", "df-generated"]
       - ["System.ComponentModel.DataAnnotations", "IValidatableObject", "Validate", "(System.ComponentModel.DataAnnotations.ValidationContext)", "summary", "df-generated"]
+      - ["System.ComponentModel.DataAnnotations", "LengthAttribute", "IsValid", "(System.Object)", "summary", "df-generated"]
       - ["System.ComponentModel.DataAnnotations", "LengthAttribute", "LengthAttribute", "(System.Int32,System.Int32)", "summary", "df-generated"]
       - ["System.ComponentModel.DataAnnotations", "LengthAttribute", "get_MaximumLength", "()", "summary", "df-generated"]
       - ["System.ComponentModel.DataAnnotations", "LengthAttribute", "get_MinimumLength", "()", "summary", "df-generated"]
+      - ["System.ComponentModel.DataAnnotations", "MaxLengthAttribute", "IsValid", "(System.Object)", "summary", "df-generated"]
       - ["System.ComponentModel.DataAnnotations", "MaxLengthAttribute", "MaxLengthAttribute", "(System.Int32)", "summary", "df-generated"]
       - ["System.ComponentModel.DataAnnotations", "MaxLengthAttribute", "get_Length", "()", "summary", "df-generated"]
       - ["System.ComponentModel.DataAnnotations", "MetadataTypeAttribute", "MetadataTypeAttribute", "(System.Type)", "summary", "df-generated"]
       - ["System.ComponentModel.DataAnnotations", "MetadataTypeAttribute", "get_MetadataClassType", "()", "summary", "df-generated"]
+      - ["System.ComponentModel.DataAnnotations", "MinLengthAttribute", "IsValid", "(System.Object)", "summary", "df-generated"]
       - ["System.ComponentModel.DataAnnotations", "MinLengthAttribute", "MinLengthAttribute", "(System.Int32)", "summary", "df-generated"]
       - ["System.ComponentModel.DataAnnotations", "MinLengthAttribute", "get_Length", "()", "summary", "df-generated"]
+      - ["System.ComponentModel.DataAnnotations", "PhoneAttribute", "IsValid", "(System.Object)", "summary", "df-generated"]
+      - ["System.ComponentModel.DataAnnotations", "RangeAttribute", "IsValid", "(System.Object)", "summary", "df-generated"]
       - ["System.ComponentModel.DataAnnotations", "RangeAttribute", "RangeAttribute", "(System.Double,System.Double)", "summary", "df-generated"]
       - ["System.ComponentModel.DataAnnotations", "RangeAttribute", "RangeAttribute", "(System.Int32,System.Int32)", "summary", "df-generated"]
       - ["System.ComponentModel.DataAnnotations", "RangeAttribute", "get_OperandType", "()", "summary", "df-generated"]
+      - ["System.ComponentModel.DataAnnotations", "RegularExpressionAttribute", "IsValid", "(System.Object)", "summary", "df-generated"]
       - ["System.ComponentModel.DataAnnotations", "RegularExpressionAttribute", "get_MatchTimeout", "()", "summary", "df-generated"]
       - ["System.ComponentModel.DataAnnotations", "RegularExpressionAttribute", "get_Pattern", "()", "summary", "df-generated"]
+      - ["System.ComponentModel.DataAnnotations", "RequiredAttribute", "IsValid", "(System.Object)", "summary", "df-generated"]
       - ["System.ComponentModel.DataAnnotations", "ScaffoldColumnAttribute", "ScaffoldColumnAttribute", "(System.Boolean)", "summary", "df-generated"]
       - ["System.ComponentModel.DataAnnotations", "ScaffoldColumnAttribute", "get_Scaffold", "()", "summary", "df-generated"]
+      - ["System.ComponentModel.DataAnnotations", "StringLengthAttribute", "IsValid", "(System.Object)", "summary", "df-generated"]
       - ["System.ComponentModel.DataAnnotations", "StringLengthAttribute", "StringLengthAttribute", "(System.Int32)", "summary", "df-generated"]
       - ["System.ComponentModel.DataAnnotations", "StringLengthAttribute", "get_MaximumLength", "()", "summary", "df-generated"]
       - ["System.ComponentModel.DataAnnotations", "UIHintAttribute", "Equals", "(System.Object)", "summary", "df-generated"]
       - ["System.ComponentModel.DataAnnotations", "UIHintAttribute", "GetHashCode", "()", "summary", "df-generated"]
       - ["System.ComponentModel.DataAnnotations", "UIHintAttribute", "UIHintAttribute", "(System.String)", "summary", "df-generated"]
       - ["System.ComponentModel.DataAnnotations", "UIHintAttribute", "UIHintAttribute", "(System.String,System.String)", "summary", "df-generated"]
+      - ["System.ComponentModel.DataAnnotations", "UrlAttribute", "IsValid", "(System.Object)", "summary", "df-generated"]
+      - ["System.ComponentModel.DataAnnotations", "ValidationAttribute", "GetValidationResult", "(System.Object,System.ComponentModel.DataAnnotations.ValidationContext)", "summary", "df-generated"]
+      - ["System.ComponentModel.DataAnnotations", "ValidationAttribute", "IsValid", "(System.Object)", "summary", "df-generated"]
+      - ["System.ComponentModel.DataAnnotations", "ValidationAttribute", "IsValid", "(System.Object,System.ComponentModel.DataAnnotations.ValidationContext)", "summary", "df-generated"]
+      - ["System.ComponentModel.DataAnnotations", "ValidationAttribute", "Validate", "(System.Object,System.ComponentModel.DataAnnotations.ValidationContext)", "summary", "df-generated"]
+      - ["System.ComponentModel.DataAnnotations", "ValidationAttribute", "Validate", "(System.Object,System.String)", "summary", "df-generated"]
       - ["System.ComponentModel.DataAnnotations", "ValidationAttribute", "ValidationAttribute", "(System.String)", "summary", "df-generated"]
       - ["System.ComponentModel.DataAnnotations", "ValidationAttribute", "get_RequiresValidationContext", "()", "summary", "df-generated"]
       - ["System.ComponentModel.DataAnnotations", "ValidationContext", "ValidationContext", "(System.Object)", "summary", "df-generated"]

csharp/ql/lib/ext/generated/System.ComponentModel.model.yml

@@ -195,17 +195,16 @@ extensions:
       - ["System.ComponentModel", "TypeConverter", False, "ConvertFromString", "(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.String)", "", "Argument[2]", "ReturnValue", "value", "dfc-generated"]
       - ["System.ComponentModel", "TypeConverter", False, "ConvertFromString", "(System.ComponentModel.ITypeDescriptorContext,System.String)", "", "Argument[1]", "ReturnValue", "value", "dfc-generated"]
       - ["System.ComponentModel", "TypeConverter", False, "ConvertFromString", "(System.String)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
-      - ["System.ComponentModel", "TypeConverter", False, "ConvertTo", "(System.Object,System.Type)", "", "Argument[0]", "ReturnValue", "value", "df-generated"]
+      - ["System.ComponentModel", "TypeConverter", False, "ConvertTo", "(System.Object,System.Type)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["System.ComponentModel", "TypeConverter", False, "ConvertTo", "(System.Object,System.Type)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.ComponentModel", "TypeConverter", False, "ConvertToInvariantString", "(System.ComponentModel.ITypeDescriptorContext,System.Object)", "", "Argument[1]", "ReturnValue", "value", "df-generated"]
+      - ["System.ComponentModel", "TypeConverter", False, "ConvertToInvariantString", "(System.ComponentModel.ITypeDescriptorContext,System.Object)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
       - ["System.ComponentModel", "TypeConverter", False, "ConvertToInvariantString", "(System.ComponentModel.ITypeDescriptorContext,System.Object)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.ComponentModel", "TypeConverter", False, "ConvertToInvariantString", "(System.Object)", "", "Argument[0]", "ReturnValue", "value", "df-generated"]
+      - ["System.ComponentModel", "TypeConverter", False, "ConvertToInvariantString", "(System.Object)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["System.ComponentModel", "TypeConverter", False, "ConvertToInvariantString", "(System.Object)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.ComponentModel", "TypeConverter", False, "ConvertToString", "(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object)", "", "Argument[1].Property[System.Globalization.CultureInfo.TextInfo].Property[System.Globalization.TextInfo.ListSeparator]", "ReturnValue", "taint", "dfc-generated"]
-      - ["System.ComponentModel", "TypeConverter", False, "ConvertToString", "(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object)", "", "Argument[2]", "ReturnValue", "value", "df-generated"]
-      - ["System.ComponentModel", "TypeConverter", False, "ConvertToString", "(System.ComponentModel.ITypeDescriptorContext,System.Object)", "", "Argument[1]", "ReturnValue", "value", "df-generated"]
+      - ["System.ComponentModel", "TypeConverter", False, "ConvertToString", "(System.ComponentModel.ITypeDescriptorContext,System.Object)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
       - ["System.ComponentModel", "TypeConverter", False, "ConvertToString", "(System.ComponentModel.ITypeDescriptorContext,System.Object)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.ComponentModel", "TypeConverter", False, "ConvertToString", "(System.Object)", "", "Argument[0]", "ReturnValue", "value", "df-generated"]
+      - ["System.ComponentModel", "TypeConverter", False, "ConvertToString", "(System.Object)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["System.ComponentModel", "TypeConverter", False, "ConvertToString", "(System.Object)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.ComponentModel", "TypeConverter", False, "GetProperties", "(System.ComponentModel.ITypeDescriptorContext,System.Object)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
       - ["System.ComponentModel", "TypeConverter", False, "GetProperties", "(System.Object)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
@@ -216,7 +215,6 @@ extensions:
       - ["System.ComponentModel", "TypeConverter", True, "ConvertFrom", "(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object)", "", "Argument[2]", "ReturnValue", "value", "dfc-generated"]
       - ["System.ComponentModel", "TypeConverter", True, "ConvertTo", "(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type)", "", "Argument[2].Element", "ReturnValue", "taint", "dfc-generated"]
       - ["System.ComponentModel", "TypeConverter", True, "ConvertTo", "(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type)", "", "Argument[2]", "ReturnValue", "taint", "dfc-generated"]
-      - ["System.ComponentModel", "TypeConverter", True, "ConvertTo", "(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type)", "", "Argument[2]", "ReturnValue", "value", "df-generated"]
       - ["System.ComponentModel", "TypeConverter", True, "GetProperties", "(System.ComponentModel.ITypeDescriptorContext,System.Object,System.Attribute[])", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
       - ["System.ComponentModel", "TypeConverter", True, "GetStandardValues", "(System.ComponentModel.ITypeDescriptorContext)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.ComponentModel", "TypeConverterAttribute", False, "TypeConverterAttribute", "(System.String)", "", "Argument[0]", "Argument[this].Property[System.ComponentModel.TypeConverterAttribute.ConverterTypeName]", "value", "dfc-generated"]

csharp/ql/lib/ext/generated/System.Composition.Hosting.Core.model.yml

@@ -47,7 +47,7 @@ extensions:
       - ["System.Composition.Hosting.Core", "ExportDescriptorProvider", True, "GetExportDescriptors", "(System.Composition.Hosting.Core.CompositionContract,System.Composition.Hosting.Core.DependencyAccessor)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["System.Composition.Hosting.Core", "ExportDescriptorProvider", True, "GetExportDescriptors", "(System.Composition.Hosting.Core.CompositionContract,System.Composition.Hosting.Core.DependencyAccessor)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Composition.Hosting.Core", "LifetimeContext", False, "AddBoundInstance", "(System.IDisposable)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Composition.Hosting.Core", "LifetimeContext", False, "FindContextWithin", "(System.String)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["System.Composition.Hosting.Core", "LifetimeContext", False, "FindContextWithin", "(System.String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Composition.Hosting.Core", "LifetimeContext", False, "GetOrCreate", "(System.Int32,System.Composition.Hosting.Core.CompositionOperation,System.Composition.Hosting.Core.CompositeActivator)", "", "Argument[1]", "Argument[2].Parameter[1]", "value", "dfc-generated"]
       - ["System.Composition.Hosting.Core", "LifetimeContext", False, "GetOrCreate", "(System.Int32,System.Composition.Hosting.Core.CompositionOperation,System.Composition.Hosting.Core.CompositeActivator)", "", "Argument[2].ReturnValue", "ReturnValue", "value", "dfc-generated"]
       - ["System.Composition.Hosting.Core", "LifetimeContext", False, "GetOrCreate", "(System.Int32,System.Composition.Hosting.Core.CompositionOperation,System.Composition.Hosting.Core.CompositeActivator)", "", "Argument[this]", "Argument[2].Parameter[0]", "value", "dfc-generated"]

csharp/ql/lib/ext/generated/System.Composition.model.yml

@@ -4,21 +4,20 @@ extensions:
       pack: codeql/csharp-all
       extensible: summaryModel
     data:
-      - ["System.Composition", "CompositionContext", False, "GetExport", "(System.Composition.Hosting.Core.CompositionContract)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
-      - ["System.Composition", "CompositionContext", False, "GetExport", "(System.Type)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
-      - ["System.Composition", "CompositionContext", False, "GetExport", "(System.Type,System.String)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
-      - ["System.Composition", "CompositionContext", False, "GetExport<TExport>", "()", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
-      - ["System.Composition", "CompositionContext", False, "GetExport<TExport>", "(System.String)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["System.Composition", "CompositionContext", False, "GetExport", "(System.Composition.Hosting.Core.CompositionContract)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Composition", "CompositionContext", False, "GetExport", "(System.Type)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Composition", "CompositionContext", False, "GetExport", "(System.Type,System.String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Composition", "CompositionContext", False, "GetExport<TExport>", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Composition", "CompositionContext", False, "GetExport<TExport>", "(System.String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Composition", "CompositionContext", False, "GetExports", "(System.Type)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Composition", "CompositionContext", False, "GetExports", "(System.Type,System.String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Composition", "CompositionContext", False, "GetExports<TExport>", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Composition", "CompositionContext", False, "GetExports<TExport>", "(System.String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Composition", "CompositionContext", False, "TryGetExport", "(System.Type,System.Object)", "", "Argument[this]", "Argument[1]", "value", "df-generated"]
-      - ["System.Composition", "CompositionContext", False, "TryGetExport", "(System.Type,System.String,System.Object)", "", "Argument[this]", "Argument[2]", "value", "df-generated"]
-      - ["System.Composition", "CompositionContext", False, "TryGetExport<TExport>", "(System.String,TExport)", "", "Argument[this]", "Argument[1]", "value", "df-generated"]
-      - ["System.Composition", "CompositionContext", False, "TryGetExport<TExport>", "(TExport)", "", "Argument[this]", "Argument[0]", "value", "df-generated"]
+      - ["System.Composition", "CompositionContext", False, "TryGetExport", "(System.Type,System.Object)", "", "Argument[this]", "Argument[1]", "taint", "df-generated"]
+      - ["System.Composition", "CompositionContext", False, "TryGetExport", "(System.Type,System.String,System.Object)", "", "Argument[this]", "Argument[2]", "taint", "df-generated"]
+      - ["System.Composition", "CompositionContext", False, "TryGetExport<TExport>", "(System.String,TExport)", "", "Argument[this]", "Argument[1]", "taint", "df-generated"]
+      - ["System.Composition", "CompositionContext", False, "TryGetExport<TExport>", "(TExport)", "", "Argument[this]", "Argument[0]", "taint", "df-generated"]
       - ["System.Composition", "CompositionContext", True, "TryGetExport", "(System.Composition.Hosting.Core.CompositionContract,System.Object)", "", "Argument[this]", "Argument[1]", "taint", "df-generated"]
-      - ["System.Composition", "CompositionContext", True, "TryGetExport", "(System.Composition.Hosting.Core.CompositionContract,System.Object)", "", "Argument[this]", "Argument[1]", "value", "df-generated"]
       - ["System.Composition", "Export<T>", False, "Export", "(T,System.Action)", "", "Argument[0]", "Argument[this].Property[System.Composition.Export`1.Value]", "value", "dfc-generated"]
       - ["System.Composition", "ExportAttribute", False, "ExportAttribute", "(System.String,System.Type)", "", "Argument[0]", "Argument[this].Property[System.Composition.ExportAttribute.ContractName]", "value", "dfc-generated"]
       - ["System.Composition", "ExportFactory<T,TMetadata>", False, "ExportFactory", "(System.Func<System.Tuple<T,System.Action>>,TMetadata)", "", "Argument[1]", "Argument[this].Property[System.Composition.ExportFactory`2.Metadata]", "value", "dfc-generated"]

csharp/ql/lib/ext/generated/System.Data.Odbc.model.yml

@@ -49,7 +49,7 @@ extensions:
       - ["System.Data.Odbc", "OdbcParameter", False, "ToString", "()", "", "Argument[this].Property[System.Data.Odbc.OdbcParameter.ParameterName]", "ReturnValue", "value", "dfc-generated"]
       - ["System.Data.Odbc", "OdbcParameter", False, "ToString", "()", "", "Argument[this].SyntheticField[System.Data.Odbc.OdbcParameter._parameterName]", "ReturnValue", "value", "dfc-generated"]
       - ["System.Data.Odbc", "OdbcParameterCollection", False, "Add", "(System.Data.Odbc.OdbcParameter)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Data.Odbc", "OdbcParameterCollection", False, "Add", "(System.Data.Odbc.OdbcParameter)", "", "Argument[0]", "ReturnValue", "value", "df-generated"]
+      - ["System.Data.Odbc", "OdbcParameterCollection", False, "Add", "(System.Data.Odbc.OdbcParameter)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["System.Data.Odbc", "OdbcParameterCollection", False, "Add", "(System.Data.Odbc.OdbcParameter)", "", "Argument[this]", "Argument[0]", "taint", "df-generated"]
       - ["System.Data.Odbc", "OdbcParameterCollection", False, "Add", "(System.Data.Odbc.OdbcParameter)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Data.Odbc", "OdbcParameterCollection", False, "Add", "(System.String,System.Data.Odbc.OdbcType)", "", "Argument[0]", "ReturnValue.SyntheticField[System.Data.Odbc.OdbcParameter._parameterName]", "value", "dfc-generated"]

csharp/ql/lib/ext/generated/System.Globalization.model.yml

@@ -17,7 +17,7 @@ extensions:
       - ["System.Globalization", "CultureInfo", False, "GetCultureInfo", "(System.String,System.String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["System.Globalization", "CultureInfo", False, "GetCultureInfo", "(System.String,System.String)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
       - ["System.Globalization", "CultureInfo", False, "GetCultureInfoByIetfLanguageTag", "(System.String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Globalization", "CultureInfo", False, "ReadOnly", "(System.Globalization.CultureInfo)", "", "Argument[0]", "ReturnValue", "value", "df-generated"]
+      - ["System.Globalization", "CultureInfo", False, "ReadOnly", "(System.Globalization.CultureInfo)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["System.Globalization", "CultureInfo", False, "ToString", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Globalization", "CultureInfo", False, "get_IetfLanguageTag", "()", "", "Argument[this].Property[System.Globalization.CultureInfo.Name]", "ReturnValue", "value", "dfc-generated"]
       - ["System.Globalization", "CultureInfo", True, "get_Calendar", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]

csharp/ql/lib/ext/generated/System.Linq.Expressions.model.yml

@@ -408,24 +408,24 @@ extensions:
       - ["System.Linq.Expressions", "Expression", True, "Accept", "(System.Linq.Expressions.ExpressionVisitor)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
       - ["System.Linq.Expressions", "Expression", True, "Reduce", "()", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
       - ["System.Linq.Expressions", "Expression", True, "VisitChildren", "(System.Linq.Expressions.ExpressionVisitor)", "", "Argument[this]", "Argument[0]", "taint", "df-generated"]
-      - ["System.Linq.Expressions", "Expression", True, "VisitChildren", "(System.Linq.Expressions.ExpressionVisitor)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["System.Linq.Expressions", "Expression", True, "VisitChildren", "(System.Linq.Expressions.ExpressionVisitor)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Linq.Expressions", "Expression<TDelegate>", False, "Update", "(System.Linq.Expressions.Expression,System.Collections.Generic.IEnumerable<System.Linq.Expressions.ParameterExpression>)", "", "Argument[1].Element", "ReturnValue", "taint", "df-generated"]
       - ["System.Linq.Expressions", "Expression<TDelegate>", False, "Update", "(System.Linq.Expressions.Expression,System.Collections.Generic.IEnumerable<System.Linq.Expressions.ParameterExpression>)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Linq.Expressions", "ExpressionVisitor", False, "Visit", "(System.Collections.ObjectModel.ReadOnlyCollection<System.Linq.Expressions.Expression>)", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
-      - ["System.Linq.Expressions", "ExpressionVisitor", False, "Visit", "(System.Collections.ObjectModel.ReadOnlyCollection<System.Linq.Expressions.Expression>)", "", "Argument[0]", "ReturnValue", "value", "df-generated"]
+      - ["System.Linq.Expressions", "ExpressionVisitor", False, "Visit", "(System.Collections.ObjectModel.ReadOnlyCollection<System.Linq.Expressions.Expression>)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
       - ["System.Linq.Expressions", "ExpressionVisitor", False, "Visit<T>", "(System.Collections.ObjectModel.ReadOnlyCollection<T>,System.Func<T,T>)", "", "Argument[0].Element", "Argument[1].Parameter[0]", "value", "dfc-generated"]
       - ["System.Linq.Expressions", "ExpressionVisitor", False, "Visit<T>", "(System.Collections.ObjectModel.ReadOnlyCollection<T>,System.Func<T,T>)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
       - ["System.Linq.Expressions", "ExpressionVisitor", False, "VisitAndConvert<T>", "(System.Collections.ObjectModel.ReadOnlyCollection<T>,System.String)", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
-      - ["System.Linq.Expressions", "ExpressionVisitor", False, "VisitAndConvert<T>", "(System.Collections.ObjectModel.ReadOnlyCollection<T>,System.String)", "", "Argument[0]", "ReturnValue", "value", "df-generated"]
+      - ["System.Linq.Expressions", "ExpressionVisitor", False, "VisitAndConvert<T>", "(System.Collections.ObjectModel.ReadOnlyCollection<T>,System.String)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
       - ["System.Linq.Expressions", "ExpressionVisitor", False, "VisitAndConvert<T>", "(T,System.String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Linq.Expressions", "ExpressionVisitor", False, "VisitAndConvert<T>", "(T,System.String)", "", "Argument[0]", "ReturnValue", "value", "df-generated"]
+      - ["System.Linq.Expressions", "ExpressionVisitor", False, "VisitAndConvert<T>", "(T,System.String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["System.Linq.Expressions", "ExpressionVisitor", True, "Visit", "(System.Linq.Expressions.Expression)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
       - ["System.Linq.Expressions", "ExpressionVisitor", True, "VisitBinary", "(System.Linq.Expressions.BinaryExpression)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Linq.Expressions", "ExpressionVisitor", True, "VisitBinary", "(System.Linq.Expressions.BinaryExpression)", "", "Argument[0]", "ReturnValue", "value", "df-generated"]
+      - ["System.Linq.Expressions", "ExpressionVisitor", True, "VisitBinary", "(System.Linq.Expressions.BinaryExpression)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["System.Linq.Expressions", "ExpressionVisitor", True, "VisitBlock", "(System.Linq.Expressions.BlockExpression)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
       - ["System.Linq.Expressions", "ExpressionVisitor", True, "VisitCatchBlock", "(System.Linq.Expressions.CatchBlock)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
       - ["System.Linq.Expressions", "ExpressionVisitor", True, "VisitConditional", "(System.Linq.Expressions.ConditionalExpression)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Linq.Expressions", "ExpressionVisitor", True, "VisitConditional", "(System.Linq.Expressions.ConditionalExpression)", "", "Argument[0]", "ReturnValue", "value", "df-generated"]
+      - ["System.Linq.Expressions", "ExpressionVisitor", True, "VisitConditional", "(System.Linq.Expressions.ConditionalExpression)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["System.Linq.Expressions", "ExpressionVisitor", True, "VisitConstant", "(System.Linq.Expressions.ConstantExpression)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
       - ["System.Linq.Expressions", "ExpressionVisitor", True, "VisitDebugInfo", "(System.Linq.Expressions.DebugInfoExpression)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
       - ["System.Linq.Expressions", "ExpressionVisitor", True, "VisitDefault", "(System.Linq.Expressions.DefaultExpression)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
@@ -433,22 +433,22 @@ extensions:
       - ["System.Linq.Expressions", "ExpressionVisitor", True, "VisitElementInit", "(System.Linq.Expressions.ElementInit)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
       - ["System.Linq.Expressions", "ExpressionVisitor", True, "VisitExtension", "(System.Linq.Expressions.Expression)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
       - ["System.Linq.Expressions", "ExpressionVisitor", True, "VisitGoto", "(System.Linq.Expressions.GotoExpression)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Linq.Expressions", "ExpressionVisitor", True, "VisitGoto", "(System.Linq.Expressions.GotoExpression)", "", "Argument[0]", "ReturnValue", "value", "df-generated"]
+      - ["System.Linq.Expressions", "ExpressionVisitor", True, "VisitGoto", "(System.Linq.Expressions.GotoExpression)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["System.Linq.Expressions", "ExpressionVisitor", True, "VisitIndex", "(System.Linq.Expressions.IndexExpression)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Linq.Expressions", "ExpressionVisitor", True, "VisitIndex", "(System.Linq.Expressions.IndexExpression)", "", "Argument[0]", "ReturnValue", "value", "df-generated"]
+      - ["System.Linq.Expressions", "ExpressionVisitor", True, "VisitIndex", "(System.Linq.Expressions.IndexExpression)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["System.Linq.Expressions", "ExpressionVisitor", True, "VisitInvocation", "(System.Linq.Expressions.InvocationExpression)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Linq.Expressions", "ExpressionVisitor", True, "VisitInvocation", "(System.Linq.Expressions.InvocationExpression)", "", "Argument[0]", "ReturnValue", "value", "df-generated"]
+      - ["System.Linq.Expressions", "ExpressionVisitor", True, "VisitInvocation", "(System.Linq.Expressions.InvocationExpression)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["System.Linq.Expressions", "ExpressionVisitor", True, "VisitLabel", "(System.Linq.Expressions.LabelExpression)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
       - ["System.Linq.Expressions", "ExpressionVisitor", True, "VisitLabelTarget", "(System.Linq.Expressions.LabelTarget)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
       - ["System.Linq.Expressions", "ExpressionVisitor", True, "VisitLambda<T>", "(System.Linq.Expressions.Expression<T>)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
       - ["System.Linq.Expressions", "ExpressionVisitor", True, "VisitListInit", "(System.Linq.Expressions.ListInitExpression)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
       - ["System.Linq.Expressions", "ExpressionVisitor", True, "VisitLoop", "(System.Linq.Expressions.LoopExpression)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
       - ["System.Linq.Expressions", "ExpressionVisitor", True, "VisitMember", "(System.Linq.Expressions.MemberExpression)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Linq.Expressions", "ExpressionVisitor", True, "VisitMember", "(System.Linq.Expressions.MemberExpression)", "", "Argument[0]", "ReturnValue", "value", "df-generated"]
+      - ["System.Linq.Expressions", "ExpressionVisitor", True, "VisitMember", "(System.Linq.Expressions.MemberExpression)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["System.Linq.Expressions", "ExpressionVisitor", True, "VisitMemberAssignment", "(System.Linq.Expressions.MemberAssignment)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Linq.Expressions", "ExpressionVisitor", True, "VisitMemberAssignment", "(System.Linq.Expressions.MemberAssignment)", "", "Argument[0]", "ReturnValue", "value", "df-generated"]
+      - ["System.Linq.Expressions", "ExpressionVisitor", True, "VisitMemberAssignment", "(System.Linq.Expressions.MemberAssignment)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["System.Linq.Expressions", "ExpressionVisitor", True, "VisitMemberBinding", "(System.Linq.Expressions.MemberBinding)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Linq.Expressions", "ExpressionVisitor", True, "VisitMemberBinding", "(System.Linq.Expressions.MemberBinding)", "", "Argument[0]", "ReturnValue", "value", "df-generated"]
+      - ["System.Linq.Expressions", "ExpressionVisitor", True, "VisitMemberBinding", "(System.Linq.Expressions.MemberBinding)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["System.Linq.Expressions", "ExpressionVisitor", True, "VisitMemberInit", "(System.Linq.Expressions.MemberInitExpression)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
       - ["System.Linq.Expressions", "ExpressionVisitor", True, "VisitMemberListBinding", "(System.Linq.Expressions.MemberListBinding)", "", "Argument[0].Property[System.Linq.Expressions.MemberListBinding.Initializers]", "ReturnValue.Property[System.Linq.Expressions.MemberListBinding.Initializers]", "value", "dfc-generated"]
       - ["System.Linq.Expressions", "ExpressionVisitor", True, "VisitMemberListBinding", "(System.Linq.Expressions.MemberListBinding)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]