JS: Add new env vars as extractor options

JS: Add env vars to allow specifying memory sizes
Merge pull request #15060 from am0o0/amammad-js-envinjection
2026-05-26 09:01:22 +02:00 · 2024-06-21 14:55:28 +01:00 · 2024-06-21 14:49:23 +01:00 · 2024-06-20 21:27:21 +02:00 · 2024-06-20 21:19:57 +02:00 · 2024-06-20 20:20:00 +02:00
420 changed files with 7855 additions and 4038 deletions
--- a/.github/workflows/ruby-build.yml
+++ b/.github/workflows/ruby-build.yml
@@ -7,6 +7,7 @@ on:
      - .github/workflows/ruby-build.yml
      - .github/actions/fetch-codeql/action.yml
      - codeql-workspace.yml
+      - "shared/tree-sitter-extractor/**"
    branches:
      - main
      - "rc/*"
@@ -16,6 +17,7 @@ on:
      - .github/workflows/ruby-build.yml
      - .github/actions/fetch-codeql/action.yml
      - codeql-workspace.yml
+      - "shared/tree-sitter-extractor/**"
    branches:
      - main
      - "rc/*"
--- a/cpp/ql/lib/change-notes/2024-06-10-builtin-expect.md
+++ b/cpp/ql/lib/change-notes/2024-06-10-builtin-expect.md
--- a/cpp/ql/lib/change-notes/2024-06-13-double-free.md
+++ b/cpp/ql/lib/change-notes/2024-06-13-double-free.md
@@ -0,0 +1,4 @@
+---
+category: minorAnalysis
+---
+* The queries "Potential double free" (`cpp/double-free`) and "Potential use after free" (`cpp/use-after-free`) now produce fewer false positives.
--- a/cpp/ql/lib/semmle/code/cpp/ir/implementation/aliased_ssa/internal/AliasAnalysis.qll
+++ b/cpp/ql/lib/semmle/code/cpp/ir/implementation/aliased_ssa/internal/AliasAnalysis.qll
@@ -106,8 +106,8 @@ private predicate operandEscapesDomain(Operand operand) {
  not isArgumentForParameter(_, operand, _) and
  not isOnlyEscapesViaReturnArgument(operand) and
  not operand.getUse() instanceof ReturnValueInstruction and
-  not operand.getUse() instanceof ReturnIndirectionInstruction// and
-//  not operand instanceof PhiInputOperand
+  not operand.getUse() instanceof ReturnIndirectionInstruction and
+  not operand instanceof PhiInputOperand
 }

 /**
@@ -211,9 +211,9 @@ private predicate operandEscapesNonReturn(Operand operand) {
  )
  or
  isOnlyEscapesViaReturnArgument(operand) and resultEscapesNonReturn(operand.getUse())
-//  or
-//  operand instanceof PhiInputOperand and
-//  resultEscapesNonReturn(operand.getUse())
+  or
+  operand instanceof PhiInputOperand and
+  resultEscapesNonReturn(operand.getUse())
  or
  operandEscapesDomain(operand)
 }
@@ -454,9 +454,6 @@ module Print {
      |
        value, ", "
      )
-    or
-    key = "escapes" and
-    result = strictconcat(string value | operandEscapesNonReturn(operand) and value = "nonreturn" | value, ", ")
  }

  string getInstructionProperty(Instruction instr, string key) {
--- a/cpp/ql/lib/semmle/code/cpp/security/flowafterfree/FlowAfterFree.qll
+++ b/cpp/ql/lib/semmle/code/cpp/security/flowafterfree/FlowAfterFree.qll
@@ -95,7 +95,7 @@ module FlowFromFree<FlowFromFreeParamSig P> {
        e = any(StoreInstruction store).getDestinationAddress().getUnconvertedResultExpression()
      )
      or
-      n.asExpr() instanceof ArrayExpr
+      [n.asExpr(), n.asIndirectExpr()] instanceof ArrayExpr
    }
  }

--- a/cpp/ql/test/header-variant-tests/iquote/iquote.c
+++ b/cpp/ql/test/header-variant-tests/iquote/iquote.c
@@ -3,4 +3,4 @@
 #include "b.h"
 static int has_angle_b = __has_include(<b.h>);

-// semmle-extractor-options: -I${testdir}/dir2 -iquote ${testdir}/dir1 --edg --clang
+// semmle-extractor-options: -I${testdir}/dir2 -iquote ${testdir}/dir1 --clang
--- a/cpp/ql/test/library-tests/CPP-207/options
+++ b/cpp/ql/test/library-tests/CPP-207/options
@@ -1 +1 @@
-semmle-extractor-options: --edg --microsoft
+semmle-extractor-options: --microsoft
--- a/cpp/ql/test/library-tests/attributes/availability/options
+++ b/cpp/ql/test/library-tests/attributes/availability/options
@@ -1 +1 @@
-semmle-extractor-options: --edg --clang
+semmle-extractor-options: --clang
--- a/cpp/ql/test/library-tests/attributes/routine_attributes/arguments.expected
+++ b/cpp/ql/test/library-tests/attributes/routine_attributes/arguments.expected
@@ -1,4 +1,8 @@
 | declspec.cpp:4:23:4:43 | Use fatal() instead | declspec.cpp:4:59:4:62 | exit | declspec.cpp:4:12:4:21 | deprecated | Use fatal() instead |
+| routine_attributes2.cpp:5:6:5:11 | hidden | routine_attributes2.cpp:5:13:5:21 | a_routine | routine_attributes2.cpp:5:6:5:11 | visibility | hidden |
+| routine_attributes2.cpp:5:6:5:11 | hidden | routine_attributes2.cpp:5:13:5:21 | a_routine | routine_attributes2.cpp:5:6:5:11 | visibility | hidden |
+| routine_attributes2.h:3:6:3:11 | hidden | routine_attributes2.cpp:5:13:5:21 | a_routine | routine_attributes2.h:3:6:3:11 | visibility | hidden |
+| routine_attributes2.h:3:6:3:11 | hidden | routine_attributes2.cpp:5:13:5:21 | a_routine | routine_attributes2.h:3:6:3:11 | visibility | hidden |
 | routine_attributes.c:3:53:3:59 | dummy | routine_attributes.c:3:12:3:24 | named_weakref | routine_attributes.c:3:44:3:50 | weakref | dummy |
 | routine_attributes.c:4:62:4:68 | dummy | routine_attributes.c:4:12:4:26 | aliased_weakref | routine_attributes.c:4:55:4:59 | alias | dummy |
 | routine_attributes.c:6:49:6:55 | dummy | routine_attributes.c:6:12:6:22 | plain_alias | routine_attributes.c:6:42:6:46 | alias | dummy |
--- a/cpp/ql/test/library-tests/attributes/routine_attributes/routine_attributes.expected
+++ b/cpp/ql/test/library-tests/attributes/routine_attributes/routine_attributes.expected
@@ -18,6 +18,10 @@
 | header_export.cpp:14:16:14:26 | myFunction4 | header_export.cpp:14:1:14:9 | dllexport |
 | header_export.cpp:18:6:18:16 | myFunction5 | header.h:10:2:10:10 | dllexport |
 | header_export.cpp:18:6:18:16 | myFunction5 | header.h:10:2:10:10 | dllimport |
+| routine_attributes2.cpp:5:13:5:21 | a_routine | routine_attributes2.cpp:5:6:5:11 | visibility |
+| routine_attributes2.cpp:5:13:5:21 | a_routine | routine_attributes2.cpp:5:6:5:11 | visibility |
+| routine_attributes2.cpp:5:13:5:21 | a_routine | routine_attributes2.h:3:6:3:11 | visibility |
+| routine_attributes2.cpp:5:13:5:21 | a_routine | routine_attributes2.h:3:6:3:11 | visibility |
 | routine_attributes.c:3:12:3:24 | named_weakref | routine_attributes.c:3:44:3:50 | weakref |
 | routine_attributes.c:4:12:4:26 | aliased_weakref | routine_attributes.c:4:46:4:52 | weakref |
 | routine_attributes.c:4:12:4:26 | aliased_weakref | routine_attributes.c:4:55:4:59 | alias |
--- a/cpp/ql/test/library-tests/attributes/routine_attributes/routine_attributes2.cpp
+++ b/cpp/ql/test/library-tests/attributes/routine_attributes/routine_attributes2.cpp
@@ -0,0 +1,7 @@
+#define HIDDEN __attribute__((visibility("hidden")))
+
+#include "routine_attributes2.h"
+
+void HIDDEN a_routine() {
+    return;
+}
--- a/cpp/ql/test/library-tests/attributes/routine_attributes/routine_attributes2.h
+++ b/cpp/ql/test/library-tests/attributes/routine_attributes/routine_attributes2.h
@@ -0,0 +1,3 @@
+#pragma once
+
+void HIDDEN a_routine();
--- a/cpp/ql/test/library-tests/attributes/routine_attributes/routine_attributes3.cpp
+++ b/cpp/ql/test/library-tests/attributes/routine_attributes/routine_attributes3.cpp
@@ -0,0 +1,3 @@
+#define HIDDEN __attribute__((visibility("hidden")))
+
+#include "routine_attributes2.h"
--- a/cpp/ql/test/library-tests/attributes/type_attributes/arguments.expected
+++ b/cpp/ql/test/library-tests/attributes/type_attributes/arguments.expected
@@ -1,3 +1,6 @@
+| type_attributes2.cpp:5:14:5:20 | a_class | type_attributes2.cpp:5:7:5:12 | visibility | type_attributes2.cpp:5:7:5:12 | hidden |
+| type_attributes2.cpp:5:14:5:20 | a_class | type_attributes2.h:3:7:3:12 | visibility | type_attributes2.h:3:7:3:12 | hidden |
+| type_attributes2.cpp:5:14:5:20 | a_class | type_attributes2.h:3:7:3:12 | visibility | type_attributes2.h:3:7:3:12 | hidden |
 | type_attributes_ms.cpp:4:67:4:75 | IDispatch | type_attributes_ms.cpp:4:19:4:22 | uuid | type_attributes_ms.cpp:4:24:4:63 | {00020400-0000-0000-c000-000000000046} |
 | type_attributes_ms.cpp:5:30:5:33 | Str1 | type_attributes_ms.cpp:5:12:5:16 | align | type_attributes_ms.cpp:5:18:5:19 | 32 |
 | type_attributes_ms.cpp:6:55:6:62 | IUnknown | type_attributes_ms.cpp:6:2:6:2 | uuid | type_attributes_ms.cpp:6:2:6:2 | 00000000-0000-0000-c000-000000000046 |
--- a/cpp/ql/test/library-tests/attributes/type_attributes/type_attributes.expected
+++ b/cpp/ql/test/library-tests/attributes/type_attributes/type_attributes.expected
@@ -1,4 +1,7 @@
 | file://:0:0:0:0 | short __attribute((__may_alias__)) | type_attributes.c:25:30:25:42 | may_alias |
+| type_attributes2.cpp:5:14:5:20 | a_class | type_attributes2.cpp:5:7:5:12 | visibility |
+| type_attributes2.cpp:5:14:5:20 | a_class | type_attributes2.h:3:7:3:12 | visibility |
+| type_attributes2.cpp:5:14:5:20 | a_class | type_attributes2.h:3:7:3:12 | visibility |
 | type_attributes.c:5:36:5:51 | my_packed_struct | type_attributes.c:5:23:5:32 | packed |
 | type_attributes.c:10:54:10:54 | (unnamed class/struct/union) | type_attributes.c:10:30:10:50 | transparent_union |
 | type_attributes.c:16:54:16:54 | (unnamed class/struct/union) | type_attributes.c:16:30:16:50 | transparent_union |
--- a/cpp/ql/test/library-tests/attributes/type_attributes/type_attributes2.cpp
+++ b/cpp/ql/test/library-tests/attributes/type_attributes/type_attributes2.cpp
@@ -0,0 +1,6 @@
+#define HIDDEN __attribute__((visibility("hidden")))
+
+#include "type_attributes2.h"
+
+class HIDDEN a_class {
+};
--- a/cpp/ql/test/library-tests/attributes/type_attributes/type_attributes2.h
+++ b/cpp/ql/test/library-tests/attributes/type_attributes/type_attributes2.h
@@ -0,0 +1,3 @@
+#pragma once
+
+class HIDDEN a_class;
--- a/cpp/ql/test/library-tests/attributes/type_attributes/type_attributes3.cpp
+++ b/cpp/ql/test/library-tests/attributes/type_attributes/type_attributes3.cpp
@@ -0,0 +1,3 @@
+#define HIDDEN __attribute__((visibility("hidden")))
+
+#include "type_attributes2.h"
--- a/cpp/ql/test/library-tests/attributes/var_attributes/var_attributes.expected
+++ b/cpp/ql/test/library-tests/attributes/var_attributes/var_attributes.expected
@@ -6,6 +6,10 @@
 | ms_var_attributes.cpp:12:42:12:46 | field | ms_var_attributes.cpp:12:14:12:21 | property |
 | ms_var_attributes.cpp:20:34:20:37 | pBuf | ms_var_attributes.cpp:20:12:20:12 | SAL_volatile |
 | ms_var_attributes.h:5:22:5:27 | myInt3 | ms_var_attributes.h:5:1:5:9 | dllexport |
+| var_attributes2.cpp:5:12:5:21 | a_variable | var_attributes2.cpp:5:5:5:10 | visibility |
+| var_attributes2.cpp:5:12:5:21 | a_variable | var_attributes2.cpp:5:5:5:10 | visibility |
+| var_attributes2.cpp:5:12:5:21 | a_variable | var_attributes2.h:3:12:3:17 | visibility |
+| var_attributes2.cpp:5:12:5:21 | a_variable | var_attributes2.h:3:12:3:17 | visibility |
 | var_attributes.c:1:12:1:19 | weak_var | var_attributes.c:1:36:1:39 | weak |
 | var_attributes.c:2:12:2:22 | weakref_var | var_attributes.c:2:39:2:45 | weakref |
 | var_attributes.c:3:12:3:19 | used_var | var_attributes.c:3:36:3:39 | used |
--- a/cpp/ql/test/library-tests/attributes/var_attributes/var_attributes2.cpp
+++ b/cpp/ql/test/library-tests/attributes/var_attributes/var_attributes2.cpp
@@ -0,0 +1,5 @@
+#define HIDDEN __attribute__((visibility("hidden")))
+
+#include "var_attributes2.h"
+
+int HIDDEN a_variable;
--- a/cpp/ql/test/library-tests/attributes/var_attributes/var_attributes2.h
+++ b/cpp/ql/test/library-tests/attributes/var_attributes/var_attributes2.h
@@ -0,0 +1,3 @@
+#pragma once
+
+extern int HIDDEN a_variable;
--- a/cpp/ql/test/library-tests/attributes/var_attributes/var_attributes3.cpp
+++ b/cpp/ql/test/library-tests/attributes/var_attributes/var_attributes3.cpp
@@ -0,0 +1,3 @@
+#define HIDDEN __attribute__((visibility("hidden")))
+
+#include "var_attributes2.h"
--- a/cpp/ql/test/library-tests/clang_builtin_macros/addressof.c
+++ b/cpp/ql/test/library-tests/clang_builtin_macros/addressof.c
@@ -1,4 +1,4 @@
-// semmle-extractor-options: --edg --clang
+// semmle-extractor-options: --clang

 int x = 0;

--- a/cpp/ql/test/library-tests/clang_builtin_macros/extended.cpp
+++ b/cpp/ql/test/library-tests/clang_builtin_macros/extended.cpp
@@ -1,4 +1,4 @@
-// semmle-extractor-options: --edg --clang --edg --c++11 --edg --nullptr
+// semmle-extractor-options: --clang --edg --c++11 --edg --nullptr

 static int has_nullptr_f = __has_feature(cxx_nullptr);
 static int has_nullptr_e = __has_extension(cxx_nullptr);
--- a/cpp/ql/test/library-tests/clang_builtin_macros/options
+++ b/cpp/ql/test/library-tests/clang_builtin_macros/options
@@ -1 +1 @@
-semmle-extractor-options: --edg --clang
+semmle-extractor-options: --clang
--- a/cpp/ql/test/library-tests/clang_builtin_macros/test.cpp
+++ b/cpp/ql/test/library-tests/clang_builtin_macros/test.cpp
@@ -1,7 +1,7 @@
 // For the canonical behaviour, run: clang -E -w test.cpp
 #define __builtin_TRAP __builtin_trap
 #define BAR "bar.h"
-// semmle-extractor-options: --edg --clang --expect_errors
+// semmle-extractor-options: --clang --expect_errors
 #if defined(__has_include)
 static int has_include = 1;
 #else
--- a/cpp/ql/test/library-tests/clang_ms/options
+++ b/cpp/ql/test/library-tests/clang_ms/options
@@ -1 +1 @@
-semmle-extractor-options: --edg --clang --edg --ms_extensions
+semmle-extractor-options: --clang --edg --ms_extensions
--- a/cpp/ql/test/library-tests/dataflow/dataflow-edge-tests/additionalEdges.expected
+++ b/cpp/ql/test/library-tests/dataflow/dataflow-edge-tests/additionalEdges.expected
@@ -1,6 +1,6 @@
-WARNING: Module DataFlow has been deprecated and may be removed in future (additionalEdges.ql:31,6-14)
-WARNING: Module DataFlow has been deprecated and may be removed in future (additionalEdges.ql:31,31-39)
-WARNING: Module DataFlow has been deprecated and may be removed in future (additionalEdges.ql:32,7-15)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (additionalEdges.ql:31,6-14)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (additionalEdges.ql:31,31-39)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (additionalEdges.ql:32,7-15)
 | tryExcept.c:7:7:7:7 | x | tryExcept.c:14:10:14:10 | x |
 | tryExcept.c:7:13:7:14 | 0 | tryExcept.c:10:9:10:9 | y |
 | tryExcept.c:10:9:10:9 | y | tryExcept.c:10:5:10:9 | ... = ... |
--- a/cpp/ql/test/library-tests/dataflow/dataflow-edge-tests/standardEdges.expected
+++ b/cpp/ql/test/library-tests/dataflow/dataflow-edge-tests/standardEdges.expected
@@ -1,5 +1,5 @@
-WARNING: Module DataFlow has been deprecated and may be removed in future (standardEdges.ql:4,6-14)
-WARNING: Module DataFlow has been deprecated and may be removed in future (standardEdges.ql:4,31-39)
-WARNING: Module DataFlow has been deprecated and may be removed in future (standardEdges.ql:5,7-15)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (standardEdges.ql:4,6-14)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (standardEdges.ql:4,31-39)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (standardEdges.ql:5,7-15)
 | tryExcept.c:7:13:7:14 | 0 | tryExcept.c:10:9:10:9 | y |
 | tryExcept.c:10:9:10:9 | y | tryExcept.c:10:5:10:9 | ... = ... |
--- a/cpp/ql/test/library-tests/dataflow/dataflow-tests/clang.cpp
+++ b/cpp/ql/test/library-tests/dataflow/dataflow-tests/clang.cpp
@@ -1,4 +1,4 @@
-// semmle-extractor-options: --edg --clang
+// semmle-extractor-options: --clang

 int source();
 void sink(int); void sink(const int *); void sink(int **); void indirect_sink(...);
--- a/cpp/ql/test/library-tests/dataflow/dataflow-tests/has-parameter-flow-out.expected
+++ b/cpp/ql/test/library-tests/dataflow/dataflow-tests/has-parameter-flow-out.expected
@@ -1,3 +1,3 @@
-WARNING: Module DataFlow has been deprecated and may be removed in future (has-parameter-flow-out.ql:5,18-61)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (has-parameter-flow-out.ql:5,18-61)
 testFailures
 failures
--- a/cpp/ql/test/library-tests/dataflow/dataflow-tests/localFlow.expected
+++ b/cpp/ql/test/library-tests/dataflow/dataflow-tests/localFlow.expected
@@ -1,6 +1,6 @@
-WARNING: Module DataFlow has been deprecated and may be removed in future (localFlow.ql:4,6-14)
-WARNING: Module DataFlow has been deprecated and may be removed in future (localFlow.ql:4,31-39)
-WARNING: Module DataFlow has been deprecated and may be removed in future (localFlow.ql:6,3-11)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (localFlow.ql:4,6-14)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (localFlow.ql:4,31-39)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (localFlow.ql:6,3-11)
 | example.c:15:37:15:37 | b | example.c:15:37:15:37 | b |
 | example.c:15:37:15:37 | b | example.c:19:6:19:6 | b |
 | example.c:15:44:15:46 | pos | example.c:24:24:24:26 | pos |
--- a/cpp/ql/test/library-tests/dataflow/dataflow-tests/test-number-of-outnodes.expected
+++ b/cpp/ql/test/library-tests/dataflow/dataflow-tests/test-number-of-outnodes.expected
@@ -1,3 +1,3 @@
-WARNING: Module DataFlow has been deprecated and may be removed in future (test-number-of-outnodes.ql:5,18-61)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (test-number-of-outnodes.ql:5,18-61)
 failures
 testFailures
--- a/cpp/ql/test/library-tests/dataflow/dataflow-tests/test-source-sink.expected
+++ b/cpp/ql/test/library-tests/dataflow/dataflow-tests/test-source-sink.expected
@@ -1,5 +1,5 @@
-WARNING: Module DataFlow has been deprecated and may be removed in future (test-source-sink.ql:3,25-42)
-WARNING: Module DataFlow has been deprecated and may be removed in future (test-source-sink.ql:3,57-74)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (test-source-sink.ql:3,25-42)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (test-source-sink.ql:3,57-74)
 astFlow
 | BarrierGuard.cpp:5:19:5:24 | source | BarrierGuard.cpp:9:10:9:15 | source |
 | BarrierGuard.cpp:13:17:13:22 | source | BarrierGuard.cpp:15:10:15:15 | source |
--- a/cpp/ql/test/library-tests/dataflow/fields/partial-definition-diff.expected
+++ b/cpp/ql/test/library-tests/dataflow/fields/partial-definition-diff.expected
@@ -1,4 +1,4 @@
-WARNING: Module DataFlow has been deprecated and may be removed in future (partial-definition-diff.ql:7,8-51)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (partial-definition-diff.ql:7,8-51)
 | A.cpp:25:13:25:13 | c | AST only |
 | A.cpp:27:28:27:28 | c | AST only |
 | A.cpp:28:23:28:26 | this | IR only |
--- a/cpp/ql/test/library-tests/dataflow/fields/partial-definition.expected
+++ b/cpp/ql/test/library-tests/dataflow/fields/partial-definition.expected
@@ -1,4 +1,4 @@
-WARNING: Module DataFlow has been deprecated and may be removed in future (partial-definition.ql:6,8-51)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (partial-definition.ql:6,8-51)
 | A.cpp:25:7:25:10 | this |
 | A.cpp:25:13:25:13 | c |
 | A.cpp:27:22:27:25 | this |
--- a/cpp/ql/test/library-tests/dataflow/smart-pointers-taint/taint.expected
+++ b/cpp/ql/test/library-tests/dataflow/smart-pointers-taint/taint.expected
@@ -1,6 +1,6 @@
-WARNING: Module DataFlow has been deprecated and may be removed in future (taint.ql:6,48-56)
-WARNING: Module DataFlow has been deprecated and may be removed in future (taint.ql:7,24-32)
-WARNING: Module DataFlow has been deprecated and may be removed in future (taint.ql:11,22-30)
-WARNING: Module TaintTracking has been deprecated and may be removed in future (taint.ql:19,20-33)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (taint.ql:6,48-56)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (taint.ql:7,24-32)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (taint.ql:11,22-30)
+WARNING: module 'TaintTracking' has been deprecated and may be removed in future (taint.ql:19,20-33)
 failures
 testFailures
--- a/cpp/ql/test/library-tests/dataflow/taint-tests/localTaint.expected
+++ b/cpp/ql/test/library-tests/dataflow/taint-tests/localTaint.expected
@@ -1,7 +1,7 @@
-WARNING: Module DataFlow has been deprecated and may be removed in future (localTaint.ql:4,6-14)
-WARNING: Module DataFlow has been deprecated and may be removed in future (localTaint.ql:4,31-39)
-WARNING: Module DataFlow has been deprecated and may be removed in future (localTaint.ql:7,6-14)
-WARNING: Module TaintTracking has been deprecated and may be removed in future (localTaint.ql:6,3-16)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (localTaint.ql:4,6-14)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (localTaint.ql:4,31-39)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (localTaint.ql:7,6-14)
+WARNING: module 'TaintTracking' has been deprecated and may be removed in future (localTaint.ql:6,3-16)
 | arrayassignment.cpp:9:9:9:10 | 0 | arrayassignment.cpp:10:14:10:14 | x |  |
 | arrayassignment.cpp:9:9:9:10 | 0 | arrayassignment.cpp:11:15:11:15 | x |  |
 | arrayassignment.cpp:9:9:9:10 | 0 | arrayassignment.cpp:12:13:12:13 | x |  |
--- a/cpp/ql/test/library-tests/dataflow/taint-tests/taint.expected
+++ b/cpp/ql/test/library-tests/dataflow/taint-tests/taint.expected
@@ -1,7 +1,7 @@
-WARNING: Module DataFlow has been deprecated and may be removed in future (taint.ql:46,45-53)
-WARNING: Module DataFlow has been deprecated and may be removed in future (taint.ql:47,24-32)
-WARNING: Module DataFlow has been deprecated and may be removed in future (taint.ql:61,22-30)
-WARNING: Module DataFlow has been deprecated and may be removed in future (taint.ql:68,25-33)
-WARNING: Module TaintTracking has been deprecated and may be removed in future (taint.ql:73,20-33)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (taint.ql:46,45-53)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (taint.ql:47,24-32)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (taint.ql:61,22-30)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (taint.ql:68,25-33)
+WARNING: module 'TaintTracking' has been deprecated and may be removed in future (taint.ql:73,20-33)
 testFailures
 failures
--- a/cpp/ql/test/library-tests/declspec/guard/test.cpp
+++ b/cpp/ql/test/library-tests/declspec/guard/test.cpp
@@ -1,4 +1,4 @@
-// semmle-extractor-options: --edg --microsoft
+// semmle-extractor-options: --microsoft

 void f(__declspec(guard(overflow)) size_t length) {
 }
--- a/cpp/ql/test/library-tests/ir/escape/escape.cpp
+++ b/cpp/ql/test/library-tests/ir/escape/escape.cpp
@@ -193,11 +193,10 @@ void Escape()
    int passByRef3;
    CallByReferenceParamEscape(ReturnReference(passByRef3));

-    int ssa_passByPtr4;
-    int ssa_passByPtr5;
+    int no_ssa_passByPtr4;
+    int no_ssa_passByPtr5;
    bool no_b2 = false;
-    // Treated as escaped because we don't know _which_ address will be returned.
-    MaybeReturn(&ssa_passByPtr4, &ssa_passByPtr5, no_b2);
+    MaybeReturn(&no_ssa_passByPtr4, &no_ssa_passByPtr5, no_b2);

    int passByRef6;
    EscapeAndReturn(passByRef6);
@@ -252,19 +251,3 @@ void Escape()
    CallByPointer(no_condTemp);
 }

-bool getBool();
-
-void use(int);
-
-void test_while() {
-  int r;
-  int *no_rP = &r;
-
-  while(getBool()) {
-    int s = 0;
-    *no_rP = s;
-    no_rP = &s;
-  }
-
-  use(r);
-}
--- a/cpp/ql/test/library-tests/specifiers2/cpp20.cpp
+++ b/cpp/ql/test/library-tests/specifiers2/cpp20.cpp
@@ -1,4 +1,4 @@
-// semmle-extractor-options: --edg --clang --edg --c++20
+// semmle-extractor-options: --clang --edg --c++20

 namespace cpp20 {

--- a/cpp/ql/test/library-tests/structs/compatible_c/c1_gnu.c
+++ b/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: --edg --c99 --edg --clang --edg --clang_vector_types --gnu_version 40700
+// semmle-extractor-options: --edg --c99 --clang --edg --clang_vector_types --gnu_version 40700
--- a/cpp/ql/test/library-tests/structs/compatible_c/c2_gnu.c
+++ b/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: --edg --c99 --edg --clang --edg --clang_vector_types --gnu_version 40700
+// semmle-extractor-options: --edg --c99 --clang --edg --clang_vector_types --gnu_version 40700
--- a/cpp/ql/test/library-tests/templates/CPP-223/test.cpp
+++ b/cpp/ql/test/library-tests/templates/CPP-223/test.cpp
@@ -1,4 +1,4 @@
-// semmle-extractor-options: --edg --clang --edg --ms_extensions
+// semmle-extractor-options: --clang --edg --ms_extensions

 template <int a> class b {
  template <bool> struct c;
--- a/cpp/ql/test/library-tests/vector_types/options
+++ b/cpp/ql/test/library-tests/vector_types/options
@@ -1 +1 @@
-semmle-extractor-options: --edg --clang --edg --clang_builtin_functions --edg --clang_vector_types --gnu_version 40600
+semmle-extractor-options: --clang --edg --clang_builtin_functions --edg --clang_vector_types --gnu_version 40600
--- a/cpp/ql/test/library-tests/vector_types/vector_types.cpp
+++ b/cpp/ql/test/library-tests/vector_types/vector_types.cpp
@@ -1,4 +1,4 @@
-// semmle-extractor-options: --edg --clang --edg --clang_version --edg 30801
+// semmle-extractor-options: --clang --edg --clang_version --edg 30801
 // Compilable with: clang --std=c++0x -msse4.1 vector_types.cpp
 // (some bits also compilable with gcc)
 int printf(...);
--- a/cpp/ql/test/query-tests/Critical/MemoryFreed/DoubleFree.expected
+++ b/cpp/ql/test/query-tests/Critical/MemoryFreed/DoubleFree.expected
@@ -13,21 +13,6 @@ edges
 | test_free.cpp:207:10:207:10 | pointer to free output argument | test_free.cpp:209:10:209:10 | a | provenance |  |
 | test_free.cpp:301:12:301:14 | pointer to g_free output argument | test_free.cpp:302:12:302:14 | buf | provenance |  |
 | test_free.cpp:319:16:319:16 | pointer to operator delete output argument | test_free.cpp:322:12:322:12 | a | provenance |  |
-| test_free.cpp:343:12:343:24 | *access to array [post update] [ptr] | test_free.cpp:344:12:344:24 | *access to array [ptr] | provenance |  |
-| test_free.cpp:343:12:343:24 | *access to array [post update] [ptr] | test_free.cpp:345:12:345:24 | *access to array [ptr] | provenance |  |
-| test_free.cpp:343:12:343:24 | *access to array [post update] [ptr] | test_free.cpp:346:12:346:24 | *access to array [ptr] | provenance |  |
-| test_free.cpp:343:26:343:28 | pointer to operator delete output argument | test_free.cpp:343:12:343:24 | *access to array [post update] [ptr] | provenance |  |
-| test_free.cpp:344:12:344:24 | *access to array [post update] [ptr] | test_free.cpp:345:12:345:24 | *access to array [ptr] | provenance |  |
-| test_free.cpp:344:12:344:24 | *access to array [post update] [ptr] | test_free.cpp:346:12:346:24 | *access to array [ptr] | provenance |  |
-| test_free.cpp:344:12:344:24 | *access to array [ptr] | test_free.cpp:344:26:344:28 | ptr | provenance |  |
-| test_free.cpp:344:26:344:28 | pointer to operator delete output argument | test_free.cpp:344:12:344:24 | *access to array [post update] [ptr] | provenance |  |
-| test_free.cpp:345:12:345:24 | *access to array [post update] [ptr] | test_free.cpp:346:12:346:24 | *access to array [ptr] | provenance |  |
-| test_free.cpp:345:12:345:24 | *access to array [ptr] | test_free.cpp:345:26:345:28 | ptr | provenance |  |
-| test_free.cpp:345:12:345:24 | *access to array [ptr] | test_free.cpp:345:26:345:28 | ptr | provenance |  |
-| test_free.cpp:345:26:345:28 | pointer to operator delete output argument | test_free.cpp:345:12:345:24 | *access to array [post update] [ptr] | provenance |  |
-| test_free.cpp:346:12:346:24 | *access to array [ptr] | test_free.cpp:346:26:346:28 | ptr | provenance |  |
-| test_free.cpp:346:12:346:24 | *access to array [ptr] | test_free.cpp:346:26:346:28 | ptr | provenance |  |
-| test_free.cpp:346:12:346:24 | *access to array [ptr] | test_free.cpp:346:26:346:28 | ptr | provenance |  |
 nodes
 | test_free.cpp:11:10:11:10 | pointer to free output argument | semmle.label | pointer to free output argument |
 | test_free.cpp:14:10:14:10 | a | semmle.label | a |
@@ -57,24 +42,6 @@ nodes
 | test_free.cpp:302:12:302:14 | buf | semmle.label | buf |
 | test_free.cpp:319:16:319:16 | pointer to operator delete output argument | semmle.label | pointer to operator delete output argument |
 | test_free.cpp:322:12:322:12 | a | semmle.label | a |
-| test_free.cpp:343:12:343:24 | *access to array [post update] [ptr] | semmle.label | *access to array [post update] [ptr] |
-| test_free.cpp:343:26:343:28 | pointer to operator delete output argument | semmle.label | pointer to operator delete output argument |
-| test_free.cpp:344:12:344:24 | *access to array [post update] [ptr] | semmle.label | *access to array [post update] [ptr] |
-| test_free.cpp:344:12:344:24 | *access to array [ptr] | semmle.label | *access to array [ptr] |
-| test_free.cpp:344:26:344:28 | pointer to operator delete output argument | semmle.label | pointer to operator delete output argument |
-| test_free.cpp:344:26:344:28 | ptr | semmle.label | ptr |
-| test_free.cpp:345:12:345:24 | *access to array [post update] [ptr] | semmle.label | *access to array [post update] [ptr] |
-| test_free.cpp:345:12:345:24 | *access to array [ptr] | semmle.label | *access to array [ptr] |
-| test_free.cpp:345:12:345:24 | *access to array [ptr] | semmle.label | *access to array [ptr] |
-| test_free.cpp:345:26:345:28 | pointer to operator delete output argument | semmle.label | pointer to operator delete output argument |
-| test_free.cpp:345:26:345:28 | ptr | semmle.label | ptr |
-| test_free.cpp:345:26:345:28 | ptr | semmle.label | ptr |
-| test_free.cpp:346:12:346:24 | *access to array [ptr] | semmle.label | *access to array [ptr] |
-| test_free.cpp:346:12:346:24 | *access to array [ptr] | semmle.label | *access to array [ptr] |
-| test_free.cpp:346:12:346:24 | *access to array [ptr] | semmle.label | *access to array [ptr] |
-| test_free.cpp:346:26:346:28 | ptr | semmle.label | ptr |
-| test_free.cpp:346:26:346:28 | ptr | semmle.label | ptr |
-| test_free.cpp:346:26:346:28 | ptr | semmle.label | ptr |
 subpaths
 #select
 | test_free.cpp:14:10:14:10 | a | test_free.cpp:11:10:11:10 | pointer to free output argument | test_free.cpp:14:10:14:10 | a | Memory pointed to by $@ may already have been freed by $@. | test_free.cpp:14:10:14:10 | a | a | test_free.cpp:11:5:11:8 | call to free | call to free |
@@ -91,9 +58,3 @@ subpaths
 | test_free.cpp:209:10:209:10 | a | test_free.cpp:207:10:207:10 | pointer to free output argument | test_free.cpp:209:10:209:10 | a | Memory pointed to by $@ may already have been freed by $@. | test_free.cpp:209:10:209:10 | a | a | test_free.cpp:207:5:207:8 | call to free | call to free |
 | test_free.cpp:302:12:302:14 | buf | test_free.cpp:301:12:301:14 | pointer to g_free output argument | test_free.cpp:302:12:302:14 | buf | Memory pointed to by $@ may already have been freed by $@. | test_free.cpp:302:12:302:14 | buf | buf | test_free.cpp:301:5:301:10 | call to g_free | call to g_free |
 | test_free.cpp:322:12:322:12 | a | test_free.cpp:319:16:319:16 | pointer to operator delete output argument | test_free.cpp:322:12:322:12 | a | Memory pointed to by $@ may already have been freed by $@. | test_free.cpp:322:12:322:12 | a | a | test_free.cpp:319:9:319:16 | delete | delete |
-| test_free.cpp:344:26:344:28 | ptr | test_free.cpp:343:26:343:28 | pointer to operator delete output argument | test_free.cpp:344:26:344:28 | ptr | Memory pointed to by $@ may already have been freed by $@. | test_free.cpp:344:26:344:28 | ptr | ptr | test_free.cpp:343:5:343:28 | delete | delete |
-| test_free.cpp:345:26:345:28 | ptr | test_free.cpp:343:26:343:28 | pointer to operator delete output argument | test_free.cpp:345:26:345:28 | ptr | Memory pointed to by $@ may already have been freed by $@. | test_free.cpp:345:26:345:28 | ptr | ptr | test_free.cpp:343:5:343:28 | delete | delete |
-| test_free.cpp:345:26:345:28 | ptr | test_free.cpp:344:26:344:28 | pointer to operator delete output argument | test_free.cpp:345:26:345:28 | ptr | Memory pointed to by $@ may already have been freed by $@. | test_free.cpp:345:26:345:28 | ptr | ptr | test_free.cpp:344:5:344:28 | delete | delete |
-| test_free.cpp:346:26:346:28 | ptr | test_free.cpp:343:26:343:28 | pointer to operator delete output argument | test_free.cpp:346:26:346:28 | ptr | Memory pointed to by $@ may already have been freed by $@. | test_free.cpp:346:26:346:28 | ptr | ptr | test_free.cpp:343:5:343:28 | delete | delete |
-| test_free.cpp:346:26:346:28 | ptr | test_free.cpp:344:26:344:28 | pointer to operator delete output argument | test_free.cpp:346:26:346:28 | ptr | Memory pointed to by $@ may already have been freed by $@. | test_free.cpp:346:26:346:28 | ptr | ptr | test_free.cpp:344:5:344:28 | delete | delete |
-| test_free.cpp:346:26:346:28 | ptr | test_free.cpp:345:26:345:28 | pointer to operator delete output argument | test_free.cpp:346:26:346:28 | ptr | Memory pointed to by $@ may already have been freed by $@. | test_free.cpp:346:26:346:28 | ptr | ptr | test_free.cpp:345:5:345:28 | delete | delete |
--- a/cpp/ql/test/query-tests/Critical/MemoryFreed/MemoryFreed.expected
+++ b/cpp/ql/test/query-tests/Critical/MemoryFreed/MemoryFreed.expected
@@ -115,6 +115,8 @@
 | test_free.cpp:344:26:344:28 | ptr |
 | test_free.cpp:345:26:345:28 | ptr |
 | test_free.cpp:346:26:346:28 | ptr |
+| test_free.cpp:356:19:356:19 | a |
+| test_free.cpp:357:19:357:19 | a |
 | virtual.cpp:18:10:18:10 | a |
 | virtual.cpp:19:10:19:10 | c |
 | virtual.cpp:38:10:38:10 | b |
--- a/cpp/ql/test/query-tests/Critical/MemoryFreed/test_free.cpp
+++ b/cpp/ql/test/query-tests/Critical/MemoryFreed/test_free.cpp
@@ -341,7 +341,18 @@ struct PtrContainer {

 void test_array(PtrContainer *containers) {
    delete containers[0].ptr; // GOOD
-    delete containers[1].ptr; // GOOD [FALSE POSITIVE]
-    delete containers[2].ptr; // GOOD [FALSE POSITIVE]
-    delete containers[2].ptr; // BAD (double free)
+    delete containers[1].ptr; // GOOD
+    delete containers[2].ptr; // GOOD
+    delete containers[2].ptr; // BAD (double free) [NOT DETECTED]
 }
+
+struct E {
+    struct EC {
+        int* a;
+    } ec[2];
+};
+
+void test(E* e) {
+    free(e->ec[0].a);
+    free(e->ec[1].a); // GOOD
+}
--- a/csharp/documentation/library-coverage/coverage.csv
+++ b/csharp/documentation/library-coverage/coverage.csv
@@ -2,43 +2,44 @@ package,sink,source,summary,sink:code-injection,sink:encryption-decryptor,sink:e
 Amazon.Lambda.APIGatewayEvents,,6,,,,,,,,,,,,,,,,,,6,,,
 Amazon.Lambda.Core,10,,,,,,,,,,,10,,,,,,,,,,,
 Dapper,55,42,1,,,,,,,,,,55,,42,,,,,,,,1
-ILCompiler,,,81,,,,,,,,,,,,,,,,,,,81,
-ILLink.RoslynAnalyzer,,,63,,,,,,,,,,,,,,,,,,,63,
-ILLink.Shared,,,32,,,,,,,,,,,,,,,,,,,30,2
-ILLink.Tasks,,,3,,,,,,,,,,,,,,,,,,,3,
+ILCompiler,,,123,,,,,,,,,,,,,,,,,,,123,
+ILLink.RoslynAnalyzer,,,145,,,,,,,,,,,,,,,,,,,145,
+ILLink.Shared,,,34,,,,,,,,,,,,,,,,,,,32,2
+ILLink.Tasks,,,4,,,,,,,,,,,,,,,,,,,4,
 Internal.IL,,,46,,,,,,,,,,,,,,,,,,,44,2
 Internal.Pgo,,,9,,,,,,,,,,,,,,,,,,,8,1
-Internal.TypeSystem,,,291,,,,,,,,,,,,,,,,,,,275,16
-JsonToItemsTaskFactory,,,5,,,,,,,,,,,,,,,,,,,5,
-Microsoft.Android.Build,,,14,,,,,,,,,,,,,,,,,,,14,
-Microsoft.Apple.Build,,,5,,,,,,,,,,,,,,,,,,,5,
+Internal.TypeSystem,,,315,,,,,,,,,,,,,,,,,,,299,16
+JsonToItemsTaskFactory,,,10,,,,,,,,,,,,,,,,,,,10,
+Microsoft.Android.Build,,,16,,,,,,,,,,,,,,,,,,,16,
+Microsoft.Apple.Build,,,8,,,,,,,,,,,,,,,,,,,8,
 Microsoft.ApplicationBlocks.Data,28,,,,,,,,,,,,28,,,,,,,,,,
-Microsoft.CSharp,,,10,,,,,,,,,,,,,,,,,,,10,
+Microsoft.CSharp,,,13,,,,,,,,,,,,,,,,,,,13,
 Microsoft.Diagnostics.Tools.Pgo,,,12,,,,,,,,,,,,,,,,,,,12,
+Microsoft.DotNet.Build.Tasks,,,6,,,,,,,,,,,,,,,,,,,6,
 Microsoft.EntityFrameworkCore,6,,12,,,,,,,,,,6,,,,,,,,,,12
-Microsoft.Extensions.Caching.Distributed,,,9,,,,,,,,,,,,,,,,,,,9,
-Microsoft.Extensions.Caching.Memory,,,30,,,,,,,,,,,,,,,,,,,29,1
-Microsoft.Extensions.Configuration,,2,77,,,,,,,,,,,,,2,,,,,,76,1
-Microsoft.Extensions.DependencyInjection,,,96,,,,,,,,,,,,,,,,,,,95,1
-Microsoft.Extensions.DependencyModel,,,9,,,,,,,,,,,,,,,,,,,9,
+Microsoft.Extensions.Caching.Distributed,,,10,,,,,,,,,,,,,,,,,,,10,
+Microsoft.Extensions.Caching.Memory,,,39,,,,,,,,,,,,,,,,,,,38,1
+Microsoft.Extensions.Configuration,,2,90,,,,,,,,,,,,,2,,,,,,89,1
+Microsoft.Extensions.DependencyInjection,,,134,,,,,,,,,,,,,,,,,,,133,1
+Microsoft.Extensions.DependencyModel,,,18,,,,,,,,,,,,,,,,,,,18,
 Microsoft.Extensions.Diagnostics.Metrics,,,15,,,,,,,,,,,,,,,,,,,15,
 Microsoft.Extensions.FileProviders,,,15,,,,,,,,,,,,,,,,,,,15,
-Microsoft.Extensions.FileSystemGlobbing,,,16,,,,,,,,,,,,,,,,,,,14,2
-Microsoft.Extensions.Hosting,,,26,,,,,,,,,,,,,,,,,,,25,1
-Microsoft.Extensions.Http,,,8,,,,,,,,,,,,,,,,,,,8,
-Microsoft.Extensions.Logging,,,53,,,,,,,,,,,,,,,,,,,52,1
-Microsoft.Extensions.Options,,,8,,,,,,,,,,,,,,,,,,,8,
-Microsoft.Extensions.Primitives,,,64,,,,,,,,,,,,,,,,,,,64,
-Microsoft.Interop,,,73,,,,,,,,,,,,,,,,,,,73,
-Microsoft.NET.Build.Tasks,,,1,,,,,,,,,,,,,,,,,,,1,
-Microsoft.NET.WebAssembly.Webcil,,,7,,,,,,,,,,,,,,,,,,,7,
+Microsoft.Extensions.FileSystemGlobbing,,,18,,,,,,,,,,,,,,,,,,,16,2
+Microsoft.Extensions.Hosting,,,41,,,,,,,,,,,,,,,,,,,40,1
+Microsoft.Extensions.Http,,,9,,,,,,,,,,,,,,,,,,,9,
+Microsoft.Extensions.Logging,,,65,,,,,,,,,,,,,,,,,,,64,1
+Microsoft.Extensions.Options,,,13,,,,,,,,,,,,,,,,,,,13,
+Microsoft.Extensions.Primitives,,,72,,,,,,,,,,,,,,,,,,,72,
+Microsoft.Interop,,,121,,,,,,,,,,,,,,,,,,,121,
+Microsoft.NET.Build.Tasks,,,4,,,,,,,,,,,,,,,,,,,4,
+Microsoft.NET.WebAssembly.Webcil,,,8,,,,,,,,,,,,,,,,,,,8,
 Microsoft.VisualBasic,,,6,,,,,,,,,,,,,,,,,,,1,5
-Microsoft.WebAssembly.Build.Tasks,,,3,,,,,,,,,,,,,,,,,,,3,
+Microsoft.WebAssembly.Build.Tasks,,,4,,,,,,,,,,,,,,,,,,,4,
 Microsoft.Win32,,4,4,,,,,,,,,,,,,,,,,,4,4,
-Mono.Linker,,,158,,,,,,,,,,,,,,,,,,,158,
+Mono.Linker,,,285,,,,,,,,,,,,,,,,,,,285,
 MySql.Data.MySqlClient,48,,,,,,,,,,,,48,,,,,,,,,,
 Newtonsoft.Json,,,91,,,,,,,,,,,,,,,,,,,73,18
 ServiceStack,194,,7,27,,,,,75,,,,92,,,,,,,,,7,
-SourceGenerators,,,4,,,,,,,,,,,,,,,,,,,4,
-System,49,44,9873,,3,3,1,,,4,5,,33,2,,3,15,17,3,4,,7968,1905
+SourceGenerators,,,5,,,,,,,,,,,,,,,,,,,5,
+System,60,44,10614,,7,6,5,,,4,5,,33,2,,3,15,17,3,4,,8709,1905
 Windows.Security.Cryptography.Core,1,,,,,,,1,,,,,,,,,,,,,,,
--- a/csharp/documentation/library-coverage/coverage.rst
+++ b/csharp/documentation/library-coverage/coverage.rst
@@ -8,7 +8,7 @@ C# framework & library support

   Framework / library,Package,Flow sources,Taint & value steps,Sinks (total),`CWE-079` :sub:`Cross-site scripting`
   `ServiceStack <https://servicestack.net/>`_,"``ServiceStack.*``, ``ServiceStack``",,7,194,
-   System,"``System.*``, ``System``",44,9873,49,9
-   Others,"``Amazon.Lambda.APIGatewayEvents``, ``Amazon.Lambda.Core``, ``Dapper``, ``ILCompiler``, ``ILLink.RoslynAnalyzer``, ``ILLink.Shared``, ``ILLink.Tasks``, ``Internal.IL``, ``Internal.Pgo``, ``Internal.TypeSystem``, ``JsonToItemsTaskFactory``, ``Microsoft.Android.Build``, ``Microsoft.Apple.Build``, ``Microsoft.ApplicationBlocks.Data``, ``Microsoft.CSharp``, ``Microsoft.Diagnostics.Tools.Pgo``, ``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.NET.Build.Tasks``, ``Microsoft.NET.WebAssembly.Webcil``, ``Microsoft.VisualBasic``, ``Microsoft.WebAssembly.Build.Tasks``, ``Microsoft.Win32``, ``Mono.Linker``, ``MySql.Data.MySqlClient``, ``Newtonsoft.Json``, ``SourceGenerators``, ``Windows.Security.Cryptography.Core``",54,1357,148,
-   Totals,,98,11237,391,9
+   System,"``System.*``, ``System``",44,10614,60,9
+   Others,"``Amazon.Lambda.APIGatewayEvents``, ``Amazon.Lambda.Core``, ``Dapper``, ``ILCompiler``, ``ILLink.RoslynAnalyzer``, ``ILLink.Shared``, ``ILLink.Tasks``, ``Internal.IL``, ``Internal.Pgo``, ``Internal.TypeSystem``, ``JsonToItemsTaskFactory``, ``Microsoft.Android.Build``, ``Microsoft.Apple.Build``, ``Microsoft.ApplicationBlocks.Data``, ``Microsoft.CSharp``, ``Microsoft.Diagnostics.Tools.Pgo``, ``Microsoft.DotNet.Build.Tasks``, ``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.NET.Build.Tasks``, ``Microsoft.NET.WebAssembly.Webcil``, ``Microsoft.VisualBasic``, ``Microsoft.WebAssembly.Build.Tasks``, ``Microsoft.Win32``, ``Mono.Linker``, ``MySql.Data.MySqlClient``, ``Newtonsoft.Json``, ``SourceGenerators``, ``Windows.Security.Cryptography.Core``",54,1821,148,
+   Totals,,98,12442,402,9

--- a/csharp/extractor/Semmle.Extraction.CSharp.Standalone/Extractor.cs
+++ b/csharp/extractor/Semmle.Extraction.CSharp.Standalone/Extractor.cs
@@ -42,17 +42,17 @@ namespace Semmle.Extraction.CSharp.Standalone
                    (compilation, options) => analyser.Initialize(output.FullName, extractionInput.CompilationInfos, compilation, options),
                    () =>
                    {
-                        foreach (var type in analyser.MissingNamespaces)
+                        foreach (var type in analyser.ExtractionContext!.MissingNamespaces)
                        {
                            progressMonitor.MissingNamespace(type);
                        }

-                        foreach (var type in analyser.MissingTypes)
+                        foreach (var type in analyser.ExtractionContext!.MissingTypes)
                        {
                            progressMonitor.MissingType(type);
                        }

-                        progressMonitor.MissingSummary(analyser.MissingTypes.Count(), analyser.MissingNamespaces.Count());
+                        progressMonitor.MissingSummary(analyser.ExtractionContext!.MissingTypes.Count(), analyser.ExtractionContext!.MissingNamespaces.Count());
                    });
            }
            finally
@@ -69,29 +69,6 @@ namespace Semmle.Extraction.CSharp.Standalone
            }
        }

-        private static void ExtractStandalone(
-            ExtractionInput extractionInput,
-            IProgressMonitor pm,
-            ILogger logger,
-            CommonOptions options)
-        {
-            var stopwatch = new Stopwatch();
-            stopwatch.Start();
-
-            var canonicalPathCache = CanonicalPathCache.Create(logger, 1000);
-            var pathTransformer = new PathTransformer(canonicalPathCache);
-
-            using var analyser = new StandaloneAnalyser(pm, logger, false, pathTransformer);
-            try
-            {
-                AnalyseStandalone(analyser, extractionInput, options, pm, stopwatch);
-            }
-            catch (Exception ex)  // lgtm[cs/catch-of-all-exceptions]
-            {
-                analyser.Logger.Log(Severity.Error, "  Unhandled exception: {0}", ex);
-            }
-        }
-
        private class ExtractionProgress : IProgressMonitor
        {
            public ExtractionProgress(ILogger output)
@@ -141,8 +118,8 @@ namespace Semmle.Extraction.CSharp.Standalone

        public static ExitCode Run(Options options)
        {
-            var stopwatch = new Stopwatch();
-            stopwatch.Start();
+            var overallStopwatch = new Stopwatch();
+            overallStopwatch.Start();

            using var logger = new ConsoleLogger(options.Verbosity, logThreadId: true);
            logger.Log(Severity.Info, "Extracting C# with build-mode set to 'none'");
@@ -158,12 +135,26 @@ namespace Semmle.Extraction.CSharp.Standalone

            logger.Log(Severity.Info, "");
            logger.Log(Severity.Info, "Extracting...");
-            ExtractStandalone(
-                new ExtractionInput(dependencyManager.AllSourceFiles, dependencyManager.ReferenceFiles, dependencyManager.CompilationInfos),
-                new ExtractionProgress(logger),
-                fileLogger,
-                options);
-            logger.Log(Severity.Info, $"Extraction completed in {stopwatch.Elapsed}");
+
+            var analyzerStopwatch = new Stopwatch();
+            analyzerStopwatch.Start();
+
+            var canonicalPathCache = CanonicalPathCache.Create(fileLogger, 1000);
+            var pathTransformer = new PathTransformer(canonicalPathCache);
+
+            var progressMonitor = new ExtractionProgress(logger);
+            using var analyser = new StandaloneAnalyser(progressMonitor, fileLogger, pathTransformer, canonicalPathCache, false);
+            try
+            {
+                var extractionInput = new ExtractionInput(dependencyManager.AllSourceFiles, dependencyManager.ReferenceFiles, dependencyManager.CompilationInfos);
+                AnalyseStandalone(analyser, extractionInput, options, progressMonitor, analyzerStopwatch);
+            }
+            catch (Exception ex)  // lgtm[cs/catch-of-all-exceptions]
+            {
+                fileLogger.Log(Severity.Error, "  Unhandled exception: {0}", ex);
+            }
+
+            logger.Log(Severity.Info, $"Extraction completed in {overallStopwatch.Elapsed}");

            return ExitCode.Ok;
        }
--- a/csharp/extractor/Semmle.Extraction.CSharp/Entities/Assembly.cs
+++ b/csharp/extractor/Semmle.Extraction.CSharp/Entities/Assembly.cs
@@ -17,7 +17,7 @@ namespace Semmle.Extraction.CSharp.Entities
            isOutputAssembly = init is null;
            if (isOutputAssembly)
            {
-                assemblyPath = cx.Extractor.OutputPath;
+                assemblyPath = cx.ExtractionContext.OutputPath;
                assembly = cx.Compilation.Assembly;
            }
            else
@@ -25,7 +25,7 @@ namespace Semmle.Extraction.CSharp.Entities
                assembly = init!.MetadataModule!.ContainingAssembly;
                var identity = assembly.Identity;
                var idString = identity.Name + " " + identity.Version;
-                assemblyPath = cx.Extractor.GetAssemblyFile(idString);
+                assemblyPath = cx.ExtractionContext.GetAssemblyFile(idString);
            }
        }

@@ -33,7 +33,7 @@ namespace Semmle.Extraction.CSharp.Entities
        {
            if (assemblyPath is not null)
            {
-                var isBuildlessOutputAssembly = isOutputAssembly && Context.Extractor.Mode.HasFlag(ExtractorMode.Standalone);
+                var isBuildlessOutputAssembly = isOutputAssembly && Context.ExtractionContext.Mode.HasFlag(ExtractorMode.Standalone);
                var identifier = isBuildlessOutputAssembly
                    ? ""
                    : assembly.ToString() ?? "";
@@ -74,7 +74,7 @@ namespace Semmle.Extraction.CSharp.Entities

        public override void WriteId(EscapingTextWriter trapFile)
        {
-            if (isOutputAssembly && Context.Extractor.Mode.HasFlag(ExtractorMode.Standalone))
+            if (isOutputAssembly && Context.ExtractionContext.Mode.HasFlag(ExtractorMode.Standalone))
            {
                trapFile.Write("buildlessOutputAssembly");
            }
--- a/csharp/extractor/Semmle.Extraction.CSharp/Entities/Compilations/Compilation.cs
+++ b/csharp/extractor/Semmle.Extraction.CSharp/Entities/Compilations/Compilation.cs
@@ -18,8 +18,8 @@ namespace Semmle.Extraction.CSharp.Entities
 #nullable disable warnings
        private Compilation(Context cx) : base(cx, null)
        {
-            cwd = cx.Extractor.Cwd;
-            args = cx.Extractor.Args;
+            cwd = cx.ExtractionContext.Cwd;
+            args = cx.ExtractionContext.Args;
            hashCode = cwd.GetHashCode();
            for (var i = 0; i < args.Length; i++)
            {
--- a/csharp/extractor/Semmle.Extraction.CSharp/Entities/Compilations/CompilerDiagnostic.cs
+++ b/csharp/extractor/Semmle.Extraction.CSharp/Entities/Compilations/CompilerDiagnostic.cs
@@ -28,7 +28,7 @@ namespace Semmle.Extraction.CSharp.Entities
            {
                if (messageCount == limit + 1)
                {
-                    Context.Extractor.Logger.LogWarning($"Stopped logging {key} compiler diagnostics for the current compilation after reaching {limit}");
+                    Context.ExtractionContext.Logger.LogWarning($"Stopped logging {key} compiler diagnostics for the current compilation after reaching {limit}");
                }

                return;
--- a/csharp/extractor/Semmle.Extraction.CSharp/Entities/Expressions/Invocation.cs
+++ b/csharp/extractor/Semmle.Extraction.CSharp/Entities/Expressions/Invocation.cs
@@ -133,7 +133,7 @@ namespace Semmle.Extraction.CSharp.Entities.Expressions
                        .Where(method => method.Parameters.Length >= Syntax.ArgumentList.Arguments.Count)
                        .Where(method => method.Parameters.Count(p => !p.HasExplicitDefaultValue) <= Syntax.ArgumentList.Arguments.Count);

-                    return Context.Extractor.Mode.HasFlag(ExtractorMode.Standalone) ?
+                    return Context.ExtractionContext.Mode.HasFlag(ExtractorMode.Standalone) ?
                        candidates.FirstOrDefault() :
                        candidates.SingleOrDefault();
                }
--- a/csharp/extractor/Semmle.Extraction.CSharp/Entities/File.cs
+++ b/csharp/extractor/Semmle.Extraction.CSharp/Entities/File.cs
@@ -61,7 +61,7 @@ namespace Semmle.Extraction.CSharp.Entities
                }
            }

-            trapFile.file_extraction_mode(this, Context.Extractor.Mode);
+            trapFile.file_extraction_mode(this, Context.ExtractionContext.Mode);
        }

        private bool IsPossiblyTextFile()
--- a/csharp/extractor/Semmle.Extraction.CSharp/Entities/NonGeneratedSourceLocation.cs
+++ b/csharp/extractor/Semmle.Extraction.CSharp/Entities/NonGeneratedSourceLocation.cs
@@ -27,7 +27,7 @@ namespace Semmle.Extraction.CSharp.Entities
            var mapped = Symbol.GetMappedLineSpan();
            if (mapped.HasMappedPath && mapped.IsValid)
            {
-                var path = TryAdjustRelativeMappedFilePath(mapped.Path, Position.Path, Context.Extractor.Logger);
+                var path = Context.TryAdjustRelativeMappedFilePath(mapped.Path, Position.Path);
                var mappedLoc = Create(Context, Location.Create(path, default, mapped.Span));

                trapFile.locations_mapped(this, mappedLoc);
@@ -64,25 +64,5 @@ namespace Semmle.Extraction.CSharp.Entities

            public override NonGeneratedSourceLocation Create(Context cx, Location init) => new NonGeneratedSourceLocation(cx, init);
        }
-
-        public static string TryAdjustRelativeMappedFilePath(string mappedToPath, string mappedFromPath, ILogger logger)
-        {
-            if (!Path.IsPathRooted(mappedToPath))
-            {
-                try
-                {
-                    var fullPath = Path.GetFullPath(Path.Combine(Path.GetDirectoryName(mappedFromPath)!, mappedToPath));
-                    logger.LogDebug($"Found relative path in line mapping: '{mappedToPath}', interpreting it as '{fullPath}'");
-
-                    mappedToPath = fullPath;
-                }
-                catch (Exception e)
-                {
-                    logger.LogDebug($"Failed to compute absolute path for relative path in line mapping: '{mappedToPath}': {e}");
-                }
-            }
-
-            return mappedToPath;
-        }
    }
 }
--- a/csharp/extractor/Semmle.Extraction.CSharp/Entities/OrdinaryMethod.cs
+++ b/csharp/extractor/Semmle.Extraction.CSharp/Entities/OrdinaryMethod.cs
@@ -63,7 +63,7 @@ namespace Semmle.Extraction.CSharp.Entities
        {
            if (method.MethodKind == MethodKind.ReducedExtension)
            {
-                cx.Extractor.Logger.Log(Semmle.Util.Logging.Severity.Warning, "Reduced extension method symbols should not be directly extracted.");
+                cx.ExtractionContext.Logger.Log(Semmle.Util.Logging.Severity.Warning, "Reduced extension method symbols should not be directly extracted.");
            }

            return OrdinaryMethodFactory.Instance.CreateEntityFromSymbol(cx, method);
--- a/csharp/extractor/Semmle.Extraction.CSharp/Entities/PreprocessorDirectives/LineOrSpanDirective.cs
+++ b/csharp/extractor/Semmle.Extraction.CSharp/Entities/PreprocessorDirectives/LineOrSpanDirective.cs
@@ -28,7 +28,7 @@ namespace Semmle.Extraction.CSharp.Entities
            var path = Symbol.File.ValueText;
            if (!string.IsNullOrWhiteSpace(path))
            {
-                path = NonGeneratedSourceLocation.TryAdjustRelativeMappedFilePath(path, Symbol.SyntaxTree.FilePath, Context.Extractor.Logger);
+                path = Context.TryAdjustRelativeMappedFilePath(path, Symbol.SyntaxTree.FilePath);
                var file = File.Create(Context, path);
                trapFile.directive_line_file(this, file);
            }
--- a/csharp/extractor/Semmle.Extraction.CSharp/Entities/PreprocessorDirectives/PragmaChecksumDirective.cs
+++ b/csharp/extractor/Semmle.Extraction.CSharp/Entities/PreprocessorDirectives/PragmaChecksumDirective.cs
@@ -12,7 +12,7 @@ namespace Semmle.Extraction.CSharp.Entities

        protected override void PopulatePreprocessor(TextWriter trapFile)
        {
-            var path = NonGeneratedSourceLocation.TryAdjustRelativeMappedFilePath(Symbol.File.ValueText, Symbol.SyntaxTree.FilePath, Context.Extractor.Logger);
+            var path = Context.TryAdjustRelativeMappedFilePath(Symbol.File.ValueText, Symbol.SyntaxTree.FilePath);
            var file = File.Create(Context, path);
            trapFile.pragma_checksums(this, file, Symbol.Guid.ToString(), Symbol.Bytes.ToString());
        }
--- a/csharp/extractor/Semmle.Extraction.CSharp/Entities/Types/NamedType.cs
+++ b/csharp/extractor/Semmle.Extraction.CSharp/Entities/Types/NamedType.cs
@@ -36,7 +36,7 @@ namespace Semmle.Extraction.CSharp.Entities
            if (Symbol.TypeKind == TypeKind.Error)
            {
                UnknownType.Create(Context); // make sure this exists so we can use it in `TypeRef::getReferencedType`
-                Context.Extractor.MissingType(Symbol.ToString()!, Context.FromSource);
+                Context.ExtractionContext.MissingType(Symbol.ToString()!, Context.FromSource);
                return;
            }

--- a/csharp/extractor/Semmle.Extraction.CSharp/Entities/UsingDirective.cs
+++ b/csharp/extractor/Semmle.Extraction.CSharp/Entities/UsingDirective.cs
@@ -36,7 +36,7 @@ namespace Semmle.Extraction.CSharp.Entities
                }
                else
                {
-                    Context.Extractor.MissingNamespace(name.ToFullString(), Context.FromSource);
+                    Context.ExtractionContext.MissingNamespace(name.ToFullString(), Context.FromSource);
                    Context.ModelError(node, "Namespace not found");
                    return;
                }
--- a/csharp/extractor/Semmle.Extraction.CSharp/Extractor/Analyser.cs
+++ b/csharp/extractor/Semmle.Extraction.CSharp/Extractor/Analyser.cs
@@ -10,6 +10,7 @@ using Microsoft.CodeAnalysis.CSharp;
 using Semmle.Util;
 using Semmle.Util.Logging;
 using Semmle.Extraction.CSharp.Populators;
+using System.Reflection;

 namespace Semmle.Extraction.CSharp
 {
@@ -18,7 +19,7 @@ namespace Semmle.Extraction.CSharp
    /// </summary>
    public class Analyser : IDisposable
    {
-        protected Extraction.Extractor? extractor;
+        public ExtractionContext? ExtractionContext { get; protected set; }
        protected CSharpCompilation? compilation;
        protected CommonOptions? options;
        private protected Entities.Compilation? compilationEntity;
@@ -38,14 +39,23 @@ namespace Semmle.Extraction.CSharp

        public PathTransformer PathTransformer { get; }

-        protected Analyser(IProgressMonitor pm, ILogger logger, bool addAssemblyTrapPrefix, PathTransformer pathTransformer)
+        public IPathCache PathCache { get; }
+
+        protected Analyser(
+            IProgressMonitor pm,
+            ILogger logger,
+            PathTransformer pathTransformer,
+            IPathCache pathCache,
+            bool addAssemblyTrapPrefix)
        {
            Logger = logger;
+            PathTransformer = pathTransformer;
+            PathCache = pathCache;
            this.addAssemblyTrapPrefix = addAssemblyTrapPrefix;
+            this.progressMonitor = pm;
+
            Logger.Log(Severity.Info, "EXTRACTION STARTING at {0}", DateTime.Now);
            stopWatch.Start();
-            progressMonitor = pm;
-            PathTransformer = pathTransformer;
        }

        /// <summary>
@@ -98,12 +108,12 @@ namespace Semmle.Extraction.CSharp
                        var def = reader.GetAssemblyDefinition();
                        assemblyIdentity = reader.GetString(def.Name) + " " + def.Version;
                    }
-                    extractor.SetAssemblyFile(assemblyIdentity, refPath);
+                    ExtractionContext.SetAssemblyFile(assemblyIdentity, refPath);

                }
                catch (Exception ex)  // lgtm[cs/catch-of-all-exceptions]
                {
-                    extractor.Message(new Message("Exception reading reference file", reference.FilePath, null, ex.StackTrace));
+                    ExtractionContext.Message(new Message("Exception reading reference file", reference.FilePath, null, ex.StackTrace));
                }
            }
        }
@@ -148,7 +158,7 @@ namespace Semmle.Extraction.CSharp

                    if (compilation.GetAssemblyOrModuleSymbol(r) is IAssemblySymbol assembly)
                    {
-                        var cx = new Context(extractor, compilation, trapWriter, new AssemblyScope(assembly, assemblyPath), addAssemblyTrapPrefix);
+                        var cx = new Context(ExtractionContext, compilation, trapWriter, new AssemblyScope(assembly, assemblyPath), addAssemblyTrapPrefix);

                        foreach (var module in assembly.Modules)
                        {
@@ -191,7 +201,7 @@ namespace Semmle.Extraction.CSharp

                if (!upToDate)
                {
-                    var cx = new Context(extractor, compilation, trapWriter, new SourceScope(tree), addAssemblyTrapPrefix);
+                    var cx = new Context(ExtractionContext, compilation, trapWriter, new SourceScope(tree), addAssemblyTrapPrefix);
                    // Ensure that the file itself is populated in case the source file is totally empty
                    var root = tree.GetRoot();
                    Entities.File.Create(cx, root.SyntaxTree.FilePath);
@@ -213,7 +223,7 @@ namespace Semmle.Extraction.CSharp
            }
            catch (Exception ex)  // lgtm[cs/catch-of-all-exceptions]
            {
-                extractor.Message(new Message($"Unhandled exception processing syntax tree. {ex.Message}", tree.FilePath, null, ex.StackTrace));
+                ExtractionContext.Message(new Message($"Unhandled exception processing syntax tree. {ex.Message}", tree.FilePath, null, ex.StackTrace));
            }
        }

@@ -221,7 +231,7 @@ namespace Semmle.Extraction.CSharp
        {
            try
            {
-                var assemblyPath = extractor.OutputPath;
+                var assemblyPath = ExtractionContext.OutputPath;
                var stopwatch = new Stopwatch();
                stopwatch.Start();
                var currentTaskId = IncrementTaskCount();
@@ -231,11 +241,11 @@ namespace Semmle.Extraction.CSharp
                var assembly = compilation.Assembly;
                var trapWriter = transformedAssemblyPath.CreateTrapWriter(Logger, options.TrapCompression, discardDuplicates: false);
                compilationTrapFile = trapWriter;  // Dispose later
-                var cx = new Context(extractor, compilation, trapWriter, new AssemblyScope(assembly, assemblyPath), addAssemblyTrapPrefix);
+                var cx = new Context(ExtractionContext, compilation, trapWriter, new AssemblyScope(assembly, assemblyPath), addAssemblyTrapPrefix);

                compilationEntity = Entities.Compilation.Create(cx);

-                extractor.CompilationInfos.ForEach(ci => trapWriter.Writer.compilation_info(compilationEntity, ci.key, ci.value));
+                ExtractionContext.CompilationInfos.ForEach(ci => trapWriter.Writer.compilation_info(compilationEntity, ci.key, ci.value));

                ReportProgressTaskDone(currentTaskId, assemblyPath, trapWriter.TrapFile, stopwatch.Elapsed, AnalysisAction.Extracted);
            }
@@ -318,7 +328,7 @@ namespace Semmle.Extraction.CSharp
        /// <summary>
        /// Number of errors encountered during extraction.
        /// </summary>
-        private int ExtractorErrors => extractor?.Errors ?? 0;
+        private int ExtractorErrors => ExtractionContext?.Errors ?? 0;

        /// <summary>
        /// Number of errors encountered by the compiler.
@@ -333,11 +343,26 @@ namespace Semmle.Extraction.CSharp
        /// <summary>
        /// Logs information about the extractor.
        /// </summary>
-        public void LogExtractorInfo(string extractorVersion)
+        public void LogExtractorInfo()
        {
            Logger.Log(Severity.Info, "  Extractor: {0}", Environment.GetCommandLineArgs().First());
-            Logger.Log(Severity.Info, "  Extractor version: {0}", extractorVersion);
+            Logger.Log(Severity.Info, "  Extractor version: {0}", Version);
            Logger.Log(Severity.Info, "  Current working directory: {0}", Directory.GetCurrentDirectory());
        }
+
+        private static string Version
+        {
+            get
+            {
+                // the attribute for the git information are always attached to the entry assembly by our build system
+                var assembly = Assembly.GetEntryAssembly();
+                var versionString = assembly?.GetCustomAttribute<AssemblyInformationalVersionAttribute>();
+                if (versionString == null)
+                {
+                    return "unknown (not built from internal bazel workspace)";
+                }
+                return versionString.InformationalVersion;
+            }
+        }
    }
 }
--- a/csharp/extractor/Semmle.Extraction.CSharp/Extractor/Context.cs
+++ b/csharp/extractor/Semmle.Extraction.CSharp/Extractor/Context.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Diagnostics.CodeAnalysis;
+using System.IO;
 using Microsoft.CodeAnalysis;
 using Semmle.Extraction.Entities;

@@ -76,8 +77,8 @@ namespace Semmle.Extraction.CSharp

        internal CommentProcessor CommentGenerator { get; } = new CommentProcessor();

-        public Context(Extraction.Extractor e, Compilation c, TrapWriter trapWriter, IExtractionScope scope, bool addAssemblyTrapPrefix)
-            : base(e, trapWriter, addAssemblyTrapPrefix)
+        public Context(ExtractionContext extractionContext, Compilation c, TrapWriter trapWriter, IExtractionScope scope, bool addAssemblyTrapPrefix)
+            : base(extractionContext, trapWriter, addAssemblyTrapPrefix)
        {
            Compilation = c;
            this.scope = scope;
@@ -178,5 +179,25 @@ namespace Semmle.Extraction.CSharp
            extractedGenerics.Add(entity.Label);
            return true;
        }
+
+        public string TryAdjustRelativeMappedFilePath(string mappedToPath, string mappedFromPath)
+        {
+            if (!Path.IsPathRooted(mappedToPath))
+            {
+                try
+                {
+                    var fullPath = Path.GetFullPath(Path.Combine(Path.GetDirectoryName(mappedFromPath)!, mappedToPath));
+                    ExtractionContext.Logger.LogDebug($"Found relative path in line mapping: '{mappedToPath}', interpreting it as '{fullPath}'");
+
+                    mappedToPath = fullPath;
+                }
+                catch (Exception e)
+                {
+                    ExtractionContext.Logger.LogDebug($"Failed to compute absolute path for relative path in line mapping: '{mappedToPath}': {e}");
+                }
+            }
+
+            return mappedToPath;
+        }
    }
 }
--- a/csharp/extractor/Semmle.Extraction.CSharp/Extractor/Extractor.cs
+++ b/csharp/extractor/Semmle.Extraction.CSharp/Extractor/Extractor.cs
@@ -93,20 +93,13 @@ namespace Semmle.Extraction.CSharp
        /// <returns><see cref="ExitCode"/></returns>
        public static ExitCode Run(string[] args)
        {
-            var stopwatch = new Stopwatch();
-            stopwatch.Start();
+            var analyzerStopwatch = new Stopwatch();
+            analyzerStopwatch.Start();

            var options = Options.CreateWithEnvironment(args);
-            var workingDirectory = Directory.GetCurrentDirectory();
-            var compilerArgs = options.CompilerArguments.ToArray();

            using var logger = MakeLogger(options.Verbosity, options.Console);

-            var canonicalPathCache = CanonicalPathCache.Create(logger, 1000);
-            var pathTransformer = new PathTransformer(canonicalPathCache);
-
-            using var analyser = new TracingAnalyser(new LogProgressMonitor(logger), logger, options.AssemblySensitiveTrap, pathTransformer);
-
            try
            {
                if (options.ProjectsToLoad.Any())
@@ -115,13 +108,20 @@ namespace Semmle.Extraction.CSharp
                }

                var compilerVersion = new CompilerVersion(options);
-
                if (compilerVersion.SkipExtraction)
                {
                    logger.Log(Severity.Warning, "  Unrecognized compiler '{0}' because {1}", compilerVersion.SpecifiedCompiler, compilerVersion.SkipReason);
                    return ExitCode.Ok;
                }

+                var workingDirectory = Directory.GetCurrentDirectory();
+                var compilerArgs = options.CompilerArguments.ToArray();
+
+                var canonicalPathCache = CanonicalPathCache.Create(logger, 1000);
+                var pathTransformer = new PathTransformer(canonicalPathCache);
+
+                using var analyser = new TracingAnalyser(new LogProgressMonitor(logger), logger, pathTransformer, canonicalPathCache, options.AssemblySensitiveTrap);
+
                var compilerArguments = CSharpCommandLineParser.Default.Parse(
                    compilerVersion.ArgsWithResponse,
                    workingDirectory,
@@ -144,7 +144,7 @@ namespace Semmle.Extraction.CSharp
                    return ExitCode.Ok;
                }

-                return AnalyseTracing(workingDirectory, compilerArgs, analyser, compilerArguments, options, canonicalPathCache, stopwatch);
+                return AnalyseTracing(workingDirectory, compilerArgs, analyser, compilerArguments, options, analyzerStopwatch);
            }
            catch (Exception ex)  // lgtm[cs/catch-of-all-exceptions]
            {
@@ -226,7 +226,7 @@ namespace Semmle.Extraction.CSharp
        /// The resolved references will be added (thread-safely) to the supplied
        /// list <paramref name="ret"/>.
        /// </summary>
-        private static IEnumerable<Action> ResolveReferences(Microsoft.CodeAnalysis.CommandLineArguments args, Analyser analyser, CanonicalPathCache canonicalPathCache, BlockingCollection<MetadataReference> ret)
+        private static IEnumerable<Action> ResolveReferences(Microsoft.CodeAnalysis.CommandLineArguments args, Analyser analyser, BlockingCollection<MetadataReference> ret)
        {
            var referencePaths = new Lazy<string[]>(() => FixedReferencePaths(args).ToArray());
            return args.MetadataReferences.Select<CommandLineReference, Action>(clref => () =>
@@ -235,7 +235,7 @@ namespace Semmle.Extraction.CSharp
                {
                    if (File.Exists(clref.Reference))
                    {
-                        var reference = MakeReference(clref, canonicalPathCache.GetCanonicalPath(clref.Reference));
+                        var reference = MakeReference(clref, analyser.PathCache.GetCanonicalPath(clref.Reference));
                        ret.Add(reference);
                    }
                    else
@@ -252,7 +252,7 @@ namespace Semmle.Extraction.CSharp
                    var composed = referencePaths.Value
                        .Select(path => Path.Combine(path, clref.Reference))
                        .Where(path => File.Exists(path))
-                        .Select(path => canonicalPathCache.GetCanonicalPath(path))
+                        .Select(path => analyser.PathCache.GetCanonicalPath(path))
                        .FirstOrDefault();

                    if (composed is not null)
@@ -382,11 +382,10 @@ namespace Semmle.Extraction.CSharp
            TracingAnalyser analyser,
            CSharpCommandLineArguments compilerArguments,
            Options options,
-            CanonicalPathCache canonicalPathCache,
            Stopwatch stopwatch)
        {
            return Analyse(stopwatch, analyser, options,
-                references => ResolveReferences(compilerArguments, analyser, canonicalPathCache, references),
+                references => ResolveReferences(compilerArguments, analyser, references),
                (analyser, syntaxTrees) =>
                {
                    var paths = compilerArguments.SourceFiles
@@ -399,7 +398,7 @@ namespace Semmle.Extraction.CSharp
                    }

                    return ReadSyntaxTrees(
-                        paths.Select(canonicalPathCache.GetCanonicalPath),
+                        paths.Select(analyser.PathCache.GetCanonicalPath).ToHashSet(),
                        analyser,
                        compilerArguments.ParseOptions,
                        compilerArguments.Encoding,
--- a/csharp/extractor/Semmle.Extraction.CSharp/Extractor/StandaloneAnalyser.cs
+++ b/csharp/extractor/Semmle.Extraction.CSharp/Extractor/StandaloneAnalyser.cs
@@ -1,33 +1,25 @@
-using System;
 using System.Collections.Generic;
 using System.IO;
 using Microsoft.CodeAnalysis.CSharp;
+using Semmle.Util;
 using Semmle.Util.Logging;

 namespace Semmle.Extraction.CSharp
 {
    public class StandaloneAnalyser : Analyser
    {
-        public StandaloneAnalyser(IProgressMonitor pm, ILogger logger, bool addAssemblyTrapPrefix, PathTransformer pathTransformer)
-            : base(pm, logger, addAssemblyTrapPrefix, pathTransformer)
+        public StandaloneAnalyser(IProgressMonitor pm, ILogger logger, PathTransformer pathTransformer, IPathCache pathCache, bool addAssemblyTrapPrefix)
+            : base(pm, logger, pathTransformer, pathCache, addAssemblyTrapPrefix)
        {
        }

        public void Initialize(string outputPath, IEnumerable<(string, string)> compilationInfos, CSharpCompilation compilationIn, CommonOptions options)
        {
            compilation = compilationIn;
-            extractor = new StandaloneExtractor(Directory.GetCurrentDirectory(), outputPath, compilationInfos, Logger, PathTransformer, options);
+            ExtractionContext = new ExtractionContext(Directory.GetCurrentDirectory(), [], outputPath, compilationInfos, Logger, PathTransformer, ExtractorMode.Standalone, options.QlTest);
            this.options = options;
-            LogExtractorInfo(Extraction.Extractor.Version);
+            LogExtractorInfo();
            SetReferencePaths();
        }
-
-#nullable disable warnings
-
-        public IEnumerable<string> MissingTypes => extractor.MissingTypes;
-
-        public IEnumerable<string> MissingNamespaces => extractor.MissingNamespaces;
-
-#nullable restore warnings
    }
 }
--- a/csharp/extractor/Semmle.Extraction.CSharp/Extractor/TracingAnalyser.cs
+++ b/csharp/extractor/Semmle.Extraction.CSharp/Extractor/TracingAnalyser.cs
@@ -13,8 +13,8 @@ namespace Semmle.Extraction.CSharp
    {
        private bool init;

-        public TracingAnalyser(IProgressMonitor pm, ILogger logger, bool addAssemblyTrapPrefix, PathTransformer pathTransformer)
-            : base(pm, logger, addAssemblyTrapPrefix, pathTransformer)
+        public TracingAnalyser(IProgressMonitor pm, ILogger logger, PathTransformer pathTransformer, IPathCache pathCache, bool addAssemblyTrapPrefix)
+            : base(pm, logger, pathTransformer, pathCache, addAssemblyTrapPrefix)
        {
        }

@@ -25,7 +25,8 @@ namespace Semmle.Extraction.CSharp
        /// <returns>A Boolean indicating whether to proceed with extraction.</returns>
        public bool BeginInitialize(IEnumerable<string> roslynArgs)
        {
-            return init = LogRoslynArgs(roslynArgs, Extraction.Extractor.Version);
+            LogExtractorInfo();
+            return init = LogRoslynArgs(roslynArgs);
        }

        /// <summary>
@@ -46,12 +47,12 @@ namespace Semmle.Extraction.CSharp
                throw new InternalError("EndInitialize called without BeginInitialize returning true");
            this.options = options;
            this.compilation = compilation;
-            this.extractor = new TracingExtractor(cwd, args, GetOutputName(compilation, commandLineArguments), Logger, PathTransformer, options);
-            LogDiagnostics();
+            this.ExtractionContext = new ExtractionContext(cwd, args, GetOutputName(compilation, commandLineArguments), [], Logger, PathTransformer, ExtractorMode.None, options.QlTest);
+            var errorCount = LogDiagnostics();

            SetReferencePaths();

-            CompilationErrors += FilteredDiagnostics.Count();
+            CompilationErrors += errorCount;
        }

        /// <summary>
@@ -59,9 +60,8 @@ namespace Semmle.Extraction.CSharp
        /// </summary>
        /// <param name="roslynArgs">The arguments passed to Roslyn.</param>
        /// <returns>A Boolean indicating whether the same arguments have been logged previously.</returns>
-        private bool LogRoslynArgs(IEnumerable<string> roslynArgs, string extractorVersion)
+        private bool LogRoslynArgs(IEnumerable<string> roslynArgs)
        {
-            LogExtractorInfo(extractorVersion);
            Logger.Log(Severity.Info, $"  Arguments to Roslyn: {string.Join(' ', roslynArgs)}");

            var tempFile = Extractor.GetCSharpArgsLogPath(Path.GetRandomFileName());
@@ -137,27 +137,27 @@ namespace Semmle.Extraction.CSharp
            return Path.Combine(commandLineArguments.OutputDirectory, commandLineArguments.OutputFileName);
        }

-#nullable disable warnings
-
-        /// <summary>
-        /// Logs detailed information about this invocation,
-        /// in the event that errors were detected.
-        /// </summary>
-        /// <returns>A Boolean indicating whether to proceed with extraction.</returns>
-        private void LogDiagnostics()
+        private int LogDiagnostics()
        {
-            foreach (var error in FilteredDiagnostics)
+            var filteredDiagnostics = compilation!
+                .GetDiagnostics()
+                .Where(e => e.Severity >= DiagnosticSeverity.Error && !errorsToIgnore.Contains(e.Id))
+                .ToList();
+
+            foreach (var error in filteredDiagnostics)
            {
                Logger.Log(Severity.Error, "  Compilation error: {0}", error);
            }

-            if (FilteredDiagnostics.Any())
+            if (filteredDiagnostics.Count != 0)
            {
                foreach (var reference in compilation.References)
                {
                    Logger.Log(Severity.Info, "  Resolved reference {0}", reference.Display);
                }
            }
+
+            return filteredDiagnostics.Count;
        }

        private static readonly HashSet<string> errorsToIgnore = new HashSet<string>
@@ -166,17 +166,5 @@ namespace Semmle.Extraction.CSharp
            "CS1589",   // XML referencing not supported
            "CS1569"    // Error writing XML documentation
        };
-
-        private IEnumerable<Diagnostic> FilteredDiagnostics
-        {
-            get
-            {
-                return extractor is null || extractor.Mode.HasFlag(ExtractorMode.Standalone) || compilation is null ? Enumerable.Empty<Diagnostic>() :
-                    compilation.
-                    GetDiagnostics().
-                    Where(e => e.Severity >= DiagnosticSeverity.Error && !errorsToIgnore.Contains(e.Id));
-            }
-        }
-#nullable restore warnings
    }
 }
--- a/csharp/extractor/Semmle.Extraction/Context.cs
+++ b/csharp/extractor/Semmle.Extraction/Context.cs
@@ -18,7 +18,7 @@ namespace Semmle.Extraction
        /// <summary>
        /// Access various extraction functions, e.g. logger, trap writer.
        /// </summary>
-        public Extractor Extractor { get; }
+        public ExtractionContext ExtractionContext { get; }

        /// <summary>
        /// Access to the trap file.
@@ -51,7 +51,7 @@ namespace Semmle.Extraction
                try
                {
                    writingLabel = true;
-                    entity.DefineLabel(TrapWriter.Writer, Extractor);
+                    entity.DefineLabel(TrapWriter.Writer);
                }
                finally
                {
@@ -190,9 +190,9 @@ namespace Semmle.Extraction
            }
        }

-        protected Context(Extractor extractor, TrapWriter trapWriter, bool shouldAddAssemblyTrapPrefix = false)
+        protected Context(ExtractionContext extractionContext, TrapWriter trapWriter, bool shouldAddAssemblyTrapPrefix = false)
        {
-            Extractor = extractor;
+            ExtractionContext = extractionContext;
            TrapWriter = trapWriter;
            ShouldAddAssemblyTrapPrefix = shouldAddAssemblyTrapPrefix;
        }
@@ -274,7 +274,7 @@ namespace Semmle.Extraction

            bool duplicationGuard, deferred;

-            if (Extractor.Mode is ExtractorMode.Standalone)
+            if (ExtractionContext.Mode is ExtractorMode.Standalone)
            {
                duplicationGuard = false;
                deferred = false;
@@ -398,7 +398,7 @@ namespace Semmle.Extraction
        private void ExtractionError(Message msg)
        {
            new ExtractionMessage(this, msg);
-            Extractor.Message(msg);
+            ExtractionContext.Message(msg);
        }

        private void ExtractionError(InternalError error)
@@ -408,7 +408,7 @@ namespace Semmle.Extraction

        private void ReportError(InternalError error)
        {
-            if (!Extractor.Mode.HasFlag(ExtractorMode.Standalone))
+            if (!ExtractionContext.Mode.HasFlag(ExtractorMode.Standalone))
                throw error;

            ExtractionError(error);
--- a/csharp/extractor/Semmle.Extraction/Entities/Base/Entity.cs
+++ b/csharp/extractor/Semmle.Extraction/Entities/Base/Entity.cs
@@ -28,7 +28,7 @@ namespace Semmle.Extraction

        public abstract TrapStackBehaviour TrapStackBehaviour { get; }

-        public void DefineLabel(TextWriter trapFile, Extractor extractor)
+        public void DefineLabel(TextWriter trapFile)
        {
            trapFile.WriteLabel(this);
            trapFile.Write("=");
@@ -40,7 +40,7 @@ namespace Semmle.Extraction
            catch (Exception ex)  // lgtm[cs/catch-of-all-exceptions]
            {
                trapFile.WriteLine("\"");
-                extractor.Message(new Message($"Unhandled exception generating id: {ex.Message}", ToString() ?? "", null, ex.StackTrace));
+                Context.ExtractionContext.Message(new Message($"Unhandled exception generating id: {ex.Message}", ToString() ?? "", null, ex.StackTrace));
            }
            trapFile.WriteLine();
        }
--- a/csharp/extractor/Semmle.Extraction/Entities/Base/IEntity.cs
+++ b/csharp/extractor/Semmle.Extraction/Entities/Base/IEntity.cs
@@ -48,6 +48,6 @@ namespace Semmle.Extraction
        /// </summary>
        TrapStackBehaviour TrapStackBehaviour { get; }

-        void DefineLabel(TextWriter trapFile, Extractor extractor);
+        void DefineLabel(TextWriter trapFile);
    }
 }
--- a/csharp/extractor/Semmle.Extraction/Entities/ExtractionMessage.cs
+++ b/csharp/extractor/Semmle.Extraction/Entities/ExtractionMessage.cs
@@ -25,7 +25,7 @@ namespace Semmle.Extraction.Entities
            {
                if (messageCount == limit + 1)
                {
-                    Context.Extractor.Logger.LogWarning($"Stopped logging extractor messages after reaching {limit}");
+                    Context.ExtractionContext.Logger.LogWarning($"Stopped logging extractor messages after reaching {limit}");
                }
                return;
            }
--- a/csharp/extractor/Semmle.Extraction/Entities/File.cs
+++ b/csharp/extractor/Semmle.Extraction/Entities/File.cs
@@ -8,7 +8,7 @@ namespace Semmle.Extraction.Entities
            : base(cx, path)
        {
            originalPath = path;
-            transformedPathLazy = new Lazy<PathTransformer.ITransformedPath>(() => Context.Extractor.PathTransformer.Transform(originalPath));
+            transformedPathLazy = new Lazy<PathTransformer.ITransformedPath>(() => Context.ExtractionContext.PathTransformer.Transform(originalPath));
        }

        protected readonly string originalPath;
--- a/csharp/extractor/Semmle.Extraction/Extractor/ExtractionContext.cs
+++ b/csharp/extractor/Semmle.Extraction/Extractor/ExtractionContext.cs
@@ -1,6 +1,4 @@
 using System.Collections.Generic;
-using System.Reflection;
-using System.IO;
 using Semmle.Util.Logging;
 using CompilationInfo = (string key, string value);

@@ -9,20 +7,18 @@ namespace Semmle.Extraction
    /// <summary>
    /// Implementation of the main extractor state.
    /// </summary>
-    public abstract class Extractor
+    public class ExtractionContext
    {
        public string Cwd { get; init; }
        public string[] Args { get; init; }
-        public abstract ExtractorMode Mode { get; }
+        public ExtractorMode Mode { get; }
        public string OutputPath { get; }
        public IEnumerable<CompilationInfo> CompilationInfos { get; }

        /// <summary>
        /// Creates a new extractor instance for one compilation unit.
        /// </summary>
-        /// <param name="logger">The object used for logging.</param>
-        /// <param name="pathTransformer">The object used for path transformations.</param>
-        protected Extractor(string cwd, string[] args, string outputPath, IEnumerable<CompilationInfo> compilationInfos, ILogger logger, PathTransformer pathTransformer)
+        public ExtractionContext(string cwd, string[] args, string outputPath, IEnumerable<CompilationInfo> compilationInfos, ILogger logger, PathTransformer pathTransformer, ExtractorMode mode, bool isQlTest)
        {
            OutputPath = outputPath;
            Logger = logger;
@@ -30,6 +26,12 @@ namespace Semmle.Extraction
            CompilationInfos = compilationInfos;
            Cwd = cwd;
            Args = args;
+
+            Mode = mode;
+            if (isQlTest)
+            {
+                Mode |= ExtractorMode.QlTest;
+            }
        }

        // Limit the number of error messages in the log file
@@ -107,21 +109,6 @@ namespace Semmle.Extraction

        public ILogger Logger { get; private set; }

-        public static string Version
-        {
-            get
-            {
-                // the attribute for the git information are always attached to the entry assembly by our build system
-                var assembly = Assembly.GetEntryAssembly();
-                var versionString = assembly?.GetCustomAttribute<AssemblyInformationalVersionAttribute>();
-                if (versionString == null)
-                {
-                    return "unknown (not built from internal bazel workspace)";
-                }
-                return versionString.InformationalVersion;
-            }
-        }
-
        public PathTransformer PathTransformer { get; }
    }
 }
--- a/csharp/extractor/Semmle.Extraction/Extractor/StandaloneExtractor.cs
+++ b/csharp/extractor/Semmle.Extraction/Extractor/StandaloneExtractor.cs
@@ -1,25 +0,0 @@
-using System.Collections.Generic;
-using Semmle.Util.Logging;
-
-namespace Semmle.Extraction
-{
-    public class StandaloneExtractor : Extractor
-    {
-        public override ExtractorMode Mode { get; }
-
-        /// <summary>
-        /// Creates a new extractor instance for one compilation unit.
-        /// </summary>
-        /// <param name="logger">The object used for logging.</param>
-        /// <param name="pathTransformer">The object used for path transformations.</param>
-        public StandaloneExtractor(string cwd, string outputPath, IEnumerable<(string, string)> compilationInfos, ILogger logger, PathTransformer pathTransformer, CommonOptions options)
-            : base(cwd, [], outputPath, compilationInfos, logger, pathTransformer)
-        {
-            Mode = ExtractorMode.Standalone;
-            if (options.QlTest)
-            {
-                Mode |= ExtractorMode.QlTest;
-            }
-        }
-    }
-}
--- a/csharp/extractor/Semmle.Extraction/Extractor/TracingExtractor.cs
+++ b/csharp/extractor/Semmle.Extraction/Extractor/TracingExtractor.cs
@@ -1,25 +0,0 @@
-using Semmle.Util.Logging;
-
-namespace Semmle.Extraction
-{
-    public class TracingExtractor : Extractor
-    {
-        public override ExtractorMode Mode { get; }
-
-        /// <summary>
-        /// Creates a new extractor instance for one compilation unit.
-        /// </summary>
-        /// <param name="outputPath">The name of the output DLL/EXE, or null if not specified (standalone extraction).</param>
-        /// <param name="logger">The object used for logging.</param>
-        /// <param name="pathTransformer">The object used for path transformations.</param>
-        public TracingExtractor(string cwd, string[] args, string outputPath, ILogger logger, PathTransformer pathTransformer, CommonOptions options)
-            : base(cwd, args, outputPath, [], logger, pathTransformer)
-        {
-            Mode = ExtractorMode.None;
-            if (options.QlTest)
-            {
-                Mode |= ExtractorMode.QlTest;
-            }
-        }
-    }
-}
--- a/csharp/ql/integration-tests/all-platforms/source_generator/Diag.expected
+++ b/csharp/ql/integration-tests/all-platforms/source_generator/Diag.expected
--- a/csharp/ql/integration-tests/all-platforms/source_generator/Diag.ql
+++ b/csharp/ql/integration-tests/all-platforms/source_generator/Diag.ql
@@ -0,0 +1,4 @@
+import csharp
+import semmle.code.csharp.commons.Diagnostics
+
+query predicate test2(CompilerError e) { any() }
--- a/csharp/ql/integration-tests/all-platforms/source_generator/Files.expected
+++ b/csharp/ql/integration-tests/all-platforms/source_generator/Files.expected
@@ -0,0 +1,6 @@
+| Generated/System.Text.RegularExpressions.Generator/System.Text.RegularExpressions.Generator.RegexGenerator/RegexGenerator.g.cs:0:0:0:0 | Generated/System.Text.RegularExpressions.Generator/System.Text.RegularExpressions.Generator.RegexGenerator/RegexGenerator.g.cs |
+| Generated/x.cs:0:0:0:0 | Generated/x.cs |
+| Program.cs:0:0:0:0 | Program.cs |
+| obj/Debug/net8.0/.NETCoreApp,Version=v8.0.AssemblyAttributes.cs:0:0:0:0 | obj/Debug/net8.0/.NETCoreApp,Version=v8.0.AssemblyAttributes.cs |
+| obj/Debug/net8.0/test.AssemblyInfo.cs:0:0:0:0 | obj/Debug/net8.0/test.AssemblyInfo.cs |
+| obj/Debug/net8.0/test.GlobalUsings.g.cs:0:0:0:0 | obj/Debug/net8.0/test.GlobalUsings.g.cs |
--- a/csharp/ql/integration-tests/all-platforms/source_generator/Files.ql
+++ b/csharp/ql/integration-tests/all-platforms/source_generator/Files.ql
@@ -0,0 +1,5 @@
+import csharp
+
+from File f
+where f.fromSource()
+select f
--- a/csharp/ql/integration-tests/all-platforms/source_generator/Generated/x.cs
+++ b/csharp/ql/integration-tests/all-platforms/source_generator/Generated/x.cs
@@ -0,0 +1,4 @@
+// File added to the Generated folder. This is not a source generator output file.
+class X
+{
+}
--- a/csharp/ql/integration-tests/all-platforms/source_generator/Program.cs
+++ b/csharp/ql/integration-tests/all-platforms/source_generator/Program.cs
@@ -0,0 +1,9 @@
+using System.Text.RegularExpressions;
+
+Console.WriteLine("Hello, World!");
+
+partial class Test
+{
+    [GeneratedRegex("abc|def", RegexOptions.IgnoreCase, "en-US")]
+    private static partial Regex AbcOrDefGeneratedRegex();
+}
--- a/csharp/ql/integration-tests/all-platforms/source_generator/global.json
+++ b/csharp/ql/integration-tests/all-platforms/source_generator/global.json
@@ -0,0 +1,5 @@
+{
+    "sdk": {
+        "version": "8.0.101"
+    }
+}
--- a/csharp/ql/integration-tests/all-platforms/source_generator/test.csproj
+++ b/csharp/ql/integration-tests/all-platforms/source_generator/test.csproj
@@ -0,0 +1,13 @@
+<Project Sdk="Microsoft.NET.Sdk.Web">
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <TargetFramework>net8.0</TargetFramework>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+
+    <!-- Add source generated files into the Generated folder. -->
+    <CompilerGeneratedFilesOutputPath>Generated</CompilerGeneratedFilesOutputPath>
+  </PropertyGroup>
+
+</Project>
--- a/csharp/ql/integration-tests/all-platforms/source_generator/test.py
+++ b/csharp/ql/integration-tests/all-platforms/source_generator/test.py
@@ -0,0 +1,3 @@
+from create_database_utils import *
+
+run_codeql_database_create(['dotnet build'], lang="csharp")
--- a/csharp/ql/lib/ext/generated/ILCompiler.IBC.model.yml
+++ b/csharp/ql/lib/ext/generated/ILCompiler.IBC.model.yml
@@ -11,7 +11,6 @@ extensions:
      pack: codeql/csharp-all
      extensible: neutralModel
    data:
-      - ["ILCompiler.IBC", "IBCProfileData", "GetAllMethodProfileData", "()", "summary", "df-generated"]
      - ["ILCompiler.IBC", "IBCProfileData", "GetMethodBlockCount", "(Internal.TypeSystem.MethodDesc)", "summary", "df-generated"]
      - ["ILCompiler.IBC", "IBCProfileData", "GetMethodProfileData", "(Internal.TypeSystem.MethodDesc)", "summary", "df-generated"]
      - ["ILCompiler.IBC", "IBCProfileData", "get_PartialNGen", "()", "summary", "df-generated"]
--- a/csharp/ql/lib/ext/generated/ILCompiler.Reflection.ReadyToRun.Amd64.model.yml
+++ b/csharp/ql/lib/ext/generated/ILCompiler.Reflection.ReadyToRun.Amd64.model.yml
@@ -1,5 +1,12 @@
 # THIS FILE IS AN AUTO-GENERATED MODELS AS DATA FILE. DO NOT EDIT.
 extensions:
+  - addsTo:
+      pack: codeql/csharp-all
+      extensible: summaryModel
+    data:
+      - ["ILCompiler.Reflection.ReadyToRun.Amd64", "GcSlotTable+GcSlot", False, "GcSlot", "(System.Int32,System.Int32,ILCompiler.Reflection.ReadyToRun.GcStackSlot,ILCompiler.Reflection.ReadyToRun.GcSlotFlags,System.Boolean)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
+      - ["ILCompiler.Reflection.ReadyToRun.Amd64", "GcTransition", False, "ToString", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["ILCompiler.Reflection.ReadyToRun.Amd64", "UnwindInfo", False, "ToString", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
  - addsTo:
      pack: codeql/csharp-all
      extensible: neutralModel
@@ -7,15 +14,12 @@ extensions:
      - ["ILCompiler.Reflection.ReadyToRun.Amd64", "GcInfo+SafePointOffset", "SafePointOffset", "(System.Int32,System.UInt32)", "summary", "df-generated"]
      - ["ILCompiler.Reflection.ReadyToRun.Amd64", "GcInfo", "GcInfo", "(System.Byte[],System.Int32,System.Reflection.PortableExecutable.Machine,System.UInt16)", "summary", "df-generated"]
      - ["ILCompiler.Reflection.ReadyToRun.Amd64", "GcInfo", "ToString", "()", "summary", "df-generated"]
-      - ["ILCompiler.Reflection.ReadyToRun.Amd64", "GcSlotTable+GcSlot", "GcSlot", "(System.Int32,System.Int32,ILCompiler.Reflection.ReadyToRun.GcStackSlot,ILCompiler.Reflection.ReadyToRun.GcSlotFlags,System.Boolean)", "summary", "df-generated"]
      - ["ILCompiler.Reflection.ReadyToRun.Amd64", "GcSlotTable+GcSlot", "WriteTo", "(System.Text.StringBuilder,System.Reflection.PortableExecutable.Machine,ILCompiler.Reflection.ReadyToRun.GcSlotFlags)", "summary", "df-generated"]
      - ["ILCompiler.Reflection.ReadyToRun.Amd64", "GcSlotTable", "GcSlotTable", "(System.Byte[],System.Reflection.PortableExecutable.Machine,ILCompiler.Reflection.ReadyToRun.GcInfoTypes,System.Int32)", "summary", "df-generated"]
      - ["ILCompiler.Reflection.ReadyToRun.Amd64", "GcSlotTable", "ToString", "()", "summary", "df-generated"]
      - ["ILCompiler.Reflection.ReadyToRun.Amd64", "GcSlotTable", "get_NumTracked", "()", "summary", "df-generated"]
      - ["ILCompiler.Reflection.ReadyToRun.Amd64", "GcTransition", "GcTransition", "(System.Int32,System.Int32,System.Boolean,System.Int32,ILCompiler.Reflection.ReadyToRun.Amd64.GcSlotTable,System.Reflection.PortableExecutable.Machine)", "summary", "df-generated"]
      - ["ILCompiler.Reflection.ReadyToRun.Amd64", "GcTransition", "GetSlotState", "(ILCompiler.Reflection.ReadyToRun.Amd64.GcSlotTable,System.Reflection.PortableExecutable.Machine)", "summary", "df-generated"]
-      - ["ILCompiler.Reflection.ReadyToRun.Amd64", "GcTransition", "ToString", "()", "summary", "df-generated"]
      - ["ILCompiler.Reflection.ReadyToRun.Amd64", "InterruptibleRange", "InterruptibleRange", "(System.UInt32,System.UInt32,System.UInt32)", "summary", "df-generated"]
      - ["ILCompiler.Reflection.ReadyToRun.Amd64", "UnwindCode", "UnwindCode", "(System.Byte[],System.Int32,System.Int32)", "summary", "df-generated"]
-      - ["ILCompiler.Reflection.ReadyToRun.Amd64", "UnwindInfo", "ToString", "()", "summary", "df-generated"]
      - ["ILCompiler.Reflection.ReadyToRun.Amd64", "UnwindInfo", "UnwindInfo", "(System.Byte[],System.Int32)", "summary", "df-generated"]
--- a/csharp/ql/lib/ext/generated/ILCompiler.Reflection.ReadyToRun.model.yml
+++ b/csharp/ql/lib/ext/generated/ILCompiler.Reflection.ReadyToRun.model.yml
@@ -7,10 +7,15 @@ extensions:
      - ["ILCompiler.Reflection.ReadyToRun", "DebugInfo", False, "DebugInfo", "(ILCompiler.Reflection.ReadyToRun.RuntimeFunction,System.Int32)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
      - ["ILCompiler.Reflection.ReadyToRun", "DebugInfo", False, "get_BoundsList", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
      - ["ILCompiler.Reflection.ReadyToRun", "DebugInfo", False, "get_VariablesList", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["ILCompiler.Reflection.ReadyToRun", "DisassemblingGenericContext", False, "DisassemblingGenericContext", "(System.String[],System.String[])", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
+      - ["ILCompiler.Reflection.ReadyToRun", "DisassemblingGenericContext", False, "DisassemblingGenericContext", "(System.String[],System.String[])", "", "Argument[1].Element", "Argument[this]", "taint", "df-generated"]
+      - ["ILCompiler.Reflection.ReadyToRun", "DisassemblingTypeProvider", True, "GetGenericMethodParameter", "(ILCompiler.Reflection.ReadyToRun.DisassemblingGenericContext,System.Int32)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["ILCompiler.Reflection.ReadyToRun", "DisassemblingTypeProvider", True, "GetGenericTypeParameter", "(ILCompiler.Reflection.ReadyToRun.DisassemblingGenericContext,System.Int32)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
      - ["ILCompiler.Reflection.ReadyToRun", "EHClause", False, "WriteTo", "(System.IO.TextWriter,System.Int32,System.Boolean)", "", "Argument[this]", "Argument[0]", "taint", "df-generated"]
      - ["ILCompiler.Reflection.ReadyToRun", "EHInfo", False, "EHInfo", "(ILCompiler.Reflection.ReadyToRun.ReadyToRunReader,System.Int32,System.Int32,System.Int32,System.Int32)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
      - ["ILCompiler.Reflection.ReadyToRun", "EHInfo", False, "WriteTo", "(System.IO.TextWriter,System.Boolean)", "", "Argument[this]", "Argument[0]", "taint", "df-generated"]
      - ["ILCompiler.Reflection.ReadyToRun", "EHInfo", False, "get_EHClauses", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["ILCompiler.Reflection.ReadyToRun", "FixupCell", False, "FixupCell", "(System.Int32,System.UInt32,System.UInt32,ILCompiler.Reflection.ReadyToRun.ReadyToRunSignature)", "", "Argument[3]", "Argument[this]", "taint", "df-generated"]
      - ["ILCompiler.Reflection.ReadyToRun", "GCRefMap", False, "GCRefMap", "(System.UInt32,ILCompiler.Reflection.ReadyToRun.GCRefMapEntry[])", "", "Argument[1].Element", "Argument[this]", "taint", "df-generated"]
      - ["ILCompiler.Reflection.ReadyToRun", "GCRefMapDecoder", False, "GCRefMapDecoder", "(ILCompiler.Reflection.ReadyToRun.ReadyToRunReader,System.Int32)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
      - ["ILCompiler.Reflection.ReadyToRun", "IAssemblyMetadata", True, "get_ImageReader", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
@@ -29,29 +34,51 @@ extensions:
      - ["ILCompiler.Reflection.ReadyToRun", "NativeHashtable", False, "NativeHashtable", "(System.Byte[],ILCompiler.Reflection.ReadyToRun.NativeParser,System.UInt32)", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
      - ["ILCompiler.Reflection.ReadyToRun", "NativeParser", False, "GetParserFromRelativeOffset", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
      - ["ILCompiler.Reflection.ReadyToRun", "NativeParser", False, "NativeParser", "(System.Byte[],System.UInt32,System.Byte)", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
+      - ["ILCompiler.Reflection.ReadyToRun", "PgoInfo", False, "PgoInfo", "(ILCompiler.Reflection.ReadyToRun.PgoInfoKey,ILCompiler.Reflection.ReadyToRun.ReadyToRunReader,System.Int32,System.Byte[],System.Int32)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
      - ["ILCompiler.Reflection.ReadyToRun", "PgoInfo", False, "PgoInfo", "(ILCompiler.Reflection.ReadyToRun.PgoInfoKey,ILCompiler.Reflection.ReadyToRun.ReadyToRunReader,System.Int32,System.Byte[],System.Int32)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["ILCompiler.Reflection.ReadyToRun", "PgoInfo", False, "PgoInfo", "(ILCompiler.Reflection.ReadyToRun.PgoInfoKey,ILCompiler.Reflection.ReadyToRun.ReadyToRunReader,System.Int32,System.Byte[],System.Int32)", "", "Argument[3].Element", "Argument[this]", "taint", "df-generated"]
      - ["ILCompiler.Reflection.ReadyToRun", "PgoInfo", False, "ToString", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
      - ["ILCompiler.Reflection.ReadyToRun", "PgoInfo", False, "get_PgoData", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["ILCompiler.Reflection.ReadyToRun", "PgoInfoKey", False, "FromReadyToRunMethod", "(ILCompiler.Reflection.ReadyToRun.ReadyToRunMethod)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["ILCompiler.Reflection.ReadyToRun", "PgoInfoKey", False, "PgoInfoKey", "(ILCompiler.Reflection.ReadyToRun.IAssemblyMetadata,System.String,System.Reflection.Metadata.EntityHandle,System.String[])", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["ILCompiler.Reflection.ReadyToRun", "PgoInfoKey", False, "PgoInfoKey", "(ILCompiler.Reflection.ReadyToRun.IAssemblyMetadata,System.String,System.Reflection.Metadata.EntityHandle,System.String[])", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["ILCompiler.Reflection.ReadyToRun", "PgoInfoKey", False, "PgoInfoKey", "(ILCompiler.Reflection.ReadyToRun.IAssemblyMetadata,System.String,System.Reflection.Metadata.EntityHandle,System.String[])", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
+      - ["ILCompiler.Reflection.ReadyToRun", "PgoInfoKey", False, "PgoInfoKey", "(ILCompiler.Reflection.ReadyToRun.IAssemblyMetadata,System.String,System.Reflection.Metadata.EntityHandle,System.String[])", "", "Argument[3].Element", "Argument[this]", "taint", "df-generated"]
+      - ["ILCompiler.Reflection.ReadyToRun", "PgoInfoKey", False, "ToString", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
      - ["ILCompiler.Reflection.ReadyToRun", "R2RSignatureDecoder<TType,TMethod,TGenericContext>", False, "R2RSignatureDecoder", "(ILCompiler.Reflection.ReadyToRun.IR2RSignatureTypeProvider<TType,TMethod,TGenericContext>,TGenericContext,System.Reflection.Metadata.MetadataReader,ILCompiler.Reflection.ReadyToRun.ReadyToRunReader,System.Int32,System.Boolean)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["ILCompiler.Reflection.ReadyToRun", "R2RSignatureDecoder<TType,TMethod,TGenericContext>", False, "R2RSignatureDecoder", "(ILCompiler.Reflection.ReadyToRun.IR2RSignatureTypeProvider<TType,TMethod,TGenericContext>,TGenericContext,System.Reflection.Metadata.MetadataReader,ILCompiler.Reflection.ReadyToRun.ReadyToRunReader,System.Int32,System.Boolean)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
      - ["ILCompiler.Reflection.ReadyToRun", "R2RSignatureDecoder<TType,TMethod,TGenericContext>", False, "R2RSignatureDecoder", "(ILCompiler.Reflection.ReadyToRun.IR2RSignatureTypeProvider<TType,TMethod,TGenericContext>,TGenericContext,System.Reflection.Metadata.MetadataReader,ILCompiler.Reflection.ReadyToRun.ReadyToRunReader,System.Int32,System.Boolean)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
      - ["ILCompiler.Reflection.ReadyToRun", "R2RSignatureDecoder<TType,TMethod,TGenericContext>", False, "R2RSignatureDecoder", "(ILCompiler.Reflection.ReadyToRun.IR2RSignatureTypeProvider<TType,TMethod,TGenericContext>,TGenericContext,System.Reflection.Metadata.MetadataReader,ILCompiler.Reflection.ReadyToRun.ReadyToRunReader,System.Int32,System.Boolean)", "", "Argument[3]", "Argument[this]", "taint", "df-generated"]
      - ["ILCompiler.Reflection.ReadyToRun", "R2RSignatureDecoder<TType,TMethod,TGenericContext>", False, "R2RSignatureDecoder", "(ILCompiler.Reflection.ReadyToRun.IR2RSignatureTypeProvider<TType,TMethod,TGenericContext>,TGenericContext,System.Reflection.Metadata.MetadataReader,System.Byte[],System.Int32,System.Reflection.Metadata.MetadataReader,ILCompiler.Reflection.ReadyToRun.ReadyToRunReader,System.Boolean)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["ILCompiler.Reflection.ReadyToRun", "R2RSignatureDecoder<TType,TMethod,TGenericContext>", False, "R2RSignatureDecoder", "(ILCompiler.Reflection.ReadyToRun.IR2RSignatureTypeProvider<TType,TMethod,TGenericContext>,TGenericContext,System.Reflection.Metadata.MetadataReader,System.Byte[],System.Int32,System.Reflection.Metadata.MetadataReader,ILCompiler.Reflection.ReadyToRun.ReadyToRunReader,System.Boolean)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
      - ["ILCompiler.Reflection.ReadyToRun", "R2RSignatureDecoder<TType,TMethod,TGenericContext>", False, "R2RSignatureDecoder", "(ILCompiler.Reflection.ReadyToRun.IR2RSignatureTypeProvider<TType,TMethod,TGenericContext>,TGenericContext,System.Reflection.Metadata.MetadataReader,System.Byte[],System.Int32,System.Reflection.Metadata.MetadataReader,ILCompiler.Reflection.ReadyToRun.ReadyToRunReader,System.Boolean)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
      - ["ILCompiler.Reflection.ReadyToRun", "R2RSignatureDecoder<TType,TMethod,TGenericContext>", False, "R2RSignatureDecoder", "(ILCompiler.Reflection.ReadyToRun.IR2RSignatureTypeProvider<TType,TMethod,TGenericContext>,TGenericContext,System.Reflection.Metadata.MetadataReader,System.Byte[],System.Int32,System.Reflection.Metadata.MetadataReader,ILCompiler.Reflection.ReadyToRun.ReadyToRunReader,System.Boolean)", "", "Argument[3].Element", "Argument[this]", "taint", "df-generated"]
      - ["ILCompiler.Reflection.ReadyToRun", "R2RSignatureDecoder<TType,TMethod,TGenericContext>", False, "R2RSignatureDecoder", "(ILCompiler.Reflection.ReadyToRun.IR2RSignatureTypeProvider<TType,TMethod,TGenericContext>,TGenericContext,System.Reflection.Metadata.MetadataReader,System.Byte[],System.Int32,System.Reflection.Metadata.MetadataReader,ILCompiler.Reflection.ReadyToRun.ReadyToRunReader,System.Boolean)", "", "Argument[5]", "Argument[this]", "taint", "df-generated"]
      - ["ILCompiler.Reflection.ReadyToRun", "R2RSignatureDecoder<TType,TMethod,TGenericContext>", False, "R2RSignatureDecoder", "(ILCompiler.Reflection.ReadyToRun.IR2RSignatureTypeProvider<TType,TMethod,TGenericContext>,TGenericContext,System.Reflection.Metadata.MetadataReader,System.Byte[],System.Int32,System.Reflection.Metadata.MetadataReader,ILCompiler.Reflection.ReadyToRun.ReadyToRunReader,System.Boolean)", "", "Argument[6]", "Argument[this]", "taint", "df-generated"]
      - ["ILCompiler.Reflection.ReadyToRun", "ReadyToRunAssembly", False, "get_AvailableTypes", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
      - ["ILCompiler.Reflection.ReadyToRun", "ReadyToRunAssembly", False, "get_Methods", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["ILCompiler.Reflection.ReadyToRun", "ReadyToRunHeader", False, "ToString", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["ILCompiler.Reflection.ReadyToRun", "ReadyToRunImportSection+ImportSectionEntry", False, "ImportSectionEntry", "(System.Int32,System.Int32,System.Int32,System.Int64,System.UInt32,ILCompiler.Reflection.ReadyToRun.ReadyToRunSignature)", "", "Argument[5]", "Argument[this]", "taint", "df-generated"]
+      - ["ILCompiler.Reflection.ReadyToRun", "ReadyToRunImportSection", False, "ReadyToRunImportSection", "(System.Int32,ILCompiler.Reflection.ReadyToRun.ReadyToRunReader,System.Int32,System.Int32,Internal.ReadyToRunConstants.ReadyToRunImportSectionFlags,Internal.ReadyToRunConstants.ReadyToRunImportSectionType,System.Byte,System.Int32,System.Collections.Generic.List<ILCompiler.Reflection.ReadyToRun.ReadyToRunImportSection+ImportSectionEntry>,System.Int32,System.Int32,System.Reflection.PortableExecutable.Machine,System.UInt16)", "", "Argument[8].Element", "Argument[this]", "taint", "df-generated"]
      - ["ILCompiler.Reflection.ReadyToRun", "ReadyToRunMethod", False, "ReadyToRunMethod", "(ILCompiler.Reflection.ReadyToRun.ReadyToRunReader,ILCompiler.Reflection.ReadyToRun.IAssemblyMetadata,System.Reflection.Metadata.EntityHandle,System.Int32,System.String,System.String,System.String[],System.Nullable<System.Int32>)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["ILCompiler.Reflection.ReadyToRun", "ReadyToRunMethod", False, "ReadyToRunMethod", "(ILCompiler.Reflection.ReadyToRun.ReadyToRunReader,ILCompiler.Reflection.ReadyToRun.IAssemblyMetadata,System.Reflection.Metadata.EntityHandle,System.Int32,System.String,System.String,System.String[],System.Nullable<System.Int32>)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["ILCompiler.Reflection.ReadyToRun", "ReadyToRunMethod", False, "ReadyToRunMethod", "(ILCompiler.Reflection.ReadyToRun.ReadyToRunReader,ILCompiler.Reflection.ReadyToRun.IAssemblyMetadata,System.Reflection.Metadata.EntityHandle,System.Int32,System.String,System.String,System.String[],System.Nullable<System.Int32>)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
+      - ["ILCompiler.Reflection.ReadyToRun", "ReadyToRunMethod", False, "ReadyToRunMethod", "(ILCompiler.Reflection.ReadyToRun.ReadyToRunReader,ILCompiler.Reflection.ReadyToRun.IAssemblyMetadata,System.Reflection.Metadata.EntityHandle,System.Int32,System.String,System.String,System.String[],System.Nullable<System.Int32>)", "", "Argument[4]", "Argument[this]", "taint", "df-generated"]
+      - ["ILCompiler.Reflection.ReadyToRun", "ReadyToRunMethod", False, "ReadyToRunMethod", "(ILCompiler.Reflection.ReadyToRun.ReadyToRunReader,ILCompiler.Reflection.ReadyToRun.IAssemblyMetadata,System.Reflection.Metadata.EntityHandle,System.Int32,System.String,System.String,System.String[],System.Nullable<System.Int32>)", "", "Argument[6].Element", "Argument[this]", "taint", "df-generated"]
      - ["ILCompiler.Reflection.ReadyToRun", "ReadyToRunMethod", False, "ReadyToRunMethod", "(ILCompiler.Reflection.ReadyToRun.ReadyToRunReader,ILCompiler.Reflection.ReadyToRun.IAssemblyMetadata,System.Reflection.Metadata.EntityHandle,System.Int32,System.String,System.String,System.String[],System.Nullable<System.Int32>)", "", "Argument[7]", "Argument[this]", "taint", "df-generated"]
      - ["ILCompiler.Reflection.ReadyToRun", "ReadyToRunMethod", False, "get_Fixups", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
      - ["ILCompiler.Reflection.ReadyToRun", "ReadyToRunMethod", False, "get_GcInfo", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
      - ["ILCompiler.Reflection.ReadyToRun", "ReadyToRunMethod", False, "get_PgoInfo", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
      - ["ILCompiler.Reflection.ReadyToRun", "ReadyToRunMethod", False, "get_RuntimeFunctions", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["ILCompiler.Reflection.ReadyToRun", "ReadyToRunReader", False, "GetCustomMethodToRuntimeFunctionMapping<TType,TMethod,TGenericContext>", "(ILCompiler.Reflection.ReadyToRun.IR2RSignatureTypeProvider<TType,TMethod,TGenericContext>)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
      - ["ILCompiler.Reflection.ReadyToRun", "ReadyToRunReader", False, "GetGlobalMetadata", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
      - ["ILCompiler.Reflection.ReadyToRun", "ReadyToRunReader", False, "ReadyToRunReader", "(ILCompiler.Reflection.ReadyToRun.IAssemblyResolver,ILCompiler.Reflection.ReadyToRun.IAssemblyMetadata,System.Reflection.PortableExecutable.PEReader,System.String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
      - ["ILCompiler.Reflection.ReadyToRun", "ReadyToRunReader", False, "ReadyToRunReader", "(ILCompiler.Reflection.ReadyToRun.IAssemblyResolver,ILCompiler.Reflection.ReadyToRun.IAssemblyMetadata,System.Reflection.PortableExecutable.PEReader,System.String)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["ILCompiler.Reflection.ReadyToRun", "ReadyToRunReader", False, "ReadyToRunReader", "(ILCompiler.Reflection.ReadyToRun.IAssemblyResolver,ILCompiler.Reflection.ReadyToRun.IAssemblyMetadata,System.Reflection.PortableExecutable.PEReader,System.String)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
+      - ["ILCompiler.Reflection.ReadyToRun", "ReadyToRunReader", False, "ReadyToRunReader", "(ILCompiler.Reflection.ReadyToRun.IAssemblyResolver,ILCompiler.Reflection.ReadyToRun.IAssemblyMetadata,System.Reflection.PortableExecutable.PEReader,System.String)", "", "Argument[3]", "Argument[this]", "taint", "df-generated"]
      - ["ILCompiler.Reflection.ReadyToRun", "ReadyToRunReader", False, "ReadyToRunReader", "(ILCompiler.Reflection.ReadyToRun.IAssemblyResolver,System.String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["ILCompiler.Reflection.ReadyToRun", "ReadyToRunReader", False, "ReadyToRunReader", "(ILCompiler.Reflection.ReadyToRun.IAssemblyResolver,System.String)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["ILCompiler.Reflection.ReadyToRun", "ReadyToRunReader", False, "get_AllPgoInfos", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
      - ["ILCompiler.Reflection.ReadyToRun", "ReadyToRunReader", False, "get_CompilerIdentifier", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
      - ["ILCompiler.Reflection.ReadyToRun", "ReadyToRunReader", False, "get_ImportSections", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
      - ["ILCompiler.Reflection.ReadyToRun", "ReadyToRunReader", False, "get_ImportSignatures", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
@@ -64,6 +91,8 @@ extensions:
      - ["ILCompiler.Reflection.ReadyToRun", "ReadyToRunReader", False, "get_ReadyToRunHeader", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
      - ["ILCompiler.Reflection.ReadyToRun", "ReadyToRunSignature", False, "ReadyToRunSignature", "(ILCompiler.Reflection.ReadyToRun.SignatureDecoder,Internal.ReadyToRunConstants.ReadyToRunFixupKind)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
      - ["ILCompiler.Reflection.ReadyToRun", "RuntimeFunction", False, "RuntimeFunction", "(ILCompiler.Reflection.ReadyToRun.ReadyToRunReader,System.Int32,System.Int32,System.Int32,System.Int32,System.Int32,ILCompiler.Reflection.ReadyToRun.ReadyToRunMethod,ILCompiler.Reflection.ReadyToRun.BaseUnwindInfo)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["ILCompiler.Reflection.ReadyToRun", "RuntimeFunction", False, "RuntimeFunction", "(ILCompiler.Reflection.ReadyToRun.ReadyToRunReader,System.Int32,System.Int32,System.Int32,System.Int32,System.Int32,ILCompiler.Reflection.ReadyToRun.ReadyToRunMethod,ILCompiler.Reflection.ReadyToRun.BaseUnwindInfo)", "", "Argument[6]", "Argument[this]", "taint", "df-generated"]
+      - ["ILCompiler.Reflection.ReadyToRun", "RuntimeFunction", False, "RuntimeFunction", "(ILCompiler.Reflection.ReadyToRun.ReadyToRunReader,System.Int32,System.Int32,System.Int32,System.Int32,System.Int32,ILCompiler.Reflection.ReadyToRun.ReadyToRunMethod,ILCompiler.Reflection.ReadyToRun.BaseUnwindInfo)", "", "Argument[7]", "Argument[this]", "taint", "df-generated"]
      - ["ILCompiler.Reflection.ReadyToRun", "RuntimeFunction", False, "get_DebugInfo", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
      - ["ILCompiler.Reflection.ReadyToRun", "RuntimeFunction", False, "get_EHInfo", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
      - ["ILCompiler.Reflection.ReadyToRun", "SignatureDecoder", False, "GetMetadataReaderFromModuleOverride", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
@@ -71,6 +100,7 @@ extensions:
      - ["ILCompiler.Reflection.ReadyToRun", "StringBuilderExtensions", False, "AppendEscapedString", "(System.Text.StringBuilder,System.String,System.Boolean)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
      - ["ILCompiler.Reflection.ReadyToRun", "StringTypeProviderBase<TGenericContext>", True, "GetArrayType", "(System.String,System.Reflection.Metadata.ArrayShape)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
      - ["ILCompiler.Reflection.ReadyToRun", "StringTypeProviderBase<TGenericContext>", True, "GetByReferenceType", "(System.String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["ILCompiler.Reflection.ReadyToRun", "StringTypeProviderBase<TGenericContext>", True, "GetFunctionPointerType", "(System.Reflection.Metadata.MethodSignature<System.String>)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
      - ["ILCompiler.Reflection.ReadyToRun", "StringTypeProviderBase<TGenericContext>", True, "GetGenericInstantiation", "(System.String,System.Collections.Immutable.ImmutableArray<System.String>)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
      - ["ILCompiler.Reflection.ReadyToRun", "StringTypeProviderBase<TGenericContext>", True, "GetGenericInstantiation", "(System.String,System.Collections.Immutable.ImmutableArray<System.String>)", "", "Argument[1].Element", "ReturnValue", "taint", "df-generated"]
      - ["ILCompiler.Reflection.ReadyToRun", "StringTypeProviderBase<TGenericContext>", True, "GetModifiedType", "(System.String,System.String,System.Boolean)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
@@ -78,6 +108,8 @@ extensions:
      - ["ILCompiler.Reflection.ReadyToRun", "StringTypeProviderBase<TGenericContext>", True, "GetPinnedType", "(System.String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
      - ["ILCompiler.Reflection.ReadyToRun", "StringTypeProviderBase<TGenericContext>", True, "GetPointerType", "(System.String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
      - ["ILCompiler.Reflection.ReadyToRun", "StringTypeProviderBase<TGenericContext>", True, "GetSZArrayType", "(System.String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["ILCompiler.Reflection.ReadyToRun", "TextSignatureDecoderContext", False, "TextSignatureDecoderContext", "(ILCompiler.Reflection.ReadyToRun.IAssemblyResolver,ILCompiler.Reflection.ReadyToRun.SignatureFormattingOptions)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["ILCompiler.Reflection.ReadyToRun", "TextSignatureDecoderContext", False, "TextSignatureDecoderContext", "(ILCompiler.Reflection.ReadyToRun.IAssemblyResolver,ILCompiler.Reflection.ReadyToRun.SignatureFormattingOptions)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
  - addsTo:
      pack: codeql/csharp-all
      extensible: neutralModel
@@ -87,16 +119,12 @@ extensions:
      - ["ILCompiler.Reflection.ReadyToRun", "ComponentAssembly", "ComponentAssembly", "(System.Byte[],System.Int32)", "summary", "df-generated"]
      - ["ILCompiler.Reflection.ReadyToRun", "DebugInfo", "GetPlatformSpecificRegister", "(System.Reflection.PortableExecutable.Machine,System.Int32)", "summary", "df-generated"]
      - ["ILCompiler.Reflection.ReadyToRun", "DebugInfo", "get_Machine", "()", "summary", "df-generated"]
-      - ["ILCompiler.Reflection.ReadyToRun", "DisassemblingGenericContext", "DisassemblingGenericContext", "(System.String[],System.String[])", "summary", "df-generated"]
      - ["ILCompiler.Reflection.ReadyToRun", "DisassemblingGenericContext", "get_MethodParameters", "()", "summary", "df-generated"]
      - ["ILCompiler.Reflection.ReadyToRun", "DisassemblingGenericContext", "get_TypeParameters", "()", "summary", "df-generated"]
-      - ["ILCompiler.Reflection.ReadyToRun", "DisassemblingTypeProvider", "GetGenericMethodParameter", "(ILCompiler.Reflection.ReadyToRun.DisassemblingGenericContext,System.Int32)", "summary", "df-generated"]
-      - ["ILCompiler.Reflection.ReadyToRun", "DisassemblingTypeProvider", "GetGenericTypeParameter", "(ILCompiler.Reflection.ReadyToRun.DisassemblingGenericContext,System.Int32)", "summary", "df-generated"]
      - ["ILCompiler.Reflection.ReadyToRun", "DisassemblingTypeProvider", "GetTypeFromHandle", "(System.Reflection.Metadata.MetadataReader,ILCompiler.Reflection.ReadyToRun.DisassemblingGenericContext,System.Reflection.Metadata.EntityHandle)", "summary", "df-generated"]
      - ["ILCompiler.Reflection.ReadyToRun", "DisassemblingTypeProvider", "GetTypeFromSpecification", "(System.Reflection.Metadata.MetadataReader,ILCompiler.Reflection.ReadyToRun.DisassemblingGenericContext,System.Reflection.Metadata.TypeSpecificationHandle,System.Byte)", "summary", "df-generated"]
      - ["ILCompiler.Reflection.ReadyToRun", "EHClause", "EHClause", "(ILCompiler.Reflection.ReadyToRun.ReadyToRunReader,System.Int32)", "summary", "df-generated"]
      - ["ILCompiler.Reflection.ReadyToRun", "EHInfo", "get_RelativeVirtualAddress", "()", "summary", "df-generated"]
-      - ["ILCompiler.Reflection.ReadyToRun", "FixupCell", "FixupCell", "(System.Int32,System.UInt32,System.UInt32,ILCompiler.Reflection.ReadyToRun.ReadyToRunSignature)", "summary", "df-generated"]
      - ["ILCompiler.Reflection.ReadyToRun", "FixupCell", "get_CellOffset", "()", "summary", "df-generated"]
      - ["ILCompiler.Reflection.ReadyToRun", "FixupCell", "get_Index", "()", "summary", "df-generated"]
      - ["ILCompiler.Reflection.ReadyToRun", "FixupCell", "get_Signature", "()", "summary", "df-generated"]
@@ -167,10 +195,7 @@ extensions:
      - ["ILCompiler.Reflection.ReadyToRun", "PgoInfo", "get_Size", "()", "summary", "df-generated"]
      - ["ILCompiler.Reflection.ReadyToRun", "PgoInfoKey", "Equals", "(ILCompiler.Reflection.ReadyToRun.PgoInfoKey)", "summary", "df-generated"]
      - ["ILCompiler.Reflection.ReadyToRun", "PgoInfoKey", "Equals", "(System.Object)", "summary", "df-generated"]
-      - ["ILCompiler.Reflection.ReadyToRun", "PgoInfoKey", "FromReadyToRunMethod", "(ILCompiler.Reflection.ReadyToRun.ReadyToRunMethod)", "summary", "df-generated"]
      - ["ILCompiler.Reflection.ReadyToRun", "PgoInfoKey", "GetHashCode", "()", "summary", "df-generated"]
-      - ["ILCompiler.Reflection.ReadyToRun", "PgoInfoKey", "PgoInfoKey", "(ILCompiler.Reflection.ReadyToRun.IAssemblyMetadata,System.String,System.Reflection.Metadata.EntityHandle,System.String[])", "summary", "df-generated"]
-      - ["ILCompiler.Reflection.ReadyToRun", "PgoInfoKey", "ToString", "()", "summary", "df-generated"]
      - ["ILCompiler.Reflection.ReadyToRun", "PgoInfoKey", "get_ComponentReader", "()", "summary", "df-generated"]
      - ["ILCompiler.Reflection.ReadyToRun", "PgoInfoKey", "get_DeclaringType", "()", "summary", "df-generated"]
      - ["ILCompiler.Reflection.ReadyToRun", "PgoInfoKey", "get_MethodHandle", "()", "summary", "df-generated"]
@@ -193,9 +218,6 @@ extensions:
      - ["ILCompiler.Reflection.ReadyToRun", "ReadyToRunCoreHeader", "ParseCoreHeader", "(System.Byte[],System.Int32)", "summary", "df-generated"]
      - ["ILCompiler.Reflection.ReadyToRun", "ReadyToRunCoreHeader", "ReadyToRunCoreHeader", "(System.Byte[],System.Int32)", "summary", "df-generated"]
      - ["ILCompiler.Reflection.ReadyToRun", "ReadyToRunHeader", "ReadyToRunHeader", "(System.Byte[],System.Int32,System.Int32)", "summary", "df-generated"]
-      - ["ILCompiler.Reflection.ReadyToRun", "ReadyToRunHeader", "ToString", "()", "summary", "df-generated"]
-      - ["ILCompiler.Reflection.ReadyToRun", "ReadyToRunImportSection+ImportSectionEntry", "ImportSectionEntry", "(System.Int32,System.Int32,System.Int32,System.Int64,System.UInt32,ILCompiler.Reflection.ReadyToRun.ReadyToRunSignature)", "summary", "df-generated"]
-      - ["ILCompiler.Reflection.ReadyToRun", "ReadyToRunImportSection", "ReadyToRunImportSection", "(System.Int32,ILCompiler.Reflection.ReadyToRun.ReadyToRunReader,System.Int32,System.Int32,Internal.ReadyToRunConstants.ReadyToRunImportSectionFlags,Internal.ReadyToRunConstants.ReadyToRunImportSectionType,System.Byte,System.Int32,System.Collections.Generic.List<ILCompiler.Reflection.ReadyToRun.ReadyToRunImportSection+ImportSectionEntry>,System.Int32,System.Int32,System.Reflection.PortableExecutable.Machine,System.UInt16)", "summary", "df-generated"]
      - ["ILCompiler.Reflection.ReadyToRun", "ReadyToRunImportSection", "ToString", "()", "summary", "df-generated"]
      - ["ILCompiler.Reflection.ReadyToRun", "ReadyToRunImportSection", "WriteTo", "(System.IO.TextWriter)", "summary", "df-generated"]
      - ["ILCompiler.Reflection.ReadyToRun", "ReadyToRunMethod", "get_LocalSignature", "()", "summary", "df-generated"]
@@ -204,13 +226,11 @@ extensions:
      - ["ILCompiler.Reflection.ReadyToRun", "ReadyToRunReader", "CheckNonEmptyDebugInfo", "(ILCompiler.Reflection.ReadyToRun.RuntimeFunction)", "summary", "df-generated"]
      - ["ILCompiler.Reflection.ReadyToRun", "ReadyToRunReader", "GetAssemblyIndex", "(ILCompiler.Reflection.ReadyToRun.ReadyToRunSection)", "summary", "df-generated"]
      - ["ILCompiler.Reflection.ReadyToRun", "ReadyToRunReader", "GetAssemblyMvid", "(System.Int32)", "summary", "df-generated"]
-      - ["ILCompiler.Reflection.ReadyToRun", "ReadyToRunReader", "GetCustomMethodToRuntimeFunctionMapping<TType,TMethod,TGenericContext>", "(ILCompiler.Reflection.ReadyToRun.IR2RSignatureTypeProvider<TType,TMethod,TGenericContext>)", "summary", "df-generated"]
      - ["ILCompiler.Reflection.ReadyToRun", "ReadyToRunReader", "GetGlobalAssemblyName", "()", "summary", "df-generated"]
      - ["ILCompiler.Reflection.ReadyToRun", "ReadyToRunReader", "GetOffset", "(System.Int32)", "summary", "df-generated"]
      - ["ILCompiler.Reflection.ReadyToRun", "ReadyToRunReader", "GetPgoInfoByKey", "(ILCompiler.Reflection.ReadyToRun.PgoInfoKey)", "summary", "df-generated"]
      - ["ILCompiler.Reflection.ReadyToRun", "ReadyToRunReader", "IsReadyToRunImage", "(System.Reflection.PortableExecutable.PEReader)", "summary", "df-generated"]
      - ["ILCompiler.Reflection.ReadyToRun", "ReadyToRunReader", "ValidateRuntimeFunctions", "(System.Collections.Generic.List<ILCompiler.Reflection.ReadyToRun.RuntimeFunction>)", "summary", "df-generated"]
-      - ["ILCompiler.Reflection.ReadyToRun", "ReadyToRunReader", "get_AllPgoInfos", "()", "summary", "df-generated"]
      - ["ILCompiler.Reflection.ReadyToRun", "ReadyToRunReader", "get_ComponentAssemblyIndexOffset", "()", "summary", "df-generated"]
      - ["ILCompiler.Reflection.ReadyToRun", "ReadyToRunReader", "get_ComponentAssemblyIndicesStartAtTwo", "()", "summary", "df-generated"]
      - ["ILCompiler.Reflection.ReadyToRun", "ReadyToRunReader", "get_Composite", "()", "summary", "df-generated"]
@@ -233,14 +253,12 @@ extensions:
      - ["ILCompiler.Reflection.ReadyToRun", "SignatureDecoder", "ReadTypeSignatureNoEmit", "()", "summary", "df-generated"]
      - ["ILCompiler.Reflection.ReadyToRun", "SignatureDecoder", "SignatureDecoder", "(ILCompiler.Reflection.ReadyToRun.IAssemblyResolver,ILCompiler.Reflection.ReadyToRun.SignatureFormattingOptions,System.Reflection.Metadata.MetadataReader,ILCompiler.Reflection.ReadyToRun.ReadyToRunReader,System.Int32,System.Boolean)", "summary", "df-generated"]
      - ["ILCompiler.Reflection.ReadyToRun", "StringExtensions", "ToEscapedString", "(System.String,System.Boolean)", "summary", "df-generated"]
-      - ["ILCompiler.Reflection.ReadyToRun", "StringTypeProviderBase<TGenericContext>", "GetFunctionPointerType", "(System.Reflection.Metadata.MethodSignature<System.String>)", "summary", "df-generated"]
      - ["ILCompiler.Reflection.ReadyToRun", "StringTypeProviderBase<TGenericContext>", "GetGenericMethodParameter", "(TGenericContext,System.Int32)", "summary", "df-generated"]
      - ["ILCompiler.Reflection.ReadyToRun", "StringTypeProviderBase<TGenericContext>", "GetGenericTypeParameter", "(TGenericContext,System.Int32)", "summary", "df-generated"]
      - ["ILCompiler.Reflection.ReadyToRun", "StringTypeProviderBase<TGenericContext>", "GetPrimitiveType", "(System.Reflection.Metadata.PrimitiveTypeCode)", "summary", "df-generated"]
      - ["ILCompiler.Reflection.ReadyToRun", "StringTypeProviderBase<TGenericContext>", "GetTypeFromDefinition", "(System.Reflection.Metadata.MetadataReader,System.Reflection.Metadata.TypeDefinitionHandle,System.Byte)", "summary", "df-generated"]
      - ["ILCompiler.Reflection.ReadyToRun", "StringTypeProviderBase<TGenericContext>", "GetTypeFromReference", "(System.Reflection.Metadata.MetadataReader,System.Reflection.Metadata.TypeReferenceHandle,System.Byte)", "summary", "df-generated"]
      - ["ILCompiler.Reflection.ReadyToRun", "StringTypeProviderBase<TGenericContext>", "GetTypeFromSpecification", "(System.Reflection.Metadata.MetadataReader,TGenericContext,System.Reflection.Metadata.TypeSpecificationHandle,System.Byte)", "summary", "df-generated"]
-      - ["ILCompiler.Reflection.ReadyToRun", "TextSignatureDecoderContext", "TextSignatureDecoderContext", "(ILCompiler.Reflection.ReadyToRun.IAssemblyResolver,ILCompiler.Reflection.ReadyToRun.SignatureFormattingOptions)", "summary", "df-generated"]
      - ["ILCompiler.Reflection.ReadyToRun", "TextSignatureDecoderContext", "get_AssemblyResolver", "()", "summary", "df-generated"]
      - ["ILCompiler.Reflection.ReadyToRun", "TodoSignature", "TodoSignature", "(ILCompiler.Reflection.ReadyToRun.SignatureDecoder,Internal.ReadyToRunConstants.ReadyToRunFixupKind)", "summary", "df-generated"]
      - ["ILCompiler.Reflection.ReadyToRun", "TransitionBlock", "FromReader", "(ILCompiler.Reflection.ReadyToRun.ReadyToRunReader)", "summary", "df-generated"]
--- a/csharp/ql/lib/ext/generated/ILCompiler.Reflection.ReadyToRun.x86.model.yml
+++ b/csharp/ql/lib/ext/generated/ILCompiler.Reflection.ReadyToRun.x86.model.yml
@@ -1,5 +1,14 @@
 # THIS FILE IS AN AUTO-GENERATED MODELS AS DATA FILE. DO NOT EDIT.
 extensions:
+  - addsTo:
+      pack: codeql/csharp-all
+      extensible: summaryModel
+    data:
+      - ["ILCompiler.Reflection.ReadyToRun.x86", "GcInfo", False, "ToString", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["ILCompiler.Reflection.ReadyToRun.x86", "GcSlotTable+GcSlot", False, "GcSlot", "(System.Int32,System.String,System.Int32,System.Int32,ILCompiler.Reflection.ReadyToRun.GcSlotFlags)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["ILCompiler.Reflection.ReadyToRun.x86", "GcSlotTable+GcSlot", False, "GcSlot", "(System.Int32,System.String,System.Int32,System.Int32,System.Int32,System.Int32,ILCompiler.Reflection.ReadyToRun.GcSlotFlags)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["ILCompiler.Reflection.ReadyToRun.x86", "GcSlotTable+GcSlot", False, "ToString", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["ILCompiler.Reflection.ReadyToRun.x86", "GcSlotTable", False, "ToString", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
  - addsTo:
      pack: codeql/csharp-all
      extensible: neutralModel
@@ -8,12 +17,7 @@ extensions:
      - ["ILCompiler.Reflection.ReadyToRun.x86", "CalleeSavedRegister", "ToString", "()", "summary", "df-generated"]
      - ["ILCompiler.Reflection.ReadyToRun.x86", "GcInfo", "GcInfo", "(System.Byte[],System.Int32,System.Reflection.PortableExecutable.Machine,System.UInt16)", "summary", "df-generated"]
      - ["ILCompiler.Reflection.ReadyToRun.x86", "GcInfo", "GetRegisterName", "(System.Int32)", "summary", "df-generated"]
-      - ["ILCompiler.Reflection.ReadyToRun.x86", "GcInfo", "ToString", "()", "summary", "df-generated"]
-      - ["ILCompiler.Reflection.ReadyToRun.x86", "GcSlotTable+GcSlot", "GcSlot", "(System.Int32,System.String,System.Int32,System.Int32,ILCompiler.Reflection.ReadyToRun.GcSlotFlags)", "summary", "df-generated"]
-      - ["ILCompiler.Reflection.ReadyToRun.x86", "GcSlotTable+GcSlot", "GcSlot", "(System.Int32,System.String,System.Int32,System.Int32,System.Int32,System.Int32,ILCompiler.Reflection.ReadyToRun.GcSlotFlags)", "summary", "df-generated"]
-      - ["ILCompiler.Reflection.ReadyToRun.x86", "GcSlotTable+GcSlot", "ToString", "()", "summary", "df-generated"]
      - ["ILCompiler.Reflection.ReadyToRun.x86", "GcSlotTable", "GcSlotTable", "(System.Byte[],ILCompiler.Reflection.ReadyToRun.x86.InfoHdrSmall,System.Int32)", "summary", "df-generated"]
-      - ["ILCompiler.Reflection.ReadyToRun.x86", "GcSlotTable", "ToString", "()", "summary", "df-generated"]
      - ["ILCompiler.Reflection.ReadyToRun.x86", "GcTransitionCall+CallRegister", "CallRegister", "(ILCompiler.Reflection.ReadyToRun.x86.Registers,System.Boolean)", "summary", "df-generated"]
      - ["ILCompiler.Reflection.ReadyToRun.x86", "GcTransitionCall+PtrArg", "PtrArg", "(System.UInt32,System.UInt32)", "summary", "df-generated"]
      - ["ILCompiler.Reflection.ReadyToRun.x86", "GcTransitionCall", "GcTransitionCall", "(System.Int32)", "summary", "df-generated"]
--- a/csharp/ql/lib/ext/generated/ILCompiler.model.yml
+++ b/csharp/ql/lib/ext/generated/ILCompiler.model.yml
@@ -7,18 +7,17 @@ extensions:
      - ["ILCompiler", "MethodProfileData", False, "MethodProfileData", "(Internal.TypeSystem.MethodDesc,ILCompiler.MethodProfilingDataFlags,System.Double,System.Collections.Generic.Dictionary<Internal.TypeSystem.MethodDesc,System.Int32>,System.UInt32,Internal.Pgo.PgoSchemaElem[])", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
      - ["ILCompiler", "MethodProfileData", False, "MethodProfileData", "(Internal.TypeSystem.MethodDesc,ILCompiler.MethodProfilingDataFlags,System.Double,System.Collections.Generic.Dictionary<Internal.TypeSystem.MethodDesc,System.Int32>,System.UInt32,Internal.Pgo.PgoSchemaElem[])", "", "Argument[3].Element", "Argument[this]", "taint", "df-generated"]
      - ["ILCompiler", "MethodProfileData", False, "MethodProfileData", "(Internal.TypeSystem.MethodDesc,ILCompiler.MethodProfilingDataFlags,System.Double,System.Collections.Generic.Dictionary<Internal.TypeSystem.MethodDesc,System.Int32>,System.UInt32,Internal.Pgo.PgoSchemaElem[])", "", "Argument[5].Element", "Argument[this]", "taint", "df-generated"]
+      - ["ILCompiler", "ProfileData", False, "MergeProfileData", "(System.Collections.Generic.Dictionary<Internal.TypeSystem.MethodDesc,ILCompiler.MethodProfileData>,ILCompiler.ProfileData)", "", "Argument[1]", "Argument[0].Element", "taint", "df-generated"]
+      - ["ILCompiler", "ProfileData", True, "GetAllMethodProfileData", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
      - ["ILCompiler", "ProfileData", True, "get_Config", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
  - addsTo:
      pack: codeql/csharp-all
      extensible: neutralModel
    data:
-      - ["ILCompiler", "EmptyProfileData", "GetAllMethodProfileData", "()", "summary", "df-generated"]
      - ["ILCompiler", "EmptyProfileData", "GetMethodBlockCount", "(Internal.TypeSystem.MethodDesc)", "summary", "df-generated"]
      - ["ILCompiler", "EmptyProfileData", "GetMethodProfileData", "(Internal.TypeSystem.MethodDesc)", "summary", "df-generated"]
      - ["ILCompiler", "EmptyProfileData", "get_PartialNGen", "()", "summary", "df-generated"]
      - ["ILCompiler", "EmptyProfileData", "get_Singleton", "()", "summary", "df-generated"]
-      - ["ILCompiler", "ProfileData", "GetAllMethodProfileData", "()", "summary", "df-generated"]
      - ["ILCompiler", "ProfileData", "GetMethodBlockCount", "(Internal.TypeSystem.MethodDesc)", "summary", "df-generated"]
      - ["ILCompiler", "ProfileData", "GetMethodProfileData", "(Internal.TypeSystem.MethodDesc)", "summary", "df-generated"]
-      - ["ILCompiler", "ProfileData", "MergeProfileData", "(System.Collections.Generic.Dictionary<Internal.TypeSystem.MethodDesc,ILCompiler.MethodProfileData>,ILCompiler.ProfileData)", "summary", "df-generated"]
      - ["ILCompiler", "ProfileData", "get_PartialNGen", "()", "summary", "df-generated"]
--- a/csharp/ql/lib/ext/generated/ILLink.RoslynAnalyzer.DataFlow.model.yml
+++ b/csharp/ql/lib/ext/generated/ILLink.RoslynAnalyzer.DataFlow.model.yml
@@ -38,6 +38,40 @@ extensions:
      - ["ILLink.RoslynAnalyzer.DataFlow", "LocalDataFlowVisitor<TValue,TContext,TValueLattice,TContextLattice,TConditionValue>", False, "LocalDataFlowVisitor", "(Microsoft.CodeAnalysis.Compilation,ILLink.RoslynAnalyzer.DataFlow.LocalStateAndContextLattice<TValue,TContext,TValueLattice,TContextLattice>,Microsoft.CodeAnalysis.ISymbol,Microsoft.CodeAnalysis.FlowAnalysis.ControlFlowGraph,System.Collections.Immutable.ImmutableDictionary<Microsoft.CodeAnalysis.FlowAnalysis.CaptureId,ILLink.RoslynAnalyzer.DataFlow.FlowCaptureKind>,ILLink.RoslynAnalyzer.DataFlow.InterproceduralState<TValue,TValueLattice>)", "", "Argument[3]", "Argument[this]", "taint", "df-generated"]
      - ["ILLink.RoslynAnalyzer.DataFlow", "LocalDataFlowVisitor<TValue,TContext,TValueLattice,TContextLattice,TConditionValue>", False, "LocalDataFlowVisitor", "(Microsoft.CodeAnalysis.Compilation,ILLink.RoslynAnalyzer.DataFlow.LocalStateAndContextLattice<TValue,TContext,TValueLattice,TContextLattice>,Microsoft.CodeAnalysis.ISymbol,Microsoft.CodeAnalysis.FlowAnalysis.ControlFlowGraph,System.Collections.Immutable.ImmutableDictionary<Microsoft.CodeAnalysis.FlowAnalysis.CaptureId,ILLink.RoslynAnalyzer.DataFlow.FlowCaptureKind>,ILLink.RoslynAnalyzer.DataFlow.InterproceduralState<TValue,TValueLattice>)", "", "Argument[4].Element", "Argument[this]", "taint", "df-generated"]
      - ["ILLink.RoslynAnalyzer.DataFlow", "LocalDataFlowVisitor<TValue,TContext,TValueLattice,TContextLattice,TConditionValue>", False, "LocalDataFlowVisitor", "(Microsoft.CodeAnalysis.Compilation,ILLink.RoslynAnalyzer.DataFlow.LocalStateAndContextLattice<TValue,TContext,TValueLattice,TContextLattice>,Microsoft.CodeAnalysis.ISymbol,Microsoft.CodeAnalysis.FlowAnalysis.ControlFlowGraph,System.Collections.Immutable.ImmutableDictionary<Microsoft.CodeAnalysis.FlowAnalysis.CaptureId,ILLink.RoslynAnalyzer.DataFlow.FlowCaptureKind>,ILLink.RoslynAnalyzer.DataFlow.InterproceduralState<TValue,TValueLattice>)", "", "Argument[5]", "Argument[this]", "taint", "df-generated"]
+      - ["ILLink.RoslynAnalyzer.DataFlow", "LocalDataFlowVisitor<TValue,TContext,TValueLattice,TContextLattice,TConditionValue>", True, "VisitArrayElementReference", "(Microsoft.CodeAnalysis.Operations.IArrayElementReferenceOperation,ILLink.RoslynAnalyzer.DataFlow.LocalDataFlowState<TValue,TContext,TValueLattice,TContextLattice>)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["ILLink.RoslynAnalyzer.DataFlow", "LocalDataFlowVisitor<TValue,TContext,TValueLattice,TContextLattice,TConditionValue>", True, "VisitCompoundAssignment", "(Microsoft.CodeAnalysis.Operations.ICompoundAssignmentOperation,ILLink.RoslynAnalyzer.DataFlow.LocalDataFlowState<TValue,TContext,TValueLattice,TContextLattice>)", "", "Argument[this]", "Argument[1]", "taint", "df-generated"]
+      - ["ILLink.RoslynAnalyzer.DataFlow", "LocalDataFlowVisitor<TValue,TContext,TValueLattice,TContextLattice,TConditionValue>", True, "VisitCompoundAssignment", "(Microsoft.CodeAnalysis.Operations.ICompoundAssignmentOperation,ILLink.RoslynAnalyzer.DataFlow.LocalDataFlowState<TValue,TContext,TValueLattice,TContextLattice>)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["ILLink.RoslynAnalyzer.DataFlow", "LocalDataFlowVisitor<TValue,TContext,TValueLattice,TContextLattice,TConditionValue>", True, "VisitConversion", "(Microsoft.CodeAnalysis.Operations.IConversionOperation,ILLink.RoslynAnalyzer.DataFlow.LocalDataFlowState<TValue,TContext,TValueLattice,TContextLattice>)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["ILLink.RoslynAnalyzer.DataFlow", "LocalDataFlowVisitor<TValue,TContext,TValueLattice,TContextLattice,TConditionValue>", True, "VisitDelegateCreation", "(Microsoft.CodeAnalysis.Operations.IDelegateCreationOperation,ILLink.RoslynAnalyzer.DataFlow.LocalDataFlowState<TValue,TContext,TValueLattice,TContextLattice>)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["ILLink.RoslynAnalyzer.DataFlow", "LocalDataFlowVisitor<TValue,TContext,TValueLattice,TContextLattice,TConditionValue>", True, "VisitDynamicIndexerAccess", "(Microsoft.CodeAnalysis.Operations.IDynamicIndexerAccessOperation,ILLink.RoslynAnalyzer.DataFlow.LocalDataFlowState<TValue,TContext,TValueLattice,TContextLattice>)", "", "Argument[this]", "Argument[1]", "taint", "df-generated"]
+      - ["ILLink.RoslynAnalyzer.DataFlow", "LocalDataFlowVisitor<TValue,TContext,TValueLattice,TContextLattice,TConditionValue>", True, "VisitDynamicIndexerAccess", "(Microsoft.CodeAnalysis.Operations.IDynamicIndexerAccessOperation,ILLink.RoslynAnalyzer.DataFlow.LocalDataFlowState<TValue,TContext,TValueLattice,TContextLattice>)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["ILLink.RoslynAnalyzer.DataFlow", "LocalDataFlowVisitor<TValue,TContext,TValueLattice,TContextLattice,TConditionValue>", True, "VisitDynamicInvocation", "(Microsoft.CodeAnalysis.Operations.IDynamicInvocationOperation,ILLink.RoslynAnalyzer.DataFlow.LocalDataFlowState<TValue,TContext,TValueLattice,TContextLattice>)", "", "Argument[this]", "Argument[1]", "taint", "df-generated"]
+      - ["ILLink.RoslynAnalyzer.DataFlow", "LocalDataFlowVisitor<TValue,TContext,TValueLattice,TContextLattice,TConditionValue>", True, "VisitDynamicInvocation", "(Microsoft.CodeAnalysis.Operations.IDynamicInvocationOperation,ILLink.RoslynAnalyzer.DataFlow.LocalDataFlowState<TValue,TContext,TValueLattice,TContextLattice>)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["ILLink.RoslynAnalyzer.DataFlow", "LocalDataFlowVisitor<TValue,TContext,TValueLattice,TContextLattice,TConditionValue>", True, "VisitDynamicMemberReference", "(Microsoft.CodeAnalysis.Operations.IDynamicMemberReferenceOperation,ILLink.RoslynAnalyzer.DataFlow.LocalDataFlowState<TValue,TContext,TValueLattice,TContextLattice>)", "", "Argument[this]", "Argument[1]", "taint", "df-generated"]
+      - ["ILLink.RoslynAnalyzer.DataFlow", "LocalDataFlowVisitor<TValue,TContext,TValueLattice,TContextLattice,TConditionValue>", True, "VisitDynamicMemberReference", "(Microsoft.CodeAnalysis.Operations.IDynamicMemberReferenceOperation,ILLink.RoslynAnalyzer.DataFlow.LocalDataFlowState<TValue,TContext,TValueLattice,TContextLattice>)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["ILLink.RoslynAnalyzer.DataFlow", "LocalDataFlowVisitor<TValue,TContext,TValueLattice,TContextLattice,TConditionValue>", True, "VisitDynamicObjectCreation", "(Microsoft.CodeAnalysis.Operations.IDynamicObjectCreationOperation,ILLink.RoslynAnalyzer.DataFlow.LocalDataFlowState<TValue,TContext,TValueLattice,TContextLattice>)", "", "Argument[this]", "Argument[1]", "taint", "df-generated"]
+      - ["ILLink.RoslynAnalyzer.DataFlow", "LocalDataFlowVisitor<TValue,TContext,TValueLattice,TContextLattice,TConditionValue>", True, "VisitDynamicObjectCreation", "(Microsoft.CodeAnalysis.Operations.IDynamicObjectCreationOperation,ILLink.RoslynAnalyzer.DataFlow.LocalDataFlowState<TValue,TContext,TValueLattice,TContextLattice>)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["ILLink.RoslynAnalyzer.DataFlow", "LocalDataFlowVisitor<TValue,TContext,TValueLattice,TContextLattice,TConditionValue>", True, "VisitEventAssignment", "(Microsoft.CodeAnalysis.Operations.IEventAssignmentOperation,ILLink.RoslynAnalyzer.DataFlow.LocalDataFlowState<TValue,TContext,TValueLattice,TContextLattice>)", "", "Argument[this]", "Argument[1]", "taint", "df-generated"]
+      - ["ILLink.RoslynAnalyzer.DataFlow", "LocalDataFlowVisitor<TValue,TContext,TValueLattice,TContextLattice,TConditionValue>", True, "VisitEventReference", "(Microsoft.CodeAnalysis.Operations.IEventReferenceOperation,ILLink.RoslynAnalyzer.DataFlow.LocalDataFlowState<TValue,TContext,TValueLattice,TContextLattice>)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["ILLink.RoslynAnalyzer.DataFlow", "LocalDataFlowVisitor<TValue,TContext,TValueLattice,TContextLattice,TConditionValue>", True, "VisitExpressionStatement", "(Microsoft.CodeAnalysis.Operations.IExpressionStatementOperation,ILLink.RoslynAnalyzer.DataFlow.LocalDataFlowState<TValue,TContext,TValueLattice,TContextLattice>)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["ILLink.RoslynAnalyzer.DataFlow", "LocalDataFlowVisitor<TValue,TContext,TValueLattice,TContextLattice,TConditionValue>", True, "VisitFlowAnonymousFunction", "(Microsoft.CodeAnalysis.FlowAnalysis.IFlowAnonymousFunctionOperation,ILLink.RoslynAnalyzer.DataFlow.LocalDataFlowState<TValue,TContext,TValueLattice,TContextLattice>)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["ILLink.RoslynAnalyzer.DataFlow", "LocalDataFlowVisitor<TValue,TContext,TValueLattice,TContextLattice,TConditionValue>", True, "VisitFlowCapture", "(Microsoft.CodeAnalysis.FlowAnalysis.IFlowCaptureOperation,ILLink.RoslynAnalyzer.DataFlow.LocalDataFlowState<TValue,TContext,TValueLattice,TContextLattice>)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["ILLink.RoslynAnalyzer.DataFlow", "LocalDataFlowVisitor<TValue,TContext,TValueLattice,TContextLattice,TConditionValue>", True, "VisitFlowCaptureReference", "(Microsoft.CodeAnalysis.FlowAnalysis.IFlowCaptureReferenceOperation,ILLink.RoslynAnalyzer.DataFlow.LocalDataFlowState<TValue,TContext,TValueLattice,TContextLattice>)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["ILLink.RoslynAnalyzer.DataFlow", "LocalDataFlowVisitor<TValue,TContext,TValueLattice,TContextLattice,TConditionValue>", True, "VisitImplicitIndexerReference", "(Microsoft.CodeAnalysis.Operations.IImplicitIndexerReferenceOperation,ILLink.RoslynAnalyzer.DataFlow.LocalDataFlowState<TValue,TContext,TValueLattice,TContextLattice>)", "", "Argument[this]", "Argument[1]", "taint", "df-generated"]
+      - ["ILLink.RoslynAnalyzer.DataFlow", "LocalDataFlowVisitor<TValue,TContext,TValueLattice,TContextLattice,TConditionValue>", True, "VisitImplicitIndexerReference", "(Microsoft.CodeAnalysis.Operations.IImplicitIndexerReferenceOperation,ILLink.RoslynAnalyzer.DataFlow.LocalDataFlowState<TValue,TContext,TValueLattice,TContextLattice>)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["ILLink.RoslynAnalyzer.DataFlow", "LocalDataFlowVisitor<TValue,TContext,TValueLattice,TContextLattice,TConditionValue>", True, "VisitInlineArrayAccess", "(Microsoft.CodeAnalysis.Operations.IInlineArrayAccessOperation,ILLink.RoslynAnalyzer.DataFlow.LocalDataFlowState<TValue,TContext,TValueLattice,TContextLattice>)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["ILLink.RoslynAnalyzer.DataFlow", "LocalDataFlowVisitor<TValue,TContext,TValueLattice,TContextLattice,TConditionValue>", True, "VisitInvocation", "(Microsoft.CodeAnalysis.Operations.IInvocationOperation,ILLink.RoslynAnalyzer.DataFlow.LocalDataFlowState<TValue,TContext,TValueLattice,TContextLattice>)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["ILLink.RoslynAnalyzer.DataFlow", "LocalDataFlowVisitor<TValue,TContext,TValueLattice,TContextLattice,TConditionValue>", True, "VisitInvocation", "(Microsoft.CodeAnalysis.Operations.IInvocationOperation,ILLink.RoslynAnalyzer.DataFlow.LocalDataFlowState<TValue,TContext,TValueLattice,TContextLattice>)", "", "Argument[this]", "Argument[1]", "taint", "df-generated"]
+      - ["ILLink.RoslynAnalyzer.DataFlow", "LocalDataFlowVisitor<TValue,TContext,TValueLattice,TContextLattice,TConditionValue>", True, "VisitInvocation", "(Microsoft.CodeAnalysis.Operations.IInvocationOperation,ILLink.RoslynAnalyzer.DataFlow.LocalDataFlowState<TValue,TContext,TValueLattice,TContextLattice>)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["ILLink.RoslynAnalyzer.DataFlow", "LocalDataFlowVisitor<TValue,TContext,TValueLattice,TContextLattice,TConditionValue>", True, "VisitObjectCreation", "(Microsoft.CodeAnalysis.Operations.IObjectCreationOperation,ILLink.RoslynAnalyzer.DataFlow.LocalDataFlowState<TValue,TContext,TValueLattice,TContextLattice>)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["ILLink.RoslynAnalyzer.DataFlow", "LocalDataFlowVisitor<TValue,TContext,TValueLattice,TContextLattice,TConditionValue>", True, "VisitObjectCreation", "(Microsoft.CodeAnalysis.Operations.IObjectCreationOperation,ILLink.RoslynAnalyzer.DataFlow.LocalDataFlowState<TValue,TContext,TValueLattice,TContextLattice>)", "", "Argument[this]", "Argument[1]", "taint", "df-generated"]
+      - ["ILLink.RoslynAnalyzer.DataFlow", "LocalDataFlowVisitor<TValue,TContext,TValueLattice,TContextLattice,TConditionValue>", True, "VisitObjectCreation", "(Microsoft.CodeAnalysis.Operations.IObjectCreationOperation,ILLink.RoslynAnalyzer.DataFlow.LocalDataFlowState<TValue,TContext,TValueLattice,TContextLattice>)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["ILLink.RoslynAnalyzer.DataFlow", "LocalDataFlowVisitor<TValue,TContext,TValueLattice,TContextLattice,TConditionValue>", True, "VisitPropertyReference", "(Microsoft.CodeAnalysis.Operations.IPropertyReferenceOperation,ILLink.RoslynAnalyzer.DataFlow.LocalDataFlowState<TValue,TContext,TValueLattice,TContextLattice>)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["ILLink.RoslynAnalyzer.DataFlow", "LocalDataFlowVisitor<TValue,TContext,TValueLattice,TContextLattice,TConditionValue>", True, "VisitPropertyReference", "(Microsoft.CodeAnalysis.Operations.IPropertyReferenceOperation,ILLink.RoslynAnalyzer.DataFlow.LocalDataFlowState<TValue,TContext,TValueLattice,TContextLattice>)", "", "Argument[this]", "Argument[1]", "taint", "df-generated"]
+      - ["ILLink.RoslynAnalyzer.DataFlow", "LocalDataFlowVisitor<TValue,TContext,TValueLattice,TContextLattice,TConditionValue>", True, "VisitPropertyReference", "(Microsoft.CodeAnalysis.Operations.IPropertyReferenceOperation,ILLink.RoslynAnalyzer.DataFlow.LocalDataFlowState<TValue,TContext,TValueLattice,TContextLattice>)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["ILLink.RoslynAnalyzer.DataFlow", "LocalDataFlowVisitor<TValue,TContext,TValueLattice,TContextLattice,TConditionValue>", True, "VisitReturn", "(Microsoft.CodeAnalysis.Operations.IReturnOperation,ILLink.RoslynAnalyzer.DataFlow.LocalDataFlowState<TValue,TContext,TValueLattice,TContextLattice>)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["ILLink.RoslynAnalyzer.DataFlow", "LocalDataFlowVisitor<TValue,TContext,TValueLattice,TContextLattice,TConditionValue>", True, "VisitSimpleAssignment", "(Microsoft.CodeAnalysis.Operations.ISimpleAssignmentOperation,ILLink.RoslynAnalyzer.DataFlow.LocalDataFlowState<TValue,TContext,TValueLattice,TContextLattice>)", "", "Argument[this]", "Argument[1]", "taint", "df-generated"]
+      - ["ILLink.RoslynAnalyzer.DataFlow", "LocalDataFlowVisitor<TValue,TContext,TValueLattice,TContextLattice,TConditionValue>", True, "VisitSimpleAssignment", "(Microsoft.CodeAnalysis.Operations.ISimpleAssignmentOperation,ILLink.RoslynAnalyzer.DataFlow.LocalDataFlowState<TValue,TContext,TValueLattice,TContextLattice>)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
      - ["ILLink.RoslynAnalyzer.DataFlow", "LocalKey", False, "LocalKey", "(Microsoft.CodeAnalysis.FlowAnalysis.CaptureId)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
      - ["ILLink.RoslynAnalyzer.DataFlow", "LocalKey", False, "LocalKey", "(Microsoft.CodeAnalysis.ILocalSymbol)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
      - ["ILLink.RoslynAnalyzer.DataFlow", "LocalState<TValue>", False, "Get", "(ILLink.RoslynAnalyzer.DataFlow.LocalKey)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
@@ -53,6 +87,8 @@ extensions:
      - ["ILLink.RoslynAnalyzer.DataFlow", "LocalStateAndContextLattice<TValue,TContext,TValueLattice,TContextLattice>", False, "Meet", "(ILLink.RoslynAnalyzer.DataFlow.LocalStateAndContext<TValue,TContext>,ILLink.RoslynAnalyzer.DataFlow.LocalStateAndContext<TValue,TContext>)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
      - ["ILLink.RoslynAnalyzer.DataFlow", "LocalStateLattice<TValue,TValueLattice>", False, "LocalStateLattice", "(TValueLattice)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
      - ["ILLink.RoslynAnalyzer.DataFlow", "LocalStateLattice<TValue,TValueLattice>", False, "Meet", "(ILLink.RoslynAnalyzer.DataFlow.LocalState<TValue>,ILLink.RoslynAnalyzer.DataFlow.LocalState<TValue>)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["ILLink.RoslynAnalyzer.DataFlow", "MethodBodyValue", False, "MethodBodyValue", "(Microsoft.CodeAnalysis.ISymbol,Microsoft.CodeAnalysis.FlowAnalysis.ControlFlowGraph)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["ILLink.RoslynAnalyzer.DataFlow", "MethodBodyValue", False, "MethodBodyValue", "(Microsoft.CodeAnalysis.ISymbol,Microsoft.CodeAnalysis.FlowAnalysis.ControlFlowGraph)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
  - addsTo:
      pack: codeql/csharp-all
      extensible: neutralModel
@@ -120,28 +156,7 @@ extensions:
      - ["ILLink.RoslynAnalyzer.DataFlow", "LocalDataFlowVisitor<TValue,TContext,TValueLattice,TContextLattice,TConditionValue>", "HandleReturnValue", "(TValue,Microsoft.CodeAnalysis.IOperation,TContext)", "summary", "df-generated"]
      - ["ILLink.RoslynAnalyzer.DataFlow", "LocalDataFlowVisitor<TValue,TContext,TValueLattice,TContextLattice,TConditionValue>", "Transfer", "(ILLink.RoslynAnalyzer.DataFlow.BlockProxy,ILLink.RoslynAnalyzer.DataFlow.LocalDataFlowState<TValue,TContext,TValueLattice,TContextLattice>)", "summary", "df-generated"]
      - ["ILLink.RoslynAnalyzer.DataFlow", "LocalDataFlowVisitor<TValue,TContext,TValueLattice,TContextLattice,TConditionValue>", "VisitArgument", "(Microsoft.CodeAnalysis.Operations.IArgumentOperation,ILLink.RoslynAnalyzer.DataFlow.LocalDataFlowState<TValue,TContext,TValueLattice,TContextLattice>)", "summary", "df-generated"]
-      - ["ILLink.RoslynAnalyzer.DataFlow", "LocalDataFlowVisitor<TValue,TContext,TValueLattice,TContextLattice,TConditionValue>", "VisitArrayElementReference", "(Microsoft.CodeAnalysis.Operations.IArrayElementReferenceOperation,ILLink.RoslynAnalyzer.DataFlow.LocalDataFlowState<TValue,TContext,TValueLattice,TContextLattice>)", "summary", "df-generated"]
-      - ["ILLink.RoslynAnalyzer.DataFlow", "LocalDataFlowVisitor<TValue,TContext,TValueLattice,TContextLattice,TConditionValue>", "VisitCompoundAssignment", "(Microsoft.CodeAnalysis.Operations.ICompoundAssignmentOperation,ILLink.RoslynAnalyzer.DataFlow.LocalDataFlowState<TValue,TContext,TValueLattice,TContextLattice>)", "summary", "df-generated"]
-      - ["ILLink.RoslynAnalyzer.DataFlow", "LocalDataFlowVisitor<TValue,TContext,TValueLattice,TContextLattice,TConditionValue>", "VisitConversion", "(Microsoft.CodeAnalysis.Operations.IConversionOperation,ILLink.RoslynAnalyzer.DataFlow.LocalDataFlowState<TValue,TContext,TValueLattice,TContextLattice>)", "summary", "df-generated"]
-      - ["ILLink.RoslynAnalyzer.DataFlow", "LocalDataFlowVisitor<TValue,TContext,TValueLattice,TContextLattice,TConditionValue>", "VisitDelegateCreation", "(Microsoft.CodeAnalysis.Operations.IDelegateCreationOperation,ILLink.RoslynAnalyzer.DataFlow.LocalDataFlowState<TValue,TContext,TValueLattice,TContextLattice>)", "summary", "df-generated"]
-      - ["ILLink.RoslynAnalyzer.DataFlow", "LocalDataFlowVisitor<TValue,TContext,TValueLattice,TContextLattice,TConditionValue>", "VisitDynamicIndexerAccess", "(Microsoft.CodeAnalysis.Operations.IDynamicIndexerAccessOperation,ILLink.RoslynAnalyzer.DataFlow.LocalDataFlowState<TValue,TContext,TValueLattice,TContextLattice>)", "summary", "df-generated"]
-      - ["ILLink.RoslynAnalyzer.DataFlow", "LocalDataFlowVisitor<TValue,TContext,TValueLattice,TContextLattice,TConditionValue>", "VisitDynamicInvocation", "(Microsoft.CodeAnalysis.Operations.IDynamicInvocationOperation,ILLink.RoslynAnalyzer.DataFlow.LocalDataFlowState<TValue,TContext,TValueLattice,TContextLattice>)", "summary", "df-generated"]
-      - ["ILLink.RoslynAnalyzer.DataFlow", "LocalDataFlowVisitor<TValue,TContext,TValueLattice,TContextLattice,TConditionValue>", "VisitDynamicMemberReference", "(Microsoft.CodeAnalysis.Operations.IDynamicMemberReferenceOperation,ILLink.RoslynAnalyzer.DataFlow.LocalDataFlowState<TValue,TContext,TValueLattice,TContextLattice>)", "summary", "df-generated"]
-      - ["ILLink.RoslynAnalyzer.DataFlow", "LocalDataFlowVisitor<TValue,TContext,TValueLattice,TContextLattice,TConditionValue>", "VisitDynamicObjectCreation", "(Microsoft.CodeAnalysis.Operations.IDynamicObjectCreationOperation,ILLink.RoslynAnalyzer.DataFlow.LocalDataFlowState<TValue,TContext,TValueLattice,TContextLattice>)", "summary", "df-generated"]
-      - ["ILLink.RoslynAnalyzer.DataFlow", "LocalDataFlowVisitor<TValue,TContext,TValueLattice,TContextLattice,TConditionValue>", "VisitEventAssignment", "(Microsoft.CodeAnalysis.Operations.IEventAssignmentOperation,ILLink.RoslynAnalyzer.DataFlow.LocalDataFlowState<TValue,TContext,TValueLattice,TContextLattice>)", "summary", "df-generated"]
-      - ["ILLink.RoslynAnalyzer.DataFlow", "LocalDataFlowVisitor<TValue,TContext,TValueLattice,TContextLattice,TConditionValue>", "VisitEventReference", "(Microsoft.CodeAnalysis.Operations.IEventReferenceOperation,ILLink.RoslynAnalyzer.DataFlow.LocalDataFlowState<TValue,TContext,TValueLattice,TContextLattice>)", "summary", "df-generated"]
-      - ["ILLink.RoslynAnalyzer.DataFlow", "LocalDataFlowVisitor<TValue,TContext,TValueLattice,TContextLattice,TConditionValue>", "VisitExpressionStatement", "(Microsoft.CodeAnalysis.Operations.IExpressionStatementOperation,ILLink.RoslynAnalyzer.DataFlow.LocalDataFlowState<TValue,TContext,TValueLattice,TContextLattice>)", "summary", "df-generated"]
-      - ["ILLink.RoslynAnalyzer.DataFlow", "LocalDataFlowVisitor<TValue,TContext,TValueLattice,TContextLattice,TConditionValue>", "VisitFlowAnonymousFunction", "(Microsoft.CodeAnalysis.FlowAnalysis.IFlowAnonymousFunctionOperation,ILLink.RoslynAnalyzer.DataFlow.LocalDataFlowState<TValue,TContext,TValueLattice,TContextLattice>)", "summary", "df-generated"]
-      - ["ILLink.RoslynAnalyzer.DataFlow", "LocalDataFlowVisitor<TValue,TContext,TValueLattice,TContextLattice,TConditionValue>", "VisitFlowCapture", "(Microsoft.CodeAnalysis.FlowAnalysis.IFlowCaptureOperation,ILLink.RoslynAnalyzer.DataFlow.LocalDataFlowState<TValue,TContext,TValueLattice,TContextLattice>)", "summary", "df-generated"]
-      - ["ILLink.RoslynAnalyzer.DataFlow", "LocalDataFlowVisitor<TValue,TContext,TValueLattice,TContextLattice,TConditionValue>", "VisitFlowCaptureReference", "(Microsoft.CodeAnalysis.FlowAnalysis.IFlowCaptureReferenceOperation,ILLink.RoslynAnalyzer.DataFlow.LocalDataFlowState<TValue,TContext,TValueLattice,TContextLattice>)", "summary", "df-generated"]
-      - ["ILLink.RoslynAnalyzer.DataFlow", "LocalDataFlowVisitor<TValue,TContext,TValueLattice,TContextLattice,TConditionValue>", "VisitImplicitIndexerReference", "(Microsoft.CodeAnalysis.Operations.IImplicitIndexerReferenceOperation,ILLink.RoslynAnalyzer.DataFlow.LocalDataFlowState<TValue,TContext,TValueLattice,TContextLattice>)", "summary", "df-generated"]
-      - ["ILLink.RoslynAnalyzer.DataFlow", "LocalDataFlowVisitor<TValue,TContext,TValueLattice,TContextLattice,TConditionValue>", "VisitInlineArrayAccess", "(Microsoft.CodeAnalysis.Operations.IInlineArrayAccessOperation,ILLink.RoslynAnalyzer.DataFlow.LocalDataFlowState<TValue,TContext,TValueLattice,TContextLattice>)", "summary", "df-generated"]
-      - ["ILLink.RoslynAnalyzer.DataFlow", "LocalDataFlowVisitor<TValue,TContext,TValueLattice,TContextLattice,TConditionValue>", "VisitInvocation", "(Microsoft.CodeAnalysis.Operations.IInvocationOperation,ILLink.RoslynAnalyzer.DataFlow.LocalDataFlowState<TValue,TContext,TValueLattice,TContextLattice>)", "summary", "df-generated"]
      - ["ILLink.RoslynAnalyzer.DataFlow", "LocalDataFlowVisitor<TValue,TContext,TValueLattice,TContextLattice,TConditionValue>", "VisitLocalReference", "(Microsoft.CodeAnalysis.Operations.ILocalReferenceOperation,ILLink.RoslynAnalyzer.DataFlow.LocalDataFlowState<TValue,TContext,TValueLattice,TContextLattice>)", "summary", "df-generated"]
-      - ["ILLink.RoslynAnalyzer.DataFlow", "LocalDataFlowVisitor<TValue,TContext,TValueLattice,TContextLattice,TConditionValue>", "VisitObjectCreation", "(Microsoft.CodeAnalysis.Operations.IObjectCreationOperation,ILLink.RoslynAnalyzer.DataFlow.LocalDataFlowState<TValue,TContext,TValueLattice,TContextLattice>)", "summary", "df-generated"]
-      - ["ILLink.RoslynAnalyzer.DataFlow", "LocalDataFlowVisitor<TValue,TContext,TValueLattice,TContextLattice,TConditionValue>", "VisitPropertyReference", "(Microsoft.CodeAnalysis.Operations.IPropertyReferenceOperation,ILLink.RoslynAnalyzer.DataFlow.LocalDataFlowState<TValue,TContext,TValueLattice,TContextLattice>)", "summary", "df-generated"]
-      - ["ILLink.RoslynAnalyzer.DataFlow", "LocalDataFlowVisitor<TValue,TContext,TValueLattice,TContextLattice,TConditionValue>", "VisitReturn", "(Microsoft.CodeAnalysis.Operations.IReturnOperation,ILLink.RoslynAnalyzer.DataFlow.LocalDataFlowState<TValue,TContext,TValueLattice,TContextLattice>)", "summary", "df-generated"]
-      - ["ILLink.RoslynAnalyzer.DataFlow", "LocalDataFlowVisitor<TValue,TContext,TValueLattice,TContextLattice,TConditionValue>", "VisitSimpleAssignment", "(Microsoft.CodeAnalysis.Operations.ISimpleAssignmentOperation,ILLink.RoslynAnalyzer.DataFlow.LocalDataFlowState<TValue,TContext,TValueLattice,TContextLattice>)", "summary", "df-generated"]
      - ["ILLink.RoslynAnalyzer.DataFlow", "LocalDataFlowVisitor<TValue,TContext,TValueLattice,TContextLattice,TConditionValue>", "get_TopValue", "()", "summary", "df-generated"]
      - ["ILLink.RoslynAnalyzer.DataFlow", "LocalKey", "Equals", "(ILLink.RoslynAnalyzer.DataFlow.LocalKey)", "summary", "df-generated"]
      - ["ILLink.RoslynAnalyzer.DataFlow", "LocalKey", "Equals", "(System.Object)", "summary", "df-generated"]
@@ -161,7 +176,6 @@ extensions:
      - ["ILLink.RoslynAnalyzer.DataFlow", "MethodBodyValue", "Equals", "(ILLink.RoslynAnalyzer.DataFlow.MethodBodyValue)", "summary", "df-generated"]
      - ["ILLink.RoslynAnalyzer.DataFlow", "MethodBodyValue", "Equals", "(System.Object)", "summary", "df-generated"]
      - ["ILLink.RoslynAnalyzer.DataFlow", "MethodBodyValue", "GetHashCode", "()", "summary", "df-generated"]
-      - ["ILLink.RoslynAnalyzer.DataFlow", "MethodBodyValue", "MethodBodyValue", "(Microsoft.CodeAnalysis.ISymbol,Microsoft.CodeAnalysis.FlowAnalysis.ControlFlowGraph)", "summary", "df-generated"]
      - ["ILLink.RoslynAnalyzer.DataFlow", "MethodBodyValue", "get_ControlFlowGraph", "()", "summary", "df-generated"]
      - ["ILLink.RoslynAnalyzer.DataFlow", "MethodBodyValue", "get_OwningSymbol", "()", "summary", "df-generated"]
      - ["ILLink.RoslynAnalyzer.DataFlow", "OperationWalker<TArgument,TResult>", "DefaultVisit", "(Microsoft.CodeAnalysis.IOperation,TArgument)", "summary", "df-generated"]
--- a/csharp/ql/lib/ext/generated/ILLink.RoslynAnalyzer.TrimAnalysis.model.yml
+++ b/csharp/ql/lib/ext/generated/ILLink.RoslynAnalyzer.TrimAnalysis.model.yml
@@ -5,14 +5,52 @@ extensions:
      extensible: summaryModel
    data:
      - ["ILLink.RoslynAnalyzer.TrimAnalysis", "SingleValueExtensions", False, "FromTypeSymbol", "(Microsoft.CodeAnalysis.ITypeSymbol)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["ILLink.RoslynAnalyzer.TrimAnalysis", "TrimAnalysisAssignmentPattern", False, "Merge", "(ILLink.Shared.DataFlow.ValueSetLattice<ILLink.Shared.DataFlow.SingleValue>,ILLink.RoslynAnalyzer.DataFlow.FeatureContextLattice,ILLink.RoslynAnalyzer.TrimAnalysis.TrimAnalysisAssignmentPattern)", "", "Argument[2]", "ReturnValue", "taint", "df-generated"]
+      - ["ILLink.RoslynAnalyzer.TrimAnalysis", "TrimAnalysisAssignmentPattern", False, "Merge", "(ILLink.Shared.DataFlow.ValueSetLattice<ILLink.Shared.DataFlow.SingleValue>,ILLink.RoslynAnalyzer.DataFlow.FeatureContextLattice,ILLink.RoslynAnalyzer.TrimAnalysis.TrimAnalysisAssignmentPattern)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["ILLink.RoslynAnalyzer.TrimAnalysis", "TrimAnalysisAssignmentPattern", False, "TrimAnalysisAssignmentPattern", "(ILLink.Shared.DataFlow.ValueSet<ILLink.Shared.DataFlow.SingleValue>,ILLink.Shared.DataFlow.ValueSet<ILLink.Shared.DataFlow.SingleValue>,Microsoft.CodeAnalysis.IOperation,Microsoft.CodeAnalysis.ISymbol,ILLink.RoslynAnalyzer.DataFlow.FeatureContext)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["ILLink.RoslynAnalyzer.TrimAnalysis", "TrimAnalysisAssignmentPattern", False, "TrimAnalysisAssignmentPattern", "(ILLink.Shared.DataFlow.ValueSet<ILLink.Shared.DataFlow.SingleValue>,ILLink.Shared.DataFlow.ValueSet<ILLink.Shared.DataFlow.SingleValue>,Microsoft.CodeAnalysis.IOperation,Microsoft.CodeAnalysis.ISymbol,ILLink.RoslynAnalyzer.DataFlow.FeatureContext)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["ILLink.RoslynAnalyzer.TrimAnalysis", "TrimAnalysisAssignmentPattern", False, "TrimAnalysisAssignmentPattern", "(ILLink.Shared.DataFlow.ValueSet<ILLink.Shared.DataFlow.SingleValue>,ILLink.Shared.DataFlow.ValueSet<ILLink.Shared.DataFlow.SingleValue>,Microsoft.CodeAnalysis.IOperation,Microsoft.CodeAnalysis.ISymbol,ILLink.RoslynAnalyzer.DataFlow.FeatureContext)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
+      - ["ILLink.RoslynAnalyzer.TrimAnalysis", "TrimAnalysisAssignmentPattern", False, "TrimAnalysisAssignmentPattern", "(ILLink.Shared.DataFlow.ValueSet<ILLink.Shared.DataFlow.SingleValue>,ILLink.Shared.DataFlow.ValueSet<ILLink.Shared.DataFlow.SingleValue>,Microsoft.CodeAnalysis.IOperation,Microsoft.CodeAnalysis.ISymbol,ILLink.RoslynAnalyzer.DataFlow.FeatureContext)", "", "Argument[3]", "Argument[this]", "taint", "df-generated"]
+      - ["ILLink.RoslynAnalyzer.TrimAnalysis", "TrimAnalysisAssignmentPattern", False, "TrimAnalysisAssignmentPattern", "(ILLink.Shared.DataFlow.ValueSet<ILLink.Shared.DataFlow.SingleValue>,ILLink.Shared.DataFlow.ValueSet<ILLink.Shared.DataFlow.SingleValue>,Microsoft.CodeAnalysis.IOperation,Microsoft.CodeAnalysis.ISymbol,ILLink.RoslynAnalyzer.DataFlow.FeatureContext)", "", "Argument[4]", "Argument[this]", "taint", "df-generated"]
+      - ["ILLink.RoslynAnalyzer.TrimAnalysis", "TrimAnalysisFieldAccessPattern", False, "Merge", "(ILLink.Shared.DataFlow.ValueSetLattice<ILLink.Shared.DataFlow.SingleValue>,ILLink.RoslynAnalyzer.DataFlow.FeatureContextLattice,ILLink.RoslynAnalyzer.TrimAnalysis.TrimAnalysisFieldAccessPattern)", "", "Argument[2]", "ReturnValue", "taint", "df-generated"]
+      - ["ILLink.RoslynAnalyzer.TrimAnalysis", "TrimAnalysisFieldAccessPattern", False, "Merge", "(ILLink.Shared.DataFlow.ValueSetLattice<ILLink.Shared.DataFlow.SingleValue>,ILLink.RoslynAnalyzer.DataFlow.FeatureContextLattice,ILLink.RoslynAnalyzer.TrimAnalysis.TrimAnalysisFieldAccessPattern)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["ILLink.RoslynAnalyzer.TrimAnalysis", "TrimAnalysisFieldAccessPattern", False, "TrimAnalysisFieldAccessPattern", "(Microsoft.CodeAnalysis.IFieldSymbol,Microsoft.CodeAnalysis.Operations.IFieldReferenceOperation,Microsoft.CodeAnalysis.ISymbol,ILLink.RoslynAnalyzer.DataFlow.FeatureContext)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["ILLink.RoslynAnalyzer.TrimAnalysis", "TrimAnalysisFieldAccessPattern", False, "TrimAnalysisFieldAccessPattern", "(Microsoft.CodeAnalysis.IFieldSymbol,Microsoft.CodeAnalysis.Operations.IFieldReferenceOperation,Microsoft.CodeAnalysis.ISymbol,ILLink.RoslynAnalyzer.DataFlow.FeatureContext)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["ILLink.RoslynAnalyzer.TrimAnalysis", "TrimAnalysisFieldAccessPattern", False, "TrimAnalysisFieldAccessPattern", "(Microsoft.CodeAnalysis.IFieldSymbol,Microsoft.CodeAnalysis.Operations.IFieldReferenceOperation,Microsoft.CodeAnalysis.ISymbol,ILLink.RoslynAnalyzer.DataFlow.FeatureContext)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
+      - ["ILLink.RoslynAnalyzer.TrimAnalysis", "TrimAnalysisFieldAccessPattern", False, "TrimAnalysisFieldAccessPattern", "(Microsoft.CodeAnalysis.IFieldSymbol,Microsoft.CodeAnalysis.Operations.IFieldReferenceOperation,Microsoft.CodeAnalysis.ISymbol,ILLink.RoslynAnalyzer.DataFlow.FeatureContext)", "", "Argument[3]", "Argument[this]", "taint", "df-generated"]
+      - ["ILLink.RoslynAnalyzer.TrimAnalysis", "TrimAnalysisMethodCallPattern", False, "Merge", "(ILLink.Shared.DataFlow.ValueSetLattice<ILLink.Shared.DataFlow.SingleValue>,ILLink.RoslynAnalyzer.DataFlow.FeatureContextLattice,ILLink.RoslynAnalyzer.TrimAnalysis.TrimAnalysisMethodCallPattern)", "", "Argument[2]", "ReturnValue", "taint", "df-generated"]
+      - ["ILLink.RoslynAnalyzer.TrimAnalysis", "TrimAnalysisMethodCallPattern", False, "Merge", "(ILLink.Shared.DataFlow.ValueSetLattice<ILLink.Shared.DataFlow.SingleValue>,ILLink.RoslynAnalyzer.DataFlow.FeatureContextLattice,ILLink.RoslynAnalyzer.TrimAnalysis.TrimAnalysisMethodCallPattern)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["ILLink.RoslynAnalyzer.TrimAnalysis", "TrimAnalysisMethodCallPattern", False, "TrimAnalysisMethodCallPattern", "(Microsoft.CodeAnalysis.IMethodSymbol,ILLink.Shared.DataFlow.ValueSet<ILLink.Shared.DataFlow.SingleValue>,System.Collections.Immutable.ImmutableArray<ILLink.Shared.DataFlow.ValueSet<ILLink.Shared.DataFlow.SingleValue>>,Microsoft.CodeAnalysis.IOperation,Microsoft.CodeAnalysis.ISymbol,ILLink.RoslynAnalyzer.DataFlow.FeatureContext)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["ILLink.RoslynAnalyzer.TrimAnalysis", "TrimAnalysisMethodCallPattern", False, "TrimAnalysisMethodCallPattern", "(Microsoft.CodeAnalysis.IMethodSymbol,ILLink.Shared.DataFlow.ValueSet<ILLink.Shared.DataFlow.SingleValue>,System.Collections.Immutable.ImmutableArray<ILLink.Shared.DataFlow.ValueSet<ILLink.Shared.DataFlow.SingleValue>>,Microsoft.CodeAnalysis.IOperation,Microsoft.CodeAnalysis.ISymbol,ILLink.RoslynAnalyzer.DataFlow.FeatureContext)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["ILLink.RoslynAnalyzer.TrimAnalysis", "TrimAnalysisMethodCallPattern", False, "TrimAnalysisMethodCallPattern", "(Microsoft.CodeAnalysis.IMethodSymbol,ILLink.Shared.DataFlow.ValueSet<ILLink.Shared.DataFlow.SingleValue>,System.Collections.Immutable.ImmutableArray<ILLink.Shared.DataFlow.ValueSet<ILLink.Shared.DataFlow.SingleValue>>,Microsoft.CodeAnalysis.IOperation,Microsoft.CodeAnalysis.ISymbol,ILLink.RoslynAnalyzer.DataFlow.FeatureContext)", "", "Argument[3]", "Argument[this]", "taint", "df-generated"]
+      - ["ILLink.RoslynAnalyzer.TrimAnalysis", "TrimAnalysisMethodCallPattern", False, "TrimAnalysisMethodCallPattern", "(Microsoft.CodeAnalysis.IMethodSymbol,ILLink.Shared.DataFlow.ValueSet<ILLink.Shared.DataFlow.SingleValue>,System.Collections.Immutable.ImmutableArray<ILLink.Shared.DataFlow.ValueSet<ILLink.Shared.DataFlow.SingleValue>>,Microsoft.CodeAnalysis.IOperation,Microsoft.CodeAnalysis.ISymbol,ILLink.RoslynAnalyzer.DataFlow.FeatureContext)", "", "Argument[4]", "Argument[this]", "taint", "df-generated"]
+      - ["ILLink.RoslynAnalyzer.TrimAnalysis", "TrimAnalysisMethodCallPattern", False, "TrimAnalysisMethodCallPattern", "(Microsoft.CodeAnalysis.IMethodSymbol,ILLink.Shared.DataFlow.ValueSet<ILLink.Shared.DataFlow.SingleValue>,System.Collections.Immutable.ImmutableArray<ILLink.Shared.DataFlow.ValueSet<ILLink.Shared.DataFlow.SingleValue>>,Microsoft.CodeAnalysis.IOperation,Microsoft.CodeAnalysis.ISymbol,ILLink.RoslynAnalyzer.DataFlow.FeatureContext)", "", "Argument[5]", "Argument[this]", "taint", "df-generated"]
      - ["ILLink.RoslynAnalyzer.TrimAnalysis", "TrimAnalysisPatternStore", False, "TrimAnalysisPatternStore", "(ILLink.Shared.DataFlow.ValueSetLattice<ILLink.Shared.DataFlow.SingleValue>,ILLink.RoslynAnalyzer.DataFlow.FeatureContextLattice)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
      - ["ILLink.RoslynAnalyzer.TrimAnalysis", "TrimAnalysisPatternStore", False, "TrimAnalysisPatternStore", "(ILLink.Shared.DataFlow.ValueSetLattice<ILLink.Shared.DataFlow.SingleValue>,ILLink.RoslynAnalyzer.DataFlow.FeatureContextLattice)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["ILLink.RoslynAnalyzer.TrimAnalysis", "TrimAnalysisReflectionAccessPattern", False, "Merge", "(ILLink.Shared.DataFlow.ValueSetLattice<ILLink.Shared.DataFlow.SingleValue>,ILLink.RoslynAnalyzer.DataFlow.FeatureContextLattice,ILLink.RoslynAnalyzer.TrimAnalysis.TrimAnalysisReflectionAccessPattern)", "", "Argument[2]", "ReturnValue", "taint", "df-generated"]
+      - ["ILLink.RoslynAnalyzer.TrimAnalysis", "TrimAnalysisReflectionAccessPattern", False, "Merge", "(ILLink.Shared.DataFlow.ValueSetLattice<ILLink.Shared.DataFlow.SingleValue>,ILLink.RoslynAnalyzer.DataFlow.FeatureContextLattice,ILLink.RoslynAnalyzer.TrimAnalysis.TrimAnalysisReflectionAccessPattern)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["ILLink.RoslynAnalyzer.TrimAnalysis", "TrimAnalysisReflectionAccessPattern", False, "TrimAnalysisReflectionAccessPattern", "(Microsoft.CodeAnalysis.IMethodSymbol,Microsoft.CodeAnalysis.IOperation,Microsoft.CodeAnalysis.ISymbol,ILLink.RoslynAnalyzer.DataFlow.FeatureContext)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["ILLink.RoslynAnalyzer.TrimAnalysis", "TrimAnalysisReflectionAccessPattern", False, "TrimAnalysisReflectionAccessPattern", "(Microsoft.CodeAnalysis.IMethodSymbol,Microsoft.CodeAnalysis.IOperation,Microsoft.CodeAnalysis.ISymbol,ILLink.RoslynAnalyzer.DataFlow.FeatureContext)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["ILLink.RoslynAnalyzer.TrimAnalysis", "TrimAnalysisReflectionAccessPattern", False, "TrimAnalysisReflectionAccessPattern", "(Microsoft.CodeAnalysis.IMethodSymbol,Microsoft.CodeAnalysis.IOperation,Microsoft.CodeAnalysis.ISymbol,ILLink.RoslynAnalyzer.DataFlow.FeatureContext)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
+      - ["ILLink.RoslynAnalyzer.TrimAnalysis", "TrimAnalysisReflectionAccessPattern", False, "TrimAnalysisReflectionAccessPattern", "(Microsoft.CodeAnalysis.IMethodSymbol,Microsoft.CodeAnalysis.IOperation,Microsoft.CodeAnalysis.ISymbol,ILLink.RoslynAnalyzer.DataFlow.FeatureContext)", "", "Argument[3]", "Argument[this]", "taint", "df-generated"]
      - ["ILLink.RoslynAnalyzer.TrimAnalysis", "TrimAnalysisVisitor", False, "TrimAnalysisVisitor", "(Microsoft.CodeAnalysis.Compilation,ILLink.RoslynAnalyzer.DataFlow.LocalStateAndContextLattice<ILLink.Shared.DataFlow.ValueSet<ILLink.Shared.DataFlow.SingleValue>,ILLink.RoslynAnalyzer.DataFlow.FeatureContext,ILLink.Shared.DataFlow.ValueSetLattice<ILLink.Shared.DataFlow.SingleValue>,ILLink.RoslynAnalyzer.DataFlow.FeatureContextLattice>,Microsoft.CodeAnalysis.ISymbol,Microsoft.CodeAnalysis.FlowAnalysis.ControlFlowGraph,System.Collections.Immutable.ImmutableDictionary<Microsoft.CodeAnalysis.FlowAnalysis.CaptureId,ILLink.RoslynAnalyzer.DataFlow.FlowCaptureKind>,ILLink.RoslynAnalyzer.TrimAnalysis.TrimAnalysisPatternStore,ILLink.RoslynAnalyzer.DataFlow.InterproceduralState<ILLink.Shared.DataFlow.ValueSet<ILLink.Shared.DataFlow.SingleValue>,ILLink.Shared.DataFlow.ValueSetLattice<ILLink.Shared.DataFlow.SingleValue>>,ILLink.RoslynAnalyzer.DataFlowAnalyzerContext)", "", "Argument[5]", "Argument[this]", "taint", "df-generated"]
      - ["ILLink.RoslynAnalyzer.TrimAnalysis", "TrimAnalysisVisitor", False, "TrimAnalysisVisitor", "(Microsoft.CodeAnalysis.Compilation,ILLink.RoslynAnalyzer.DataFlow.LocalStateAndContextLattice<ILLink.Shared.DataFlow.ValueSet<ILLink.Shared.DataFlow.SingleValue>,ILLink.RoslynAnalyzer.DataFlow.FeatureContext,ILLink.Shared.DataFlow.ValueSetLattice<ILLink.Shared.DataFlow.SingleValue>,ILLink.RoslynAnalyzer.DataFlow.FeatureContextLattice>,Microsoft.CodeAnalysis.ISymbol,Microsoft.CodeAnalysis.FlowAnalysis.ControlFlowGraph,System.Collections.Immutable.ImmutableDictionary<Microsoft.CodeAnalysis.FlowAnalysis.CaptureId,ILLink.RoslynAnalyzer.DataFlow.FlowCaptureKind>,ILLink.RoslynAnalyzer.TrimAnalysis.TrimAnalysisPatternStore,ILLink.RoslynAnalyzer.DataFlow.InterproceduralState<ILLink.Shared.DataFlow.ValueSet<ILLink.Shared.DataFlow.SingleValue>,ILLink.Shared.DataFlow.ValueSetLattice<ILLink.Shared.DataFlow.SingleValue>>,ILLink.RoslynAnalyzer.DataFlowAnalyzerContext)", "", "Argument[7]", "Argument[this]", "taint", "df-generated"]
      - ["ILLink.RoslynAnalyzer.TrimAnalysis", "TrimAnalysisVisitor", True, "ApplyCondition", "(ILLink.RoslynAnalyzer.DataFlow.FeatureChecksValue,ILLink.RoslynAnalyzer.DataFlow.LocalStateAndContext<ILLink.Shared.DataFlow.ValueSet<ILLink.Shared.DataFlow.SingleValue>,ILLink.RoslynAnalyzer.DataFlow.FeatureContext>)", "", "Argument[0]", "Argument[1]", "taint", "df-generated"]
      - ["ILLink.RoslynAnalyzer.TrimAnalysis", "TrimAnalysisVisitor", True, "GetFieldTargetValue", "(Microsoft.CodeAnalysis.IFieldSymbol,Microsoft.CodeAnalysis.Operations.IFieldReferenceOperation,ILLink.RoslynAnalyzer.DataFlow.FeatureContext)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["ILLink.RoslynAnalyzer.TrimAnalysis", "TrimAnalysisVisitor", True, "HandleArrayElementRead", "(ILLink.Shared.DataFlow.ValueSet<ILLink.Shared.DataFlow.SingleValue>,ILLink.Shared.DataFlow.ValueSet<ILLink.Shared.DataFlow.SingleValue>,Microsoft.CodeAnalysis.IOperation)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["ILLink.RoslynAnalyzer.TrimAnalysis", "TrimAnalysisVisitor", True, "HandleDelegateCreation", "(Microsoft.CodeAnalysis.IMethodSymbol,Microsoft.CodeAnalysis.IOperation,ILLink.RoslynAnalyzer.DataFlow.FeatureContext)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
      - ["ILLink.RoslynAnalyzer.TrimAnalysis", "TrimAnalysisVisitor", True, "HandleMethodCall", "(Microsoft.CodeAnalysis.IMethodSymbol,ILLink.Shared.DataFlow.ValueSet<ILLink.Shared.DataFlow.SingleValue>,System.Collections.Immutable.ImmutableArray<ILLink.Shared.DataFlow.ValueSet<ILLink.Shared.DataFlow.SingleValue>>,Microsoft.CodeAnalysis.IOperation,ILLink.RoslynAnalyzer.DataFlow.FeatureContext)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["ILLink.RoslynAnalyzer.TrimAnalysis", "TrimAnalysisVisitor", True, "HandleMethodCall", "(Microsoft.CodeAnalysis.IMethodSymbol,ILLink.Shared.DataFlow.ValueSet<ILLink.Shared.DataFlow.SingleValue>,System.Collections.Immutable.ImmutableArray<ILLink.Shared.DataFlow.ValueSet<ILLink.Shared.DataFlow.SingleValue>>,Microsoft.CodeAnalysis.IOperation,ILLink.RoslynAnalyzer.DataFlow.FeatureContext)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
      - ["ILLink.RoslynAnalyzer.TrimAnalysis", "TrimAnalysisVisitor", True, "HandleMethodCall", "(Microsoft.CodeAnalysis.IMethodSymbol,ILLink.Shared.DataFlow.ValueSet<ILLink.Shared.DataFlow.SingleValue>,System.Collections.Immutable.ImmutableArray<ILLink.Shared.DataFlow.ValueSet<ILLink.Shared.DataFlow.SingleValue>>,Microsoft.CodeAnalysis.IOperation,ILLink.RoslynAnalyzer.DataFlow.FeatureContext)", "", "Argument[2].Element", "ReturnValue", "taint", "df-generated"]
+      - ["ILLink.RoslynAnalyzer.TrimAnalysis", "TrimAnalysisVisitor", True, "HandleMethodCall", "(Microsoft.CodeAnalysis.IMethodSymbol,ILLink.Shared.DataFlow.ValueSet<ILLink.Shared.DataFlow.SingleValue>,System.Collections.Immutable.ImmutableArray<ILLink.Shared.DataFlow.ValueSet<ILLink.Shared.DataFlow.SingleValue>>,Microsoft.CodeAnalysis.IOperation,ILLink.RoslynAnalyzer.DataFlow.FeatureContext)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["ILLink.RoslynAnalyzer.TrimAnalysis", "TrimAnalysisVisitor", True, "Visit", "(Microsoft.CodeAnalysis.IOperation,ILLink.RoslynAnalyzer.DataFlow.LocalDataFlowState<ILLink.Shared.DataFlow.ValueSet<ILLink.Shared.DataFlow.SingleValue>,ILLink.RoslynAnalyzer.DataFlow.FeatureContext,ILLink.Shared.DataFlow.ValueSetLattice<ILLink.Shared.DataFlow.SingleValue>,ILLink.RoslynAnalyzer.DataFlow.FeatureContextLattice>)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["ILLink.RoslynAnalyzer.TrimAnalysis", "TrimAnalysisVisitor", True, "VisitArrayCreation", "(Microsoft.CodeAnalysis.Operations.IArrayCreationOperation,ILLink.RoslynAnalyzer.DataFlow.LocalDataFlowState<ILLink.Shared.DataFlow.ValueSet<ILLink.Shared.DataFlow.SingleValue>,ILLink.RoslynAnalyzer.DataFlow.FeatureContext,ILLink.Shared.DataFlow.ValueSetLattice<ILLink.Shared.DataFlow.SingleValue>,ILLink.RoslynAnalyzer.DataFlow.FeatureContextLattice>)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["ILLink.RoslynAnalyzer.TrimAnalysis", "TrimAnalysisVisitor", True, "VisitBinaryOperator", "(Microsoft.CodeAnalysis.Operations.IBinaryOperation,ILLink.RoslynAnalyzer.DataFlow.LocalDataFlowState<ILLink.Shared.DataFlow.ValueSet<ILLink.Shared.DataFlow.SingleValue>,ILLink.RoslynAnalyzer.DataFlow.FeatureContext,ILLink.Shared.DataFlow.ValueSetLattice<ILLink.Shared.DataFlow.SingleValue>,ILLink.RoslynAnalyzer.DataFlow.FeatureContextLattice>)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["ILLink.RoslynAnalyzer.TrimAnalysis", "TrimAnalysisVisitor", True, "VisitConversion", "(Microsoft.CodeAnalysis.Operations.IConversionOperation,ILLink.RoslynAnalyzer.DataFlow.LocalDataFlowState<ILLink.Shared.DataFlow.ValueSet<ILLink.Shared.DataFlow.SingleValue>,ILLink.RoslynAnalyzer.DataFlow.FeatureContext,ILLink.Shared.DataFlow.ValueSetLattice<ILLink.Shared.DataFlow.SingleValue>,ILLink.RoslynAnalyzer.DataFlow.FeatureContextLattice>)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["ILLink.RoslynAnalyzer.TrimAnalysis", "TrimAnalysisVisitor", True, "VisitFieldReference", "(Microsoft.CodeAnalysis.Operations.IFieldReferenceOperation,ILLink.RoslynAnalyzer.DataFlow.LocalDataFlowState<ILLink.Shared.DataFlow.ValueSet<ILLink.Shared.DataFlow.SingleValue>,ILLink.RoslynAnalyzer.DataFlow.FeatureContext,ILLink.Shared.DataFlow.ValueSetLattice<ILLink.Shared.DataFlow.SingleValue>,ILLink.RoslynAnalyzer.DataFlow.FeatureContextLattice>)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["ILLink.RoslynAnalyzer.TrimAnalysis", "TrimAnalysisVisitor", True, "VisitInstanceReference", "(Microsoft.CodeAnalysis.Operations.IInstanceReferenceOperation,ILLink.RoslynAnalyzer.DataFlow.LocalDataFlowState<ILLink.Shared.DataFlow.ValueSet<ILLink.Shared.DataFlow.SingleValue>,ILLink.RoslynAnalyzer.DataFlow.FeatureContext,ILLink.Shared.DataFlow.ValueSetLattice<ILLink.Shared.DataFlow.SingleValue>,ILLink.RoslynAnalyzer.DataFlow.FeatureContextLattice>)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["ILLink.RoslynAnalyzer.TrimAnalysis", "TrimAnalysisVisitor", True, "VisitTypeOf", "(Microsoft.CodeAnalysis.Operations.ITypeOfOperation,ILLink.RoslynAnalyzer.DataFlow.LocalDataFlowState<ILLink.Shared.DataFlow.ValueSet<ILLink.Shared.DataFlow.SingleValue>,ILLink.RoslynAnalyzer.DataFlow.FeatureContext,ILLink.Shared.DataFlow.ValueSetLattice<ILLink.Shared.DataFlow.SingleValue>,ILLink.RoslynAnalyzer.DataFlow.FeatureContextLattice>)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["ILLink.RoslynAnalyzer.TrimAnalysis", "TrimAnalysisVisitor", True, "VisitTypeOf", "(Microsoft.CodeAnalysis.Operations.ITypeOfOperation,ILLink.RoslynAnalyzer.DataFlow.LocalDataFlowState<ILLink.Shared.DataFlow.ValueSet<ILLink.Shared.DataFlow.SingleValue>,ILLink.RoslynAnalyzer.DataFlow.FeatureContext,ILLink.Shared.DataFlow.ValueSetLattice<ILLink.Shared.DataFlow.SingleValue>,ILLink.RoslynAnalyzer.DataFlow.FeatureContextLattice>)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
      - ["ILLink.RoslynAnalyzer.TrimAnalysis", "TrimDataFlowAnalysis", False, "TrimDataFlowAnalysis", "(Microsoft.CodeAnalysis.Diagnostics.OperationBlockAnalysisContext,ILLink.RoslynAnalyzer.DataFlowAnalyzerContext,Microsoft.CodeAnalysis.IOperation)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
      - ["ILLink.RoslynAnalyzer.TrimAnalysis", "TrimDataFlowAnalysis", True, "GetVisitor", "(Microsoft.CodeAnalysis.ISymbol,Microsoft.CodeAnalysis.FlowAnalysis.ControlFlowGraph,System.Collections.Immutable.ImmutableDictionary<Microsoft.CodeAnalysis.FlowAnalysis.CaptureId,ILLink.RoslynAnalyzer.DataFlow.FlowCaptureKind>,ILLink.RoslynAnalyzer.DataFlow.InterproceduralState<ILLink.Shared.DataFlow.ValueSet<ILLink.Shared.DataFlow.SingleValue>,ILLink.Shared.DataFlow.ValueSetLattice<ILLink.Shared.DataFlow.SingleValue>>)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
      - ["ILLink.RoslynAnalyzer.TrimAnalysis", "TrimDataFlowAnalysis", True, "TraceStart", "(ILLink.RoslynAnalyzer.DataFlow.ControlFlowGraphProxy)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
@@ -21,18 +59,12 @@ extensions:
      extensible: neutralModel
    data:
      - ["ILLink.RoslynAnalyzer.TrimAnalysis", "TrimAnalysisAssignmentPattern", "CollectDiagnostics", "(ILLink.RoslynAnalyzer.DataFlowAnalyzerContext)", "summary", "df-generated"]
-      - ["ILLink.RoslynAnalyzer.TrimAnalysis", "TrimAnalysisAssignmentPattern", "Merge", "(ILLink.Shared.DataFlow.ValueSetLattice<ILLink.Shared.DataFlow.SingleValue>,ILLink.RoslynAnalyzer.DataFlow.FeatureContextLattice,ILLink.RoslynAnalyzer.TrimAnalysis.TrimAnalysisAssignmentPattern)", "summary", "df-generated"]
-      - ["ILLink.RoslynAnalyzer.TrimAnalysis", "TrimAnalysisAssignmentPattern", "TrimAnalysisAssignmentPattern", "(ILLink.Shared.DataFlow.ValueSet<ILLink.Shared.DataFlow.SingleValue>,ILLink.Shared.DataFlow.ValueSet<ILLink.Shared.DataFlow.SingleValue>,Microsoft.CodeAnalysis.IOperation,Microsoft.CodeAnalysis.ISymbol,ILLink.RoslynAnalyzer.DataFlow.FeatureContext)", "summary", "df-generated"]
      - ["ILLink.RoslynAnalyzer.TrimAnalysis", "TrimAnalysisAssignmentPattern", "op_Equality", "(ILLink.RoslynAnalyzer.TrimAnalysis.TrimAnalysisAssignmentPattern,ILLink.RoslynAnalyzer.TrimAnalysis.TrimAnalysisAssignmentPattern)", "summary", "df-generated"]
      - ["ILLink.RoslynAnalyzer.TrimAnalysis", "TrimAnalysisAssignmentPattern", "op_Inequality", "(ILLink.RoslynAnalyzer.TrimAnalysis.TrimAnalysisAssignmentPattern,ILLink.RoslynAnalyzer.TrimAnalysis.TrimAnalysisAssignmentPattern)", "summary", "df-generated"]
      - ["ILLink.RoslynAnalyzer.TrimAnalysis", "TrimAnalysisFieldAccessPattern", "CollectDiagnostics", "(ILLink.RoslynAnalyzer.DataFlowAnalyzerContext)", "summary", "df-generated"]
-      - ["ILLink.RoslynAnalyzer.TrimAnalysis", "TrimAnalysisFieldAccessPattern", "Merge", "(ILLink.Shared.DataFlow.ValueSetLattice<ILLink.Shared.DataFlow.SingleValue>,ILLink.RoslynAnalyzer.DataFlow.FeatureContextLattice,ILLink.RoslynAnalyzer.TrimAnalysis.TrimAnalysisFieldAccessPattern)", "summary", "df-generated"]
-      - ["ILLink.RoslynAnalyzer.TrimAnalysis", "TrimAnalysisFieldAccessPattern", "TrimAnalysisFieldAccessPattern", "(Microsoft.CodeAnalysis.IFieldSymbol,Microsoft.CodeAnalysis.Operations.IFieldReferenceOperation,Microsoft.CodeAnalysis.ISymbol,ILLink.RoslynAnalyzer.DataFlow.FeatureContext)", "summary", "df-generated"]
      - ["ILLink.RoslynAnalyzer.TrimAnalysis", "TrimAnalysisFieldAccessPattern", "op_Equality", "(ILLink.RoslynAnalyzer.TrimAnalysis.TrimAnalysisFieldAccessPattern,ILLink.RoslynAnalyzer.TrimAnalysis.TrimAnalysisFieldAccessPattern)", "summary", "df-generated"]
      - ["ILLink.RoslynAnalyzer.TrimAnalysis", "TrimAnalysisFieldAccessPattern", "op_Inequality", "(ILLink.RoslynAnalyzer.TrimAnalysis.TrimAnalysisFieldAccessPattern,ILLink.RoslynAnalyzer.TrimAnalysis.TrimAnalysisFieldAccessPattern)", "summary", "df-generated"]
      - ["ILLink.RoslynAnalyzer.TrimAnalysis", "TrimAnalysisMethodCallPattern", "CollectDiagnostics", "(ILLink.RoslynAnalyzer.DataFlowAnalyzerContext)", "summary", "df-generated"]
-      - ["ILLink.RoslynAnalyzer.TrimAnalysis", "TrimAnalysisMethodCallPattern", "Merge", "(ILLink.Shared.DataFlow.ValueSetLattice<ILLink.Shared.DataFlow.SingleValue>,ILLink.RoslynAnalyzer.DataFlow.FeatureContextLattice,ILLink.RoslynAnalyzer.TrimAnalysis.TrimAnalysisMethodCallPattern)", "summary", "df-generated"]
-      - ["ILLink.RoslynAnalyzer.TrimAnalysis", "TrimAnalysisMethodCallPattern", "TrimAnalysisMethodCallPattern", "(Microsoft.CodeAnalysis.IMethodSymbol,ILLink.Shared.DataFlow.ValueSet<ILLink.Shared.DataFlow.SingleValue>,System.Collections.Immutable.ImmutableArray<ILLink.Shared.DataFlow.ValueSet<ILLink.Shared.DataFlow.SingleValue>>,Microsoft.CodeAnalysis.IOperation,Microsoft.CodeAnalysis.ISymbol,ILLink.RoslynAnalyzer.DataFlow.FeatureContext)", "summary", "df-generated"]
      - ["ILLink.RoslynAnalyzer.TrimAnalysis", "TrimAnalysisMethodCallPattern", "op_Equality", "(ILLink.RoslynAnalyzer.TrimAnalysis.TrimAnalysisMethodCallPattern,ILLink.RoslynAnalyzer.TrimAnalysis.TrimAnalysisMethodCallPattern)", "summary", "df-generated"]
      - ["ILLink.RoslynAnalyzer.TrimAnalysis", "TrimAnalysisMethodCallPattern", "op_Inequality", "(ILLink.RoslynAnalyzer.TrimAnalysis.TrimAnalysisMethodCallPattern,ILLink.RoslynAnalyzer.TrimAnalysis.TrimAnalysisMethodCallPattern)", "summary", "df-generated"]
      - ["ILLink.RoslynAnalyzer.TrimAnalysis", "TrimAnalysisPatternStore", "Add", "(ILLink.RoslynAnalyzer.TrimAnalysis.TrimAnalysisAssignmentPattern,System.Boolean)", "summary", "df-generated"]
@@ -41,25 +73,14 @@ extensions:
      - ["ILLink.RoslynAnalyzer.TrimAnalysis", "TrimAnalysisPatternStore", "Add", "(ILLink.RoslynAnalyzer.TrimAnalysis.TrimAnalysisReflectionAccessPattern)", "summary", "df-generated"]
      - ["ILLink.RoslynAnalyzer.TrimAnalysis", "TrimAnalysisPatternStore", "CollectDiagnostics", "(ILLink.RoslynAnalyzer.DataFlowAnalyzerContext)", "summary", "df-generated"]
      - ["ILLink.RoslynAnalyzer.TrimAnalysis", "TrimAnalysisReflectionAccessPattern", "CollectDiagnostics", "(ILLink.RoslynAnalyzer.DataFlowAnalyzerContext)", "summary", "df-generated"]
-      - ["ILLink.RoslynAnalyzer.TrimAnalysis", "TrimAnalysisReflectionAccessPattern", "Merge", "(ILLink.Shared.DataFlow.ValueSetLattice<ILLink.Shared.DataFlow.SingleValue>,ILLink.RoslynAnalyzer.DataFlow.FeatureContextLattice,ILLink.RoslynAnalyzer.TrimAnalysis.TrimAnalysisReflectionAccessPattern)", "summary", "df-generated"]
-      - ["ILLink.RoslynAnalyzer.TrimAnalysis", "TrimAnalysisReflectionAccessPattern", "TrimAnalysisReflectionAccessPattern", "(Microsoft.CodeAnalysis.IMethodSymbol,Microsoft.CodeAnalysis.IOperation,Microsoft.CodeAnalysis.ISymbol,ILLink.RoslynAnalyzer.DataFlow.FeatureContext)", "summary", "df-generated"]
      - ["ILLink.RoslynAnalyzer.TrimAnalysis", "TrimAnalysisReflectionAccessPattern", "op_Equality", "(ILLink.RoslynAnalyzer.TrimAnalysis.TrimAnalysisReflectionAccessPattern,ILLink.RoslynAnalyzer.TrimAnalysis.TrimAnalysisReflectionAccessPattern)", "summary", "df-generated"]
      - ["ILLink.RoslynAnalyzer.TrimAnalysis", "TrimAnalysisReflectionAccessPattern", "op_Inequality", "(ILLink.RoslynAnalyzer.TrimAnalysis.TrimAnalysisReflectionAccessPattern,ILLink.RoslynAnalyzer.TrimAnalysis.TrimAnalysisReflectionAccessPattern)", "summary", "df-generated"]
      - ["ILLink.RoslynAnalyzer.TrimAnalysis", "TrimAnalysisVisitor", "GetConditionValue", "(Microsoft.CodeAnalysis.IOperation,ILLink.RoslynAnalyzer.DataFlow.LocalDataFlowState<ILLink.Shared.DataFlow.ValueSet<ILLink.Shared.DataFlow.SingleValue>,ILLink.RoslynAnalyzer.DataFlow.FeatureContext,ILLink.Shared.DataFlow.ValueSetLattice<ILLink.Shared.DataFlow.SingleValue>,ILLink.RoslynAnalyzer.DataFlow.FeatureContextLattice>)", "summary", "df-generated"]
      - ["ILLink.RoslynAnalyzer.TrimAnalysis", "TrimAnalysisVisitor", "GetParameterTargetValue", "(Microsoft.CodeAnalysis.IParameterSymbol)", "summary", "df-generated"]
-      - ["ILLink.RoslynAnalyzer.TrimAnalysis", "TrimAnalysisVisitor", "HandleArrayElementRead", "(ILLink.Shared.DataFlow.ValueSet<ILLink.Shared.DataFlow.SingleValue>,ILLink.Shared.DataFlow.ValueSet<ILLink.Shared.DataFlow.SingleValue>,Microsoft.CodeAnalysis.IOperation)", "summary", "df-generated"]
      - ["ILLink.RoslynAnalyzer.TrimAnalysis", "TrimAnalysisVisitor", "HandleArrayElementWrite", "(ILLink.Shared.DataFlow.ValueSet<ILLink.Shared.DataFlow.SingleValue>,ILLink.Shared.DataFlow.ValueSet<ILLink.Shared.DataFlow.SingleValue>,ILLink.Shared.DataFlow.ValueSet<ILLink.Shared.DataFlow.SingleValue>,Microsoft.CodeAnalysis.IOperation,System.Boolean)", "summary", "df-generated"]
      - ["ILLink.RoslynAnalyzer.TrimAnalysis", "TrimAnalysisVisitor", "HandleAssignment", "(ILLink.Shared.DataFlow.ValueSet<ILLink.Shared.DataFlow.SingleValue>,ILLink.Shared.DataFlow.ValueSet<ILLink.Shared.DataFlow.SingleValue>,Microsoft.CodeAnalysis.IOperation,ILLink.RoslynAnalyzer.DataFlow.FeatureContext)", "summary", "df-generated"]
-      - ["ILLink.RoslynAnalyzer.TrimAnalysis", "TrimAnalysisVisitor", "HandleDelegateCreation", "(Microsoft.CodeAnalysis.IMethodSymbol,Microsoft.CodeAnalysis.IOperation,ILLink.RoslynAnalyzer.DataFlow.FeatureContext)", "summary", "df-generated"]
      - ["ILLink.RoslynAnalyzer.TrimAnalysis", "TrimAnalysisVisitor", "HandleReturnValue", "(ILLink.Shared.DataFlow.ValueSet<ILLink.Shared.DataFlow.SingleValue>,Microsoft.CodeAnalysis.IOperation,ILLink.RoslynAnalyzer.DataFlow.FeatureContext)", "summary", "df-generated"]
-      - ["ILLink.RoslynAnalyzer.TrimAnalysis", "TrimAnalysisVisitor", "Visit", "(Microsoft.CodeAnalysis.IOperation,ILLink.RoslynAnalyzer.DataFlow.LocalDataFlowState<ILLink.Shared.DataFlow.ValueSet<ILLink.Shared.DataFlow.SingleValue>,ILLink.RoslynAnalyzer.DataFlow.FeatureContext,ILLink.Shared.DataFlow.ValueSetLattice<ILLink.Shared.DataFlow.SingleValue>,ILLink.RoslynAnalyzer.DataFlow.FeatureContextLattice>)", "summary", "df-generated"]
-      - ["ILLink.RoslynAnalyzer.TrimAnalysis", "TrimAnalysisVisitor", "VisitArrayCreation", "(Microsoft.CodeAnalysis.Operations.IArrayCreationOperation,ILLink.RoslynAnalyzer.DataFlow.LocalDataFlowState<ILLink.Shared.DataFlow.ValueSet<ILLink.Shared.DataFlow.SingleValue>,ILLink.RoslynAnalyzer.DataFlow.FeatureContext,ILLink.Shared.DataFlow.ValueSetLattice<ILLink.Shared.DataFlow.SingleValue>,ILLink.RoslynAnalyzer.DataFlow.FeatureContextLattice>)", "summary", "df-generated"]
-      - ["ILLink.RoslynAnalyzer.TrimAnalysis", "TrimAnalysisVisitor", "VisitBinaryOperator", "(Microsoft.CodeAnalysis.Operations.IBinaryOperation,ILLink.RoslynAnalyzer.DataFlow.LocalDataFlowState<ILLink.Shared.DataFlow.ValueSet<ILLink.Shared.DataFlow.SingleValue>,ILLink.RoslynAnalyzer.DataFlow.FeatureContext,ILLink.Shared.DataFlow.ValueSetLattice<ILLink.Shared.DataFlow.SingleValue>,ILLink.RoslynAnalyzer.DataFlow.FeatureContextLattice>)", "summary", "df-generated"]
-      - ["ILLink.RoslynAnalyzer.TrimAnalysis", "TrimAnalysisVisitor", "VisitConversion", "(Microsoft.CodeAnalysis.Operations.IConversionOperation,ILLink.RoslynAnalyzer.DataFlow.LocalDataFlowState<ILLink.Shared.DataFlow.ValueSet<ILLink.Shared.DataFlow.SingleValue>,ILLink.RoslynAnalyzer.DataFlow.FeatureContext,ILLink.Shared.DataFlow.ValueSetLattice<ILLink.Shared.DataFlow.SingleValue>,ILLink.RoslynAnalyzer.DataFlow.FeatureContextLattice>)", "summary", "df-generated"]
-      - ["ILLink.RoslynAnalyzer.TrimAnalysis", "TrimAnalysisVisitor", "VisitFieldReference", "(Microsoft.CodeAnalysis.Operations.IFieldReferenceOperation,ILLink.RoslynAnalyzer.DataFlow.LocalDataFlowState<ILLink.Shared.DataFlow.ValueSet<ILLink.Shared.DataFlow.SingleValue>,ILLink.RoslynAnalyzer.DataFlow.FeatureContext,ILLink.Shared.DataFlow.ValueSetLattice<ILLink.Shared.DataFlow.SingleValue>,ILLink.RoslynAnalyzer.DataFlow.FeatureContextLattice>)", "summary", "df-generated"]
-      - ["ILLink.RoslynAnalyzer.TrimAnalysis", "TrimAnalysisVisitor", "VisitInstanceReference", "(Microsoft.CodeAnalysis.Operations.IInstanceReferenceOperation,ILLink.RoslynAnalyzer.DataFlow.LocalDataFlowState<ILLink.Shared.DataFlow.ValueSet<ILLink.Shared.DataFlow.SingleValue>,ILLink.RoslynAnalyzer.DataFlow.FeatureContext,ILLink.Shared.DataFlow.ValueSetLattice<ILLink.Shared.DataFlow.SingleValue>,ILLink.RoslynAnalyzer.DataFlow.FeatureContextLattice>)", "summary", "df-generated"]
      - ["ILLink.RoslynAnalyzer.TrimAnalysis", "TrimAnalysisVisitor", "VisitParameterReference", "(Microsoft.CodeAnalysis.Operations.IParameterReferenceOperation,ILLink.RoslynAnalyzer.DataFlow.LocalDataFlowState<ILLink.Shared.DataFlow.ValueSet<ILLink.Shared.DataFlow.SingleValue>,ILLink.RoslynAnalyzer.DataFlow.FeatureContext,ILLink.Shared.DataFlow.ValueSetLattice<ILLink.Shared.DataFlow.SingleValue>,ILLink.RoslynAnalyzer.DataFlow.FeatureContextLattice>)", "summary", "df-generated"]
-      - ["ILLink.RoslynAnalyzer.TrimAnalysis", "TrimAnalysisVisitor", "VisitTypeOf", "(Microsoft.CodeAnalysis.Operations.ITypeOfOperation,ILLink.RoslynAnalyzer.DataFlow.LocalDataFlowState<ILLink.Shared.DataFlow.ValueSet<ILLink.Shared.DataFlow.SingleValue>,ILLink.RoslynAnalyzer.DataFlow.FeatureContext,ILLink.Shared.DataFlow.ValueSetLattice<ILLink.Shared.DataFlow.SingleValue>,ILLink.RoslynAnalyzer.DataFlow.FeatureContextLattice>)", "summary", "df-generated"]
      - ["ILLink.RoslynAnalyzer.TrimAnalysis", "TrimDataFlowAnalysis", "CollectDiagnostics", "()", "summary", "df-generated"]
      - ["ILLink.RoslynAnalyzer.TrimAnalysis", "TrimDataFlowAnalysis", "TraceBlockInput", "(ILLink.RoslynAnalyzer.DataFlow.LocalStateAndContext<ILLink.Shared.DataFlow.ValueSet<ILLink.Shared.DataFlow.SingleValue>,ILLink.RoslynAnalyzer.DataFlow.FeatureContext>,System.Nullable<ILLink.RoslynAnalyzer.DataFlow.LocalStateAndContext<ILLink.Shared.DataFlow.ValueSet<ILLink.Shared.DataFlow.SingleValue>,ILLink.RoslynAnalyzer.DataFlow.FeatureContext>>,System.Nullable<ILLink.RoslynAnalyzer.DataFlow.LocalStateAndContext<ILLink.Shared.DataFlow.ValueSet<ILLink.Shared.DataFlow.SingleValue>,ILLink.RoslynAnalyzer.DataFlow.FeatureContext>>)", "summary", "df-generated"]
      - ["ILLink.RoslynAnalyzer.TrimAnalysis", "TrimDataFlowAnalysis", "TraceBlockOutput", "(ILLink.RoslynAnalyzer.DataFlow.LocalStateAndContext<ILLink.Shared.DataFlow.ValueSet<ILLink.Shared.DataFlow.SingleValue>,ILLink.RoslynAnalyzer.DataFlow.FeatureContext>,System.Nullable<ILLink.RoslynAnalyzer.DataFlow.LocalStateAndContext<ILLink.Shared.DataFlow.ValueSet<ILLink.Shared.DataFlow.SingleValue>,ILLink.RoslynAnalyzer.DataFlow.FeatureContext>>,System.Nullable<ILLink.RoslynAnalyzer.DataFlow.LocalStateAndContext<ILLink.Shared.DataFlow.ValueSet<ILLink.Shared.DataFlow.SingleValue>,ILLink.RoslynAnalyzer.DataFlow.FeatureContext>>)", "summary", "df-generated"]
--- a/csharp/ql/lib/ext/generated/ILLink.RoslynAnalyzer.model.yml
+++ b/csharp/ql/lib/ext/generated/ILLink.RoslynAnalyzer.model.yml
@@ -6,6 +6,14 @@ extensions:
    data:
      - ["ILLink.RoslynAnalyzer", "CompilationExtensions", False, "GetUnqualifiedName", "(Microsoft.CodeAnalysis.CSharp.Syntax.NameSyntax)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
      - ["ILLink.RoslynAnalyzer", "CompilationExtensions", False, "ToImmutableArray<T>", "(System.ReadOnlySpan<T>)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["ILLink.RoslynAnalyzer", "DataFlowAnalyzerContext", False, "Create", "(Microsoft.CodeAnalysis.Diagnostics.AnalyzerOptions,Microsoft.CodeAnalysis.Compilation,System.Collections.Immutable.ImmutableArray<ILLink.RoslynAnalyzer.RequiresAnalyzerBase>)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["ILLink.RoslynAnalyzer", "DataFlowAnalyzerContext", False, "get_EnabledRequiresAnalyzers", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["ILLink.RoslynAnalyzer", "IPropertySymbolExtensions", False, "GetGetMethod", "(Microsoft.CodeAnalysis.IPropertySymbol)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["ILLink.RoslynAnalyzer", "IPropertySymbolExtensions", False, "GetSetMethod", "(Microsoft.CodeAnalysis.IPropertySymbol)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["ILLink.RoslynAnalyzer", "ISymbolExtensions", False, "GetDisplayName", "(Microsoft.CodeAnalysis.ISymbol)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["ILLink.RoslynAnalyzer", "RequiresAnalyzerBase", False, "FindContainingSymbol", "(Microsoft.CodeAnalysis.Diagnostics.OperationAnalysisContext,ILLink.RoslynAnalyzer.RequiresAnalyzerBase+DiagnosticTargets)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["ILLink.RoslynAnalyzer", "RequiresAnalyzerBase", True, "GetMessageFromAttribute", "(Microsoft.CodeAnalysis.AttributeData)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["ILLink.RoslynAnalyzer", "RequiresUnreferencedCodeUtils", False, "GetMessageFromAttribute", "(Microsoft.CodeAnalysis.AttributeData)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
  - addsTo:
      pack: codeql/csharp-all
      extensible: neutralModel
@@ -13,12 +21,10 @@ extensions:
      - ["ILLink.RoslynAnalyzer", "COMAnalyzer", "Initialize", "(Microsoft.CodeAnalysis.Diagnostics.AnalysisContext)", "summary", "df-generated"]
      - ["ILLink.RoslynAnalyzer", "COMAnalyzer", "get_SupportedDiagnostics", "()", "summary", "df-generated"]
      - ["ILLink.RoslynAnalyzer", "CompilationExtensions", "GetBestTypeByMetadataName", "(Microsoft.CodeAnalysis.Compilation,System.String)", "summary", "df-generated"]
-      - ["ILLink.RoslynAnalyzer", "DataFlowAnalyzerContext", "Create", "(Microsoft.CodeAnalysis.Diagnostics.AnalyzerOptions,Microsoft.CodeAnalysis.Compilation,System.Collections.Immutable.ImmutableArray<ILLink.RoslynAnalyzer.RequiresAnalyzerBase>)", "summary", "df-generated"]
      - ["ILLink.RoslynAnalyzer", "DataFlowAnalyzerContext", "GetSpecialIncompatibleMembers", "(ILLink.RoslynAnalyzer.RequiresAnalyzerBase)", "summary", "df-generated"]
      - ["ILLink.RoslynAnalyzer", "DataFlowAnalyzerContext", "get_AnyAnalyzersEnabled", "()", "summary", "df-generated"]
      - ["ILLink.RoslynAnalyzer", "DataFlowAnalyzerContext", "get_Compilation", "()", "summary", "df-generated"]
      - ["ILLink.RoslynAnalyzer", "DataFlowAnalyzerContext", "get_EnableTrimAnalyzer", "()", "summary", "df-generated"]
-      - ["ILLink.RoslynAnalyzer", "DataFlowAnalyzerContext", "get_EnabledRequiresAnalyzers", "()", "summary", "df-generated"]
      - ["ILLink.RoslynAnalyzer", "DiagnosticDescriptors", "GetDiagnosticDescriptor", "(ILLink.Shared.DiagnosticId)", "summary", "df-generated"]
      - ["ILLink.RoslynAnalyzer", "DiagnosticDescriptors", "GetDiagnosticDescriptor", "(ILLink.Shared.DiagnosticId,ILLink.Shared.DiagnosticString)", "summary", "df-generated"]
      - ["ILLink.RoslynAnalyzer", "DiagnosticDescriptors", "GetDiagnosticDescriptor", "(ILLink.Shared.DiagnosticId,Microsoft.CodeAnalysis.LocalizableResourceString,Microsoft.CodeAnalysis.LocalizableResourceString,System.String,Microsoft.CodeAnalysis.DiagnosticSeverity,System.Boolean,System.String)", "summary", "df-generated"]
@@ -26,9 +32,6 @@ extensions:
      - ["ILLink.RoslynAnalyzer", "DynamicallyAccessedMembersAnalyzer", "Initialize", "(Microsoft.CodeAnalysis.Diagnostics.AnalysisContext)", "summary", "df-generated"]
      - ["ILLink.RoslynAnalyzer", "DynamicallyAccessedMembersAnalyzer", "get_RequiresAnalyzers", "()", "summary", "df-generated"]
      - ["ILLink.RoslynAnalyzer", "DynamicallyAccessedMembersAnalyzer", "get_SupportedDiagnostics", "()", "summary", "df-generated"]
-      - ["ILLink.RoslynAnalyzer", "IPropertySymbolExtensions", "GetGetMethod", "(Microsoft.CodeAnalysis.IPropertySymbol)", "summary", "df-generated"]
-      - ["ILLink.RoslynAnalyzer", "IPropertySymbolExtensions", "GetSetMethod", "(Microsoft.CodeAnalysis.IPropertySymbol)", "summary", "df-generated"]
-      - ["ILLink.RoslynAnalyzer", "ISymbolExtensions", "GetDisplayName", "(Microsoft.CodeAnalysis.ISymbol)", "summary", "df-generated"]
      - ["ILLink.RoslynAnalyzer", "ISymbolExtensions", "IsConstructor", "(Microsoft.CodeAnalysis.ISymbol)", "summary", "df-generated"]
      - ["ILLink.RoslynAnalyzer", "ISymbolExtensions", "IsInterface", "(Microsoft.CodeAnalysis.ISymbol)", "summary", "df-generated"]
      - ["ILLink.RoslynAnalyzer", "ISymbolExtensions", "IsStaticConstructor", "(Microsoft.CodeAnalysis.ISymbol)", "summary", "df-generated"]
@@ -37,27 +40,21 @@ extensions:
      - ["ILLink.RoslynAnalyzer", "ISymbolExtensions", "get_ILLinkTypeDisplayFormat", "()", "summary", "df-generated"]
      - ["ILLink.RoslynAnalyzer", "RequiresAnalyzerBase", "CheckAndCreateRequiresDiagnostic", "(Microsoft.CodeAnalysis.IOperation,Microsoft.CodeAnalysis.ISymbol,Microsoft.CodeAnalysis.ISymbol,System.Collections.Immutable.ImmutableArray<Microsoft.CodeAnalysis.ISymbol>,Microsoft.CodeAnalysis.Diagnostic)", "summary", "df-generated"]
      - ["ILLink.RoslynAnalyzer", "RequiresAnalyzerBase", "CreateSpecialIncompatibleMembersDiagnostic", "(Microsoft.CodeAnalysis.IOperation,System.Collections.Immutable.ImmutableArray<Microsoft.CodeAnalysis.ISymbol>,Microsoft.CodeAnalysis.ISymbol,Microsoft.CodeAnalysis.Diagnostic)", "summary", "df-generated"]
-      - ["ILLink.RoslynAnalyzer", "RequiresAnalyzerBase", "FindContainingSymbol", "(Microsoft.CodeAnalysis.Diagnostics.OperationAnalysisContext,ILLink.RoslynAnalyzer.RequiresAnalyzerBase+DiagnosticTargets)", "summary", "df-generated"]
-      - ["ILLink.RoslynAnalyzer", "RequiresAnalyzerBase", "GetMessageFromAttribute", "(Microsoft.CodeAnalysis.AttributeData)", "summary", "df-generated"]
      - ["ILLink.RoslynAnalyzer", "RequiresAnalyzerBase", "GetUrlFromAttribute", "(Microsoft.CodeAnalysis.AttributeData)", "summary", "df-generated"]
      - ["ILLink.RoslynAnalyzer", "RequiresAnalyzerBase", "Initialize", "(Microsoft.CodeAnalysis.Diagnostics.AnalysisContext)", "summary", "df-generated"]
      - ["ILLink.RoslynAnalyzer", "RequiresAnalyzerBase", "VerifyAttributeArguments", "(Microsoft.CodeAnalysis.AttributeData)", "summary", "df-generated"]
      - ["ILLink.RoslynAnalyzer", "RequiresAssemblyFilesAnalyzer", "CreateSpecialIncompatibleMembersDiagnostic", "(Microsoft.CodeAnalysis.IOperation,System.Collections.Immutable.ImmutableArray<Microsoft.CodeAnalysis.ISymbol>,Microsoft.CodeAnalysis.ISymbol,Microsoft.CodeAnalysis.Diagnostic)", "summary", "df-generated"]
-      - ["ILLink.RoslynAnalyzer", "RequiresAssemblyFilesAnalyzer", "GetMessageFromAttribute", "(Microsoft.CodeAnalysis.AttributeData)", "summary", "df-generated"]
      - ["ILLink.RoslynAnalyzer", "RequiresAssemblyFilesAnalyzer", "VerifyAttributeArguments", "(Microsoft.CodeAnalysis.AttributeData)", "summary", "df-generated"]
      - ["ILLink.RoslynAnalyzer", "RequiresAssemblyFilesAnalyzer", "get_SupportedDiagnostics", "()", "summary", "df-generated"]
-      - ["ILLink.RoslynAnalyzer", "RequiresDynamicCodeAnalyzer", "GetMessageFromAttribute", "(Microsoft.CodeAnalysis.AttributeData)", "summary", "df-generated"]
      - ["ILLink.RoslynAnalyzer", "RequiresDynamicCodeAnalyzer", "VerifyAttributeArguments", "(Microsoft.CodeAnalysis.AttributeData)", "summary", "df-generated"]
      - ["ILLink.RoslynAnalyzer", "RequiresDynamicCodeAnalyzer", "get_SupportedDiagnostics", "()", "summary", "df-generated"]
      - ["ILLink.RoslynAnalyzer", "RequiresISymbolExtensions", "DoesMemberRequire", "(Microsoft.CodeAnalysis.ISymbol,System.String,Microsoft.CodeAnalysis.AttributeData)", "summary", "df-generated"]
      - ["ILLink.RoslynAnalyzer", "RequiresISymbolExtensions", "IsInRequiresScope", "(Microsoft.CodeAnalysis.ISymbol,System.String)", "summary", "df-generated"]
      - ["ILLink.RoslynAnalyzer", "RequiresISymbolExtensions", "IsInRequiresScope", "(Microsoft.CodeAnalysis.ISymbol,System.String,Microsoft.CodeAnalysis.AttributeData)", "summary", "df-generated"]
      - ["ILLink.RoslynAnalyzer", "RequiresUnreferencedCodeAnalyzer", "CreateSpecialIncompatibleMembersDiagnostic", "(Microsoft.CodeAnalysis.IOperation,System.Collections.Immutable.ImmutableArray<Microsoft.CodeAnalysis.ISymbol>,Microsoft.CodeAnalysis.ISymbol,Microsoft.CodeAnalysis.Diagnostic)", "summary", "df-generated"]
-      - ["ILLink.RoslynAnalyzer", "RequiresUnreferencedCodeAnalyzer", "GetMessageFromAttribute", "(Microsoft.CodeAnalysis.AttributeData)", "summary", "df-generated"]
      - ["ILLink.RoslynAnalyzer", "RequiresUnreferencedCodeAnalyzer", "VerifyAttributeArguments", "(Microsoft.CodeAnalysis.AttributeData)", "summary", "df-generated"]
      - ["ILLink.RoslynAnalyzer", "RequiresUnreferencedCodeAnalyzer", "get_SupportedDiagnostics", "()", "summary", "df-generated"]
      - ["ILLink.RoslynAnalyzer", "RequiresUnreferencedCodeUtils", "DoesMemberRequireUnreferencedCodeAttribute", "(Microsoft.CodeAnalysis.ISymbol,Microsoft.CodeAnalysis.AttributeData)", "summary", "df-generated"]
-      - ["ILLink.RoslynAnalyzer", "RequiresUnreferencedCodeUtils", "GetMessageFromAttribute", "(Microsoft.CodeAnalysis.AttributeData)", "summary", "df-generated"]
      - ["ILLink.RoslynAnalyzer", "RequiresUnreferencedCodeUtils", "IsInRequiresUnreferencedCodeAttributeScope", "(Microsoft.CodeAnalysis.ISymbol,Microsoft.CodeAnalysis.AttributeData)", "summary", "df-generated"]
      - ["ILLink.RoslynAnalyzer", "RequiresUnreferencedCodeUtils", "TryGetRequiresUnreferencedCodeAttribute", "(Microsoft.CodeAnalysis.ISymbol,Microsoft.CodeAnalysis.AttributeData)", "summary", "df-generated"]
      - ["ILLink.RoslynAnalyzer", "RequiresUnreferencedCodeUtils", "VerifyRequiresUnreferencedCodeAttributeArguments", "(Microsoft.CodeAnalysis.AttributeData)", "summary", "df-generated"]
--- a/csharp/ql/lib/ext/generated/ILLink.Shared.DataFlow.model.yml
+++ b/csharp/ql/lib/ext/generated/ILLink.Shared.DataFlow.model.yml
@@ -4,6 +4,7 @@ extensions:
      pack: codeql/csharp-all
      extensible: summaryModel
    data:
+      - ["ILLink.Shared.DataFlow", "Box<T>", False, "Box", "(T)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
      - ["ILLink.Shared.DataFlow", "DefaultValueDictionary<TKey,TValue>", False, "Clone", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
      - ["ILLink.Shared.DataFlow", "DefaultValueDictionary<TKey,TValue>", False, "DefaultValueDictionary", "(ILLink.Shared.DataFlow.DefaultValueDictionary<TKey,TValue>)", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
      - ["ILLink.Shared.DataFlow", "DefaultValueDictionary<TKey,TValue>", False, "DefaultValueDictionary", "(TValue)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
@@ -33,7 +34,6 @@ extensions:
      pack: codeql/csharp-all
      extensible: neutralModel
    data:
-      - ["ILLink.Shared.DataFlow", "Box<T>", "Box", "(T)", "summary", "df-generated"]
      - ["ILLink.Shared.DataFlow", "DefaultValueDictionary<TKey,TValue>", "Equals", "(ILLink.Shared.DataFlow.DefaultValueDictionary<TKey,TValue>)", "summary", "df-generated"]
      - ["ILLink.Shared.DataFlow", "DefaultValueDictionary<TKey,TValue>", "Equals", "(System.Object)", "summary", "df-generated"]
      - ["ILLink.Shared.DataFlow", "DefaultValueDictionary<TKey,TValue>", "GetHashCode", "()", "summary", "df-generated"]
--- a/csharp/ql/lib/ext/generated/ILLink.Shared.TrimAnalysis.model.yml
+++ b/csharp/ql/lib/ext/generated/ILLink.Shared.TrimAnalysis.model.yml
@@ -5,6 +5,7 @@ extensions:
      extensible: summaryModel
    data:
      - ["ILLink.Shared.TrimAnalysis", "FlowAnnotations", False, "FlowAnnotations", "(Mono.Linker.LinkContext)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["ILLink.Shared.TrimAnalysis", "ValueWithDynamicallyAccessedMembers", True, "GetDiagnosticArgumentsForAnnotationMismatch", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
  - addsTo:
      pack: codeql/csharp-all
      extensible: neutralModel
@@ -37,7 +38,6 @@ extensions:
      - ["ILLink.Shared.TrimAnalysis", "ReferenceValue", "get_EqualityContract", "()", "summary", "df-generated"]
      - ["ILLink.Shared.TrimAnalysis", "ReferenceValue", "op_Equality", "(ILLink.Shared.TrimAnalysis.ReferenceValue,ILLink.Shared.TrimAnalysis.ReferenceValue)", "summary", "df-generated"]
      - ["ILLink.Shared.TrimAnalysis", "ReferenceValue", "op_Inequality", "(ILLink.Shared.TrimAnalysis.ReferenceValue,ILLink.Shared.TrimAnalysis.ReferenceValue)", "summary", "df-generated"]
-      - ["ILLink.Shared.TrimAnalysis", "ValueWithDynamicallyAccessedMembers", "GetDiagnosticArgumentsForAnnotationMismatch", "()", "summary", "df-generated"]
      - ["ILLink.Shared.TrimAnalysis", "ValueWithDynamicallyAccessedMembers", "get_DynamicallyAccessedMemberTypes", "()", "summary", "df-generated"]
      - ["ILLink.Shared.TrimAnalysis", "ValueWithDynamicallyAccessedMembers", "get_EqualityContract", "()", "summary", "df-generated"]
      - ["ILLink.Shared.TrimAnalysis", "ValueWithDynamicallyAccessedMembers", "op_Equality", "(ILLink.Shared.TrimAnalysis.ValueWithDynamicallyAccessedMembers,ILLink.Shared.TrimAnalysis.ValueWithDynamicallyAccessedMembers)", "summary", "df-generated"]
--- a/csharp/ql/lib/ext/generated/ILLink.Tasks.model.yml
+++ b/csharp/ql/lib/ext/generated/ILLink.Tasks.model.yml
@@ -6,6 +6,7 @@ extensions:
    data:
      - ["ILLink.Tasks", "ILLink", True, "GenerateCommandLineCommands", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
      - ["ILLink.Tasks", "ILLink", True, "GenerateFullPathToTool", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["ILLink.Tasks", "ILLink", True, "GenerateResponseFileCommands", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
      - ["ILLink.Tasks", "ILLink", True, "get_ToolName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
  - addsTo:
      pack: codeql/csharp-all
@@ -16,7 +17,6 @@ extensions:
      - ["ILLink.Tasks", "CreateRuntimeRootILLinkDescriptorFile", "Execute", "()", "summary", "df-generated"]
      - ["ILLink.Tasks", "CreateRuntimeRootILLinkDescriptorFile", "ProcessCoreTypes", "(System.String)", "summary", "df-generated"]
      - ["ILLink.Tasks", "CreateRuntimeRootILLinkDescriptorFile", "ProcessExceptionTypes", "(System.String)", "summary", "df-generated"]
-      - ["ILLink.Tasks", "ILLink", "GenerateResponseFileCommands", "()", "summary", "df-generated"]
      - ["ILLink.Tasks", "ILLink", "get_StandardErrorLoggingImportance", "()", "summary", "df-generated"]
      - ["ILLink.Tasks", "ILLink", "set_BeforeFieldInit", "(System.Boolean)", "summary", "df-generated"]
      - ["ILLink.Tasks", "ILLink", "set_IPConstProp", "(System.Boolean)", "summary", "df-generated"]
--- a/csharp/ql/lib/ext/generated/Internal.IL.model.yml
+++ b/csharp/ql/lib/ext/generated/Internal.IL.model.yml
@@ -41,7 +41,6 @@ extensions:
      - ["Internal.IL", "EcmaMethodDebugInformation", "get_IsStateMachineMoveNextMethod", "()", "summary", "df-generated"]
      - ["Internal.IL", "EcmaMethodIL", "get_IsInitLocals", "()", "summary", "df-generated"]
      - ["Internal.IL", "EcmaMethodIL", "get_MaxStack", "()", "summary", "df-generated"]
-      - ["Internal.IL", "ILDisassembler+ILTypeNameFormatter", "AppendName", "(System.Text.StringBuilder,Internal.TypeSystem.GenericParameterDesc)", "summary", "df-generated"]
      - ["Internal.IL", "ILDisassembler+ILTypeNameFormatter", "AppendName", "(System.Text.StringBuilder,Internal.TypeSystem.SignatureMethodVariable)", "summary", "df-generated"]
      - ["Internal.IL", "ILDisassembler+ILTypeNameFormatter", "AppendName", "(System.Text.StringBuilder,Internal.TypeSystem.SignatureTypeVariable)", "summary", "df-generated"]
      - ["Internal.IL", "ILDisassembler", "AppendOffset", "(System.Text.StringBuilder,System.Int32)", "summary", "df-generated"]
--- a/csharp/ql/lib/ext/generated/Internal.TypeSystem.Ecma.model.yml
+++ b/csharp/ql/lib/ext/generated/Internal.TypeSystem.Ecma.model.yml
@@ -10,12 +10,15 @@ extensions:
      - ["Internal.TypeSystem.Ecma", "EcmaAssembly", False, "EcmaAssembly", "(Internal.TypeSystem.TypeSystemContext,System.Reflection.PortableExecutable.PEReader,System.Reflection.Metadata.MetadataReader,Internal.TypeSystem.IModuleResolver)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
      - ["Internal.TypeSystem.Ecma", "EcmaAssembly", False, "get_AssemblyDefinition", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
      - ["Internal.TypeSystem.Ecma", "EcmaField", False, "get_Handle", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["Internal.TypeSystem.Ecma", "EcmaField", False, "get_MetadataReader", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
      - ["Internal.TypeSystem.Ecma", "EcmaField", False, "get_Module", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
      - ["Internal.TypeSystem.Ecma", "EcmaGenericParameter", False, "get_Handle", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
      - ["Internal.TypeSystem.Ecma", "EcmaGenericParameter", False, "get_MetadataReader", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
      - ["Internal.TypeSystem.Ecma", "EcmaGenericParameter", False, "get_Module", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
      - ["Internal.TypeSystem.Ecma", "EcmaMethod", False, "get_Handle", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["Internal.TypeSystem.Ecma", "EcmaMethod", False, "get_MetadataReader", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
      - ["Internal.TypeSystem.Ecma", "EcmaMethod", False, "get_Module", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["Internal.TypeSystem.Ecma", "EcmaModule", False, "Create", "(Internal.TypeSystem.TypeSystemContext,System.Reflection.PortableExecutable.PEReader,Internal.TypeSystem.IAssemblyDesc,Internal.TypeSystem.Ecma.PdbSymbolReader,Internal.TypeSystem.IModuleResolver)", "", "Argument[3]", "ReturnValue", "taint", "df-generated"]
      - ["Internal.TypeSystem.Ecma", "EcmaModule", False, "Create", "(Internal.TypeSystem.TypeSystemContext,System.Reflection.PortableExecutable.PEReader,Internal.TypeSystem.IAssemblyDesc,Internal.TypeSystem.IModuleResolver)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
      - ["Internal.TypeSystem.Ecma", "EcmaModule", False, "Create", "(Internal.TypeSystem.TypeSystemContext,System.Reflection.PortableExecutable.PEReader,Internal.TypeSystem.IAssemblyDesc,Internal.TypeSystem.IModuleResolver)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
      - ["Internal.TypeSystem.Ecma", "EcmaModule", False, "Create", "(Internal.TypeSystem.TypeSystemContext,System.Reflection.PortableExecutable.PEReader,Internal.TypeSystem.IAssemblyDesc,Internal.TypeSystem.IModuleResolver)", "", "Argument[3]", "ReturnValue", "taint", "df-generated"]
@@ -72,13 +75,11 @@ extensions:
      - ["Internal.TypeSystem.Ecma", "EcmaField", "get_IsLiteral", "()", "summary", "df-generated"]
      - ["Internal.TypeSystem.Ecma", "EcmaField", "get_IsStatic", "()", "summary", "df-generated"]
      - ["Internal.TypeSystem.Ecma", "EcmaField", "get_IsThreadStatic", "()", "summary", "df-generated"]
-      - ["Internal.TypeSystem.Ecma", "EcmaField", "get_MetadataReader", "()", "summary", "df-generated"]
      - ["Internal.TypeSystem.Ecma", "EcmaFieldExtensions", "GetFieldRvaData", "(Internal.TypeSystem.Ecma.EcmaField)", "summary", "df-generated"]
      - ["Internal.TypeSystem.Ecma", "EcmaFieldExtensions", "GetFieldRvaValue", "(Internal.TypeSystem.Ecma.EcmaField)", "summary", "df-generated"]
      - ["Internal.TypeSystem.Ecma", "EcmaGenericParameter", "CompareToImpl", "(Internal.TypeSystem.TypeDesc,Internal.TypeSystem.TypeSystemComparer)", "summary", "df-generated"]
      - ["Internal.TypeSystem.Ecma", "EcmaGenericParameter", "get_ClassCode", "()", "summary", "df-generated"]
      - ["Internal.TypeSystem.Ecma", "EcmaGenericParameter", "get_Constraints", "()", "summary", "df-generated"]
-      - ["Internal.TypeSystem.Ecma", "EcmaGenericParameter", "get_DiagnosticName", "()", "summary", "df-generated"]
      - ["Internal.TypeSystem.Ecma", "EcmaGenericParameter", "get_Index", "()", "summary", "df-generated"]
      - ["Internal.TypeSystem.Ecma", "EcmaGenericParameter", "get_Kind", "()", "summary", "df-generated"]
      - ["Internal.TypeSystem.Ecma", "EcmaGenericParameter", "get_Name", "()", "summary", "df-generated"]
@@ -109,11 +110,9 @@ extensions:
      - ["Internal.TypeSystem.Ecma", "EcmaMethod", "get_IsSynchronized", "()", "summary", "df-generated"]
      - ["Internal.TypeSystem.Ecma", "EcmaMethod", "get_IsUnmanagedCallersOnly", "()", "summary", "df-generated"]
      - ["Internal.TypeSystem.Ecma", "EcmaMethod", "get_IsVirtual", "()", "summary", "df-generated"]
-      - ["Internal.TypeSystem.Ecma", "EcmaMethod", "get_MetadataReader", "()", "summary", "df-generated"]
      - ["Internal.TypeSystem.Ecma", "EcmaMethod", "get_RequireSecObject", "()", "summary", "df-generated"]
      - ["Internal.TypeSystem.Ecma", "EcmaModule", "CompareTo", "(Internal.TypeSystem.Ecma.EcmaModule)", "summary", "df-generated"]
      - ["Internal.TypeSystem.Ecma", "EcmaModule", "CompareTo", "(Internal.TypeSystem.Ecma.IEcmaModule)", "summary", "df-generated"]
-      - ["Internal.TypeSystem.Ecma", "EcmaModule", "Create", "(Internal.TypeSystem.TypeSystemContext,System.Reflection.PortableExecutable.PEReader,Internal.TypeSystem.IAssemblyDesc,Internal.TypeSystem.Ecma.PdbSymbolReader,Internal.TypeSystem.IModuleResolver)", "summary", "df-generated"]
      - ["Internal.TypeSystem.Ecma", "EcmaModule", "GetContentTypeFromAssemblyFlags", "(System.Reflection.AssemblyFlags)", "summary", "df-generated"]
      - ["Internal.TypeSystem.Ecma", "EcmaModule", "GetUserString", "(System.Reflection.Metadata.UserStringHandle)", "summary", "df-generated"]
      - ["Internal.TypeSystem.Ecma", "EcmaModule", "get_IsPlatformNeutral", "()", "summary", "df-generated"]
@@ -136,7 +135,6 @@ extensions:
      - ["Internal.TypeSystem.Ecma", "EcmaType", "GetHashCode", "()", "summary", "df-generated"]
      - ["Internal.TypeSystem.Ecma", "EcmaType", "GetInlineArrayLength", "()", "summary", "df-generated"]
      - ["Internal.TypeSystem.Ecma", "EcmaType", "GetNestedType", "(System.String)", "summary", "df-generated"]
-      - ["Internal.TypeSystem.Ecma", "EcmaType", "GetNestedTypes", "()", "summary", "df-generated"]
      - ["Internal.TypeSystem.Ecma", "EcmaType", "HasCustomAttribute", "(System.String,System.String)", "summary", "df-generated"]
      - ["Internal.TypeSystem.Ecma", "EcmaType", "get_Attributes", "()", "summary", "df-generated"]
      - ["Internal.TypeSystem.Ecma", "EcmaType", "get_ClassCode", "()", "summary", "df-generated"]
--- a/csharp/ql/lib/ext/generated/Internal.TypeSystem.model.yml
+++ b/csharp/ql/lib/ext/generated/Internal.TypeSystem.model.yml
@@ -14,9 +14,17 @@ extensions:
      - ["Internal.TypeSystem", "ConstructedTypeRewritingHelpers", False, "ReplaceTypesInConstructionOfType", "(Internal.TypeSystem.TypeDesc,Internal.TypeSystem.TypeDesc[],Internal.TypeSystem.TypeDesc[])", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
      - ["Internal.TypeSystem", "ConstructedTypeRewritingHelpers", False, "ReplaceTypesInConstructionOfType", "(Internal.TypeSystem.TypeDesc,Internal.TypeSystem.TypeDesc[],Internal.TypeSystem.TypeDesc[])", "", "Argument[2].Element", "ReturnValue", "taint", "df-generated"]
      - ["Internal.TypeSystem", "CustomAttributeTypeNameFormatter", False, "AppendNameForNamespaceType", "(System.Text.StringBuilder,Internal.TypeSystem.DefType,System.Boolean)", "", "Argument[1]", "Argument[0]", "taint", "df-generated"]
+      - ["Internal.TypeSystem", "CustomAttributeTypeNameFormatter", False, "AppendNameForNamespaceType", "(System.Text.StringBuilder,Internal.TypeSystem.DefType,System.Boolean)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
      - ["Internal.TypeSystem", "CustomAttributeTypeNameFormatter", False, "AppendNameForNestedType", "(System.Text.StringBuilder,Internal.TypeSystem.DefType,Internal.TypeSystem.DefType,System.Boolean)", "", "Argument[1]", "Argument[0]", "taint", "df-generated"]
      - ["Internal.TypeSystem", "CustomAttributeTypeNameFormatter", False, "AppendNameForNestedType", "(System.Text.StringBuilder,Internal.TypeSystem.DefType,Internal.TypeSystem.DefType,System.Boolean)", "", "Argument[2]", "Argument[0]", "taint", "df-generated"]
+      - ["Internal.TypeSystem", "CustomAttributeTypeNameFormatter", False, "AppendNameForNestedType", "(System.Text.StringBuilder,Internal.TypeSystem.DefType,Internal.TypeSystem.DefType,System.Boolean)", "", "Argument[2]", "ReturnValue", "taint", "df-generated"]
      - ["Internal.TypeSystem", "CustomAttributeTypeNameFormatter", False, "CustomAttributeTypeNameFormatter", "(Internal.TypeSystem.IAssemblyDesc)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["Internal.TypeSystem", "DebugNameFormatter", True, "AppendName", "(System.Text.StringBuilder,Internal.TypeSystem.ArrayType,Internal.TypeSystem.DebugNameFormatter+FormatOptions)", "", "Argument[1]", "Argument[0]", "taint", "df-generated"]
+      - ["Internal.TypeSystem", "DebugNameFormatter", True, "AppendName", "(System.Text.StringBuilder,Internal.TypeSystem.ByRefType,Internal.TypeSystem.DebugNameFormatter+FormatOptions)", "", "Argument[1]", "Argument[0]", "taint", "df-generated"]
+      - ["Internal.TypeSystem", "DebugNameFormatter", True, "AppendName", "(System.Text.StringBuilder,Internal.TypeSystem.FunctionPointerType,Internal.TypeSystem.DebugNameFormatter+FormatOptions)", "", "Argument[1]", "Argument[0]", "taint", "df-generated"]
+      - ["Internal.TypeSystem", "DebugNameFormatter", True, "AppendName", "(System.Text.StringBuilder,Internal.TypeSystem.GenericParameterDesc,Internal.TypeSystem.DebugNameFormatter+FormatOptions)", "", "Argument[1]", "Argument[0]", "taint", "df-generated"]
+      - ["Internal.TypeSystem", "DebugNameFormatter", True, "AppendName", "(System.Text.StringBuilder,Internal.TypeSystem.PointerType,Internal.TypeSystem.DebugNameFormatter+FormatOptions)", "", "Argument[1]", "Argument[0]", "taint", "df-generated"]
+      - ["Internal.TypeSystem", "DebugNameFormatter", True, "AppendNameForInstantiatedType", "(System.Text.StringBuilder,Internal.TypeSystem.DefType,Internal.TypeSystem.DebugNameFormatter+FormatOptions)", "", "Argument[1]", "Argument[0]", "taint", "df-generated"]
      - ["Internal.TypeSystem", "DebugNameFormatter", True, "AppendNameForNamespaceType", "(System.Text.StringBuilder,Internal.TypeSystem.DefType,Internal.TypeSystem.DebugNameFormatter+FormatOptions)", "", "Argument[1]", "Argument[0]", "taint", "df-generated"]
      - ["Internal.TypeSystem", "DebugNameFormatter", True, "AppendNameForNestedType", "(System.Text.StringBuilder,Internal.TypeSystem.DefType,Internal.TypeSystem.DefType,Internal.TypeSystem.DebugNameFormatter+FormatOptions)", "", "Argument[1]", "Argument[0]", "taint", "df-generated"]
      - ["Internal.TypeSystem", "DebugNameFormatter", True, "AppendNameForNestedType", "(System.Text.StringBuilder,Internal.TypeSystem.DefType,Internal.TypeSystem.DefType,Internal.TypeSystem.DebugNameFormatter+FormatOptions)", "", "Argument[2]", "Argument[0]", "taint", "df-generated"]
@@ -47,6 +55,7 @@ extensions:
      - ["Internal.TypeSystem", "FieldLayoutAlgorithm", True, "ComputeInstanceLayout", "(Internal.TypeSystem.DefType,Internal.TypeSystem.InstanceLayoutKind)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
      - ["Internal.TypeSystem", "FunctionPointerType", False, "get_Signature", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
      - ["Internal.TypeSystem", "GenericParameterDesc", True, "get_AssociatedTypeOrMethod", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["Internal.TypeSystem", "GenericParameterDesc", True, "get_DiagnosticName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
      - ["Internal.TypeSystem", "IAssemblyDesc", True, "GetName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
      - ["Internal.TypeSystem", "IModuleResolver", True, "ResolveAssembly", "(System.Reflection.AssemblyName,System.Boolean)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
      - ["Internal.TypeSystem", "IPrefixMangledMethod", True, "get_BaseMethod", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
@@ -71,6 +80,8 @@ extensions:
      - ["Internal.TypeSystem", "LockFreeReaderHashtable<TKey,TValue>", False, "GetOrCreateValue", "(TKey)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
      - ["Internal.TypeSystem", "LockFreeReaderHashtable<TKey,TValue>", False, "GetValueIfExists", "(TValue)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
      - ["Internal.TypeSystem", "LockFreeReaderHashtable<TKey,TValue>", False, "TryGetValue", "(TKey,TValue)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["Internal.TypeSystem", "MarshalAsDescriptor", False, "MarshalAsDescriptor", "(Internal.TypeSystem.NativeTypeKind,Internal.TypeSystem.NativeTypeKind,System.Nullable<System.UInt32>,System.Nullable<System.UInt32>,Internal.TypeSystem.TypeDesc,System.String)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
+      - ["Internal.TypeSystem", "MarshalAsDescriptor", False, "MarshalAsDescriptor", "(Internal.TypeSystem.NativeTypeKind,Internal.TypeSystem.NativeTypeKind,System.Nullable<System.UInt32>,System.Nullable<System.UInt32>,Internal.TypeSystem.TypeDesc,System.String)", "", "Argument[3]", "Argument[this]", "taint", "df-generated"]
      - ["Internal.TypeSystem", "MarshalAsDescriptor", False, "MarshalAsDescriptor", "(Internal.TypeSystem.NativeTypeKind,Internal.TypeSystem.NativeTypeKind,System.Nullable<System.UInt32>,System.Nullable<System.UInt32>,Internal.TypeSystem.TypeDesc,System.String)", "", "Argument[4]", "Argument[this]", "taint", "df-generated"]
      - ["Internal.TypeSystem", "MarshalAsDescriptor", False, "MarshalAsDescriptor", "(Internal.TypeSystem.NativeTypeKind,Internal.TypeSystem.NativeTypeKind,System.Nullable<System.UInt32>,System.Nullable<System.UInt32>,Internal.TypeSystem.TypeDesc,System.String)", "", "Argument[5]", "Argument[this]", "taint", "df-generated"]
      - ["Internal.TypeSystem", "MarshalAsDescriptor", False, "get_Cookie", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
@@ -78,6 +89,7 @@ extensions:
      - ["Internal.TypeSystem", "MetadataFieldLayoutAlgorithm", False, "CalculateFieldBaseOffset", "(Internal.TypeSystem.MetadataType,System.Boolean,System.Boolean)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
      - ["Internal.TypeSystem", "MetadataType", False, "get_VirtualMethodImplsForType", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
      - ["Internal.TypeSystem", "MetadataType", True, "ComputeVirtualMethodImplsForType", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["Internal.TypeSystem", "MetadataType", True, "GetNestedTypes", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
      - ["Internal.TypeSystem", "MetadataType", True, "get_ExplicitlyImplementedInterfaces", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
      - ["Internal.TypeSystem", "MetadataType", True, "get_MetadataBaseType", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
      - ["Internal.TypeSystem", "MetadataType", True, "get_Module", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
@@ -117,6 +129,8 @@ extensions:
      - ["Internal.TypeSystem", "MethodSignature", False, "MethodSignature", "(Internal.TypeSystem.MethodSignatureFlags,System.Int32,Internal.TypeSystem.TypeDesc,Internal.TypeSystem.TypeDesc[],Internal.TypeSystem.EmbeddedSignatureData[])", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
      - ["Internal.TypeSystem", "MethodSignature", False, "MethodSignature", "(Internal.TypeSystem.MethodSignatureFlags,System.Int32,Internal.TypeSystem.TypeDesc,Internal.TypeSystem.TypeDesc[],Internal.TypeSystem.EmbeddedSignatureData[])", "", "Argument[3].Element", "Argument[this]", "taint", "df-generated"]
      - ["Internal.TypeSystem", "MethodSignature", False, "MethodSignature", "(Internal.TypeSystem.MethodSignatureFlags,System.Int32,Internal.TypeSystem.TypeDesc,Internal.TypeSystem.TypeDesc[],Internal.TypeSystem.EmbeddedSignatureData[])", "", "Argument[4].Element", "Argument[this]", "taint", "df-generated"]
+      - ["Internal.TypeSystem", "MethodSignature", False, "ToString", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["Internal.TypeSystem", "MethodSignature", False, "ToString", "(System.Boolean)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
      - ["Internal.TypeSystem", "MethodSignature", False, "get_Parameter", "(System.Int32)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
      - ["Internal.TypeSystem", "MethodSignature", False, "get_ReturnType", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
      - ["Internal.TypeSystem", "MethodSignatureBuilder", False, "MethodSignatureBuilder", "(Internal.TypeSystem.MethodSignature)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
@@ -193,18 +207,23 @@ extensions:
      - ["Internal.TypeSystem", "TypeDesc", True, "get_Instantiation", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
      - ["Internal.TypeSystem", "TypeDesc", True, "get_TypeIdentifierData", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
      - ["Internal.TypeSystem", "TypeDesc", True, "get_UnderlyingType", "()", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["Internal.TypeSystem", "TypeIdentifierData", False, "TypeIdentifierData", "(System.String,System.String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["Internal.TypeSystem", "TypeIdentifierData", False, "TypeIdentifierData", "(System.String,System.String)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
      - ["Internal.TypeSystem", "TypeNameFormatter", False, "AppendName", "(System.Text.StringBuilder,Internal.TypeSystem.DefType)", "", "Argument[1]", "Argument[0]", "taint", "df-generated"]
      - ["Internal.TypeSystem", "TypeNameFormatter", False, "AppendName", "(System.Text.StringBuilder,Internal.TypeSystem.TypeDesc)", "", "Argument[1]", "Argument[0]", "taint", "df-generated"]
      - ["Internal.TypeSystem", "TypeNameFormatter", False, "FormatName", "(Internal.TypeSystem.TypeDesc)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
      - ["Internal.TypeSystem", "TypeNameFormatter", True, "AppendName", "(System.Text.StringBuilder,Internal.TypeSystem.ArrayType)", "", "Argument[1]", "Argument[0]", "taint", "df-generated"]
      - ["Internal.TypeSystem", "TypeNameFormatter", True, "AppendName", "(System.Text.StringBuilder,Internal.TypeSystem.ByRefType)", "", "Argument[1]", "Argument[0]", "taint", "df-generated"]
      - ["Internal.TypeSystem", "TypeNameFormatter", True, "AppendName", "(System.Text.StringBuilder,Internal.TypeSystem.FunctionPointerType)", "", "Argument[1]", "Argument[0]", "taint", "df-generated"]
+      - ["Internal.TypeSystem", "TypeNameFormatter", True, "AppendName", "(System.Text.StringBuilder,Internal.TypeSystem.GenericParameterDesc)", "", "Argument[1]", "Argument[0]", "taint", "df-generated"]
      - ["Internal.TypeSystem", "TypeNameFormatter", True, "AppendName", "(System.Text.StringBuilder,Internal.TypeSystem.PointerType)", "", "Argument[1]", "Argument[0]", "taint", "df-generated"]
      - ["Internal.TypeSystem", "TypeNameFormatter", True, "AppendNameForInstantiatedType", "(System.Text.StringBuilder,Internal.TypeSystem.DefType)", "", "Argument[1]", "Argument[0]", "taint", "df-generated"]
      - ["Internal.TypeSystem", "TypeNameFormatter", True, "AppendNameForNamespaceType", "(System.Text.StringBuilder,Internal.TypeSystem.DefType)", "", "Argument[1]", "Argument[0]", "taint", "df-generated"]
      - ["Internal.TypeSystem", "TypeNameFormatter", True, "AppendNameForNestedType", "(System.Text.StringBuilder,Internal.TypeSystem.DefType,Internal.TypeSystem.DefType)", "", "Argument[1]", "Argument[0]", "taint", "df-generated"]
      - ["Internal.TypeSystem", "TypeNameFormatter", True, "AppendNameForNestedType", "(System.Text.StringBuilder,Internal.TypeSystem.DefType,Internal.TypeSystem.DefType)", "", "Argument[2]", "Argument[0]", "taint", "df-generated"]
      - ["Internal.TypeSystem", "TypeNameFormatter<TState,TOptions>", False, "AppendName", "(System.Text.StringBuilder,Internal.TypeSystem.DefType,TOptions)", "", "Argument[1]", "Argument[0]", "taint", "df-generated"]
+      - ["Internal.TypeSystem", "TypeNameFormatter<TState,TOptions>", False, "AppendName", "(System.Text.StringBuilder,Internal.TypeSystem.DefType,TOptions)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["Internal.TypeSystem", "TypeNameFormatter<TState,TOptions>", False, "AppendName", "(System.Text.StringBuilder,Internal.TypeSystem.TypeDesc,TOptions)", "", "Argument[1]", "Argument[0]", "taint", "df-generated"]
      - ["Internal.TypeSystem", "TypeNameFormatter<TState,TOptions>", True, "GetContainingType", "(Internal.TypeSystem.DefType,TOptions)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
      - ["Internal.TypeSystem", "TypeSystemContext+FunctionPointerHashtable", True, "CreateValueFromKey", "(Internal.TypeSystem.MethodSignature)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
      - ["Internal.TypeSystem", "TypeSystemContext", False, "GetArrayType", "(Internal.TypeSystem.TypeDesc)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
@@ -220,6 +239,8 @@ extensions:
      - ["Internal.TypeSystem", "TypeSystemContext", False, "GetPointerType", "(Internal.TypeSystem.TypeDesc)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
      - ["Internal.TypeSystem", "TypeSystemContext", False, "GetRuntimeDeterminedType", "(Internal.TypeSystem.DefType,Internal.TypeSystem.GenericParameterDesc)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
      - ["Internal.TypeSystem", "TypeSystemContext", False, "GetSignatureVariable", "(System.Int32,System.Boolean)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["Internal.TypeSystem", "TypeSystemContext", False, "InitializeSystemModule", "(Internal.TypeSystem.ModuleDesc)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["Internal.TypeSystem", "TypeSystemContext", False, "TypeSystemContext", "(Internal.TypeSystem.TargetDetails)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
      - ["Internal.TypeSystem", "TypeSystemContext", False, "get_CanonType", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
      - ["Internal.TypeSystem", "TypeSystemContext", False, "get_UniversalCanonType", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
      - ["Internal.TypeSystem", "TypeSystemContext", True, "GetAllMethods", "(Internal.TypeSystem.TypeDesc)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
@@ -287,7 +308,6 @@ extensions:
      - ["Internal.TypeSystem", "CanonBaseType", "GetClassLayout", "()", "summary", "df-generated"]
      - ["Internal.TypeSystem", "CanonBaseType", "GetInlineArrayLength", "()", "summary", "df-generated"]
      - ["Internal.TypeSystem", "CanonBaseType", "GetNestedType", "(System.String)", "summary", "df-generated"]
-      - ["Internal.TypeSystem", "CanonBaseType", "GetNestedTypes", "()", "summary", "df-generated"]
      - ["Internal.TypeSystem", "CanonBaseType", "HasCustomAttribute", "(System.String,System.String)", "summary", "df-generated"]
      - ["Internal.TypeSystem", "CanonBaseType", "get_IsAbstract", "()", "summary", "df-generated"]
      - ["Internal.TypeSystem", "CanonBaseType", "get_IsBeforeFieldInit", "()", "summary", "df-generated"]
@@ -309,14 +329,8 @@ extensions:
      - ["Internal.TypeSystem", "CustomAttributeTypeNameFormatter", "AppendName", "(System.Text.StringBuilder,Internal.TypeSystem.SignatureTypeVariable,System.Boolean)", "summary", "df-generated"]
      - ["Internal.TypeSystem", "CustomAttributeTypeNameFormatter", "AppendNameForInstantiatedType", "(System.Text.StringBuilder,Internal.TypeSystem.DefType,System.Boolean)", "summary", "df-generated"]
      - ["Internal.TypeSystem", "DebugNameFormatter+Void", "get_Value", "()", "summary", "df-generated"]
-      - ["Internal.TypeSystem", "DebugNameFormatter", "AppendName", "(System.Text.StringBuilder,Internal.TypeSystem.ArrayType,Internal.TypeSystem.DebugNameFormatter+FormatOptions)", "summary", "df-generated"]
-      - ["Internal.TypeSystem", "DebugNameFormatter", "AppendName", "(System.Text.StringBuilder,Internal.TypeSystem.ByRefType,Internal.TypeSystem.DebugNameFormatter+FormatOptions)", "summary", "df-generated"]
-      - ["Internal.TypeSystem", "DebugNameFormatter", "AppendName", "(System.Text.StringBuilder,Internal.TypeSystem.FunctionPointerType,Internal.TypeSystem.DebugNameFormatter+FormatOptions)", "summary", "df-generated"]
-      - ["Internal.TypeSystem", "DebugNameFormatter", "AppendName", "(System.Text.StringBuilder,Internal.TypeSystem.GenericParameterDesc,Internal.TypeSystem.DebugNameFormatter+FormatOptions)", "summary", "df-generated"]
-      - ["Internal.TypeSystem", "DebugNameFormatter", "AppendName", "(System.Text.StringBuilder,Internal.TypeSystem.PointerType,Internal.TypeSystem.DebugNameFormatter+FormatOptions)", "summary", "df-generated"]
      - ["Internal.TypeSystem", "DebugNameFormatter", "AppendName", "(System.Text.StringBuilder,Internal.TypeSystem.SignatureMethodVariable,Internal.TypeSystem.DebugNameFormatter+FormatOptions)", "summary", "df-generated"]
      - ["Internal.TypeSystem", "DebugNameFormatter", "AppendName", "(System.Text.StringBuilder,Internal.TypeSystem.SignatureTypeVariable,Internal.TypeSystem.DebugNameFormatter+FormatOptions)", "summary", "df-generated"]
-      - ["Internal.TypeSystem", "DebugNameFormatter", "AppendNameForInstantiatedType", "(System.Text.StringBuilder,Internal.TypeSystem.DefType,Internal.TypeSystem.DebugNameFormatter+FormatOptions)", "summary", "df-generated"]
      - ["Internal.TypeSystem", "DefType", "ComputeInstanceLayout", "(Internal.TypeSystem.InstanceLayoutKind)", "summary", "df-generated"]
      - ["Internal.TypeSystem", "DefType", "ComputeIsUnsafeValueType", "()", "summary", "df-generated"]
      - ["Internal.TypeSystem", "DefType", "ComputeStaticFieldLayout", "(Internal.TypeSystem.StaticLayoutKind)", "summary", "df-generated"]
@@ -347,7 +361,6 @@ extensions:
      - ["Internal.TypeSystem", "EffectiveVisibilityExtensions", "GetEffectiveVisibility", "(Internal.TypeSystem.FieldDesc)", "summary", "df-generated"]
      - ["Internal.TypeSystem", "EffectiveVisibilityExtensions", "GetEffectiveVisibility", "(Internal.TypeSystem.TypeDesc)", "summary", "df-generated"]
      - ["Internal.TypeSystem", "EffectiveVisibilityExtensions", "IsExposedOutsideOfThisAssembly", "(Internal.TypeSystem.EffectiveVisibility,System.Boolean)", "summary", "df-generated"]
-      - ["Internal.TypeSystem", "ExceptionTypeNameFormatter", "AppendName", "(System.Text.StringBuilder,Internal.TypeSystem.GenericParameterDesc)", "summary", "df-generated"]
      - ["Internal.TypeSystem", "ExceptionTypeNameFormatter", "AppendName", "(System.Text.StringBuilder,Internal.TypeSystem.SignatureMethodVariable)", "summary", "df-generated"]
      - ["Internal.TypeSystem", "ExceptionTypeNameFormatter", "AppendName", "(System.Text.StringBuilder,Internal.TypeSystem.SignatureTypeVariable)", "summary", "df-generated"]
      - ["Internal.TypeSystem", "ExceptionTypeNameFormatter", "get_Instance", "()", "summary", "df-generated"]
@@ -414,7 +427,6 @@ extensions:
      - ["Internal.TypeSystem", "GenericParameterDesc", "GetHashCode", "()", "summary", "df-generated"]
      - ["Internal.TypeSystem", "GenericParameterDesc", "IsCanonicalSubtype", "(Internal.TypeSystem.CanonicalFormKind)", "summary", "df-generated"]
      - ["Internal.TypeSystem", "GenericParameterDesc", "get_Constraints", "()", "summary", "df-generated"]
-      - ["Internal.TypeSystem", "GenericParameterDesc", "get_DiagnosticName", "()", "summary", "df-generated"]
      - ["Internal.TypeSystem", "GenericParameterDesc", "get_HasAcceptByRefLikeConstraint", "()", "summary", "df-generated"]
      - ["Internal.TypeSystem", "GenericParameterDesc", "get_HasDefaultConstructorConstraint", "()", "summary", "df-generated"]
      - ["Internal.TypeSystem", "GenericParameterDesc", "get_HasNotNullableValueTypeConstraint", "()", "summary", "df-generated"]
@@ -464,7 +476,6 @@ extensions:
      - ["Internal.TypeSystem", "InstantiatedType", "GetHashCode", "()", "summary", "df-generated"]
      - ["Internal.TypeSystem", "InstantiatedType", "GetInlineArrayLength", "()", "summary", "df-generated"]
      - ["Internal.TypeSystem", "InstantiatedType", "GetNestedType", "(System.String)", "summary", "df-generated"]
-      - ["Internal.TypeSystem", "InstantiatedType", "GetNestedTypes", "()", "summary", "df-generated"]
      - ["Internal.TypeSystem", "InstantiatedType", "HasCustomAttribute", "(System.String,System.String)", "summary", "df-generated"]
      - ["Internal.TypeSystem", "InstantiatedType", "IsCanonicalSubtype", "(Internal.TypeSystem.CanonicalFormKind)", "summary", "df-generated"]
      - ["Internal.TypeSystem", "InstantiatedType", "get_ClassCode", "()", "summary", "df-generated"]
@@ -532,7 +543,6 @@ extensions:
      - ["Internal.TypeSystem", "MetadataType", "GetClassLayout", "()", "summary", "df-generated"]
      - ["Internal.TypeSystem", "MetadataType", "GetInlineArrayLength", "()", "summary", "df-generated"]
      - ["Internal.TypeSystem", "MetadataType", "GetNestedType", "(System.String)", "summary", "df-generated"]
-      - ["Internal.TypeSystem", "MetadataType", "GetNestedTypes", "()", "summary", "df-generated"]
      - ["Internal.TypeSystem", "MetadataType", "HasCustomAttribute", "(System.String,System.String)", "summary", "df-generated"]
      - ["Internal.TypeSystem", "MetadataType", "IsCanonicalSubtype", "(Internal.TypeSystem.CanonicalFormKind)", "summary", "df-generated"]
      - ["Internal.TypeSystem", "MetadataType", "get_IsAbstract", "()", "summary", "df-generated"]
@@ -649,8 +659,6 @@ extensions:
      - ["Internal.TypeSystem", "MethodSignature", "EquivalentWithCovariantReturnType", "(Internal.TypeSystem.MethodSignature)", "summary", "df-generated"]
      - ["Internal.TypeSystem", "MethodSignature", "GetHashCode", "()", "summary", "df-generated"]
      - ["Internal.TypeSystem", "MethodSignature", "GetIndexOfCustomModifierOnPointedAtTypeByParameterIndex", "(System.Int32)", "summary", "df-generated"]
-      - ["Internal.TypeSystem", "MethodSignature", "ToString", "()", "summary", "df-generated"]
-      - ["Internal.TypeSystem", "MethodSignature", "ToString", "(System.Boolean)", "summary", "df-generated"]
      - ["Internal.TypeSystem", "MethodSignature", "get_EmbeddedSignatureMismatchPermitted", "()", "summary", "df-generated"]
      - ["Internal.TypeSystem", "MethodSignature", "get_Flags", "()", "summary", "df-generated"]
      - ["Internal.TypeSystem", "MethodSignature", "get_GenericParameterCount", "()", "summary", "df-generated"]
@@ -805,10 +813,8 @@ extensions:
      - ["Internal.TypeSystem", "TypeIdentifierData", "Equals", "(Internal.TypeSystem.TypeIdentifierData)", "summary", "df-generated"]
      - ["Internal.TypeSystem", "TypeIdentifierData", "Equals", "(System.Object)", "summary", "df-generated"]
      - ["Internal.TypeSystem", "TypeIdentifierData", "GetHashCode", "()", "summary", "df-generated"]
-      - ["Internal.TypeSystem", "TypeIdentifierData", "TypeIdentifierData", "(System.String,System.String)", "summary", "df-generated"]
      - ["Internal.TypeSystem", "TypeIdentifierData", "get_Name", "()", "summary", "df-generated"]
      - ["Internal.TypeSystem", "TypeIdentifierData", "get_Scope", "()", "summary", "df-generated"]
-      - ["Internal.TypeSystem", "TypeNameFormatter", "AppendName", "(System.Text.StringBuilder,Internal.TypeSystem.GenericParameterDesc)", "summary", "df-generated"]
      - ["Internal.TypeSystem", "TypeNameFormatter", "AppendName", "(System.Text.StringBuilder,Internal.TypeSystem.SignatureMethodVariable)", "summary", "df-generated"]
      - ["Internal.TypeSystem", "TypeNameFormatter", "AppendName", "(System.Text.StringBuilder,Internal.TypeSystem.SignatureTypeVariable)", "summary", "df-generated"]
      - ["Internal.TypeSystem", "TypeNameFormatter<TState,TOptions>", "AppendName", "(System.Text.StringBuilder,Internal.TypeSystem.ArrayType,TOptions)", "summary", "df-generated"]
@@ -818,7 +824,6 @@ extensions:
      - ["Internal.TypeSystem", "TypeNameFormatter<TState,TOptions>", "AppendName", "(System.Text.StringBuilder,Internal.TypeSystem.PointerType,TOptions)", "summary", "df-generated"]
      - ["Internal.TypeSystem", "TypeNameFormatter<TState,TOptions>", "AppendName", "(System.Text.StringBuilder,Internal.TypeSystem.SignatureMethodVariable,TOptions)", "summary", "df-generated"]
      - ["Internal.TypeSystem", "TypeNameFormatter<TState,TOptions>", "AppendName", "(System.Text.StringBuilder,Internal.TypeSystem.SignatureTypeVariable,TOptions)", "summary", "df-generated"]
-      - ["Internal.TypeSystem", "TypeNameFormatter<TState,TOptions>", "AppendName", "(System.Text.StringBuilder,Internal.TypeSystem.TypeDesc,TOptions)", "summary", "df-generated"]
      - ["Internal.TypeSystem", "TypeNameFormatter<TState,TOptions>", "AppendNameForInstantiatedType", "(System.Text.StringBuilder,Internal.TypeSystem.DefType,TOptions)", "summary", "df-generated"]
      - ["Internal.TypeSystem", "TypeNameFormatter<TState,TOptions>", "AppendNameForNamespaceType", "(System.Text.StringBuilder,Internal.TypeSystem.DefType,TOptions)", "summary", "df-generated"]
      - ["Internal.TypeSystem", "TypeNameFormatter<TState,TOptions>", "AppendNameForNestedType", "(System.Text.StringBuilder,Internal.TypeSystem.DefType,Internal.TypeSystem.DefType,TOptions)", "summary", "df-generated"]
@@ -856,11 +861,9 @@ extensions:
      - ["Internal.TypeSystem", "TypeSystemContext", "GetRuntimeInterfacesAlgorithmForNonPointerArrayType", "(Internal.TypeSystem.ArrayType)", "summary", "df-generated"]
      - ["Internal.TypeSystem", "TypeSystemContext", "GetRuntimeInterfacesAlgorithmForType", "(Internal.TypeSystem.TypeDesc)", "summary", "df-generated"]
      - ["Internal.TypeSystem", "TypeSystemContext", "GetVirtualMethodAlgorithmForType", "(Internal.TypeSystem.TypeDesc)", "summary", "df-generated"]
-      - ["Internal.TypeSystem", "TypeSystemContext", "InitializeSystemModule", "(Internal.TypeSystem.ModuleDesc)", "summary", "df-generated"]
      - ["Internal.TypeSystem", "TypeSystemContext", "IsCanonicalDefinitionType", "(Internal.TypeSystem.TypeDesc,Internal.TypeSystem.CanonicalFormKind)", "summary", "df-generated"]
      - ["Internal.TypeSystem", "TypeSystemContext", "IsIDynamicInterfaceCastableInterface", "(Internal.TypeSystem.DefType)", "summary", "df-generated"]
      - ["Internal.TypeSystem", "TypeSystemContext", "ResolveModule", "(Internal.TypeSystem.IAssemblyDesc,System.String,System.Boolean)", "summary", "df-generated"]
-      - ["Internal.TypeSystem", "TypeSystemContext", "TypeSystemContext", "(Internal.TypeSystem.TargetDetails)", "summary", "df-generated"]
      - ["Internal.TypeSystem", "TypeSystemContext", "get_SupportsCOMInterop", "()", "summary", "df-generated"]
      - ["Internal.TypeSystem", "TypeSystemContext", "get_SupportsCanon", "()", "summary", "df-generated"]
      - ["Internal.TypeSystem", "TypeSystemContext", "get_SupportsTypeEquivalence", "()", "summary", "df-generated"]
--- a/Show More
+++ b/Show More