From df406b4fca88a73d345fc8d34ce7b59b3d5876dd Mon Sep 17 00:00:00 2001
From: Rasmus Lerchedahl Petersen <yoff@github.com>
Date: Fri, 2 Feb 2024 10:14:17 +0100
Subject: [PATCH 001/347] python: Start modelling using MaD - empty models for
 now - `summaryModel` of `codeql/python-all` will be added to shortly.

---
 python/ql/lib/ext/StdLib.model.yml | 30 ++++++++++++++++++++++++++++++
 python/ql/lib/qlpack.yml           |  2 ++
 2 files changed, 32 insertions(+)
 create mode 100644 python/ql/lib/ext/StdLib.model.yml

diff --git a/python/ql/lib/ext/StdLib.model.yml b/python/ql/lib/ext/StdLib.model.yml
new file mode 100644
index 000000000000..6c1f0ec89908
--- /dev/null
+++ b/python/ql/lib/ext/StdLib.model.yml
@@ -0,0 +1,30 @@
+extensions:
+  - addsTo:
+      pack: codeql/python-all
+      extensible: sourceModel
+    data: []
+
+  - addsTo:
+      pack: codeql/python-all
+      extensible: sinkModel
+    data: []
+
+  - addsTo:
+      pack: codeql/python-all
+      extensible: summaryModel
+    data: []
+
+  - addsTo:
+      pack: codeql/python-all
+      extensible: neutralModel
+    data: []
+
+  - addsTo:
+      pack: codeql/python-all
+      extensible: typeModel
+    data: []
+
+  - addsTo:
+      pack: codeql/python-all
+      extensible: typeVariableModel
+    data: []
diff --git a/python/ql/lib/qlpack.yml b/python/ql/lib/qlpack.yml
index 36d43473f2a6..765cdb11c2e1 100644
--- a/python/ql/lib/qlpack.yml
+++ b/python/ql/lib/qlpack.yml
@@ -15,4 +15,6 @@ dependencies:
   codeql/yaml: ${workspace}
 dataExtensions:
   - semmle/python/frameworks/**/*.model.yml
+  - ext/*.model.yml
+  - ext/generated/*.model.yml
 warnOnImplicitThis: true

From 281ac05868d722e514ead85373da9de4c27168be Mon Sep 17 00:00:00 2001
From: Rasmus Lerchedahl Petersen <yoff@github.com>
Date: Fri, 8 Mar 2024 11:12:33 +0100
Subject: [PATCH 002/347] python: add modelling for `urlib.parse` - `quote`
 together with `re.compile` recover regex injection alerts on haiwen/seahub -
 `quote_plus` recovers the URL redirection alert on
 DemocracyClub/EveryElection - `unquote` recovers path injection alerts on
 `cloudera/hue` - it was tedious finding justifications for the rest..

---
 python/ql/lib/ext/StdLib.model.yml | 22 ++++++++++++++++++++--
 1 file changed, 20 insertions(+), 2 deletions(-)

diff --git a/python/ql/lib/ext/StdLib.model.yml b/python/ql/lib/ext/StdLib.model.yml
index 6c1f0ec89908..16f62bd77481 100644
--- a/python/ql/lib/ext/StdLib.model.yml
+++ b/python/ql/lib/ext/StdLib.model.yml
@@ -12,8 +12,26 @@ extensions:
   - addsTo:
       pack: codeql/python-all
       extensible: summaryModel
-    data: []
-
+    data:
+      # See https://docs.python.org/3/library/urllib.parse.html#urllib.parse.quote
+      - ["urllib", "Member[parse].Member[quote]", "Argument[0,string:]", "ReturnValue", "taint"]
+      # See https://docs.python.org/3/library/urllib.parse.html#urllib.parse.quote_plus
+      - ["urllib", "Member[parse].Member[quote_plus]", "Argument[0,string:]", "ReturnValue", "taint"]
+      # See https://epydoc.sourceforge.net/stdlib/urllib-module.html
+      - ["urllib", "Member[parse].Member[splitquery]", "Argument[0,url:]", "ReturnValue.TupleElement[0]", "taint"]
+      - ["urllib", "Member[parse].Member[splitquery]", "Argument[0,url:]", "ReturnValue.TupleElement[1]", "taint"]
+      # See https://docs.python.org/3/library/urllib.parse.html#urllib.parse.unquote
+      - ["urllib", "Member[parse].Member[unquote]", "Argument[0,string:]", "ReturnValue", "taint"]
+      # See https://docs.python.org/3/library/urllib.parse.html#urllib.parse.unquote_plus
+      - ["urllib", "Member[parse].Member[unquote_plus]", "Argument[0,string:]", "ReturnValue", "taint"]
+      # We could consider a more precise source than the first argument, namely tuple or dict content.
+      # See https://docs.python.org/3/library/urllib.parse.html#urllib.parse.urlencode
+      - ["urllib", "Member[parse].Member[urlencode]", "Argument[0,query:]", "ReturnValue", "taint"]
+      # See https://docs.python.org/3/library/urllib.parse.html#urllib.parse.urljoin
+      - ["urllib", "Member[parse].Member[urljoin]", "Argument[0,base:]", "ReturnValue", "taint"]
+      - ["urllib", "Member[parse].Member[urljoin]", "Argument[1,url:]", "ReturnValue", "taint"]
+      # See https://docs.python.org/3/library/re.html#re.compile
+      - ["re", "Member[compile]", "Argument[0,pattern:]", "ReturnValue", "taint"]
   - addsTo:
       pack: codeql/python-all
       extensible: neutralModel

From c004ffaca8e721834f4f10ef0deb7bf6f18ff421 Mon Sep 17 00:00:00 2001
From: Rasmus Lerchedahl Petersen <yoff@github.com>
Date: Thu, 14 Mar 2024 09:22:08 +0100
Subject: [PATCH 003/347] python: move model to `Stdlib.yml` There is already a
 model there so we add to that one.

We did observe that this existing model was blocked by the external MaD model.
This is concerning and needs to be cleared up.
---
 python/ql/lib/ext/StdLib.model.yml                | 2 --
 python/ql/lib/semmle/python/frameworks/Stdlib.qll | 9 +++++++--
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/python/ql/lib/ext/StdLib.model.yml b/python/ql/lib/ext/StdLib.model.yml
index 16f62bd77481..df4feaf04249 100644
--- a/python/ql/lib/ext/StdLib.model.yml
+++ b/python/ql/lib/ext/StdLib.model.yml
@@ -30,8 +30,6 @@ extensions:
       # See https://docs.python.org/3/library/urllib.parse.html#urllib.parse.urljoin
       - ["urllib", "Member[parse].Member[urljoin]", "Argument[0,base:]", "ReturnValue", "taint"]
       - ["urllib", "Member[parse].Member[urljoin]", "Argument[1,url:]", "ReturnValue", "taint"]
-      # See https://docs.python.org/3/library/re.html#re.compile
-      - ["re", "Member[compile]", "Argument[0,pattern:]", "ReturnValue", "taint"]
   - addsTo:
       pack: codeql/python-all
       extensible: neutralModel
diff --git a/python/ql/lib/semmle/python/frameworks/Stdlib.qll b/python/ql/lib/semmle/python/frameworks/Stdlib.qll
index 3c23b3929911..7a373a523e47 100644
--- a/python/ql/lib/semmle/python/frameworks/Stdlib.qll
+++ b/python/ql/lib/semmle/python/frameworks/Stdlib.qll
@@ -3251,8 +3251,13 @@ module StdlibPrivate {
 
     override predicate propagatesFlow(string input, string output, boolean preservesValue) {
       input in ["Argument[0]", "Argument[pattern:]"] and
-      output = "ReturnValue.Attribute[pattern]" and
-      preservesValue = true
+      (
+        output = "ReturnValue.Attribute[pattern]" and
+        preservesValue = true
+        or
+        output = "ReturnValue" and
+        preservesValue = false
+      )
     }
   }
 

From d410136852410110010987d5d6476ff8f7562324 Mon Sep 17 00:00:00 2001
From: Rasmus Lerchedahl Petersen <yoff@github.com>
Date: Tue, 9 Apr 2024 13:14:42 +0200
Subject: [PATCH 004/347] python: compress models

---
 python/ql/lib/ext/StdLib.model.yml | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/python/ql/lib/ext/StdLib.model.yml b/python/ql/lib/ext/StdLib.model.yml
index df4feaf04249..e3cc9cd61c87 100644
--- a/python/ql/lib/ext/StdLib.model.yml
+++ b/python/ql/lib/ext/StdLib.model.yml
@@ -18,8 +18,7 @@ extensions:
       # See https://docs.python.org/3/library/urllib.parse.html#urllib.parse.quote_plus
       - ["urllib", "Member[parse].Member[quote_plus]", "Argument[0,string:]", "ReturnValue", "taint"]
       # See https://epydoc.sourceforge.net/stdlib/urllib-module.html
-      - ["urllib", "Member[parse].Member[splitquery]", "Argument[0,url:]", "ReturnValue.TupleElement[0]", "taint"]
-      - ["urllib", "Member[parse].Member[splitquery]", "Argument[0,url:]", "ReturnValue.TupleElement[1]", "taint"]
+      - ["urllib", "Member[parse].Member[splitquery]", "Argument[0,url:]", "ReturnValue.TupleElement[0,1]", "taint"]
       # See https://docs.python.org/3/library/urllib.parse.html#urllib.parse.unquote
       - ["urllib", "Member[parse].Member[unquote]", "Argument[0,string:]", "ReturnValue", "taint"]
       # See https://docs.python.org/3/library/urllib.parse.html#urllib.parse.unquote_plus
@@ -28,8 +27,7 @@ extensions:
       # See https://docs.python.org/3/library/urllib.parse.html#urllib.parse.urlencode
       - ["urllib", "Member[parse].Member[urlencode]", "Argument[0,query:]", "ReturnValue", "taint"]
       # See https://docs.python.org/3/library/urllib.parse.html#urllib.parse.urljoin
-      - ["urllib", "Member[parse].Member[urljoin]", "Argument[0,base:]", "ReturnValue", "taint"]
-      - ["urllib", "Member[parse].Member[urljoin]", "Argument[1,url:]", "ReturnValue", "taint"]
+      - ["urllib", "Member[parse].Member[urljoin]", "Argument[0,base:,1,url:]", "ReturnValue", "taint"]
   - addsTo:
       pack: codeql/python-all
       extensible: neutralModel

From 1e97600c4aa9abf1ea7562b6367b06d9efb9334b Mon Sep 17 00:00:00 2001
From: Rasmus Lerchedahl Petersen <yoff@github.com>
Date: Tue, 9 Apr 2024 13:31:26 +0200
Subject: [PATCH 005/347] Python: move models

---
 .../lib/{ext => semmle/python/frameworks/Stdlib}/StdLib.model.yml | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename python/ql/lib/{ext => semmle/python/frameworks/Stdlib}/StdLib.model.yml (100%)

diff --git a/python/ql/lib/ext/StdLib.model.yml b/python/ql/lib/semmle/python/frameworks/Stdlib/StdLib.model.yml
similarity index 100%
rename from python/ql/lib/ext/StdLib.model.yml
rename to python/ql/lib/semmle/python/frameworks/Stdlib/StdLib.model.yml

From b80a711b27033581261bd2af8c3bc8e56a889ff2 Mon Sep 17 00:00:00 2001
From: Rasmus Lerchedahl Petersen <yoff@github.com>
Date: Tue, 9 Apr 2024 13:33:05 +0200
Subject: [PATCH 006/347] python: undo changes to qlpack

---
 python/ql/lib/qlpack.yml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/python/ql/lib/qlpack.yml b/python/ql/lib/qlpack.yml
index 765cdb11c2e1..36d43473f2a6 100644
--- a/python/ql/lib/qlpack.yml
+++ b/python/ql/lib/qlpack.yml
@@ -15,6 +15,4 @@ dependencies:
   codeql/yaml: ${workspace}
 dataExtensions:
   - semmle/python/frameworks/**/*.model.yml
-  - ext/*.model.yml
-  - ext/generated/*.model.yml
 warnOnImplicitThis: true

From 2118f233b9d020a32126535282277644ac13d6e3 Mon Sep 17 00:00:00 2001
From: Rasmus Lerchedahl Petersen <yoff@github.com>
Date: Tue, 25 Jun 2024 14:40:23 +0200
Subject: [PATCH 007/347] Python: model optparse.OptionParser.parse_arg

---
 python/ql/lib/semmle/python/frameworks/Stdlib/StdLib.model.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/python/ql/lib/semmle/python/frameworks/Stdlib/StdLib.model.yml b/python/ql/lib/semmle/python/frameworks/Stdlib/StdLib.model.yml
index e3cc9cd61c87..1b359ce05ea4 100644
--- a/python/ql/lib/semmle/python/frameworks/Stdlib/StdLib.model.yml
+++ b/python/ql/lib/semmle/python/frameworks/Stdlib/StdLib.model.yml
@@ -13,6 +13,8 @@ extensions:
       pack: codeql/python-all
       extensible: summaryModel
     data:
+      # See https://docs.python.org/3/library/optparse.html#optparse.OptionParser.parse_args
+      - ["optparse.OptionParser", "Member[parse_args]", "Argument[0,args:,1,values:]", "ReturnValue.TupleElement[0,1]", "taint"]
       # See https://docs.python.org/3/library/urllib.parse.html#urllib.parse.quote
       - ["urllib", "Member[parse].Member[quote]", "Argument[0,string:]", "ReturnValue", "taint"]
       # See https://docs.python.org/3/library/urllib.parse.html#urllib.parse.quote_plus

From 501cda4e8c1f5d4568740b31fe437ea21eea38e8 Mon Sep 17 00:00:00 2001
From: Rasmus Lerchedahl Petersen <yoff@github.com>
Date: Tue, 25 Jun 2024 14:44:39 +0200
Subject: [PATCH 008/347] Python: model `fnmatch.filter`

---
 python/ql/lib/semmle/python/frameworks/Stdlib/StdLib.model.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/python/ql/lib/semmle/python/frameworks/Stdlib/StdLib.model.yml b/python/ql/lib/semmle/python/frameworks/Stdlib/StdLib.model.yml
index 1b359ce05ea4..c2d8546b9dfb 100644
--- a/python/ql/lib/semmle/python/frameworks/Stdlib/StdLib.model.yml
+++ b/python/ql/lib/semmle/python/frameworks/Stdlib/StdLib.model.yml
@@ -13,6 +13,9 @@ extensions:
       pack: codeql/python-all
       extensible: summaryModel
     data:
+      # See See https://docs.python.org/3/library/fnmatch.html#fnmatch.filter
+      - ["fnmatch", "Member[filter]", "Argument[0,names:].ListElement", "ReturnValue.ListElement", "value"]
+      - ["fnmatch", "Member[filter]", "Argument[0,names:]", "ReturnValue", "taint"]
       # See https://docs.python.org/3/library/optparse.html#optparse.OptionParser.parse_args
       - ["optparse.OptionParser", "Member[parse_args]", "Argument[0,args:,1,values:]", "ReturnValue.TupleElement[0,1]", "taint"]
       # See https://docs.python.org/3/library/urllib.parse.html#urllib.parse.quote

From bc551174f95b687acb78970ac855b56f5c5a6b7f Mon Sep 17 00:00:00 2001
From: Rasmus Lerchedahl Petersen <yoff@github.com>
Date: Tue, 25 Jun 2024 14:53:06 +0200
Subject: [PATCH 009/347] Python: model `copy.deepcopy` as a value step

---
 .../dataflow/new/internal/TaintTrackingPrivate.qll | 14 --------------
 .../python/frameworks/Stdlib/StdLib.model.yml      |  2 ++
 2 files changed, 2 insertions(+), 14 deletions(-)

diff --git a/python/ql/lib/semmle/python/dataflow/new/internal/TaintTrackingPrivate.qll b/python/ql/lib/semmle/python/dataflow/new/internal/TaintTrackingPrivate.qll
index 572e67c28a9c..b268d6290603 100644
--- a/python/ql/lib/semmle/python/dataflow/new/internal/TaintTrackingPrivate.qll
+++ b/python/ql/lib/semmle/python/dataflow/new/internal/TaintTrackingPrivate.qll
@@ -46,8 +46,6 @@ private module Cached {
       or
       containerStep(nodeFrom, nodeTo)
       or
-      copyStep(nodeFrom, nodeTo)
-      or
       DataFlowPrivate::forReadStep(nodeFrom, _, nodeTo)
       or
       DataFlowPrivate::iterableUnpackingReadStep(nodeFrom, _, nodeTo)
@@ -191,18 +189,6 @@ predicate containerStep(DataFlow::Node nodeFrom, DataFlow::Node nodeTo) {
   DataFlowPrivate::comprehensionStoreStep(nodeFrom, _, nodeTo)
 }
 
-/**
- * Holds if taint can flow from `nodeFrom` to `nodeTo` with a step related to copying.
- */
-predicate copyStep(DataFlow::CfgNode nodeFrom, DataFlow::CfgNode nodeTo) {
-  exists(DataFlow::CallCfgNode call | call = nodeTo |
-    call = API::moduleImport("copy").getMember(["copy", "deepcopy"]).getACall() and
-    call.getArg(0) = nodeFrom
-  )
-  or
-  nodeTo.(DataFlow::MethodCallNode).calls(nodeFrom, "copy")
-}
-
 /**
  * Holds if taint can flow from `nodeFrom` to `nodeTo` with an `await`-step,
  * such that the whole expression `await x` is tainted if `x` is tainted.
diff --git a/python/ql/lib/semmle/python/frameworks/Stdlib/StdLib.model.yml b/python/ql/lib/semmle/python/frameworks/Stdlib/StdLib.model.yml
index c2d8546b9dfb..3a320407d9c4 100644
--- a/python/ql/lib/semmle/python/frameworks/Stdlib/StdLib.model.yml
+++ b/python/ql/lib/semmle/python/frameworks/Stdlib/StdLib.model.yml
@@ -13,6 +13,8 @@ extensions:
       pack: codeql/python-all
       extensible: summaryModel
     data:
+      # See https://docs.python.org/3/library/copy.html#copy.deepcopy
+      - ["copy", "Member[copy,deepcopy]", "Argument[0,x:]", "ReturnValue", "value"]
       # See See https://docs.python.org/3/library/fnmatch.html#fnmatch.filter
       - ["fnmatch", "Member[filter]", "Argument[0,names:].ListElement", "ReturnValue.ListElement", "value"]
       - ["fnmatch", "Member[filter]", "Argument[0,names:]", "ReturnValue", "taint"]

From bdc48088e6dcc0ded83f81c0fdc9d6b04a3a7da8 Mon Sep 17 00:00:00 2001
From: Rasmus Lerchedahl Petersen <yoff@github.com>
Date: Tue, 25 Jun 2024 15:21:29 +0200
Subject: [PATCH 010/347] Python: MaD summary models

Two of the generated summaries have been excluded:
 - ["re", "Member[split]", "Argument[0,pattern:]", "ReturnValue", "taint"]
   From the documentation, it is not clear why pattern should figure in the return value, as that is the part denoting split point and thus all those instances are filtered out.
   From the implementation
     Spit function: https://github.com/python/cpython/blob/3.12/Lib/re/__init__.py#L199
     _compile function being called by split: https://github.com/python/cpython/blob/3.12/Lib/re/__init__.py#L280
   We see that in case the pattern is already a compiled `Pattern`, it is returned directly from _compile and could thus be part of the return value from split. This is probably not possible to arrange for an attacker, and so an FP in practice.

 - ["urllib2", "Member[unquote]", "Argument[0,string:]", "ReturnValue", "taint"]
   urllib2 seems to be only in Python2 (e.g. https://docs.python.org/2.7/library/urllib2.html) and I cannot locate the function unquote.
---
 .../python/frameworks/Stdlib/StdLib.model.yml | 105 +++++++++++++++++-
 1 file changed, 104 insertions(+), 1 deletion(-)

diff --git a/python/ql/lib/semmle/python/frameworks/Stdlib/StdLib.model.yml b/python/ql/lib/semmle/python/frameworks/Stdlib/StdLib.model.yml
index 3a320407d9c4..1d7e0c070fe4 100644
--- a/python/ql/lib/semmle/python/frameworks/Stdlib/StdLib.model.yml
+++ b/python/ql/lib/semmle/python/frameworks/Stdlib/StdLib.model.yml
@@ -7,19 +7,107 @@ extensions:
   - addsTo:
       pack: codeql/python-all
       extensible: sinkModel
-    data: []
+    data:
+      - ["subprocess.Popen!","Subclass.Call.Argument[0,args:]", "log-injection"]
+      - ["zipfile.ZipFile","Member[extractall].Argument[0,path:]", "path-injection"]
 
   - addsTo:
       pack: codeql/python-all
       extensible: summaryModel
     data:
+      # See
+      #  - https://docs.python.org/3/glossary.html#term-mapping 
+      #  - https://docs.python.org/3/library/stdtypes.html#dict.get
+      - ["_collections_abc.Mapping", "Member[get]", "Argument[1,default:]", "ReturnValue", "taint"]
+      # See https://docs.python.org/3/library/argparse.html#argparse.ArgumentParser
+      - ["argparse.ArgumentParser", "Member[_parse_known_args,_read_args_from_files]", "Argument[0,arg_strings:]", "ReturnValue", "taint"]
+      - ["argparse.ArgumentParser", "Member[parse_args,parse_known_args]", "Argument[0,args:]", "ReturnValue", "taint"]
+      # See https://docs.python.org/3/library/cgi.html#higher-level-interface
+      - ["cgi.FieldStorage", "Member[getfirst,getlist,getvalue]", "Argument[self]", "ReturnValue", "taint"]
+      # See https://docs.python.org/3/library/contextlib.html#contextlib.ExitStack
+      - ["contextlib.ExitStack", "Member[enter_context]", "Argument[0,cm:]", "ReturnValue", "taint"]
       # See https://docs.python.org/3/library/copy.html#copy.deepcopy
       - ["copy", "Member[copy,deepcopy]", "Argument[0,x:]", "ReturnValue", "value"]
+      # See
+      #  - https://docs.python.org/3/library/ctypes.html#ctypes.create_string_buffer
+      #  - https://docs.python.org/3/library/ctypes.html#ctypes.create_unicode_buffer
+      - ["ctypes", "Member[create_string_buffer,create_unicode_buffer]", "Argument[0,init:,init_or_size:]", "ReturnValue", "taint"]
+      # See https://docs.python.org/3.11/distutils/apiref.html#distutils.util.change_root
+      - ["distutils", "Member[util].Member[change_root]", "Argument[0,new_root:,1,pathname:]", "ReturnValue", "taint"]
+      # See https://docs.python.org/3/library/email.header.html#email.header.Header
+      - ["email.header.Header!", "Subclass.Call", "Argument[0,s:]", "ReturnValue", "taint"]
+      # See https://docs.python.org/3/library/email.utils.html#email.utils.parseaddr
+      - ["email", "Member[utils].Member[parseaddr]", "Argument[0,addr:]", "ReturnValue", "taint"]
+      - ["email", "Member[utils].Member[parseaddr]", "Argument[0,addr:]", "ReturnValue.TupleElement[0,1]", "taint"]
       # See See https://docs.python.org/3/library/fnmatch.html#fnmatch.filter
       - ["fnmatch", "Member[filter]", "Argument[0,names:].ListElement", "ReturnValue.ListElement", "value"]
       - ["fnmatch", "Member[filter]", "Argument[0,names:]", "ReturnValue", "taint"]
+      # See https://docs.python.org/3/library/getopt.html#getopt.getopt
+      - ["getopt", "Member[getopt]", "Argument[0,args:]", "ReturnValue.TupleElement[1]", "taint"]
+      - ["getopt", "Member[getopt]", "Argument[1,shortopts:,2,longopts:]", "ReturnValue.TupleElement[0].ListElement.TupleElement[0]", "taint"]
+      # See https://docs.python.org/3/library/gettext.html#gettext.gettext
+      - ["gettext", "Member[gettext]", "Argument[0,message:]", "ReturnValue", "taint"]
+      # See https://docs.python.org/3/library/gzip.html#gzip.GzipFile
+      - ["gzip.GzipFile!", "Subclass.Call", "Argument[0,filename:]", "ReturnValue", "taint"]
+      # See
+      #  - https://docs.python.org/3/library/html.html#html.escape
+      #  - https://docs.python.org/3/library/html.html#html.unescape
+      - ["html", "Member[escape,unescape]", "Argument[0,s:]", "ReturnValue", "taint"]
+      # See https://docs.python.org/3/library/html.parser.html#html.parser.HTMLParser.feed
+      - ["html.parser.HTMLParser", "Member[feed]", "Argument[0,data:]", "Argument[self]", "taint"]
+      # See https://docs.python.org/3.11/library/imp.html#imp.find_module
+      - ["imp", "Member[find_module]", "Argument[0,name:,1,path:]", "ReturnValue", "taint"]
+      # See https://docs.python.org/3/library/logging.html#logging.getLevelName
+      #   specifically the no matching case 
+      - ["logging", "Member[getLevelName]", "Argument[0,level:]", "ReturnValue", "taint"]
+      # See https://docs.python.org/3/library/logging.html#logging.LogRecord.getMessage
+      - ["logging.LogRecord", "Member[getMessage]", "Argument[self]", "ReturnValue", "taint"]
+      # See https://docs.python.org/3/library/mimetypes.html#mimetypes.guess_type
+      - ["mimetypes", "Member[guess_type]", "Argument[0,url:]", "ReturnValue", "taint"]
+      # See https://docs.python.org/3/library/multiprocessing.html#multiprocessing.connection.Listener
+      - ["multiprocessing.connection.Listener!", "Subclass.Call", "Argument[3,authkey:]", "ReturnValue", "taint"]
+      # See https://github.com/python/cpython/blob/main/Lib/nturl2path.py
+      #   No user-facing documentation, unfortunately.
+      - ["nturl2path", "Member[pathname2url]", "Argument[0,p:]", "ReturnValue", "taint"]
+      - ["nturl2path", "Member[url2pathname]", "Argument[0,url:]", "ReturnValue", "taint"]
       # See https://docs.python.org/3/library/optparse.html#optparse.OptionParser.parse_args
       - ["optparse.OptionParser", "Member[parse_args]", "Argument[0,args:,1,values:]", "ReturnValue.TupleElement[0,1]", "taint"]
+      # See https://github.com/python/cpython/blob/3.10/Lib/pathlib.py#L972-L973
+      - ["pathlib.Path", ".Member[__enter__]", "Argument[self]", "ReturnValue", "taint"]
+      # See https://docs.python.org/3/library/os.html#os.PathLike.__fspath__
+      - ["pathlib.PurePath", "Member[__fspath__]", "Argument[self]", "ReturnValue", "taint"]
+      # See
+      #  - https://docs.python.org/3/library/asyncio-queue.html#asyncio.Queue.put
+      #  - https://docs.python.org/3/library/asyncio-queue.html#asyncio.Queue.put_nowait
+      - ["queue.Queue", "Member[put,put_nowait]", "Argument[0,item:]", "Argument[self]", "taint"]
+      # See 
+      #  - https://docs.python.org/3/library/random.html#random.choice
+      #  - https://docs.python.org/3/library/random.html#module-random
+      - ["random", "Member[choice]", "Argument[0,seq:]", "ReturnValue", "taint"]
+      - ["random.Random", "Member[choice]", "Argument[0,seq:]", "ReturnValue", "taint"]
+      # See https://docs.python.org/3/library/shlex.html#shlex.quote
+      - ["shlex", "Member[quote]", "Argument[0,s:]", "ReturnValue", "taint"]
+      # See https://docs.python.org/3/library/shutil.html#shutil.rmtree
+      - ["shutil", "Member[rmtree]", "Argument[0,path:]", "Argument[2,onerror:,onexc:].Argument[1]", "taint"]
+      # See https://docs.python.org/3/library/shutil.html#shutil.which
+      - ["shutil", "Member[which]", "Argument[0,cmd:,2,path:]", "ReturnValue", "taint"]
+      # See https://docs.python.org/3/library/subprocess.html#subprocess.Popen
+      - ["subprocess.Popen!", "Subclass.Call", "Argument[0,args:]", "ReturnValue", "taint"]
+      # See
+      #  - https://docs.python.org/3/library/tarfile.html#tarfile.open
+      #  - https://docs.python.org/3/library/tarfile.html#tarfile.TarFile.open
+      - ["tarfile", "Member[open]", "Argument[0,name:,2,fileobj:]", "ReturnValue", "taint"]
+      - ["tarfile.TarFile", "Member[open]", "Argument[0,name:,2,fileobj:]", "ReturnValue", "taint"]
+      # See https://docs.python.org/3/library/tempfile.html#tempfile.mkdtemp
+      - ["tempfile", "Member[mkdtemp]", "Argument[0,suffix:,1,prefix:,2,dir:]", "ReturnValue", "taint"]
+      # See https://docs.python.org/3/library/tempfile.html#tempfile.mkstemp
+      - ["tempfile", "Member[mkstemp]", "Argument[0,suffix:,1,prefix:,2,dir:]", "ReturnValue.TupleElement[0,1]", "taint"]
+      # See https://docs.python.org/3/library/textwrap.html#textwrap.dedent
+      - ["textwrap", "Member[dedent]", "Argument[0,text:]", "ReturnValue", "taint"]
+      # See https://docs.python.org/3/library/traceback.html#traceback.StackSummary.from_list
+      - ["traceback.StackSummary", "Member[from_list]", "Argument[0,a_list:]", "ReturnValue", "taint"]
+      # See https://docs.python.org/3/library/typing.html#typing.cast
+      - ["typing", "Member[cast]", "Argument[1,val:]", "ReturnValue", "value"]
       # See https://docs.python.org/3/library/urllib.parse.html#urllib.parse.quote
       - ["urllib", "Member[parse].Member[quote]", "Argument[0,string:]", "ReturnValue", "taint"]
       # See https://docs.python.org/3/library/urllib.parse.html#urllib.parse.quote_plus
@@ -35,6 +123,21 @@ extensions:
       - ["urllib", "Member[parse].Member[urlencode]", "Argument[0,query:]", "ReturnValue", "taint"]
       # See https://docs.python.org/3/library/urllib.parse.html#urllib.parse.urljoin
       - ["urllib", "Member[parse].Member[urljoin]", "Argument[0,base:,1,url:]", "ReturnValue", "taint"]
+      # See the internal documentation
+      #   https://github.com/python/cpython/blob/3.12/Lib/zipfile/_path/__init__.py#L103-L105
+      - ["zipfile.CompleteDirs", "Member[namelist]", "Argument[self]", "ReturnValue", "taint"]
+      # See https://docs.python.org/3/library/zipfile.html#zipfile.ZipFile
+      #   it may be necessary to read the code to understand the taint propagation
+      #   Constructor: https://github.com/python/cpython/blob/3.12/Lib/zipfile/__init__.py#L1266
+      - ["zipfile.ZipFile!", "Subclass.Call", "Argument[0,file:]", "ReturnValue", "taint"]
+      - ["zipfile.ZipFile!", "Subclass.Call", "Argument[0,file:]", "ReturnValue.Attribute[filelist].ListElement.Attribute[filename]", "value"]
+      #   _extract_member: https://github.com/python/cpython/blob/3.12/Lib/zipfile/__init__.py#L1761
+      - ["zipfile.ZipFile", "Member[_extract_member]", "Argument[1,targetpath:]", "ReturnValue", "taint"]
+      #   infolist: https://github.com/python/cpython/blob/3.12/Lib/zipfile/__init__.py#L1498-L1501
+      - ["zipfile.ZipFile", "Member[infolist]", "Argument[self]", "ReturnValue", "taint"]
+      - ["zipfile.ZipFile", "Member[infolist]", "Argument[self].Attribute[filelist]", "ReturnValue", "value"]
+      #   namelist: https://github.com/python/cpython/blob/3.12/Lib/zipfile/__init__.py#L1494-L1496
+      - ["zipfile.ZipFile", "Member[namelist]", "Argument[self]", "ReturnValue", "taint"]
   - addsTo:
       pack: codeql/python-all
       extensible: neutralModel

From eb32cbe8a5fa65d85894c62c01dd42a5a8cbec98 Mon Sep 17 00:00:00 2001
From: Rasmus Lerchedahl Petersen <yoff@github.com>
Date: Wed, 26 Jun 2024 00:57:59 +0200
Subject: [PATCH 011/347] Python: codecs.open

---
 python/ql/lib/semmle/python/frameworks/Stdlib.qll | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/python/ql/lib/semmle/python/frameworks/Stdlib.qll b/python/ql/lib/semmle/python/frameworks/Stdlib.qll
index 7a373a523e47..74e33429ed05 100644
--- a/python/ql/lib/semmle/python/frameworks/Stdlib.qll
+++ b/python/ql/lib/semmle/python/frameworks/Stdlib.qll
@@ -1492,6 +1492,9 @@ module StdlibPrivate {
     or
     // io.open is a special case, since it is an alias for the builtin `open`
     result = API::moduleImport("io").getMember("open")
+    or
+    // similarly, coecs.open calls the builtin `open`: https://github.com/python/cpython/blob/3.12/Lib/codecs.py#L918
+    result = API::moduleImport("codecs").getMember("open")
   }
 
   /**

From 571be8be3e052737e13c50d1fcc4201891aafe4f Mon Sep 17 00:00:00 2001
From: Rasmus Lerchedahl Petersen <yoff@github.com>
Date: Wed, 26 Jun 2024 01:00:38 +0200
Subject: [PATCH 012/347] Python: model more loggers

---
 python/ql/lib/semmle/python/frameworks/Stdlib.qll | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/python/ql/lib/semmle/python/frameworks/Stdlib.qll b/python/ql/lib/semmle/python/frameworks/Stdlib.qll
index 74e33429ed05..57bceeda79aa 100644
--- a/python/ql/lib/semmle/python/frameworks/Stdlib.qll
+++ b/python/ql/lib/semmle/python/frameworks/Stdlib.qll
@@ -254,10 +254,14 @@ module Stdlib {
    * See https://docs.python.org/3.9/library/logging.html#logging.Logger.
    */
   module Logger {
+    private import semmle.python.dataflow.new.internal.DataFlowDispatch as DD
+
     /** Gets a reference to the `logging.Logger` class or any subclass. */
     API::Node subclassRef() {
       result = API::moduleImport("logging").getMember("Logger").getASubclass*()
       or
+      result = API::moduleImport("logging").getMember("getLoggerClass").getReturn().getASubclass*()
+      or
       result = ModelOutput::getATypeNode("logging.Logger~Subclass").getASubclass*()
     }
 
@@ -277,6 +281,13 @@ module Stdlib {
       ClassInstantiation() {
         this = subclassRef().getACall()
         or
+        this =
+          DD::selfTracker(subclassRef()
+                .getAValueReachableFromSource()
+                .asExpr()
+                .(ClassExpr)
+                .getInnerScope())
+        or
         this = API::moduleImport("logging").getMember("root").asSource()
         or
         this = API::moduleImport("logging").getMember("getLogger").getACall()

From b261145f4346ee7ee666ba4445d199af076374f0 Mon Sep 17 00:00:00 2001
From: Rasmus Lerchedahl Petersen <yoff@github.com>
Date: Wed, 26 Jun 2024 10:46:38 +0200
Subject: [PATCH 013/347] Python: fix compilation

---
 .../functions/ModificationOfParameterWithDefault.qll   | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/python/ql/src/semmle/python/functions/ModificationOfParameterWithDefault.qll b/python/ql/src/semmle/python/functions/ModificationOfParameterWithDefault.qll
index 77dc4ccafcc0..68194309e1dd 100644
--- a/python/ql/src/semmle/python/functions/ModificationOfParameterWithDefault.qll
+++ b/python/ql/src/semmle/python/functions/ModificationOfParameterWithDefault.qll
@@ -8,7 +8,7 @@
 
 private import python
 import semmle.python.dataflow.new.DataFlow
-private import semmle.python.dataflow.new.internal.TaintTrackingPrivate as TTP
+private import semmle.python.ApiGraphs
 
 /**
  * Provides a data-flow configuration for detecting modifications of a parameters default value.
@@ -73,7 +73,13 @@ module ModificationOfParameterWithDefault {
       or
       // the target of a copy step is (presumably) a different object, and hence modifications of
       // this object no longer matter for the purposes of this query.
-      TTP::copyStep(_, node) and state in [true, false]
+      copyTarget(node) and state in [true, false]
+    }
+
+    private predicate copyTarget(DataFlow::Node node) {
+      node = API::moduleImport("copy").getMember(["copy", "deepcopy"]).getACall()
+      or
+      node.(DataFlow::MethodCallNode).calls(_, "copy")
     }
   }
 

From a3076f4f724884a71e41535f592ae8e717127c1c Mon Sep 17 00:00:00 2001
From: Rasmus Lerchedahl Petersen <yoff@github.com>
Date: Wed, 26 Jun 2024 13:27:32 +0200
Subject: [PATCH 014/347] Python: fix test expectations, add missing sanitizer

---
 .../UnsafeShellCommandConstructionQuery.qll       |  1 +
 .../CWE-022-UnsafeUnpacking/UnsafeUnpack.expected |  1 +
 .../Security/CWE-409/DecompressionBombs.expected  | 15 +++++++++++++++
 .../CommandInjection.expected                     |  2 +-
 4 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/python/ql/lib/semmle/python/security/dataflow/UnsafeShellCommandConstructionQuery.qll b/python/ql/lib/semmle/python/security/dataflow/UnsafeShellCommandConstructionQuery.qll
index 73205fdeb28c..6d292a88b6c7 100644
--- a/python/ql/lib/semmle/python/security/dataflow/UnsafeShellCommandConstructionQuery.qll
+++ b/python/ql/lib/semmle/python/security/dataflow/UnsafeShellCommandConstructionQuery.qll
@@ -45,6 +45,7 @@ module UnsafeShellCommandConstructionConfig implements DataFlow::ConfigSig {
   predicate isSink(DataFlow::Node sink) { sink instanceof Sink }
 
   predicate isBarrier(DataFlow::Node node) {
+    node instanceof Sanitizer or
     node instanceof CommandInjection::Sanitizer // using all sanitizers from `py/command-injection`
   }
 
diff --git a/python/ql/test/experimental/query-tests/Security/CWE-022-UnsafeUnpacking/UnsafeUnpack.expected b/python/ql/test/experimental/query-tests/Security/CWE-022-UnsafeUnpacking/UnsafeUnpack.expected
index ca4d7ebafff0..e1710375df25 100644
--- a/python/ql/test/experimental/query-tests/Security/CWE-022-UnsafeUnpacking/UnsafeUnpack.expected
+++ b/python/ql/test/experimental/query-tests/Security/CWE-022-UnsafeUnpacking/UnsafeUnpack.expected
@@ -75,6 +75,7 @@ edges
 | UnsafeUnpack.py:161:19:161:21 | ControlFlowNode for tar | UnsafeUnpack.py:163:33:163:35 | ControlFlowNode for tar | provenance |  |
 | UnsafeUnpack.py:161:25:161:46 | ControlFlowNode for Attribute() | UnsafeUnpack.py:161:19:161:21 | ControlFlowNode for tar | provenance |  |
 | UnsafeUnpack.py:161:38:161:45 | ControlFlowNode for savepath | UnsafeUnpack.py:161:25:161:46 | ControlFlowNode for Attribute() | provenance | Config |
+| UnsafeUnpack.py:161:38:161:45 | ControlFlowNode for savepath | UnsafeUnpack.py:161:25:161:46 | ControlFlowNode for Attribute() | provenance | MaD:49 |
 | UnsafeUnpack.py:163:23:163:28 | ControlFlowNode for member | UnsafeUnpack.py:166:37:166:42 | ControlFlowNode for member | provenance |  |
 | UnsafeUnpack.py:163:33:163:35 | ControlFlowNode for tar | UnsafeUnpack.py:163:23:163:28 | ControlFlowNode for member | provenance |  |
 | UnsafeUnpack.py:166:23:166:28 | [post] ControlFlowNode for result | UnsafeUnpack.py:167:67:167:72 | ControlFlowNode for result | provenance |  |
diff --git a/python/ql/test/experimental/query-tests/Security/CWE-409/DecompressionBombs.expected b/python/ql/test/experimental/query-tests/Security/CWE-409/DecompressionBombs.expected
index 5689deb01a03..92af7f59efe7 100644
--- a/python/ql/test/experimental/query-tests/Security/CWE-409/DecompressionBombs.expected
+++ b/python/ql/test/experimental/query-tests/Security/CWE-409/DecompressionBombs.expected
@@ -1,13 +1,23 @@
 edges
 | test.py:10:16:10:24 | ControlFlowNode for file_path | test.py:11:21:11:29 | ControlFlowNode for file_path | provenance |  |
+| test.py:11:5:11:35 | ControlFlowNode for Attribute() | test.py:11:5:11:52 | ControlFlowNode for Attribute() | provenance | Config |
+| test.py:11:21:11:29 | ControlFlowNode for file_path | test.py:11:5:11:35 | ControlFlowNode for Attribute() | provenance | MaD:64 |
 | test.py:11:21:11:29 | ControlFlowNode for file_path | test.py:11:5:11:52 | ControlFlowNode for Attribute() | provenance | Config |
 | test.py:11:21:11:29 | ControlFlowNode for file_path | test.py:12:21:12:29 | ControlFlowNode for file_path | provenance |  |
+| test.py:12:5:12:35 | ControlFlowNode for Attribute() | test.py:12:5:12:48 | ControlFlowNode for Attribute() | provenance | Config |
+| test.py:12:21:12:29 | ControlFlowNode for file_path | test.py:12:5:12:35 | ControlFlowNode for Attribute() | provenance | MaD:64 |
 | test.py:12:21:12:29 | ControlFlowNode for file_path | test.py:12:5:12:48 | ControlFlowNode for Attribute() | provenance | Config |
 | test.py:12:21:12:29 | ControlFlowNode for file_path | test.py:14:26:14:34 | ControlFlowNode for file_path | provenance |  |
+| test.py:14:10:14:35 | ControlFlowNode for Attribute() | test.py:15:14:15:29 | ControlFlowNode for Attribute() | provenance | Config |
+| test.py:14:26:14:34 | ControlFlowNode for file_path | test.py:14:10:14:35 | ControlFlowNode for Attribute() | provenance | MaD:64 |
 | test.py:14:26:14:34 | ControlFlowNode for file_path | test.py:15:14:15:29 | ControlFlowNode for Attribute() | provenance | Config |
 | test.py:14:26:14:34 | ControlFlowNode for file_path | test.py:18:26:18:34 | ControlFlowNode for file_path | provenance |  |
+| test.py:18:10:18:35 | ControlFlowNode for Attribute() | test.py:19:14:19:39 | ControlFlowNode for Attribute() | provenance | Config |
+| test.py:18:26:18:34 | ControlFlowNode for file_path | test.py:18:10:18:35 | ControlFlowNode for Attribute() | provenance | MaD:64 |
 | test.py:18:26:18:34 | ControlFlowNode for file_path | test.py:19:14:19:39 | ControlFlowNode for Attribute() | provenance | Config |
 | test.py:18:26:18:34 | ControlFlowNode for file_path | test.py:22:21:22:29 | ControlFlowNode for file_path | provenance |  |
+| test.py:22:5:22:30 | ControlFlowNode for Attribute() | test.py:22:5:22:60 | ControlFlowNode for Attribute() | provenance | Config |
+| test.py:22:21:22:29 | ControlFlowNode for file_path | test.py:22:5:22:30 | ControlFlowNode for Attribute() | provenance | MaD:64 |
 | test.py:22:21:22:29 | ControlFlowNode for file_path | test.py:22:5:22:60 | ControlFlowNode for Attribute() | provenance | Config |
 | test.py:22:21:22:29 | ControlFlowNode for file_path | test.py:24:18:24:26 | ControlFlowNode for file_path | provenance |  |
 | test.py:24:18:24:26 | ControlFlowNode for file_path | test.py:24:5:24:52 | ControlFlowNode for Attribute() | provenance | Config |
@@ -37,14 +47,19 @@ edges
 | test.py:28:26:28:34 | ControlFlowNode for file_path | test.py:64:36:64:44 | ControlFlowNode for file_path | provenance |  |
 nodes
 | test.py:10:16:10:24 | ControlFlowNode for file_path | semmle.label | ControlFlowNode for file_path |
+| test.py:11:5:11:35 | ControlFlowNode for Attribute() | semmle.label | ControlFlowNode for Attribute() |
 | test.py:11:5:11:52 | ControlFlowNode for Attribute() | semmle.label | ControlFlowNode for Attribute() |
 | test.py:11:21:11:29 | ControlFlowNode for file_path | semmle.label | ControlFlowNode for file_path |
+| test.py:12:5:12:35 | ControlFlowNode for Attribute() | semmle.label | ControlFlowNode for Attribute() |
 | test.py:12:5:12:48 | ControlFlowNode for Attribute() | semmle.label | ControlFlowNode for Attribute() |
 | test.py:12:21:12:29 | ControlFlowNode for file_path | semmle.label | ControlFlowNode for file_path |
+| test.py:14:10:14:35 | ControlFlowNode for Attribute() | semmle.label | ControlFlowNode for Attribute() |
 | test.py:14:26:14:34 | ControlFlowNode for file_path | semmle.label | ControlFlowNode for file_path |
 | test.py:15:14:15:29 | ControlFlowNode for Attribute() | semmle.label | ControlFlowNode for Attribute() |
+| test.py:18:10:18:35 | ControlFlowNode for Attribute() | semmle.label | ControlFlowNode for Attribute() |
 | test.py:18:26:18:34 | ControlFlowNode for file_path | semmle.label | ControlFlowNode for file_path |
 | test.py:19:14:19:39 | ControlFlowNode for Attribute() | semmle.label | ControlFlowNode for Attribute() |
+| test.py:22:5:22:30 | ControlFlowNode for Attribute() | semmle.label | ControlFlowNode for Attribute() |
 | test.py:22:5:22:60 | ControlFlowNode for Attribute() | semmle.label | ControlFlowNode for Attribute() |
 | test.py:22:21:22:29 | ControlFlowNode for file_path | semmle.label | ControlFlowNode for file_path |
 | test.py:24:5:24:52 | ControlFlowNode for Attribute() | semmle.label | ControlFlowNode for Attribute() |
diff --git a/python/ql/test/query-tests/Security/CWE-078-CommandInjection/CommandInjection.expected b/python/ql/test/query-tests/Security/CWE-078-CommandInjection/CommandInjection.expected
index 1e75c67db66b..4a1856ba98ad 100644
--- a/python/ql/test/query-tests/Security/CWE-078-CommandInjection/CommandInjection.expected
+++ b/python/ql/test/query-tests/Security/CWE-078-CommandInjection/CommandInjection.expected
@@ -12,7 +12,7 @@ edges
 | command_injection.py:11:13:11:19 | ControlFlowNode for request | command_injection.py:11:13:11:24 | ControlFlowNode for Attribute | provenance | AdditionalTaintStep |
 | command_injection.py:11:13:11:24 | ControlFlowNode for Attribute | command_injection.py:11:13:11:41 | ControlFlowNode for Attribute() | provenance | dict.get |
 | command_injection.py:11:13:11:41 | ControlFlowNode for Attribute() | command_injection.py:11:5:11:9 | ControlFlowNode for files | provenance |  |
-| command_injection.py:18:5:18:9 | ControlFlowNode for files | command_injection.py:20:22:20:34 | ControlFlowNode for BinaryExpr | provenance |  |
+| command_injection.py:18:5:18:9 | ControlFlowNode for files | command_injection.py:20:22:20:34 | ControlFlowNode for BinaryExpr | provenance |  Sink:MaD:11 |
 | command_injection.py:18:13:18:19 | ControlFlowNode for request | command_injection.py:18:13:18:24 | ControlFlowNode for Attribute | provenance | AdditionalTaintStep |
 | command_injection.py:18:13:18:24 | ControlFlowNode for Attribute | command_injection.py:18:13:18:41 | ControlFlowNode for Attribute() | provenance | dict.get |
 | command_injection.py:18:13:18:41 | ControlFlowNode for Attribute() | command_injection.py:18:5:18:9 | ControlFlowNode for files | provenance |  |

From bbc3ff2dfedf7cbf087209f7863d1049db7b4bca Mon Sep 17 00:00:00 2001
From: yoff <lerchedahl@gmail.com>
Date: Fri, 28 Jun 2024 14:39:03 +0200
Subject: [PATCH 015/347] Apply suggestions from code review

Co-authored-by: Rasmus Wriedt Larsen <rasmuswriedtlarsen@gmail.com>
---
 .../ql/lib/semmle/python/frameworks/Stdlib/StdLib.model.yml   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/python/ql/lib/semmle/python/frameworks/Stdlib/StdLib.model.yml b/python/ql/lib/semmle/python/frameworks/Stdlib/StdLib.model.yml
index 1d7e0c070fe4..16bd96ffe252 100644
--- a/python/ql/lib/semmle/python/frameworks/Stdlib/StdLib.model.yml
+++ b/python/ql/lib/semmle/python/frameworks/Stdlib/StdLib.model.yml
@@ -18,7 +18,7 @@ extensions:
       # See
       #  - https://docs.python.org/3/glossary.html#term-mapping 
       #  - https://docs.python.org/3/library/stdtypes.html#dict.get
-      - ["_collections_abc.Mapping", "Member[get]", "Argument[1,default:]", "ReturnValue", "taint"]
+      - ["collections.abc.Mapping", "Member[get]", "Argument[1,default:]", "ReturnValue", "taint"]
       # See https://docs.python.org/3/library/argparse.html#argparse.ArgumentParser
       - ["argparse.ArgumentParser", "Member[_parse_known_args,_read_args_from_files]", "Argument[0,arg_strings:]", "ReturnValue", "taint"]
       - ["argparse.ArgumentParser", "Member[parse_args,parse_known_args]", "Argument[0,args:]", "ReturnValue", "taint"]
@@ -88,7 +88,7 @@ extensions:
       # See https://docs.python.org/3/library/shlex.html#shlex.quote
       - ["shlex", "Member[quote]", "Argument[0,s:]", "ReturnValue", "taint"]
       # See https://docs.python.org/3/library/shutil.html#shutil.rmtree
-      - ["shutil", "Member[rmtree]", "Argument[0,path:]", "Argument[2,onerror:,onexc:].Argument[1]", "taint"]
+      - ["shutil", "Member[rmtree]", "Argument[0,path:]", "Argument[2,onerror:,onexc:].Parameter[1]", "taint"]
       # See https://docs.python.org/3/library/shutil.html#shutil.which
       - ["shutil", "Member[which]", "Argument[0,cmd:,2,path:]", "ReturnValue", "taint"]
       # See https://docs.python.org/3/library/subprocess.html#subprocess.Popen

From 59f953269a22300e011546a9ced4cc3a2c4c9234 Mon Sep 17 00:00:00 2001
From: Rasmus Lerchedahl Petersen <yoff@github.com>
Date: Fri, 28 Jun 2024 14:42:24 +0200
Subject: [PATCH 016/347] Python: remove strange sink It is not clear from the
 code how this could happen and I do not remember the path I saw, perhaps it
 was unreasonable.

---
 python/ql/lib/semmle/python/frameworks/Stdlib/StdLib.model.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/python/ql/lib/semmle/python/frameworks/Stdlib/StdLib.model.yml b/python/ql/lib/semmle/python/frameworks/Stdlib/StdLib.model.yml
index 16bd96ffe252..aee88e1d9419 100644
--- a/python/ql/lib/semmle/python/frameworks/Stdlib/StdLib.model.yml
+++ b/python/ql/lib/semmle/python/frameworks/Stdlib/StdLib.model.yml
@@ -8,7 +8,6 @@ extensions:
       pack: codeql/python-all
       extensible: sinkModel
     data:
-      - ["subprocess.Popen!","Subclass.Call.Argument[0,args:]", "log-injection"]
       - ["zipfile.ZipFile","Member[extractall].Argument[0,path:]", "path-injection"]
 
   - addsTo:

From 5ddfe75a0da516249e7a7ff3c0a06bbbc2200b87 Mon Sep 17 00:00:00 2001
From: Rasmus Lerchedahl Petersen <yoff@github.com>
Date: Fri, 28 Jun 2024 15:10:08 +0200
Subject: [PATCH 017/347] Python: Add value steps for sequence elements It
 would be nice to simplify to a single sequence content type..

---
 .../semmle/python/frameworks/Stdlib/StdLib.model.yml   | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/python/ql/lib/semmle/python/frameworks/Stdlib/StdLib.model.yml b/python/ql/lib/semmle/python/frameworks/Stdlib/StdLib.model.yml
index aee88e1d9419..569ad9e48e7f 100644
--- a/python/ql/lib/semmle/python/frameworks/Stdlib/StdLib.model.yml
+++ b/python/ql/lib/semmle/python/frameworks/Stdlib/StdLib.model.yml
@@ -76,13 +76,23 @@ extensions:
       # See https://docs.python.org/3/library/os.html#os.PathLike.__fspath__
       - ["pathlib.PurePath", "Member[__fspath__]", "Argument[self]", "ReturnValue", "taint"]
       # See
+      #  - https://docs.python.org/3/library/asyncio-queue.html#asyncio.Queue.get
+      #  - https://docs.python.org/3/library/asyncio-queue.html#asyncio.Queue.get_nowait
+      - ["queue.Queue", "Member[get,get_nowait]", "Argument[self].ListElement", "ReturnValue", "value"]
+      - ["queue.Queue", "Member[get,get_nowait]", "Argument[self]", "ReturnValue", "taint"]
+      # See
       #  - https://docs.python.org/3/library/asyncio-queue.html#asyncio.Queue.put
       #  - https://docs.python.org/3/library/asyncio-queue.html#asyncio.Queue.put_nowait
+      - ["queue.Queue", "Member[put,put_nowait]", "Argument[0,item:]", "Argument[self].ListElement", "value"]
       - ["queue.Queue", "Member[put,put_nowait]", "Argument[0,item:]", "Argument[self]", "taint"]
       # See 
       #  - https://docs.python.org/3/library/random.html#random.choice
       #  - https://docs.python.org/3/library/random.html#module-random
+      - ["random", "Member[choice]", "Argument[0,seq:].ListElement", "ReturnValue", "value"]
+      - ["random", "Member[choice]", "Argument[0,seq:].SetElement", "ReturnValue", "value"]
       - ["random", "Member[choice]", "Argument[0,seq:]", "ReturnValue", "taint"]
+      - ["random.Random", "Member[choice]", "Argument[0,seq:].ListElement", "ReturnValue", "value"]
+      - ["random.Random", "Member[choice]", "Argument[0,seq:].SetElement", "ReturnValue", "value"]
       - ["random.Random", "Member[choice]", "Argument[0,seq:]", "ReturnValue", "taint"]
       # See https://docs.python.org/3/library/shlex.html#shlex.quote
       - ["shlex", "Member[quote]", "Argument[0,s:]", "ReturnValue", "taint"]

From 77a00873a974c4ecec229f19a59f2cef7ede0c02 Mon Sep 17 00:00:00 2001
From: Rasmus Lerchedahl Petersen <yoff@github.com>
Date: Fri, 28 Jun 2024 15:25:17 +0200
Subject: [PATCH 018/347] Python: add tests for loggers

---
 .../ql/test/library-tests/frameworks/stdlib/Logging.py   | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/python/ql/test/library-tests/frameworks/stdlib/Logging.py b/python/ql/test/library-tests/frameworks/stdlib/Logging.py
index cb2e3fddc902..72a5175fef85 100644
--- a/python/ql/test/library-tests/frameworks/stdlib/Logging.py
+++ b/python/ql/test/library-tests/frameworks/stdlib/Logging.py
@@ -43,3 +43,12 @@ class MyLogger(logging.Logger):
     pass
 
 MyLogger("bar").info("hello") # $ loggingInput="hello"
+
+class CustomLogger(logging.getLoggerClass()):
+    pass
+
+CustomLogger("baz").info("hello") # $ loggingInput="hello"
+
+class LoggerSubClassUsingSelf(logging.Logger):
+    def foo(self):
+        self.info("hello") # $ loggingInput="hello"
\ No newline at end of file

From e40ae2e52d3a3d378aa00a0b9f5bd6c5f9a88bc3 Mon Sep 17 00:00:00 2001
From: Rasmus Lerchedahl Petersen <yoff@github.com>
Date: Fri, 28 Jun 2024 21:56:11 +0200
Subject: [PATCH 019/347] Python: adjust test expectations MaD row numbers in
 provenance column

---
 .../CWE-022-UnsafeUnpacking/UnsafeUnpack.expected      |  2 +-
 .../Security/CWE-409/DecompressionBombs.expected       | 10 +++++-----
 .../CWE-078-CommandInjection/CommandInjection.expected |  2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/python/ql/test/experimental/query-tests/Security/CWE-022-UnsafeUnpacking/UnsafeUnpack.expected b/python/ql/test/experimental/query-tests/Security/CWE-022-UnsafeUnpacking/UnsafeUnpack.expected
index e1710375df25..ea08c95d7b64 100644
--- a/python/ql/test/experimental/query-tests/Security/CWE-022-UnsafeUnpacking/UnsafeUnpack.expected
+++ b/python/ql/test/experimental/query-tests/Security/CWE-022-UnsafeUnpacking/UnsafeUnpack.expected
@@ -75,7 +75,7 @@ edges
 | UnsafeUnpack.py:161:19:161:21 | ControlFlowNode for tar | UnsafeUnpack.py:163:33:163:35 | ControlFlowNode for tar | provenance |  |
 | UnsafeUnpack.py:161:25:161:46 | ControlFlowNode for Attribute() | UnsafeUnpack.py:161:19:161:21 | ControlFlowNode for tar | provenance |  |
 | UnsafeUnpack.py:161:38:161:45 | ControlFlowNode for savepath | UnsafeUnpack.py:161:25:161:46 | ControlFlowNode for Attribute() | provenance | Config |
-| UnsafeUnpack.py:161:38:161:45 | ControlFlowNode for savepath | UnsafeUnpack.py:161:25:161:46 | ControlFlowNode for Attribute() | provenance | MaD:49 |
+| UnsafeUnpack.py:161:38:161:45 | ControlFlowNode for savepath | UnsafeUnpack.py:161:25:161:46 | ControlFlowNode for Attribute() | provenance | MaD:55 |
 | UnsafeUnpack.py:163:23:163:28 | ControlFlowNode for member | UnsafeUnpack.py:166:37:166:42 | ControlFlowNode for member | provenance |  |
 | UnsafeUnpack.py:163:33:163:35 | ControlFlowNode for tar | UnsafeUnpack.py:163:23:163:28 | ControlFlowNode for member | provenance |  |
 | UnsafeUnpack.py:166:23:166:28 | [post] ControlFlowNode for result | UnsafeUnpack.py:167:67:167:72 | ControlFlowNode for result | provenance |  |
diff --git a/python/ql/test/experimental/query-tests/Security/CWE-409/DecompressionBombs.expected b/python/ql/test/experimental/query-tests/Security/CWE-409/DecompressionBombs.expected
index 92af7f59efe7..19d715d8a868 100644
--- a/python/ql/test/experimental/query-tests/Security/CWE-409/DecompressionBombs.expected
+++ b/python/ql/test/experimental/query-tests/Security/CWE-409/DecompressionBombs.expected
@@ -1,23 +1,23 @@
 edges
 | test.py:10:16:10:24 | ControlFlowNode for file_path | test.py:11:21:11:29 | ControlFlowNode for file_path | provenance |  |
 | test.py:11:5:11:35 | ControlFlowNode for Attribute() | test.py:11:5:11:52 | ControlFlowNode for Attribute() | provenance | Config |
-| test.py:11:21:11:29 | ControlFlowNode for file_path | test.py:11:5:11:35 | ControlFlowNode for Attribute() | provenance | MaD:64 |
+| test.py:11:21:11:29 | ControlFlowNode for file_path | test.py:11:5:11:35 | ControlFlowNode for Attribute() | provenance | MaD:70 |
 | test.py:11:21:11:29 | ControlFlowNode for file_path | test.py:11:5:11:52 | ControlFlowNode for Attribute() | provenance | Config |
 | test.py:11:21:11:29 | ControlFlowNode for file_path | test.py:12:21:12:29 | ControlFlowNode for file_path | provenance |  |
 | test.py:12:5:12:35 | ControlFlowNode for Attribute() | test.py:12:5:12:48 | ControlFlowNode for Attribute() | provenance | Config |
-| test.py:12:21:12:29 | ControlFlowNode for file_path | test.py:12:5:12:35 | ControlFlowNode for Attribute() | provenance | MaD:64 |
+| test.py:12:21:12:29 | ControlFlowNode for file_path | test.py:12:5:12:35 | ControlFlowNode for Attribute() | provenance | MaD:70 |
 | test.py:12:21:12:29 | ControlFlowNode for file_path | test.py:12:5:12:48 | ControlFlowNode for Attribute() | provenance | Config |
 | test.py:12:21:12:29 | ControlFlowNode for file_path | test.py:14:26:14:34 | ControlFlowNode for file_path | provenance |  |
 | test.py:14:10:14:35 | ControlFlowNode for Attribute() | test.py:15:14:15:29 | ControlFlowNode for Attribute() | provenance | Config |
-| test.py:14:26:14:34 | ControlFlowNode for file_path | test.py:14:10:14:35 | ControlFlowNode for Attribute() | provenance | MaD:64 |
+| test.py:14:26:14:34 | ControlFlowNode for file_path | test.py:14:10:14:35 | ControlFlowNode for Attribute() | provenance | MaD:70 |
 | test.py:14:26:14:34 | ControlFlowNode for file_path | test.py:15:14:15:29 | ControlFlowNode for Attribute() | provenance | Config |
 | test.py:14:26:14:34 | ControlFlowNode for file_path | test.py:18:26:18:34 | ControlFlowNode for file_path | provenance |  |
 | test.py:18:10:18:35 | ControlFlowNode for Attribute() | test.py:19:14:19:39 | ControlFlowNode for Attribute() | provenance | Config |
-| test.py:18:26:18:34 | ControlFlowNode for file_path | test.py:18:10:18:35 | ControlFlowNode for Attribute() | provenance | MaD:64 |
+| test.py:18:26:18:34 | ControlFlowNode for file_path | test.py:18:10:18:35 | ControlFlowNode for Attribute() | provenance | MaD:70 |
 | test.py:18:26:18:34 | ControlFlowNode for file_path | test.py:19:14:19:39 | ControlFlowNode for Attribute() | provenance | Config |
 | test.py:18:26:18:34 | ControlFlowNode for file_path | test.py:22:21:22:29 | ControlFlowNode for file_path | provenance |  |
 | test.py:22:5:22:30 | ControlFlowNode for Attribute() | test.py:22:5:22:60 | ControlFlowNode for Attribute() | provenance | Config |
-| test.py:22:21:22:29 | ControlFlowNode for file_path | test.py:22:5:22:30 | ControlFlowNode for Attribute() | provenance | MaD:64 |
+| test.py:22:21:22:29 | ControlFlowNode for file_path | test.py:22:5:22:30 | ControlFlowNode for Attribute() | provenance | MaD:70 |
 | test.py:22:21:22:29 | ControlFlowNode for file_path | test.py:22:5:22:60 | ControlFlowNode for Attribute() | provenance | Config |
 | test.py:22:21:22:29 | ControlFlowNode for file_path | test.py:24:18:24:26 | ControlFlowNode for file_path | provenance |  |
 | test.py:24:18:24:26 | ControlFlowNode for file_path | test.py:24:5:24:52 | ControlFlowNode for Attribute() | provenance | Config |
diff --git a/python/ql/test/query-tests/Security/CWE-078-CommandInjection/CommandInjection.expected b/python/ql/test/query-tests/Security/CWE-078-CommandInjection/CommandInjection.expected
index 4a1856ba98ad..1e75c67db66b 100644
--- a/python/ql/test/query-tests/Security/CWE-078-CommandInjection/CommandInjection.expected
+++ b/python/ql/test/query-tests/Security/CWE-078-CommandInjection/CommandInjection.expected
@@ -12,7 +12,7 @@ edges
 | command_injection.py:11:13:11:19 | ControlFlowNode for request | command_injection.py:11:13:11:24 | ControlFlowNode for Attribute | provenance | AdditionalTaintStep |
 | command_injection.py:11:13:11:24 | ControlFlowNode for Attribute | command_injection.py:11:13:11:41 | ControlFlowNode for Attribute() | provenance | dict.get |
 | command_injection.py:11:13:11:41 | ControlFlowNode for Attribute() | command_injection.py:11:5:11:9 | ControlFlowNode for files | provenance |  |
-| command_injection.py:18:5:18:9 | ControlFlowNode for files | command_injection.py:20:22:20:34 | ControlFlowNode for BinaryExpr | provenance |  Sink:MaD:11 |
+| command_injection.py:18:5:18:9 | ControlFlowNode for files | command_injection.py:20:22:20:34 | ControlFlowNode for BinaryExpr | provenance |  |
 | command_injection.py:18:13:18:19 | ControlFlowNode for request | command_injection.py:18:13:18:24 | ControlFlowNode for Attribute | provenance | AdditionalTaintStep |
 | command_injection.py:18:13:18:24 | ControlFlowNode for Attribute | command_injection.py:18:13:18:41 | ControlFlowNode for Attribute() | provenance | dict.get |
 | command_injection.py:18:13:18:41 | ControlFlowNode for Attribute() | command_injection.py:18:5:18:9 | ControlFlowNode for files | provenance |  |

From e30f725e71e6637f037bd232ee1a5573ce1c2aa7 Mon Sep 17 00:00:00 2001
From: Rasmus Lerchedahl Petersen <yoff@github.com>
Date: Mon, 22 Jul 2024 15:43:06 +0200
Subject: [PATCH 020/347] Python: Remove questionable model for
 `multiprocessing.connection.Listener`

---
 python/ql/lib/semmle/python/frameworks/Stdlib/StdLib.model.yml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/python/ql/lib/semmle/python/frameworks/Stdlib/StdLib.model.yml b/python/ql/lib/semmle/python/frameworks/Stdlib/StdLib.model.yml
index 569ad9e48e7f..19a97b16537e 100644
--- a/python/ql/lib/semmle/python/frameworks/Stdlib/StdLib.model.yml
+++ b/python/ql/lib/semmle/python/frameworks/Stdlib/StdLib.model.yml
@@ -63,8 +63,6 @@ extensions:
       - ["logging.LogRecord", "Member[getMessage]", "Argument[self]", "ReturnValue", "taint"]
       # See https://docs.python.org/3/library/mimetypes.html#mimetypes.guess_type
       - ["mimetypes", "Member[guess_type]", "Argument[0,url:]", "ReturnValue", "taint"]
-      # See https://docs.python.org/3/library/multiprocessing.html#multiprocessing.connection.Listener
-      - ["multiprocessing.connection.Listener!", "Subclass.Call", "Argument[3,authkey:]", "ReturnValue", "taint"]
       # See https://github.com/python/cpython/blob/main/Lib/nturl2path.py
       #   No user-facing documentation, unfortunately.
       - ["nturl2path", "Member[pathname2url]", "Argument[0,p:]", "ReturnValue", "taint"]

From 3434c38da78189324578285f405f0bd0bb180786 Mon Sep 17 00:00:00 2001
From: Rasmus Lerchedahl Petersen <yoff@github.com>
Date: Mon, 22 Jul 2024 17:03:29 +0200
Subject: [PATCH 021/347] Python: update test expectations This is MaD...

---
 .../CWE-022-UnsafeUnpacking/UnsafeUnpack.expected      |  2 +-
 .../Security/CWE-409/DecompressionBombs.expected       | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/python/ql/test/experimental/query-tests/Security/CWE-022-UnsafeUnpacking/UnsafeUnpack.expected b/python/ql/test/experimental/query-tests/Security/CWE-022-UnsafeUnpacking/UnsafeUnpack.expected
index ea08c95d7b64..0c6c30857220 100644
--- a/python/ql/test/experimental/query-tests/Security/CWE-022-UnsafeUnpacking/UnsafeUnpack.expected
+++ b/python/ql/test/experimental/query-tests/Security/CWE-022-UnsafeUnpacking/UnsafeUnpack.expected
@@ -75,7 +75,7 @@ edges
 | UnsafeUnpack.py:161:19:161:21 | ControlFlowNode for tar | UnsafeUnpack.py:163:33:163:35 | ControlFlowNode for tar | provenance |  |
 | UnsafeUnpack.py:161:25:161:46 | ControlFlowNode for Attribute() | UnsafeUnpack.py:161:19:161:21 | ControlFlowNode for tar | provenance |  |
 | UnsafeUnpack.py:161:38:161:45 | ControlFlowNode for savepath | UnsafeUnpack.py:161:25:161:46 | ControlFlowNode for Attribute() | provenance | Config |
-| UnsafeUnpack.py:161:38:161:45 | ControlFlowNode for savepath | UnsafeUnpack.py:161:25:161:46 | ControlFlowNode for Attribute() | provenance | MaD:55 |
+| UnsafeUnpack.py:161:38:161:45 | ControlFlowNode for savepath | UnsafeUnpack.py:161:25:161:46 | ControlFlowNode for Attribute() | provenance | MaD:54 |
 | UnsafeUnpack.py:163:23:163:28 | ControlFlowNode for member | UnsafeUnpack.py:166:37:166:42 | ControlFlowNode for member | provenance |  |
 | UnsafeUnpack.py:163:33:163:35 | ControlFlowNode for tar | UnsafeUnpack.py:163:23:163:28 | ControlFlowNode for member | provenance |  |
 | UnsafeUnpack.py:166:23:166:28 | [post] ControlFlowNode for result | UnsafeUnpack.py:167:67:167:72 | ControlFlowNode for result | provenance |  |
diff --git a/python/ql/test/experimental/query-tests/Security/CWE-409/DecompressionBombs.expected b/python/ql/test/experimental/query-tests/Security/CWE-409/DecompressionBombs.expected
index 19d715d8a868..073533bcc092 100644
--- a/python/ql/test/experimental/query-tests/Security/CWE-409/DecompressionBombs.expected
+++ b/python/ql/test/experimental/query-tests/Security/CWE-409/DecompressionBombs.expected
@@ -1,23 +1,23 @@
 edges
 | test.py:10:16:10:24 | ControlFlowNode for file_path | test.py:11:21:11:29 | ControlFlowNode for file_path | provenance |  |
 | test.py:11:5:11:35 | ControlFlowNode for Attribute() | test.py:11:5:11:52 | ControlFlowNode for Attribute() | provenance | Config |
-| test.py:11:21:11:29 | ControlFlowNode for file_path | test.py:11:5:11:35 | ControlFlowNode for Attribute() | provenance | MaD:70 |
+| test.py:11:21:11:29 | ControlFlowNode for file_path | test.py:11:5:11:35 | ControlFlowNode for Attribute() | provenance | MaD:69 |
 | test.py:11:21:11:29 | ControlFlowNode for file_path | test.py:11:5:11:52 | ControlFlowNode for Attribute() | provenance | Config |
 | test.py:11:21:11:29 | ControlFlowNode for file_path | test.py:12:21:12:29 | ControlFlowNode for file_path | provenance |  |
 | test.py:12:5:12:35 | ControlFlowNode for Attribute() | test.py:12:5:12:48 | ControlFlowNode for Attribute() | provenance | Config |
-| test.py:12:21:12:29 | ControlFlowNode for file_path | test.py:12:5:12:35 | ControlFlowNode for Attribute() | provenance | MaD:70 |
+| test.py:12:21:12:29 | ControlFlowNode for file_path | test.py:12:5:12:35 | ControlFlowNode for Attribute() | provenance | MaD:69 |
 | test.py:12:21:12:29 | ControlFlowNode for file_path | test.py:12:5:12:48 | ControlFlowNode for Attribute() | provenance | Config |
 | test.py:12:21:12:29 | ControlFlowNode for file_path | test.py:14:26:14:34 | ControlFlowNode for file_path | provenance |  |
 | test.py:14:10:14:35 | ControlFlowNode for Attribute() | test.py:15:14:15:29 | ControlFlowNode for Attribute() | provenance | Config |
-| test.py:14:26:14:34 | ControlFlowNode for file_path | test.py:14:10:14:35 | ControlFlowNode for Attribute() | provenance | MaD:70 |
+| test.py:14:26:14:34 | ControlFlowNode for file_path | test.py:14:10:14:35 | ControlFlowNode for Attribute() | provenance | MaD:69 |
 | test.py:14:26:14:34 | ControlFlowNode for file_path | test.py:15:14:15:29 | ControlFlowNode for Attribute() | provenance | Config |
 | test.py:14:26:14:34 | ControlFlowNode for file_path | test.py:18:26:18:34 | ControlFlowNode for file_path | provenance |  |
 | test.py:18:10:18:35 | ControlFlowNode for Attribute() | test.py:19:14:19:39 | ControlFlowNode for Attribute() | provenance | Config |
-| test.py:18:26:18:34 | ControlFlowNode for file_path | test.py:18:10:18:35 | ControlFlowNode for Attribute() | provenance | MaD:70 |
+| test.py:18:26:18:34 | ControlFlowNode for file_path | test.py:18:10:18:35 | ControlFlowNode for Attribute() | provenance | MaD:69 |
 | test.py:18:26:18:34 | ControlFlowNode for file_path | test.py:19:14:19:39 | ControlFlowNode for Attribute() | provenance | Config |
 | test.py:18:26:18:34 | ControlFlowNode for file_path | test.py:22:21:22:29 | ControlFlowNode for file_path | provenance |  |
 | test.py:22:5:22:30 | ControlFlowNode for Attribute() | test.py:22:5:22:60 | ControlFlowNode for Attribute() | provenance | Config |
-| test.py:22:21:22:29 | ControlFlowNode for file_path | test.py:22:5:22:30 | ControlFlowNode for Attribute() | provenance | MaD:70 |
+| test.py:22:21:22:29 | ControlFlowNode for file_path | test.py:22:5:22:30 | ControlFlowNode for Attribute() | provenance | MaD:69 |
 | test.py:22:21:22:29 | ControlFlowNode for file_path | test.py:22:5:22:60 | ControlFlowNode for Attribute() | provenance | Config |
 | test.py:22:21:22:29 | ControlFlowNode for file_path | test.py:24:18:24:26 | ControlFlowNode for file_path | provenance |  |
 | test.py:24:18:24:26 | ControlFlowNode for file_path | test.py:24:5:24:52 | ControlFlowNode for Attribute() | provenance | Config |

From 35378aa7146386caac4aea2d9fa4e9341a6a3ed9 Mon Sep 17 00:00:00 2001
From: Geoffrey White <40627776+geoffw0@users.noreply.github.com>
Date: Wed, 18 Sep 2024 15:57:32 +0100
Subject: [PATCH 022/347] Rust: Add placeholder query + test for unreachable
 code query.

---
 .../queries/unusedentities/UnreachableCode.ql |  15 ++
 .../unusedentities/UnreachableCode.expected   |   0
 .../unusedentities/UnreachableCode.qlref      |   1 +
 .../query-tests/unusedentities/unreachable.rs | 140 ++++++++++++++++++
 4 files changed, 156 insertions(+)
 create mode 100644 rust/ql/src/queries/unusedentities/UnreachableCode.ql
 create mode 100644 rust/ql/test/query-tests/unusedentities/UnreachableCode.expected
 create mode 100644 rust/ql/test/query-tests/unusedentities/UnreachableCode.qlref
 create mode 100644 rust/ql/test/query-tests/unusedentities/unreachable.rs

diff --git a/rust/ql/src/queries/unusedentities/UnreachableCode.ql b/rust/ql/src/queries/unusedentities/UnreachableCode.ql
new file mode 100644
index 000000000000..af19469e83c4
--- /dev/null
+++ b/rust/ql/src/queries/unusedentities/UnreachableCode.ql
@@ -0,0 +1,15 @@
+/**
+ * @name Unreachable code
+ * @description Code that cannot be reached should be deleted.
+ * @kind problem
+ * @problem.severity recommendation
+ * @precision medium
+ * @id rust/dead-code
+ * @tags maintainability
+ */
+
+import rust
+
+from Locatable e
+where none() // TODO: implement query
+select e, "This code is never reached."
diff --git a/rust/ql/test/query-tests/unusedentities/UnreachableCode.expected b/rust/ql/test/query-tests/unusedentities/UnreachableCode.expected
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/rust/ql/test/query-tests/unusedentities/UnreachableCode.qlref b/rust/ql/test/query-tests/unusedentities/UnreachableCode.qlref
new file mode 100644
index 000000000000..f65928931a13
--- /dev/null
+++ b/rust/ql/test/query-tests/unusedentities/UnreachableCode.qlref
@@ -0,0 +1 @@
+queries/unusedentities/UnreachableCode.ql
\ No newline at end of file
diff --git a/rust/ql/test/query-tests/unusedentities/unreachable.rs b/rust/ql/test/query-tests/unusedentities/unreachable.rs
new file mode 100644
index 000000000000..3f32eb36693a
--- /dev/null
+++ b/rust/ql/test/query-tests/unusedentities/unreachable.rs
@@ -0,0 +1,140 @@
+
+//fn cond() -> bool;
+//fn get_a_number() -> i32;
+
+// --- unreachable code --
+
+fn do_something() {
+}
+
+fn unreachable_if() {
+	if false {
+		do_something(); // BAD: unreachable code [NOT DETECTED]
+	} else {
+		do_something();
+	}
+
+	if true {
+		do_something();
+	} else {
+		do_something(); // BAD: unreachable code [NOT DETECTED]
+	}
+
+	let v = get_a_number();
+	if v == 1 {
+		if v != 1 {
+			do_something(); // BAD: unreachable code [NOT DETECTED]
+		}
+	}
+
+	if cond() {
+		return;
+		do_something(); // BAD: unreachable code [NOT DETECTED]
+	}
+
+	if cond() {
+		do_something();
+	} else {
+		return;
+		do_something(); // BAD: unreachable code [NOT DETECTED]
+	}
+	do_something();
+
+	if cond() {
+		return;
+	} else {
+		return;
+	}
+	do_something(); // BAD: unreachable code [NOT DETECTED]
+}
+
+fn unreachable_panic() {
+	if cond() {
+		do_something();
+		panic!("Oh no!!!");
+		do_something(); // BAD: unreachable code [NOT DETECTED]
+	}
+
+	if cond() {
+		do_something();
+		unimplemented!();
+		do_something(); // BAD: unreachable code [NOT DETECTED]
+	}
+
+	if cond() {
+		do_something();
+		todo!();
+		do_something(); // BAD: unreachable code [NOT DETECTED]
+	}
+
+	if cond() {
+		let mut maybe;
+
+		maybe = Some("Thing");
+		_ = maybe.unwrap(); // (safe)
+		do_something();
+
+		maybe = if cond() { Some("Other") } else { None };
+		_ = maybe.unwrap(); // (might panic)
+		do_something();
+
+		maybe = None;
+		_ = maybe.unwrap(); // (always panics)
+		do_something(); // BAD: unreachable code [NOT DETECTED]
+	}
+}
+
+fn unreachable_match() {
+	match get_a_number() {
+		1=>{
+			return;
+		}
+		_=>{
+			do_something();
+		}
+	}
+	do_something();
+
+	match get_a_number() {
+		1=>{
+			return;
+		}
+		_=>{
+			return;
+		}
+	}
+	do_something(); // BAD: unreachable code [NOT DETECTED]
+}
+
+fn unreachable_loop() {
+	loop {
+		do_something();
+		break;
+		do_something(); // BAD: unreachable code [NOT DETECTED]
+	}
+
+	if cond() {
+		while cond() {
+			do_something();
+		}
+
+		while false {
+			do_something(); // BAD: unreachable code [NOT DETECTED]
+		}
+
+		while true {
+			do_something();
+		}
+		do_something(); // BAD: unreachable code [NOT DETECTED]
+	}
+
+	loop {
+		if cond() {
+			return;
+			do_something(); // BAD: unreachable code [NOT DETECTED]
+		}
+	}
+	do_something(); // BAD: unreachable code [NOT DETECTED]
+	do_something();
+	do_something();
+}

From e7e0c6bf12eae2e3d8de9dbb5b2573a48c409f6f Mon Sep 17 00:00:00 2001
From: Geoffrey White <40627776+geoffw0@users.noreply.github.com>
Date: Wed, 18 Sep 2024 15:57:03 +0100
Subject: [PATCH 023/347] Rust: Add qhelp + examples for unreachable code
 query.

---
 .../unusedentities/UnreachableCode.qhelp      | 24 +++++++++++++++++++
 .../unusedentities/UnreachableCodeBad.rs      | 11 +++++++++
 .../unusedentities/UnreachableCodeGood.rs     |  9 +++++++
 3 files changed, 44 insertions(+)
 create mode 100644 rust/ql/src/queries/unusedentities/UnreachableCode.qhelp
 create mode 100644 rust/ql/src/queries/unusedentities/UnreachableCodeBad.rs
 create mode 100644 rust/ql/src/queries/unusedentities/UnreachableCodeGood.rs

diff --git a/rust/ql/src/queries/unusedentities/UnreachableCode.qhelp b/rust/ql/src/queries/unusedentities/UnreachableCode.qhelp
new file mode 100644
index 000000000000..fef1aa71f6ba
--- /dev/null
+++ b/rust/ql/src/queries/unusedentities/UnreachableCode.qhelp
@@ -0,0 +1,24 @@
+<!DOCTYPE qhelp PUBLIC
+  "-//Semmle//qhelp//EN"
+  "qhelp.dtd">
+<qhelp>
+
+<overview>
+<p>This rule finds code that is never reached. Unused code should be removed to increase readability and avoid confusion.</p>
+</overview>
+
+<recommendation>
+<p>Remove any unreachable code.</p>
+</recommendation>
+
+<example>
+<p>In the following example, the final <code>return</code> statement can never be reached:</p>
+<sample src="UnreachableCodeBad.rs" />
+<p>The problem can be fixed simply by removing the unreachable code:</p>
+<sample src="UnreachableCodeGood.rs" />
+</example>
+
+<references>
+<li>Wikipedia: <a href="https://en.wikipedia.org/wiki/Unreachable_code">Unreachable code</a></li>
+</references>
+</qhelp>
diff --git a/rust/ql/src/queries/unusedentities/UnreachableCodeBad.rs b/rust/ql/src/queries/unusedentities/UnreachableCodeBad.rs
new file mode 100644
index 000000000000..a27bc0cab164
--- /dev/null
+++ b/rust/ql/src/queries/unusedentities/UnreachableCodeBad.rs
@@ -0,0 +1,11 @@
+fn fib(input: u32) -> u32 {
+	if (input == 0) {
+		return 0;
+	} else if (input == 1) {
+		return 1;
+	} else {
+		return fib(input - 1) + fib(input - 2);
+	}
+
+	return input; // BAD: this code is never reached
+}
diff --git a/rust/ql/src/queries/unusedentities/UnreachableCodeGood.rs b/rust/ql/src/queries/unusedentities/UnreachableCodeGood.rs
new file mode 100644
index 000000000000..0b2bde66fe95
--- /dev/null
+++ b/rust/ql/src/queries/unusedentities/UnreachableCodeGood.rs
@@ -0,0 +1,9 @@
+fn fib(input: u32) -> u32 {
+	if (input == 0) {
+		return 0;
+	} else if (input == 1) {
+		return 1;
+	} else {
+		return fib(input - 1) + fib(input - 2);
+	}
+}

From 1eaa998648c099238a9e4267c25f19994926a4e8 Mon Sep 17 00:00:00 2001
From: Geoffrey White <40627776+geoffw0@users.noreply.github.com>
Date: Wed, 18 Sep 2024 17:57:42 +0100
Subject: [PATCH 024/347] Rust: Implement unreachable code query.

---
 .../queries/unusedentities/UnreachableCode.ql | 50 +++++++++++++++++--
 .../unusedentities/UnreachableCode.expected   | 15 ++++++
 .../query-tests/unusedentities/unreachable.rs | 30 +++++------
 3 files changed, 77 insertions(+), 18 deletions(-)

diff --git a/rust/ql/src/queries/unusedentities/UnreachableCode.ql b/rust/ql/src/queries/unusedentities/UnreachableCode.ql
index af19469e83c4..3458bb338c55 100644
--- a/rust/ql/src/queries/unusedentities/UnreachableCode.ql
+++ b/rust/ql/src/queries/unusedentities/UnreachableCode.ql
@@ -9,7 +9,51 @@
  */
 
 import rust
+import codeql.rust.controlflow.ControlFlowGraph
+import codeql.rust.controlflow.internal.ControlFlowGraphImpl as ControlFlowGraphImpl
 
-from Locatable e
-where none() // TODO: implement query
-select e, "This code is never reached."
+/**
+ * Holds if `n` is an AST node that's unreachable, and is not the successor
+ * of an unreachable node (which would be a duplicate result).
+ */
+predicate firstUnreachable(AstNode n) {
+  // entry nodes are reachable
+  not exists(CfgScope s | s.scopeFirst(n)) and
+  // we never want a `ControlFlowTree` successor node:
+  //  - if the predecessor is reachable, so are we.
+  //  - if the predecessor is unreachable, we're not the *first* unreachable node.
+  not ControlFlowGraphImpl::succ(_, n, _)
+  // (note that an unreachable cycle of nodes could be missed by this logic, in
+  //  general it wouldn't be possible to pick one node to represent it)
+}
+
+/**
+ * Gets a node we'd prefer not to report as unreachable.
+ */
+predicate skipNode(AstNode n) {
+  n instanceof ControlFlowGraphImpl::PostOrderTree or // location is counter-intuitive
+  not n instanceof ControlFlowGraphImpl::ControlFlowTree // not expected to be reachable
+}
+
+/**
+ * Gets the `ControlFlowTree` successor of a node we'd prefer not to report.
+ */
+AstNode skipSuccessor(AstNode n) {
+  skipNode(n) and
+  ControlFlowGraphImpl::succ(n, result, _)
+}
+
+/**
+ * Gets the node `n`, skipping past any nodes we'd prefer not to report.
+ */
+AstNode skipSuccessors(AstNode n) {
+  result = skipSuccessor*(n) and
+  not skipNode(result)
+}
+
+from AstNode first, AstNode report
+where
+  firstUnreachable(first) and
+  report = skipSuccessors(first) and
+  exists(report.getFile().getRelativePath()) // in source
+select report, "This code is never reached."
diff --git a/rust/ql/test/query-tests/unusedentities/UnreachableCode.expected b/rust/ql/test/query-tests/unusedentities/UnreachableCode.expected
index e69de29bb2d1..fc28f042e943 100644
--- a/rust/ql/test/query-tests/unusedentities/UnreachableCode.expected
+++ b/rust/ql/test/query-tests/unusedentities/UnreachableCode.expected
@@ -0,0 +1,15 @@
+| unreachable.rs:32:3:32:17 | ExprStmt | This code is never reached. |
+| unreachable.rs:39:3:39:17 | ExprStmt | This code is never reached. |
+| unreachable.rs:48:2:48:16 | ExprStmt | This code is never reached. |
+| unreachable.rs:89:3:91:3 | MatchArm | This code is never reached. |
+| unreachable.rs:92:3:94:3 | MatchArm | This code is never reached. |
+| unreachable.rs:96:2:96:16 | ExprStmt | This code is never reached. |
+| unreachable.rs:99:3:101:3 | MatchArm | This code is never reached. |
+| unreachable.rs:102:3:104:3 | MatchArm | This code is never reached. |
+| unreachable.rs:106:2:106:16 | ExprStmt | This code is never reached. |
+| unreachable.rs:113:3:113:17 | ExprStmt | This code is never reached. |
+| unreachable.rs:118:4:118:18 | ExprStmt | This code is never reached. |
+| unreachable.rs:122:4:122:18 | ExprStmt | This code is never reached. |
+| unreachable.rs:126:4:126:18 | ExprStmt | This code is never reached. |
+| unreachable.rs:134:4:134:18 | ExprStmt | This code is never reached. |
+| unreachable.rs:137:2:137:16 | ExprStmt | This code is never reached. |
diff --git a/rust/ql/test/query-tests/unusedentities/unreachable.rs b/rust/ql/test/query-tests/unusedentities/unreachable.rs
index 3f32eb36693a..3dbda4981e9c 100644
--- a/rust/ql/test/query-tests/unusedentities/unreachable.rs
+++ b/rust/ql/test/query-tests/unusedentities/unreachable.rs
@@ -29,14 +29,14 @@ fn unreachable_if() {
 
 	if cond() {
 		return;
-		do_something(); // BAD: unreachable code [NOT DETECTED]
+		do_something(); // BAD: unreachable code
 	}
 
 	if cond() {
 		do_something();
 	} else {
 		return;
-		do_something(); // BAD: unreachable code [NOT DETECTED]
+		do_something(); // BAD: unreachable code
 	}
 	do_something();
 
@@ -45,7 +45,7 @@ fn unreachable_if() {
 	} else {
 		return;
 	}
-	do_something(); // BAD: unreachable code [NOT DETECTED]
+	do_something(); // BAD: unreachable code
 }
 
 fn unreachable_panic() {
@@ -86,44 +86,44 @@ fn unreachable_panic() {
 
 fn unreachable_match() {
 	match get_a_number() {
-		1=>{
+		1=>{ // [unreachable FALSE POSITIVE]
 			return;
 		}
-		_=>{
+		_=>{ // [unreachable FALSE POSITIVE]
 			do_something();
 		}
 	}
-	do_something();
+	do_something(); // [unreachable FALSE POSITIVE]
 
 	match get_a_number() {
-		1=>{
+		1=>{ // [unreachable FALSE POSITIVE]
 			return;
 		}
-		_=>{
+		_=>{ // [unreachable FALSE POSITIVE]
 			return;
 		}
 	}
-	do_something(); // BAD: unreachable code [NOT DETECTED]
+	do_something(); // BAD: unreachable code
 }
 
 fn unreachable_loop() {
 	loop {
 		do_something();
 		break;
-		do_something(); // BAD: unreachable code [NOT DETECTED]
+		do_something(); // BAD: unreachable code
 	}
 
 	if cond() {
 		while cond() {
-			do_something();
+			do_something();{ // [unreachable FALSE POSITIVE]
 		}
 
 		while false {
-			do_something(); // BAD: unreachable code [NOT DETECTED]
+			do_something(); // BAD: unreachable code
 		}
 
 		while true {
-			do_something();
+			do_something(); // [unreachable FALSE POSITIVE]
 		}
 		do_something(); // BAD: unreachable code [NOT DETECTED]
 	}
@@ -131,10 +131,10 @@ fn unreachable_loop() {
 	loop {
 		if cond() {
 			return;
-			do_something(); // BAD: unreachable code [NOT DETECTED]
+			do_something(); // BAD: unreachable code
 		}
 	}
-	do_something(); // BAD: unreachable code [NOT DETECTED]
+	do_something(); // BAD: unreachable code
 	do_something();
 	do_something();
 }

From 3e0d30f13a1d3b390c20195fbdcbb6e6e9733bd6 Mon Sep 17 00:00:00 2001
From: Geoffrey White <40627776+geoffw0@users.noreply.github.com>
Date: Thu, 19 Sep 2024 16:34:31 +0100
Subject: [PATCH 025/347] Rust: Merge of unusedvar and unreachable work.

---
 .../query-tests/unusedentities/UnreachableCode.expected   | 1 +
 rust/ql/test/query-tests/unusedentities/main.rs           | 8 +++++++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/rust/ql/test/query-tests/unusedentities/UnreachableCode.expected b/rust/ql/test/query-tests/unusedentities/UnreachableCode.expected
index fc28f042e943..83aba7040460 100644
--- a/rust/ql/test/query-tests/unusedentities/UnreachableCode.expected
+++ b/rust/ql/test/query-tests/unusedentities/UnreachableCode.expected
@@ -1,3 +1,4 @@
+| main.rs:114:3:114:29 | ExprStmt | This code is never reached. |
 | unreachable.rs:32:3:32:17 | ExprStmt | This code is never reached. |
 | unreachable.rs:39:3:39:17 | ExprStmt | This code is never reached. |
 | unreachable.rs:48:2:48:16 | ExprStmt | This code is never reached. |
diff --git a/rust/ql/test/query-tests/unusedentities/main.rs b/rust/ql/test/query-tests/unusedentities/main.rs
index 8066f7c783e0..3f163b2a0641 100644
--- a/rust/ql/test/query-tests/unusedentities/main.rs
+++ b/rust/ql/test/query-tests/unusedentities/main.rs
@@ -111,7 +111,7 @@ fn arrays() {
 	println!("lets use {:?}", js);
 
 	for k in ks {
-		println!("lets use {}", k);
+		println!("lets use {}", k); // [unreachable FALSE POSITIVE]
 	}
 }
 
@@ -142,6 +142,8 @@ fn parameters(
 	return x;
 }
 
+// --- main ---
+
 fn main() {
 	locals_1();
 	locals_2();
@@ -149,4 +151,8 @@ fn main() {
 	arrays();
 	statics();
 	println!("lets use result {}", parameters(1, 2, 3));
+	unreachable_if();
+	unreachable_panic();
+	unreachable_match();
+	unreachable_loop();
 }

From f95926e1a810b677ec2b8ce45711ea1ea0e24518 Mon Sep 17 00:00:00 2001
From: Rasmus Lerchedahl Petersen <yoff@github.com>
Date: Tue, 24 Sep 2024 20:23:39 +0200
Subject: [PATCH 026/347] Python: add change note

---
 python/ql/lib/change-notes/2024-09-24-std-lib-models.md | 4 ++++
 1 file changed, 4 insertions(+)
 create mode 100644 python/ql/lib/change-notes/2024-09-24-std-lib-models.md

diff --git a/python/ql/lib/change-notes/2024-09-24-std-lib-models.md b/python/ql/lib/change-notes/2024-09-24-std-lib-models.md
new file mode 100644
index 000000000000..20b522576a30
--- /dev/null
+++ b/python/ql/lib/change-notes/2024-09-24-std-lib-models.md
@@ -0,0 +1,4 @@
+---
+category: minorAnalysis
+---
+* Added several models of standard library functions and classes. This should make the analysis much more complete in cases where the standard library is not extracted.
\ No newline at end of file

From 112e7c95fa32f9c0d2931c9948b6db57465d6d82 Mon Sep 17 00:00:00 2001
From: Rasmus Lerchedahl Petersen <yoff@github.com>
Date: Tue, 24 Sep 2024 20:58:59 +0200
Subject: [PATCH 027/347] Python: all dict constructor args are relevant

---
 python/ql/lib/semmle/python/frameworks/Stdlib.qll | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/python/ql/lib/semmle/python/frameworks/Stdlib.qll b/python/ql/lib/semmle/python/frameworks/Stdlib.qll
index 3c23b3929911..ca8b10d8578a 100644
--- a/python/ql/lib/semmle/python/frameworks/Stdlib.qll
+++ b/python/ql/lib/semmle/python/frameworks/Stdlib.qll
@@ -4219,7 +4219,7 @@ module StdlibPrivate {
 
     override predicate propagatesFlow(string input, string output, boolean preservesValue) {
       exists(DataFlow::DictionaryElementContent dc, string key | key = dc.getKey() |
-        input = "Argument[0].DictionaryElement[" + key + "]" and
+        input = "Argument[0..].DictionaryElement[" + key + "]" and
         output = "ReturnValue.DictionaryElement[" + key + "]" and
         preservesValue = true
       )
@@ -4230,7 +4230,7 @@ module StdlibPrivate {
         preservesValue = true
       )
       or
-      input = "Argument[0]" and
+      input = "Argument[0..]" and
       output = "ReturnValue" and
       preservesValue = false
     }

From fc2dc28f87c7e5669e240f46fa37dba22123a88f Mon Sep 17 00:00:00 2001
From: Rasmus Lerchedahl Petersen <yoff@github.com>
Date: Wed, 25 Sep 2024 10:02:31 +0200
Subject: [PATCH 028/347] python: capture flow through comprehensions - add
 comprehension functions as `DataFlowCallable`s - add comprehension call as
 `DataFlowCall` - create capture argument node for comprehension calls

---
 .../new/internal/DataFlowDispatch.qll         | 46 +++++++++++++++++++
 .../library-tests/dataflow/coverage/test.py   |  2 +-
 2 files changed, 47 insertions(+), 1 deletion(-)

diff --git a/python/ql/lib/semmle/python/dataflow/new/internal/DataFlowDispatch.qll b/python/ql/lib/semmle/python/dataflow/new/internal/DataFlowDispatch.qll
index 28c1c652df46..d71c32ffc882 100644
--- a/python/ql/lib/semmle/python/dataflow/new/internal/DataFlowDispatch.qll
+++ b/python/ql/lib/semmle/python/dataflow/new/internal/DataFlowDispatch.qll
@@ -320,6 +320,9 @@ newtype TDataFlowCallable =
     // same to keep things easy to reason about (and therefore exclude things that do
     // not have a definition)
     exists(func.getDefinition())
+    or
+    // ...scratch that, variable capture requires a callable
+    exists(Comp c | c.getFunction() = func)
   } or
   /** see QLDoc for `DataFlowModuleScope` for why we need this. */
   TModule(Module m) or
@@ -1382,6 +1385,7 @@ private predicate sameEnclosingCallable(Node node1, Node node2) {
 // =============================================================================
 newtype TDataFlowCall =
   TNormalCall(CallNode call, Function target, CallType type) { resolveCall(call, target, type) } or
+  TComprehensionCall(Comp c) or
   TPotentialLibraryCall(CallNode call) or
   /** A synthesized call inside a summarized callable */
   TSummaryCall(
@@ -1468,6 +1472,30 @@ class NormalCall extends ExtractedDataFlowCall, TNormalCall {
   CallType getCallType() { result = type }
 }
 
+class ComprehensionCall extends ExtractedDataFlowCall, TComprehensionCall {
+  Comp c;
+  Function target;
+
+  ComprehensionCall() {
+    this = TComprehensionCall(c) and
+    target = c.getFunction()
+  }
+
+  Comp getComprehension() { result = c }
+
+  override string toString() { result = "comprehension call" }
+
+  override ControlFlowNode getNode() { result.getNode() = c }
+
+  override Scope getScope() { result = c.getScope() }
+
+  override DataFlowCallable getCallable() { result.(DataFlowFunction).getScope() = target }
+
+  override ArgumentNode getArgument(ArgumentPosition apos) { none() }
+
+  override Location getLocation() { result = c.getLocation() }
+}
+
 /**
  * A potential call to a summarized callable, a `LibraryCallable`.
  *
@@ -1698,6 +1726,24 @@ class CapturedVariablesArgumentNode extends CfgNode, ArgumentNode {
   }
 }
 
+class ComprehensionCapturedVariablesArgumentNode extends CfgNode, ArgumentNode {
+  Comp comp;
+
+  ComprehensionCapturedVariablesArgumentNode() {
+    node.getNode() = comp and
+    exists(Function target | target = comp.getFunction() |
+      target = any(VariableCapture::CapturedVariable v).getACapturingScope()
+    )
+  }
+
+  override string toString() { result = "Capturing closure argument (comp)" }
+
+  override predicate argumentOf(DataFlowCall call, ArgumentPosition pos) {
+    call.(ComprehensionCall).getComprehension() = comp and
+    pos.isLambdaSelf()
+  }
+}
+
 /** Gets a viable run-time target for the call `call`. */
 DataFlowCallable viableCallable(DataFlowCall call) {
   call instanceof ExtractedDataFlowCall and
diff --git a/python/ql/test/library-tests/dataflow/coverage/test.py b/python/ql/test/library-tests/dataflow/coverage/test.py
index a2ea9cccd676..511390df6816 100644
--- a/python/ql/test/library-tests/dataflow/coverage/test.py
+++ b/python/ql/test/library-tests/dataflow/coverage/test.py
@@ -137,7 +137,7 @@ def test_list_comprehension_with_tuple_result():
     s = SOURCE
     ns = NONSOURCE
     l3 = [(s, ns) for _ in [1]]
-    SINK(l3[0][0]) # $ MISSING: flow="SOURCE, l:-3 -> l3[0][0]"
+    SINK(l3[0][0]) # $ flow="SOURCE, l:-3 -> l3[0][0]"
     SINK_F(l3[0][1])
 
 

From 7da2845cad4dfbbdd90cc84d3c394b7734feb1c4 Mon Sep 17 00:00:00 2001
From: Geoffrey White <40627776+geoffw0@users.noreply.github.com>
Date: Wed, 25 Sep 2024 16:30:45 +0100
Subject: [PATCH 029/347] Rust: Uncomment two lines from the test that should
 now behave deterministically.

---
 rust/ql/test/query-tests/diagnostics/LinesOfCode.expected   | 2 +-
 .../test/query-tests/diagnostics/LinesOfUserCode.expected   | 2 +-
 .../query-tests/diagnostics/LinesOfUserCodeInFiles.expected | 2 +-
 rust/ql/test/query-tests/diagnostics/SummaryStats.expected  | 6 +++---
 rust/ql/test/query-tests/diagnostics/main.rs                | 2 +-
 rust/ql/test/query-tests/diagnostics/my_macro.rs            | 2 +-
 6 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/rust/ql/test/query-tests/diagnostics/LinesOfCode.expected b/rust/ql/test/query-tests/diagnostics/LinesOfCode.expected
index 035a74975be8..d6a21ebb49cf 100644
--- a/rust/ql/test/query-tests/diagnostics/LinesOfCode.expected
+++ b/rust/ql/test/query-tests/diagnostics/LinesOfCode.expected
@@ -1 +1 @@
-| 48 |
+| 49 |
diff --git a/rust/ql/test/query-tests/diagnostics/LinesOfUserCode.expected b/rust/ql/test/query-tests/diagnostics/LinesOfUserCode.expected
index 035a74975be8..d6a21ebb49cf 100644
--- a/rust/ql/test/query-tests/diagnostics/LinesOfUserCode.expected
+++ b/rust/ql/test/query-tests/diagnostics/LinesOfUserCode.expected
@@ -1 +1 @@
-| 48 |
+| 49 |
diff --git a/rust/ql/test/query-tests/diagnostics/LinesOfUserCodeInFiles.expected b/rust/ql/test/query-tests/diagnostics/LinesOfUserCodeInFiles.expected
index 2be3f73088ca..dde3c7fe35a7 100644
--- a/rust/ql/test/query-tests/diagnostics/LinesOfUserCodeInFiles.expected
+++ b/rust/ql/test/query-tests/diagnostics/LinesOfUserCodeInFiles.expected
@@ -1,6 +1,6 @@
 | my_struct.rs:0:0:0:0 | my_struct.rs | 21 |
+| main.rs:0:0:0:0 | main.rs | 8 |
 | my_macro.rs:0:0:0:0 | my_macro.rs | 8 |
-| main.rs:0:0:0:0 | main.rs | 7 |
 | lib.rs:0:0:0:0 | lib.rs | 6 |
 | does_not_compile.rs:0:0:0:0 | does_not_compile.rs | 3 |
 | error.rs:0:0:0:0 | error.rs | 3 |
diff --git a/rust/ql/test/query-tests/diagnostics/SummaryStats.expected b/rust/ql/test/query-tests/diagnostics/SummaryStats.expected
index 145a18cae05d..f92218d10d21 100644
--- a/rust/ql/test/query-tests/diagnostics/SummaryStats.expected
+++ b/rust/ql/test/query-tests/diagnostics/SummaryStats.expected
@@ -1,5 +1,5 @@
-| Elements extracted | 204 |
+| Elements extracted | 211 |
 | Elements unextracted | 0 |
 | Files extracted | 6 |
-| Lines of code extracted | 48 |
-| Lines of user code extracted | 48 |
+| Lines of code extracted | 49 |
+| Lines of user code extracted | 49 |
diff --git a/rust/ql/test/query-tests/diagnostics/main.rs b/rust/ql/test/query-tests/diagnostics/main.rs
index 790547c0ff9d..6e0ddf695a3a 100644
--- a/rust/ql/test/query-tests/diagnostics/main.rs
+++ b/rust/ql/test/query-tests/diagnostics/main.rs
@@ -11,7 +11,7 @@ mod my_macro;
 // another comment
 
 fn main() { // another comment
-    //println!("Hello, world!"); // currently causes consistency issues
+    println!("Hello, world!");
 
     my_struct::my_func();
     my_macro::my_func();
diff --git a/rust/ql/test/query-tests/diagnostics/my_macro.rs b/rust/ql/test/query-tests/diagnostics/my_macro.rs
index 0f85877c3c60..d8a0cc2812bd 100644
--- a/rust/ql/test/query-tests/diagnostics/my_macro.rs
+++ b/rust/ql/test/query-tests/diagnostics/my_macro.rs
@@ -7,7 +7,7 @@
 
 macro_rules! myMacro {
     () => {
-        //println!("Hello, world!"); // currently causes consistency issues
+        println!("Hello, world!");
     };
 }
 

From f8ce11b3a7d55ffeb656767239b81d0a19efb8f8 Mon Sep 17 00:00:00 2001
From: Geoffrey White <40627776+geoffw0@users.noreply.github.com>
Date: Wed, 25 Sep 2024 16:42:08 +0100
Subject: [PATCH 030/347] Rust: Improve File.getNumberOfLinesOfCode().

---
 rust/ql/lib/codeql/files/FileSystem.qll                      | 5 ++++-
 rust/ql/test/query-tests/diagnostics/LinesOfCode.expected    | 2 +-
 .../ql/test/query-tests/diagnostics/LinesOfUserCode.expected | 2 +-
 .../query-tests/diagnostics/LinesOfUserCodeInFiles.expected  | 2 +-
 rust/ql/test/query-tests/diagnostics/SummaryStats.expected   | 4 ++--
 5 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/rust/ql/lib/codeql/files/FileSystem.qll b/rust/ql/lib/codeql/files/FileSystem.qll
index f6926609d685..e4ff5aa0f7ed 100644
--- a/rust/ql/lib/codeql/files/FileSystem.qll
+++ b/rust/ql/lib/codeql/files/FileSystem.qll
@@ -2,6 +2,7 @@
 
 private import codeql.Locations
 private import codeql.util.FileSystem
+private import codeql.rust.elements.Module
 private import codeql.rust.elements.SourceFile
 private import codeql.rust.elements.AstNode
 
@@ -44,7 +45,9 @@ class File extends Container, Impl::File {
     result =
       count(int line |
         exists(AstNode node, Location loc |
-          not node instanceof SourceFile and loc = node.getLocation()
+          not node instanceof Module and
+          not node instanceof SourceFile and
+          loc = node.getLocation()
         |
           node.getFile() = this and
           line = [loc.getStartLine(), loc.getEndLine()] and
diff --git a/rust/ql/test/query-tests/diagnostics/LinesOfCode.expected b/rust/ql/test/query-tests/diagnostics/LinesOfCode.expected
index d6a21ebb49cf..035a74975be8 100644
--- a/rust/ql/test/query-tests/diagnostics/LinesOfCode.expected
+++ b/rust/ql/test/query-tests/diagnostics/LinesOfCode.expected
@@ -1 +1 @@
-| 49 |
+| 48 |
diff --git a/rust/ql/test/query-tests/diagnostics/LinesOfUserCode.expected b/rust/ql/test/query-tests/diagnostics/LinesOfUserCode.expected
index d6a21ebb49cf..035a74975be8 100644
--- a/rust/ql/test/query-tests/diagnostics/LinesOfUserCode.expected
+++ b/rust/ql/test/query-tests/diagnostics/LinesOfUserCode.expected
@@ -1 +1 @@
-| 49 |
+| 48 |
diff --git a/rust/ql/test/query-tests/diagnostics/LinesOfUserCodeInFiles.expected b/rust/ql/test/query-tests/diagnostics/LinesOfUserCodeInFiles.expected
index dde3c7fe35a7..2be3f73088ca 100644
--- a/rust/ql/test/query-tests/diagnostics/LinesOfUserCodeInFiles.expected
+++ b/rust/ql/test/query-tests/diagnostics/LinesOfUserCodeInFiles.expected
@@ -1,6 +1,6 @@
 | my_struct.rs:0:0:0:0 | my_struct.rs | 21 |
-| main.rs:0:0:0:0 | main.rs | 8 |
 | my_macro.rs:0:0:0:0 | my_macro.rs | 8 |
+| main.rs:0:0:0:0 | main.rs | 7 |
 | lib.rs:0:0:0:0 | lib.rs | 6 |
 | does_not_compile.rs:0:0:0:0 | does_not_compile.rs | 3 |
 | error.rs:0:0:0:0 | error.rs | 3 |
diff --git a/rust/ql/test/query-tests/diagnostics/SummaryStats.expected b/rust/ql/test/query-tests/diagnostics/SummaryStats.expected
index f92218d10d21..766ca8332fac 100644
--- a/rust/ql/test/query-tests/diagnostics/SummaryStats.expected
+++ b/rust/ql/test/query-tests/diagnostics/SummaryStats.expected
@@ -1,5 +1,5 @@
 | Elements extracted | 211 |
 | Elements unextracted | 0 |
 | Files extracted | 6 |
-| Lines of code extracted | 49 |
-| Lines of user code extracted | 49 |
+| Lines of code extracted | 48 |
+| Lines of user code extracted | 48 |

From caca4950e64097a18085e4928da940ad454e2ab1 Mon Sep 17 00:00:00 2001
From: Geoffrey White <40627776+geoffw0@users.noreply.github.com>
Date: Thu, 26 Sep 2024 11:10:03 +0100
Subject: [PATCH 031/347] Rust: Revert the change to FileSystem.qll.

---
 rust/ql/lib/codeql/files/FileSystem.qll                       | 2 --
 rust/ql/test/query-tests/diagnostics/LinesOfCode.expected     | 2 +-
 rust/ql/test/query-tests/diagnostics/LinesOfUserCode.expected | 2 +-
 .../query-tests/diagnostics/LinesOfUserCodeInFiles.expected   | 2 +-
 rust/ql/test/query-tests/diagnostics/SummaryStats.expected    | 4 ++--
 5 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/rust/ql/lib/codeql/files/FileSystem.qll b/rust/ql/lib/codeql/files/FileSystem.qll
index e4ff5aa0f7ed..0b9351800ab6 100644
--- a/rust/ql/lib/codeql/files/FileSystem.qll
+++ b/rust/ql/lib/codeql/files/FileSystem.qll
@@ -2,7 +2,6 @@
 
 private import codeql.Locations
 private import codeql.util.FileSystem
-private import codeql.rust.elements.Module
 private import codeql.rust.elements.SourceFile
 private import codeql.rust.elements.AstNode
 
@@ -45,7 +44,6 @@ class File extends Container, Impl::File {
     result =
       count(int line |
         exists(AstNode node, Location loc |
-          not node instanceof Module and
           not node instanceof SourceFile and
           loc = node.getLocation()
         |
diff --git a/rust/ql/test/query-tests/diagnostics/LinesOfCode.expected b/rust/ql/test/query-tests/diagnostics/LinesOfCode.expected
index 035a74975be8..d6a21ebb49cf 100644
--- a/rust/ql/test/query-tests/diagnostics/LinesOfCode.expected
+++ b/rust/ql/test/query-tests/diagnostics/LinesOfCode.expected
@@ -1 +1 @@
-| 48 |
+| 49 |
diff --git a/rust/ql/test/query-tests/diagnostics/LinesOfUserCode.expected b/rust/ql/test/query-tests/diagnostics/LinesOfUserCode.expected
index 035a74975be8..d6a21ebb49cf 100644
--- a/rust/ql/test/query-tests/diagnostics/LinesOfUserCode.expected
+++ b/rust/ql/test/query-tests/diagnostics/LinesOfUserCode.expected
@@ -1 +1 @@
-| 48 |
+| 49 |
diff --git a/rust/ql/test/query-tests/diagnostics/LinesOfUserCodeInFiles.expected b/rust/ql/test/query-tests/diagnostics/LinesOfUserCodeInFiles.expected
index 2be3f73088ca..dde3c7fe35a7 100644
--- a/rust/ql/test/query-tests/diagnostics/LinesOfUserCodeInFiles.expected
+++ b/rust/ql/test/query-tests/diagnostics/LinesOfUserCodeInFiles.expected
@@ -1,6 +1,6 @@
 | my_struct.rs:0:0:0:0 | my_struct.rs | 21 |
+| main.rs:0:0:0:0 | main.rs | 8 |
 | my_macro.rs:0:0:0:0 | my_macro.rs | 8 |
-| main.rs:0:0:0:0 | main.rs | 7 |
 | lib.rs:0:0:0:0 | lib.rs | 6 |
 | does_not_compile.rs:0:0:0:0 | does_not_compile.rs | 3 |
 | error.rs:0:0:0:0 | error.rs | 3 |
diff --git a/rust/ql/test/query-tests/diagnostics/SummaryStats.expected b/rust/ql/test/query-tests/diagnostics/SummaryStats.expected
index 766ca8332fac..f92218d10d21 100644
--- a/rust/ql/test/query-tests/diagnostics/SummaryStats.expected
+++ b/rust/ql/test/query-tests/diagnostics/SummaryStats.expected
@@ -1,5 +1,5 @@
 | Elements extracted | 211 |
 | Elements unextracted | 0 |
 | Files extracted | 6 |
-| Lines of code extracted | 48 |
-| Lines of user code extracted | 48 |
+| Lines of code extracted | 49 |
+| Lines of user code extracted | 49 |

From 294092b671a1e909939956c0633eef1ec9065f62 Mon Sep 17 00:00:00 2001
From: Rasmus Lerchedahl Petersen <yoff@github.com>
Date: Fri, 27 Sep 2024 09:44:39 +0200
Subject: [PATCH 032/347] Python: use comprehension function argument For a
 comprehension `[x for x in l] - `l` is now a legal argument (in
 DataFlowPublic) - `l` is the argument of the comprehension function (in
 DataFlowDispatch) - the parameter of the comprehension function is being read
 rather than `l` (in IterableUnpacking) Thus the read that used to cross
 callable boundaries is now split into a arg-param edge and a read from that
 param.

---
 .../semmle/python/dataflow/new/internal/DataFlowDispatch.qll | 5 ++++-
 .../semmle/python/dataflow/new/internal/DataFlowPublic.qll   | 3 +++
 .../python/dataflow/new/internal/IterableUnpacking.qll       | 2 +-
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/python/ql/lib/semmle/python/dataflow/new/internal/DataFlowDispatch.qll b/python/ql/lib/semmle/python/dataflow/new/internal/DataFlowDispatch.qll
index d71c32ffc882..58fc674f48df 100644
--- a/python/ql/lib/semmle/python/dataflow/new/internal/DataFlowDispatch.qll
+++ b/python/ql/lib/semmle/python/dataflow/new/internal/DataFlowDispatch.qll
@@ -1491,7 +1491,10 @@ class ComprehensionCall extends ExtractedDataFlowCall, TComprehensionCall {
 
   override DataFlowCallable getCallable() { result.(DataFlowFunction).getScope() = target }
 
-  override ArgumentNode getArgument(ArgumentPosition apos) { none() }
+  override ArgumentNode getArgument(ArgumentPosition apos) {
+    result.asExpr() = c.getIterable() and
+    apos.isPositional(0)
+  }
 
   override Location getLocation() { result = c.getLocation() }
 }
diff --git a/python/ql/lib/semmle/python/dataflow/new/internal/DataFlowPublic.qll b/python/ql/lib/semmle/python/dataflow/new/internal/DataFlowPublic.qll
index cb05f3887a3f..fa9e844eda39 100644
--- a/python/ql/lib/semmle/python/dataflow/new/internal/DataFlowPublic.qll
+++ b/python/ql/lib/semmle/python/dataflow/new/internal/DataFlowPublic.qll
@@ -350,6 +350,9 @@ class ExtractedArgumentNode extends ArgumentNode {
     or
     // and self arguments
     this.asCfgNode() = any(CallNode c).getFunction().(AttrNode).getObject()
+    or
+    // for comprehensions, we allow the synthetic `iterable` argument
+    this.asExpr() = any(Comp c).getIterable()
   }
 
   final override predicate argumentOf(DataFlowCall call, ArgumentPosition pos) {
diff --git a/python/ql/lib/semmle/python/dataflow/new/internal/IterableUnpacking.qll b/python/ql/lib/semmle/python/dataflow/new/internal/IterableUnpacking.qll
index 05b084672529..e83e789c2fbc 100644
--- a/python/ql/lib/semmle/python/dataflow/new/internal/IterableUnpacking.qll
+++ b/python/ql/lib/semmle/python/dataflow/new/internal/IterableUnpacking.qll
@@ -187,7 +187,7 @@ class ForTarget extends ControlFlowNode {
     )
     or
     exists(Comp comp |
-      source = comp.getIterable() and
+      source = comp.getFunction().getArg(0) and
       this.getNode() = comp.getNthInnerLoop(0).getTarget()
     )
   }

From 72530a83129cb9eb985846efe266f970eb349986 Mon Sep 17 00:00:00 2001
From: Rasmus Lerchedahl Petersen <yoff@github.com>
Date: Fri, 27 Sep 2024 12:15:03 +0200
Subject: [PATCH 033/347] Python: use synthetic node for comprehension capture
 argument We used to use the CfgNode for the comprehension itself. In cases
 where that is also an argument, say ```python ",".join([x for x in l]) ```
 that would be an argument to two different calls causing a dataflow
 consistency violation.

---
 .../dataflow/new/internal/DataFlowDispatch.qll | 18 ++++++++++++++----
 .../dataflow/new/internal/DataFlowPublic.qll   |  4 +++-
 .../dataflow/new/internal/VariableCapture.qll  |  5 +++++
 3 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/python/ql/lib/semmle/python/dataflow/new/internal/DataFlowDispatch.qll b/python/ql/lib/semmle/python/dataflow/new/internal/DataFlowDispatch.qll
index 58fc674f48df..c15f1751edb4 100644
--- a/python/ql/lib/semmle/python/dataflow/new/internal/DataFlowDispatch.qll
+++ b/python/ql/lib/semmle/python/dataflow/new/internal/DataFlowDispatch.qll
@@ -1729,24 +1729,34 @@ class CapturedVariablesArgumentNode extends CfgNode, ArgumentNode {
   }
 }
 
-class ComprehensionCapturedVariablesArgumentNode extends CfgNode, ArgumentNode {
+class ComprehensionCapturedVariablesArgumentNode extends Node, ArgumentNode {
   Comp comp;
 
   ComprehensionCapturedVariablesArgumentNode() {
-    node.getNode() = comp and
+    this = TSynthCompCapturedVariablesArgumentNode(comp) and
     exists(Function target | target = comp.getFunction() |
       target = any(VariableCapture::CapturedVariable v).getACapturingScope()
     )
   }
 
-  override string toString() { result = "Capturing closure argument (comp)" }
-
   override predicate argumentOf(DataFlowCall call, ArgumentPosition pos) {
     call.(ComprehensionCall).getComprehension() = comp and
     pos.isLambdaSelf()
   }
 }
 
+class SynthCompCapturedVariablesArgumentNode extends Node, TSynthCompCapturedVariablesArgumentNode {
+  Comp comp;
+
+  SynthCompCapturedVariablesArgumentNode() { this = TSynthCompCapturedVariablesArgumentNode(comp) }
+
+  override string toString() { result = "Capturing closure argument (comp)" }
+
+  override Scope getScope() { result = comp.getFunction() }
+
+  override Location getLocation() { result = comp.getLocation() }
+}
+
 /** Gets a viable run-time target for the call `call`. */
 DataFlowCallable viableCallable(DataFlowCall call) {
   call instanceof ExtractedDataFlowCall and
diff --git a/python/ql/lib/semmle/python/dataflow/new/internal/DataFlowPublic.qll b/python/ql/lib/semmle/python/dataflow/new/internal/DataFlowPublic.qll
index fa9e844eda39..eca9da797914 100644
--- a/python/ql/lib/semmle/python/dataflow/new/internal/DataFlowPublic.qll
+++ b/python/ql/lib/semmle/python/dataflow/new/internal/DataFlowPublic.qll
@@ -124,9 +124,11 @@ newtype TNode =
   /** A synthetic node representing the heap of a function. Used for variable capture. */
   TSynthCapturedVariablesParameterNode(Function f) {
     f = any(VariableCapture::CapturedVariable v).getACapturingScope() and
-    // TODO: Remove this restriction when adding proper support for captured variables in the body of the function we generate for comprehensions
     exists(TFunction(f))
   } or
+  TSynthCompCapturedVariablesArgumentNode(Comp comp) {
+    comp.getFunction() = any(VariableCapture::CapturedVariable v).getACapturingScope()
+  } or
   /** An empty, unused node type that exists to prevent unwanted dependencies on data flow nodes. */
   TForbiddenRecursionGuard() {
     none() and
diff --git a/python/ql/lib/semmle/python/dataflow/new/internal/VariableCapture.qll b/python/ql/lib/semmle/python/dataflow/new/internal/VariableCapture.qll
index 86dcee2bfe36..6cb80881e2a8 100644
--- a/python/ql/lib/semmle/python/dataflow/new/internal/VariableCapture.qll
+++ b/python/ql/lib/semmle/python/dataflow/new/internal/VariableCapture.qll
@@ -127,6 +127,11 @@ module Flow = Shared::Flow<Location, CaptureInput>;
 private Flow::ClosureNode asClosureNode(Node n) {
   result = n.(SynthCaptureNode).getSynthesizedCaptureNode()
   or
+  exists(Comp comp | n = TSynthCompCapturedVariablesArgumentNode(comp) |
+    result.(Flow::ExprNode).getExpr().getNode() = comp
+  )
+  or
+  // TODO: Should the `Comp`s above be excluded here?
   result.(Flow::ExprNode).getExpr() = n.(CfgNode).getNode()
   or
   result.(Flow::VariableWriteSourceNode).getVariableWrite() = n.(CfgNode).getNode()

From 26e58532ee07e5f58ecc05b3f16a13fbcc570d79 Mon Sep 17 00:00:00 2001
From: "REDMOND\\brodes" <brodes@microsoft.com>
Date: Fri, 27 Sep 2024 12:37:09 -0400
Subject: [PATCH 034/347] Adding tests and updated expected file with false
 positives to correct.

---
 .../CWE/CWE-704/WcharCharConversion.cpp       | 57 ++++++++++++++++++-
 .../CWE/CWE-704/WcharCharConversion.expected  | 14 +++++
 2 files changed, 70 insertions(+), 1 deletion(-)

diff --git a/cpp/ql/test/query-tests/Security/CWE/CWE-704/WcharCharConversion.cpp b/cpp/ql/test/query-tests/Security/CWE/CWE-704/WcharCharConversion.cpp
index 909927c6549c..dc2b9f4a9c18 100644
--- a/cpp/ql/test/query-tests/Security/CWE/CWE-704/WcharCharConversion.cpp
+++ b/cpp/ql/test/query-tests/Security/CWE/CWE-704/WcharCharConversion.cpp
@@ -53,4 +53,59 @@ void NonStringFalsePositiveTest2(unsigned char* buffer)
 {
 	wchar_t *lpWchar = NULL;
 	lpWchar = (LPWSTR)buffer; // Possible False Positive
-}
\ No newline at end of file
+}
+
+typedef unsigned char BYTE;
+using FOO = BYTE*;
+
+void NonStringFalsePositiveTest3(FOO buffer)
+{
+	wchar_t *lpWchar = NULL;
+	lpWchar = (LPWSTR)buffer; // GOOD
+}
+
+#define UNICODE 0x8
+
+// assume EMPTY_MACRO is tied to if UNICODE is enabled
+#ifdef EMPTY_MACRO
+typedef WCHAR* LPTSTR;
+#else
+typedef char* LPTSTR;
+#endif
+
+void CheckedConversionFalsePositiveTest3(unsigned short flags, LPTSTR buffer)
+{
+	wchar_t *lpWchar = NULL;
+	if(flags & UNICODE)
+		lpWchar = (LPWSTR)buffer; // GOOD
+	else
+		lpWchar = (LPWSTR)buffer; // BUG
+
+	if((flags & UNICODE) == 0x8)
+		lpWchar = (LPWSTR)buffer; // GOOD
+	else
+		lpWchar = (LPWSTR)buffer; // BUG
+
+	if((flags & UNICODE) != 0x8)
+		lpWchar = (LPWSTR)buffer; // BUG
+	else
+		lpWchar = (LPWSTR)buffer; // GOOD
+
+	// Bad operator precedence
+	if(flags & UNICODE == 0x8)
+		lpWchar = (LPWSTR)buffer; // BUG
+	else
+		lpWchar = (LPWSTR)buffer; // BUG
+
+	if((flags & UNICODE) != 0)
+		lpWchar = (LPWSTR)buffer; // GOOD
+	else
+		lpWchar = (LPWSTR)buffer; // BUG
+
+	if((flags & UNICODE) == 0)
+		lpWchar = (LPWSTR)buffer; // BUG
+	else
+		lpWchar = (LPWSTR)buffer; // GOOD
+
+	lpWchar = (LPWSTR)buffer; // BUG
+}
diff --git a/cpp/ql/test/query-tests/Security/CWE/CWE-704/WcharCharConversion.expected b/cpp/ql/test/query-tests/Security/CWE/CWE-704/WcharCharConversion.expected
index 73787d4f6eb9..5aca312c0839 100644
--- a/cpp/ql/test/query-tests/Security/CWE/CWE-704/WcharCharConversion.expected
+++ b/cpp/ql/test/query-tests/Security/CWE/CWE-704/WcharCharConversion.expected
@@ -3,3 +3,17 @@
 | WcharCharConversion.cpp:24:22:24:27 | lpChar | Conversion from char * to wchar_t *. Use of invalid string can lead to undefined behavior. |
 | WcharCharConversion.cpp:26:23:26:28 | lpChar | Conversion from char * to LPCWSTR. Use of invalid string can lead to undefined behavior. |
 | WcharCharConversion.cpp:27:17:27:22 | lpChar | Conversion from char * to LPWSTR. Use of invalid string can lead to undefined behavior. |
+| WcharCharConversion.cpp:64:20:64:25 | buffer | Conversion from FOO to LPWSTR. Use of invalid string can lead to undefined behavior. |
+| WcharCharConversion.cpp:80:21:80:26 | buffer | Conversion from LPTSTR to LPWSTR. Use of invalid string can lead to undefined behavior. |
+| WcharCharConversion.cpp:82:21:82:26 | buffer | Conversion from LPTSTR to LPWSTR. Use of invalid string can lead to undefined behavior. |
+| WcharCharConversion.cpp:85:21:85:26 | buffer | Conversion from LPTSTR to LPWSTR. Use of invalid string can lead to undefined behavior. |
+| WcharCharConversion.cpp:87:21:87:26 | buffer | Conversion from LPTSTR to LPWSTR. Use of invalid string can lead to undefined behavior. |
+| WcharCharConversion.cpp:90:21:90:26 | buffer | Conversion from LPTSTR to LPWSTR. Use of invalid string can lead to undefined behavior. |
+| WcharCharConversion.cpp:92:21:92:26 | buffer | Conversion from LPTSTR to LPWSTR. Use of invalid string can lead to undefined behavior. |
+| WcharCharConversion.cpp:96:21:96:26 | buffer | Conversion from LPTSTR to LPWSTR. Use of invalid string can lead to undefined behavior. |
+| WcharCharConversion.cpp:98:21:98:26 | buffer | Conversion from LPTSTR to LPWSTR. Use of invalid string can lead to undefined behavior. |
+| WcharCharConversion.cpp:101:21:101:26 | buffer | Conversion from LPTSTR to LPWSTR. Use of invalid string can lead to undefined behavior. |
+| WcharCharConversion.cpp:103:21:103:26 | buffer | Conversion from LPTSTR to LPWSTR. Use of invalid string can lead to undefined behavior. |
+| WcharCharConversion.cpp:106:21:106:26 | buffer | Conversion from LPTSTR to LPWSTR. Use of invalid string can lead to undefined behavior. |
+| WcharCharConversion.cpp:108:21:108:26 | buffer | Conversion from LPTSTR to LPWSTR. Use of invalid string can lead to undefined behavior. |
+| WcharCharConversion.cpp:110:20:110:25 | buffer | Conversion from LPTSTR to LPWSTR. Use of invalid string can lead to undefined behavior. |

From cc24f1ed9fb348c563bd53df7521ca6251d42fc2 Mon Sep 17 00:00:00 2001
From: "REDMOND\\brodes" <brodes@microsoft.com>
Date: Fri, 27 Sep 2024 12:38:22 -0400
Subject: [PATCH 035/347] Modifications to the query to address false
 positives.

---
 .../CWE/CWE-704/WcharCharConversion.ql        | 78 +++++++++++++++++--
 1 file changed, 73 insertions(+), 5 deletions(-)

diff --git a/cpp/ql/src/Security/CWE/CWE-704/WcharCharConversion.ql b/cpp/ql/src/Security/CWE/CWE-704/WcharCharConversion.ql
index bfd3324f2a9b..33fcad2cbf6f 100644
--- a/cpp/ql/src/Security/CWE/CWE-704/WcharCharConversion.ql
+++ b/cpp/ql/src/Security/CWE/CWE-704/WcharCharConversion.ql
@@ -13,23 +13,87 @@
  */
 
 import cpp
+import semmle.code.cpp.controlflow.Guards
 
 class WideCharPointerType extends PointerType {
   WideCharPointerType() { this.getBaseType() instanceof WideCharType }
 }
 
+/**
+ * Recurse through types to find any intermediate type or final type
+ * that suggests the type is unlikely to be a string.
+ * Specifically looking for any unsigned character, or datatype with name containing "byte"
+ * or datatype uint8_t.
+ */
+predicate hasIntermediateType(Type cur, Type targ) {
+  cur = targ
+  or
+  hasIntermediateType(cur.(DerivedType).getBaseType(), targ)
+  or
+  hasIntermediateType(cur.(TypedefType).getBaseType(), targ)
+}
+
 /**
  * A type that may also be `CharPointerType`, but that are likely used as arbitrary buffers.
  */
 class UnlikelyToBeAStringType extends Type {
   UnlikelyToBeAStringType() {
-    this.(PointerType).getBaseType().(CharType).isUnsigned() or
-    this.(PointerType).getBaseType().getName().toLowerCase().matches("%byte") or
-    this.getName().toLowerCase().matches("%byte") or
-    this.(PointerType).getBaseType().hasName("uint8_t")
+    exists(Type targ |
+      targ.(CharType).isUnsigned() or
+      targ.getName().toLowerCase().matches(["uint8_t", "%byte%"])
+    |
+      hasIntermediateType(this, targ)
+    )
   }
 }
 
+// Types that can be wide depending on the UNICODE macro
+// see https://learn.microsoft.com/en-us/windows/win32/winprog/windows-data-types
+class UnicodeMacroDependentWidthType extends Type {
+  UnicodeMacroDependentWidthType() {
+    exists(Type targ |
+      targ.getName() in [
+          "LPCTSTR",
+          "LPTSTR",
+          "PCTSTR",
+          "PTSTR",
+          "TBYTE",
+          "TCHAR"
+        ]
+    |
+      hasIntermediateType(this, targ)
+    )
+  }
+}
+
+class UnicodeMacro extends Macro {
+  UnicodeMacro() { this.getName().toLowerCase().matches("%unicode%") }
+}
+
+class UnicodeMacroInvocation extends MacroInvocation {
+  UnicodeMacroInvocation() { this.getMacro() instanceof UnicodeMacro }
+}
+
+/**
+ * Holds when a expression whose type is UnicodeMacroDependentWidthType and
+ * is observed to be guarded by a check involving a bitwise-and operation
+ * with a UnicodeMacroInvocation.
+ * Such expressions are assumed to be checked dynamically, i.e.,
+ * the flag would indicate if UNICODE typing is set correctly to allow
+ * or disallow a widening cast.
+ */
+predicate isLikelyDynamicChecked(Expr e, GuardCondition gc) {
+  e.getType() instanceof UnicodeMacroDependentWidthType and
+  exists(BitwiseAndExpr bai, UnicodeMacroInvocation umi | bai.getAnOperand() = umi.getExpr() |
+    // bai == 0 is false when reaching `e.getBasicBlock()`.
+    // That is, bai != 0 when reaching `e.getBasicBlock()`.
+    gc.ensuresEq(bai, 0, e.getBasicBlock(), false)
+    or
+    // bai == k and k != 0 is true when reaching `e.getBasicBlock()`.
+    gc.ensuresEq(bai, any(int k | k != 0), e.getBasicBlock(), true)
+  )
+}
+
 from Expr e1, Cast e2
 where
   e2 = e1.getConversion() and
@@ -42,7 +106,11 @@ where
   not e1.getType() instanceof UnlikelyToBeAStringType and
   // Avoid castings from 'new' expressions as typically these will be safe
   // Example: `__Type* ret = reinterpret_cast<__Type*>(New(m_pmo) char[num * sizeof(__Type)]);`
-  not exists(NewOrNewArrayExpr newExpr | newExpr.getAChild*() = e1)
+  not exists(NewOrNewArrayExpr newExpr | newExpr.getAChild*() = e1) and
+  // Avoid cases where the cast is guarded by a check to determine if
+  // unicode encoding is enabled in such a way to disallow the dangerous cast
+  // at runtime.
+  not isLikelyDynamicChecked(e1, _)
 select e1,
   "Conversion from " + e1.getType().toString() + " to " + e2.getType().toString() +
     ". Use of invalid string can lead to undefined behavior."

From 92c8d39ba3d5c17220b77425636366266b968f5b Mon Sep 17 00:00:00 2001
From: "REDMOND\\brodes" <brodes@microsoft.com>
Date: Fri, 27 Sep 2024 12:39:50 -0400
Subject: [PATCH 036/347] Updating expected file, false positives now resolved.

---
 .../Security/CWE/CWE-704/WcharCharConversion.expected       | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/cpp/ql/test/query-tests/Security/CWE/CWE-704/WcharCharConversion.expected b/cpp/ql/test/query-tests/Security/CWE/CWE-704/WcharCharConversion.expected
index 5aca312c0839..9b34966aa87f 100644
--- a/cpp/ql/test/query-tests/Security/CWE/CWE-704/WcharCharConversion.expected
+++ b/cpp/ql/test/query-tests/Security/CWE/CWE-704/WcharCharConversion.expected
@@ -3,17 +3,11 @@
 | WcharCharConversion.cpp:24:22:24:27 | lpChar | Conversion from char * to wchar_t *. Use of invalid string can lead to undefined behavior. |
 | WcharCharConversion.cpp:26:23:26:28 | lpChar | Conversion from char * to LPCWSTR. Use of invalid string can lead to undefined behavior. |
 | WcharCharConversion.cpp:27:17:27:22 | lpChar | Conversion from char * to LPWSTR. Use of invalid string can lead to undefined behavior. |
-| WcharCharConversion.cpp:64:20:64:25 | buffer | Conversion from FOO to LPWSTR. Use of invalid string can lead to undefined behavior. |
-| WcharCharConversion.cpp:80:21:80:26 | buffer | Conversion from LPTSTR to LPWSTR. Use of invalid string can lead to undefined behavior. |
 | WcharCharConversion.cpp:82:21:82:26 | buffer | Conversion from LPTSTR to LPWSTR. Use of invalid string can lead to undefined behavior. |
-| WcharCharConversion.cpp:85:21:85:26 | buffer | Conversion from LPTSTR to LPWSTR. Use of invalid string can lead to undefined behavior. |
 | WcharCharConversion.cpp:87:21:87:26 | buffer | Conversion from LPTSTR to LPWSTR. Use of invalid string can lead to undefined behavior. |
 | WcharCharConversion.cpp:90:21:90:26 | buffer | Conversion from LPTSTR to LPWSTR. Use of invalid string can lead to undefined behavior. |
-| WcharCharConversion.cpp:92:21:92:26 | buffer | Conversion from LPTSTR to LPWSTR. Use of invalid string can lead to undefined behavior. |
 | WcharCharConversion.cpp:96:21:96:26 | buffer | Conversion from LPTSTR to LPWSTR. Use of invalid string can lead to undefined behavior. |
 | WcharCharConversion.cpp:98:21:98:26 | buffer | Conversion from LPTSTR to LPWSTR. Use of invalid string can lead to undefined behavior. |
-| WcharCharConversion.cpp:101:21:101:26 | buffer | Conversion from LPTSTR to LPWSTR. Use of invalid string can lead to undefined behavior. |
 | WcharCharConversion.cpp:103:21:103:26 | buffer | Conversion from LPTSTR to LPWSTR. Use of invalid string can lead to undefined behavior. |
 | WcharCharConversion.cpp:106:21:106:26 | buffer | Conversion from LPTSTR to LPWSTR. Use of invalid string can lead to undefined behavior. |
-| WcharCharConversion.cpp:108:21:108:26 | buffer | Conversion from LPTSTR to LPWSTR. Use of invalid string can lead to undefined behavior. |
 | WcharCharConversion.cpp:110:20:110:25 | buffer | Conversion from LPTSTR to LPWSTR. Use of invalid string can lead to undefined behavior. |

From b73fe0ba0aaf86c10090e681a9080a7eab1ed483 Mon Sep 17 00:00:00 2001
From: "REDMOND\\brodes" <brodes@microsoft.com>
Date: Fri, 27 Sep 2024 12:41:45 -0400
Subject: [PATCH 037/347] Adding change log

---
 .../2024-09-26-wcharcharconversion-false-positives.md        | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 cpp/ql/src/change-notes/2024-09-26-wcharcharconversion-false-positives.md

diff --git a/cpp/ql/src/change-notes/2024-09-26-wcharcharconversion-false-positives.md b/cpp/ql/src/change-notes/2024-09-26-wcharcharconversion-false-positives.md
new file mode 100644
index 000000000000..7398013e9ef0
--- /dev/null
+++ b/cpp/ql/src/change-notes/2024-09-26-wcharcharconversion-false-positives.md
@@ -0,0 +1,5 @@
+---
+category: minorAnalysis
+---
+* Removed false positives caused by failure to detect byte arrays
+* Removed false positives caused by failure to recognize dynamic checks prior to possible dangerous widening
\ No newline at end of file

From e73d1c7b76c0466ceb717b1fcd9037beed9ab856 Mon Sep 17 00:00:00 2001
From: Jeroen Ketema <jketema@github.com>
Date: Thu, 26 Sep 2024 14:14:46 +0200
Subject: [PATCH 038/347] C++: Add more macro expansion tests

---
 .../inmacroexpansion.expected                 | 169 ++++++++++++++++--
 .../macros/inmacroexpansion/test.cpp          |  81 ++++++++-
 2 files changed, 235 insertions(+), 15 deletions(-)

diff --git a/cpp/ql/test/library-tests/macros/inmacroexpansion/inmacroexpansion.expected b/cpp/ql/test/library-tests/macros/inmacroexpansion/inmacroexpansion.expected
index 7ffe4cb03e9f..f8eff955d47c 100644
--- a/cpp/ql/test/library-tests/macros/inmacroexpansion/inmacroexpansion.expected
+++ b/cpp/ql/test/library-tests/macros/inmacroexpansion/inmacroexpansion.expected
@@ -2,25 +2,168 @@
 | file://:0:0:0:0 | (unnamed parameter 0) | false |
 | file://:0:0:0:0 | __super | false |
 | file://:0:0:0:0 | __va_list_tag | false |
+| file://:0:0:0:0 | decltype([...](...){...}) | false |
 | file://:0:0:0:0 | operator= | false |
 | file://:0:0:0:0 | operator= | false |
 | test.cpp:0:0:0:0 | test.cpp | false |
-| test.cpp:2:1:2:61 | #define FOO class S{int i; void f(void) { int j; return; } }; | false |
+| test.cpp:2:1:2:68 | #define CLASS_DECL class S{int i; void f(void) { int j; return; } }; | false |
 | test.cpp:4:1:4:1 | S | false |
 | test.cpp:4:1:4:1 | declaration of S | false |
 | test.cpp:4:1:4:1 | declaration of operator= | false |
 | test.cpp:4:1:4:1 | declaration of operator= | false |
 | test.cpp:4:1:4:1 | operator= | false |
 | test.cpp:4:1:4:1 | operator= | false |
-| test.cpp:4:1:4:3 | FOO | false |
-| test.cpp:4:1:4:3 | S | false |
-| test.cpp:4:1:4:3 | declaration | true |
-| test.cpp:4:1:4:3 | definition of S | true |
-| test.cpp:4:1:4:3 | definition of f | true |
-| test.cpp:4:1:4:3 | definition of i | true |
-| test.cpp:4:1:4:3 | definition of j | true |
-| test.cpp:4:1:4:3 | f | false |
-| test.cpp:4:1:4:3 | i | false |
-| test.cpp:4:1:4:3 | j | true |
-| test.cpp:4:1:4:3 | return ... | true |
-| test.cpp:4:1:4:3 | { ... } | true |
+| test.cpp:4:1:4:10 | CLASS_DECL | false |
+| test.cpp:4:1:4:10 | S | false |
+| test.cpp:4:1:4:10 | declaration | true |
+| test.cpp:4:1:4:10 | definition of S | true |
+| test.cpp:4:1:4:10 | definition of f | true |
+| test.cpp:4:1:4:10 | definition of i | true |
+| test.cpp:4:1:4:10 | definition of j | true |
+| test.cpp:4:1:4:10 | f | false |
+| test.cpp:4:1:4:10 | i | false |
+| test.cpp:4:1:4:10 | j | true |
+| test.cpp:4:1:4:10 | return ... | true |
+| test.cpp:4:1:4:10 | { ... } | true |
+| test.cpp:6:1:6:42 | #define FUNCTION_DECL void f1() { int k; } | false |
+| test.cpp:8:1:8:13 | FUNCTION_DECL | false |
+| test.cpp:8:1:8:13 | declaration | true |
+| test.cpp:8:1:8:13 | definition of f1 | true |
+| test.cpp:8:1:8:13 | definition of k | true |
+| test.cpp:8:1:8:13 | f1 | false |
+| test.cpp:8:1:8:13 | k | true |
+| test.cpp:8:1:8:13 | return ... | true |
+| test.cpp:8:1:8:13 | { ... } | true |
+| test.cpp:10:1:10:33 | #define VARIABLE_DECL int v1 = 1; | false |
+| test.cpp:12:1:12:13 | 1 | true |
+| test.cpp:12:1:12:13 | VARIABLE_DECL | false |
+| test.cpp:12:1:12:13 | definition of v1 | true |
+| test.cpp:12:1:12:13 | initializer for v1 | true |
+| test.cpp:12:1:12:13 | v1 | true |
+| test.cpp:14:1:14:35 | #define TYPE_DECL_1 typedef int t1; | false |
+| test.cpp:16:1:16:11 | TYPE_DECL_1 | false |
+| test.cpp:16:1:16:11 | declaration of t1 | true |
+| test.cpp:16:1:16:11 | t1 | false |
+| test.cpp:18:1:18:35 | #define TYPE_DECL_2 using t2 = int; | false |
+| test.cpp:20:1:20:11 | TYPE_DECL_2 | false |
+| test.cpp:20:1:20:11 | declaration of t2 | true |
+| test.cpp:20:1:20:11 | t2 | false |
+| test.cpp:22:1:22:47 | #define NAMESPACE_DECL namespace ns { int v2; } | false |
+| test.cpp:24:1:24:14 | NAMESPACE_DECL | false |
+| test.cpp:24:1:24:14 | definition of v2 | true |
+| test.cpp:24:1:24:14 | ns | false |
+| test.cpp:24:1:24:14 | ns | false |
+| test.cpp:24:1:24:14 | v2 | true |
+| test.cpp:26:1:26:43 | #define USING_NAMESPACE using namespace ns; | false |
+| test.cpp:28:1:28:34 | #define ENUM_CONSTANT enum_element | false |
+| test.cpp:30:12:30:21 | definition of enum_class | false |
+| test.cpp:30:12:30:21 | enum_class | false |
+| test.cpp:30:25:30:37 | ENUM_CONSTANT | false |
+| test.cpp:30:25:30:37 | enum_element | false |
+| test.cpp:32:1:32:41 | #define USING_ENUM using enum enum_class; | false |
+| test.cpp:34:1:34:10 | USING_ENUM | false |
+| test.cpp:34:1:34:10 | using enum enum_class | false |
+| test.cpp:36:1:36:48 | #define STATIC_ASSERT static_assert(1 == 1, ""); | false |
+| test.cpp:38:1:38:13 | 1 | true |
+| test.cpp:38:1:38:13 | 1 | true |
+| test.cpp:38:1:38:13 | ... == ... | true |
+| test.cpp:38:1:38:13 | STATIC_ASSERT | false |
+| test.cpp:38:1:38:13 | static_assert(..., "") | false |
+| test.cpp:40:1:40:42 | #define ATTRIBUTE [[nodiscard("reason1")]] | false |
+| test.cpp:42:1:42:9 | ATTRIBUTE | false |
+| test.cpp:42:1:42:9 | nodiscard | false |
+| test.cpp:42:1:42:9 | reason1 | false |
+| test.cpp:42:1:42:9 | reason1 | true |
+| test.cpp:43:5:43:6 | declaration of f2 | false |
+| test.cpp:43:5:43:6 | f2 | false |
+| test.cpp:45:1:45:31 | #define ATTRIBUTE_ARG "reason2" | false |
+| test.cpp:47:3:47:11 | nodiscard | false |
+| test.cpp:47:13:47:25 | ATTRIBUTE_ARG | false |
+| test.cpp:47:13:47:25 | reason2 | false |
+| test.cpp:47:13:47:25 | reason2 | true |
+| test.cpp:48:5:48:6 | declaration of f3 | false |
+| test.cpp:48:5:48:6 | f3 | false |
+| test.cpp:50:1:50:16 | #define TYPE int | false |
+| test.cpp:52:1:52:4 | TYPE | false |
+| test.cpp:52:6:52:7 | definition of v3 | true |
+| test.cpp:52:6:52:7 | v3 | true |
+| test.cpp:52:11:52:11 | 1 | false |
+| test.cpp:52:11:52:11 | initializer for v3 | false |
+| test.cpp:54:1:54:29 | #define DERIVATION : public S | false |
+| test.cpp:56:7:56:7 | T | false |
+| test.cpp:56:7:56:7 | T | false |
+| test.cpp:56:7:56:7 | declaration of T | false |
+| test.cpp:56:7:56:7 | declaration of operator= | false |
+| test.cpp:56:7:56:7 | declaration of operator= | false |
+| test.cpp:56:7:56:7 | definition of T | false |
+| test.cpp:56:7:56:7 | operator= | false |
+| test.cpp:56:7:56:7 | operator= | false |
+| test.cpp:56:9:56:18 | DERIVATION | false |
+| test.cpp:56:9:56:18 | derivation | false |
+| test.cpp:58:1:58:31 | #define FRIEND friend int f3(); | false |
+| test.cpp:60:7:60:7 | U | false |
+| test.cpp:60:7:60:7 | declaration of operator= | false |
+| test.cpp:60:7:60:7 | declaration of operator= | false |
+| test.cpp:60:7:60:7 | definition of U | false |
+| test.cpp:60:7:60:7 | operator= | false |
+| test.cpp:60:7:60:7 | operator= | false |
+| test.cpp:61:3:61:8 | FRIEND | false |
+| test.cpp:61:3:61:8 | U's friend | false |
+| test.cpp:64:1:64:24 | #define NAME_QUAL_1 ns:: | false |
+| test.cpp:66:1:66:22 | #define NAME_QUAL_2 ns | false |
+| test.cpp:68:1:68:19 | #define LOCAL_VAR m | false |
+| test.cpp:70:6:70:7 | definition of f4 | false |
+| test.cpp:70:6:70:7 | f4 | false |
+| test.cpp:70:11:76:1 | { ... } | false |
+| test.cpp:71:5:71:8 | ns:: | false |
+| test.cpp:71:5:71:15 | NAME_QUAL_1 | false |
+| test.cpp:71:5:71:18 | v2 | false |
+| test.cpp:71:5:71:19 | ExprStmt | false |
+| test.cpp:72:5:72:8 | ns:: | false |
+| test.cpp:72:5:72:15 | NAME_QUAL_2 | false |
+| test.cpp:72:5:72:21 | v2 | false |
+| test.cpp:72:5:72:22 | ExprStmt | false |
+| test.cpp:73:5:73:23 | declaration | false |
+| test.cpp:73:9:73:17 | LOCAL_VAR | false |
+| test.cpp:73:9:73:17 | definition of m | true |
+| test.cpp:73:9:73:17 | m | true |
+| test.cpp:73:20:73:22 | 42 | false |
+| test.cpp:73:20:73:22 | initializer for m | false |
+| test.cpp:74:5:74:41 | declaration | false |
+| test.cpp:74:10:74:10 | definition of l | false |
+| test.cpp:74:10:74:10 | l | false |
+| test.cpp:74:13:74:40 | [...](...){...} | false |
+| test.cpp:74:13:74:40 | initializer for l | false |
+| test.cpp:74:13:74:40 | {...} | false |
+| test.cpp:74:14:74:14 | (unnamed constructor) | false |
+| test.cpp:74:14:74:14 | (unnamed constructor) | false |
+| test.cpp:74:14:74:14 | (unnamed constructor) | false |
+| test.cpp:74:14:74:14 | declaration of (unnamed constructor) | false |
+| test.cpp:74:14:74:14 | declaration of (unnamed constructor) | false |
+| test.cpp:74:14:74:14 | definition of (unnamed constructor) | false |
+| test.cpp:74:14:74:14 | definition of operator= | false |
+| test.cpp:74:14:74:14 | operator= | false |
+| test.cpp:74:15:74:15 | definition of m | false |
+| test.cpp:74:15:74:15 | m | false |
+| test.cpp:74:15:74:15 | m | false |
+| test.cpp:74:15:74:23 | LOCAL_VAR | false |
+| test.cpp:74:15:74:23 | m | true |
+| test.cpp:74:25:74:25 | definition of operator() | false |
+| test.cpp:74:25:74:25 | operator() | false |
+| test.cpp:74:28:74:40 | { ... } | false |
+| test.cpp:74:30:74:38 | return ... | false |
+| test.cpp:74:37:74:37 | (int)... | false |
+| test.cpp:75:5:75:5 | (const lambda [] type at line 74, col. 14)... | false |
+| test.cpp:75:5:75:5 | l | false |
+| test.cpp:75:5:75:8 | ExprStmt | false |
+| test.cpp:75:6:75:6 | call to operator() | false |
+| test.cpp:76:1:76:1 | return ... | false |
+| test.cpp:78:1:78:15 | #define ID(x) x | false |
+| test.cpp:79:1:79:23 | #define NESTED(x) ID(x) | false |
+| test.cpp:80:5:80:6 | definition of v4 | false |
+| test.cpp:80:5:80:6 | v4 | false |
+| test.cpp:80:10:80:18 | ID(x) | false |
+| test.cpp:80:10:80:18 | NESTED(x) | false |
+| test.cpp:80:17:80:17 | 1 | true |
+| test.cpp:80:17:80:17 | initializer for v4 | true |
+| test.cpp:82:1:82:39 | // semmle-extractor-options: -std=c++20 | false |
diff --git a/cpp/ql/test/library-tests/macros/inmacroexpansion/test.cpp b/cpp/ql/test/library-tests/macros/inmacroexpansion/test.cpp
index 7cc1d581a0a9..22e55b17f5a3 100644
--- a/cpp/ql/test/library-tests/macros/inmacroexpansion/test.cpp
+++ b/cpp/ql/test/library-tests/macros/inmacroexpansion/test.cpp
@@ -1,5 +1,82 @@
 
-#define FOO class S{int i; void f(void) { int j; return; } };
+#define CLASS_DECL class S{int i; void f(void) { int j; return; } };
 
-FOO
+CLASS_DECL
 
+#define FUNCTION_DECL void f1() { int k; }
+
+FUNCTION_DECL
+
+#define VARIABLE_DECL int v1 = 1;
+
+VARIABLE_DECL
+
+#define TYPE_DECL_1 typedef int t1;
+
+TYPE_DECL_1
+
+#define TYPE_DECL_2 using t2 = int;
+
+TYPE_DECL_2
+
+#define NAMESPACE_DECL namespace ns { int v2; }
+
+NAMESPACE_DECL
+
+#define USING_NAMESPACE using namespace ns;
+
+#define ENUM_CONSTANT enum_element
+
+enum class enum_class { ENUM_CONSTANT };
+
+#define USING_ENUM using enum enum_class;
+
+USING_ENUM
+
+#define STATIC_ASSERT static_assert(1 == 1, "");
+
+STATIC_ASSERT
+
+#define ATTRIBUTE [[nodiscard("reason1")]]
+
+ATTRIBUTE
+int f2();
+
+#define ATTRIBUTE_ARG "reason2"
+
+[[nodiscard(ATTRIBUTE_ARG)]]
+int f3();
+
+#define TYPE int
+
+TYPE v3 = 1;
+
+#define DERIVATION : public S
+
+class T DERIVATION {};
+
+#define FRIEND friend int f3();
+
+class U {
+  FRIEND
+};
+
+#define NAME_QUAL_1 ns::
+
+#define NAME_QUAL_2 ns
+
+#define LOCAL_VAR m
+
+void f4() {
+    NAME_QUAL_1 v2;
+    NAME_QUAL_2 :: v2;
+    int LOCAL_VAR = 42;
+    auto l = [LOCAL_VAR]() { return m; };
+    l();
+}
+
+#define ID(x) x
+#define NESTED(x) ID(x)
+int v4 = NESTED(1);
+
+// semmle-extractor-options: -std=c++20

From d4ea62edec413cd9120cc11ef8f8ae593b17e0b0 Mon Sep 17 00:00:00 2001
From: Rasmus Lerchedahl Petersen <yoff@github.com>
Date: Mon, 30 Sep 2024 09:01:29 +0200
Subject: [PATCH 039/347] Python: flow through yield - add yield as a dataflow
 return - replace comprehension store step    with a store step to the yield

---
 .../new/internal/DataFlowDispatch.qll         |  7 +++-
 .../dataflow/new/internal/DataFlowPrivate.qll | 35 +++++++++++++++++--
 .../library-tests/dataflow/coverage/test.py   |  4 +--
 3 files changed, 41 insertions(+), 5 deletions(-)

diff --git a/python/ql/lib/semmle/python/dataflow/new/internal/DataFlowDispatch.qll b/python/ql/lib/semmle/python/dataflow/new/internal/DataFlowDispatch.qll
index c15f1751edb4..fbad70536c7a 100644
--- a/python/ql/lib/semmle/python/dataflow/new/internal/DataFlowDispatch.qll
+++ b/python/ql/lib/semmle/python/dataflow/new/internal/DataFlowDispatch.qll
@@ -1755,6 +1755,8 @@ class SynthCompCapturedVariablesArgumentNode extends Node, TSynthCompCapturedVar
   override Scope getScope() { result = comp.getFunction() }
 
   override Location getLocation() { result = comp.getLocation() }
+
+  Comp getComprehension() { result = comp }
 }
 
 /** Gets a viable run-time target for the call `call`. */
@@ -1796,7 +1798,10 @@ abstract class ReturnNode extends Node {
 /** A data flow node that represents a value returned by a callable. */
 class ExtractedReturnNode extends ReturnNode, CfgNode {
   // See `TaintTrackingImplementation::returnFlowStep`
-  ExtractedReturnNode() { node = any(Return ret).getValue().getAFlowNode() }
+  ExtractedReturnNode() {
+    node = any(Return ret).getValue().getAFlowNode() or
+    node = any(Yield yield).getAFlowNode()
+  }
 
   override ReturnKind getKind() { any() }
 }
diff --git a/python/ql/lib/semmle/python/dataflow/new/internal/DataFlowPrivate.qll b/python/ql/lib/semmle/python/dataflow/new/internal/DataFlowPrivate.qll
index 218dbdae3025..efe039dc7b81 100644
--- a/python/ql/lib/semmle/python/dataflow/new/internal/DataFlowPrivate.qll
+++ b/python/ql/lib/semmle/python/dataflow/new/internal/DataFlowPrivate.qll
@@ -168,6 +168,37 @@ private predicate synthDictSplatArgumentNodeStoreStep(
   )
 }
 
+private predicate yieldStoreStep(Node nodeFrom, Content c, Node nodeTo) {
+  exists(Yield yield, Function func |
+    nodeTo.asCfgNode() = yield.getAFlowNode() and
+    nodeFrom.asCfgNode() = yield.getValue().getAFlowNode() and
+    func.containsInScope(yield)
+  |
+    exists(Comp comp | func = comp.getFunction() |
+      (
+        comp instanceof ListComp or
+        comp instanceof GeneratorExp
+      ) and
+      c instanceof ListElementContent
+      or
+      comp instanceof SetComp and
+      c instanceof SetElementContent
+      or
+      comp instanceof DictComp and
+      c instanceof DictionaryElementContent
+    )
+    or
+    not exists(Comp comp | func = comp.getFunction()) and
+    (
+      c instanceof ListElementContent
+      or
+      c instanceof SetElementContent
+      or
+      c instanceof DictionaryElementContent
+    )
+  )
+}
+
 /**
  * Ensures that the a `**kwargs` parameter will not contain elements with names of
  * keyword parameters.
@@ -668,8 +699,6 @@ predicate storeStep(Node nodeFrom, ContentSet c, Node nodeTo) {
   or
   setStoreStep(nodeFrom, c, nodeTo)
   or
-  comprehensionStoreStep(nodeFrom, c, nodeTo)
-  or
   attributeStoreStep(nodeFrom, c, nodeTo)
   or
   matchStoreStep(nodeFrom, c, nodeTo)
@@ -683,6 +712,8 @@ predicate storeStep(Node nodeFrom, ContentSet c, Node nodeTo) {
   or
   synthDictSplatArgumentNodeStoreStep(nodeFrom, c, nodeTo)
   or
+  yieldStoreStep(nodeFrom, c, nodeTo)
+  or
   VariableCapture::storeStep(nodeFrom, c, nodeTo)
 }
 
diff --git a/python/ql/test/library-tests/dataflow/coverage/test.py b/python/ql/test/library-tests/dataflow/coverage/test.py
index 511390df6816..64c500b5b693 100644
--- a/python/ql/test/library-tests/dataflow/coverage/test.py
+++ b/python/ql/test/library-tests/dataflow/coverage/test.py
@@ -245,7 +245,7 @@ def gen(x):
 
 def test_yield():
     g = gen(SOURCE)
-    SINK(next(g)) #$ MISSING:flow="SOURCE, l:-1 -> next()"
+    SINK(next(g)) #$ flow="SOURCE, l:-1 -> next(..)"
 
 
 def gen_from(x):
@@ -260,7 +260,7 @@ def test_yield_from():
 # a statement rather than an expression, but related to generators
 def test_for():
     for x in gen(SOURCE):
-        SINK(x) #$ MISSING:flow="SOURCE, l:-1 -> x"
+        SINK(x) #$ flow="SOURCE, l:-1 -> x"
 
 
 # 6.2.9.1. Generator-iterator methods

From 310819d39282d181272d7fe8a3bc350d0cdc056d Mon Sep 17 00:00:00 2001
From: Rasmus Lerchedahl Petersen <yoff@github.com>
Date: Mon, 30 Sep 2024 10:31:36 +0200
Subject: [PATCH 040/347] Python: fix dataflow inconsistencies - adjust scope
 of argument, the argument is outside the called function - add missing
 post-update nodes for the new arguments

---
 .../dataflow/new/internal/DataFlowDispatch.qll     | 14 +++++++++++++-
 .../dataflow/new/internal/DataFlowPrivate.qll      | 11 +++++++++++
 .../dataflow/new/internal/DataFlowPublic.qll       |  6 ++++++
 3 files changed, 30 insertions(+), 1 deletion(-)

diff --git a/python/ql/lib/semmle/python/dataflow/new/internal/DataFlowDispatch.qll b/python/ql/lib/semmle/python/dataflow/new/internal/DataFlowDispatch.qll
index fbad70536c7a..29c5f4e26272 100644
--- a/python/ql/lib/semmle/python/dataflow/new/internal/DataFlowDispatch.qll
+++ b/python/ql/lib/semmle/python/dataflow/new/internal/DataFlowDispatch.qll
@@ -1752,13 +1752,25 @@ class SynthCompCapturedVariablesArgumentNode extends Node, TSynthCompCapturedVar
 
   override string toString() { result = "Capturing closure argument (comp)" }
 
-  override Scope getScope() { result = comp.getFunction() }
+  override Scope getScope() { result = comp.getScope() }
 
   override Location getLocation() { result = comp.getLocation() }
 
   Comp getComprehension() { result = comp }
 }
 
+class SynthCompCapturedVariablesArgumentPostUpdateNode extends PostUpdateNodeImpl,
+  TSynthCompCapturedVariablesArgumentPostUpdateNode
+{
+  Comp comp;
+
+  SynthCompCapturedVariablesArgumentPostUpdateNode() {
+    this = TSynthCompCapturedVariablesArgumentPostUpdateNode(comp)
+  }
+
+  override Node getPreUpdateNode() { result = TSynthCompCapturedVariablesArgumentNode(comp) }
+}
+
 /** Gets a viable run-time target for the call `call`. */
 DataFlowCallable viableCallable(DataFlowCall call) {
   call instanceof ExtractedDataFlowCall and
diff --git a/python/ql/lib/semmle/python/dataflow/new/internal/DataFlowPrivate.qll b/python/ql/lib/semmle/python/dataflow/new/internal/DataFlowPrivate.qll
index efe039dc7b81..eb2568300ecb 100644
--- a/python/ql/lib/semmle/python/dataflow/new/internal/DataFlowPrivate.qll
+++ b/python/ql/lib/semmle/python/dataflow/new/internal/DataFlowPrivate.qll
@@ -287,6 +287,12 @@ abstract class PostUpdateNodeImpl extends Node {
   abstract Node getPreUpdateNode();
 }
 
+/**
+ * A post-update node synthesised for an existing control flow node.
+ * Add to `TSyntheticPostUpdateNode` to get the synthetic post-update node synthesised.
+ *
+ * Synthetic post-update nodes for synthetic nodes need to be listed one by one.
+ */
 class SyntheticPostUpdateNode extends PostUpdateNodeImpl, TSyntheticPostUpdateNode {
   ControlFlowNode node;
 
@@ -301,6 +307,11 @@ class SyntheticPostUpdateNode extends PostUpdateNodeImpl, TSyntheticPostUpdateNo
   override Location getLocation() { result = node.getLocation() }
 }
 
+/**
+ * An existsing control flow node being the post-update node of a synthetic pre-update node.
+ *
+ * Synthetic post-update nodes for synthetic nodes need to be listed one by one.
+ */
 class NonSyntheticPostUpdateNode extends PostUpdateNodeImpl, CfgNode {
   SyntheticPreUpdateNode pre;
 
diff --git a/python/ql/lib/semmle/python/dataflow/new/internal/DataFlowPublic.qll b/python/ql/lib/semmle/python/dataflow/new/internal/DataFlowPublic.qll
index eca9da797914..b8ce9634cf33 100644
--- a/python/ql/lib/semmle/python/dataflow/new/internal/DataFlowPublic.qll
+++ b/python/ql/lib/semmle/python/dataflow/new/internal/DataFlowPublic.qll
@@ -71,6 +71,9 @@ newtype TNode =
       def.getDefiningNode() = node and
       def.getParameter() = func.getArg(0)
     )
+    or
+    // the iterable argument to the implicit comprehension function
+    node.getNode() = any(Comp c).getIterable()
   } or
   /** A node representing a global (module-level) variable in a specific module. */
   TModuleVariableNode(Module m, GlobalVariable v) {
@@ -129,6 +132,9 @@ newtype TNode =
   TSynthCompCapturedVariablesArgumentNode(Comp comp) {
     comp.getFunction() = any(VariableCapture::CapturedVariable v).getACapturingScope()
   } or
+  TSynthCompCapturedVariablesArgumentPostUpdateNode(Comp comp) {
+    comp.getFunction() = any(VariableCapture::CapturedVariable v).getACapturingScope()
+  } or
   /** An empty, unused node type that exists to prevent unwanted dependencies on data flow nodes. */
   TForbiddenRecursionGuard() {
     none() and

From 3ef05a628fe5d3dbf1089f29719c654050db3f51 Mon Sep 17 00:00:00 2001
From: Rasmus Lerchedahl Petersen <yoff@github.com>
Date: Mon, 30 Sep 2024 11:56:36 +0200
Subject: [PATCH 041/347] Python: add location to node

---
 .../python/dataflow/new/internal/DataFlowDispatch.qll       | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/python/ql/lib/semmle/python/dataflow/new/internal/DataFlowDispatch.qll b/python/ql/lib/semmle/python/dataflow/new/internal/DataFlowDispatch.qll
index 29c5f4e26272..31773624aad1 100644
--- a/python/ql/lib/semmle/python/dataflow/new/internal/DataFlowDispatch.qll
+++ b/python/ql/lib/semmle/python/dataflow/new/internal/DataFlowDispatch.qll
@@ -1768,6 +1768,12 @@ class SynthCompCapturedVariablesArgumentPostUpdateNode extends PostUpdateNodeImp
     this = TSynthCompCapturedVariablesArgumentPostUpdateNode(comp)
   }
 
+  override string toString() { result = "[post] Capturing closure argument (comp)" }
+
+  override Scope getScope() { result = comp.getScope() }
+
+  override Location getLocation() { result = comp.getLocation() }
+
   override Node getPreUpdateNode() { result = TSynthCompCapturedVariablesArgumentNode(comp) }
 }
 

From f9f46f0f983e3988618f1995285f2e6e556e5dfe Mon Sep 17 00:00:00 2001
From: Rasmus Lerchedahl Petersen <yoff@github.com>
Date: Mon, 30 Sep 2024 12:00:38 +0200
Subject: [PATCH 042/347] Python: update test expectations We now have a new
 callable, yielding new enclosing callables

---
 .../enclosing-callable/EnclosingCallable.expected      | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/python/ql/test/library-tests/dataflow/enclosing-callable/EnclosingCallable.expected b/python/ql/test/library-tests/dataflow/enclosing-callable/EnclosingCallable.expected
index 0a26a2f2cb39..c168ea8c3916 100644
--- a/python/ql/test/library-tests/dataflow/enclosing-callable/EnclosingCallable.expected
+++ b/python/ql/test/library-tests/dataflow/enclosing-callable/EnclosingCallable.expected
@@ -15,10 +15,10 @@
 | generator.py:0:0:0:0 | Module generator | generator.py:1:1:1:23 | ControlFlowNode for FunctionExpr |
 | generator.py:0:0:0:0 | Module generator | generator.py:1:5:1:18 | ControlFlowNode for generator_func |
 | generator.py:1:1:1:23 | Function generator_func | generator.py:1:20:1:21 | ControlFlowNode for xs |
-| generator.py:1:1:1:23 | Function generator_func | generator.py:2:12:2:26 | ControlFlowNode for .0 |
-| generator.py:1:1:1:23 | Function generator_func | generator.py:2:12:2:26 | ControlFlowNode for .0 |
 | generator.py:1:1:1:23 | Function generator_func | generator.py:2:12:2:26 | ControlFlowNode for ListComp |
-| generator.py:1:1:1:23 | Function generator_func | generator.py:2:13:2:13 | ControlFlowNode for Yield |
-| generator.py:1:1:1:23 | Function generator_func | generator.py:2:13:2:13 | ControlFlowNode for x |
-| generator.py:1:1:1:23 | Function generator_func | generator.py:2:19:2:19 | ControlFlowNode for x |
 | generator.py:1:1:1:23 | Function generator_func | generator.py:2:24:2:25 | ControlFlowNode for xs |
+| generator.py:2:12:2:26 | Function listcomp | generator.py:2:12:2:26 | ControlFlowNode for .0 |
+| generator.py:2:12:2:26 | Function listcomp | generator.py:2:12:2:26 | ControlFlowNode for .0 |
+| generator.py:2:12:2:26 | Function listcomp | generator.py:2:13:2:13 | ControlFlowNode for Yield |
+| generator.py:2:12:2:26 | Function listcomp | generator.py:2:13:2:13 | ControlFlowNode for x |
+| generator.py:2:12:2:26 | Function listcomp | generator.py:2:19:2:19 | ControlFlowNode for x |

From ded39749a74d7cd2f8f67f2d01e50504867b03b2 Mon Sep 17 00:00:00 2001
From: Rasmus Lerchedahl Petersen <yoff@github.com>
Date: Mon, 30 Sep 2024 13:02:20 +0200
Subject: [PATCH 043/347] Python: allow comp arg as argumentnode

---
 .../semmle/python/dataflow/new/internal/DataFlowDispatch.qll  | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/python/ql/lib/semmle/python/dataflow/new/internal/DataFlowDispatch.qll b/python/ql/lib/semmle/python/dataflow/new/internal/DataFlowDispatch.qll
index 31773624aad1..aaea0d277233 100644
--- a/python/ql/lib/semmle/python/dataflow/new/internal/DataFlowDispatch.qll
+++ b/python/ql/lib/semmle/python/dataflow/new/internal/DataFlowDispatch.qll
@@ -163,6 +163,10 @@ newtype TArgumentPosition =
     // position, we need to ensure we make these available (these are specified as
     // parameters in the flow-summary spec)
     FlowSummaryImpl::ParsePositions::isParsedPositionalParameterPosition(_, index)
+    or
+    // the generated function inside a comprehension has a positional argument at index 0
+    exists(Comp c) and
+    index = 0
   } or
   TKeywordArgumentPosition(string name) {
     exists(any(CallNode c).getArgByName(name))

From ec0bd4494ce5ca2e37511a80ef517b9093a6708c Mon Sep 17 00:00:00 2001
From: Anders Schack-Mulligen <aschackmull@github.com>
Date: Fri, 27 Sep 2024 15:00:19 +0200
Subject: [PATCH 044/347] Java: Add overrides to the interpretation of neutral
 MaD models.

---
 java/ql/lib/semmle/code/java/dataflow/ExternalFlow.qll          | 2 +-
 .../lib/semmle/code/java/dataflow/internal/FlowSummaryImpl.qll  | 2 +-
 java/ql/src/utils/modeleditor/ModelEditor.qll                   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/java/ql/lib/semmle/code/java/dataflow/ExternalFlow.qll b/java/ql/lib/semmle/code/java/dataflow/ExternalFlow.qll
index 28be9a61d75a..123e042b6215 100644
--- a/java/ql/lib/semmle/code/java/dataflow/ExternalFlow.qll
+++ b/java/ql/lib/semmle/code/java/dataflow/ExternalFlow.qll
@@ -416,7 +416,7 @@ private predicate elementSpec(
   or
   summaryModel(package, type, subtypes, name, signature, ext, _, _, _, _, _)
   or
-  neutralModel(package, type, name, signature, _, _) and ext = "" and subtypes = false
+  neutralModel(package, type, name, signature, _, _) and ext = "" and subtypes = true
 }
 
 private string getNestedName(Type t) {
diff --git a/java/ql/lib/semmle/code/java/dataflow/internal/FlowSummaryImpl.qll b/java/ql/lib/semmle/code/java/dataflow/internal/FlowSummaryImpl.qll
index feab4b3cec78..b4a2bad48f35 100644
--- a/java/ql/lib/semmle/code/java/dataflow/internal/FlowSummaryImpl.qll
+++ b/java/ql/lib/semmle/code/java/dataflow/internal/FlowSummaryImpl.qll
@@ -34,7 +34,7 @@ module Input implements InputSig<Location, DataFlowImplSpecific::JavaDataFlow> {
   ) {
     exists(string namespace, string type, string name, string signature |
       neutralModel(namespace, type, name, signature, kind, provenance) and
-      c.asCallable() = interpretElement(namespace, type, false, name, signature, "", isExact)
+      c.asCallable() = interpretElement(namespace, type, true, name, signature, "", isExact)
     )
   }
 
diff --git a/java/ql/src/utils/modeleditor/ModelEditor.qll b/java/ql/src/utils/modeleditor/ModelEditor.qll
index d5286e9024a8..016b4664b3b9 100644
--- a/java/ql/src/utils/modeleditor/ModelEditor.qll
+++ b/java/ql/src/utils/modeleditor/ModelEditor.qll
@@ -77,7 +77,7 @@ class Endpoint extends Callable {
   predicate isNeutral() {
     exists(string namespace, string type, string name, string signature |
       neutralModel(namespace, type, name, signature, _, _) and
-      this = interpretElement(namespace, type, false, name, signature, "", _)
+      this = interpretElement(namespace, type, true, name, signature, "", _)
     )
   }
 

From fb07a56de60d183921d25a7fe17f612d6ca20943 Mon Sep 17 00:00:00 2001
From: Rasmus Lerchedahl Petersen <yoff@github.com>
Date: Mon, 30 Sep 2024 13:26:59 +0200
Subject: [PATCH 045/347] Python: adjust test expectations

---
 .../test/library-tests/dataflow/coverage/localFlow.expected  | 5 -----
 .../test/library-tests/dataflow/regression/dataflow.expected | 1 +
 python/ql/test/library-tests/dataflow/regression/test.py     | 2 +-
 .../defaultAdditionalTaintStep/test_collections.py           | 4 ++--
 4 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/python/ql/test/library-tests/dataflow/coverage/localFlow.expected b/python/ql/test/library-tests/dataflow/coverage/localFlow.expected
index 1cb2cab49fae..665fb1aa12b8 100644
--- a/python/ql/test/library-tests/dataflow/coverage/localFlow.expected
+++ b/python/ql/test/library-tests/dataflow/coverage/localFlow.expected
@@ -8,9 +8,4 @@
 | test.py:208:1:208:53 | Entry definition for SsaSourceVariable SINK | test.py:210:5:210:8 | ControlFlowNode for SINK |
 | test.py:208:1:208:53 | Entry definition for SsaSourceVariable SOURCE | test.py:209:25:209:30 | ControlFlowNode for SOURCE |
 | test.py:209:5:209:5 | ControlFlowNode for x | test.py:210:10:210:10 | ControlFlowNode for x |
-| test.py:209:9:209:68 | ControlFlowNode for .0 | test.py:209:9:209:68 | ControlFlowNode for .0 |
 | test.py:209:9:209:68 | ControlFlowNode for ListComp | test.py:209:5:209:5 | ControlFlowNode for x |
-| test.py:209:16:209:16 | ControlFlowNode for v | test.py:209:45:209:45 | ControlFlowNode for v |
-| test.py:209:40:209:40 | ControlFlowNode for u | test.py:209:56:209:56 | ControlFlowNode for u |
-| test.py:209:51:209:51 | ControlFlowNode for z | test.py:209:67:209:67 | ControlFlowNode for z |
-| test.py:209:62:209:62 | ControlFlowNode for y | test.py:209:10:209:10 | ControlFlowNode for y |
diff --git a/python/ql/test/library-tests/dataflow/regression/dataflow.expected b/python/ql/test/library-tests/dataflow/regression/dataflow.expected
index dfce2c727378..c8ffed514463 100644
--- a/python/ql/test/library-tests/dataflow/regression/dataflow.expected
+++ b/python/ql/test/library-tests/dataflow/regression/dataflow.expected
@@ -23,3 +23,4 @@
 | test.py:195:9:195:14 | ControlFlowNode for SOURCE | test.py:199:14:199:14 | ControlFlowNode for t |
 | test.py:202:10:202:15 | ControlFlowNode for SOURCE | test.py:204:14:204:14 | ControlFlowNode for i |
 | test.py:202:10:202:15 | ControlFlowNode for SOURCE | test.py:205:10:205:10 | ControlFlowNode for i |
+| test.py:208:12:208:17 | ControlFlowNode for SOURCE | test.py:214:14:214:14 | ControlFlowNode for x |
diff --git a/python/ql/test/library-tests/dataflow/regression/test.py b/python/ql/test/library-tests/dataflow/regression/test.py
index 80c9c7e5e343..869993a5b643 100644
--- a/python/ql/test/library-tests/dataflow/regression/test.py
+++ b/python/ql/test/library-tests/dataflow/regression/test.py
@@ -211,4 +211,4 @@ def flow_in_generator():
 
 def flow_from_generator():
     for x in flow_in_generator():
-        SINK(x)  # Flow not found
+        SINK(x)
diff --git a/python/ql/test/library-tests/dataflow/tainttracking/defaultAdditionalTaintStep/test_collections.py b/python/ql/test/library-tests/dataflow/tainttracking/defaultAdditionalTaintStep/test_collections.py
index 0e2aae935546..e7ae9b41eda6 100644
--- a/python/ql/test/library-tests/dataflow/tainttracking/defaultAdditionalTaintStep/test_collections.py
+++ b/python/ql/test/library-tests/dataflow/tainttracking/defaultAdditionalTaintStep/test_collections.py
@@ -61,7 +61,7 @@ def test_access(x, y, z):
         iter(tainted_list), # $ tainted
         next(iter(tainted_list)), # $ MISSING: tainted
         [i for i in tainted_list], # $ tainted
-        [tainted_list for _i in [1,2,3]], # $ MISSING: tainted
+        [tainted_list for _i in [1,2,3]], # $ tainted
     )
 
     a, b, c = tainted_list[0:3]
@@ -85,7 +85,7 @@ def test_access_explicit(x, y, z):
         iter(tainted_list), # $ tainted
         next(iter(tainted_list)), # $ tainted
         [i for i in tainted_list], # $ tainted
-        [tainted_list for i in [1,2,3]], # $ MISSING: tainted
+        [tainted_list for i in [1,2,3]], # $ tainted
         [TAINTED_STRING for i in [1,2,3]], # $ tainted
         [tainted_list], # $ tainted
     )

From 7392d186bcc9849ca0291d70a17497d1abc9804d Mon Sep 17 00:00:00 2001
From: Rasmus Lerchedahl Petersen <yoff@github.com>
Date: Mon, 30 Sep 2024 13:49:01 +0200
Subject: [PATCH 046/347] Python: use yield step also for taint Using the
 comprehension store step meant that all comprehensions would receive taint.
 This because comprehension flow now goes via a callable, meaning they share
 the return node.

---
 .../dataflow/new/internal/DataFlowPrivate.qll | 27 +------------------
 .../new/internal/TaintTrackingPrivate.qll     |  2 +-
 2 files changed, 2 insertions(+), 27 deletions(-)

diff --git a/python/ql/lib/semmle/python/dataflow/new/internal/DataFlowPrivate.qll b/python/ql/lib/semmle/python/dataflow/new/internal/DataFlowPrivate.qll
index eb2568300ecb..e70a1fb8b2db 100644
--- a/python/ql/lib/semmle/python/dataflow/new/internal/DataFlowPrivate.qll
+++ b/python/ql/lib/semmle/python/dataflow/new/internal/DataFlowPrivate.qll
@@ -168,7 +168,7 @@ private predicate synthDictSplatArgumentNodeStoreStep(
   )
 }
 
-private predicate yieldStoreStep(Node nodeFrom, Content c, Node nodeTo) {
+predicate yieldStoreStep(Node nodeFrom, Content c, Node nodeTo) {
   exists(Yield yield, Function func |
     nodeTo.asCfgNode() = yield.getAFlowNode() and
     nodeFrom.asCfgNode() = yield.getValue().getAFlowNode() and
@@ -885,31 +885,6 @@ predicate dictClearStep(Node node, DictionaryElementContent c) {
   )
 }
 
-/** Data flows from an element expression in a comprehension to the comprehension. */
-predicate comprehensionStoreStep(CfgNode nodeFrom, Content c, CfgNode nodeTo) {
-  // Comprehension
-  //   `[x+1 for x in l]`
-  //   nodeFrom is `x+1`, cfg node
-  //   nodeTo is `[x+1 for x in l]`, cfg node
-  //   c denotes list or set or dictionary without index
-  //
-  // List
-  nodeTo.getNode().getNode().(ListComp).getElt() = nodeFrom.getNode().getNode() and
-  c instanceof ListElementContent
-  or
-  // Set
-  nodeTo.getNode().getNode().(SetComp).getElt() = nodeFrom.getNode().getNode() and
-  c instanceof SetElementContent
-  or
-  // Dictionary
-  nodeTo.getNode().getNode().(DictComp).getElt() = nodeFrom.getNode().getNode() and
-  c instanceof DictionaryElementAnyContent
-  or
-  // Generator
-  nodeTo.getNode().getNode().(GeneratorExp).getElt() = nodeFrom.getNode().getNode() and
-  c instanceof ListElementContent
-}
-
 /**
  * Holds if `nodeFrom` flows into the attribute `c` of `nodeTo` via an attribute assignment.
  *
diff --git a/python/ql/lib/semmle/python/dataflow/new/internal/TaintTrackingPrivate.qll b/python/ql/lib/semmle/python/dataflow/new/internal/TaintTrackingPrivate.qll
index 572e67c28a9c..e59301bd1ec9 100644
--- a/python/ql/lib/semmle/python/dataflow/new/internal/TaintTrackingPrivate.qll
+++ b/python/ql/lib/semmle/python/dataflow/new/internal/TaintTrackingPrivate.qll
@@ -188,7 +188,7 @@ predicate containerStep(DataFlow::Node nodeFrom, DataFlow::Node nodeTo) {
   // TODO: once we have proper flow-summary modeling, we might not need this step any
   // longer -- but there needs to be a matching read-step for the store-step, and we
   // don't provide that right now.
-  DataFlowPrivate::comprehensionStoreStep(nodeFrom, _, nodeTo)
+  DataFlowPrivate::yieldStoreStep(nodeFrom, _, nodeTo)
 }
 
 /**

From a22ea6c1c8809b09e60108570ba3f18568748600 Mon Sep 17 00:00:00 2001
From: Rasmus Lerchedahl Petersen <yoff@github.com>
Date: Mon, 30 Sep 2024 14:22:17 +0200
Subject: [PATCH 047/347] Python: use known sanitiser - also adjust test
 expectations in experimental

---
 .../query-tests/Security/CWE-022-TarSlip/TarSlip.expected      | 3 +++
 python/ql/test/query-tests/Security/CWE-022-TarSlip/tarslip.py | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/python/ql/test/experimental/query-tests/Security/CWE-022-TarSlip/TarSlip.expected b/python/ql/test/experimental/query-tests/Security/CWE-022-TarSlip/TarSlip.expected
index 664807d623d5..97527c300db5 100644
--- a/python/ql/test/experimental/query-tests/Security/CWE-022-TarSlip/TarSlip.expected
+++ b/python/ql/test/experimental/query-tests/Security/CWE-022-TarSlip/TarSlip.expected
@@ -34,7 +34,9 @@ edges
 | TarSlipImprov.py:142:9:142:13 | ControlFlowNode for entry | TarSlipImprov.py:143:36:143:40 | ControlFlowNode for entry | provenance |  |
 | TarSlipImprov.py:151:14:151:50 | ControlFlowNode for closing() | TarSlipImprov.py:151:55:151:56 | ControlFlowNode for tf | provenance |  |
 | TarSlipImprov.py:151:22:151:49 | ControlFlowNode for Attribute() | TarSlipImprov.py:151:14:151:50 | ControlFlowNode for closing() | provenance | Config |
+| TarSlipImprov.py:151:55:151:56 | ControlFlowNode for tf | TarSlipImprov.py:152:13:152:20 | ControlFlowNode for Yield | provenance |  |
 | TarSlipImprov.py:151:55:151:56 | ControlFlowNode for tf | TarSlipImprov.py:152:19:152:20 | ControlFlowNode for tf | provenance |  |
+| TarSlipImprov.py:152:13:152:20 | ControlFlowNode for Yield | TarSlipImprov.py:157:18:157:40 | ControlFlowNode for py2_tarxz() | provenance |  |
 | TarSlipImprov.py:152:19:152:20 | ControlFlowNode for tf | TarSlipImprov.py:157:18:157:40 | ControlFlowNode for py2_tarxz() | provenance |  |
 | TarSlipImprov.py:157:9:157:14 | ControlFlowNode for tar_cm | TarSlipImprov.py:162:20:162:23 | ControlFlowNode for tarc | provenance |  |
 | TarSlipImprov.py:157:18:157:40 | ControlFlowNode for py2_tarxz() | TarSlipImprov.py:157:9:157:14 | ControlFlowNode for tar_cm | provenance |  |
@@ -131,6 +133,7 @@ nodes
 | TarSlipImprov.py:151:14:151:50 | ControlFlowNode for closing() | semmle.label | ControlFlowNode for closing() |
 | TarSlipImprov.py:151:22:151:49 | ControlFlowNode for Attribute() | semmle.label | ControlFlowNode for Attribute() |
 | TarSlipImprov.py:151:55:151:56 | ControlFlowNode for tf | semmle.label | ControlFlowNode for tf |
+| TarSlipImprov.py:152:13:152:20 | ControlFlowNode for Yield | semmle.label | ControlFlowNode for Yield |
 | TarSlipImprov.py:152:19:152:20 | ControlFlowNode for tf | semmle.label | ControlFlowNode for tf |
 | TarSlipImprov.py:157:9:157:14 | ControlFlowNode for tar_cm | semmle.label | ControlFlowNode for tar_cm |
 | TarSlipImprov.py:157:18:157:40 | ControlFlowNode for py2_tarxz() | semmle.label | ControlFlowNode for py2_tarxz() |
diff --git a/python/ql/test/query-tests/Security/CWE-022-TarSlip/tarslip.py b/python/ql/test/query-tests/Security/CWE-022-TarSlip/tarslip.py
index b9ca0e8e9440..2c06d01adfd5 100644
--- a/python/ql/test/query-tests/Security/CWE-022-TarSlip/tarslip.py
+++ b/python/ql/test/query-tests/Security/CWE-022-TarSlip/tarslip.py
@@ -46,7 +46,7 @@
 #Sanitize members
 def safemembers(members):
     for info in members:
-        if badpath(info):
+        if os.path.isabs(info.name) or ".." in info.name:
             raise
         yield info
 

From 0459d136d3d9c24b2b7a04f866d27b9f696e02fe Mon Sep 17 00:00:00 2001
From: Anders Schack-Mulligen <aschackmull@github.com>
Date: Mon, 30 Sep 2024 13:21:14 +0200
Subject: [PATCH 048/347] Java: Remove neutral model for Object.toString.

---
 java/ql/lib/ext/java.lang.model.yml                 | 1 -
 java/ql/test/ext/TopJdkApis/TopJdkApisTest.expected | 1 +
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/java/ql/lib/ext/java.lang.model.yml b/java/ql/lib/ext/java.lang.model.yml
index c0c0905a7a43..6fc2b8487980 100644
--- a/java/ql/lib/ext/java.lang.model.yml
+++ b/java/ql/lib/ext/java.lang.model.yml
@@ -207,7 +207,6 @@ extensions:
       - ["java.lang", "Object", "equals", "(Object)", "summary", "manual"]
       - ["java.lang", "Object", "getClass", "()", "summary", "manual"]
       - ["java.lang", "Object", "hashCode", "()", "summary", "manual"]
-      - ["java.lang", "Object", "toString", "()", "summary", "manual"]
       - ["java.lang", "Runtime", "getRuntime", "()", "summary", "manual"]
       - ["java.lang", "String", "compareTo", "(String)", "summary", "manual"]
       - ["java.lang", "String", "contains", "(CharSequence)", "summary", "manual"]
diff --git a/java/ql/test/ext/TopJdkApis/TopJdkApisTest.expected b/java/ql/test/ext/TopJdkApis/TopJdkApisTest.expected
index f289ad7feb7b..b5e3960f1b4d 100644
--- a/java/ql/test/ext/TopJdkApis/TopJdkApisTest.expected
+++ b/java/ql/test/ext/TopJdkApis/TopJdkApisTest.expected
@@ -1,3 +1,4 @@
+| java.lang.Object#toString() | no manual model |
 | java.lang.Runnable#run() | no manual model |
 | java.util.Comparator#comparing(Function) | no manual model |
 | java.util.function.BiConsumer#accept(Object,Object) | no manual model |

From a8f55d93cbdd2382fcdc3ef1c314f3d71570dad9 Mon Sep 17 00:00:00 2001
From: Anders Schack-Mulligen <aschackmull@github.com>
Date: Mon, 30 Sep 2024 15:23:27 +0200
Subject: [PATCH 049/347] C#: Add overrides to the interpretation of neutral
 MaD models.

---
 .../lib/semmle/code/csharp/dataflow/internal/ExternalFlow.qll | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/csharp/ql/lib/semmle/code/csharp/dataflow/internal/ExternalFlow.qll b/csharp/ql/lib/semmle/code/csharp/dataflow/internal/ExternalFlow.qll
index 4ac73cae9e9f..ccc0a333b9e7 100644
--- a/csharp/ql/lib/semmle/code/csharp/dataflow/internal/ExternalFlow.qll
+++ b/csharp/ql/lib/semmle/code/csharp/dataflow/internal/ExternalFlow.qll
@@ -318,7 +318,7 @@ private predicate elementSpec(
   or
   summaryModel(namespace, type, subtypes, name, signature, ext, _, _, _, _, _)
   or
-  neutralModel(namespace, type, name, signature, _, _) and ext = "" and subtypes = false
+  neutralModel(namespace, type, name, signature, _, _) and ext = "" and subtypes = true
 }
 
 private predicate elementSpec(
@@ -602,7 +602,7 @@ private predicate interpretSummary(
 predicate interpretNeutral(UnboundCallable c, string kind, string provenance) {
   exists(string namespace, string type, string name, string signature |
     neutralModel(namespace, type, name, signature, kind, provenance) and
-    c = interpretElement(namespace, type, false, name, signature, "")
+    c = interpretElement(namespace, type, true, name, signature, "")
   )
 }
 

From 438e6641167180e69b12833019c2adf3812a812e Mon Sep 17 00:00:00 2001
From: Rasmus Lerchedahl Petersen <yoff@github.com>
Date: Mon, 30 Sep 2024 15:43:19 +0200
Subject: [PATCH 050/347] Python: add missing qldoc More doc is needed, but
 this should turn the tests green

---
 .../lib/semmle/python/dataflow/new/internal/DataFlowPublic.qll  | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/python/ql/lib/semmle/python/dataflow/new/internal/DataFlowPublic.qll b/python/ql/lib/semmle/python/dataflow/new/internal/DataFlowPublic.qll
index b8ce9634cf33..085eed843eff 100644
--- a/python/ql/lib/semmle/python/dataflow/new/internal/DataFlowPublic.qll
+++ b/python/ql/lib/semmle/python/dataflow/new/internal/DataFlowPublic.qll
@@ -129,9 +129,11 @@ newtype TNode =
     f = any(VariableCapture::CapturedVariable v).getACapturingScope() and
     exists(TFunction(f))
   } or
+  /** A synthetic node representing the values of variables captured by a comprehension. */
   TSynthCompCapturedVariablesArgumentNode(Comp comp) {
     comp.getFunction() = any(VariableCapture::CapturedVariable v).getACapturingScope()
   } or
+  /** A synthetic node representing the values of variables captured by a comprehension after the output has been computed. */
   TSynthCompCapturedVariablesArgumentPostUpdateNode(Comp comp) {
     comp.getFunction() = any(VariableCapture::CapturedVariable v).getACapturingScope()
   } or

From dacc0ab8fe64b190ae3f11e664aeabb648ec4020 Mon Sep 17 00:00:00 2001
From: Rasmus Lerchedahl Petersen <yoff@github.com>
Date: Mon, 30 Sep 2024 16:06:30 +0200
Subject: [PATCH 051/347] Python: docs and a simplification

---
 .../new/internal/DataFlowDispatch.qll         | 37 +++++++------------
 .../dataflow/new/internal/DataFlowPrivate.qll | 10 +++++
 2 files changed, 24 insertions(+), 23 deletions(-)

diff --git a/python/ql/lib/semmle/python/dataflow/new/internal/DataFlowDispatch.qll b/python/ql/lib/semmle/python/dataflow/new/internal/DataFlowDispatch.qll
index aaea0d277233..b1db806d343e 100644
--- a/python/ql/lib/semmle/python/dataflow/new/internal/DataFlowDispatch.qll
+++ b/python/ql/lib/semmle/python/dataflow/new/internal/DataFlowDispatch.qll
@@ -318,14 +318,10 @@ newtype TDataFlowCallable =
    * class instantiations, and (in the future) special methods.
    */
   TFunction(Function func) {
-    // For generators/list-comprehensions we create a synthetic function. In the
-    // points-to call-graph these were not considered callable, and instead we added
-    // data-flow steps (read/write) for these. As an easy solution for now, we do the
-    // same to keep things easy to reason about (and therefore exclude things that do
-    // not have a definition)
+    // Functions with an explicit definition
     exists(func.getDefinition())
     or
-    // ...scratch that, variable capture requires a callable
+    // For generators/list-comprehensions we create a synthetic function.
     exists(Comp c | c.getFunction() = func)
   } or
   /** see QLDoc for `DataFlowModuleScope` for why we need this. */
@@ -1389,6 +1385,7 @@ private predicate sameEnclosingCallable(Node node1, Node node2) {
 // =============================================================================
 newtype TDataFlowCall =
   TNormalCall(CallNode call, Function target, CallType type) { resolveCall(call, target, type) } or
+  /** A call to the generated function inside a comprhension */
   TComprehensionCall(Comp c) or
   TPotentialLibraryCall(CallNode call) or
   /** A synthesized call inside a summarized callable */
@@ -1476,6 +1473,7 @@ class NormalCall extends ExtractedDataFlowCall, TNormalCall {
   CallType getCallType() { result = type }
 }
 
+/** A call to the generated function inside a comprhension */
 class ComprehensionCall extends ExtractedDataFlowCall, TComprehensionCall {
   Comp c;
   Function target;
@@ -1733,23 +1731,10 @@ class CapturedVariablesArgumentNode extends CfgNode, ArgumentNode {
   }
 }
 
-class ComprehensionCapturedVariablesArgumentNode extends Node, ArgumentNode {
-  Comp comp;
-
-  ComprehensionCapturedVariablesArgumentNode() {
-    this = TSynthCompCapturedVariablesArgumentNode(comp) and
-    exists(Function target | target = comp.getFunction() |
-      target = any(VariableCapture::CapturedVariable v).getACapturingScope()
-    )
-  }
-
-  override predicate argumentOf(DataFlowCall call, ArgumentPosition pos) {
-    call.(ComprehensionCall).getComprehension() = comp and
-    pos.isLambdaSelf()
-  }
-}
-
-class SynthCompCapturedVariablesArgumentNode extends Node, TSynthCompCapturedVariablesArgumentNode {
+/** A synthetic node representing the values of variables captured by a comprehension. */
+class SynthCompCapturedVariablesArgumentNode extends Node, TSynthCompCapturedVariablesArgumentNode,
+  ArgumentNode
+{
   Comp comp;
 
   SynthCompCapturedVariablesArgumentNode() { this = TSynthCompCapturedVariablesArgumentNode(comp) }
@@ -1761,8 +1746,14 @@ class SynthCompCapturedVariablesArgumentNode extends Node, TSynthCompCapturedVar
   override Location getLocation() { result = comp.getLocation() }
 
   Comp getComprehension() { result = comp }
+
+  override predicate argumentOf(DataFlowCall call, ArgumentPosition pos) {
+    call.(ComprehensionCall).getComprehension() = comp and
+    pos.isLambdaSelf()
+  }
 }
 
+/** A synthetic node representing the values of variables captured by a comprehension after the output has been computed. */
 class SynthCompCapturedVariablesArgumentPostUpdateNode extends PostUpdateNodeImpl,
   TSynthCompCapturedVariablesArgumentPostUpdateNode
 {
diff --git a/python/ql/lib/semmle/python/dataflow/new/internal/DataFlowPrivate.qll b/python/ql/lib/semmle/python/dataflow/new/internal/DataFlowPrivate.qll
index e70a1fb8b2db..5b2457cd762e 100644
--- a/python/ql/lib/semmle/python/dataflow/new/internal/DataFlowPrivate.qll
+++ b/python/ql/lib/semmle/python/dataflow/new/internal/DataFlowPrivate.qll
@@ -168,6 +168,16 @@ private predicate synthDictSplatArgumentNodeStoreStep(
   )
 }
 
+/**
+ * Holds if `nodeFrom` is the value yielded by the `yield` found at `nodeTo`.
+ *
+ * For example, in
+ * ```python
+ * for x in l:
+ *   yield x.name
+ * ```
+ * data from `x.name` is stored into the `yield` (and can subsequently be read out of the iterable).
+ */
 predicate yieldStoreStep(Node nodeFrom, Content c, Node nodeTo) {
   exists(Yield yield, Function func |
     nodeTo.asCfgNode() = yield.getAFlowNode() and

From 5c4b4d644a569f0d6c580d6a8ee22fbd7cec10c5 Mon Sep 17 00:00:00 2001
From: Anders Schack-Mulligen <aschackmull@github.com>
Date: Mon, 30 Sep 2024 16:27:50 +0200
Subject: [PATCH 052/347] C#: Accept test changes.

---
 .../dataflow/library/FlowSummaries.expected   | 1198 +++++++++++++++++
 1 file changed, 1198 insertions(+)

diff --git a/csharp/ql/test/library-tests/dataflow/library/FlowSummaries.expected b/csharp/ql/test/library-tests/dataflow/library/FlowSummaries.expected
index 1e30cae7031f..ccb38ae35f96 100644
--- a/csharp/ql/test/library-tests/dataflow/library/FlowSummaries.expected
+++ b/csharp/ql/test/library-tests/dataflow/library/FlowSummaries.expected
@@ -21187,6 +21187,233 @@ summary
 | System;WeakReference<T>;GetObjectData;(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext);Argument[this];Argument[0];taint;df-generated |
 | System;WeakReference<T>;TryGetTarget;(T);Argument[this];ReturnValue;taint;df-generated |
 neutral
+| Dapper;SqlMapper+GridReader;Dispose;();summary;df-generated |
+| Dapper;SqlMapper+Identity;Equals;(Dapper.SqlMapper+Identity);summary;df-generated |
+| Funq;Container;Dispose;();summary;df-generated |
+| Microsoft.AspNetCore.Authentication.Cookies;PostConfigureCookieAuthenticationOptions;PostConfigure;(System.String,Microsoft.AspNetCore.Authentication.Cookies.CookieAuthenticationOptions);summary;df-generated |
+| Microsoft.AspNetCore.Authentication.OAuth;OAuthTokenResponse;Dispose;();summary;df-generated |
+| Microsoft.AspNetCore.Builder;ConfigureHostBuilder;Build;();summary;df-generated |
+| Microsoft.AspNetCore.Builder;ConfigureHostBuilder;get_Properties;();summary;df-generated |
+| Microsoft.AspNetCore.Builder;WebApplication;Dispose;();summary;df-generated |
+| Microsoft.AspNetCore.Builder;WebApplication;StartAsync;(System.Threading.CancellationToken);summary;df-generated |
+| Microsoft.AspNetCore.Builder;WebApplication;StopAsync;(System.Threading.CancellationToken);summary;df-generated |
+| Microsoft.AspNetCore.Builder;WebApplication;get_Services;();summary;df-generated |
+| Microsoft.AspNetCore.Components.Authorization;CascadingAuthenticationState;Dispose;();summary;df-generated |
+| Microsoft.AspNetCore.Components.Forms;DataAnnotationsValidator;Dispose;();summary;df-generated |
+| Microsoft.AspNetCore.Components.Forms;FieldIdentifier;Equals;(Microsoft.AspNetCore.Components.Forms.FieldIdentifier);summary;df-generated |
+| Microsoft.AspNetCore.Components.Forms;InputBase<TValue>;Dispose;();summary;df-generated |
+| Microsoft.AspNetCore.Components.Forms;InputFile;Dispose;();summary;df-generated |
+| Microsoft.AspNetCore.Components.Forms;ValidationMessage<TValue>;Dispose;();summary;df-generated |
+| Microsoft.AspNetCore.Components.Forms;ValidationSummary;Dispose;();summary;df-generated |
+| Microsoft.AspNetCore.Components.RenderTree;Renderer;Dispose;();summary;df-generated |
+| Microsoft.AspNetCore.Components.Rendering;RenderTreeBuilder;Dispose;();summary;df-generated |
+| Microsoft.AspNetCore.Components.Routing;NavLink;Dispose;();summary;df-generated |
+| Microsoft.AspNetCore.Components.Routing;Router;Dispose;();summary;df-generated |
+| Microsoft.AspNetCore.Components.Sections;SectionContent;Dispose;();summary;df-generated |
+| Microsoft.AspNetCore.Components.Sections;SectionOutlet;Dispose;();summary;df-generated |
+| Microsoft.AspNetCore.Components.Server;RevalidatingServerAuthenticationStateProvider;Dispose;();summary;df-generated |
+| Microsoft.AspNetCore.Components.Web;HtmlRenderer;Dispose;();summary;df-generated |
+| Microsoft.AspNetCore.Components;OwningComponentBase;Dispose;();summary;df-generated |
+| Microsoft.AspNetCore.Components;PersistingComponentStateSubscription;Dispose;();summary;df-generated |
+| Microsoft.AspNetCore.Connections;ConnectionItems;Contains;(System.Collections.Generic.KeyValuePair<System.Object,System.Object>);summary;df-generated |
+| Microsoft.AspNetCore.Connections;ConnectionItems;ContainsKey;(System.Object);summary;df-generated |
+| Microsoft.AspNetCore.Connections;ConnectionItems;Remove;(System.Collections.Generic.KeyValuePair<System.Object,System.Object>);summary;df-generated |
+| Microsoft.AspNetCore.Connections;ConnectionItems;Remove;(System.Object);summary;df-generated |
+| Microsoft.AspNetCore.Connections;ConnectionItems;TryGetValue;(System.Object,System.Object);summary;df-generated |
+| Microsoft.AspNetCore.Connections;ConnectionItems;get_Count;();summary;df-generated |
+| Microsoft.AspNetCore.Connections;ConnectionItems;get_IsReadOnly;();summary;df-generated |
+| Microsoft.AspNetCore.DataProtection;Secret;Dispose;();summary;df-generated |
+| Microsoft.AspNetCore.Http.Connections;ConnectionOptionsSetup;Configure;(Microsoft.AspNetCore.Http.Connections.ConnectionOptions);summary;df-generated |
+| Microsoft.AspNetCore.Http.Features;RequestServicesFeature;Dispose;();summary;df-generated |
+| Microsoft.AspNetCore.Http;EndpointMetadataCollection+Enumerator;Dispose;();summary;df-generated |
+| Microsoft.AspNetCore.Http;EndpointMetadataCollection+Enumerator;MoveNext;();summary;df-generated |
+| Microsoft.AspNetCore.Http;EndpointMetadataCollection+Enumerator;Reset;();summary;df-generated |
+| Microsoft.AspNetCore.Http;EndpointMetadataCollection+Enumerator;get_Current;();summary;df-generated |
+| Microsoft.AspNetCore.Http;EndpointMetadataCollection;get_Count;();summary;df-generated |
+| Microsoft.AspNetCore.Http;EndpointMetadataCollection;get_Item;(System.Int32);summary;df-generated |
+| Microsoft.AspNetCore.Http;FormCollection+Enumerator;Dispose;();summary;df-generated |
+| Microsoft.AspNetCore.Http;FormCollection+Enumerator;MoveNext;();summary;df-generated |
+| Microsoft.AspNetCore.Http;FormCollection+Enumerator;Reset;();summary;df-generated |
+| Microsoft.AspNetCore.Http;FormCollection+Enumerator;get_Current;();summary;df-generated |
+| Microsoft.AspNetCore.Http;FragmentString;Equals;(Microsoft.AspNetCore.Http.FragmentString);summary;df-generated |
+| Microsoft.AspNetCore.Http;HeaderDictionary+Enumerator;Dispose;();summary;df-generated |
+| Microsoft.AspNetCore.Http;HeaderDictionary+Enumerator;MoveNext;();summary;df-generated |
+| Microsoft.AspNetCore.Http;HeaderDictionary+Enumerator;Reset;();summary;df-generated |
+| Microsoft.AspNetCore.Http;HeaderDictionary+Enumerator;get_Current;();summary;df-generated |
+| Microsoft.AspNetCore.Http;HeaderDictionary;Contains;(System.Collections.Generic.KeyValuePair<System.String,Microsoft.Extensions.Primitives.StringValues>);summary;df-generated |
+| Microsoft.AspNetCore.Http;HeaderDictionary;ContainsKey;(System.String);summary;df-generated |
+| Microsoft.AspNetCore.Http;HeaderDictionary;Remove;(System.Collections.Generic.KeyValuePair<System.String,Microsoft.Extensions.Primitives.StringValues>);summary;df-generated |
+| Microsoft.AspNetCore.Http;HeaderDictionary;Remove;(System.String);summary;df-generated |
+| Microsoft.AspNetCore.Http;HeaderDictionary;TryGetValue;(System.String,Microsoft.Extensions.Primitives.StringValues);summary;df-generated |
+| Microsoft.AspNetCore.Http;HeaderDictionary;get_Count;();summary;df-generated |
+| Microsoft.AspNetCore.Http;HeaderDictionary;get_IsReadOnly;();summary;df-generated |
+| Microsoft.AspNetCore.Http;HostString;Equals;(Microsoft.AspNetCore.Http.HostString);summary;df-generated |
+| Microsoft.AspNetCore.Http;PathString;Equals;(Microsoft.AspNetCore.Http.PathString);summary;df-generated |
+| Microsoft.AspNetCore.Http;QueryCollection+Enumerator;Dispose;();summary;df-generated |
+| Microsoft.AspNetCore.Http;QueryCollection+Enumerator;MoveNext;();summary;df-generated |
+| Microsoft.AspNetCore.Http;QueryCollection+Enumerator;Reset;();summary;df-generated |
+| Microsoft.AspNetCore.Http;QueryCollection+Enumerator;get_Current;();summary;df-generated |
+| Microsoft.AspNetCore.Http;QueryString;Equals;(Microsoft.AspNetCore.Http.QueryString);summary;df-generated |
+| Microsoft.AspNetCore.Identity;RoleManager<TRole>;Dispose;();summary;df-generated |
+| Microsoft.AspNetCore.Identity;RoleStoreBase<TRole,TKey,TUserRole,TRoleClaim>;Dispose;();summary;df-generated |
+| Microsoft.AspNetCore.Identity;UserManager<TUser>;Dispose;();summary;df-generated |
+| Microsoft.AspNetCore.Identity;UserStoreBase<TUser,TKey,TUserClaim,TUserLogin,TUserToken>;Dispose;();summary;df-generated |
+| Microsoft.AspNetCore.Mvc.Diagnostics;EventData+Enumerator;Dispose;();summary;df-generated |
+| Microsoft.AspNetCore.Mvc.Diagnostics;EventData+Enumerator;MoveNext;();summary;df-generated |
+| Microsoft.AspNetCore.Mvc.Diagnostics;EventData+Enumerator;Reset;();summary;df-generated |
+| Microsoft.AspNetCore.Mvc.Diagnostics;EventData+Enumerator;get_Current;();summary;df-generated |
+| Microsoft.AspNetCore.Mvc.Diagnostics;EventData;get_Count;();summary;df-generated |
+| Microsoft.AspNetCore.Mvc.Diagnostics;EventData;get_Item;(System.Int32);summary;df-generated |
+| Microsoft.AspNetCore.Mvc.Formatters.Xml;DelegatingEnumerator<TWrapped,TDeclared>;Dispose;();summary;df-generated |
+| Microsoft.AspNetCore.Mvc.Formatters.Xml;DelegatingEnumerator<TWrapped,TDeclared>;MoveNext;();summary;df-generated |
+| Microsoft.AspNetCore.Mvc.Formatters.Xml;DelegatingEnumerator<TWrapped,TDeclared>;Reset;();summary;df-generated |
+| Microsoft.AspNetCore.Mvc.Formatters.Xml;DelegatingEnumerator<TWrapped,TDeclared>;get_Current;();summary;df-generated |
+| Microsoft.AspNetCore.Mvc.Formatters.Xml;ProblemDetailsWrapper;GetSchema;();summary;df-generated |
+| Microsoft.AspNetCore.Mvc.Formatters.Xml;SerializableErrorWrapper;GetSchema;();summary;df-generated |
+| Microsoft.AspNetCore.Mvc.Infrastructure;ConfigureCompatibilityOptions<TOptions>;PostConfigure;(System.String,TOptions);summary;df-generated |
+| Microsoft.AspNetCore.Mvc.ModelBinding.Metadata;ModelMetadataIdentity;Equals;(Microsoft.AspNetCore.Mvc.ModelBinding.Metadata.ModelMetadataIdentity);summary;df-generated |
+| Microsoft.AspNetCore.Mvc.ModelBinding.Validation;ValidationStateDictionary;Contains;(System.Collections.Generic.KeyValuePair<System.Object,Microsoft.AspNetCore.Mvc.ModelBinding.Validation.ValidationStateEntry>);summary;df-generated |
+| Microsoft.AspNetCore.Mvc.ModelBinding.Validation;ValidationStateDictionary;ContainsKey;(System.Object);summary;df-generated |
+| Microsoft.AspNetCore.Mvc.ModelBinding.Validation;ValidationStateDictionary;Remove;(System.Collections.Generic.KeyValuePair<System.Object,Microsoft.AspNetCore.Mvc.ModelBinding.Validation.ValidationStateEntry>);summary;df-generated |
+| Microsoft.AspNetCore.Mvc.ModelBinding.Validation;ValidationStateDictionary;Remove;(System.Object);summary;df-generated |
+| Microsoft.AspNetCore.Mvc.ModelBinding.Validation;ValidationStateDictionary;TryGetValue;(System.Object,Microsoft.AspNetCore.Mvc.ModelBinding.Validation.ValidationStateEntry);summary;df-generated |
+| Microsoft.AspNetCore.Mvc.ModelBinding.Validation;ValidationStateDictionary;get_Count;();summary;df-generated |
+| Microsoft.AspNetCore.Mvc.ModelBinding.Validation;ValidationStateDictionary;get_IsReadOnly;();summary;df-generated |
+| Microsoft.AspNetCore.Mvc.ModelBinding.Validation;ValidationStateDictionary;get_Item;(System.Object);summary;df-generated |
+| Microsoft.AspNetCore.Mvc.ModelBinding.Validation;ValidationStateDictionary;get_Keys;();summary;df-generated |
+| Microsoft.AspNetCore.Mvc.ModelBinding.Validation;ValidationStateDictionary;get_Values;();summary;df-generated |
+| Microsoft.AspNetCore.Mvc.ModelBinding.Validation;ValidationVisitor+StateManager;Dispose;();summary;df-generated |
+| Microsoft.AspNetCore.Mvc.ModelBinding;BindingSource;Equals;(Microsoft.AspNetCore.Mvc.ModelBinding.BindingSource);summary;df-generated |
+| Microsoft.AspNetCore.Mvc.ModelBinding;ModelBindingContext+NestedScope;Dispose;();summary;df-generated |
+| Microsoft.AspNetCore.Mvc.ModelBinding;ModelBindingResult;Equals;(Microsoft.AspNetCore.Mvc.ModelBinding.ModelBindingResult);summary;df-generated |
+| Microsoft.AspNetCore.Mvc.ModelBinding;ModelMetadata;Equals;(Microsoft.AspNetCore.Mvc.ModelBinding.ModelMetadata);summary;df-generated |
+| Microsoft.AspNetCore.Mvc.ModelBinding;ModelStateDictionary+Enumerator;Dispose;();summary;df-generated |
+| Microsoft.AspNetCore.Mvc.ModelBinding;ModelStateDictionary+Enumerator;MoveNext;();summary;df-generated |
+| Microsoft.AspNetCore.Mvc.ModelBinding;ModelStateDictionary+Enumerator;Reset;();summary;df-generated |
+| Microsoft.AspNetCore.Mvc.ModelBinding;ModelStateDictionary+Enumerator;get_Current;();summary;df-generated |
+| Microsoft.AspNetCore.Mvc.ModelBinding;ModelStateDictionary+KeyEnumerator;Dispose;();summary;df-generated |
+| Microsoft.AspNetCore.Mvc.ModelBinding;ModelStateDictionary+KeyEnumerator;MoveNext;();summary;df-generated |
+| Microsoft.AspNetCore.Mvc.ModelBinding;ModelStateDictionary+KeyEnumerator;Reset;();summary;df-generated |
+| Microsoft.AspNetCore.Mvc.ModelBinding;ModelStateDictionary+KeyEnumerator;get_Current;();summary;df-generated |
+| Microsoft.AspNetCore.Mvc.ModelBinding;ModelStateDictionary+ValueEnumerator;Dispose;();summary;df-generated |
+| Microsoft.AspNetCore.Mvc.ModelBinding;ModelStateDictionary+ValueEnumerator;MoveNext;();summary;df-generated |
+| Microsoft.AspNetCore.Mvc.ModelBinding;ModelStateDictionary+ValueEnumerator;Reset;();summary;df-generated |
+| Microsoft.AspNetCore.Mvc.ModelBinding;ModelStateDictionary+ValueEnumerator;get_Current;();summary;df-generated |
+| Microsoft.AspNetCore.Mvc.ModelBinding;ModelStateDictionary;ContainsKey;(System.String);summary;df-generated |
+| Microsoft.AspNetCore.Mvc.ModelBinding;ModelStateDictionary;TryGetValue;(System.String,Microsoft.AspNetCore.Mvc.ModelBinding.ModelStateEntry);summary;df-generated |
+| Microsoft.AspNetCore.Mvc.ModelBinding;ModelStateDictionary;get_Count;();summary;df-generated |
+| Microsoft.AspNetCore.Mvc.ModelBinding;ModelStateDictionary;get_Item;(System.String);summary;df-generated |
+| Microsoft.AspNetCore.Mvc.ModelBinding;ModelStateDictionary;get_Keys;();summary;df-generated |
+| Microsoft.AspNetCore.Mvc.ModelBinding;ModelStateDictionary;get_Values;();summary;df-generated |
+| Microsoft.AspNetCore.Mvc.ModelBinding;ValueProviderResult;Equals;(Microsoft.AspNetCore.Mvc.ModelBinding.ValueProviderResult);summary;df-generated |
+| Microsoft.AspNetCore.Mvc.Rendering;MvcForm;Dispose;();summary;df-generated |
+| Microsoft.AspNetCore.Mvc.TagHelpers.Cache;CacheTagKey;Equals;(Microsoft.AspNetCore.Mvc.TagHelpers.Cache.CacheTagKey);summary;df-generated |
+| Microsoft.AspNetCore.Mvc.ViewFeatures;AttributeDictionary+Enumerator;Dispose;();summary;df-generated |
+| Microsoft.AspNetCore.Mvc.ViewFeatures;AttributeDictionary+Enumerator;MoveNext;();summary;df-generated |
+| Microsoft.AspNetCore.Mvc.ViewFeatures;AttributeDictionary+Enumerator;Reset;();summary;df-generated |
+| Microsoft.AspNetCore.Mvc.ViewFeatures;AttributeDictionary+Enumerator;get_Current;();summary;df-generated |
+| Microsoft.AspNetCore.Mvc.ViewFeatures;AttributeDictionary;Contains;(System.Collections.Generic.KeyValuePair<System.String,System.String>);summary;df-generated |
+| Microsoft.AspNetCore.Mvc.ViewFeatures;AttributeDictionary;ContainsKey;(System.String);summary;df-generated |
+| Microsoft.AspNetCore.Mvc.ViewFeatures;AttributeDictionary;Remove;(System.Collections.Generic.KeyValuePair<System.String,System.String>);summary;df-generated |
+| Microsoft.AspNetCore.Mvc.ViewFeatures;AttributeDictionary;Remove;(System.String);summary;df-generated |
+| Microsoft.AspNetCore.Mvc.ViewFeatures;AttributeDictionary;TryGetValue;(System.String,System.String);summary;df-generated |
+| Microsoft.AspNetCore.Mvc.ViewFeatures;AttributeDictionary;get_Count;();summary;df-generated |
+| Microsoft.AspNetCore.Mvc.ViewFeatures;AttributeDictionary;get_IsReadOnly;();summary;df-generated |
+| Microsoft.AspNetCore.Mvc.ViewFeatures;AttributeDictionary;get_Item;(System.String);summary;df-generated |
+| Microsoft.AspNetCore.Mvc.ViewFeatures;AttributeDictionary;get_Keys;();summary;df-generated |
+| Microsoft.AspNetCore.Mvc.ViewFeatures;AttributeDictionary;get_Values;();summary;df-generated |
+| Microsoft.AspNetCore.Mvc.ViewFeatures;TempDataDictionary;Contains;(System.Collections.Generic.KeyValuePair<System.String,System.Object>);summary;df-generated |
+| Microsoft.AspNetCore.Mvc.ViewFeatures;TempDataDictionary;ContainsKey;(System.String);summary;df-generated |
+| Microsoft.AspNetCore.Mvc.ViewFeatures;TempDataDictionary;Remove;(System.Collections.Generic.KeyValuePair<System.String,System.Object>);summary;df-generated |
+| Microsoft.AspNetCore.Mvc.ViewFeatures;TempDataDictionary;Remove;(System.String);summary;df-generated |
+| Microsoft.AspNetCore.Mvc.ViewFeatures;TempDataDictionary;TryGetValue;(System.String,System.Object);summary;df-generated |
+| Microsoft.AspNetCore.Mvc.ViewFeatures;TempDataDictionary;get_Count;();summary;df-generated |
+| Microsoft.AspNetCore.Mvc.ViewFeatures;TempDataDictionary;get_IsReadOnly;();summary;df-generated |
+| Microsoft.AspNetCore.Mvc.ViewFeatures;ViewDataDictionary;Contains;(System.Collections.Generic.KeyValuePair<System.String,System.Object>);summary;df-generated |
+| Microsoft.AspNetCore.Mvc.ViewFeatures;ViewDataDictionary;ContainsKey;(System.String);summary;df-generated |
+| Microsoft.AspNetCore.Mvc.ViewFeatures;ViewDataDictionary;Remove;(System.Collections.Generic.KeyValuePair<System.String,System.Object>);summary;df-generated |
+| Microsoft.AspNetCore.Mvc.ViewFeatures;ViewDataDictionary;Remove;(System.String);summary;df-generated |
+| Microsoft.AspNetCore.Mvc.ViewFeatures;ViewDataDictionary;TryGetValue;(System.String,System.Object);summary;df-generated |
+| Microsoft.AspNetCore.Mvc.ViewFeatures;ViewDataDictionary;get_Count;();summary;df-generated |
+| Microsoft.AspNetCore.Mvc.ViewFeatures;ViewDataDictionary;get_IsReadOnly;();summary;df-generated |
+| Microsoft.AspNetCore.Mvc;Controller;Dispose;();summary;df-generated |
+| Microsoft.AspNetCore.Mvc;RemoteAttributeBase;IsValid;(System.Object);summary;df-generated |
+| Microsoft.AspNetCore.Razor.TagHelpers;NullHtmlEncoder;FindFirstCharacterToEncode;(System.Char*,System.Int32);summary;df-generated |
+| Microsoft.AspNetCore.Razor.TagHelpers;NullHtmlEncoder;TryEncodeUnicodeScalar;(System.Int32,System.Char*,System.Int32,System.Int32);summary;df-generated |
+| Microsoft.AspNetCore.Razor.TagHelpers;NullHtmlEncoder;WillEncode;(System.Int32);summary;df-generated |
+| Microsoft.AspNetCore.Razor.TagHelpers;NullHtmlEncoder;get_MaxOutputCharactersPerInputCharacter;();summary;df-generated |
+| Microsoft.AspNetCore.Razor.TagHelpers;TagHelperAttributeList;Remove;(Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute);summary;df-generated |
+| Microsoft.AspNetCore.Razor.TagHelpers;TagHelperAttributeList;RemoveAt;(System.Int32);summary;df-generated |
+| Microsoft.AspNetCore.Razor.TagHelpers;TagHelperAttributeList;get_IsReadOnly;();summary;df-generated |
+| Microsoft.AspNetCore.ResponseCompression;BrotliCompressionProviderOptions;get_Value;();summary;df-generated |
+| Microsoft.AspNetCore.ResponseCompression;GzipCompressionProviderOptions;get_Value;();summary;df-generated |
+| Microsoft.AspNetCore.Routing.Matching;EndpointMetadataComparer;Compare;(Microsoft.AspNetCore.Http.Endpoint,Microsoft.AspNetCore.Http.Endpoint);summary;df-generated |
+| Microsoft.AspNetCore.Routing.Matching;EndpointMetadataComparer<TMetadata>;Compare;(Microsoft.AspNetCore.Http.Endpoint,Microsoft.AspNetCore.Http.Endpoint);summary;df-generated |
+| Microsoft.AspNetCore.Routing;CompositeEndpointDataSource;Dispose;();summary;df-generated |
+| Microsoft.AspNetCore.Routing;RouteValueDictionary+Enumerator;Dispose;();summary;df-generated |
+| Microsoft.AspNetCore.Routing;RouteValueDictionary+Enumerator;MoveNext;();summary;df-generated |
+| Microsoft.AspNetCore.Routing;RouteValueDictionary+Enumerator;Reset;();summary;df-generated |
+| Microsoft.AspNetCore.Routing;RouteValueDictionary+Enumerator;get_Current;();summary;df-generated |
+| Microsoft.AspNetCore.Routing;RouteValueDictionary;Contains;(System.Collections.Generic.KeyValuePair<System.String,System.Object>);summary;df-generated |
+| Microsoft.AspNetCore.Routing;RouteValueDictionary;ContainsKey;(System.String);summary;df-generated |
+| Microsoft.AspNetCore.Routing;RouteValueDictionary;Remove;(System.Collections.Generic.KeyValuePair<System.String,System.Object>);summary;df-generated |
+| Microsoft.AspNetCore.Routing;RouteValueDictionary;Remove;(System.String);summary;df-generated |
+| Microsoft.AspNetCore.Routing;RouteValueDictionary;TryGetValue;(System.String,System.Object);summary;df-generated |
+| Microsoft.AspNetCore.Routing;RouteValueDictionary;get_Count;();summary;df-generated |
+| Microsoft.AspNetCore.Routing;RouteValueDictionary;get_IsReadOnly;();summary;df-generated |
+| Microsoft.AspNetCore.Routing;RouteValueDictionary;get_Item;(System.String);summary;df-generated |
+| Microsoft.AspNetCore.Routing;RouteValueDictionary;get_Keys;();summary;df-generated |
+| Microsoft.AspNetCore.Routing;RouteValueDictionary;get_Values;();summary;df-generated |
+| Microsoft.AspNetCore.Routing;RouteValueEqualityComparer;Equals;(System.Object,System.Object);summary;df-generated |
+| Microsoft.AspNetCore.Routing;RouteValueEqualityComparer;GetHashCode;(System.Object);summary;df-generated |
+| Microsoft.AspNetCore.Server.HttpSys;DelegationRule;Dispose;();summary;df-generated |
+| Microsoft.AspNetCore.Server.HttpSys;HttpSysException;get_ErrorCode;();summary;df-generated |
+| Microsoft.AspNetCore.Server.HttpSys;UrlPrefixCollection;Contains;(Microsoft.AspNetCore.Server.HttpSys.UrlPrefix);summary;df-generated |
+| Microsoft.AspNetCore.Server.HttpSys;UrlPrefixCollection;Remove;(Microsoft.AspNetCore.Server.HttpSys.UrlPrefix);summary;df-generated |
+| Microsoft.AspNetCore.Server.HttpSys;UrlPrefixCollection;get_Count;();summary;df-generated |
+| Microsoft.AspNetCore.Server.HttpSys;UrlPrefixCollection;get_IsReadOnly;();summary;df-generated |
+| Microsoft.AspNetCore.Server.Kestrel.Core;KestrelServer;Dispose;();summary;df-generated |
+| Microsoft.AspNetCore.Server.Kestrel.Transport.Sockets;SocketConnectionContextFactory;Dispose;();summary;df-generated |
+| Microsoft.AspNetCore.SignalR;Hub;Dispose;();summary;df-generated |
+| Microsoft.AspNetCore.SignalR;HubConnectionStore+Enumerator;Dispose;();summary;df-generated |
+| Microsoft.AspNetCore.SignalR;HubConnectionStore+Enumerator;MoveNext;();summary;df-generated |
+| Microsoft.AspNetCore.SignalR;HubConnectionStore+Enumerator;Reset;();summary;df-generated |
+| Microsoft.AspNetCore.SignalR;HubConnectionStore+Enumerator;get_Current;();summary;df-generated |
+| Microsoft.AspNetCore.SignalR;HubOptionsSetup;Configure;(Microsoft.AspNetCore.SignalR.HubOptions);summary;df-generated |
+| Microsoft.AspNetCore.SignalR;HubOptionsSetup<THub>;Configure;(Microsoft.AspNetCore.SignalR.HubOptions<THub>);summary;df-generated |
+| Microsoft.AspNetCore.WebUtilities;BufferedReadStream;Dispose;(System.Boolean);summary;df-generated |
+| Microsoft.AspNetCore.WebUtilities;BufferedReadStream;Flush;();summary;df-generated |
+| Microsoft.AspNetCore.WebUtilities;BufferedReadStream;Seek;(System.Int64,System.IO.SeekOrigin);summary;df-generated |
+| Microsoft.AspNetCore.WebUtilities;BufferedReadStream;SetLength;(System.Int64);summary;df-generated |
+| Microsoft.AspNetCore.WebUtilities;BufferedReadStream;get_CanRead;();summary;df-generated |
+| Microsoft.AspNetCore.WebUtilities;BufferedReadStream;get_CanSeek;();summary;df-generated |
+| Microsoft.AspNetCore.WebUtilities;BufferedReadStream;get_CanTimeout;();summary;df-generated |
+| Microsoft.AspNetCore.WebUtilities;BufferedReadStream;get_CanWrite;();summary;df-generated |
+| Microsoft.AspNetCore.WebUtilities;BufferedReadStream;get_Length;();summary;df-generated |
+| Microsoft.AspNetCore.WebUtilities;FileBufferingReadStream;Dispose;(System.Boolean);summary;df-generated |
+| Microsoft.AspNetCore.WebUtilities;FileBufferingReadStream;Flush;();summary;df-generated |
+| Microsoft.AspNetCore.WebUtilities;FileBufferingReadStream;Seek;(System.Int64,System.IO.SeekOrigin);summary;df-generated |
+| Microsoft.AspNetCore.WebUtilities;FileBufferingReadStream;SetLength;(System.Int64);summary;df-generated |
+| Microsoft.AspNetCore.WebUtilities;FileBufferingReadStream;get_CanRead;();summary;df-generated |
+| Microsoft.AspNetCore.WebUtilities;FileBufferingReadStream;get_CanSeek;();summary;df-generated |
+| Microsoft.AspNetCore.WebUtilities;FileBufferingReadStream;get_CanWrite;();summary;df-generated |
+| Microsoft.AspNetCore.WebUtilities;FileBufferingReadStream;get_Length;();summary;df-generated |
+| Microsoft.AspNetCore.WebUtilities;FileBufferingWriteStream;Dispose;(System.Boolean);summary;df-generated |
+| Microsoft.AspNetCore.WebUtilities;FileBufferingWriteStream;Flush;();summary;df-generated |
+| Microsoft.AspNetCore.WebUtilities;FileBufferingWriteStream;Seek;(System.Int64,System.IO.SeekOrigin);summary;df-generated |
+| Microsoft.AspNetCore.WebUtilities;FileBufferingWriteStream;SetLength;(System.Int64);summary;df-generated |
+| Microsoft.AspNetCore.WebUtilities;FileBufferingWriteStream;get_CanRead;();summary;df-generated |
+| Microsoft.AspNetCore.WebUtilities;FileBufferingWriteStream;get_CanSeek;();summary;df-generated |
+| Microsoft.AspNetCore.WebUtilities;FileBufferingWriteStream;get_CanWrite;();summary;df-generated |
+| Microsoft.AspNetCore.WebUtilities;FileBufferingWriteStream;get_Length;();summary;df-generated |
+| Microsoft.AspNetCore.WebUtilities;FormReader;Dispose;();summary;df-generated |
+| Microsoft.AspNetCore.WebUtilities;HttpRequestStreamReader;Dispose;(System.Boolean);summary;df-generated |
+| Microsoft.AspNetCore.WebUtilities;HttpRequestStreamReader;Peek;();summary;df-generated |
+| Microsoft.AspNetCore.WebUtilities;HttpResponseStreamWriter;Dispose;(System.Boolean);summary;df-generated |
+| Microsoft.AspNetCore.WebUtilities;HttpResponseStreamWriter;Flush;();summary;df-generated |
+| Microsoft.AspNetCore.WebUtilities;HttpResponseStreamWriter;Write;(System.Char);summary;df-generated |
+| Microsoft.AspNetCore.WebUtilities;HttpResponseStreamWriter;Write;(System.ReadOnlySpan<System.Char>);summary;df-generated |
+| Microsoft.AspNetCore.WebUtilities;HttpResponseStreamWriter;WriteLine;(System.ReadOnlySpan<System.Char>);summary;df-generated |
 | Microsoft.CSharp.RuntimeBinder;Binder;Convert;(Microsoft.CSharp.RuntimeBinder.CSharpBinderFlags,System.Type,System.Type);summary;df-generated |
 | Microsoft.CSharp.RuntimeBinder;RuntimeBinderException;RuntimeBinderException;(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext);summary;df-generated |
 | Microsoft.CSharp.RuntimeBinder;RuntimeBinderException;RuntimeBinderException;(System.String);summary;df-generated |
@@ -21196,6 +21423,7 @@ neutral
 | Microsoft.CSharp.RuntimeBinder;RuntimeBinderInternalCompilerException;RuntimeBinderInternalCompilerException;(System.String,System.Exception);summary;df-generated |
 | Microsoft.CSharp;CSharpCodeProvider;GetConverter;(System.Type);summary;df-generated |
 | Microsoft.CSharp;CSharpCodeProvider;get_FileExtension;();summary;df-generated |
+| Microsoft.EntityFrameworkCore;DbContext;Dispose;();summary;df-generated |
 | Microsoft.Extensions.Caching.Distributed;DistributedCacheExtensions;GetString;(Microsoft.Extensions.Caching.Distributed.IDistributedCache,System.String);summary;df-generated |
 | Microsoft.Extensions.Caching.Distributed;DistributedCacheExtensions;GetStringAsync;(Microsoft.Extensions.Caching.Distributed.IDistributedCache,System.String,System.Threading.CancellationToken);summary;df-generated |
 | Microsoft.Extensions.Caching.Distributed;DistributedCacheExtensions;Set;(Microsoft.Extensions.Caching.Distributed.IDistributedCache,System.String,System.Byte[]);summary;df-generated |
@@ -21239,6 +21467,7 @@ neutral
 | Microsoft.Extensions.Caching.Memory;MemoryCache;get_Count;();summary;df-generated |
 | Microsoft.Extensions.Caching.Memory;MemoryCacheEntryOptions;get_ExpirationTokens;();summary;df-generated |
 | Microsoft.Extensions.Caching.Memory;MemoryCacheEntryOptions;get_PostEvictionCallbacks;();summary;df-generated |
+| Microsoft.Extensions.Caching.Memory;MemoryCacheOptions;get_Value;();summary;df-generated |
 | Microsoft.Extensions.Configuration.CommandLine;CommandLineConfigurationProvider;CommandLineConfigurationProvider;(System.Collections.Generic.IEnumerable<System.String>,System.Collections.Generic.IDictionary<System.String,System.String>);summary;df-generated |
 | Microsoft.Extensions.Configuration.CommandLine;CommandLineConfigurationProvider;Load;();summary;df-generated |
 | Microsoft.Extensions.Configuration.EnvironmentVariables;EnvironmentVariablesConfigurationProvider;Load;();summary;df-generated |
@@ -21251,6 +21480,8 @@ neutral
 | Microsoft.Extensions.Configuration.Json;JsonConfigurationProvider;Load;(System.IO.Stream);summary;df-generated |
 | Microsoft.Extensions.Configuration.Json;JsonStreamConfigurationProvider;JsonStreamConfigurationProvider;(Microsoft.Extensions.Configuration.Json.JsonStreamConfigurationSource);summary;df-generated |
 | Microsoft.Extensions.Configuration.Json;JsonStreamConfigurationProvider;Load;(System.IO.Stream);summary;df-generated |
+| Microsoft.Extensions.Configuration.KeyPerFile;KeyPerFileConfigurationProvider;Dispose;();summary;df-generated |
+| Microsoft.Extensions.Configuration.KeyPerFile;KeyPerFileConfigurationProvider;Load;();summary;df-generated |
 | Microsoft.Extensions.Configuration.Memory;MemoryConfigurationProvider;Add;(System.String,System.String);summary;df-generated |
 | Microsoft.Extensions.Configuration.UserSecrets;UserSecretsIdAttribute;UserSecretsIdAttribute;(System.String);summary;df-generated |
 | Microsoft.Extensions.Configuration.UserSecrets;UserSecretsIdAttribute;get_UserSecretsId;();summary;df-generated |
@@ -21283,6 +21514,7 @@ neutral
 | Microsoft.Extensions.Configuration;ConfigurationProvider;OnReload;();summary;df-generated |
 | Microsoft.Extensions.Configuration;ConfigurationProvider;Set;(System.String,System.String);summary;df-generated |
 | Microsoft.Extensions.Configuration;ConfigurationReloadToken;OnReload;();summary;df-generated |
+| Microsoft.Extensions.Configuration;ConfigurationReloadToken;get_ActiveChangeCallbacks;();summary;df-generated |
 | Microsoft.Extensions.Configuration;ConfigurationReloadToken;get_HasChanged;();summary;df-generated |
 | Microsoft.Extensions.Configuration;ConfigurationRoot;Dispose;();summary;df-generated |
 | Microsoft.Extensions.Configuration;ConfigurationRoot;GetChildren;();summary;df-generated |
@@ -21339,6 +21571,7 @@ neutral
 | Microsoft.Extensions.DependencyInjection;ActivatorUtilities;CreateInstance;(System.IServiceProvider,System.Type,System.Object[]);summary;df-generated |
 | Microsoft.Extensions.DependencyInjection;ActivatorUtilities;CreateInstance<T>;(System.IServiceProvider,System.Object[]);summary;df-generated |
 | Microsoft.Extensions.DependencyInjection;AsyncServiceScope;Dispose;();summary;df-generated |
+| Microsoft.Extensions.DependencyInjection;DefaultServiceProviderFactory;CreateBuilder;(Microsoft.Extensions.DependencyInjection.IServiceCollection);summary;df-generated |
 | Microsoft.Extensions.DependencyInjection;DefaultServiceProviderFactory;CreateServiceProvider;(Microsoft.Extensions.DependencyInjection.IServiceCollection);summary;df-generated |
 | Microsoft.Extensions.DependencyInjection;FromKeyedServicesAttribute;FromKeyedServicesAttribute;(System.Object);summary;df-generated |
 | Microsoft.Extensions.DependencyInjection;FromKeyedServicesAttribute;get_Key;();summary;df-generated |
@@ -21354,6 +21587,7 @@ neutral
 | Microsoft.Extensions.DependencyInjection;ISocketsHttpHandlerBuilder;get_Services;();summary;df-generated |
 | Microsoft.Extensions.DependencyInjection;ISupportRequiredService;GetRequiredService;(System.Type);summary;df-generated |
 | Microsoft.Extensions.DependencyInjection;KeyedService;get_AnyKey;();summary;df-generated |
+| Microsoft.Extensions.DependencyInjection;OAuthPostConfigureOptions<TOptions,THandler>;PostConfigure;(System.String,TOptions);summary;df-generated |
 | Microsoft.Extensions.DependencyInjection;OptionsServiceCollectionExtensions;AddOptions<TOptions>;(Microsoft.Extensions.DependencyInjection.IServiceCollection);summary;df-generated |
 | Microsoft.Extensions.DependencyInjection;OptionsServiceCollectionExtensions;AddOptions<TOptions>;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.String);summary;df-generated |
 | Microsoft.Extensions.DependencyInjection;OptionsServiceCollectionExtensions;AddOptionsWithValidateOnStart<TOptions,TValidateOptions>;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.String);summary;df-generated |
@@ -21420,6 +21654,10 @@ neutral
 | Microsoft.Extensions.Diagnostics.Metrics;InstrumentRule;get_Scopes;();summary;df-generated |
 | Microsoft.Extensions.Diagnostics.Metrics;MetricsOptions;get_Rules;();summary;df-generated |
 | Microsoft.Extensions.FileProviders.Composite;CompositeDirectoryContents;get_Exists;();summary;df-generated |
+| Microsoft.Extensions.FileProviders.Embedded;EmbeddedResourceFileInfo;get_Exists;();summary;df-generated |
+| Microsoft.Extensions.FileProviders.Embedded;EmbeddedResourceFileInfo;get_IsDirectory;();summary;df-generated |
+| Microsoft.Extensions.FileProviders.Embedded;EmbeddedResourceFileInfo;get_LastModified;();summary;df-generated |
+| Microsoft.Extensions.FileProviders.Embedded;EmbeddedResourceFileInfo;get_Length;();summary;df-generated |
 | Microsoft.Extensions.FileProviders.Internal;PhysicalDirectoryContents;PhysicalDirectoryContents;(System.String);summary;df-generated |
 | Microsoft.Extensions.FileProviders.Internal;PhysicalDirectoryContents;PhysicalDirectoryContents;(System.String,Microsoft.Extensions.FileProviders.Physical.ExclusionFilters);summary;df-generated |
 | Microsoft.Extensions.FileProviders.Internal;PhysicalDirectoryContents;get_Exists;();summary;df-generated |
@@ -21435,12 +21673,16 @@ neutral
 | Microsoft.Extensions.FileProviders.Physical;PhysicalFilesWatcher;Dispose;();summary;df-generated |
 | Microsoft.Extensions.FileProviders.Physical;PhysicalFilesWatcher;Dispose;(System.Boolean);summary;df-generated |
 | Microsoft.Extensions.FileProviders.Physical;PhysicalFilesWatcher;PhysicalFilesWatcher;(System.String,System.IO.FileSystemWatcher,System.Boolean);summary;df-generated |
+| Microsoft.Extensions.FileProviders.Physical;PollingFileChangeToken;get_ActiveChangeCallbacks;();summary;df-generated |
 | Microsoft.Extensions.FileProviders.Physical;PollingFileChangeToken;get_HasChanged;();summary;df-generated |
 | Microsoft.Extensions.FileProviders.Physical;PollingWildCardChangeToken;GetLastWriteUtc;(System.String);summary;df-generated |
 | Microsoft.Extensions.FileProviders.Physical;PollingWildCardChangeToken;PollingWildCardChangeToken;(System.String,System.String);summary;df-generated |
+| Microsoft.Extensions.FileProviders.Physical;PollingWildCardChangeToken;get_ActiveChangeCallbacks;();summary;df-generated |
 | Microsoft.Extensions.FileProviders.Physical;PollingWildCardChangeToken;get_HasChanged;();summary;df-generated |
 | Microsoft.Extensions.FileProviders;CompositeFileProvider;GetFileInfo;(System.String);summary;df-generated |
 | Microsoft.Extensions.FileProviders;CompositeFileProvider;Watch;(System.String);summary;df-generated |
+| Microsoft.Extensions.FileProviders;EmbeddedFileProvider;GetFileInfo;(System.String);summary;df-generated |
+| Microsoft.Extensions.FileProviders;EmbeddedFileProvider;Watch;(System.String);summary;df-generated |
 | Microsoft.Extensions.FileProviders;IDirectoryContents;get_Exists;();summary;df-generated |
 | Microsoft.Extensions.FileProviders;IFileInfo;get_Exists;();summary;df-generated |
 | Microsoft.Extensions.FileProviders;IFileInfo;get_IsDirectory;();summary;df-generated |
@@ -21448,6 +21690,8 @@ neutral
 | Microsoft.Extensions.FileProviders;IFileInfo;get_Length;();summary;df-generated |
 | Microsoft.Extensions.FileProviders;IFileProvider;GetFileInfo;(System.String);summary;df-generated |
 | Microsoft.Extensions.FileProviders;IFileProvider;Watch;(System.String);summary;df-generated |
+| Microsoft.Extensions.FileProviders;ManifestEmbeddedFileProvider;GetFileInfo;(System.String);summary;df-generated |
+| Microsoft.Extensions.FileProviders;ManifestEmbeddedFileProvider;Watch;(System.String);summary;df-generated |
 | Microsoft.Extensions.FileProviders;NotFoundDirectoryContents;get_Exists;();summary;df-generated |
 | Microsoft.Extensions.FileProviders;NotFoundDirectoryContents;get_Singleton;();summary;df-generated |
 | Microsoft.Extensions.FileProviders;NotFoundFileInfo;NotFoundFileInfo;(System.String);summary;df-generated |
@@ -21638,12 +21882,15 @@ neutral
 | Microsoft.Extensions.Logging.Configuration;LoggerProviderOptionsChangeTokenSource<TOptions,TProvider>;LoggerProviderOptionsChangeTokenSource;(Microsoft.Extensions.Logging.Configuration.ILoggerProviderConfiguration<TProvider>);summary;df-generated |
 | Microsoft.Extensions.Logging.Configuration;LoggingBuilderConfigurationExtensions;AddConfiguration;(Microsoft.Extensions.Logging.ILoggingBuilder);summary;df-generated |
 | Microsoft.Extensions.Logging.Console;ConfigurationConsoleLoggerSettings;TryGetSwitch;(System.String,Microsoft.Extensions.Logging.LogLevel);summary;df-generated |
+| Microsoft.Extensions.Logging.Console;ConfigurationConsoleLoggerSettings;get_ChangeToken;();summary;df-generated |
 | Microsoft.Extensions.Logging.Console;ConfigurationConsoleLoggerSettings;get_IncludeScopes;();summary;df-generated |
 | Microsoft.Extensions.Logging.Console;ConsoleFormatter;ConsoleFormatter;(System.String);summary;df-generated |
 | Microsoft.Extensions.Logging.Console;ConsoleFormatter;get_Name;();summary;df-generated |
 | Microsoft.Extensions.Logging.Console;ConsoleLoggerProvider;ConsoleLoggerProvider;(Microsoft.Extensions.Options.IOptionsMonitor<Microsoft.Extensions.Logging.Console.ConsoleLoggerOptions>);summary;df-generated |
 | Microsoft.Extensions.Logging.Console;ConsoleLoggerProvider;Dispose;();summary;df-generated |
 | Microsoft.Extensions.Logging.Console;ConsoleLoggerSettings;TryGetSwitch;(System.String,Microsoft.Extensions.Logging.LogLevel);summary;df-generated |
+| Microsoft.Extensions.Logging.Console;ConsoleLoggerSettings;get_ChangeToken;();summary;df-generated |
+| Microsoft.Extensions.Logging.Console;ConsoleLoggerSettings;get_IncludeScopes;();summary;df-generated |
 | Microsoft.Extensions.Logging.Console;IConsoleLoggerSettings;TryGetSwitch;(System.String,Microsoft.Extensions.Logging.LogLevel);summary;df-generated |
 | Microsoft.Extensions.Logging.Console;IConsoleLoggerSettings;get_ChangeToken;();summary;df-generated |
 | Microsoft.Extensions.Logging.Console;IConsoleLoggerSettings;get_IncludeScopes;();summary;df-generated |
@@ -21734,6 +21981,7 @@ neutral
 | Microsoft.Extensions.Logging;ProviderAliasAttribute;ProviderAliasAttribute;(System.String);summary;df-generated |
 | Microsoft.Extensions.Logging;ProviderAliasAttribute;get_Alias;();summary;df-generated |
 | Microsoft.Extensions.Options;ConfigurationChangeTokenSource<TOptions>;ConfigurationChangeTokenSource;(Microsoft.Extensions.Configuration.IConfiguration);summary;df-generated |
+| Microsoft.Extensions.Options;ConfigurationChangeTokenSource<TOptions>;GetChangeToken;();summary;df-generated |
 | Microsoft.Extensions.Options;ConfigurationChangeTokenSource<TOptions>;get_Name;();summary;df-generated |
 | Microsoft.Extensions.Options;ConfigureFromConfigurationOptions<TOptions>;ConfigureFromConfigurationOptions;(Microsoft.Extensions.Configuration.IConfiguration);summary;df-generated |
 | Microsoft.Extensions.Options;ConfigureNamedOptions<TOptions,TDep1,TDep2,TDep3,TDep4,TDep5>;Configure;(System.String,TOptions);summary;df-generated |
@@ -21902,6 +22150,7 @@ neutral
 | Microsoft.Extensions.Options;ValidateOptionsResult;Fail;(System.String);summary;df-generated |
 | Microsoft.Extensions.Options;ValidateOptionsResultBuilder;Build;();summary;df-generated |
 | Microsoft.Extensions.Options;ValidateOptionsResultBuilder;Clear;();summary;df-generated |
+| Microsoft.Extensions.Primitives;CancellationChangeToken;get_ActiveChangeCallbacks;();summary;df-generated |
 | Microsoft.Extensions.Primitives;CancellationChangeToken;get_HasChanged;();summary;df-generated |
 | Microsoft.Extensions.Primitives;CompositeChangeToken;CompositeChangeToken;(System.Collections.Generic.IReadOnlyList<Microsoft.Extensions.Primitives.IChangeToken>);summary;df-generated |
 | Microsoft.Extensions.Primitives;CompositeChangeToken;get_ActiveChangeCallbacks;();summary;df-generated |
@@ -21957,10 +22206,22 @@ neutral
 | Microsoft.Extensions.Primitives;StringTokenizer+Enumerator;Dispose;();summary;df-generated |
 | Microsoft.Extensions.Primitives;StringTokenizer+Enumerator;MoveNext;();summary;df-generated |
 | Microsoft.Extensions.Primitives;StringTokenizer+Enumerator;Reset;();summary;df-generated |
+| Microsoft.Extensions.Primitives;StringTokenizer+Enumerator;get_Current;();summary;df-generated |
 | Microsoft.Extensions.Primitives;StringValues+Enumerator;Dispose;();summary;df-generated |
 | Microsoft.Extensions.Primitives;StringValues+Enumerator;Enumerator;(Microsoft.Extensions.Primitives.StringValues);summary;df-generated |
 | Microsoft.Extensions.Primitives;StringValues+Enumerator;MoveNext;();summary;df-generated |
 | Microsoft.Extensions.Primitives;StringValues+Enumerator;Reset;();summary;df-generated |
+| Microsoft.Extensions.Primitives;StringValues+Enumerator;get_Current;();summary;df-generated |
+| Microsoft.Extensions.Primitives;StringValues;Contains;(System.String);summary;df-generated |
+| Microsoft.Extensions.Primitives;StringValues;Equals;(Microsoft.Extensions.Primitives.StringValues);summary;df-generated |
+| Microsoft.Extensions.Primitives;StringValues;Equals;(System.String);summary;df-generated |
+| Microsoft.Extensions.Primitives;StringValues;Equals;(System.String[]);summary;df-generated |
+| Microsoft.Extensions.Primitives;StringValues;IndexOf;(System.String);summary;df-generated |
+| Microsoft.Extensions.Primitives;StringValues;Remove;(System.String);summary;df-generated |
+| Microsoft.Extensions.Primitives;StringValues;RemoveAt;(System.Int32);summary;df-generated |
+| Microsoft.Extensions.Primitives;StringValues;get_Count;();summary;df-generated |
+| Microsoft.Extensions.Primitives;StringValues;get_IsReadOnly;();summary;df-generated |
+| Microsoft.Extensions.Primitives;StringValues;get_Item;(System.Int32);summary;df-generated |
 | Microsoft.Extensions.Primitives;StringValues;op_Equality;(Microsoft.Extensions.Primitives.StringValues,Microsoft.Extensions.Primitives.StringValues);summary;df-generated |
 | Microsoft.Extensions.Primitives;StringValues;op_Equality;(Microsoft.Extensions.Primitives.StringValues,System.Object);summary;df-generated |
 | Microsoft.Extensions.Primitives;StringValues;op_Equality;(Microsoft.Extensions.Primitives.StringValues,System.String);summary;df-generated |
@@ -21975,6 +22236,44 @@ neutral
 | Microsoft.Extensions.Primitives;StringValues;op_Inequality;(System.Object,Microsoft.Extensions.Primitives.StringValues);summary;df-generated |
 | Microsoft.Extensions.Primitives;StringValues;op_Inequality;(System.String,Microsoft.Extensions.Primitives.StringValues);summary;df-generated |
 | Microsoft.Extensions.Primitives;StringValues;op_Inequality;(System.String[],Microsoft.Extensions.Primitives.StringValues);summary;df-generated |
+| Microsoft.Extensions.WebEncoders.Testing;HtmlTestEncoder;FindFirstCharacterToEncode;(System.Char*,System.Int32);summary;df-generated |
+| Microsoft.Extensions.WebEncoders.Testing;HtmlTestEncoder;TryEncodeUnicodeScalar;(System.Int32,System.Char*,System.Int32,System.Int32);summary;df-generated |
+| Microsoft.Extensions.WebEncoders.Testing;HtmlTestEncoder;WillEncode;(System.Int32);summary;df-generated |
+| Microsoft.Extensions.WebEncoders.Testing;HtmlTestEncoder;get_MaxOutputCharactersPerInputCharacter;();summary;df-generated |
+| Microsoft.Extensions.WebEncoders.Testing;JavaScriptTestEncoder;FindFirstCharacterToEncode;(System.Char*,System.Int32);summary;df-generated |
+| Microsoft.Extensions.WebEncoders.Testing;JavaScriptTestEncoder;TryEncodeUnicodeScalar;(System.Int32,System.Char*,System.Int32,System.Int32);summary;df-generated |
+| Microsoft.Extensions.WebEncoders.Testing;JavaScriptTestEncoder;WillEncode;(System.Int32);summary;df-generated |
+| Microsoft.Extensions.WebEncoders.Testing;JavaScriptTestEncoder;get_MaxOutputCharactersPerInputCharacter;();summary;df-generated |
+| Microsoft.Extensions.WebEncoders.Testing;UrlTestEncoder;FindFirstCharacterToEncode;(System.Char*,System.Int32);summary;df-generated |
+| Microsoft.Extensions.WebEncoders.Testing;UrlTestEncoder;TryEncodeUnicodeScalar;(System.Int32,System.Char*,System.Int32,System.Int32);summary;df-generated |
+| Microsoft.Extensions.WebEncoders.Testing;UrlTestEncoder;WillEncode;(System.Int32);summary;df-generated |
+| Microsoft.Extensions.WebEncoders.Testing;UrlTestEncoder;get_MaxOutputCharactersPerInputCharacter;();summary;df-generated |
+| Microsoft.JSInterop.Implementation;JSInProcessObjectReference;Dispose;();summary;df-generated |
+| Microsoft.JSInterop;DotNetObjectReference<TValue>;Dispose;();summary;df-generated |
+| Microsoft.JSInterop;DotNetStreamReference;Dispose;();summary;df-generated |
+| Microsoft.JSInterop;JSRuntime;Dispose;();summary;df-generated |
+| Microsoft.Net.Http.Headers;MediaTypeHeaderValueComparer;Compare;(Microsoft.Net.Http.Headers.MediaTypeHeaderValue,Microsoft.Net.Http.Headers.MediaTypeHeaderValue);summary;df-generated |
+| Microsoft.Net.Http.Headers;StringWithQualityHeaderValueComparer;Compare;(Microsoft.Net.Http.Headers.StringWithQualityHeaderValue,Microsoft.Net.Http.Headers.StringWithQualityHeaderValue);summary;df-generated |
+| Microsoft.SqlServer.Server;SqlDataRecord;GetBoolean;(System.Int32);summary;df-generated |
+| Microsoft.SqlServer.Server;SqlDataRecord;GetByte;(System.Int32);summary;df-generated |
+| Microsoft.SqlServer.Server;SqlDataRecord;GetBytes;(System.Int32,System.Int64,System.Byte[],System.Int32,System.Int32);summary;df-generated |
+| Microsoft.SqlServer.Server;SqlDataRecord;GetChar;(System.Int32);summary;df-generated |
+| Microsoft.SqlServer.Server;SqlDataRecord;GetChars;(System.Int32,System.Int64,System.Char[],System.Int32,System.Int32);summary;df-generated |
+| Microsoft.SqlServer.Server;SqlDataRecord;GetData;(System.Int32);summary;df-generated |
+| Microsoft.SqlServer.Server;SqlDataRecord;GetDataTypeName;(System.Int32);summary;manual |
+| Microsoft.SqlServer.Server;SqlDataRecord;GetDateTime;(System.Int32);summary;df-generated |
+| Microsoft.SqlServer.Server;SqlDataRecord;GetDecimal;(System.Int32);summary;df-generated |
+| Microsoft.SqlServer.Server;SqlDataRecord;GetDouble;(System.Int32);summary;df-generated |
+| Microsoft.SqlServer.Server;SqlDataRecord;GetFieldType;(System.Int32);summary;df-generated |
+| Microsoft.SqlServer.Server;SqlDataRecord;GetFloat;(System.Int32);summary;df-generated |
+| Microsoft.SqlServer.Server;SqlDataRecord;GetGuid;(System.Int32);summary;manual |
+| Microsoft.SqlServer.Server;SqlDataRecord;GetInt16;(System.Int32);summary;df-generated |
+| Microsoft.SqlServer.Server;SqlDataRecord;GetInt32;(System.Int32);summary;df-generated |
+| Microsoft.SqlServer.Server;SqlDataRecord;GetInt64;(System.Int32);summary;df-generated |
+| Microsoft.SqlServer.Server;SqlDataRecord;GetName;(System.Int32);summary;manual |
+| Microsoft.SqlServer.Server;SqlDataRecord;GetOrdinal;(System.String);summary;df-generated |
+| Microsoft.SqlServer.Server;SqlDataRecord;IsDBNull;(System.Int32);summary;df-generated |
+| Microsoft.SqlServer.Server;SqlDataRecord;get_FieldCount;();summary;df-generated |
 | Microsoft.VisualBasic.CompilerServices;BooleanType;FromObject;(System.Object);summary;df-generated |
 | Microsoft.VisualBasic.CompilerServices;BooleanType;FromString;(System.String);summary;df-generated |
 | Microsoft.VisualBasic.CompilerServices;ByteType;FromObject;(System.Object);summary;df-generated |
@@ -22648,6 +22947,238 @@ neutral
 | Microsoft.Win32;UserPreferenceChangedEventArgs;get_Category;();summary;df-generated |
 | Microsoft.Win32;UserPreferenceChangingEventArgs;UserPreferenceChangingEventArgs;(Microsoft.Win32.UserPreferenceCategory);summary;df-generated |
 | Microsoft.Win32;UserPreferenceChangingEventArgs;get_Category;();summary;df-generated |
+| Newtonsoft.Json.Linq;JArray;Contains;(Newtonsoft.Json.Linq.JToken);summary;df-generated |
+| Newtonsoft.Json.Linq;JArray;IndexOf;(Newtonsoft.Json.Linq.JToken);summary;df-generated |
+| Newtonsoft.Json.Linq;JArray;Remove;(Newtonsoft.Json.Linq.JToken);summary;df-generated |
+| Newtonsoft.Json.Linq;JArray;RemoveAt;(System.Int32);summary;df-generated |
+| Newtonsoft.Json.Linq;JArray;get_IsReadOnly;();summary;df-generated |
+| Newtonsoft.Json.Linq;JContainer;AddIndex;(System.ComponentModel.PropertyDescriptor);summary;df-generated |
+| Newtonsoft.Json.Linq;JContainer;Contains;(Newtonsoft.Json.Linq.JToken);summary;df-generated |
+| Newtonsoft.Json.Linq;JContainer;Contains;(System.Object);summary;df-generated |
+| Newtonsoft.Json.Linq;JContainer;IndexOf;(Newtonsoft.Json.Linq.JToken);summary;df-generated |
+| Newtonsoft.Json.Linq;JContainer;IndexOf;(System.Object);summary;df-generated |
+| Newtonsoft.Json.Linq;JContainer;Remove;(Newtonsoft.Json.Linq.JToken);summary;df-generated |
+| Newtonsoft.Json.Linq;JContainer;RemoveAt;(System.Int32);summary;df-generated |
+| Newtonsoft.Json.Linq;JContainer;RemoveIndex;(System.ComponentModel.PropertyDescriptor);summary;df-generated |
+| Newtonsoft.Json.Linq;JContainer;RemoveSort;();summary;df-generated |
+| Newtonsoft.Json.Linq;JContainer;get_AllowEdit;();summary;df-generated |
+| Newtonsoft.Json.Linq;JContainer;get_AllowNew;();summary;df-generated |
+| Newtonsoft.Json.Linq;JContainer;get_AllowRemove;();summary;df-generated |
+| Newtonsoft.Json.Linq;JContainer;get_Count;();summary;df-generated |
+| Newtonsoft.Json.Linq;JContainer;get_IsFixedSize;();summary;df-generated |
+| Newtonsoft.Json.Linq;JContainer;get_IsReadOnly;();summary;df-generated |
+| Newtonsoft.Json.Linq;JContainer;get_IsSorted;();summary;df-generated |
+| Newtonsoft.Json.Linq;JContainer;get_IsSynchronized;();summary;df-generated |
+| Newtonsoft.Json.Linq;JContainer;get_SortDirection;();summary;df-generated |
+| Newtonsoft.Json.Linq;JContainer;get_SupportsChangeNotification;();summary;df-generated |
+| Newtonsoft.Json.Linq;JContainer;get_SupportsSearching;();summary;df-generated |
+| Newtonsoft.Json.Linq;JContainer;get_SupportsSorting;();summary;df-generated |
+| Newtonsoft.Json.Linq;JEnumerable<T>;Equals;(Newtonsoft.Json.Linq.JEnumerable<T>);summary;df-generated |
+| Newtonsoft.Json.Linq;JObject;Contains;(System.Collections.Generic.KeyValuePair<System.String,Newtonsoft.Json.Linq.JToken>);summary;df-generated |
+| Newtonsoft.Json.Linq;JObject;ContainsKey;(System.String);summary;df-generated |
+| Newtonsoft.Json.Linq;JObject;GetClassName;();summary;df-generated |
+| Newtonsoft.Json.Linq;JObject;GetComponentName;();summary;df-generated |
+| Newtonsoft.Json.Linq;JObject;GetConverter;();summary;df-generated |
+| Newtonsoft.Json.Linq;JObject;GetDefaultEvent;();summary;df-generated |
+| Newtonsoft.Json.Linq;JObject;GetDefaultProperty;();summary;df-generated |
+| Newtonsoft.Json.Linq;JObject;GetEditor;(System.Type);summary;df-generated |
+| Newtonsoft.Json.Linq;JObject;GetEvents;();summary;df-generated |
+| Newtonsoft.Json.Linq;JObject;GetEvents;(System.Attribute[]);summary;df-generated |
+| Newtonsoft.Json.Linq;JObject;Remove;(System.Collections.Generic.KeyValuePair<System.String,Newtonsoft.Json.Linq.JToken>);summary;df-generated |
+| Newtonsoft.Json.Linq;JObject;Remove;(System.String);summary;df-generated |
+| Newtonsoft.Json.Linq;JObject;TryGetValue;(System.String,Newtonsoft.Json.Linq.JToken);summary;df-generated |
+| Newtonsoft.Json.Linq;JObject;get_IsReadOnly;();summary;df-generated |
+| Newtonsoft.Json.Linq;JPropertyDescriptor;CanResetValue;(System.Object);summary;df-generated |
+| Newtonsoft.Json.Linq;JPropertyDescriptor;ShouldSerializeValue;(System.Object);summary;df-generated |
+| Newtonsoft.Json.Linq;JPropertyDescriptor;get_ComponentType;();summary;df-generated |
+| Newtonsoft.Json.Linq;JPropertyDescriptor;get_IsReadOnly;();summary;df-generated |
+| Newtonsoft.Json.Linq;JPropertyDescriptor;get_NameHashCode;();summary;df-generated |
+| Newtonsoft.Json.Linq;JPropertyDescriptor;get_PropertyType;();summary;df-generated |
+| Newtonsoft.Json.Linq;JToken;GetMetaObject;(System.Linq.Expressions.Expression);summary;df-generated |
+| Newtonsoft.Json.Linq;JTokenEqualityComparer;Equals;(Newtonsoft.Json.Linq.JToken,Newtonsoft.Json.Linq.JToken);summary;df-generated |
+| Newtonsoft.Json.Linq;JTokenEqualityComparer;GetHashCode;(Newtonsoft.Json.Linq.JToken);summary;df-generated |
+| Newtonsoft.Json.Linq;JValue;CompareTo;(Newtonsoft.Json.Linq.JValue);summary;df-generated |
+| Newtonsoft.Json.Linq;JValue;CompareTo;(System.Object);summary;df-generated |
+| Newtonsoft.Json.Linq;JValue;Equals;(Newtonsoft.Json.Linq.JValue);summary;df-generated |
+| Newtonsoft.Json.Linq;JValue;GetTypeCode;();summary;df-generated |
+| Newtonsoft.Json.Linq;JValue;ToBoolean;(System.IFormatProvider);summary;df-generated |
+| Newtonsoft.Json.Linq;JValue;ToByte;(System.IFormatProvider);summary;df-generated |
+| Newtonsoft.Json.Linq;JValue;ToChar;(System.IFormatProvider);summary;df-generated |
+| Newtonsoft.Json.Linq;JValue;ToDouble;(System.IFormatProvider);summary;df-generated |
+| Newtonsoft.Json.Linq;JValue;ToInt16;(System.IFormatProvider);summary;df-generated |
+| Newtonsoft.Json.Linq;JValue;ToInt32;(System.IFormatProvider);summary;df-generated |
+| Newtonsoft.Json.Linq;JValue;ToInt64;(System.IFormatProvider);summary;df-generated |
+| Newtonsoft.Json.Linq;JValue;ToSByte;(System.IFormatProvider);summary;df-generated |
+| Newtonsoft.Json.Linq;JValue;ToSingle;(System.IFormatProvider);summary;df-generated |
+| Newtonsoft.Json.Linq;JValue;ToUInt16;(System.IFormatProvider);summary;df-generated |
+| Newtonsoft.Json.Linq;JValue;ToUInt32;(System.IFormatProvider);summary;df-generated |
+| Newtonsoft.Json.Linq;JValue;ToUInt64;(System.IFormatProvider);summary;df-generated |
+| Newtonsoft.Json.Serialization;DefaultSerializationBinder;BindToName;(System.Type,System.String,System.String);summary;df-generated |
+| Newtonsoft.Json.Serialization;DefaultSerializationBinder;BindToType;(System.String,System.String);summary;df-generated |
+| Newtonsoft.Json.Serialization;JsonPropertyCollection;GetKeyForItem;(Newtonsoft.Json.Serialization.JsonProperty);summary;df-generated |
+| Newtonsoft.Json;JsonReader;Dispose;();summary;df-generated |
+| Newtonsoft.Json;JsonWriter;Dispose;();summary;df-generated |
+| ServiceStack.AsyncEx;CancellationTokenTaskSource<T>;Dispose;();summary;df-generated |
+| ServiceStack.Caching;CacheClientWithPrefix;Dispose;();summary;df-generated |
+| ServiceStack.Caching;MemoryCacheClient;Dispose;();summary;df-generated |
+| ServiceStack.Caching;MultiCacheClient;Dispose;();summary;df-generated |
+| ServiceStack.Messaging;BackgroundMqClient;Dispose;();summary;df-generated |
+| ServiceStack.Messaging;BackgroundMqCollection<T>;Dispose;();summary;df-generated |
+| ServiceStack.Messaging;BackgroundMqMessageFactory;Dispose;();summary;df-generated |
+| ServiceStack.Messaging;BackgroundMqService;Dispose;();summary;df-generated |
+| ServiceStack.Messaging;BackgroundMqWorker;Dispose;();summary;df-generated |
+| ServiceStack.Messaging;InMemoryMessageQueueClient;Dispose;();summary;df-generated |
+| ServiceStack.Messaging;InMemoryTransientMessageFactory;Dispose;();summary;df-generated |
+| ServiceStack.Messaging;MessageHandler<T>;Dispose;();summary;df-generated |
+| ServiceStack.Messaging;MessageQueueClientFactory;Dispose;();summary;df-generated |
+| ServiceStack.Messaging;RedisMessageFactory;Dispose;();summary;df-generated |
+| ServiceStack.Messaging;RedisMessageProducer;Dispose;();summary;df-generated |
+| ServiceStack.Messaging;RedisMessageQueueClient;Dispose;();summary;df-generated |
+| ServiceStack.Messaging;RedisMessageQueueClientFactory;Dispose;();summary;df-generated |
+| ServiceStack.Messaging;TransientMessageServiceBase;Dispose;();summary;df-generated |
+| ServiceStack.MiniProfiler.Data;ProfiledCommand;Cancel;();summary;df-generated |
+| ServiceStack.MiniProfiler.Data;ProfiledCommand;CreateDbParameter;();summary;df-generated |
+| ServiceStack.MiniProfiler.Data;ProfiledCommand;Dispose;(System.Boolean);summary;df-generated |
+| ServiceStack.MiniProfiler.Data;ProfiledCommand;ExecuteNonQuery;();summary;df-generated |
+| ServiceStack.MiniProfiler.Data;ProfiledCommand;Prepare;();summary;df-generated |
+| ServiceStack.MiniProfiler.Data;ProfiledConnection;ChangeDatabase;(System.String);summary;df-generated |
+| ServiceStack.MiniProfiler.Data;ProfiledConnection;Close;();summary;df-generated |
+| ServiceStack.MiniProfiler.Data;ProfiledConnection;Dispose;(System.Boolean);summary;df-generated |
+| ServiceStack.MiniProfiler.Data;ProfiledConnection;Open;();summary;df-generated |
+| ServiceStack.MiniProfiler.Data;ProfiledConnection;get_CanRaiseEvents;();summary;df-generated |
+| ServiceStack.MiniProfiler.Data;ProfiledConnection;get_ConnectionTimeout;();summary;df-generated |
+| ServiceStack.MiniProfiler.Data;ProfiledConnection;get_DataSource;();summary;df-generated |
+| ServiceStack.MiniProfiler.Data;ProfiledConnection;get_Database;();summary;df-generated |
+| ServiceStack.MiniProfiler.Data;ProfiledConnection;get_State;();summary;df-generated |
+| ServiceStack.MiniProfiler.Data;ProfiledDbDataReader;Close;();summary;df-generated |
+| ServiceStack.MiniProfiler.Data;ProfiledDbDataReader;GetBoolean;(System.Int32);summary;df-generated |
+| ServiceStack.MiniProfiler.Data;ProfiledDbDataReader;GetByte;(System.Int32);summary;df-generated |
+| ServiceStack.MiniProfiler.Data;ProfiledDbDataReader;GetBytes;(System.Int32,System.Int64,System.Byte[],System.Int32,System.Int32);summary;df-generated |
+| ServiceStack.MiniProfiler.Data;ProfiledDbDataReader;GetChar;(System.Int32);summary;df-generated |
+| ServiceStack.MiniProfiler.Data;ProfiledDbDataReader;GetChars;(System.Int32,System.Int64,System.Char[],System.Int32,System.Int32);summary;df-generated |
+| ServiceStack.MiniProfiler.Data;ProfiledDbDataReader;GetDataTypeName;(System.Int32);summary;manual |
+| ServiceStack.MiniProfiler.Data;ProfiledDbDataReader;GetDateTime;(System.Int32);summary;df-generated |
+| ServiceStack.MiniProfiler.Data;ProfiledDbDataReader;GetDecimal;(System.Int32);summary;df-generated |
+| ServiceStack.MiniProfiler.Data;ProfiledDbDataReader;GetDouble;(System.Int32);summary;df-generated |
+| ServiceStack.MiniProfiler.Data;ProfiledDbDataReader;GetFieldType;(System.Int32);summary;df-generated |
+| ServiceStack.MiniProfiler.Data;ProfiledDbDataReader;GetFloat;(System.Int32);summary;df-generated |
+| ServiceStack.MiniProfiler.Data;ProfiledDbDataReader;GetGuid;(System.Int32);summary;manual |
+| ServiceStack.MiniProfiler.Data;ProfiledDbDataReader;GetInt16;(System.Int32);summary;df-generated |
+| ServiceStack.MiniProfiler.Data;ProfiledDbDataReader;GetInt32;(System.Int32);summary;df-generated |
+| ServiceStack.MiniProfiler.Data;ProfiledDbDataReader;GetInt64;(System.Int32);summary;df-generated |
+| ServiceStack.MiniProfiler.Data;ProfiledDbDataReader;GetName;(System.Int32);summary;manual |
+| ServiceStack.MiniProfiler.Data;ProfiledDbDataReader;GetOrdinal;(System.String);summary;df-generated |
+| ServiceStack.MiniProfiler.Data;ProfiledDbDataReader;IsDBNull;(System.Int32);summary;df-generated |
+| ServiceStack.MiniProfiler.Data;ProfiledDbDataReader;NextResult;();summary;df-generated |
+| ServiceStack.MiniProfiler.Data;ProfiledDbDataReader;Read;();summary;df-generated |
+| ServiceStack.MiniProfiler.Data;ProfiledDbDataReader;get_Depth;();summary;df-generated |
+| ServiceStack.MiniProfiler.Data;ProfiledDbDataReader;get_FieldCount;();summary;df-generated |
+| ServiceStack.MiniProfiler.Data;ProfiledDbDataReader;get_HasRows;();summary;df-generated |
+| ServiceStack.MiniProfiler.Data;ProfiledDbDataReader;get_IsClosed;();summary;df-generated |
+| ServiceStack.MiniProfiler.Data;ProfiledDbDataReader;get_RecordsAffected;();summary;df-generated |
+| ServiceStack.MiniProfiler.Data;ProfiledDbTransaction;Commit;();summary;df-generated |
+| ServiceStack.MiniProfiler.Data;ProfiledDbTransaction;Dispose;(System.Boolean);summary;df-generated |
+| ServiceStack.MiniProfiler.Data;ProfiledDbTransaction;Rollback;();summary;df-generated |
+| ServiceStack.MiniProfiler.Data;ProfiledDbTransaction;get_IsolationLevel;();summary;df-generated |
+| ServiceStack.MiniProfiler.Data;ProfiledProviderFactory;CreateCommand;();summary;df-generated |
+| ServiceStack.MiniProfiler.Data;ProfiledProviderFactory;CreateConnection;();summary;df-generated |
+| ServiceStack.MiniProfiler.Data;ProfiledProviderFactory;CreateConnectionStringBuilder;();summary;df-generated |
+| ServiceStack.MiniProfiler.Data;ProfiledProviderFactory;CreateParameter;();summary;df-generated |
+| ServiceStack.NetCore;NetCoreContainerAdapter;Dispose;();summary;df-generated |
+| ServiceStack.NetCore;NetCoreHeadersCollection;GetValues;(System.String);summary;df-generated |
+| ServiceStack.NetCore;NetCoreHeadersCollection;Remove;(System.String);summary;df-generated |
+| ServiceStack.NetCore;NetCoreHeadersCollection;get_Count;();summary;df-generated |
+| ServiceStack.NetCore;NetCoreQueryStringCollection;GetValues;(System.String);summary;df-generated |
+| ServiceStack.NetCore;NetCoreQueryStringCollection;Remove;(System.String);summary;df-generated |
+| ServiceStack.NetCore;NetCoreQueryStringCollection;get_Count;();summary;df-generated |
+| ServiceStack.OrmLite.Dapper;SqlMapper+GridReader;Dispose;();summary;df-generated |
+| ServiceStack.OrmLite.Dapper;SqlMapper+Identity;Equals;(ServiceStack.OrmLite.Dapper.SqlMapper+Identity);summary;df-generated |
+| ServiceStack.OrmLite;OrmLiteCommand;Cancel;();summary;df-generated |
+| ServiceStack.OrmLite;OrmLiteCommand;CreateParameter;();summary;df-generated |
+| ServiceStack.OrmLite;OrmLiteCommand;Dispose;();summary;df-generated |
+| ServiceStack.OrmLite;OrmLiteCommand;ExecuteNonQuery;();summary;df-generated |
+| ServiceStack.OrmLite;OrmLiteCommand;ExecuteReader;(System.Data.CommandBehavior);summary;df-generated |
+| ServiceStack.OrmLite;OrmLiteCommand;Prepare;();summary;df-generated |
+| ServiceStack.OrmLite;OrmLiteConnection;ChangeDatabase;(System.String);summary;df-generated |
+| ServiceStack.OrmLite;OrmLiteConnection;Close;();summary;df-generated |
+| ServiceStack.OrmLite;OrmLiteConnection;Dispose;();summary;df-generated |
+| ServiceStack.OrmLite;OrmLiteConnection;Open;();summary;df-generated |
+| ServiceStack.OrmLite;OrmLiteConnection;get_ConnectionTimeout;();summary;df-generated |
+| ServiceStack.OrmLite;OrmLiteConnection;get_Database;();summary;df-generated |
+| ServiceStack.OrmLite;OrmLiteConnection;get_State;();summary;df-generated |
+| ServiceStack.OrmLite;OrmLiteDataParameter;get_IsNullable;();summary;df-generated |
+| ServiceStack.OrmLite;OrmLitePersistenceProvider;Dispose;();summary;df-generated |
+| ServiceStack.OrmLite;OrmLiteResultsFilter;Dispose;();summary;df-generated |
+| ServiceStack.OrmLite;OrmLiteSPStatement;Dispose;();summary;df-generated |
+| ServiceStack.OrmLite;OrmLiteTransaction;Commit;();summary;df-generated |
+| ServiceStack.OrmLite;OrmLiteTransaction;Dispose;();summary;df-generated |
+| ServiceStack.OrmLite;OrmLiteTransaction;Rollback;();summary;df-generated |
+| ServiceStack.OrmLite;OrmLiteTransaction;get_IsolationLevel;();summary;df-generated |
+| ServiceStack.Script;PageResult;Dispose;();summary;df-generated |
+| ServiceStack.Script;ScriptContext;Dispose;();summary;df-generated |
+| ServiceStack.Script;SharpCodePage;Dispose;();summary;df-generated |
+| ServiceStack.Serialization;XmlSerializerWrapper;IsStartObject;(System.Xml.XmlDictionaryReader);summary;df-generated |
+| ServiceStack.Serialization;XmlSerializerWrapper;ReadObject;(System.Xml.XmlDictionaryReader);summary;df-generated |
+| ServiceStack.Serialization;XmlSerializerWrapper;ReadObject;(System.Xml.XmlDictionaryReader,System.Boolean);summary;df-generated |
+| ServiceStack.Serialization;XmlSerializerWrapper;WriteEndObject;(System.Xml.XmlDictionaryWriter);summary;df-generated |
+| ServiceStack.Serialization;XmlSerializerWrapper;WriteObject;(System.Xml.XmlDictionaryWriter,System.Object);summary;df-generated |
+| ServiceStack.Serialization;XmlSerializerWrapper;WriteObjectContent;(System.Xml.XmlDictionaryWriter,System.Object);summary;df-generated |
+| ServiceStack.Serialization;XmlSerializerWrapper;WriteStartObject;(System.Xml.XmlDictionaryWriter,System.Object);summary;df-generated |
+| ServiceStack.Text.Pools;PooledObject<T>;Dispose;();summary;df-generated |
+| ServiceStack.Text;DirectStreamWriter;Flush;();summary;df-generated |
+| ServiceStack.Text;DirectStreamWriter;Write;(System.Char);summary;df-generated |
+| ServiceStack.Text;JsConfigScope;Dispose;();summary;df-generated |
+| ServiceStack.Text;RecyclableMemoryStream;Close;();summary;df-generated |
+| ServiceStack.Text;RecyclableMemoryStream;Dispose;(System.Boolean);summary;df-generated |
+| ServiceStack.Text;RecyclableMemoryStream;ReadByte;();summary;df-generated |
+| ServiceStack.Text;RecyclableMemoryStream;Seek;(System.Int64,System.IO.SeekOrigin);summary;df-generated |
+| ServiceStack.Text;RecyclableMemoryStream;SetLength;(System.Int64);summary;df-generated |
+| ServiceStack.Text;RecyclableMemoryStream;Write;(System.ReadOnlySpan<System.Byte>);summary;df-generated |
+| ServiceStack.Text;RecyclableMemoryStream;WriteByte;(System.Byte);summary;df-generated |
+| ServiceStack.Text;RecyclableMemoryStream;get_CanRead;();summary;df-generated |
+| ServiceStack.Text;RecyclableMemoryStream;get_CanSeek;();summary;df-generated |
+| ServiceStack.Text;RecyclableMemoryStream;get_CanTimeout;();summary;df-generated |
+| ServiceStack.Text;RecyclableMemoryStream;get_CanWrite;();summary;df-generated |
+| ServiceStack.Text;RecyclableMemoryStream;get_Length;();summary;df-generated |
+| ServiceStack.Validation;ExecOnceOnly;Dispose;();summary;df-generated |
+| ServiceStack;AsyncTimer;Dispose;();summary;df-generated |
+| ServiceStack;AuthenticateAttribute;Equals;(System.Object);summary;df-generated |
+| ServiceStack;AuthenticateAttribute;GetHashCode;();summary;df-generated |
+| ServiceStack;ByteArrayComparer;Equals;(System.Byte[],System.Byte[]);summary;df-generated |
+| ServiceStack;ByteArrayComparer;GetHashCode;(System.Byte[]);summary;df-generated |
+| ServiceStack;CachedServiceClient;Dispose;();summary;df-generated |
+| ServiceStack;Defer;Dispose;();summary;df-generated |
+| ServiceStack;DisposableTracker;Dispose;();summary;df-generated |
+| ServiceStack;DynamicJson;TryGetMember;(System.Dynamic.GetMemberBinder,System.Object);summary;df-generated |
+| ServiceStack;DynamicJson;TrySetMember;(System.Dynamic.SetMemberBinder,System.Object);summary;df-generated |
+| ServiceStack;EventSubscription;Dispose;();summary;df-generated |
+| ServiceStack;HttpResult;Dispose;();summary;df-generated |
+| ServiceStack;JsonApiClient;Dispose;();summary;df-generated |
+| ServiceStack;LispReplTcpServer;Dispose;();summary;df-generated |
+| ServiceStack;LogicBase;Dispose;();summary;df-generated |
+| ServiceStack;LongRange;Equals;(ServiceStack.LongRange);summary;df-generated |
+| ServiceStack;MemoryServerEvents;Dispose;();summary;df-generated |
+| ServiceStack;NameValue;Equals;(ServiceStack.NameValue);summary;df-generated |
+| ServiceStack;ProfilerDiagnosticObserver;OnCompleted;();summary;df-generated |
+| ServiceStack;ProfilerDiagnosticObserver;OnError;(System.Exception);summary;df-generated |
+| ServiceStack;ProfilerDiagnosticObserver;OnNext;(System.Collections.Generic.KeyValuePair<System.String,System.Object>);summary;df-generated |
+| ServiceStack;ProfilerDiagnosticObserver;OnNext;(System.Diagnostics.DiagnosticListener);summary;df-generated |
+| ServiceStack;QueryDataSource<T>;Dispose;();summary;df-generated |
+| ServiceStack;RepositoryBase;Dispose;();summary;df-generated |
+| ServiceStack;RequiredClaimAttribute;Equals;(System.Object);summary;df-generated |
+| ServiceStack;RequiredClaimAttribute;GetHashCode;();summary;df-generated |
+| ServiceStack;RequiredPermissionAttribute;Equals;(System.Object);summary;df-generated |
+| ServiceStack;RequiredPermissionAttribute;GetHashCode;();summary;df-generated |
+| ServiceStack;RequiredRoleAttribute;Equals;(System.Object);summary;df-generated |
+| ServiceStack;RequiredRoleAttribute;GetHashCode;();summary;df-generated |
+| ServiceStack;RouteAttribute;Equals;(System.Object);summary;df-generated |
+| ServiceStack;RouteAttribute;GetHashCode;();summary;df-generated |
+| ServiceStack;ServerEventsClient;Dispose;();summary;df-generated |
+| ServiceStack;Service;Dispose;();summary;df-generated |
+| ServiceStack;ServiceClientBase;Dispose;();summary;df-generated |
+| ServiceStack;ServiceStackCodePage;Dispose;();summary;df-generated |
+| ServiceStack;ServiceStackHost;Dispose;();summary;df-generated |
+| ServiceStack;ServiceStackProvider;Dispose;();summary;df-generated |
 | System.Buffers.Binary;BinaryPrimitives;ReadDoubleBigEndian;(System.ReadOnlySpan<System.Byte>);summary;df-generated |
 | System.Buffers.Binary;BinaryPrimitives;ReadDoubleLittleEndian;(System.ReadOnlySpan<System.Byte>);summary;df-generated |
 | System.Buffers.Binary;BinaryPrimitives;ReadHalfBigEndian;(System.ReadOnlySpan<System.Byte>);summary;df-generated |
@@ -22819,6 +23350,7 @@ neutral
 | System.Buffers;ArrayBufferWriter<T>;Advance;(System.Int32);summary;df-generated |
 | System.Buffers;ArrayBufferWriter<T>;ArrayBufferWriter;(System.Int32);summary;df-generated |
 | System.Buffers;ArrayBufferWriter<T>;Clear;();summary;df-generated |
+| System.Buffers;ArrayBufferWriter<T>;GetMemory;(System.Int32);summary;df-generated |
 | System.Buffers;ArrayBufferWriter<T>;GetSpan;(System.Int32);summary;df-generated |
 | System.Buffers;ArrayBufferWriter<T>;ResetWrittenCount;();summary;df-generated |
 | System.Buffers;ArrayBufferWriter<T>;get_Capacity;();summary;df-generated |
@@ -22844,6 +23376,7 @@ neutral
 | System.Buffers;MemoryManager<T>;Pin;(System.Int32);summary;df-generated |
 | System.Buffers;MemoryManager<T>;TryGetArray;(System.ArraySegment<T>);summary;df-generated |
 | System.Buffers;MemoryManager<T>;Unpin;();summary;df-generated |
+| System.Buffers;MemoryManager<T>;get_Memory;();summary;df-generated |
 | System.Buffers;MemoryPool<T>;Dispose;();summary;df-generated |
 | System.Buffers;MemoryPool<T>;Dispose;(System.Boolean);summary;df-generated |
 | System.Buffers;MemoryPool<T>;Rent;(System.Int32);summary;df-generated |
@@ -23136,6 +23669,9 @@ neutral
 | System.Collections.Concurrent;BlockingCollection<T>;get_IsCompleted;();summary;df-generated |
 | System.Collections.Concurrent;BlockingCollection<T>;get_IsSynchronized;();summary;df-generated |
 | System.Collections.Concurrent;ConcurrentBag<T>;ConcurrentBag;(System.Collections.Generic.IEnumerable<T>);summary;df-generated |
+| System.Collections.Concurrent;ConcurrentBag<T>;ToArray;();summary;df-generated |
+| System.Collections.Concurrent;ConcurrentBag<T>;TryAdd;(T);summary;df-generated |
+| System.Collections.Concurrent;ConcurrentBag<T>;TryTake;(T);summary;df-generated |
 | System.Collections.Concurrent;ConcurrentBag<T>;get_Count;();summary;df-generated |
 | System.Collections.Concurrent;ConcurrentBag<T>;get_IsEmpty;();summary;df-generated |
 | System.Collections.Concurrent;ConcurrentBag<T>;get_IsSynchronized;();summary;df-generated |
@@ -23159,6 +23695,9 @@ neutral
 | System.Collections.Concurrent;ConcurrentDictionary<TKey,TValue>;get_IsFixedSize;();summary;df-generated |
 | System.Collections.Concurrent;ConcurrentDictionary<TKey,TValue>;get_IsReadOnly;();summary;df-generated |
 | System.Collections.Concurrent;ConcurrentDictionary<TKey,TValue>;get_IsSynchronized;();summary;df-generated |
+| System.Collections.Concurrent;ConcurrentDictionary<TKey,TValue>;get_Item;(TKey);summary;df-generated |
+| System.Collections.Concurrent;ConcurrentDictionary<TKey,TValue>;get_Keys;();summary;df-generated |
+| System.Collections.Concurrent;ConcurrentDictionary<TKey,TValue>;get_Values;();summary;df-generated |
 | System.Collections.Concurrent;ConcurrentQueue<T>;ConcurrentQueue;(System.Collections.Generic.IEnumerable<T>);summary;df-generated |
 | System.Collections.Concurrent;ConcurrentQueue<T>;Enqueue;(T);summary;df-generated |
 | System.Collections.Concurrent;ConcurrentQueue<T>;ToArray;();summary;df-generated |
@@ -23174,6 +23713,7 @@ neutral
 | System.Collections.Concurrent;ConcurrentStack<T>;PushRange;(T[],System.Int32,System.Int32);summary;df-generated |
 | System.Collections.Concurrent;ConcurrentStack<T>;ToArray;();summary;df-generated |
 | System.Collections.Concurrent;ConcurrentStack<T>;TryAdd;(T);summary;df-generated |
+| System.Collections.Concurrent;ConcurrentStack<T>;TryTake;(T);summary;df-generated |
 | System.Collections.Concurrent;ConcurrentStack<T>;get_Count;();summary;df-generated |
 | System.Collections.Concurrent;ConcurrentStack<T>;get_IsEmpty;();summary;df-generated |
 | System.Collections.Concurrent;ConcurrentStack<T>;get_IsSynchronized;();summary;df-generated |
@@ -23195,6 +23735,7 @@ neutral
 | System.Collections.Frozen;FrozenDictionary<TKey,TValue>+Enumerator;Dispose;();summary;df-generated |
 | System.Collections.Frozen;FrozenDictionary<TKey,TValue>+Enumerator;MoveNext;();summary;df-generated |
 | System.Collections.Frozen;FrozenDictionary<TKey,TValue>+Enumerator;Reset;();summary;df-generated |
+| System.Collections.Frozen;FrozenDictionary<TKey,TValue>+Enumerator;get_Current;();summary;df-generated |
 | System.Collections.Frozen;FrozenDictionary<TKey,TValue>;Contains;(System.Collections.Generic.KeyValuePair<TKey,TValue>);summary;df-generated |
 | System.Collections.Frozen;FrozenDictionary<TKey,TValue>;Contains;(System.Object);summary;df-generated |
 | System.Collections.Frozen;FrozenDictionary<TKey,TValue>;ContainsKey;(TKey);summary;df-generated |
@@ -23212,9 +23753,12 @@ neutral
 | System.Collections.Frozen;FrozenDictionary<TKey,TValue>;get_IsReadOnly;();summary;df-generated |
 | System.Collections.Frozen;FrozenDictionary<TKey,TValue>;get_IsSynchronized;();summary;df-generated |
 | System.Collections.Frozen;FrozenDictionary<TKey,TValue>;get_Item;(TKey);summary;df-generated |
+| System.Collections.Frozen;FrozenDictionary<TKey,TValue>;get_Keys;();summary;df-generated |
+| System.Collections.Frozen;FrozenDictionary<TKey,TValue>;get_Values;();summary;df-generated |
 | System.Collections.Frozen;FrozenSet<T>+Enumerator;Dispose;();summary;df-generated |
 | System.Collections.Frozen;FrozenSet<T>+Enumerator;MoveNext;();summary;df-generated |
 | System.Collections.Frozen;FrozenSet<T>+Enumerator;Reset;();summary;df-generated |
+| System.Collections.Frozen;FrozenSet<T>+Enumerator;get_Current;();summary;df-generated |
 | System.Collections.Frozen;FrozenSet<T>;Contains;(T);summary;df-generated |
 | System.Collections.Frozen;FrozenSet<T>;ExceptWith;(System.Collections.Generic.IEnumerable<T>);summary;df-generated |
 | System.Collections.Frozen;FrozenSet<T>;GetEnumerator;();summary;df-generated |
@@ -23241,9 +23785,11 @@ neutral
 | System.Collections.Generic;Dictionary<TKey,TValue>+Enumerator;Dispose;();summary;df-generated |
 | System.Collections.Generic;Dictionary<TKey,TValue>+Enumerator;MoveNext;();summary;df-generated |
 | System.Collections.Generic;Dictionary<TKey,TValue>+Enumerator;Reset;();summary;df-generated |
+| System.Collections.Generic;Dictionary<TKey,TValue>+Enumerator;get_Current;();summary;df-generated |
 | System.Collections.Generic;Dictionary<TKey,TValue>+KeyCollection+Enumerator;Dispose;();summary;df-generated |
 | System.Collections.Generic;Dictionary<TKey,TValue>+KeyCollection+Enumerator;MoveNext;();summary;df-generated |
 | System.Collections.Generic;Dictionary<TKey,TValue>+KeyCollection+Enumerator;Reset;();summary;df-generated |
+| System.Collections.Generic;Dictionary<TKey,TValue>+KeyCollection+Enumerator;get_Current;();summary;df-generated |
 | System.Collections.Generic;Dictionary<TKey,TValue>+KeyCollection;Contains;(TKey);summary;df-generated |
 | System.Collections.Generic;Dictionary<TKey,TValue>+KeyCollection;Remove;(TKey);summary;df-generated |
 | System.Collections.Generic;Dictionary<TKey,TValue>+KeyCollection;get_Count;();summary;df-generated |
@@ -23252,6 +23798,7 @@ neutral
 | System.Collections.Generic;Dictionary<TKey,TValue>+ValueCollection+Enumerator;Dispose;();summary;df-generated |
 | System.Collections.Generic;Dictionary<TKey,TValue>+ValueCollection+Enumerator;MoveNext;();summary;df-generated |
 | System.Collections.Generic;Dictionary<TKey,TValue>+ValueCollection+Enumerator;Reset;();summary;df-generated |
+| System.Collections.Generic;Dictionary<TKey,TValue>+ValueCollection+Enumerator;get_Current;();summary;df-generated |
 | System.Collections.Generic;Dictionary<TKey,TValue>+ValueCollection;Contains;(TValue);summary;df-generated |
 | System.Collections.Generic;Dictionary<TKey,TValue>+ValueCollection;Remove;(TValue);summary;df-generated |
 | System.Collections.Generic;Dictionary<TKey,TValue>+ValueCollection;get_Count;();summary;df-generated |
@@ -23278,6 +23825,9 @@ neutral
 | System.Collections.Generic;Dictionary<TKey,TValue>;get_IsFixedSize;();summary;df-generated |
 | System.Collections.Generic;Dictionary<TKey,TValue>;get_IsReadOnly;();summary;df-generated |
 | System.Collections.Generic;Dictionary<TKey,TValue>;get_IsSynchronized;();summary;df-generated |
+| System.Collections.Generic;Dictionary<TKey,TValue>;get_Item;(TKey);summary;df-generated |
+| System.Collections.Generic;Dictionary<TKey,TValue>;get_Keys;();summary;df-generated |
+| System.Collections.Generic;Dictionary<TKey,TValue>;get_Values;();summary;df-generated |
 | System.Collections.Generic;EqualityComparer<T>;Equals;(System.Object,System.Object);summary;df-generated |
 | System.Collections.Generic;EqualityComparer<T>;Equals;(T,T);summary;df-generated |
 | System.Collections.Generic;EqualityComparer<T>;GetHashCode;(System.Object);summary;df-generated |
@@ -23286,6 +23836,7 @@ neutral
 | System.Collections.Generic;HashSet<T>+Enumerator;Dispose;();summary;df-generated |
 | System.Collections.Generic;HashSet<T>+Enumerator;MoveNext;();summary;df-generated |
 | System.Collections.Generic;HashSet<T>+Enumerator;Reset;();summary;df-generated |
+| System.Collections.Generic;HashSet<T>+Enumerator;get_Current;();summary;df-generated |
 | System.Collections.Generic;HashSet<T>;Contains;(T);summary;df-generated |
 | System.Collections.Generic;HashSet<T>;CopyTo;(T[]);summary;df-generated |
 | System.Collections.Generic;HashSet<T>;CopyTo;(T[],System.Int32,System.Int32);summary;df-generated |
@@ -23358,6 +23909,7 @@ neutral
 | System.Collections.Generic;LinkedList<T>+Enumerator;MoveNext;();summary;df-generated |
 | System.Collections.Generic;LinkedList<T>+Enumerator;OnDeserialization;(System.Object);summary;df-generated |
 | System.Collections.Generic;LinkedList<T>+Enumerator;Reset;();summary;df-generated |
+| System.Collections.Generic;LinkedList<T>+Enumerator;get_Current;();summary;df-generated |
 | System.Collections.Generic;LinkedList<T>;Contains;(T);summary;df-generated |
 | System.Collections.Generic;LinkedList<T>;OnDeserialization;(System.Object);summary;df-generated |
 | System.Collections.Generic;LinkedList<T>;Remove;(T);summary;df-generated |
@@ -23370,6 +23922,7 @@ neutral
 | System.Collections.Generic;List<T>+Enumerator;Dispose;();summary;df-generated |
 | System.Collections.Generic;List<T>+Enumerator;MoveNext;();summary;df-generated |
 | System.Collections.Generic;List<T>+Enumerator;Reset;();summary;df-generated |
+| System.Collections.Generic;List<T>+Enumerator;get_Current;();summary;df-generated |
 | System.Collections.Generic;List<T>;BinarySearch;(System.Int32,System.Int32,T,System.Collections.Generic.IComparer<T>);summary;df-generated |
 | System.Collections.Generic;List<T>;BinarySearch;(T);summary;df-generated |
 | System.Collections.Generic;List<T>;BinarySearch;(T,System.Collections.Generic.IComparer<T>);summary;df-generated |
@@ -23399,6 +23952,7 @@ neutral
 | System.Collections.Generic;List<T>;get_IsFixedSize;();summary;df-generated |
 | System.Collections.Generic;List<T>;get_IsReadOnly;();summary;df-generated |
 | System.Collections.Generic;List<T>;get_IsSynchronized;();summary;df-generated |
+| System.Collections.Generic;List<T>;get_Item;(System.Int32);summary;df-generated |
 | System.Collections.Generic;PriorityQueue<TElement,TPriority>+UnorderedItemsCollection+Enumerator;Dispose;();summary;df-generated |
 | System.Collections.Generic;PriorityQueue<TElement,TPriority>+UnorderedItemsCollection+Enumerator;MoveNext;();summary;df-generated |
 | System.Collections.Generic;PriorityQueue<TElement,TPriority>+UnorderedItemsCollection+Enumerator;Reset;();summary;df-generated |
@@ -23417,6 +23971,7 @@ neutral
 | System.Collections.Generic;Queue<T>+Enumerator;Dispose;();summary;df-generated |
 | System.Collections.Generic;Queue<T>+Enumerator;MoveNext;();summary;df-generated |
 | System.Collections.Generic;Queue<T>+Enumerator;Reset;();summary;df-generated |
+| System.Collections.Generic;Queue<T>+Enumerator;get_Current;();summary;df-generated |
 | System.Collections.Generic;Queue<T>;Contains;(T);summary;df-generated |
 | System.Collections.Generic;Queue<T>;EnsureCapacity;(System.Int32);summary;df-generated |
 | System.Collections.Generic;Queue<T>;Queue;(System.Int32);summary;df-generated |
@@ -23430,6 +23985,7 @@ neutral
 | System.Collections.Generic;SortedDictionary<TKey,TValue>+Enumerator;Dispose;();summary;df-generated |
 | System.Collections.Generic;SortedDictionary<TKey,TValue>+Enumerator;MoveNext;();summary;df-generated |
 | System.Collections.Generic;SortedDictionary<TKey,TValue>+Enumerator;Reset;();summary;df-generated |
+| System.Collections.Generic;SortedDictionary<TKey,TValue>+Enumerator;get_Current;();summary;df-generated |
 | System.Collections.Generic;SortedDictionary<TKey,TValue>+KeyCollection+Enumerator;Dispose;();summary;df-generated |
 | System.Collections.Generic;SortedDictionary<TKey,TValue>+KeyCollection+Enumerator;MoveNext;();summary;df-generated |
 | System.Collections.Generic;SortedDictionary<TKey,TValue>+KeyCollection+Enumerator;Reset;();summary;df-generated |
@@ -23462,6 +24018,9 @@ neutral
 | System.Collections.Generic;SortedDictionary<TKey,TValue>;get_IsFixedSize;();summary;df-generated |
 | System.Collections.Generic;SortedDictionary<TKey,TValue>;get_IsReadOnly;();summary;df-generated |
 | System.Collections.Generic;SortedDictionary<TKey,TValue>;get_IsSynchronized;();summary;df-generated |
+| System.Collections.Generic;SortedDictionary<TKey,TValue>;get_Item;(TKey);summary;df-generated |
+| System.Collections.Generic;SortedDictionary<TKey,TValue>;get_Keys;();summary;df-generated |
+| System.Collections.Generic;SortedDictionary<TKey,TValue>;get_Values;();summary;df-generated |
 | System.Collections.Generic;SortedList<TKey,TValue>;Contains;(System.Collections.Generic.KeyValuePair<TKey,TValue>);summary;df-generated |
 | System.Collections.Generic;SortedList<TKey,TValue>;Contains;(System.Object);summary;df-generated |
 | System.Collections.Generic;SortedList<TKey,TValue>;ContainsKey;(TKey);summary;df-generated |
@@ -23475,18 +24034,24 @@ neutral
 | System.Collections.Generic;SortedList<TKey,TValue>;SortedList;(System.Int32);summary;df-generated |
 | System.Collections.Generic;SortedList<TKey,TValue>;SortedList;(System.Int32,System.Collections.Generic.IComparer<TKey>);summary;df-generated |
 | System.Collections.Generic;SortedList<TKey,TValue>;TrimExcess;();summary;df-generated |
+| System.Collections.Generic;SortedList<TKey,TValue>;TryGetValue;(TKey,TValue);summary;df-generated |
 | System.Collections.Generic;SortedList<TKey,TValue>;get_Count;();summary;df-generated |
 | System.Collections.Generic;SortedList<TKey,TValue>;get_IsFixedSize;();summary;df-generated |
 | System.Collections.Generic;SortedList<TKey,TValue>;get_IsReadOnly;();summary;df-generated |
 | System.Collections.Generic;SortedList<TKey,TValue>;get_IsSynchronized;();summary;df-generated |
+| System.Collections.Generic;SortedList<TKey,TValue>;get_Item;(TKey);summary;df-generated |
+| System.Collections.Generic;SortedList<TKey,TValue>;get_Keys;();summary;df-generated |
+| System.Collections.Generic;SortedList<TKey,TValue>;get_Values;();summary;df-generated |
 | System.Collections.Generic;SortedSet<T>+Enumerator;Dispose;();summary;df-generated |
 | System.Collections.Generic;SortedSet<T>+Enumerator;MoveNext;();summary;df-generated |
 | System.Collections.Generic;SortedSet<T>+Enumerator;OnDeserialization;(System.Object);summary;df-generated |
 | System.Collections.Generic;SortedSet<T>+Enumerator;Reset;();summary;df-generated |
+| System.Collections.Generic;SortedSet<T>+Enumerator;get_Current;();summary;df-generated |
 | System.Collections.Generic;SortedSet<T>;Contains;(T);summary;df-generated |
 | System.Collections.Generic;SortedSet<T>;CreateSetComparer;();summary;df-generated |
 | System.Collections.Generic;SortedSet<T>;CreateSetComparer;(System.Collections.Generic.IEqualityComparer<T>);summary;df-generated |
 | System.Collections.Generic;SortedSet<T>;ExceptWith;(System.Collections.Generic.IEnumerable<T>);summary;df-generated |
+| System.Collections.Generic;SortedSet<T>;IntersectWith;(System.Collections.Generic.IEnumerable<T>);summary;df-generated |
 | System.Collections.Generic;SortedSet<T>;IsProperSubsetOf;(System.Collections.Generic.IEnumerable<T>);summary;df-generated |
 | System.Collections.Generic;SortedSet<T>;IsProperSupersetOf;(System.Collections.Generic.IEnumerable<T>);summary;df-generated |
 | System.Collections.Generic;SortedSet<T>;IsSubsetOf;(System.Collections.Generic.IEnumerable<T>);summary;df-generated |
@@ -23496,12 +24061,15 @@ neutral
 | System.Collections.Generic;SortedSet<T>;Remove;(T);summary;df-generated |
 | System.Collections.Generic;SortedSet<T>;SetEquals;(System.Collections.Generic.IEnumerable<T>);summary;df-generated |
 | System.Collections.Generic;SortedSet<T>;SortedSet;(System.Collections.Generic.IEnumerable<T>);summary;df-generated |
+| System.Collections.Generic;SortedSet<T>;SymmetricExceptWith;(System.Collections.Generic.IEnumerable<T>);summary;df-generated |
+| System.Collections.Generic;SortedSet<T>;UnionWith;(System.Collections.Generic.IEnumerable<T>);summary;df-generated |
 | System.Collections.Generic;SortedSet<T>;get_Count;();summary;df-generated |
 | System.Collections.Generic;SortedSet<T>;get_IsReadOnly;();summary;df-generated |
 | System.Collections.Generic;SortedSet<T>;get_IsSynchronized;();summary;df-generated |
 | System.Collections.Generic;Stack<T>+Enumerator;Dispose;();summary;df-generated |
 | System.Collections.Generic;Stack<T>+Enumerator;MoveNext;();summary;df-generated |
 | System.Collections.Generic;Stack<T>+Enumerator;Reset;();summary;df-generated |
+| System.Collections.Generic;Stack<T>+Enumerator;get_Current;();summary;df-generated |
 | System.Collections.Generic;Stack<T>;Contains;(T);summary;df-generated |
 | System.Collections.Generic;Stack<T>;EnsureCapacity;(System.Int32);summary;df-generated |
 | System.Collections.Generic;Stack<T>;Stack;(System.Int32);summary;df-generated |
@@ -23585,7 +24153,9 @@ neutral
 | System.Collections.Immutable;ImmutableArray<T>+Builder;Sort;(System.Int32,System.Int32,System.Collections.Generic.IComparer<T>);summary;df-generated |
 | System.Collections.Immutable;ImmutableArray<T>+Builder;ToArray;();summary;df-generated |
 | System.Collections.Immutable;ImmutableArray<T>+Builder;ToImmutable;();summary;df-generated |
+| System.Collections.Immutable;ImmutableArray<T>+Builder;get_Count;();summary;df-generated |
 | System.Collections.Immutable;ImmutableArray<T>+Builder;get_IsReadOnly;();summary;df-generated |
+| System.Collections.Immutable;ImmutableArray<T>+Builder;get_Item;(System.Int32);summary;df-generated |
 | System.Collections.Immutable;ImmutableArray<T>+Enumerator;MoveNext;();summary;df-generated |
 | System.Collections.Immutable;ImmutableArray<T>;Clear;();summary;df-generated |
 | System.Collections.Immutable;ImmutableArray<T>;CompareTo;(System.Object,System.Collections.IComparer);summary;df-generated |
@@ -23605,13 +24175,20 @@ neutral
 | System.Collections.Immutable;ImmutableArray<T>;IndexOf;(T,System.Int32,System.Collections.Generic.IEqualityComparer<T>);summary;df-generated |
 | System.Collections.Immutable;ImmutableArray<T>;IndexOf;(T,System.Int32,System.Int32);summary;df-generated |
 | System.Collections.Immutable;ImmutableArray<T>;IndexOf;(T,System.Int32,System.Int32,System.Collections.Generic.IEqualityComparer<T>);summary;df-generated |
+| System.Collections.Immutable;ImmutableArray<T>;Insert;(System.Int32,T);summary;df-generated |
+| System.Collections.Immutable;ImmutableArray<T>;InsertRange;(System.Int32,System.Collections.Generic.IEnumerable<T>);summary;df-generated |
 | System.Collections.Immutable;ImmutableArray<T>;ItemRef;(System.Int32);summary;df-generated |
 | System.Collections.Immutable;ImmutableArray<T>;LastIndexOf;(T);summary;df-generated |
 | System.Collections.Immutable;ImmutableArray<T>;LastIndexOf;(T,System.Int32);summary;df-generated |
 | System.Collections.Immutable;ImmutableArray<T>;LastIndexOf;(T,System.Int32,System.Int32);summary;df-generated |
 | System.Collections.Immutable;ImmutableArray<T>;LastIndexOf;(T,System.Int32,System.Int32,System.Collections.Generic.IEqualityComparer<T>);summary;df-generated |
 | System.Collections.Immutable;ImmutableArray<T>;Remove;(T);summary;df-generated |
+| System.Collections.Immutable;ImmutableArray<T>;Remove;(T,System.Collections.Generic.IEqualityComparer<T>);summary;df-generated |
 | System.Collections.Immutable;ImmutableArray<T>;RemoveAt;(System.Int32);summary;df-generated |
+| System.Collections.Immutable;ImmutableArray<T>;RemoveRange;(System.Collections.Generic.IEnumerable<T>,System.Collections.Generic.IEqualityComparer<T>);summary;df-generated |
+| System.Collections.Immutable;ImmutableArray<T>;RemoveRange;(System.Int32,System.Int32);summary;df-generated |
+| System.Collections.Immutable;ImmutableArray<T>;Replace;(T,T,System.Collections.Generic.IEqualityComparer<T>);summary;df-generated |
+| System.Collections.Immutable;ImmutableArray<T>;SetItem;(System.Int32,T);summary;df-generated |
 | System.Collections.Immutable;ImmutableArray<T>;get_Count;();summary;df-generated |
 | System.Collections.Immutable;ImmutableArray<T>;get_IsDefault;();summary;df-generated |
 | System.Collections.Immutable;ImmutableArray<T>;get_IsDefaultOrEmpty;();summary;df-generated |
@@ -23619,6 +24196,7 @@ neutral
 | System.Collections.Immutable;ImmutableArray<T>;get_IsFixedSize;();summary;df-generated |
 | System.Collections.Immutable;ImmutableArray<T>;get_IsReadOnly;();summary;df-generated |
 | System.Collections.Immutable;ImmutableArray<T>;get_IsSynchronized;();summary;df-generated |
+| System.Collections.Immutable;ImmutableArray<T>;get_Item;(System.Int32);summary;df-generated |
 | System.Collections.Immutable;ImmutableArray<T>;get_Length;();summary;df-generated |
 | System.Collections.Immutable;ImmutableArray<T>;op_Equality;(System.Collections.Immutable.ImmutableArray<T>,System.Collections.Immutable.ImmutableArray<T>);summary;df-generated |
 | System.Collections.Immutable;ImmutableArray<T>;op_Equality;(System.Nullable<System.Collections.Immutable.ImmutableArray<T>>,System.Nullable<System.Collections.Immutable.ImmutableArray<T>>);summary;df-generated |
@@ -23644,9 +24222,14 @@ neutral
 | System.Collections.Immutable;ImmutableDictionary<TKey,TValue>+Builder;get_IsFixedSize;();summary;df-generated |
 | System.Collections.Immutable;ImmutableDictionary<TKey,TValue>+Builder;get_IsReadOnly;();summary;df-generated |
 | System.Collections.Immutable;ImmutableDictionary<TKey,TValue>+Builder;get_IsSynchronized;();summary;df-generated |
+| System.Collections.Immutable;ImmutableDictionary<TKey,TValue>+Builder;get_Item;(TKey);summary;df-generated |
+| System.Collections.Immutable;ImmutableDictionary<TKey,TValue>+Builder;get_Keys;();summary;df-generated |
+| System.Collections.Immutable;ImmutableDictionary<TKey,TValue>+Builder;get_Values;();summary;df-generated |
 | System.Collections.Immutable;ImmutableDictionary<TKey,TValue>+Enumerator;Dispose;();summary;df-generated |
 | System.Collections.Immutable;ImmutableDictionary<TKey,TValue>+Enumerator;MoveNext;();summary;df-generated |
 | System.Collections.Immutable;ImmutableDictionary<TKey,TValue>+Enumerator;Reset;();summary;df-generated |
+| System.Collections.Immutable;ImmutableDictionary<TKey,TValue>+Enumerator;get_Current;();summary;df-generated |
+| System.Collections.Immutable;ImmutableDictionary<TKey,TValue>;Add;(TKey,TValue);summary;df-generated |
 | System.Collections.Immutable;ImmutableDictionary<TKey,TValue>;Contains;(System.Collections.Generic.KeyValuePair<TKey,TValue>);summary;df-generated |
 | System.Collections.Immutable;ImmutableDictionary<TKey,TValue>;Contains;(System.Object);summary;df-generated |
 | System.Collections.Immutable;ImmutableDictionary<TKey,TValue>;ContainsKey;(TKey);summary;df-generated |
@@ -23654,12 +24237,19 @@ neutral
 | System.Collections.Immutable;ImmutableDictionary<TKey,TValue>;Remove;(System.Collections.Generic.KeyValuePair<TKey,TValue>);summary;df-generated |
 | System.Collections.Immutable;ImmutableDictionary<TKey,TValue>;Remove;(System.Object);summary;df-generated |
 | System.Collections.Immutable;ImmutableDictionary<TKey,TValue>;Remove;(TKey);summary;df-generated |
+| System.Collections.Immutable;ImmutableDictionary<TKey,TValue>;RemoveRange;(System.Collections.Generic.IEnumerable<TKey>);summary;df-generated |
+| System.Collections.Immutable;ImmutableDictionary<TKey,TValue>;SetItem;(TKey,TValue);summary;df-generated |
+| System.Collections.Immutable;ImmutableDictionary<TKey,TValue>;SetItems;(System.Collections.Generic.IEnumerable<System.Collections.Generic.KeyValuePair<TKey,TValue>>);summary;df-generated |
+| System.Collections.Immutable;ImmutableDictionary<TKey,TValue>;TryGetKey;(TKey,TKey);summary;df-generated |
 | System.Collections.Immutable;ImmutableDictionary<TKey,TValue>;TryGetValue;(TKey,TValue);summary;df-generated |
 | System.Collections.Immutable;ImmutableDictionary<TKey,TValue>;get_Count;();summary;df-generated |
 | System.Collections.Immutable;ImmutableDictionary<TKey,TValue>;get_IsEmpty;();summary;df-generated |
 | System.Collections.Immutable;ImmutableDictionary<TKey,TValue>;get_IsFixedSize;();summary;df-generated |
 | System.Collections.Immutable;ImmutableDictionary<TKey,TValue>;get_IsReadOnly;();summary;df-generated |
 | System.Collections.Immutable;ImmutableDictionary<TKey,TValue>;get_IsSynchronized;();summary;df-generated |
+| System.Collections.Immutable;ImmutableDictionary<TKey,TValue>;get_Item;(TKey);summary;df-generated |
+| System.Collections.Immutable;ImmutableDictionary<TKey,TValue>;get_Keys;();summary;df-generated |
+| System.Collections.Immutable;ImmutableDictionary<TKey,TValue>;get_Values;();summary;df-generated |
 | System.Collections.Immutable;ImmutableHashSet;Create<T>;();summary;df-generated |
 | System.Collections.Immutable;ImmutableHashSet;Create<T>;(System.Collections.Generic.IEqualityComparer<T>);summary;df-generated |
 | System.Collections.Immutable;ImmutableHashSet;CreateBuilder<T>;();summary;df-generated |
@@ -23675,6 +24265,7 @@ neutral
 | System.Collections.Immutable;ImmutableHashSet<T>+Builder;Overlaps;(System.Collections.Generic.IEnumerable<T>);summary;df-generated |
 | System.Collections.Immutable;ImmutableHashSet<T>+Builder;Remove;(T);summary;df-generated |
 | System.Collections.Immutable;ImmutableHashSet<T>+Builder;SetEquals;(System.Collections.Generic.IEnumerable<T>);summary;df-generated |
+| System.Collections.Immutable;ImmutableHashSet<T>+Builder;SymmetricExceptWith;(System.Collections.Generic.IEnumerable<T>);summary;df-generated |
 | System.Collections.Immutable;ImmutableHashSet<T>+Builder;ToImmutable;();summary;df-generated |
 | System.Collections.Immutable;ImmutableHashSet<T>+Builder;UnionWith;(System.Collections.Generic.IEnumerable<T>);summary;df-generated |
 | System.Collections.Immutable;ImmutableHashSet<T>+Builder;get_Count;();summary;df-generated |
@@ -23682,8 +24273,11 @@ neutral
 | System.Collections.Immutable;ImmutableHashSet<T>+Enumerator;Dispose;();summary;df-generated |
 | System.Collections.Immutable;ImmutableHashSet<T>+Enumerator;MoveNext;();summary;df-generated |
 | System.Collections.Immutable;ImmutableHashSet<T>+Enumerator;Reset;();summary;df-generated |
+| System.Collections.Immutable;ImmutableHashSet<T>+Enumerator;get_Current;();summary;df-generated |
 | System.Collections.Immutable;ImmutableHashSet<T>;Contains;(T);summary;df-generated |
+| System.Collections.Immutable;ImmutableHashSet<T>;Except;(System.Collections.Generic.IEnumerable<T>);summary;df-generated |
 | System.Collections.Immutable;ImmutableHashSet<T>;ExceptWith;(System.Collections.Generic.IEnumerable<T>);summary;df-generated |
+| System.Collections.Immutable;ImmutableHashSet<T>;Intersect;(System.Collections.Generic.IEnumerable<T>);summary;df-generated |
 | System.Collections.Immutable;ImmutableHashSet<T>;IntersectWith;(System.Collections.Generic.IEnumerable<T>);summary;df-generated |
 | System.Collections.Immutable;ImmutableHashSet<T>;IsProperSubsetOf;(System.Collections.Generic.IEnumerable<T>);summary;df-generated |
 | System.Collections.Immutable;ImmutableHashSet<T>;IsProperSupersetOf;(System.Collections.Generic.IEnumerable<T>);summary;df-generated |
@@ -23692,7 +24286,10 @@ neutral
 | System.Collections.Immutable;ImmutableHashSet<T>;Overlaps;(System.Collections.Generic.IEnumerable<T>);summary;df-generated |
 | System.Collections.Immutable;ImmutableHashSet<T>;Remove;(T);summary;df-generated |
 | System.Collections.Immutable;ImmutableHashSet<T>;SetEquals;(System.Collections.Generic.IEnumerable<T>);summary;df-generated |
+| System.Collections.Immutable;ImmutableHashSet<T>;SymmetricExcept;(System.Collections.Generic.IEnumerable<T>);summary;df-generated |
 | System.Collections.Immutable;ImmutableHashSet<T>;SymmetricExceptWith;(System.Collections.Generic.IEnumerable<T>);summary;df-generated |
+| System.Collections.Immutable;ImmutableHashSet<T>;TryGetValue;(T,T);summary;df-generated |
+| System.Collections.Immutable;ImmutableHashSet<T>;Union;(System.Collections.Generic.IEnumerable<T>);summary;df-generated |
 | System.Collections.Immutable;ImmutableHashSet<T>;UnionWith;(System.Collections.Generic.IEnumerable<T>);summary;df-generated |
 | System.Collections.Immutable;ImmutableHashSet<T>;get_Count;();summary;df-generated |
 | System.Collections.Immutable;ImmutableHashSet<T>;get_IsEmpty;();summary;df-generated |
@@ -23754,6 +24351,7 @@ neutral
 | System.Collections.Immutable;ImmutableList<T>+Enumerator;Dispose;();summary;df-generated |
 | System.Collections.Immutable;ImmutableList<T>+Enumerator;MoveNext;();summary;df-generated |
 | System.Collections.Immutable;ImmutableList<T>+Enumerator;Reset;();summary;df-generated |
+| System.Collections.Immutable;ImmutableList<T>+Enumerator;get_Current;();summary;df-generated |
 | System.Collections.Immutable;ImmutableList<T>;BinarySearch;(T);summary;df-generated |
 | System.Collections.Immutable;ImmutableList<T>;Clear;();summary;df-generated |
 | System.Collections.Immutable;ImmutableList<T>;Contains;(System.Object);summary;df-generated |
@@ -23762,18 +24360,29 @@ neutral
 | System.Collections.Immutable;ImmutableList<T>;IndexOf;(System.Object);summary;df-generated |
 | System.Collections.Immutable;ImmutableList<T>;IndexOf;(T);summary;df-generated |
 | System.Collections.Immutable;ImmutableList<T>;IndexOf;(T,System.Int32,System.Int32,System.Collections.Generic.IEqualityComparer<T>);summary;df-generated |
+| System.Collections.Immutable;ImmutableList<T>;Insert;(System.Int32,T);summary;df-generated |
+| System.Collections.Immutable;ImmutableList<T>;InsertRange;(System.Int32,System.Collections.Generic.IEnumerable<T>);summary;df-generated |
 | System.Collections.Immutable;ImmutableList<T>;ItemRef;(System.Int32);summary;df-generated |
 | System.Collections.Immutable;ImmutableList<T>;LastIndexOf;(T,System.Int32,System.Int32,System.Collections.Generic.IEqualityComparer<T>);summary;df-generated |
 | System.Collections.Immutable;ImmutableList<T>;Remove;(T);summary;df-generated |
+| System.Collections.Immutable;ImmutableList<T>;Remove;(T,System.Collections.Generic.IEqualityComparer<T>);summary;df-generated |
 | System.Collections.Immutable;ImmutableList<T>;RemoveAt;(System.Int32);summary;df-generated |
+| System.Collections.Immutable;ImmutableList<T>;RemoveRange;(System.Collections.Generic.IEnumerable<T>,System.Collections.Generic.IEqualityComparer<T>);summary;df-generated |
+| System.Collections.Immutable;ImmutableList<T>;RemoveRange;(System.Int32,System.Int32);summary;df-generated |
+| System.Collections.Immutable;ImmutableList<T>;Replace;(T,T,System.Collections.Generic.IEqualityComparer<T>);summary;df-generated |
+| System.Collections.Immutable;ImmutableList<T>;SetItem;(System.Int32,T);summary;df-generated |
 | System.Collections.Immutable;ImmutableList<T>;get_Count;();summary;df-generated |
 | System.Collections.Immutable;ImmutableList<T>;get_IsEmpty;();summary;df-generated |
 | System.Collections.Immutable;ImmutableList<T>;get_IsFixedSize;();summary;df-generated |
 | System.Collections.Immutable;ImmutableList<T>;get_IsReadOnly;();summary;df-generated |
 | System.Collections.Immutable;ImmutableList<T>;get_IsSynchronized;();summary;df-generated |
+| System.Collections.Immutable;ImmutableList<T>;get_Item;(System.Int32);summary;df-generated |
 | System.Collections.Immutable;ImmutableQueue;Create<T>;();summary;df-generated |
 | System.Collections.Immutable;ImmutableQueue<T>+Enumerator;MoveNext;();summary;df-generated |
 | System.Collections.Immutable;ImmutableQueue<T>;Clear;();summary;df-generated |
+| System.Collections.Immutable;ImmutableQueue<T>;Dequeue;();summary;df-generated |
+| System.Collections.Immutable;ImmutableQueue<T>;Enqueue;(T);summary;df-generated |
+| System.Collections.Immutable;ImmutableQueue<T>;Peek;();summary;df-generated |
 | System.Collections.Immutable;ImmutableQueue<T>;PeekRef;();summary;df-generated |
 | System.Collections.Immutable;ImmutableQueue<T>;get_Empty;();summary;df-generated |
 | System.Collections.Immutable;ImmutableQueue<T>;get_IsEmpty;();summary;df-generated |
@@ -23796,9 +24405,14 @@ neutral
 | System.Collections.Immutable;ImmutableSortedDictionary<TKey,TValue>+Builder;get_IsFixedSize;();summary;df-generated |
 | System.Collections.Immutable;ImmutableSortedDictionary<TKey,TValue>+Builder;get_IsReadOnly;();summary;df-generated |
 | System.Collections.Immutable;ImmutableSortedDictionary<TKey,TValue>+Builder;get_IsSynchronized;();summary;df-generated |
+| System.Collections.Immutable;ImmutableSortedDictionary<TKey,TValue>+Builder;get_Item;(TKey);summary;df-generated |
+| System.Collections.Immutable;ImmutableSortedDictionary<TKey,TValue>+Builder;get_Keys;();summary;df-generated |
+| System.Collections.Immutable;ImmutableSortedDictionary<TKey,TValue>+Builder;get_Values;();summary;df-generated |
 | System.Collections.Immutable;ImmutableSortedDictionary<TKey,TValue>+Enumerator;Dispose;();summary;df-generated |
 | System.Collections.Immutable;ImmutableSortedDictionary<TKey,TValue>+Enumerator;MoveNext;();summary;df-generated |
 | System.Collections.Immutable;ImmutableSortedDictionary<TKey,TValue>+Enumerator;Reset;();summary;df-generated |
+| System.Collections.Immutable;ImmutableSortedDictionary<TKey,TValue>+Enumerator;get_Current;();summary;df-generated |
+| System.Collections.Immutable;ImmutableSortedDictionary<TKey,TValue>;Add;(TKey,TValue);summary;df-generated |
 | System.Collections.Immutable;ImmutableSortedDictionary<TKey,TValue>;Contains;(System.Collections.Generic.KeyValuePair<TKey,TValue>);summary;df-generated |
 | System.Collections.Immutable;ImmutableSortedDictionary<TKey,TValue>;Contains;(System.Object);summary;df-generated |
 | System.Collections.Immutable;ImmutableSortedDictionary<TKey,TValue>;ContainsKey;(TKey);summary;df-generated |
@@ -23806,6 +24420,10 @@ neutral
 | System.Collections.Immutable;ImmutableSortedDictionary<TKey,TValue>;Remove;(System.Collections.Generic.KeyValuePair<TKey,TValue>);summary;df-generated |
 | System.Collections.Immutable;ImmutableSortedDictionary<TKey,TValue>;Remove;(System.Object);summary;df-generated |
 | System.Collections.Immutable;ImmutableSortedDictionary<TKey,TValue>;Remove;(TKey);summary;df-generated |
+| System.Collections.Immutable;ImmutableSortedDictionary<TKey,TValue>;RemoveRange;(System.Collections.Generic.IEnumerable<TKey>);summary;df-generated |
+| System.Collections.Immutable;ImmutableSortedDictionary<TKey,TValue>;SetItem;(TKey,TValue);summary;df-generated |
+| System.Collections.Immutable;ImmutableSortedDictionary<TKey,TValue>;SetItems;(System.Collections.Generic.IEnumerable<System.Collections.Generic.KeyValuePair<TKey,TValue>>);summary;df-generated |
+| System.Collections.Immutable;ImmutableSortedDictionary<TKey,TValue>;TryGetKey;(TKey,TKey);summary;df-generated |
 | System.Collections.Immutable;ImmutableSortedDictionary<TKey,TValue>;TryGetValue;(TKey,TValue);summary;df-generated |
 | System.Collections.Immutable;ImmutableSortedDictionary<TKey,TValue>;ValueRef;(TKey);summary;df-generated |
 | System.Collections.Immutable;ImmutableSortedDictionary<TKey,TValue>;get_Count;();summary;df-generated |
@@ -23813,12 +24431,16 @@ neutral
 | System.Collections.Immutable;ImmutableSortedDictionary<TKey,TValue>;get_IsFixedSize;();summary;df-generated |
 | System.Collections.Immutable;ImmutableSortedDictionary<TKey,TValue>;get_IsReadOnly;();summary;df-generated |
 | System.Collections.Immutable;ImmutableSortedDictionary<TKey,TValue>;get_IsSynchronized;();summary;df-generated |
+| System.Collections.Immutable;ImmutableSortedDictionary<TKey,TValue>;get_Item;(TKey);summary;df-generated |
+| System.Collections.Immutable;ImmutableSortedDictionary<TKey,TValue>;get_Keys;();summary;df-generated |
+| System.Collections.Immutable;ImmutableSortedDictionary<TKey,TValue>;get_Values;();summary;df-generated |
 | System.Collections.Immutable;ImmutableSortedSet;Create<T>;();summary;df-generated |
 | System.Collections.Immutable;ImmutableSortedSet;CreateBuilder<T>;();summary;df-generated |
 | System.Collections.Immutable;ImmutableSortedSet;ToImmutableSortedSet<TSource>;(System.Collections.Immutable.ImmutableSortedSet<TSource>+Builder);summary;df-generated |
 | System.Collections.Immutable;ImmutableSortedSet<T>+Builder;Contains;(T);summary;df-generated |
 | System.Collections.Immutable;ImmutableSortedSet<T>+Builder;ExceptWith;(System.Collections.Generic.IEnumerable<T>);summary;df-generated |
 | System.Collections.Immutable;ImmutableSortedSet<T>+Builder;IndexOf;(T);summary;df-generated |
+| System.Collections.Immutable;ImmutableSortedSet<T>+Builder;IntersectWith;(System.Collections.Generic.IEnumerable<T>);summary;df-generated |
 | System.Collections.Immutable;ImmutableSortedSet<T>+Builder;IsProperSubsetOf;(System.Collections.Generic.IEnumerable<T>);summary;df-generated |
 | System.Collections.Immutable;ImmutableSortedSet<T>+Builder;IsProperSupersetOf;(System.Collections.Generic.IEnumerable<T>);summary;df-generated |
 | System.Collections.Immutable;ImmutableSortedSet<T>+Builder;IsSubsetOf;(System.Collections.Generic.IEnumerable<T>);summary;df-generated |
@@ -23827,7 +24449,9 @@ neutral
 | System.Collections.Immutable;ImmutableSortedSet<T>+Builder;Overlaps;(System.Collections.Generic.IEnumerable<T>);summary;df-generated |
 | System.Collections.Immutable;ImmutableSortedSet<T>+Builder;Remove;(T);summary;df-generated |
 | System.Collections.Immutable;ImmutableSortedSet<T>+Builder;SetEquals;(System.Collections.Generic.IEnumerable<T>);summary;df-generated |
+| System.Collections.Immutable;ImmutableSortedSet<T>+Builder;SymmetricExceptWith;(System.Collections.Generic.IEnumerable<T>);summary;df-generated |
 | System.Collections.Immutable;ImmutableSortedSet<T>+Builder;ToImmutable;();summary;df-generated |
+| System.Collections.Immutable;ImmutableSortedSet<T>+Builder;UnionWith;(System.Collections.Generic.IEnumerable<T>);summary;df-generated |
 | System.Collections.Immutable;ImmutableSortedSet<T>+Builder;get_Count;();summary;df-generated |
 | System.Collections.Immutable;ImmutableSortedSet<T>+Builder;get_IsReadOnly;();summary;df-generated |
 | System.Collections.Immutable;ImmutableSortedSet<T>+Builder;get_IsSynchronized;();summary;df-generated |
@@ -23835,11 +24459,14 @@ neutral
 | System.Collections.Immutable;ImmutableSortedSet<T>+Enumerator;Dispose;();summary;df-generated |
 | System.Collections.Immutable;ImmutableSortedSet<T>+Enumerator;MoveNext;();summary;df-generated |
 | System.Collections.Immutable;ImmutableSortedSet<T>+Enumerator;Reset;();summary;df-generated |
+| System.Collections.Immutable;ImmutableSortedSet<T>+Enumerator;get_Current;();summary;df-generated |
 | System.Collections.Immutable;ImmutableSortedSet<T>;Contains;(System.Object);summary;df-generated |
 | System.Collections.Immutable;ImmutableSortedSet<T>;Contains;(T);summary;df-generated |
+| System.Collections.Immutable;ImmutableSortedSet<T>;Except;(System.Collections.Generic.IEnumerable<T>);summary;df-generated |
 | System.Collections.Immutable;ImmutableSortedSet<T>;ExceptWith;(System.Collections.Generic.IEnumerable<T>);summary;df-generated |
 | System.Collections.Immutable;ImmutableSortedSet<T>;IndexOf;(System.Object);summary;df-generated |
 | System.Collections.Immutable;ImmutableSortedSet<T>;IndexOf;(T);summary;df-generated |
+| System.Collections.Immutable;ImmutableSortedSet<T>;Intersect;(System.Collections.Generic.IEnumerable<T>);summary;df-generated |
 | System.Collections.Immutable;ImmutableSortedSet<T>;IntersectWith;(System.Collections.Generic.IEnumerable<T>);summary;df-generated |
 | System.Collections.Immutable;ImmutableSortedSet<T>;IsProperSubsetOf;(System.Collections.Generic.IEnumerable<T>);summary;df-generated |
 | System.Collections.Immutable;ImmutableSortedSet<T>;IsProperSupersetOf;(System.Collections.Generic.IEnumerable<T>);summary;df-generated |
@@ -23850,17 +24477,24 @@ neutral
 | System.Collections.Immutable;ImmutableSortedSet<T>;Remove;(T);summary;df-generated |
 | System.Collections.Immutable;ImmutableSortedSet<T>;RemoveAt;(System.Int32);summary;df-generated |
 | System.Collections.Immutable;ImmutableSortedSet<T>;SetEquals;(System.Collections.Generic.IEnumerable<T>);summary;df-generated |
+| System.Collections.Immutable;ImmutableSortedSet<T>;SymmetricExcept;(System.Collections.Generic.IEnumerable<T>);summary;df-generated |
 | System.Collections.Immutable;ImmutableSortedSet<T>;SymmetricExceptWith;(System.Collections.Generic.IEnumerable<T>);summary;df-generated |
+| System.Collections.Immutable;ImmutableSortedSet<T>;TryGetValue;(T,T);summary;df-generated |
+| System.Collections.Immutable;ImmutableSortedSet<T>;Union;(System.Collections.Generic.IEnumerable<T>);summary;df-generated |
 | System.Collections.Immutable;ImmutableSortedSet<T>;UnionWith;(System.Collections.Generic.IEnumerable<T>);summary;df-generated |
 | System.Collections.Immutable;ImmutableSortedSet<T>;get_Count;();summary;df-generated |
 | System.Collections.Immutable;ImmutableSortedSet<T>;get_IsEmpty;();summary;df-generated |
 | System.Collections.Immutable;ImmutableSortedSet<T>;get_IsFixedSize;();summary;df-generated |
 | System.Collections.Immutable;ImmutableSortedSet<T>;get_IsReadOnly;();summary;df-generated |
 | System.Collections.Immutable;ImmutableSortedSet<T>;get_IsSynchronized;();summary;df-generated |
+| System.Collections.Immutable;ImmutableSortedSet<T>;get_Item;(System.Int32);summary;df-generated |
 | System.Collections.Immutable;ImmutableStack;Create<T>;();summary;df-generated |
 | System.Collections.Immutable;ImmutableStack<T>+Enumerator;MoveNext;();summary;df-generated |
 | System.Collections.Immutable;ImmutableStack<T>;Clear;();summary;df-generated |
+| System.Collections.Immutable;ImmutableStack<T>;Peek;();summary;df-generated |
 | System.Collections.Immutable;ImmutableStack<T>;PeekRef;();summary;df-generated |
+| System.Collections.Immutable;ImmutableStack<T>;Pop;();summary;df-generated |
+| System.Collections.Immutable;ImmutableStack<T>;Push;(T);summary;df-generated |
 | System.Collections.Immutable;ImmutableStack<T>;get_Empty;();summary;df-generated |
 | System.Collections.Immutable;ImmutableStack<T>;get_IsEmpty;();summary;df-generated |
 | System.Collections.ObjectModel;Collection<T>;ClearItems;();summary;df-generated |
@@ -23875,6 +24509,7 @@ neutral
 | System.Collections.ObjectModel;Collection<T>;get_IsFixedSize;();summary;df-generated |
 | System.Collections.ObjectModel;Collection<T>;get_IsReadOnly;();summary;df-generated |
 | System.Collections.ObjectModel;Collection<T>;get_IsSynchronized;();summary;df-generated |
+| System.Collections.ObjectModel;Collection<T>;get_Item;(System.Int32);summary;df-generated |
 | System.Collections.ObjectModel;KeyedCollection<TKey,TItem>;ChangeItemKey;(TItem,TKey);summary;df-generated |
 | System.Collections.ObjectModel;KeyedCollection<TKey,TItem>;ClearItems;();summary;df-generated |
 | System.Collections.ObjectModel;KeyedCollection<TKey,TItem>;Contains;(TKey);summary;df-generated |
@@ -23903,6 +24538,7 @@ neutral
 | System.Collections.ObjectModel;ReadOnlyCollection<T>;get_IsFixedSize;();summary;df-generated |
 | System.Collections.ObjectModel;ReadOnlyCollection<T>;get_IsReadOnly;();summary;df-generated |
 | System.Collections.ObjectModel;ReadOnlyCollection<T>;get_IsSynchronized;();summary;df-generated |
+| System.Collections.ObjectModel;ReadOnlyCollection<T>;get_Item;(System.Int32);summary;df-generated |
 | System.Collections.ObjectModel;ReadOnlyDictionary<TKey,TValue>+KeyCollection;Contains;(TKey);summary;df-generated |
 | System.Collections.ObjectModel;ReadOnlyDictionary<TKey,TValue>+KeyCollection;Remove;(TKey);summary;df-generated |
 | System.Collections.ObjectModel;ReadOnlyDictionary<TKey,TValue>+KeyCollection;get_Count;();summary;df-generated |
@@ -23925,6 +24561,9 @@ neutral
 | System.Collections.ObjectModel;ReadOnlyDictionary<TKey,TValue>;get_IsFixedSize;();summary;df-generated |
 | System.Collections.ObjectModel;ReadOnlyDictionary<TKey,TValue>;get_IsReadOnly;();summary;df-generated |
 | System.Collections.ObjectModel;ReadOnlyDictionary<TKey,TValue>;get_IsSynchronized;();summary;df-generated |
+| System.Collections.ObjectModel;ReadOnlyDictionary<TKey,TValue>;get_Item;(TKey);summary;df-generated |
+| System.Collections.ObjectModel;ReadOnlyDictionary<TKey,TValue>;get_Keys;();summary;df-generated |
+| System.Collections.ObjectModel;ReadOnlyDictionary<TKey,TValue>;get_Values;();summary;df-generated |
 | System.Collections.ObjectModel;ReadOnlyObservableCollection<T>;OnCollectionChanged;(System.Collections.Specialized.NotifyCollectionChangedEventArgs);summary;df-generated |
 | System.Collections.ObjectModel;ReadOnlyObservableCollection<T>;OnPropertyChanged;(System.ComponentModel.PropertyChangedEventArgs);summary;df-generated |
 | System.Collections.ObjectModel;ReadOnlyObservableCollection<T>;ReadOnlyObservableCollection;(System.Collections.ObjectModel.ObservableCollection<T>);summary;df-generated |
@@ -24010,6 +24649,7 @@ neutral
 | System.Collections.Specialized;NotifyCollectionChangedEventArgs;get_NewStartingIndex;();summary;df-generated |
 | System.Collections.Specialized;NotifyCollectionChangedEventArgs;get_OldStartingIndex;();summary;df-generated |
 | System.Collections.Specialized;OrderedDictionary;Contains;(System.Object);summary;df-generated |
+| System.Collections.Specialized;OrderedDictionary;GetEnumerator;();summary;df-generated |
 | System.Collections.Specialized;OrderedDictionary;Insert;(System.Int32,System.Object,System.Object);summary;df-generated |
 | System.Collections.Specialized;OrderedDictionary;OnDeserialization;(System.Object);summary;df-generated |
 | System.Collections.Specialized;OrderedDictionary;OrderedDictionary;(System.Collections.IEqualityComparer);summary;df-generated |
@@ -24193,6 +24833,8 @@ neutral
 | System.ComponentModel.DataAnnotations.Schema;DatabaseGeneratedAttribute;get_DatabaseGeneratedOption;();summary;df-generated |
 | System.ComponentModel.DataAnnotations.Schema;ForeignKeyAttribute;ForeignKeyAttribute;(System.String);summary;df-generated |
 | System.ComponentModel.DataAnnotations.Schema;ForeignKeyAttribute;get_Name;();summary;df-generated |
+| System.ComponentModel.DataAnnotations.Schema;IndexAttribute;Equals;(System.Object);summary;df-generated |
+| System.ComponentModel.DataAnnotations.Schema;IndexAttribute;GetHashCode;();summary;df-generated |
 | System.ComponentModel.DataAnnotations.Schema;InversePropertyAttribute;InversePropertyAttribute;(System.String);summary;df-generated |
 | System.ComponentModel.DataAnnotations.Schema;InversePropertyAttribute;get_Property;();summary;df-generated |
 | System.ComponentModel.DataAnnotations.Schema;TableAttribute;TableAttribute;(System.String);summary;df-generated |
@@ -25167,6 +25809,7 @@ neutral
 | System.ComponentModel;PropertyDescriptorCollection;InternalSort;(System.Collections.IComparer);summary;df-generated |
 | System.ComponentModel;PropertyDescriptorCollection;InternalSort;(System.String[]);summary;df-generated |
 | System.ComponentModel;PropertyDescriptorCollection;Remove;(System.ComponentModel.PropertyDescriptor);summary;df-generated |
+| System.ComponentModel;PropertyDescriptorCollection;Remove;(System.Object);summary;df-generated |
 | System.ComponentModel;PropertyDescriptorCollection;RemoveAt;(System.Int32);summary;df-generated |
 | System.ComponentModel;PropertyDescriptorCollection;get_Count;();summary;df-generated |
 | System.ComponentModel;PropertyDescriptorCollection;get_IsFixedSize;();summary;df-generated |
@@ -25968,15 +26611,18 @@ neutral
 | System.Data.Common;DbDataReader;GetChars;(System.Int32,System.Int64,System.Char[],System.Int32,System.Int32);summary;df-generated |
 | System.Data.Common;DbDataReader;GetColumnSchemaAsync;(System.Threading.CancellationToken);summary;df-generated |
 | System.Data.Common;DbDataReader;GetData;(System.Int32);summary;df-generated |
+| System.Data.Common;DbDataReader;GetDataTypeName;(System.Int32);summary;manual |
 | System.Data.Common;DbDataReader;GetDateTime;(System.Int32);summary;df-generated |
 | System.Data.Common;DbDataReader;GetDbDataReader;(System.Int32);summary;df-generated |
 | System.Data.Common;DbDataReader;GetDecimal;(System.Int32);summary;df-generated |
 | System.Data.Common;DbDataReader;GetDouble;(System.Int32);summary;df-generated |
 | System.Data.Common;DbDataReader;GetFieldType;(System.Int32);summary;df-generated |
 | System.Data.Common;DbDataReader;GetFloat;(System.Int32);summary;df-generated |
+| System.Data.Common;DbDataReader;GetGuid;(System.Int32);summary;manual |
 | System.Data.Common;DbDataReader;GetInt16;(System.Int32);summary;df-generated |
 | System.Data.Common;DbDataReader;GetInt32;(System.Int32);summary;df-generated |
 | System.Data.Common;DbDataReader;GetInt64;(System.Int32);summary;df-generated |
+| System.Data.Common;DbDataReader;GetName;(System.Int32);summary;manual |
 | System.Data.Common;DbDataReader;GetOrdinal;(System.String);summary;df-generated |
 | System.Data.Common;DbDataReader;GetProviderSpecificFieldType;(System.Int32);summary;df-generated |
 | System.Data.Common;DbDataReader;GetStream;(System.Int32);summary;df-generated |
@@ -26006,6 +26652,7 @@ neutral
 | System.Data.Common;DbDataRecord;GetComponentName;();summary;df-generated |
 | System.Data.Common;DbDataRecord;GetConverter;();summary;df-generated |
 | System.Data.Common;DbDataRecord;GetData;(System.Int32);summary;df-generated |
+| System.Data.Common;DbDataRecord;GetDataTypeName;(System.Int32);summary;manual |
 | System.Data.Common;DbDataRecord;GetDateTime;(System.Int32);summary;df-generated |
 | System.Data.Common;DbDataRecord;GetDbDataReader;(System.Int32);summary;df-generated |
 | System.Data.Common;DbDataRecord;GetDecimal;(System.Int32);summary;df-generated |
@@ -26017,9 +26664,11 @@ neutral
 | System.Data.Common;DbDataRecord;GetEvents;(System.Attribute[]);summary;df-generated |
 | System.Data.Common;DbDataRecord;GetFieldType;(System.Int32);summary;df-generated |
 | System.Data.Common;DbDataRecord;GetFloat;(System.Int32);summary;df-generated |
+| System.Data.Common;DbDataRecord;GetGuid;(System.Int32);summary;manual |
 | System.Data.Common;DbDataRecord;GetInt16;(System.Int32);summary;df-generated |
 | System.Data.Common;DbDataRecord;GetInt32;(System.Int32);summary;df-generated |
 | System.Data.Common;DbDataRecord;GetInt64;(System.Int32);summary;df-generated |
+| System.Data.Common;DbDataRecord;GetName;(System.Int32);summary;manual |
 | System.Data.Common;DbDataRecord;GetOrdinal;(System.String);summary;df-generated |
 | System.Data.Common;DbDataRecord;IsDBNull;(System.Int32);summary;df-generated |
 | System.Data.Common;DbDataRecord;get_FieldCount;();summary;df-generated |
@@ -26047,6 +26696,7 @@ neutral
 | System.Data.Common;DbException;get_IsTransient;();summary;df-generated |
 | System.Data.Common;DbException;get_SqlState;();summary;df-generated |
 | System.Data.Common;DbParameter;ResetDbType;();summary;df-generated |
+| System.Data.Common;DbParameter;get_IsNullable;();summary;df-generated |
 | System.Data.Common;DbParameterCollection;Contains;(System.Object);summary;df-generated |
 | System.Data.Common;DbParameterCollection;Contains;(System.String);summary;df-generated |
 | System.Data.Common;DbParameterCollection;IndexOf;(System.Object);summary;df-generated |
@@ -26096,6 +26746,150 @@ neutral
 | System.Data.Common;RowUpdatedEventArgs;get_RowCount;();summary;df-generated |
 | System.Data.Common;RowUpdatedEventArgs;get_StatementType;();summary;df-generated |
 | System.Data.Common;RowUpdatingEventArgs;get_StatementType;();summary;df-generated |
+| System.Data.Entity.Core.EntityClient;EntityCommand;Cancel;();summary;df-generated |
+| System.Data.Entity.Core.EntityClient;EntityCommand;CreateDbParameter;();summary;df-generated |
+| System.Data.Entity.Core.EntityClient;EntityCommand;ExecuteNonQuery;();summary;df-generated |
+| System.Data.Entity.Core.EntityClient;EntityCommand;ExecuteNonQueryAsync;(System.Threading.CancellationToken);summary;df-generated |
+| System.Data.Entity.Core.EntityClient;EntityCommand;Prepare;();summary;df-generated |
+| System.Data.Entity.Core.EntityClient;EntityConnection;ChangeDatabase;(System.String);summary;df-generated |
+| System.Data.Entity.Core.EntityClient;EntityConnection;Close;();summary;df-generated |
+| System.Data.Entity.Core.EntityClient;EntityConnection;Dispose;(System.Boolean);summary;df-generated |
+| System.Data.Entity.Core.EntityClient;EntityConnection;EnlistTransaction;(System.Transactions.Transaction);summary;df-generated |
+| System.Data.Entity.Core.EntityClient;EntityConnection;Open;();summary;df-generated |
+| System.Data.Entity.Core.EntityClient;EntityConnection;get_ConnectionTimeout;();summary;df-generated |
+| System.Data.Entity.Core.EntityClient;EntityConnection;get_DataSource;();summary;df-generated |
+| System.Data.Entity.Core.EntityClient;EntityConnection;get_Database;();summary;df-generated |
+| System.Data.Entity.Core.EntityClient;EntityConnection;get_DbProviderFactory;();summary;df-generated |
+| System.Data.Entity.Core.EntityClient;EntityConnection;get_State;();summary;df-generated |
+| System.Data.Entity.Core.EntityClient;EntityConnectionStringBuilder;ContainsKey;(System.String);summary;df-generated |
+| System.Data.Entity.Core.EntityClient;EntityConnectionStringBuilder;Remove;(System.String);summary;df-generated |
+| System.Data.Entity.Core.EntityClient;EntityConnectionStringBuilder;get_IsFixedSize;();summary;df-generated |
+| System.Data.Entity.Core.EntityClient;EntityDataReader;Close;();summary;df-generated |
+| System.Data.Entity.Core.EntityClient;EntityDataReader;Dispose;(System.Boolean);summary;df-generated |
+| System.Data.Entity.Core.EntityClient;EntityDataReader;GetBoolean;(System.Int32);summary;df-generated |
+| System.Data.Entity.Core.EntityClient;EntityDataReader;GetByte;(System.Int32);summary;df-generated |
+| System.Data.Entity.Core.EntityClient;EntityDataReader;GetBytes;(System.Int32,System.Int64,System.Byte[],System.Int32,System.Int32);summary;df-generated |
+| System.Data.Entity.Core.EntityClient;EntityDataReader;GetChar;(System.Int32);summary;df-generated |
+| System.Data.Entity.Core.EntityClient;EntityDataReader;GetChars;(System.Int32,System.Int64,System.Char[],System.Int32,System.Int32);summary;df-generated |
+| System.Data.Entity.Core.EntityClient;EntityDataReader;GetDataTypeName;(System.Int32);summary;manual |
+| System.Data.Entity.Core.EntityClient;EntityDataReader;GetDateTime;(System.Int32);summary;df-generated |
+| System.Data.Entity.Core.EntityClient;EntityDataReader;GetDbDataReader;(System.Int32);summary;df-generated |
+| System.Data.Entity.Core.EntityClient;EntityDataReader;GetDecimal;(System.Int32);summary;df-generated |
+| System.Data.Entity.Core.EntityClient;EntityDataReader;GetDouble;(System.Int32);summary;df-generated |
+| System.Data.Entity.Core.EntityClient;EntityDataReader;GetFieldType;(System.Int32);summary;df-generated |
+| System.Data.Entity.Core.EntityClient;EntityDataReader;GetFloat;(System.Int32);summary;df-generated |
+| System.Data.Entity.Core.EntityClient;EntityDataReader;GetGuid;(System.Int32);summary;manual |
+| System.Data.Entity.Core.EntityClient;EntityDataReader;GetInt16;(System.Int32);summary;df-generated |
+| System.Data.Entity.Core.EntityClient;EntityDataReader;GetInt32;(System.Int32);summary;df-generated |
+| System.Data.Entity.Core.EntityClient;EntityDataReader;GetInt64;(System.Int32);summary;df-generated |
+| System.Data.Entity.Core.EntityClient;EntityDataReader;GetName;(System.Int32);summary;manual |
+| System.Data.Entity.Core.EntityClient;EntityDataReader;GetOrdinal;(System.String);summary;df-generated |
+| System.Data.Entity.Core.EntityClient;EntityDataReader;GetProviderSpecificFieldType;(System.Int32);summary;df-generated |
+| System.Data.Entity.Core.EntityClient;EntityDataReader;IsDBNull;(System.Int32);summary;df-generated |
+| System.Data.Entity.Core.EntityClient;EntityDataReader;NextResult;();summary;df-generated |
+| System.Data.Entity.Core.EntityClient;EntityDataReader;NextResultAsync;(System.Threading.CancellationToken);summary;df-generated |
+| System.Data.Entity.Core.EntityClient;EntityDataReader;Read;();summary;df-generated |
+| System.Data.Entity.Core.EntityClient;EntityDataReader;ReadAsync;(System.Threading.CancellationToken);summary;df-generated |
+| System.Data.Entity.Core.EntityClient;EntityDataReader;get_Depth;();summary;df-generated |
+| System.Data.Entity.Core.EntityClient;EntityDataReader;get_FieldCount;();summary;df-generated |
+| System.Data.Entity.Core.EntityClient;EntityDataReader;get_HasRows;();summary;df-generated |
+| System.Data.Entity.Core.EntityClient;EntityDataReader;get_IsClosed;();summary;df-generated |
+| System.Data.Entity.Core.EntityClient;EntityDataReader;get_RecordsAffected;();summary;df-generated |
+| System.Data.Entity.Core.EntityClient;EntityDataReader;get_VisibleFieldCount;();summary;df-generated |
+| System.Data.Entity.Core.EntityClient;EntityParameter;ResetDbType;();summary;df-generated |
+| System.Data.Entity.Core.EntityClient;EntityParameter;get_IsNullable;();summary;df-generated |
+| System.Data.Entity.Core.EntityClient;EntityParameterCollection;Contains;(System.Object);summary;df-generated |
+| System.Data.Entity.Core.EntityClient;EntityParameterCollection;Contains;(System.String);summary;df-generated |
+| System.Data.Entity.Core.EntityClient;EntityParameterCollection;IndexOf;(System.Object);summary;df-generated |
+| System.Data.Entity.Core.EntityClient;EntityParameterCollection;IndexOf;(System.String);summary;df-generated |
+| System.Data.Entity.Core.EntityClient;EntityParameterCollection;Remove;(System.Object);summary;df-generated |
+| System.Data.Entity.Core.EntityClient;EntityParameterCollection;RemoveAt;(System.Int32);summary;df-generated |
+| System.Data.Entity.Core.EntityClient;EntityParameterCollection;RemoveAt;(System.String);summary;df-generated |
+| System.Data.Entity.Core.EntityClient;EntityParameterCollection;get_Count;();summary;df-generated |
+| System.Data.Entity.Core.EntityClient;EntityParameterCollection;get_IsFixedSize;();summary;df-generated |
+| System.Data.Entity.Core.EntityClient;EntityParameterCollection;get_IsReadOnly;();summary;df-generated |
+| System.Data.Entity.Core.EntityClient;EntityParameterCollection;get_IsSynchronized;();summary;df-generated |
+| System.Data.Entity.Core.EntityClient;EntityProviderFactory;CreateCommand;();summary;df-generated |
+| System.Data.Entity.Core.EntityClient;EntityProviderFactory;CreateCommandBuilder;();summary;df-generated |
+| System.Data.Entity.Core.EntityClient;EntityProviderFactory;CreateConnection;();summary;df-generated |
+| System.Data.Entity.Core.EntityClient;EntityProviderFactory;CreateConnectionStringBuilder;();summary;df-generated |
+| System.Data.Entity.Core.EntityClient;EntityProviderFactory;CreateDataAdapter;();summary;df-generated |
+| System.Data.Entity.Core.EntityClient;EntityProviderFactory;CreateParameter;();summary;df-generated |
+| System.Data.Entity.Core.EntityClient;EntityTransaction;Commit;();summary;df-generated |
+| System.Data.Entity.Core.EntityClient;EntityTransaction;Dispose;(System.Boolean);summary;df-generated |
+| System.Data.Entity.Core.EntityClient;EntityTransaction;Rollback;();summary;df-generated |
+| System.Data.Entity.Core.EntityClient;EntityTransaction;get_IsolationLevel;();summary;df-generated |
+| System.Data.Entity.Core.Metadata.Edm;ReadOnlyMetadataCollection<T>+Enumerator;Dispose;();summary;df-generated |
+| System.Data.Entity.Core.Metadata.Edm;ReadOnlyMetadataCollection<T>+Enumerator;MoveNext;();summary;df-generated |
+| System.Data.Entity.Core.Metadata.Edm;ReadOnlyMetadataCollection<T>+Enumerator;Reset;();summary;df-generated |
+| System.Data.Entity.Core.Metadata.Edm;ReadOnlyMetadataCollection<T>+Enumerator;get_Current;();summary;df-generated |
+| System.Data.Entity.Core.Objects.DataClasses;EntityCollection<TEntity>;Contains;(TEntity);summary;df-generated |
+| System.Data.Entity.Core.Objects.DataClasses;EntityCollection<TEntity>;Remove;(TEntity);summary;df-generated |
+| System.Data.Entity.Core.Objects.DataClasses;EntityCollection<TEntity>;get_ContainsListCollection;();summary;df-generated |
+| System.Data.Entity.Core.Objects.DataClasses;EntityCollection<TEntity>;get_Count;();summary;df-generated |
+| System.Data.Entity.Core.Objects.DataClasses;EntityCollection<TEntity>;get_IsReadOnly;();summary;df-generated |
+| System.Data.Entity.Core.Objects;DbUpdatableDataRecord;GetBoolean;(System.Int32);summary;df-generated |
+| System.Data.Entity.Core.Objects;DbUpdatableDataRecord;GetByte;(System.Int32);summary;df-generated |
+| System.Data.Entity.Core.Objects;DbUpdatableDataRecord;GetBytes;(System.Int32,System.Int64,System.Byte[],System.Int32,System.Int32);summary;df-generated |
+| System.Data.Entity.Core.Objects;DbUpdatableDataRecord;GetChar;(System.Int32);summary;df-generated |
+| System.Data.Entity.Core.Objects;DbUpdatableDataRecord;GetChars;(System.Int32,System.Int64,System.Char[],System.Int32,System.Int32);summary;df-generated |
+| System.Data.Entity.Core.Objects;DbUpdatableDataRecord;GetData;(System.Int32);summary;df-generated |
+| System.Data.Entity.Core.Objects;DbUpdatableDataRecord;GetDataTypeName;(System.Int32);summary;manual |
+| System.Data.Entity.Core.Objects;DbUpdatableDataRecord;GetDateTime;(System.Int32);summary;df-generated |
+| System.Data.Entity.Core.Objects;DbUpdatableDataRecord;GetDbDataReader;(System.Int32);summary;df-generated |
+| System.Data.Entity.Core.Objects;DbUpdatableDataRecord;GetDecimal;(System.Int32);summary;df-generated |
+| System.Data.Entity.Core.Objects;DbUpdatableDataRecord;GetDouble;(System.Int32);summary;df-generated |
+| System.Data.Entity.Core.Objects;DbUpdatableDataRecord;GetFieldType;(System.Int32);summary;df-generated |
+| System.Data.Entity.Core.Objects;DbUpdatableDataRecord;GetFloat;(System.Int32);summary;df-generated |
+| System.Data.Entity.Core.Objects;DbUpdatableDataRecord;GetGuid;(System.Int32);summary;manual |
+| System.Data.Entity.Core.Objects;DbUpdatableDataRecord;GetInt16;(System.Int32);summary;df-generated |
+| System.Data.Entity.Core.Objects;DbUpdatableDataRecord;GetInt32;(System.Int32);summary;df-generated |
+| System.Data.Entity.Core.Objects;DbUpdatableDataRecord;GetInt64;(System.Int32);summary;df-generated |
+| System.Data.Entity.Core.Objects;DbUpdatableDataRecord;GetName;(System.Int32);summary;manual |
+| System.Data.Entity.Core.Objects;DbUpdatableDataRecord;GetOrdinal;(System.String);summary;df-generated |
+| System.Data.Entity.Core.Objects;DbUpdatableDataRecord;IsDBNull;(System.Int32);summary;df-generated |
+| System.Data.Entity.Core.Objects;DbUpdatableDataRecord;get_FieldCount;();summary;df-generated |
+| System.Data.Entity.Core.Objects;ObjectContext;Dispose;();summary;df-generated |
+| System.Data.Entity.Core.Objects;ObjectParameterCollection;Contains;(System.Data.Entity.Core.Objects.ObjectParameter);summary;df-generated |
+| System.Data.Entity.Core.Objects;ObjectParameterCollection;Remove;(System.Data.Entity.Core.Objects.ObjectParameter);summary;df-generated |
+| System.Data.Entity.Core.Objects;ObjectParameterCollection;get_Count;();summary;df-generated |
+| System.Data.Entity.Core.Objects;ObjectParameterCollection;get_IsReadOnly;();summary;df-generated |
+| System.Data.Entity.Core.Objects;ObjectQuery;get_ContainsListCollection;();summary;df-generated |
+| System.Data.Entity.Core.Objects;ObjectQuery;get_ElementType;();summary;df-generated |
+| System.Data.Entity.Core.Objects;ObjectResult;Dispose;();summary;df-generated |
+| System.Data.Entity.Core.Objects;ObjectResult;get_ContainsListCollection;();summary;df-generated |
+| System.Data.Entity.Core.Objects;ProxyDataContractResolver;ResolveName;(System.String,System.String,System.Type,System.Runtime.Serialization.DataContractResolver);summary;df-generated |
+| System.Data.Entity.Core.Objects;ProxyDataContractResolver;TryResolveType;(System.Type,System.Type,System.Runtime.Serialization.DataContractResolver,System.Xml.XmlDictionaryString,System.Xml.XmlDictionaryString);summary;df-generated |
+| System.Data.Entity.Core;EntityKey;Equals;(System.Data.Entity.Core.EntityKey);summary;df-generated |
+| System.Data.Entity.Hierarchy;HierarchyId;CompareTo;(System.Object);summary;df-generated |
+| System.Data.Entity.Infrastructure.Interception;DatabaseLogger;Dispose;();summary;df-generated |
+| System.Data.Entity.Infrastructure;DbQuery;get_ContainsListCollection;();summary;df-generated |
+| System.Data.Entity.Infrastructure;DbQuery;get_ElementType;();summary;df-generated |
+| System.Data.Entity.Infrastructure;DbQuery<TResult>;get_ContainsListCollection;();summary;df-generated |
+| System.Data.Entity.Infrastructure;DbQuery<TResult>;get_ElementType;();summary;df-generated |
+| System.Data.Entity.Infrastructure;DbRawSqlQuery;get_ContainsListCollection;();summary;df-generated |
+| System.Data.Entity.Infrastructure;DbRawSqlQuery<TElement>;get_ContainsListCollection;();summary;df-generated |
+| System.Data.Entity.Infrastructure;ObjectReferenceEqualityComparer;Equals;(System.Object,System.Object);summary;df-generated |
+| System.Data.Entity.Infrastructure;ObjectReferenceEqualityComparer;GetHashCode;(System.Object);summary;df-generated |
+| System.Data.Entity.Infrastructure;TransactionHandler;Dispose;();summary;df-generated |
+| System.Data.Entity.Migrations.Utilities;IndentedTextWriter;Close;();summary;df-generated |
+| System.Data.Entity.Migrations.Utilities;IndentedTextWriter;Flush;();summary;df-generated |
+| System.Data.Entity.Migrations.Utilities;IndentedTextWriter;Write;(System.Boolean);summary;df-generated |
+| System.Data.Entity.Migrations.Utilities;IndentedTextWriter;Write;(System.Char);summary;df-generated |
+| System.Data.Entity.Migrations.Utilities;IndentedTextWriter;Write;(System.Double);summary;df-generated |
+| System.Data.Entity.Migrations.Utilities;IndentedTextWriter;Write;(System.Int32);summary;df-generated |
+| System.Data.Entity.Migrations.Utilities;IndentedTextWriter;Write;(System.Int64);summary;df-generated |
+| System.Data.Entity.Migrations.Utilities;IndentedTextWriter;Write;(System.Single);summary;df-generated |
+| System.Data.Entity.Migrations.Utilities;IndentedTextWriter;WriteLine;();summary;df-generated |
+| System.Data.Entity.Migrations.Utilities;IndentedTextWriter;WriteLine;(System.Boolean);summary;df-generated |
+| System.Data.Entity.Migrations.Utilities;IndentedTextWriter;WriteLine;(System.Char);summary;df-generated |
+| System.Data.Entity.Migrations.Utilities;IndentedTextWriter;WriteLine;(System.Double);summary;df-generated |
+| System.Data.Entity.Migrations.Utilities;IndentedTextWriter;WriteLine;(System.Int32);summary;df-generated |
+| System.Data.Entity.Migrations.Utilities;IndentedTextWriter;WriteLine;(System.Int64);summary;df-generated |
+| System.Data.Entity.Migrations.Utilities;IndentedTextWriter;WriteLine;(System.Single);summary;df-generated |
+| System.Data.Entity.Migrations.Utilities;IndentedTextWriter;WriteLine;(System.UInt32);summary;df-generated |
+| System.Data.Entity;DbContext;Dispose;();summary;df-generated |
+| System.Data.Entity;DbContextTransaction;Dispose;();summary;df-generated |
 | System.Data.Odbc;OdbcPermission;Add;(System.String,System.String,System.Data.KeyRestrictionBehavior);summary;df-generated |
 | System.Data.Odbc;OdbcPermission;OdbcPermission;(System.Security.Permissions.PermissionState);summary;df-generated |
 | System.Data.Odbc;OdbcPermission;OdbcPermission;(System.Security.Permissions.PermissionState,System.Boolean);summary;df-generated |
@@ -26115,11 +26909,95 @@ neutral
 | System.Data.OracleClient;OraclePermissionAttribute;OraclePermissionAttribute;(System.Security.Permissions.SecurityAction);summary;df-generated |
 | System.Data.OracleClient;OraclePermissionAttribute;ShouldSerializeConnectionString;();summary;df-generated |
 | System.Data.OracleClient;OraclePermissionAttribute;ShouldSerializeKeyRestrictions;();summary;df-generated |
+| System.Data.SqlClient;SqlBulkCopy;Dispose;();summary;df-generated |
+| System.Data.SqlClient;SqlClientFactory;CreateCommand;();summary;df-generated |
+| System.Data.SqlClient;SqlClientFactory;CreateCommandBuilder;();summary;df-generated |
+| System.Data.SqlClient;SqlClientFactory;CreateConnection;();summary;df-generated |
+| System.Data.SqlClient;SqlClientFactory;CreateConnectionStringBuilder;();summary;df-generated |
+| System.Data.SqlClient;SqlClientFactory;CreateDataAdapter;();summary;df-generated |
+| System.Data.SqlClient;SqlClientFactory;CreateParameter;();summary;df-generated |
 | System.Data.SqlClient;SqlClientPermission;Add;(System.String,System.String,System.Data.KeyRestrictionBehavior);summary;df-generated |
 | System.Data.SqlClient;SqlClientPermission;SqlClientPermission;(System.Security.Permissions.PermissionState);summary;df-generated |
 | System.Data.SqlClient;SqlClientPermission;SqlClientPermission;(System.Security.Permissions.PermissionState,System.Boolean);summary;df-generated |
 | System.Data.SqlClient;SqlClientPermissionAttribute;CreatePermission;();summary;df-generated |
 | System.Data.SqlClient;SqlClientPermissionAttribute;SqlClientPermissionAttribute;(System.Security.Permissions.SecurityAction);summary;df-generated |
+| System.Data.SqlClient;SqlCommand;Cancel;();summary;df-generated |
+| System.Data.SqlClient;SqlCommand;CreateDbParameter;();summary;df-generated |
+| System.Data.SqlClient;SqlCommand;Dispose;(System.Boolean);summary;df-generated |
+| System.Data.SqlClient;SqlCommand;ExecuteNonQuery;();summary;df-generated |
+| System.Data.SqlClient;SqlCommand;ExecuteNonQueryAsync;(System.Threading.CancellationToken);summary;df-generated |
+| System.Data.SqlClient;SqlCommand;Prepare;();summary;df-generated |
+| System.Data.SqlClient;SqlCommandBuilder;ApplyParameterInfo;(System.Data.Common.DbParameter,System.Data.DataRow,System.Data.StatementType,System.Boolean);summary;df-generated |
+| System.Data.SqlClient;SqlCommandBuilder;GetParameterName;(System.Int32);summary;df-generated |
+| System.Data.SqlClient;SqlCommandBuilder;GetParameterPlaceholder;(System.Int32);summary;df-generated |
+| System.Data.SqlClient;SqlCommandBuilder;GetSchemaTable;(System.Data.Common.DbCommand);summary;df-generated |
+| System.Data.SqlClient;SqlCommandBuilder;SetRowUpdatingHandler;(System.Data.Common.DbDataAdapter);summary;df-generated |
+| System.Data.SqlClient;SqlConnection;ChangeDatabase;(System.String);summary;df-generated |
+| System.Data.SqlClient;SqlConnection;Close;();summary;df-generated |
+| System.Data.SqlClient;SqlConnection;Dispose;(System.Boolean);summary;df-generated |
+| System.Data.SqlClient;SqlConnection;GetSchema;();summary;df-generated |
+| System.Data.SqlClient;SqlConnection;GetSchema;(System.String);summary;df-generated |
+| System.Data.SqlClient;SqlConnection;GetSchema;(System.String,System.String[]);summary;df-generated |
+| System.Data.SqlClient;SqlConnection;Open;();summary;df-generated |
+| System.Data.SqlClient;SqlConnection;get_ConnectionTimeout;();summary;df-generated |
+| System.Data.SqlClient;SqlConnection;get_DataSource;();summary;df-generated |
+| System.Data.SqlClient;SqlConnection;get_Database;();summary;df-generated |
+| System.Data.SqlClient;SqlConnection;get_State;();summary;df-generated |
+| System.Data.SqlClient;SqlConnectionStringBuilder;ContainsKey;(System.String);summary;df-generated |
+| System.Data.SqlClient;SqlConnectionStringBuilder;Remove;(System.String);summary;df-generated |
+| System.Data.SqlClient;SqlConnectionStringBuilder;ShouldSerialize;(System.String);summary;df-generated |
+| System.Data.SqlClient;SqlDataAdapter;OnRowUpdated;(System.Data.Common.RowUpdatedEventArgs);summary;df-generated |
+| System.Data.SqlClient;SqlDataAdapter;OnRowUpdating;(System.Data.Common.RowUpdatingEventArgs);summary;df-generated |
+| System.Data.SqlClient;SqlDataReader;GetBoolean;(System.Int32);summary;df-generated |
+| System.Data.SqlClient;SqlDataReader;GetByte;(System.Int32);summary;df-generated |
+| System.Data.SqlClient;SqlDataReader;GetBytes;(System.Int32,System.Int64,System.Byte[],System.Int32,System.Int32);summary;df-generated |
+| System.Data.SqlClient;SqlDataReader;GetChar;(System.Int32);summary;df-generated |
+| System.Data.SqlClient;SqlDataReader;GetChars;(System.Int32,System.Int64,System.Char[],System.Int32,System.Int32);summary;df-generated |
+| System.Data.SqlClient;SqlDataReader;GetColumnSchema;();summary;df-generated |
+| System.Data.SqlClient;SqlDataReader;GetDataTypeName;(System.Int32);summary;manual |
+| System.Data.SqlClient;SqlDataReader;GetDateTime;(System.Int32);summary;df-generated |
+| System.Data.SqlClient;SqlDataReader;GetDecimal;(System.Int32);summary;df-generated |
+| System.Data.SqlClient;SqlDataReader;GetDouble;(System.Int32);summary;df-generated |
+| System.Data.SqlClient;SqlDataReader;GetFieldType;(System.Int32);summary;df-generated |
+| System.Data.SqlClient;SqlDataReader;GetFloat;(System.Int32);summary;df-generated |
+| System.Data.SqlClient;SqlDataReader;GetGuid;(System.Int32);summary;manual |
+| System.Data.SqlClient;SqlDataReader;GetInt16;(System.Int32);summary;df-generated |
+| System.Data.SqlClient;SqlDataReader;GetInt32;(System.Int32);summary;df-generated |
+| System.Data.SqlClient;SqlDataReader;GetInt64;(System.Int32);summary;df-generated |
+| System.Data.SqlClient;SqlDataReader;GetName;(System.Int32);summary;manual |
+| System.Data.SqlClient;SqlDataReader;GetOrdinal;(System.String);summary;df-generated |
+| System.Data.SqlClient;SqlDataReader;GetProviderSpecificFieldType;(System.Int32);summary;df-generated |
+| System.Data.SqlClient;SqlDataReader;GetStream;(System.Int32);summary;df-generated |
+| System.Data.SqlClient;SqlDataReader;IsDBNull;(System.Int32);summary;df-generated |
+| System.Data.SqlClient;SqlDataReader;IsDBNullAsync;(System.Int32,System.Threading.CancellationToken);summary;df-generated |
+| System.Data.SqlClient;SqlDataReader;NextResult;();summary;df-generated |
+| System.Data.SqlClient;SqlDataReader;NextResultAsync;(System.Threading.CancellationToken);summary;df-generated |
+| System.Data.SqlClient;SqlDataReader;Read;();summary;df-generated |
+| System.Data.SqlClient;SqlDataReader;ReadAsync;(System.Threading.CancellationToken);summary;df-generated |
+| System.Data.SqlClient;SqlDataReader;get_Depth;();summary;df-generated |
+| System.Data.SqlClient;SqlDataReader;get_FieldCount;();summary;df-generated |
+| System.Data.SqlClient;SqlDataReader;get_HasRows;();summary;df-generated |
+| System.Data.SqlClient;SqlDataReader;get_IsClosed;();summary;df-generated |
+| System.Data.SqlClient;SqlDataReader;get_RecordsAffected;();summary;df-generated |
+| System.Data.SqlClient;SqlDataReader;get_VisibleFieldCount;();summary;df-generated |
+| System.Data.SqlClient;SqlErrorCollection;get_Count;();summary;df-generated |
+| System.Data.SqlClient;SqlErrorCollection;get_IsSynchronized;();summary;df-generated |
+| System.Data.SqlClient;SqlParameter;ResetDbType;();summary;df-generated |
+| System.Data.SqlClient;SqlParameter;get_IsNullable;();summary;df-generated |
+| System.Data.SqlClient;SqlParameterCollection;Contains;(System.Object);summary;df-generated |
+| System.Data.SqlClient;SqlParameterCollection;Contains;(System.String);summary;df-generated |
+| System.Data.SqlClient;SqlParameterCollection;IndexOf;(System.Object);summary;df-generated |
+| System.Data.SqlClient;SqlParameterCollection;IndexOf;(System.String);summary;df-generated |
+| System.Data.SqlClient;SqlParameterCollection;Remove;(System.Object);summary;df-generated |
+| System.Data.SqlClient;SqlParameterCollection;RemoveAt;(System.Int32);summary;df-generated |
+| System.Data.SqlClient;SqlParameterCollection;RemoveAt;(System.String);summary;df-generated |
+| System.Data.SqlClient;SqlParameterCollection;get_Count;();summary;df-generated |
+| System.Data.SqlClient;SqlParameterCollection;get_IsFixedSize;();summary;df-generated |
+| System.Data.SqlClient;SqlParameterCollection;get_IsReadOnly;();summary;df-generated |
+| System.Data.SqlClient;SqlTransaction;Commit;();summary;df-generated |
+| System.Data.SqlClient;SqlTransaction;Dispose;(System.Boolean);summary;df-generated |
+| System.Data.SqlClient;SqlTransaction;Rollback;();summary;df-generated |
+| System.Data.SqlClient;SqlTransaction;get_IsolationLevel;();summary;df-generated |
 | System.Data.SqlTypes;INullable;get_IsNull;();summary;df-generated |
 | System.Data.SqlTypes;SqlAlreadyFilledException;SqlAlreadyFilledException;(System.String);summary;df-generated |
 | System.Data.SqlTypes;SqlAlreadyFilledException;SqlAlreadyFilledException;(System.String,System.Exception);summary;df-generated |
@@ -26408,6 +27286,13 @@ neutral
 | System.Data.SqlTypes;SqlDouble;op_Multiply;(System.Data.SqlTypes.SqlDouble,System.Data.SqlTypes.SqlDouble);summary;df-generated |
 | System.Data.SqlTypes;SqlDouble;op_Subtraction;(System.Data.SqlTypes.SqlDouble,System.Data.SqlTypes.SqlDouble);summary;df-generated |
 | System.Data.SqlTypes;SqlDouble;op_UnaryNegation;(System.Data.SqlTypes.SqlDouble);summary;df-generated |
+| System.Data.SqlTypes;SqlFileStream;Flush;();summary;df-generated |
+| System.Data.SqlTypes;SqlFileStream;Seek;(System.Int64,System.IO.SeekOrigin);summary;df-generated |
+| System.Data.SqlTypes;SqlFileStream;SetLength;(System.Int64);summary;df-generated |
+| System.Data.SqlTypes;SqlFileStream;get_CanRead;();summary;df-generated |
+| System.Data.SqlTypes;SqlFileStream;get_CanSeek;();summary;df-generated |
+| System.Data.SqlTypes;SqlFileStream;get_CanWrite;();summary;df-generated |
+| System.Data.SqlTypes;SqlFileStream;get_Length;();summary;df-generated |
 | System.Data.SqlTypes;SqlGuid;CompareTo;(System.Data.SqlTypes.SqlGuid);summary;df-generated |
 | System.Data.SqlTypes;SqlGuid;CompareTo;(System.Object);summary;df-generated |
 | System.Data.SqlTypes;SqlGuid;Equals;(System.Data.SqlTypes.SqlGuid);summary;df-generated |
@@ -27046,14 +27931,17 @@ neutral
 | System.Data;DataTableReader;GetBytes;(System.Int32,System.Int64,System.Byte[],System.Int32,System.Int32);summary;df-generated |
 | System.Data;DataTableReader;GetChar;(System.Int32);summary;df-generated |
 | System.Data;DataTableReader;GetChars;(System.Int32,System.Int64,System.Char[],System.Int32,System.Int32);summary;df-generated |
+| System.Data;DataTableReader;GetDataTypeName;(System.Int32);summary;manual |
 | System.Data;DataTableReader;GetDateTime;(System.Int32);summary;df-generated |
 | System.Data;DataTableReader;GetDecimal;(System.Int32);summary;df-generated |
 | System.Data;DataTableReader;GetDouble;(System.Int32);summary;df-generated |
 | System.Data;DataTableReader;GetFieldType;(System.Int32);summary;df-generated |
 | System.Data;DataTableReader;GetFloat;(System.Int32);summary;df-generated |
+| System.Data;DataTableReader;GetGuid;(System.Int32);summary;manual |
 | System.Data;DataTableReader;GetInt16;(System.Int32);summary;df-generated |
 | System.Data;DataTableReader;GetInt32;(System.Int32);summary;df-generated |
 | System.Data;DataTableReader;GetInt64;(System.Int32);summary;df-generated |
+| System.Data;DataTableReader;GetName;(System.Int32);summary;manual |
 | System.Data;DataTableReader;GetOrdinal;(System.String);summary;df-generated |
 | System.Data;DataTableReader;GetProviderSpecificFieldType;(System.Int32);summary;df-generated |
 | System.Data;DataTableReader;IsDBNull;(System.Int32);summary;df-generated |
@@ -27790,10 +28678,12 @@ neutral
 | System.Diagnostics;ActivityTagsCollection+Enumerator;Dispose;();summary;df-generated |
 | System.Diagnostics;ActivityTagsCollection+Enumerator;MoveNext;();summary;df-generated |
 | System.Diagnostics;ActivityTagsCollection+Enumerator;Reset;();summary;df-generated |
+| System.Diagnostics;ActivityTagsCollection+Enumerator;get_Current;();summary;df-generated |
 | System.Diagnostics;ActivityTagsCollection;Contains;(System.Collections.Generic.KeyValuePair<System.String,System.Object>);summary;df-generated |
 | System.Diagnostics;ActivityTagsCollection;ContainsKey;(System.String);summary;df-generated |
 | System.Diagnostics;ActivityTagsCollection;Remove;(System.Collections.Generic.KeyValuePair<System.String,System.Object>);summary;df-generated |
 | System.Diagnostics;ActivityTagsCollection;Remove;(System.String);summary;df-generated |
+| System.Diagnostics;ActivityTagsCollection;TryGetValue;(System.String,System.Object);summary;df-generated |
 | System.Diagnostics;ActivityTagsCollection;get_Count;();summary;df-generated |
 | System.Diagnostics;ActivityTagsCollection;get_IsReadOnly;();summary;df-generated |
 | System.Diagnostics;ActivityTraceId;CopyTo;(System.Span<System.Byte>);summary;df-generated |
@@ -27913,6 +28803,7 @@ neutral
 | System.Diagnostics;DiagnosticListener;IsEnabled;(System.String,System.Object,System.Object);summary;df-generated |
 | System.Diagnostics;DiagnosticListener;OnActivityExport;(System.Diagnostics.Activity,System.Object);summary;df-generated |
 | System.Diagnostics;DiagnosticListener;OnActivityImport;(System.Diagnostics.Activity,System.Object);summary;df-generated |
+| System.Diagnostics;DiagnosticListener;Subscribe;(System.IObserver<System.Collections.Generic.KeyValuePair<System.String,System.Object>>);summary;df-generated |
 | System.Diagnostics;DiagnosticListener;Write;(System.String,System.Object);summary;df-generated |
 | System.Diagnostics;DiagnosticListener;get_AllListeners;();summary;df-generated |
 | System.Diagnostics;DiagnosticSource;IsEnabled;(System.String);summary;df-generated |
@@ -28196,6 +29087,7 @@ neutral
 | System.Diagnostics;TagList+Enumerator;Dispose;();summary;df-generated |
 | System.Diagnostics;TagList+Enumerator;MoveNext;();summary;df-generated |
 | System.Diagnostics;TagList+Enumerator;Reset;();summary;df-generated |
+| System.Diagnostics;TagList+Enumerator;get_Current;();summary;df-generated |
 | System.Diagnostics;TagList;Add;(System.String,System.Object);summary;df-generated |
 | System.Diagnostics;TagList;Contains;(System.Collections.Generic.KeyValuePair<System.String,System.Object>);summary;df-generated |
 | System.Diagnostics;TagList;IndexOf;(System.Collections.Generic.KeyValuePair<System.String,System.Object>);summary;df-generated |
@@ -28203,6 +29095,7 @@ neutral
 | System.Diagnostics;TagList;RemoveAt;(System.Int32);summary;df-generated |
 | System.Diagnostics;TagList;get_Count;();summary;df-generated |
 | System.Diagnostics;TagList;get_IsReadOnly;();summary;df-generated |
+| System.Diagnostics;TagList;get_Item;(System.Int32);summary;df-generated |
 | System.Diagnostics;TextWriterTraceListener;Close;();summary;df-generated |
 | System.Diagnostics;TextWriterTraceListener;Dispose;(System.Boolean);summary;df-generated |
 | System.Diagnostics;TextWriterTraceListener;Flush;();summary;df-generated |
@@ -28300,6 +29193,25 @@ neutral
 | System.Diagnostics;XmlWriterTraceListener;XmlWriterTraceListener;(System.IO.TextWriter,System.String);summary;df-generated |
 | System.Diagnostics;XmlWriterTraceListener;XmlWriterTraceListener;(System.String);summary;df-generated |
 | System.Diagnostics;XmlWriterTraceListener;XmlWriterTraceListener;(System.String,System.String);summary;df-generated |
+| System.Drawing.Drawing2D;CustomLineCap;Dispose;();summary;df-generated |
+| System.Drawing.Drawing2D;GraphicsPath;Dispose;();summary;df-generated |
+| System.Drawing.Drawing2D;GraphicsPathIterator;Dispose;();summary;df-generated |
+| System.Drawing.Drawing2D;Matrix;Dispose;();summary;df-generated |
+| System.Drawing.Imaging;EncoderParameter;Dispose;();summary;df-generated |
+| System.Drawing.Imaging;EncoderParameters;Dispose;();summary;df-generated |
+| System.Drawing.Imaging;ImageAttributes;Dispose;();summary;df-generated |
+| System.Drawing.Printing;MarginsConverter;CanConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Type);summary;df-generated |
+| System.Drawing.Printing;MarginsConverter;CanConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Type);summary;df-generated |
+| System.Drawing.Printing;MarginsConverter;CreateInstance;(System.ComponentModel.ITypeDescriptorContext,System.Collections.IDictionary);summary;df-generated |
+| System.Drawing.Printing;MarginsConverter;GetCreateInstanceSupported;(System.ComponentModel.ITypeDescriptorContext);summary;df-generated |
+| System.Drawing.Printing;PrinterSettings+PaperSizeCollection;get_Count;();summary;df-generated |
+| System.Drawing.Printing;PrinterSettings+PaperSizeCollection;get_IsSynchronized;();summary;df-generated |
+| System.Drawing.Printing;PrinterSettings+PaperSourceCollection;get_Count;();summary;df-generated |
+| System.Drawing.Printing;PrinterSettings+PaperSourceCollection;get_IsSynchronized;();summary;df-generated |
+| System.Drawing.Printing;PrinterSettings+PrinterResolutionCollection;get_Count;();summary;df-generated |
+| System.Drawing.Printing;PrinterSettings+PrinterResolutionCollection;get_IsSynchronized;();summary;df-generated |
+| System.Drawing.Printing;PrinterSettings+StringCollection;get_Count;();summary;df-generated |
+| System.Drawing.Printing;PrinterSettings+StringCollection;get_IsSynchronized;();summary;df-generated |
 | System.Drawing.Printing;PrintingPermission;FromXml;(System.Security.SecurityElement);summary;df-generated |
 | System.Drawing.Printing;PrintingPermission;IsSubsetOf;(System.Security.IPermission);summary;df-generated |
 | System.Drawing.Printing;PrintingPermission;IsUnrestricted;();summary;df-generated |
@@ -28308,6 +29220,10 @@ neutral
 | System.Drawing.Printing;PrintingPermission;ToXml;();summary;df-generated |
 | System.Drawing.Printing;PrintingPermissionAttribute;CreatePermission;();summary;df-generated |
 | System.Drawing.Printing;PrintingPermissionAttribute;PrintingPermissionAttribute;(System.Security.Permissions.SecurityAction);summary;df-generated |
+| System.Drawing.Text;FontCollection;Dispose;();summary;df-generated |
+| System.Drawing;Brush;Dispose;();summary;df-generated |
+| System.Drawing;BufferedGraphics;Dispose;();summary;df-generated |
+| System.Drawing;BufferedGraphicsContext;Dispose;();summary;df-generated |
 | System.Drawing;Color;Equals;(System.Drawing.Color);summary;df-generated |
 | System.Drawing;Color;Equals;(System.Object);summary;df-generated |
 | System.Drawing;Color;FromArgb;(System.Int32);summary;df-generated |
@@ -28480,6 +29396,29 @@ neutral
 | System.Drawing;ColorTranslator;FromWin32;(System.Int32);summary;df-generated |
 | System.Drawing;ColorTranslator;ToOle;(System.Drawing.Color);summary;df-generated |
 | System.Drawing;ColorTranslator;ToWin32;(System.Drawing.Color);summary;df-generated |
+| System.Drawing;Font;Dispose;();summary;df-generated |
+| System.Drawing;FontConverter+FontNameConverter;CanConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Type);summary;df-generated |
+| System.Drawing;FontConverter+FontNameConverter;Dispose;();summary;df-generated |
+| System.Drawing;FontConverter+FontNameConverter;GetStandardValuesExclusive;(System.ComponentModel.ITypeDescriptorContext);summary;df-generated |
+| System.Drawing;FontConverter+FontNameConverter;GetStandardValuesSupported;(System.ComponentModel.ITypeDescriptorContext);summary;df-generated |
+| System.Drawing;FontConverter;CanConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Type);summary;df-generated |
+| System.Drawing;FontConverter;CanConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Type);summary;df-generated |
+| System.Drawing;FontConverter;CreateInstance;(System.ComponentModel.ITypeDescriptorContext,System.Collections.IDictionary);summary;df-generated |
+| System.Drawing;FontConverter;GetCreateInstanceSupported;(System.ComponentModel.ITypeDescriptorContext);summary;df-generated |
+| System.Drawing;FontConverter;GetPropertiesSupported;(System.ComponentModel.ITypeDescriptorContext);summary;df-generated |
+| System.Drawing;FontFamily;Dispose;();summary;df-generated |
+| System.Drawing;Graphics;Dispose;();summary;df-generated |
+| System.Drawing;Icon;Dispose;();summary;df-generated |
+| System.Drawing;IconConverter;CanConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Type);summary;df-generated |
+| System.Drawing;IconConverter;CanConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Type);summary;df-generated |
+| System.Drawing;Image;Dispose;();summary;df-generated |
+| System.Drawing;ImageConverter;CanConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Type);summary;df-generated |
+| System.Drawing;ImageConverter;CanConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Type);summary;df-generated |
+| System.Drawing;ImageConverter;GetPropertiesSupported;(System.ComponentModel.ITypeDescriptorContext);summary;df-generated |
+| System.Drawing;ImageFormatConverter;CanConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Type);summary;df-generated |
+| System.Drawing;ImageFormatConverter;CanConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Type);summary;df-generated |
+| System.Drawing;ImageFormatConverter;GetStandardValuesSupported;(System.ComponentModel.ITypeDescriptorContext);summary;df-generated |
+| System.Drawing;Pen;Dispose;();summary;df-generated |
 | System.Drawing;Point;Add;(System.Drawing.Point,System.Drawing.Size);summary;df-generated |
 | System.Drawing;Point;Ceiling;(System.Drawing.PointF);summary;df-generated |
 | System.Drawing;Point;Equals;(System.Drawing.Point);summary;df-generated |
@@ -28582,6 +29521,7 @@ neutral
 | System.Drawing;RectangleF;get_Top;();summary;df-generated |
 | System.Drawing;RectangleF;op_Equality;(System.Drawing.RectangleF,System.Drawing.RectangleF);summary;df-generated |
 | System.Drawing;RectangleF;op_Inequality;(System.Drawing.RectangleF,System.Drawing.RectangleF);summary;df-generated |
+| System.Drawing;Region;Dispose;();summary;df-generated |
 | System.Drawing;Size;Add;(System.Drawing.Size,System.Drawing.Size);summary;df-generated |
 | System.Drawing;Size;Ceiling;(System.Drawing.SizeF);summary;df-generated |
 | System.Drawing;Size;Equals;(System.Drawing.Size);summary;df-generated |
@@ -28635,6 +29575,7 @@ neutral
 | System.Drawing;SizeFConverter;CreateInstance;(System.ComponentModel.ITypeDescriptorContext,System.Collections.IDictionary);summary;df-generated |
 | System.Drawing;SizeFConverter;GetCreateInstanceSupported;(System.ComponentModel.ITypeDescriptorContext);summary;df-generated |
 | System.Drawing;SizeFConverter;GetPropertiesSupported;(System.ComponentModel.ITypeDescriptorContext);summary;df-generated |
+| System.Drawing;StringFormat;Dispose;();summary;df-generated |
 | System.Drawing;SystemColors;get_ActiveBorder;();summary;df-generated |
 | System.Drawing;SystemColors;get_ActiveCaption;();summary;df-generated |
 | System.Drawing;SystemColors;get_ActiveCaptionText;();summary;df-generated |
@@ -28668,6 +29609,8 @@ neutral
 | System.Drawing;SystemColors;get_Window;();summary;df-generated |
 | System.Drawing;SystemColors;get_WindowFrame;();summary;df-generated |
 | System.Drawing;SystemColors;get_WindowText;();summary;df-generated |
+| System.Drawing;ToolboxBitmapAttribute;Equals;(System.Object);summary;df-generated |
+| System.Drawing;ToolboxBitmapAttribute;GetHashCode;();summary;df-generated |
 | System.Dynamic;BinaryOperationBinder;BinaryOperationBinder;(System.Linq.Expressions.ExpressionType);summary;df-generated |
 | System.Dynamic;BinaryOperationBinder;Bind;(System.Dynamic.DynamicMetaObject,System.Dynamic.DynamicMetaObject[]);summary;df-generated |
 | System.Dynamic;BinaryOperationBinder;FallbackBinaryOperation;(System.Dynamic.DynamicMetaObject,System.Dynamic.DynamicMetaObject);summary;df-generated |
@@ -28748,6 +29691,7 @@ neutral
 | System.Dynamic;ExpandoObject;GetMetaObject;(System.Linq.Expressions.Expression);summary;df-generated |
 | System.Dynamic;ExpandoObject;Remove;(System.Collections.Generic.KeyValuePair<System.String,System.Object>);summary;df-generated |
 | System.Dynamic;ExpandoObject;Remove;(System.String);summary;df-generated |
+| System.Dynamic;ExpandoObject;TryGetValue;(System.String,System.Object);summary;df-generated |
 | System.Dynamic;ExpandoObject;get_Count;();summary;df-generated |
 | System.Dynamic;ExpandoObject;get_IsReadOnly;();summary;df-generated |
 | System.Dynamic;GetIndexBinder;Bind;(System.Dynamic.DynamicMetaObject,System.Dynamic.DynamicMetaObject[]);summary;df-generated |
@@ -29485,6 +30429,7 @@ neutral
 | System.IO.Enumeration;FileSystemEnumerator<TResult>;ShouldIncludeEntry;(System.IO.Enumeration.FileSystemEntry);summary;df-generated |
 | System.IO.Enumeration;FileSystemEnumerator<TResult>;ShouldRecurseIntoEntry;(System.IO.Enumeration.FileSystemEntry);summary;df-generated |
 | System.IO.Enumeration;FileSystemEnumerator<TResult>;TransformEntry;(System.IO.Enumeration.FileSystemEntry);summary;df-generated |
+| System.IO.Enumeration;FileSystemEnumerator<TResult>;get_Current;();summary;df-generated |
 | System.IO.Enumeration;FileSystemName;MatchesSimpleExpression;(System.ReadOnlySpan<System.Char>,System.ReadOnlySpan<System.Char>,System.Boolean);summary;df-generated |
 | System.IO.Enumeration;FileSystemName;MatchesWin32Expression;(System.ReadOnlySpan<System.Char>,System.ReadOnlySpan<System.Char>,System.Boolean);summary;df-generated |
 | System.IO.IsolatedStorage;INormalizeForIsolatedStorage;Normalize;();summary;df-generated |
@@ -29616,6 +30561,8 @@ neutral
 | System.IO.Pipelines;PipeWriter;Complete;(System.Exception);summary;df-generated |
 | System.IO.Pipelines;PipeWriter;CompleteAsync;(System.Exception);summary;df-generated |
 | System.IO.Pipelines;PipeWriter;CopyFromAsync;(System.IO.Stream,System.Threading.CancellationToken);summary;df-generated |
+| System.IO.Pipelines;PipeWriter;GetMemory;(System.Int32);summary;df-generated |
+| System.IO.Pipelines;PipeWriter;GetSpan;(System.Int32);summary;df-generated |
 | System.IO.Pipelines;PipeWriter;get_CanGetUnflushedBytes;();summary;df-generated |
 | System.IO.Pipelines;PipeWriter;get_UnflushedBytes;();summary;df-generated |
 | System.IO.Pipelines;ReadResult;get_IsCanceled;();summary;df-generated |
@@ -30605,6 +31552,7 @@ neutral
 | System.Linq;ImmutableArrayExtensions;SingleOrDefault<T>;(System.Collections.Immutable.ImmutableArray<T>);summary;df-generated |
 | System.Linq;Lookup<TKey,TElement>;Contains;(TKey);summary;df-generated |
 | System.Linq;Lookup<TKey,TElement>;get_Count;();summary;df-generated |
+| System.Linq;Lookup<TKey,TElement>;get_Item;(TKey);summary;df-generated |
 | System.Linq;ParallelEnumerable;Any<TSource>;(System.Linq.ParallelQuery<TSource>);summary;df-generated |
 | System.Linq;ParallelEnumerable;Average;(System.Linq.ParallelQuery<System.Decimal>);summary;df-generated |
 | System.Linq;ParallelEnumerable;Average;(System.Linq.ParallelQuery<System.Double>);summary;df-generated |
@@ -30774,6 +31722,7 @@ neutral
 | System.Net.Http.Headers;HeaderStringValues+Enumerator;Dispose;();summary;df-generated |
 | System.Net.Http.Headers;HeaderStringValues+Enumerator;MoveNext;();summary;df-generated |
 | System.Net.Http.Headers;HeaderStringValues+Enumerator;Reset;();summary;df-generated |
+| System.Net.Http.Headers;HeaderStringValues+Enumerator;get_Current;();summary;df-generated |
 | System.Net.Http.Headers;HeaderStringValues;get_Count;();summary;df-generated |
 | System.Net.Http.Headers;HttpContentHeaders;get_Allow;();summary;df-generated |
 | System.Net.Http.Headers;HttpContentHeaders;get_ContentEncoding;();summary;df-generated |
@@ -30797,9 +31746,14 @@ neutral
 | System.Net.Http.Headers;HttpHeadersNonValidated+Enumerator;Dispose;();summary;df-generated |
 | System.Net.Http.Headers;HttpHeadersNonValidated+Enumerator;MoveNext;();summary;df-generated |
 | System.Net.Http.Headers;HttpHeadersNonValidated+Enumerator;Reset;();summary;df-generated |
+| System.Net.Http.Headers;HttpHeadersNonValidated+Enumerator;get_Current;();summary;df-generated |
 | System.Net.Http.Headers;HttpHeadersNonValidated;Contains;(System.String);summary;df-generated |
 | System.Net.Http.Headers;HttpHeadersNonValidated;ContainsKey;(System.String);summary;df-generated |
+| System.Net.Http.Headers;HttpHeadersNonValidated;TryGetValue;(System.String,System.Net.Http.Headers.HeaderStringValues);summary;df-generated |
 | System.Net.Http.Headers;HttpHeadersNonValidated;get_Count;();summary;df-generated |
+| System.Net.Http.Headers;HttpHeadersNonValidated;get_Item;(System.String);summary;df-generated |
+| System.Net.Http.Headers;HttpHeadersNonValidated;get_Keys;();summary;df-generated |
+| System.Net.Http.Headers;HttpHeadersNonValidated;get_Values;();summary;df-generated |
 | System.Net.Http.Headers;HttpRequestHeaders;get_Accept;();summary;df-generated |
 | System.Net.Http.Headers;HttpRequestHeaders;get_AcceptCharset;();summary;df-generated |
 | System.Net.Http.Headers;HttpRequestHeaders;get_AcceptEncoding;();summary;df-generated |
@@ -31056,6 +32010,9 @@ neutral
 | System.Net.Http;HttpRequestOptions;TryGetValue<TValue>;(System.Net.Http.HttpRequestOptionsKey<TValue>,TValue);summary;df-generated |
 | System.Net.Http;HttpRequestOptions;get_Count;();summary;df-generated |
 | System.Net.Http;HttpRequestOptions;get_IsReadOnly;();summary;df-generated |
+| System.Net.Http;HttpRequestOptions;get_Item;(System.String);summary;df-generated |
+| System.Net.Http;HttpRequestOptions;get_Keys;();summary;df-generated |
+| System.Net.Http;HttpRequestOptions;get_Values;();summary;df-generated |
 | System.Net.Http;HttpRequestOptionsKey<TValue>;HttpRequestOptionsKey;(System.String);summary;df-generated |
 | System.Net.Http;HttpRequestOptionsKey<TValue>;get_Key;();summary;df-generated |
 | System.Net.Http;HttpResponseMessage;Dispose;();summary;df-generated |
@@ -32234,6 +33191,7 @@ neutral
 | System.Net;WebUtility;UrlDecodeToBytes;(System.Byte[],System.Int32,System.Int32);summary;df-generated |
 | System.Net;WebUtility;UrlEncodeToBytes;(System.Byte[],System.Int32,System.Int32);summary;df-generated |
 | System.Net;WriteStreamClosedEventArgs;get_Error;();summary;df-generated |
+| System.Numerics;BigInteger;Abs;(System.Numerics.BigInteger);summary;df-generated |
 | System.Numerics;BigInteger;Add;(System.Numerics.BigInteger,System.Numerics.BigInteger);summary;df-generated |
 | System.Numerics;BigInteger;BigInteger;(System.Byte[]);summary;df-generated |
 | System.Numerics;BigInteger;BigInteger;(System.Decimal);summary;df-generated |
@@ -32249,6 +33207,7 @@ neutral
 | System.Numerics;BigInteger;CompareTo;(System.Numerics.BigInteger);summary;df-generated |
 | System.Numerics;BigInteger;CompareTo;(System.Object);summary;df-generated |
 | System.Numerics;BigInteger;CompareTo;(System.UInt64);summary;df-generated |
+| System.Numerics;BigInteger;DivRem;(System.Numerics.BigInteger,System.Numerics.BigInteger);summary;df-generated |
 | System.Numerics;BigInteger;Divide;(System.Numerics.BigInteger,System.Numerics.BigInteger);summary;df-generated |
 | System.Numerics;BigInteger;Equals;(System.Int64);summary;df-generated |
 | System.Numerics;BigInteger;Equals;(System.Numerics.BigInteger);summary;df-generated |
@@ -32283,6 +33242,10 @@ neutral
 | System.Numerics;BigInteger;Log10;(System.Numerics.BigInteger);summary;df-generated |
 | System.Numerics;BigInteger;Log;(System.Numerics.BigInteger);summary;df-generated |
 | System.Numerics;BigInteger;Log;(System.Numerics.BigInteger,System.Double);summary;df-generated |
+| System.Numerics;BigInteger;MaxMagnitude;(System.Numerics.BigInteger,System.Numerics.BigInteger);summary;df-generated |
+| System.Numerics;BigInteger;MaxMagnitudeNumber;(System.Numerics.BigInteger,System.Numerics.BigInteger);summary;df-generated |
+| System.Numerics;BigInteger;MinMagnitude;(System.Numerics.BigInteger,System.Numerics.BigInteger);summary;df-generated |
+| System.Numerics;BigInteger;MinMagnitudeNumber;(System.Numerics.BigInteger,System.Numerics.BigInteger);summary;df-generated |
 | System.Numerics;BigInteger;ModPow;(System.Numerics.BigInteger,System.Numerics.BigInteger,System.Numerics.BigInteger);summary;df-generated |
 | System.Numerics;BigInteger;Multiply;(System.Numerics.BigInteger,System.Numerics.BigInteger);summary;df-generated |
 | System.Numerics;BigInteger;Negate;(System.Numerics.BigInteger);summary;df-generated |
@@ -32293,8 +33256,32 @@ neutral
 | System.Numerics;BigInteger;Parse;(System.String,System.Globalization.NumberStyles,System.IFormatProvider);summary;df-generated |
 | System.Numerics;BigInteger;Parse;(System.String,System.IFormatProvider);summary;df-generated |
 | System.Numerics;BigInteger;PopCount;(System.Numerics.BigInteger);summary;df-generated |
+| System.Numerics;BigInteger;RotateLeft;(System.Numerics.BigInteger,System.Int32);summary;df-generated |
+| System.Numerics;BigInteger;RotateRight;(System.Numerics.BigInteger,System.Int32);summary;df-generated |
 | System.Numerics;BigInteger;Sign;(System.Numerics.BigInteger);summary;df-generated |
 | System.Numerics;BigInteger;Subtract;(System.Numerics.BigInteger,System.Numerics.BigInteger);summary;df-generated |
+| System.Numerics;BigInteger;System.Numerics.IAdditionOperators<System.Numerics.BigInteger,System.Numerics.BigInteger,System.Numerics.BigInteger>.op_Addition;(System.Numerics.BigInteger,System.Numerics.BigInteger);summary;df-generated |
+| System.Numerics;BigInteger;System.Numerics.IBitwiseOperators<System.Numerics.BigInteger,System.Numerics.BigInteger,System.Numerics.BigInteger>.op_BitwiseAnd;(System.Numerics.BigInteger,System.Numerics.BigInteger);summary;df-generated |
+| System.Numerics;BigInteger;System.Numerics.IBitwiseOperators<System.Numerics.BigInteger,System.Numerics.BigInteger,System.Numerics.BigInteger>.op_BitwiseOr;(System.Numerics.BigInteger,System.Numerics.BigInteger);summary;df-generated |
+| System.Numerics;BigInteger;System.Numerics.IBitwiseOperators<System.Numerics.BigInteger,System.Numerics.BigInteger,System.Numerics.BigInteger>.op_ExclusiveOr;(System.Numerics.BigInteger,System.Numerics.BigInteger);summary;df-generated |
+| System.Numerics;BigInteger;System.Numerics.IBitwiseOperators<System.Numerics.BigInteger,System.Numerics.BigInteger,System.Numerics.BigInteger>.op_OnesComplement;(System.Numerics.BigInteger);summary;df-generated |
+| System.Numerics;BigInteger;System.Numerics.IComparisonOperators<System.Numerics.BigInteger,System.Numerics.BigInteger,System.Boolean>.op_GreaterThan;(System.Numerics.BigInteger,System.Numerics.BigInteger);summary;df-generated |
+| System.Numerics;BigInteger;System.Numerics.IComparisonOperators<System.Numerics.BigInteger,System.Numerics.BigInteger,System.Boolean>.op_GreaterThanOrEqual;(System.Numerics.BigInteger,System.Numerics.BigInteger);summary;df-generated |
+| System.Numerics;BigInteger;System.Numerics.IComparisonOperators<System.Numerics.BigInteger,System.Numerics.BigInteger,System.Boolean>.op_LessThan;(System.Numerics.BigInteger,System.Numerics.BigInteger);summary;df-generated |
+| System.Numerics;BigInteger;System.Numerics.IComparisonOperators<System.Numerics.BigInteger,System.Numerics.BigInteger,System.Boolean>.op_LessThanOrEqual;(System.Numerics.BigInteger,System.Numerics.BigInteger);summary;df-generated |
+| System.Numerics;BigInteger;System.Numerics.IDecrementOperators<System.Numerics.BigInteger>.op_Decrement;(System.Numerics.BigInteger);summary;df-generated |
+| System.Numerics;BigInteger;System.Numerics.IDivisionOperators<System.Numerics.BigInteger,System.Numerics.BigInteger,System.Numerics.BigInteger>.op_Division;(System.Numerics.BigInteger,System.Numerics.BigInteger);summary;df-generated |
+| System.Numerics;BigInteger;System.Numerics.IEqualityOperators<System.Numerics.BigInteger,System.Numerics.BigInteger,System.Boolean>.op_Equality;(System.Numerics.BigInteger,System.Numerics.BigInteger);summary;df-generated |
+| System.Numerics;BigInteger;System.Numerics.IEqualityOperators<System.Numerics.BigInteger,System.Numerics.BigInteger,System.Boolean>.op_Inequality;(System.Numerics.BigInteger,System.Numerics.BigInteger);summary;df-generated |
+| System.Numerics;BigInteger;System.Numerics.IIncrementOperators<System.Numerics.BigInteger>.op_Increment;(System.Numerics.BigInteger);summary;df-generated |
+| System.Numerics;BigInteger;System.Numerics.IModulusOperators<System.Numerics.BigInteger,System.Numerics.BigInteger,System.Numerics.BigInteger>.op_Modulus;(System.Numerics.BigInteger,System.Numerics.BigInteger);summary;df-generated |
+| System.Numerics;BigInteger;System.Numerics.IMultiplyOperators<System.Numerics.BigInteger,System.Numerics.BigInteger,System.Numerics.BigInteger>.op_Multiply;(System.Numerics.BigInteger,System.Numerics.BigInteger);summary;df-generated |
+| System.Numerics;BigInteger;System.Numerics.IShiftOperators<System.Numerics.BigInteger,System.Int32,System.Numerics.BigInteger>.op_LeftShift;(System.Numerics.BigInteger,System.Int32);summary;df-generated |
+| System.Numerics;BigInteger;System.Numerics.IShiftOperators<System.Numerics.BigInteger,System.Int32,System.Numerics.BigInteger>.op_RightShift;(System.Numerics.BigInteger,System.Int32);summary;df-generated |
+| System.Numerics;BigInteger;System.Numerics.IShiftOperators<System.Numerics.BigInteger,System.Int32,System.Numerics.BigInteger>.op_UnsignedRightShift;(System.Numerics.BigInteger,System.Int32);summary;df-generated |
+| System.Numerics;BigInteger;System.Numerics.ISubtractionOperators<System.Numerics.BigInteger,System.Numerics.BigInteger,System.Numerics.BigInteger>.op_Subtraction;(System.Numerics.BigInteger,System.Numerics.BigInteger);summary;df-generated |
+| System.Numerics;BigInteger;System.Numerics.IUnaryNegationOperators<System.Numerics.BigInteger,System.Numerics.BigInteger>.op_UnaryNegation;(System.Numerics.BigInteger);summary;df-generated |
+| System.Numerics;BigInteger;System.Numerics.IUnaryPlusOperators<System.Numerics.BigInteger,System.Numerics.BigInteger>.op_UnaryPlus;(System.Numerics.BigInteger);summary;df-generated |
 | System.Numerics;BigInteger;ToByteArray;();summary;df-generated |
 | System.Numerics;BigInteger;ToByteArray;(System.Boolean,System.Boolean);summary;df-generated |
 | System.Numerics;BigInteger;ToString;();summary;df-generated |
@@ -32429,6 +33416,10 @@ neutral
 | System.Numerics;Complex;Log10;(System.Numerics.Complex);summary;df-generated |
 | System.Numerics;Complex;Log;(System.Numerics.Complex);summary;df-generated |
 | System.Numerics;Complex;Log;(System.Numerics.Complex,System.Double);summary;df-generated |
+| System.Numerics;Complex;MaxMagnitude;(System.Numerics.Complex,System.Numerics.Complex);summary;df-generated |
+| System.Numerics;Complex;MaxMagnitudeNumber;(System.Numerics.Complex,System.Numerics.Complex);summary;df-generated |
+| System.Numerics;Complex;MinMagnitude;(System.Numerics.Complex,System.Numerics.Complex);summary;df-generated |
+| System.Numerics;Complex;MinMagnitudeNumber;(System.Numerics.Complex,System.Numerics.Complex);summary;df-generated |
 | System.Numerics;Complex;Multiply;(System.Double,System.Numerics.Complex);summary;df-generated |
 | System.Numerics;Complex;Multiply;(System.Numerics.Complex,System.Double);summary;df-generated |
 | System.Numerics;Complex;Multiply;(System.Numerics.Complex,System.Numerics.Complex);summary;df-generated |
@@ -32446,6 +33437,16 @@ neutral
 | System.Numerics;Complex;Subtract;(System.Double,System.Numerics.Complex);summary;df-generated |
 | System.Numerics;Complex;Subtract;(System.Numerics.Complex,System.Double);summary;df-generated |
 | System.Numerics;Complex;Subtract;(System.Numerics.Complex,System.Numerics.Complex);summary;df-generated |
+| System.Numerics;Complex;System.Numerics.IAdditionOperators<System.Numerics.Complex,System.Numerics.Complex,System.Numerics.Complex>.op_Addition;(System.Numerics.Complex,System.Numerics.Complex);summary;df-generated |
+| System.Numerics;Complex;System.Numerics.IDecrementOperators<System.Numerics.Complex>.op_Decrement;(System.Numerics.Complex);summary;df-generated |
+| System.Numerics;Complex;System.Numerics.IDivisionOperators<System.Numerics.Complex,System.Numerics.Complex,System.Numerics.Complex>.op_Division;(System.Numerics.Complex,System.Numerics.Complex);summary;df-generated |
+| System.Numerics;Complex;System.Numerics.IEqualityOperators<System.Numerics.Complex,System.Numerics.Complex,System.Boolean>.op_Equality;(System.Numerics.Complex,System.Numerics.Complex);summary;df-generated |
+| System.Numerics;Complex;System.Numerics.IEqualityOperators<System.Numerics.Complex,System.Numerics.Complex,System.Boolean>.op_Inequality;(System.Numerics.Complex,System.Numerics.Complex);summary;df-generated |
+| System.Numerics;Complex;System.Numerics.IIncrementOperators<System.Numerics.Complex>.op_Increment;(System.Numerics.Complex);summary;df-generated |
+| System.Numerics;Complex;System.Numerics.IMultiplyOperators<System.Numerics.Complex,System.Numerics.Complex,System.Numerics.Complex>.op_Multiply;(System.Numerics.Complex,System.Numerics.Complex);summary;df-generated |
+| System.Numerics;Complex;System.Numerics.ISubtractionOperators<System.Numerics.Complex,System.Numerics.Complex,System.Numerics.Complex>.op_Subtraction;(System.Numerics.Complex,System.Numerics.Complex);summary;df-generated |
+| System.Numerics;Complex;System.Numerics.IUnaryNegationOperators<System.Numerics.Complex,System.Numerics.Complex>.op_UnaryNegation;(System.Numerics.Complex);summary;df-generated |
+| System.Numerics;Complex;System.Numerics.IUnaryPlusOperators<System.Numerics.Complex,System.Numerics.Complex>.op_UnaryPlus;(System.Numerics.Complex);summary;df-generated |
 | System.Numerics;Complex;Tan;(System.Numerics.Complex);summary;df-generated |
 | System.Numerics;Complex;Tanh;(System.Numerics.Complex);summary;df-generated |
 | System.Numerics;Complex;ToString;();summary;df-generated |
@@ -34377,6 +35378,7 @@ neutral
 | System.Reflection.Metadata;ImportDefinitionCollection+Enumerator;Dispose;();summary;df-generated |
 | System.Reflection.Metadata;ImportDefinitionCollection+Enumerator;MoveNext;();summary;df-generated |
 | System.Reflection.Metadata;ImportDefinitionCollection+Enumerator;Reset;();summary;df-generated |
+| System.Reflection.Metadata;ImportDefinitionCollection+Enumerator;get_Current;();summary;df-generated |
 | System.Reflection.Metadata;ImportScope;GetImports;();summary;df-generated |
 | System.Reflection.Metadata;ImportScope;get_ImportsBlob;();summary;df-generated |
 | System.Reflection.Metadata;ImportScope;get_Parent;();summary;df-generated |
@@ -34672,6 +35674,7 @@ neutral
 | System.Reflection.Metadata;SequencePointCollection+Enumerator;Dispose;();summary;df-generated |
 | System.Reflection.Metadata;SequencePointCollection+Enumerator;MoveNext;();summary;df-generated |
 | System.Reflection.Metadata;SequencePointCollection+Enumerator;Reset;();summary;df-generated |
+| System.Reflection.Metadata;SequencePointCollection+Enumerator;get_Current;();summary;df-generated |
 | System.Reflection.Metadata;SignatureHeader;Equals;(System.Object);summary;df-generated |
 | System.Reflection.Metadata;SignatureHeader;Equals;(System.Reflection.Metadata.SignatureHeader);summary;df-generated |
 | System.Reflection.Metadata;SignatureHeader;GetHashCode;();summary;df-generated |
@@ -36601,17 +37604,32 @@ neutral
 | System.Runtime.InteropServices;NFloat;SinPi;(System.Runtime.InteropServices.NFloat);summary;df-generated |
 | System.Runtime.InteropServices;NFloat;Sinh;(System.Runtime.InteropServices.NFloat);summary;df-generated |
 | System.Runtime.InteropServices;NFloat;Sqrt;(System.Runtime.InteropServices.NFloat);summary;df-generated |
+| System.Runtime.InteropServices;NFloat;System.Numerics.IAdditionOperators<System.Runtime.InteropServices.NFloat,System.Runtime.InteropServices.NFloat,System.Runtime.InteropServices.NFloat>.op_Addition;(System.Runtime.InteropServices.NFloat,System.Runtime.InteropServices.NFloat);summary;df-generated |
 | System.Runtime.InteropServices;NFloat;System.Numerics.IAdditionOperators<System.Runtime.InteropServices.NFloat,System.Runtime.InteropServices.NFloat,System.Runtime.InteropServices.NFloat>.op_CheckedAddition;(System.Runtime.InteropServices.NFloat,System.Runtime.InteropServices.NFloat);summary;df-generated |
 | System.Runtime.InteropServices;NFloat;System.Numerics.IBitwiseOperators<System.Runtime.InteropServices.NFloat,System.Runtime.InteropServices.NFloat,System.Runtime.InteropServices.NFloat>.op_BitwiseAnd;(System.Runtime.InteropServices.NFloat,System.Runtime.InteropServices.NFloat);summary;df-generated |
 | System.Runtime.InteropServices;NFloat;System.Numerics.IBitwiseOperators<System.Runtime.InteropServices.NFloat,System.Runtime.InteropServices.NFloat,System.Runtime.InteropServices.NFloat>.op_BitwiseOr;(System.Runtime.InteropServices.NFloat,System.Runtime.InteropServices.NFloat);summary;df-generated |
 | System.Runtime.InteropServices;NFloat;System.Numerics.IBitwiseOperators<System.Runtime.InteropServices.NFloat,System.Runtime.InteropServices.NFloat,System.Runtime.InteropServices.NFloat>.op_ExclusiveOr;(System.Runtime.InteropServices.NFloat,System.Runtime.InteropServices.NFloat);summary;df-generated |
 | System.Runtime.InteropServices;NFloat;System.Numerics.IBitwiseOperators<System.Runtime.InteropServices.NFloat,System.Runtime.InteropServices.NFloat,System.Runtime.InteropServices.NFloat>.op_OnesComplement;(System.Runtime.InteropServices.NFloat);summary;df-generated |
+| System.Runtime.InteropServices;NFloat;System.Numerics.IComparisonOperators<System.Runtime.InteropServices.NFloat,System.Runtime.InteropServices.NFloat,System.Boolean>.op_GreaterThan;(System.Runtime.InteropServices.NFloat,System.Runtime.InteropServices.NFloat);summary;df-generated |
+| System.Runtime.InteropServices;NFloat;System.Numerics.IComparisonOperators<System.Runtime.InteropServices.NFloat,System.Runtime.InteropServices.NFloat,System.Boolean>.op_GreaterThanOrEqual;(System.Runtime.InteropServices.NFloat,System.Runtime.InteropServices.NFloat);summary;df-generated |
+| System.Runtime.InteropServices;NFloat;System.Numerics.IComparisonOperators<System.Runtime.InteropServices.NFloat,System.Runtime.InteropServices.NFloat,System.Boolean>.op_LessThan;(System.Runtime.InteropServices.NFloat,System.Runtime.InteropServices.NFloat);summary;df-generated |
+| System.Runtime.InteropServices;NFloat;System.Numerics.IComparisonOperators<System.Runtime.InteropServices.NFloat,System.Runtime.InteropServices.NFloat,System.Boolean>.op_LessThanOrEqual;(System.Runtime.InteropServices.NFloat,System.Runtime.InteropServices.NFloat);summary;df-generated |
 | System.Runtime.InteropServices;NFloat;System.Numerics.IDecrementOperators<System.Runtime.InteropServices.NFloat>.op_CheckedDecrement;(System.Runtime.InteropServices.NFloat);summary;df-generated |
+| System.Runtime.InteropServices;NFloat;System.Numerics.IDecrementOperators<System.Runtime.InteropServices.NFloat>.op_Decrement;(System.Runtime.InteropServices.NFloat);summary;df-generated |
 | System.Runtime.InteropServices;NFloat;System.Numerics.IDivisionOperators<System.Runtime.InteropServices.NFloat,System.Runtime.InteropServices.NFloat,System.Runtime.InteropServices.NFloat>.op_CheckedDivision;(System.Runtime.InteropServices.NFloat,System.Runtime.InteropServices.NFloat);summary;df-generated |
+| System.Runtime.InteropServices;NFloat;System.Numerics.IDivisionOperators<System.Runtime.InteropServices.NFloat,System.Runtime.InteropServices.NFloat,System.Runtime.InteropServices.NFloat>.op_Division;(System.Runtime.InteropServices.NFloat,System.Runtime.InteropServices.NFloat);summary;df-generated |
+| System.Runtime.InteropServices;NFloat;System.Numerics.IEqualityOperators<System.Runtime.InteropServices.NFloat,System.Runtime.InteropServices.NFloat,System.Boolean>.op_Equality;(System.Runtime.InteropServices.NFloat,System.Runtime.InteropServices.NFloat);summary;df-generated |
+| System.Runtime.InteropServices;NFloat;System.Numerics.IEqualityOperators<System.Runtime.InteropServices.NFloat,System.Runtime.InteropServices.NFloat,System.Boolean>.op_Inequality;(System.Runtime.InteropServices.NFloat,System.Runtime.InteropServices.NFloat);summary;df-generated |
 | System.Runtime.InteropServices;NFloat;System.Numerics.IIncrementOperators<System.Runtime.InteropServices.NFloat>.op_CheckedIncrement;(System.Runtime.InteropServices.NFloat);summary;df-generated |
+| System.Runtime.InteropServices;NFloat;System.Numerics.IIncrementOperators<System.Runtime.InteropServices.NFloat>.op_Increment;(System.Runtime.InteropServices.NFloat);summary;df-generated |
+| System.Runtime.InteropServices;NFloat;System.Numerics.IModulusOperators<System.Runtime.InteropServices.NFloat,System.Runtime.InteropServices.NFloat,System.Runtime.InteropServices.NFloat>.op_Modulus;(System.Runtime.InteropServices.NFloat,System.Runtime.InteropServices.NFloat);summary;df-generated |
 | System.Runtime.InteropServices;NFloat;System.Numerics.IMultiplyOperators<System.Runtime.InteropServices.NFloat,System.Runtime.InteropServices.NFloat,System.Runtime.InteropServices.NFloat>.op_CheckedMultiply;(System.Runtime.InteropServices.NFloat,System.Runtime.InteropServices.NFloat);summary;df-generated |
+| System.Runtime.InteropServices;NFloat;System.Numerics.IMultiplyOperators<System.Runtime.InteropServices.NFloat,System.Runtime.InteropServices.NFloat,System.Runtime.InteropServices.NFloat>.op_Multiply;(System.Runtime.InteropServices.NFloat,System.Runtime.InteropServices.NFloat);summary;df-generated |
 | System.Runtime.InteropServices;NFloat;System.Numerics.ISubtractionOperators<System.Runtime.InteropServices.NFloat,System.Runtime.InteropServices.NFloat,System.Runtime.InteropServices.NFloat>.op_CheckedSubtraction;(System.Runtime.InteropServices.NFloat,System.Runtime.InteropServices.NFloat);summary;df-generated |
+| System.Runtime.InteropServices;NFloat;System.Numerics.ISubtractionOperators<System.Runtime.InteropServices.NFloat,System.Runtime.InteropServices.NFloat,System.Runtime.InteropServices.NFloat>.op_Subtraction;(System.Runtime.InteropServices.NFloat,System.Runtime.InteropServices.NFloat);summary;df-generated |
 | System.Runtime.InteropServices;NFloat;System.Numerics.IUnaryNegationOperators<System.Runtime.InteropServices.NFloat,System.Runtime.InteropServices.NFloat>.op_CheckedUnaryNegation;(System.Runtime.InteropServices.NFloat);summary;df-generated |
+| System.Runtime.InteropServices;NFloat;System.Numerics.IUnaryNegationOperators<System.Runtime.InteropServices.NFloat,System.Runtime.InteropServices.NFloat>.op_UnaryNegation;(System.Runtime.InteropServices.NFloat);summary;df-generated |
+| System.Runtime.InteropServices;NFloat;System.Numerics.IUnaryPlusOperators<System.Runtime.InteropServices.NFloat,System.Runtime.InteropServices.NFloat>.op_UnaryPlus;(System.Runtime.InteropServices.NFloat);summary;df-generated |
 | System.Runtime.InteropServices;NFloat;Tan;(System.Runtime.InteropServices.NFloat);summary;df-generated |
 | System.Runtime.InteropServices;NFloat;TanPi;(System.Runtime.InteropServices.NFloat);summary;df-generated |
 | System.Runtime.InteropServices;NFloat;Tanh;(System.Runtime.InteropServices.NFloat);summary;df-generated |
@@ -43755,6 +44773,7 @@ neutral
 | System.Security.Cryptography.X509Certificates;X509Certificate2Enumerator;Dispose;();summary;df-generated |
 | System.Security.Cryptography.X509Certificates;X509Certificate2Enumerator;MoveNext;();summary;df-generated |
 | System.Security.Cryptography.X509Certificates;X509Certificate2Enumerator;Reset;();summary;df-generated |
+| System.Security.Cryptography.X509Certificates;X509Certificate2Enumerator;get_Current;();summary;df-generated |
 | System.Security.Cryptography.X509Certificates;X509Certificate2UI;DisplayCertificate;(System.Security.Cryptography.X509Certificates.X509Certificate2);summary;df-generated |
 | System.Security.Cryptography.X509Certificates;X509Certificate2UI;DisplayCertificate;(System.Security.Cryptography.X509Certificates.X509Certificate2,System.IntPtr);summary;df-generated |
 | System.Security.Cryptography.X509Certificates;X509Certificate2UI;SelectFromCollection;(System.Security.Cryptography.X509Certificates.X509Certificate2Collection,System.String,System.String,System.Security.Cryptography.X509Certificates.X509SelectionFlag);summary;df-generated |
@@ -43828,6 +44847,7 @@ neutral
 | System.Security.Cryptography.X509Certificates;X509ChainElementEnumerator;Dispose;();summary;df-generated |
 | System.Security.Cryptography.X509Certificates;X509ChainElementEnumerator;MoveNext;();summary;df-generated |
 | System.Security.Cryptography.X509Certificates;X509ChainElementEnumerator;Reset;();summary;df-generated |
+| System.Security.Cryptography.X509Certificates;X509ChainElementEnumerator;get_Current;();summary;df-generated |
 | System.Security.Cryptography.X509Certificates;X509ChainPolicy;Reset;();summary;df-generated |
 | System.Security.Cryptography.X509Certificates;X509ChainPolicy;get_ApplicationPolicy;();summary;df-generated |
 | System.Security.Cryptography.X509Certificates;X509ChainPolicy;get_CertificatePolicy;();summary;df-generated |
@@ -43845,6 +44865,7 @@ neutral
 | System.Security.Cryptography.X509Certificates;X509ExtensionEnumerator;Dispose;();summary;df-generated |
 | System.Security.Cryptography.X509Certificates;X509ExtensionEnumerator;MoveNext;();summary;df-generated |
 | System.Security.Cryptography.X509Certificates;X509ExtensionEnumerator;Reset;();summary;df-generated |
+| System.Security.Cryptography.X509Certificates;X509ExtensionEnumerator;get_Current;();summary;df-generated |
 | System.Security.Cryptography.X509Certificates;X509KeyUsageExtension;X509KeyUsageExtension;(System.Security.Cryptography.AsnEncodedData,System.Boolean);summary;df-generated |
 | System.Security.Cryptography.X509Certificates;X509KeyUsageExtension;X509KeyUsageExtension;(System.Security.Cryptography.X509Certificates.X509KeyUsageFlags,System.Boolean);summary;df-generated |
 | System.Security.Cryptography.X509Certificates;X509KeyUsageExtension;get_KeyUsages;();summary;df-generated |
@@ -46049,6 +47070,7 @@ neutral
 | System.Text.Json.Nodes;JsonObject;JsonObject;(System.Nullable<System.Text.Json.Nodes.JsonNodeOptions>);summary;df-generated |
 | System.Text.Json.Nodes;JsonObject;Remove;(System.Collections.Generic.KeyValuePair<System.String,System.Text.Json.Nodes.JsonNode>);summary;df-generated |
 | System.Text.Json.Nodes;JsonObject;Remove;(System.String);summary;df-generated |
+| System.Text.Json.Nodes;JsonObject;TryGetValue;(System.String,System.Text.Json.Nodes.JsonNode);summary;df-generated |
 | System.Text.Json.Nodes;JsonObject;WriteTo;(System.Text.Json.Utf8JsonWriter,System.Text.Json.JsonSerializerOptions);summary;df-generated |
 | System.Text.Json.Nodes;JsonObject;get_Count;();summary;df-generated |
 | System.Text.Json.Nodes;JsonObject;get_IsReadOnly;();summary;df-generated |
@@ -46188,6 +47210,7 @@ neutral
 | System.Text.Json;JsonElement+ArrayEnumerator;Dispose;();summary;df-generated |
 | System.Text.Json;JsonElement+ArrayEnumerator;MoveNext;();summary;df-generated |
 | System.Text.Json;JsonElement+ArrayEnumerator;Reset;();summary;df-generated |
+| System.Text.Json;JsonElement+ArrayEnumerator;get_Current;();summary;df-generated |
 | System.Text.Json;JsonElement+ObjectEnumerator;Dispose;();summary;df-generated |
 | System.Text.Json;JsonElement+ObjectEnumerator;MoveNext;();summary;df-generated |
 | System.Text.Json;JsonElement+ObjectEnumerator;Reset;();summary;df-generated |
@@ -46507,6 +47530,7 @@ neutral
 | System.Text.RegularExpressions;CaptureCollection;get_IsFixedSize;();summary;df-generated |
 | System.Text.RegularExpressions;CaptureCollection;get_IsReadOnly;();summary;df-generated |
 | System.Text.RegularExpressions;CaptureCollection;get_IsSynchronized;();summary;df-generated |
+| System.Text.RegularExpressions;CaptureCollection;get_Item;(System.Int32);summary;df-generated |
 | System.Text.RegularExpressions;GeneratedRegexAttribute;GeneratedRegexAttribute;(System.String);summary;df-generated |
 | System.Text.RegularExpressions;GeneratedRegexAttribute;GeneratedRegexAttribute;(System.String,System.Text.RegularExpressions.RegexOptions);summary;df-generated |
 | System.Text.RegularExpressions;GeneratedRegexAttribute;GeneratedRegexAttribute;(System.String,System.Text.RegularExpressions.RegexOptions,System.Int32);summary;df-generated |
@@ -46525,10 +47549,15 @@ neutral
 | System.Text.RegularExpressions;GroupCollection;IndexOf;(System.Text.RegularExpressions.Group);summary;df-generated |
 | System.Text.RegularExpressions;GroupCollection;Remove;(System.Text.RegularExpressions.Group);summary;df-generated |
 | System.Text.RegularExpressions;GroupCollection;RemoveAt;(System.Int32);summary;df-generated |
+| System.Text.RegularExpressions;GroupCollection;TryGetValue;(System.String,System.Text.RegularExpressions.Group);summary;df-generated |
 | System.Text.RegularExpressions;GroupCollection;get_Count;();summary;df-generated |
 | System.Text.RegularExpressions;GroupCollection;get_IsFixedSize;();summary;df-generated |
 | System.Text.RegularExpressions;GroupCollection;get_IsReadOnly;();summary;df-generated |
 | System.Text.RegularExpressions;GroupCollection;get_IsSynchronized;();summary;df-generated |
+| System.Text.RegularExpressions;GroupCollection;get_Item;(System.Int32);summary;df-generated |
+| System.Text.RegularExpressions;GroupCollection;get_Item;(System.String);summary;df-generated |
+| System.Text.RegularExpressions;GroupCollection;get_Keys;();summary;df-generated |
+| System.Text.RegularExpressions;GroupCollection;get_Values;();summary;df-generated |
 | System.Text.RegularExpressions;Match;Result;(System.String);summary;df-generated |
 | System.Text.RegularExpressions;Match;get_Empty;();summary;df-generated |
 | System.Text.RegularExpressions;Match;get_Groups;();summary;df-generated |
@@ -46542,6 +47571,7 @@ neutral
 | System.Text.RegularExpressions;MatchCollection;get_IsFixedSize;();summary;df-generated |
 | System.Text.RegularExpressions;MatchCollection;get_IsReadOnly;();summary;df-generated |
 | System.Text.RegularExpressions;MatchCollection;get_IsSynchronized;();summary;df-generated |
+| System.Text.RegularExpressions;MatchCollection;get_Item;(System.Int32);summary;df-generated |
 | System.Text.RegularExpressions;Regex+ValueMatchEnumerator;MoveNext;();summary;df-generated |
 | System.Text.RegularExpressions;Regex;CompileToAssembly;(System.Text.RegularExpressions.RegexCompilationInfo[],System.Reflection.AssemblyName);summary;df-generated |
 | System.Text.RegularExpressions;Regex;CompileToAssembly;(System.Text.RegularExpressions.RegexCompilationInfo[],System.Reflection.AssemblyName,System.Reflection.Emit.CustomAttributeBuilder[]);summary;df-generated |
@@ -47062,6 +48092,7 @@ neutral
 | System.Text;StringRuneEnumerator;Dispose;();summary;df-generated |
 | System.Text;StringRuneEnumerator;MoveNext;();summary;df-generated |
 | System.Text;StringRuneEnumerator;Reset;();summary;df-generated |
+| System.Text;StringRuneEnumerator;get_Current;();summary;df-generated |
 | System.Text;UTF7Encoding;Equals;(System.Object);summary;df-generated |
 | System.Text;UTF7Encoding;GetByteCount;(System.Char*,System.Int32);summary;df-generated |
 | System.Text;UTF7Encoding;GetByteCount;(System.Char[],System.Int32,System.Int32);summary;df-generated |
@@ -47202,8 +48233,10 @@ neutral
 | System.Threading.Tasks.Dataflow;BatchBlock<T>;Complete;();summary;df-generated |
 | System.Threading.Tasks.Dataflow;BatchBlock<T>;ConsumeMessage;(System.Threading.Tasks.Dataflow.DataflowMessageHeader,System.Threading.Tasks.Dataflow.ITargetBlock<T[]>,System.Boolean);summary;df-generated |
 | System.Threading.Tasks.Dataflow;BatchBlock<T>;Fault;(System.Exception);summary;df-generated |
+| System.Threading.Tasks.Dataflow;BatchBlock<T>;LinkTo;(System.Threading.Tasks.Dataflow.ITargetBlock<T[]>,System.Threading.Tasks.Dataflow.DataflowLinkOptions);summary;df-generated |
 | System.Threading.Tasks.Dataflow;BatchBlock<T>;OfferMessage;(System.Threading.Tasks.Dataflow.DataflowMessageHeader,T,System.Threading.Tasks.Dataflow.ISourceBlock<T>,System.Boolean);summary;df-generated |
 | System.Threading.Tasks.Dataflow;BatchBlock<T>;ReleaseReservation;(System.Threading.Tasks.Dataflow.DataflowMessageHeader,System.Threading.Tasks.Dataflow.ITargetBlock<T[]>);summary;df-generated |
+| System.Threading.Tasks.Dataflow;BatchBlock<T>;ReserveMessage;(System.Threading.Tasks.Dataflow.DataflowMessageHeader,System.Threading.Tasks.Dataflow.ITargetBlock<T[]>);summary;df-generated |
 | System.Threading.Tasks.Dataflow;BatchBlock<T>;ToString;();summary;df-generated |
 | System.Threading.Tasks.Dataflow;BatchBlock<T>;TriggerBatch;();summary;df-generated |
 | System.Threading.Tasks.Dataflow;BatchBlock<T>;TryReceiveAll;(System.Collections.Generic.IList<T[]>);summary;df-generated |
@@ -47213,7 +48246,9 @@ neutral
 | System.Threading.Tasks.Dataflow;BatchedJoinBlock<T1,T2,T3>;Complete;();summary;df-generated |
 | System.Threading.Tasks.Dataflow;BatchedJoinBlock<T1,T2,T3>;ConsumeMessage;(System.Threading.Tasks.Dataflow.DataflowMessageHeader,System.Threading.Tasks.Dataflow.ITargetBlock<System.Tuple<System.Collections.Generic.IList<T1>,System.Collections.Generic.IList<T2>,System.Collections.Generic.IList<T3>>>,System.Boolean);summary;df-generated |
 | System.Threading.Tasks.Dataflow;BatchedJoinBlock<T1,T2,T3>;Fault;(System.Exception);summary;df-generated |
+| System.Threading.Tasks.Dataflow;BatchedJoinBlock<T1,T2,T3>;LinkTo;(System.Threading.Tasks.Dataflow.ITargetBlock<System.Tuple<System.Collections.Generic.IList<T1>,System.Collections.Generic.IList<T2>,System.Collections.Generic.IList<T3>>>,System.Threading.Tasks.Dataflow.DataflowLinkOptions);summary;df-generated |
 | System.Threading.Tasks.Dataflow;BatchedJoinBlock<T1,T2,T3>;ReleaseReservation;(System.Threading.Tasks.Dataflow.DataflowMessageHeader,System.Threading.Tasks.Dataflow.ITargetBlock<System.Tuple<System.Collections.Generic.IList<T1>,System.Collections.Generic.IList<T2>,System.Collections.Generic.IList<T3>>>);summary;df-generated |
+| System.Threading.Tasks.Dataflow;BatchedJoinBlock<T1,T2,T3>;ReserveMessage;(System.Threading.Tasks.Dataflow.DataflowMessageHeader,System.Threading.Tasks.Dataflow.ITargetBlock<System.Tuple<System.Collections.Generic.IList<T1>,System.Collections.Generic.IList<T2>,System.Collections.Generic.IList<T3>>>);summary;df-generated |
 | System.Threading.Tasks.Dataflow;BatchedJoinBlock<T1,T2,T3>;ToString;();summary;df-generated |
 | System.Threading.Tasks.Dataflow;BatchedJoinBlock<T1,T2,T3>;TryReceiveAll;(System.Collections.Generic.IList<System.Tuple<System.Collections.Generic.IList<T1>,System.Collections.Generic.IList<T2>,System.Collections.Generic.IList<T3>>>);summary;df-generated |
 | System.Threading.Tasks.Dataflow;BatchedJoinBlock<T1,T2,T3>;get_BatchSize;();summary;df-generated |
@@ -47222,21 +48257,29 @@ neutral
 | System.Threading.Tasks.Dataflow;BatchedJoinBlock<T1,T2>;Complete;();summary;df-generated |
 | System.Threading.Tasks.Dataflow;BatchedJoinBlock<T1,T2>;ConsumeMessage;(System.Threading.Tasks.Dataflow.DataflowMessageHeader,System.Threading.Tasks.Dataflow.ITargetBlock<System.Tuple<System.Collections.Generic.IList<T1>,System.Collections.Generic.IList<T2>>>,System.Boolean);summary;df-generated |
 | System.Threading.Tasks.Dataflow;BatchedJoinBlock<T1,T2>;Fault;(System.Exception);summary;df-generated |
+| System.Threading.Tasks.Dataflow;BatchedJoinBlock<T1,T2>;LinkTo;(System.Threading.Tasks.Dataflow.ITargetBlock<System.Tuple<System.Collections.Generic.IList<T1>,System.Collections.Generic.IList<T2>>>,System.Threading.Tasks.Dataflow.DataflowLinkOptions);summary;df-generated |
 | System.Threading.Tasks.Dataflow;BatchedJoinBlock<T1,T2>;ReleaseReservation;(System.Threading.Tasks.Dataflow.DataflowMessageHeader,System.Threading.Tasks.Dataflow.ITargetBlock<System.Tuple<System.Collections.Generic.IList<T1>,System.Collections.Generic.IList<T2>>>);summary;df-generated |
+| System.Threading.Tasks.Dataflow;BatchedJoinBlock<T1,T2>;ReserveMessage;(System.Threading.Tasks.Dataflow.DataflowMessageHeader,System.Threading.Tasks.Dataflow.ITargetBlock<System.Tuple<System.Collections.Generic.IList<T1>,System.Collections.Generic.IList<T2>>>);summary;df-generated |
 | System.Threading.Tasks.Dataflow;BatchedJoinBlock<T1,T2>;ToString;();summary;df-generated |
 | System.Threading.Tasks.Dataflow;BatchedJoinBlock<T1,T2>;TryReceiveAll;(System.Collections.Generic.IList<System.Tuple<System.Collections.Generic.IList<T1>,System.Collections.Generic.IList<T2>>>);summary;df-generated |
 | System.Threading.Tasks.Dataflow;BatchedJoinBlock<T1,T2>;get_BatchSize;();summary;df-generated |
 | System.Threading.Tasks.Dataflow;BatchedJoinBlock<T1,T2>;get_OutputCount;();summary;df-generated |
 | System.Threading.Tasks.Dataflow;BroadcastBlock<T>;Complete;();summary;df-generated |
+| System.Threading.Tasks.Dataflow;BroadcastBlock<T>;ConsumeMessage;(System.Threading.Tasks.Dataflow.DataflowMessageHeader,System.Threading.Tasks.Dataflow.ITargetBlock<T>,System.Boolean);summary;df-generated |
 | System.Threading.Tasks.Dataflow;BroadcastBlock<T>;Fault;(System.Exception);summary;df-generated |
+| System.Threading.Tasks.Dataflow;BroadcastBlock<T>;LinkTo;(System.Threading.Tasks.Dataflow.ITargetBlock<T>,System.Threading.Tasks.Dataflow.DataflowLinkOptions);summary;df-generated |
 | System.Threading.Tasks.Dataflow;BroadcastBlock<T>;OfferMessage;(System.Threading.Tasks.Dataflow.DataflowMessageHeader,T,System.Threading.Tasks.Dataflow.ISourceBlock<T>,System.Boolean);summary;df-generated |
 | System.Threading.Tasks.Dataflow;BroadcastBlock<T>;ReleaseReservation;(System.Threading.Tasks.Dataflow.DataflowMessageHeader,System.Threading.Tasks.Dataflow.ITargetBlock<T>);summary;df-generated |
+| System.Threading.Tasks.Dataflow;BroadcastBlock<T>;ReserveMessage;(System.Threading.Tasks.Dataflow.DataflowMessageHeader,System.Threading.Tasks.Dataflow.ITargetBlock<T>);summary;df-generated |
 | System.Threading.Tasks.Dataflow;BroadcastBlock<T>;ToString;();summary;df-generated |
+| System.Threading.Tasks.Dataflow;BroadcastBlock<T>;TryReceiveAll;(System.Collections.Generic.IList<T>);summary;df-generated |
 | System.Threading.Tasks.Dataflow;BufferBlock<T>;Complete;();summary;df-generated |
 | System.Threading.Tasks.Dataflow;BufferBlock<T>;ConsumeMessage;(System.Threading.Tasks.Dataflow.DataflowMessageHeader,System.Threading.Tasks.Dataflow.ITargetBlock<T>,System.Boolean);summary;df-generated |
 | System.Threading.Tasks.Dataflow;BufferBlock<T>;Fault;(System.Exception);summary;df-generated |
+| System.Threading.Tasks.Dataflow;BufferBlock<T>;LinkTo;(System.Threading.Tasks.Dataflow.ITargetBlock<T>,System.Threading.Tasks.Dataflow.DataflowLinkOptions);summary;df-generated |
 | System.Threading.Tasks.Dataflow;BufferBlock<T>;OfferMessage;(System.Threading.Tasks.Dataflow.DataflowMessageHeader,T,System.Threading.Tasks.Dataflow.ISourceBlock<T>,System.Boolean);summary;df-generated |
 | System.Threading.Tasks.Dataflow;BufferBlock<T>;ReleaseReservation;(System.Threading.Tasks.Dataflow.DataflowMessageHeader,System.Threading.Tasks.Dataflow.ITargetBlock<T>);summary;df-generated |
+| System.Threading.Tasks.Dataflow;BufferBlock<T>;ReserveMessage;(System.Threading.Tasks.Dataflow.DataflowMessageHeader,System.Threading.Tasks.Dataflow.ITargetBlock<T>);summary;df-generated |
 | System.Threading.Tasks.Dataflow;BufferBlock<T>;ToString;();summary;df-generated |
 | System.Threading.Tasks.Dataflow;BufferBlock<T>;TryReceiveAll;(System.Collections.Generic.IList<T>);summary;df-generated |
 | System.Threading.Tasks.Dataflow;BufferBlock<T>;get_Count;();summary;df-generated |
@@ -47262,22 +48305,28 @@ neutral
 | System.Threading.Tasks.Dataflow;JoinBlock<T1,T2,T3>;Complete;();summary;df-generated |
 | System.Threading.Tasks.Dataflow;JoinBlock<T1,T2,T3>;ConsumeMessage;(System.Threading.Tasks.Dataflow.DataflowMessageHeader,System.Threading.Tasks.Dataflow.ITargetBlock<System.Tuple<T1,T2,T3>>,System.Boolean);summary;df-generated |
 | System.Threading.Tasks.Dataflow;JoinBlock<T1,T2,T3>;Fault;(System.Exception);summary;df-generated |
+| System.Threading.Tasks.Dataflow;JoinBlock<T1,T2,T3>;LinkTo;(System.Threading.Tasks.Dataflow.ITargetBlock<System.Tuple<T1,T2,T3>>,System.Threading.Tasks.Dataflow.DataflowLinkOptions);summary;df-generated |
 | System.Threading.Tasks.Dataflow;JoinBlock<T1,T2,T3>;ReleaseReservation;(System.Threading.Tasks.Dataflow.DataflowMessageHeader,System.Threading.Tasks.Dataflow.ITargetBlock<System.Tuple<T1,T2,T3>>);summary;df-generated |
+| System.Threading.Tasks.Dataflow;JoinBlock<T1,T2,T3>;ReserveMessage;(System.Threading.Tasks.Dataflow.DataflowMessageHeader,System.Threading.Tasks.Dataflow.ITargetBlock<System.Tuple<T1,T2,T3>>);summary;df-generated |
 | System.Threading.Tasks.Dataflow;JoinBlock<T1,T2,T3>;ToString;();summary;df-generated |
 | System.Threading.Tasks.Dataflow;JoinBlock<T1,T2,T3>;TryReceiveAll;(System.Collections.Generic.IList<System.Tuple<T1,T2,T3>>);summary;df-generated |
 | System.Threading.Tasks.Dataflow;JoinBlock<T1,T2,T3>;get_OutputCount;();summary;df-generated |
 | System.Threading.Tasks.Dataflow;JoinBlock<T1,T2>;Complete;();summary;df-generated |
 | System.Threading.Tasks.Dataflow;JoinBlock<T1,T2>;ConsumeMessage;(System.Threading.Tasks.Dataflow.DataflowMessageHeader,System.Threading.Tasks.Dataflow.ITargetBlock<System.Tuple<T1,T2>>,System.Boolean);summary;df-generated |
 | System.Threading.Tasks.Dataflow;JoinBlock<T1,T2>;Fault;(System.Exception);summary;df-generated |
+| System.Threading.Tasks.Dataflow;JoinBlock<T1,T2>;LinkTo;(System.Threading.Tasks.Dataflow.ITargetBlock<System.Tuple<T1,T2>>,System.Threading.Tasks.Dataflow.DataflowLinkOptions);summary;df-generated |
 | System.Threading.Tasks.Dataflow;JoinBlock<T1,T2>;ReleaseReservation;(System.Threading.Tasks.Dataflow.DataflowMessageHeader,System.Threading.Tasks.Dataflow.ITargetBlock<System.Tuple<T1,T2>>);summary;df-generated |
+| System.Threading.Tasks.Dataflow;JoinBlock<T1,T2>;ReserveMessage;(System.Threading.Tasks.Dataflow.DataflowMessageHeader,System.Threading.Tasks.Dataflow.ITargetBlock<System.Tuple<T1,T2>>);summary;df-generated |
 | System.Threading.Tasks.Dataflow;JoinBlock<T1,T2>;ToString;();summary;df-generated |
 | System.Threading.Tasks.Dataflow;JoinBlock<T1,T2>;TryReceiveAll;(System.Collections.Generic.IList<System.Tuple<T1,T2>>);summary;df-generated |
 | System.Threading.Tasks.Dataflow;JoinBlock<T1,T2>;get_OutputCount;();summary;df-generated |
 | System.Threading.Tasks.Dataflow;TransformBlock<TInput,TOutput>;Complete;();summary;df-generated |
 | System.Threading.Tasks.Dataflow;TransformBlock<TInput,TOutput>;ConsumeMessage;(System.Threading.Tasks.Dataflow.DataflowMessageHeader,System.Threading.Tasks.Dataflow.ITargetBlock<TOutput>,System.Boolean);summary;df-generated |
 | System.Threading.Tasks.Dataflow;TransformBlock<TInput,TOutput>;Fault;(System.Exception);summary;df-generated |
+| System.Threading.Tasks.Dataflow;TransformBlock<TInput,TOutput>;LinkTo;(System.Threading.Tasks.Dataflow.ITargetBlock<TOutput>,System.Threading.Tasks.Dataflow.DataflowLinkOptions);summary;df-generated |
 | System.Threading.Tasks.Dataflow;TransformBlock<TInput,TOutput>;OfferMessage;(System.Threading.Tasks.Dataflow.DataflowMessageHeader,TInput,System.Threading.Tasks.Dataflow.ISourceBlock<TInput>,System.Boolean);summary;df-generated |
 | System.Threading.Tasks.Dataflow;TransformBlock<TInput,TOutput>;ReleaseReservation;(System.Threading.Tasks.Dataflow.DataflowMessageHeader,System.Threading.Tasks.Dataflow.ITargetBlock<TOutput>);summary;df-generated |
+| System.Threading.Tasks.Dataflow;TransformBlock<TInput,TOutput>;ReserveMessage;(System.Threading.Tasks.Dataflow.DataflowMessageHeader,System.Threading.Tasks.Dataflow.ITargetBlock<TOutput>);summary;df-generated |
 | System.Threading.Tasks.Dataflow;TransformBlock<TInput,TOutput>;ToString;();summary;df-generated |
 | System.Threading.Tasks.Dataflow;TransformBlock<TInput,TOutput>;TryReceiveAll;(System.Collections.Generic.IList<TOutput>);summary;df-generated |
 | System.Threading.Tasks.Dataflow;TransformBlock<TInput,TOutput>;get_InputCount;();summary;df-generated |
@@ -47285,15 +48334,22 @@ neutral
 | System.Threading.Tasks.Dataflow;TransformManyBlock<TInput,TOutput>;Complete;();summary;df-generated |
 | System.Threading.Tasks.Dataflow;TransformManyBlock<TInput,TOutput>;ConsumeMessage;(System.Threading.Tasks.Dataflow.DataflowMessageHeader,System.Threading.Tasks.Dataflow.ITargetBlock<TOutput>,System.Boolean);summary;df-generated |
 | System.Threading.Tasks.Dataflow;TransformManyBlock<TInput,TOutput>;Fault;(System.Exception);summary;df-generated |
+| System.Threading.Tasks.Dataflow;TransformManyBlock<TInput,TOutput>;LinkTo;(System.Threading.Tasks.Dataflow.ITargetBlock<TOutput>,System.Threading.Tasks.Dataflow.DataflowLinkOptions);summary;df-generated |
 | System.Threading.Tasks.Dataflow;TransformManyBlock<TInput,TOutput>;OfferMessage;(System.Threading.Tasks.Dataflow.DataflowMessageHeader,TInput,System.Threading.Tasks.Dataflow.ISourceBlock<TInput>,System.Boolean);summary;df-generated |
 | System.Threading.Tasks.Dataflow;TransformManyBlock<TInput,TOutput>;ReleaseReservation;(System.Threading.Tasks.Dataflow.DataflowMessageHeader,System.Threading.Tasks.Dataflow.ITargetBlock<TOutput>);summary;df-generated |
+| System.Threading.Tasks.Dataflow;TransformManyBlock<TInput,TOutput>;ReserveMessage;(System.Threading.Tasks.Dataflow.DataflowMessageHeader,System.Threading.Tasks.Dataflow.ITargetBlock<TOutput>);summary;df-generated |
 | System.Threading.Tasks.Dataflow;TransformManyBlock<TInput,TOutput>;ToString;();summary;df-generated |
 | System.Threading.Tasks.Dataflow;TransformManyBlock<TInput,TOutput>;TryReceiveAll;(System.Collections.Generic.IList<TOutput>);summary;df-generated |
 | System.Threading.Tasks.Dataflow;TransformManyBlock<TInput,TOutput>;get_InputCount;();summary;df-generated |
 | System.Threading.Tasks.Dataflow;TransformManyBlock<TInput,TOutput>;get_OutputCount;();summary;df-generated |
 | System.Threading.Tasks.Dataflow;WriteOnceBlock<T>;Complete;();summary;df-generated |
+| System.Threading.Tasks.Dataflow;WriteOnceBlock<T>;ConsumeMessage;(System.Threading.Tasks.Dataflow.DataflowMessageHeader,System.Threading.Tasks.Dataflow.ITargetBlock<T>,System.Boolean);summary;df-generated |
 | System.Threading.Tasks.Dataflow;WriteOnceBlock<T>;Fault;(System.Exception);summary;df-generated |
+| System.Threading.Tasks.Dataflow;WriteOnceBlock<T>;LinkTo;(System.Threading.Tasks.Dataflow.ITargetBlock<T>,System.Threading.Tasks.Dataflow.DataflowLinkOptions);summary;df-generated |
+| System.Threading.Tasks.Dataflow;WriteOnceBlock<T>;OfferMessage;(System.Threading.Tasks.Dataflow.DataflowMessageHeader,T,System.Threading.Tasks.Dataflow.ISourceBlock<T>,System.Boolean);summary;df-generated |
+| System.Threading.Tasks.Dataflow;WriteOnceBlock<T>;ReleaseReservation;(System.Threading.Tasks.Dataflow.DataflowMessageHeader,System.Threading.Tasks.Dataflow.ITargetBlock<T>);summary;df-generated |
 | System.Threading.Tasks.Dataflow;WriteOnceBlock<T>;ReserveMessage;(System.Threading.Tasks.Dataflow.DataflowMessageHeader,System.Threading.Tasks.Dataflow.ITargetBlock<T>);summary;df-generated |
+| System.Threading.Tasks.Dataflow;WriteOnceBlock<T>;TryReceiveAll;(System.Collections.Generic.IList<T>);summary;df-generated |
 | System.Threading.Tasks.Sources;IValueTaskSource;GetResult;(System.Int16);summary;df-generated |
 | System.Threading.Tasks.Sources;IValueTaskSource;GetStatus;(System.Int16);summary;df-generated |
 | System.Threading.Tasks.Sources;IValueTaskSource<TResult>;GetResult;(System.Int16);summary;df-generated |
@@ -47986,6 +49042,7 @@ neutral
 | System.Web;AspNetHostingPermission;ToXml;();summary;df-generated |
 | System.Web;AspNetHostingPermissionAttribute;AspNetHostingPermissionAttribute;(System.Security.Permissions.SecurityAction);summary;df-generated |
 | System.Web;AspNetHostingPermissionAttribute;CreatePermission;();summary;df-generated |
+| System.Web;HtmlString;ToHtmlString;();summary;df-generated |
 | System.Web;HttpUtility;ParseQueryString;(System.String);summary;df-generated |
 | System.Web;HttpUtility;ParseQueryString;(System.String,System.Text.Encoding);summary;df-generated |
 | System.Web;HttpUtility;UrlDecode;(System.Byte[],System.Int32,System.Int32,System.Text.Encoding);summary;df-generated |
@@ -48186,6 +49243,9 @@ neutral
 | System.Xml.Schema;XmlSchemaInferenceException;XmlSchemaInferenceException;(System.String);summary;df-generated |
 | System.Xml.Schema;XmlSchemaInferenceException;XmlSchemaInferenceException;(System.String,System.Exception);summary;df-generated |
 | System.Xml.Schema;XmlSchemaInferenceException;XmlSchemaInferenceException;(System.String,System.Exception,System.Int32,System.Int32);summary;df-generated |
+| System.Xml.Schema;XmlSchemaInfo;get_IsDefault;();summary;df-generated |
+| System.Xml.Schema;XmlSchemaInfo;get_IsNil;();summary;df-generated |
+| System.Xml.Schema;XmlSchemaInfo;get_Validity;();summary;df-generated |
 | System.Xml.Schema;XmlSchemaObjectCollection;Contains;(System.Xml.Schema.XmlSchemaObject);summary;df-generated |
 | System.Xml.Schema;XmlSchemaObjectCollection;IndexOf;(System.Xml.Schema.XmlSchemaObject);summary;df-generated |
 | System.Xml.Schema;XmlSchemaObjectCollection;OnClear;();summary;df-generated |
@@ -48283,6 +49343,7 @@ neutral
 | System.Xml.Serialization;XmlSchemaEnumerator;Dispose;();summary;df-generated |
 | System.Xml.Serialization;XmlSchemaEnumerator;MoveNext;();summary;df-generated |
 | System.Xml.Serialization;XmlSchemaEnumerator;Reset;();summary;df-generated |
+| System.Xml.Serialization;XmlSchemaEnumerator;get_Current;();summary;df-generated |
 | System.Xml.Serialization;XmlSchemaExporter;ExportAnyType;(System.String);summary;df-generated |
 | System.Xml.Serialization;XmlSchemaExporter;ExportAnyType;(System.Xml.Serialization.XmlMembersMapping);summary;df-generated |
 | System.Xml.Serialization;XmlSchemaImporter;ImportAnyType;(System.Xml.XmlQualifiedName,System.String);summary;df-generated |
@@ -49314,6 +50375,7 @@ neutral
 | System;ArraySegment<T>+Enumerator;Dispose;();summary;df-generated |
 | System;ArraySegment<T>+Enumerator;MoveNext;();summary;df-generated |
 | System;ArraySegment<T>+Enumerator;Reset;();summary;df-generated |
+| System;ArraySegment<T>+Enumerator;get_Current;();summary;df-generated |
 | System;ArraySegment<T>;Contains;(T);summary;df-generated |
 | System;ArraySegment<T>;CopyTo;(System.ArraySegment<T>);summary;df-generated |
 | System;ArraySegment<T>;CopyTo;(T[]);summary;df-generated |
@@ -49328,6 +50390,7 @@ neutral
 | System;ArraySegment<T>;get_Count;();summary;df-generated |
 | System;ArraySegment<T>;get_Empty;();summary;df-generated |
 | System;ArraySegment<T>;get_IsReadOnly;();summary;df-generated |
+| System;ArraySegment<T>;get_Item;(System.Int32);summary;df-generated |
 | System;ArraySegment<T>;get_Offset;();summary;df-generated |
 | System;ArraySegment<T>;op_Equality;(System.ArraySegment<T>,System.ArraySegment<T>);summary;df-generated |
 | System;ArraySegment<T>;op_Inequality;(System.ArraySegment<T>,System.ArraySegment<T>);summary;df-generated |
@@ -50221,6 +51284,21 @@ neutral
 | System;Decimal;Round;(System.Decimal,System.MidpointRounding);summary;df-generated |
 | System;Decimal;Sign;(System.Decimal);summary;df-generated |
 | System;Decimal;Subtract;(System.Decimal,System.Decimal);summary;df-generated |
+| System;Decimal;System.Numerics.IAdditionOperators<System.Decimal,System.Decimal,System.Decimal>.op_Addition;(System.Decimal,System.Decimal);summary;df-generated |
+| System;Decimal;System.Numerics.IComparisonOperators<System.Decimal,System.Decimal,System.Boolean>.op_GreaterThan;(System.Decimal,System.Decimal);summary;df-generated |
+| System;Decimal;System.Numerics.IComparisonOperators<System.Decimal,System.Decimal,System.Boolean>.op_GreaterThanOrEqual;(System.Decimal,System.Decimal);summary;df-generated |
+| System;Decimal;System.Numerics.IComparisonOperators<System.Decimal,System.Decimal,System.Boolean>.op_LessThan;(System.Decimal,System.Decimal);summary;df-generated |
+| System;Decimal;System.Numerics.IComparisonOperators<System.Decimal,System.Decimal,System.Boolean>.op_LessThanOrEqual;(System.Decimal,System.Decimal);summary;df-generated |
+| System;Decimal;System.Numerics.IDecrementOperators<System.Decimal>.op_Decrement;(System.Decimal);summary;df-generated |
+| System;Decimal;System.Numerics.IDivisionOperators<System.Decimal,System.Decimal,System.Decimal>.op_Division;(System.Decimal,System.Decimal);summary;df-generated |
+| System;Decimal;System.Numerics.IEqualityOperators<System.Decimal,System.Decimal,System.Boolean>.op_Equality;(System.Decimal,System.Decimal);summary;df-generated |
+| System;Decimal;System.Numerics.IEqualityOperators<System.Decimal,System.Decimal,System.Boolean>.op_Inequality;(System.Decimal,System.Decimal);summary;df-generated |
+| System;Decimal;System.Numerics.IIncrementOperators<System.Decimal>.op_Increment;(System.Decimal);summary;df-generated |
+| System;Decimal;System.Numerics.IModulusOperators<System.Decimal,System.Decimal,System.Decimal>.op_Modulus;(System.Decimal,System.Decimal);summary;df-generated |
+| System;Decimal;System.Numerics.IMultiplyOperators<System.Decimal,System.Decimal,System.Decimal>.op_Multiply;(System.Decimal,System.Decimal);summary;df-generated |
+| System;Decimal;System.Numerics.ISubtractionOperators<System.Decimal,System.Decimal,System.Decimal>.op_Subtraction;(System.Decimal,System.Decimal);summary;df-generated |
+| System;Decimal;System.Numerics.IUnaryNegationOperators<System.Decimal,System.Decimal>.op_UnaryNegation;(System.Decimal);summary;df-generated |
+| System;Decimal;System.Numerics.IUnaryPlusOperators<System.Decimal,System.Decimal>.op_UnaryPlus;(System.Decimal);summary;df-generated |
 | System;Decimal;ToBoolean;(System.IFormatProvider);summary;df-generated |
 | System;Decimal;ToByte;(System.Decimal);summary;df-generated |
 | System;Decimal;ToByte;(System.IFormatProvider);summary;df-generated |
@@ -50410,8 +51488,14 @@ neutral
 | System;Double;System.Numerics.IBitwiseOperators<System.Double,System.Double,System.Double>.op_BitwiseOr;(System.Double,System.Double);summary;df-generated |
 | System;Double;System.Numerics.IBitwiseOperators<System.Double,System.Double,System.Double>.op_ExclusiveOr;(System.Double,System.Double);summary;df-generated |
 | System;Double;System.Numerics.IBitwiseOperators<System.Double,System.Double,System.Double>.op_OnesComplement;(System.Double);summary;df-generated |
+| System;Double;System.Numerics.IComparisonOperators<System.Double,System.Double,System.Boolean>.op_GreaterThan;(System.Double,System.Double);summary;df-generated |
+| System;Double;System.Numerics.IComparisonOperators<System.Double,System.Double,System.Boolean>.op_GreaterThanOrEqual;(System.Double,System.Double);summary;df-generated |
+| System;Double;System.Numerics.IComparisonOperators<System.Double,System.Double,System.Boolean>.op_LessThan;(System.Double,System.Double);summary;df-generated |
+| System;Double;System.Numerics.IComparisonOperators<System.Double,System.Double,System.Boolean>.op_LessThanOrEqual;(System.Double,System.Double);summary;df-generated |
 | System;Double;System.Numerics.IDecrementOperators<System.Double>.op_Decrement;(System.Double);summary;df-generated |
 | System;Double;System.Numerics.IDivisionOperators<System.Double,System.Double,System.Double>.op_Division;(System.Double,System.Double);summary;df-generated |
+| System;Double;System.Numerics.IEqualityOperators<System.Double,System.Double,System.Boolean>.op_Equality;(System.Double,System.Double);summary;df-generated |
+| System;Double;System.Numerics.IEqualityOperators<System.Double,System.Double,System.Boolean>.op_Inequality;(System.Double,System.Double);summary;df-generated |
 | System;Double;System.Numerics.IIncrementOperators<System.Double>.op_Increment;(System.Double);summary;df-generated |
 | System;Double;System.Numerics.IModulusOperators<System.Double,System.Double,System.Double>.op_Modulus;(System.Double,System.Double);summary;df-generated |
 | System;Double;System.Numerics.IMultiplyOperators<System.Double,System.Double,System.Double>.op_Multiply;(System.Double,System.Double);summary;df-generated |
@@ -50695,6 +51779,8 @@ neutral
 | System;Half;Atan;(System.Half);summary;df-generated |
 | System;Half;AtanPi;(System.Half);summary;df-generated |
 | System;Half;Atanh;(System.Half);summary;df-generated |
+| System;Half;BitDecrement;(System.Half);summary;df-generated |
+| System;Half;BitIncrement;(System.Half);summary;df-generated |
 | System;Half;Cbrt;(System.Half);summary;df-generated |
 | System;Half;Ceiling;(System.Half);summary;df-generated |
 | System;Half;Clamp;(System.Half,System.Half,System.Half);summary;df-generated |
@@ -50751,8 +51837,10 @@ neutral
 | System;Half;LogP1;(System.Half);summary;df-generated |
 | System;Half;Max;(System.Half,System.Half);summary;df-generated |
 | System;Half;MaxMagnitude;(System.Half,System.Half);summary;df-generated |
+| System;Half;MaxMagnitudeNumber;(System.Half,System.Half);summary;df-generated |
 | System;Half;Min;(System.Half,System.Half);summary;df-generated |
 | System;Half;MinMagnitude;(System.Half,System.Half);summary;df-generated |
+| System;Half;MinMagnitudeNumber;(System.Half,System.Half);summary;df-generated |
 | System;Half;Parse;(System.ReadOnlySpan<System.Byte>,System.Globalization.NumberStyles,System.IFormatProvider);summary;df-generated |
 | System;Half;Parse;(System.ReadOnlySpan<System.Byte>,System.IFormatProvider);summary;df-generated |
 | System;Half;Parse;(System.ReadOnlySpan<System.Char>,System.Globalization.NumberStyles,System.IFormatProvider);summary;df-generated |
@@ -50778,10 +51866,25 @@ neutral
 | System;Half;SinPi;(System.Half);summary;df-generated |
 | System;Half;Sinh;(System.Half);summary;df-generated |
 | System;Half;Sqrt;(System.Half);summary;df-generated |
+| System;Half;System.Numerics.IAdditionOperators<System.Half,System.Half,System.Half>.op_Addition;(System.Half,System.Half);summary;df-generated |
 | System;Half;System.Numerics.IBitwiseOperators<System.Half,System.Half,System.Half>.op_BitwiseAnd;(System.Half,System.Half);summary;df-generated |
 | System;Half;System.Numerics.IBitwiseOperators<System.Half,System.Half,System.Half>.op_BitwiseOr;(System.Half,System.Half);summary;df-generated |
 | System;Half;System.Numerics.IBitwiseOperators<System.Half,System.Half,System.Half>.op_ExclusiveOr;(System.Half,System.Half);summary;df-generated |
 | System;Half;System.Numerics.IBitwiseOperators<System.Half,System.Half,System.Half>.op_OnesComplement;(System.Half);summary;df-generated |
+| System;Half;System.Numerics.IComparisonOperators<System.Half,System.Half,System.Boolean>.op_GreaterThan;(System.Half,System.Half);summary;df-generated |
+| System;Half;System.Numerics.IComparisonOperators<System.Half,System.Half,System.Boolean>.op_GreaterThanOrEqual;(System.Half,System.Half);summary;df-generated |
+| System;Half;System.Numerics.IComparisonOperators<System.Half,System.Half,System.Boolean>.op_LessThan;(System.Half,System.Half);summary;df-generated |
+| System;Half;System.Numerics.IComparisonOperators<System.Half,System.Half,System.Boolean>.op_LessThanOrEqual;(System.Half,System.Half);summary;df-generated |
+| System;Half;System.Numerics.IDecrementOperators<System.Half>.op_Decrement;(System.Half);summary;df-generated |
+| System;Half;System.Numerics.IDivisionOperators<System.Half,System.Half,System.Half>.op_Division;(System.Half,System.Half);summary;df-generated |
+| System;Half;System.Numerics.IEqualityOperators<System.Half,System.Half,System.Boolean>.op_Equality;(System.Half,System.Half);summary;df-generated |
+| System;Half;System.Numerics.IEqualityOperators<System.Half,System.Half,System.Boolean>.op_Inequality;(System.Half,System.Half);summary;df-generated |
+| System;Half;System.Numerics.IIncrementOperators<System.Half>.op_Increment;(System.Half);summary;df-generated |
+| System;Half;System.Numerics.IModulusOperators<System.Half,System.Half,System.Half>.op_Modulus;(System.Half,System.Half);summary;df-generated |
+| System;Half;System.Numerics.IMultiplyOperators<System.Half,System.Half,System.Half>.op_Multiply;(System.Half,System.Half);summary;df-generated |
+| System;Half;System.Numerics.ISubtractionOperators<System.Half,System.Half,System.Half>.op_Subtraction;(System.Half,System.Half);summary;df-generated |
+| System;Half;System.Numerics.IUnaryNegationOperators<System.Half,System.Half>.op_UnaryNegation;(System.Half);summary;df-generated |
+| System;Half;System.Numerics.IUnaryPlusOperators<System.Half,System.Half>.op_UnaryPlus;(System.Half);summary;df-generated |
 | System;Half;Tan;(System.Half);summary;df-generated |
 | System;Half;TanPi;(System.Half);summary;df-generated |
 | System;Half;Tanh;(System.Half);summary;df-generated |
@@ -51064,7 +52167,10 @@ neutral
 | System;Int32;MinNumber;(System.Int32,System.Int32);summary;df-generated |
 | System;Int32;Parse;(System.ReadOnlySpan<System.Byte>,System.Globalization.NumberStyles,System.IFormatProvider);summary;df-generated |
 | System;Int32;Parse;(System.ReadOnlySpan<System.Byte>,System.IFormatProvider);summary;df-generated |
+| System;Int32;Parse;(System.ReadOnlySpan<System.Char>,System.Globalization.NumberStyles,System.IFormatProvider);summary;df-generated |
 | System;Int32;Parse;(System.ReadOnlySpan<System.Char>,System.IFormatProvider);summary;df-generated |
+| System;Int32;Parse;(System.String,System.Globalization.NumberStyles,System.IFormatProvider);summary;df-generated |
+| System;Int32;Parse;(System.String,System.IFormatProvider);summary;df-generated |
 | System;Int32;PopCount;(System.Int32);summary;df-generated |
 | System;Int32;RotateLeft;(System.Int32,System.Int32);summary;df-generated |
 | System;Int32;RotateRight;(System.Int32,System.Int32);summary;df-generated |
@@ -51123,7 +52229,9 @@ neutral
 | System;Int32;TryParse;(System.ReadOnlySpan<System.Byte>,System.Globalization.NumberStyles,System.IFormatProvider,System.Int32);summary;df-generated |
 | System;Int32;TryParse;(System.ReadOnlySpan<System.Byte>,System.IFormatProvider,System.Int32);summary;df-generated |
 | System;Int32;TryParse;(System.ReadOnlySpan<System.Byte>,System.Int32);summary;df-generated |
+| System;Int32;TryParse;(System.ReadOnlySpan<System.Char>,System.Globalization.NumberStyles,System.IFormatProvider,System.Int32);summary;df-generated |
 | System;Int32;TryParse;(System.ReadOnlySpan<System.Char>,System.IFormatProvider,System.Int32);summary;df-generated |
+| System;Int32;TryParse;(System.String,System.Globalization.NumberStyles,System.IFormatProvider,System.Int32);summary;df-generated |
 | System;Int32;TryParse;(System.String,System.IFormatProvider,System.Int32);summary;df-generated |
 | System;Int32;TryReadBigEndian;(System.ReadOnlySpan<System.Byte>,System.Boolean,System.Int32);summary;df-generated |
 | System;Int32;TryReadLittleEndian;(System.ReadOnlySpan<System.Byte>,System.Boolean,System.Int32);summary;df-generated |
@@ -51266,6 +52374,7 @@ neutral
 | System;Int64;get_One;();summary;df-generated |
 | System;Int64;get_Radix;();summary;df-generated |
 | System;Int64;get_Zero;();summary;df-generated |
+| System;Int128;Abs;(System.Int128);summary;df-generated |
 | System;Int128;CompareTo;(System.Int128);summary;df-generated |
 | System;Int128;CompareTo;(System.Object);summary;df-generated |
 | System;Int128;DivRem;(System.Int128,System.Int128);summary;df-generated |
@@ -51295,6 +52404,10 @@ neutral
 | System;Int128;IsZero;(System.Int128);summary;df-generated |
 | System;Int128;LeadingZeroCount;(System.Int128);summary;df-generated |
 | System;Int128;Log2;(System.Int128);summary;df-generated |
+| System;Int128;MaxMagnitude;(System.Int128,System.Int128);summary;df-generated |
+| System;Int128;MaxMagnitudeNumber;(System.Int128,System.Int128);summary;df-generated |
+| System;Int128;MinMagnitude;(System.Int128,System.Int128);summary;df-generated |
+| System;Int128;MinMagnitudeNumber;(System.Int128,System.Int128);summary;df-generated |
 | System;Int128;Parse;(System.ReadOnlySpan<System.Byte>,System.Globalization.NumberStyles,System.IFormatProvider);summary;df-generated |
 | System;Int128;Parse;(System.ReadOnlySpan<System.Byte>,System.IFormatProvider);summary;df-generated |
 | System;Int128;Parse;(System.ReadOnlySpan<System.Char>,System.Globalization.NumberStyles,System.IFormatProvider);summary;df-generated |
@@ -51307,6 +52420,34 @@ neutral
 | System;Int128;RotateLeft;(System.Int128,System.Int32);summary;df-generated |
 | System;Int128;RotateRight;(System.Int128,System.Int32);summary;df-generated |
 | System;Int128;Sign;(System.Int128);summary;df-generated |
+| System;Int128;System.Numerics.IAdditionOperators<System.Int128,System.Int128,System.Int128>.op_Addition;(System.Int128,System.Int128);summary;df-generated |
+| System;Int128;System.Numerics.IBitwiseOperators<System.Int128,System.Int128,System.Int128>.op_BitwiseAnd;(System.Int128,System.Int128);summary;df-generated |
+| System;Int128;System.Numerics.IBitwiseOperators<System.Int128,System.Int128,System.Int128>.op_BitwiseOr;(System.Int128,System.Int128);summary;df-generated |
+| System;Int128;System.Numerics.IBitwiseOperators<System.Int128,System.Int128,System.Int128>.op_ExclusiveOr;(System.Int128,System.Int128);summary;df-generated |
+| System;Int128;System.Numerics.IBitwiseOperators<System.Int128,System.Int128,System.Int128>.op_OnesComplement;(System.Int128);summary;df-generated |
+| System;Int128;System.Numerics.IComparisonOperators<System.Int128,System.Int128,System.Boolean>.op_GreaterThan;(System.Int128,System.Int128);summary;df-generated |
+| System;Int128;System.Numerics.IComparisonOperators<System.Int128,System.Int128,System.Boolean>.op_GreaterThanOrEqual;(System.Int128,System.Int128);summary;df-generated |
+| System;Int128;System.Numerics.IComparisonOperators<System.Int128,System.Int128,System.Boolean>.op_LessThan;(System.Int128,System.Int128);summary;df-generated |
+| System;Int128;System.Numerics.IComparisonOperators<System.Int128,System.Int128,System.Boolean>.op_LessThanOrEqual;(System.Int128,System.Int128);summary;df-generated |
+| System;Int128;System.Numerics.IDecrementOperators<System.Int128>.op_CheckedDecrement;(System.Int128);summary;df-generated |
+| System;Int128;System.Numerics.IDecrementOperators<System.Int128>.op_Decrement;(System.Int128);summary;df-generated |
+| System;Int128;System.Numerics.IDivisionOperators<System.Int128,System.Int128,System.Int128>.op_CheckedDivision;(System.Int128,System.Int128);summary;df-generated |
+| System;Int128;System.Numerics.IDivisionOperators<System.Int128,System.Int128,System.Int128>.op_Division;(System.Int128,System.Int128);summary;df-generated |
+| System;Int128;System.Numerics.IEqualityOperators<System.Int128,System.Int128,System.Boolean>.op_Equality;(System.Int128,System.Int128);summary;df-generated |
+| System;Int128;System.Numerics.IEqualityOperators<System.Int128,System.Int128,System.Boolean>.op_Inequality;(System.Int128,System.Int128);summary;df-generated |
+| System;Int128;System.Numerics.IIncrementOperators<System.Int128>.op_CheckedIncrement;(System.Int128);summary;df-generated |
+| System;Int128;System.Numerics.IIncrementOperators<System.Int128>.op_Increment;(System.Int128);summary;df-generated |
+| System;Int128;System.Numerics.IModulusOperators<System.Int128,System.Int128,System.Int128>.op_Modulus;(System.Int128,System.Int128);summary;df-generated |
+| System;Int128;System.Numerics.IMultiplyOperators<System.Int128,System.Int128,System.Int128>.op_CheckedMultiply;(System.Int128,System.Int128);summary;df-generated |
+| System;Int128;System.Numerics.IMultiplyOperators<System.Int128,System.Int128,System.Int128>.op_Multiply;(System.Int128,System.Int128);summary;df-generated |
+| System;Int128;System.Numerics.IShiftOperators<System.Int128,System.Int32,System.Int128>.op_LeftShift;(System.Int128,System.Int32);summary;df-generated |
+| System;Int128;System.Numerics.IShiftOperators<System.Int128,System.Int32,System.Int128>.op_RightShift;(System.Int128,System.Int32);summary;df-generated |
+| System;Int128;System.Numerics.IShiftOperators<System.Int128,System.Int32,System.Int128>.op_UnsignedRightShift;(System.Int128,System.Int32);summary;df-generated |
+| System;Int128;System.Numerics.ISubtractionOperators<System.Int128,System.Int128,System.Int128>.op_CheckedSubtraction;(System.Int128,System.Int128);summary;df-generated |
+| System;Int128;System.Numerics.ISubtractionOperators<System.Int128,System.Int128,System.Int128>.op_Subtraction;(System.Int128,System.Int128);summary;df-generated |
+| System;Int128;System.Numerics.IUnaryNegationOperators<System.Int128,System.Int128>.op_CheckedUnaryNegation;(System.Int128);summary;df-generated |
+| System;Int128;System.Numerics.IUnaryNegationOperators<System.Int128,System.Int128>.op_UnaryNegation;(System.Int128);summary;df-generated |
+| System;Int128;System.Numerics.IUnaryPlusOperators<System.Int128,System.Int128>.op_UnaryPlus;(System.Int128);summary;df-generated |
 | System;Int128;ToString;();summary;df-generated |
 | System;Int128;ToString;(System.IFormatProvider);summary;df-generated |
 | System;Int128;ToString;(System.String);summary;df-generated |
@@ -51341,6 +52482,7 @@ neutral
 | System;Int128;get_One;();summary;df-generated |
 | System;Int128;get_Radix;();summary;df-generated |
 | System;Int128;get_Zero;();summary;df-generated |
+| System;IntPtr;Abs;(System.IntPtr);summary;df-generated |
 | System;IntPtr;CompareTo;(System.IntPtr);summary;df-generated |
 | System;IntPtr;CompareTo;(System.Object);summary;df-generated |
 | System;IntPtr;DivRem;(System.IntPtr,System.IntPtr);summary;df-generated |
@@ -51372,6 +52514,10 @@ neutral
 | System;IntPtr;IsZero;(System.IntPtr);summary;df-generated |
 | System;IntPtr;LeadingZeroCount;(System.IntPtr);summary;df-generated |
 | System;IntPtr;Log2;(System.IntPtr);summary;df-generated |
+| System;IntPtr;MaxMagnitude;(System.IntPtr,System.IntPtr);summary;df-generated |
+| System;IntPtr;MaxMagnitudeNumber;(System.IntPtr,System.IntPtr);summary;df-generated |
+| System;IntPtr;MinMagnitude;(System.IntPtr,System.IntPtr);summary;df-generated |
+| System;IntPtr;MinMagnitudeNumber;(System.IntPtr,System.IntPtr);summary;df-generated |
 | System;IntPtr;Parse;(System.ReadOnlySpan<System.Byte>,System.Globalization.NumberStyles,System.IFormatProvider);summary;df-generated |
 | System;IntPtr;Parse;(System.ReadOnlySpan<System.Byte>,System.IFormatProvider);summary;df-generated |
 | System;IntPtr;Parse;(System.ReadOnlySpan<System.Char>,System.Globalization.NumberStyles,System.IFormatProvider);summary;df-generated |
@@ -51385,6 +52531,7 @@ neutral
 | System;IntPtr;RotateRight;(System.IntPtr,System.Int32);summary;df-generated |
 | System;IntPtr;Sign;(System.IntPtr);summary;df-generated |
 | System;IntPtr;Subtract;(System.IntPtr,System.Int32);summary;df-generated |
+| System;IntPtr;System.Numerics.IAdditionOperators<nint,nint,nint>.op_Addition;(System.IntPtr,System.IntPtr);summary;df-generated |
 | System;IntPtr;System.Numerics.IBitwiseOperators<nint,nint,nint>.op_BitwiseAnd;(System.IntPtr,System.IntPtr);summary;df-generated |
 | System;IntPtr;System.Numerics.IBitwiseOperators<nint,nint,nint>.op_BitwiseOr;(System.IntPtr,System.IntPtr);summary;df-generated |
 | System;IntPtr;System.Numerics.IBitwiseOperators<nint,nint,nint>.op_ExclusiveOr;(System.IntPtr,System.IntPtr);summary;df-generated |
@@ -51396,6 +52543,8 @@ neutral
 | System;IntPtr;System.Numerics.IDecrementOperators<nint>.op_CheckedDecrement;(System.IntPtr);summary;df-generated |
 | System;IntPtr;System.Numerics.IDecrementOperators<nint>.op_Decrement;(System.IntPtr);summary;df-generated |
 | System;IntPtr;System.Numerics.IDivisionOperators<nint,nint,nint>.op_Division;(System.IntPtr,System.IntPtr);summary;df-generated |
+| System;IntPtr;System.Numerics.IEqualityOperators<nint,nint,System.Boolean>.op_Equality;(System.IntPtr,System.IntPtr);summary;df-generated |
+| System;IntPtr;System.Numerics.IEqualityOperators<nint,nint,System.Boolean>.op_Inequality;(System.IntPtr,System.IntPtr);summary;df-generated |
 | System;IntPtr;System.Numerics.IIncrementOperators<nint>.op_CheckedIncrement;(System.IntPtr);summary;df-generated |
 | System;IntPtr;System.Numerics.IIncrementOperators<nint>.op_Increment;(System.IntPtr);summary;df-generated |
 | System;IntPtr;System.Numerics.IModulusOperators<nint,nint,nint>.op_Modulus;(System.IntPtr,System.IntPtr);summary;df-generated |
@@ -52203,8 +53352,14 @@ neutral
 | System;Single;System.Numerics.IBitwiseOperators<System.Single,System.Single,System.Single>.op_BitwiseOr;(System.Single,System.Single);summary;df-generated |
 | System;Single;System.Numerics.IBitwiseOperators<System.Single,System.Single,System.Single>.op_ExclusiveOr;(System.Single,System.Single);summary;df-generated |
 | System;Single;System.Numerics.IBitwiseOperators<System.Single,System.Single,System.Single>.op_OnesComplement;(System.Single);summary;df-generated |
+| System;Single;System.Numerics.IComparisonOperators<System.Single,System.Single,System.Boolean>.op_GreaterThan;(System.Single,System.Single);summary;df-generated |
+| System;Single;System.Numerics.IComparisonOperators<System.Single,System.Single,System.Boolean>.op_GreaterThanOrEqual;(System.Single,System.Single);summary;df-generated |
+| System;Single;System.Numerics.IComparisonOperators<System.Single,System.Single,System.Boolean>.op_LessThan;(System.Single,System.Single);summary;df-generated |
+| System;Single;System.Numerics.IComparisonOperators<System.Single,System.Single,System.Boolean>.op_LessThanOrEqual;(System.Single,System.Single);summary;df-generated |
 | System;Single;System.Numerics.IDecrementOperators<System.Single>.op_Decrement;(System.Single);summary;df-generated |
 | System;Single;System.Numerics.IDivisionOperators<System.Single,System.Single,System.Single>.op_Division;(System.Single,System.Single);summary;df-generated |
+| System;Single;System.Numerics.IEqualityOperators<System.Single,System.Single,System.Boolean>.op_Equality;(System.Single,System.Single);summary;df-generated |
+| System;Single;System.Numerics.IEqualityOperators<System.Single,System.Single,System.Boolean>.op_Inequality;(System.Single,System.Single);summary;df-generated |
 | System;Single;System.Numerics.IIncrementOperators<System.Single>.op_Increment;(System.Single);summary;df-generated |
 | System;Single;System.Numerics.IModulusOperators<System.Single,System.Single,System.Single>.op_Modulus;(System.Single,System.Single);summary;df-generated |
 | System;Single;System.Numerics.IMultiplyOperators<System.Single,System.Single,System.Single>.op_Multiply;(System.Single,System.Single);summary;df-generated |
@@ -52349,6 +53504,7 @@ neutral
 | System;String;LastIndexOfAny;(System.Char[],System.Int32);summary;df-generated |
 | System;String;LastIndexOfAny;(System.Char[],System.Int32,System.Int32);summary;df-generated |
 | System;String;Parse;(System.ReadOnlySpan<System.Char>,System.IFormatProvider);summary;df-generated |
+| System;String;Parse;(System.String,System.IFormatProvider);summary;df-generated |
 | System;String;StartsWith;(System.Char);summary;df-generated |
 | System;String;StartsWith;(System.String);summary;df-generated |
 | System;String;StartsWith;(System.String,System.Boolean,System.Globalization.CultureInfo);summary;df-generated |
@@ -52376,6 +53532,7 @@ neutral
 | System;String;ToUInt64;(System.IFormatProvider);summary;df-generated |
 | System;String;TryCopyTo;(System.Span<System.Char>);summary;df-generated |
 | System;String;TryParse;(System.ReadOnlySpan<System.Char>,System.IFormatProvider,System.String);summary;df-generated |
+| System;String;TryParse;(System.String,System.IFormatProvider,System.String);summary;df-generated |
 | System;String;get_Chars;(System.Int32);summary;df-generated |
 | System;String;get_Length;();summary;df-generated |
 | System;String;op_Equality;(System.String,System.String);summary;df-generated |
@@ -53235,6 +54392,7 @@ neutral
 | System;UInt64;get_One;();summary;df-generated |
 | System;UInt64;get_Radix;();summary;df-generated |
 | System;UInt64;get_Zero;();summary;df-generated |
+| System;UInt128;Abs;(System.UInt128);summary;df-generated |
 | System;UInt128;CompareTo;(System.Object);summary;df-generated |
 | System;UInt128;CompareTo;(System.UInt128);summary;df-generated |
 | System;UInt128;DivRem;(System.UInt128,System.UInt128);summary;df-generated |
@@ -53263,6 +54421,10 @@ neutral
 | System;UInt128;IsZero;(System.UInt128);summary;df-generated |
 | System;UInt128;LeadingZeroCount;(System.UInt128);summary;df-generated |
 | System;UInt128;Log2;(System.UInt128);summary;df-generated |
+| System;UInt128;MaxMagnitude;(System.UInt128,System.UInt128);summary;df-generated |
+| System;UInt128;MaxMagnitudeNumber;(System.UInt128,System.UInt128);summary;df-generated |
+| System;UInt128;MinMagnitude;(System.UInt128,System.UInt128);summary;df-generated |
+| System;UInt128;MinMagnitudeNumber;(System.UInt128,System.UInt128);summary;df-generated |
 | System;UInt128;Parse;(System.ReadOnlySpan<System.Byte>,System.Globalization.NumberStyles,System.IFormatProvider);summary;df-generated |
 | System;UInt128;Parse;(System.ReadOnlySpan<System.Byte>,System.IFormatProvider);summary;df-generated |
 | System;UInt128;Parse;(System.ReadOnlySpan<System.Char>,System.Globalization.NumberStyles,System.IFormatProvider);summary;df-generated |
@@ -53275,6 +54437,34 @@ neutral
 | System;UInt128;RotateLeft;(System.UInt128,System.Int32);summary;df-generated |
 | System;UInt128;RotateRight;(System.UInt128,System.Int32);summary;df-generated |
 | System;UInt128;Sign;(System.UInt128);summary;df-generated |
+| System;UInt128;System.Numerics.IAdditionOperators<System.UInt128,System.UInt128,System.UInt128>.op_Addition;(System.UInt128,System.UInt128);summary;df-generated |
+| System;UInt128;System.Numerics.IBitwiseOperators<System.UInt128,System.UInt128,System.UInt128>.op_BitwiseAnd;(System.UInt128,System.UInt128);summary;df-generated |
+| System;UInt128;System.Numerics.IBitwiseOperators<System.UInt128,System.UInt128,System.UInt128>.op_BitwiseOr;(System.UInt128,System.UInt128);summary;df-generated |
+| System;UInt128;System.Numerics.IBitwiseOperators<System.UInt128,System.UInt128,System.UInt128>.op_ExclusiveOr;(System.UInt128,System.UInt128);summary;df-generated |
+| System;UInt128;System.Numerics.IBitwiseOperators<System.UInt128,System.UInt128,System.UInt128>.op_OnesComplement;(System.UInt128);summary;df-generated |
+| System;UInt128;System.Numerics.IComparisonOperators<System.UInt128,System.UInt128,System.Boolean>.op_GreaterThan;(System.UInt128,System.UInt128);summary;df-generated |
+| System;UInt128;System.Numerics.IComparisonOperators<System.UInt128,System.UInt128,System.Boolean>.op_GreaterThanOrEqual;(System.UInt128,System.UInt128);summary;df-generated |
+| System;UInt128;System.Numerics.IComparisonOperators<System.UInt128,System.UInt128,System.Boolean>.op_LessThan;(System.UInt128,System.UInt128);summary;df-generated |
+| System;UInt128;System.Numerics.IComparisonOperators<System.UInt128,System.UInt128,System.Boolean>.op_LessThanOrEqual;(System.UInt128,System.UInt128);summary;df-generated |
+| System;UInt128;System.Numerics.IDecrementOperators<System.UInt128>.op_CheckedDecrement;(System.UInt128);summary;df-generated |
+| System;UInt128;System.Numerics.IDecrementOperators<System.UInt128>.op_Decrement;(System.UInt128);summary;df-generated |
+| System;UInt128;System.Numerics.IDivisionOperators<System.UInt128,System.UInt128,System.UInt128>.op_CheckedDivision;(System.UInt128,System.UInt128);summary;df-generated |
+| System;UInt128;System.Numerics.IDivisionOperators<System.UInt128,System.UInt128,System.UInt128>.op_Division;(System.UInt128,System.UInt128);summary;df-generated |
+| System;UInt128;System.Numerics.IEqualityOperators<System.UInt128,System.UInt128,System.Boolean>.op_Equality;(System.UInt128,System.UInt128);summary;df-generated |
+| System;UInt128;System.Numerics.IEqualityOperators<System.UInt128,System.UInt128,System.Boolean>.op_Inequality;(System.UInt128,System.UInt128);summary;df-generated |
+| System;UInt128;System.Numerics.IIncrementOperators<System.UInt128>.op_CheckedIncrement;(System.UInt128);summary;df-generated |
+| System;UInt128;System.Numerics.IIncrementOperators<System.UInt128>.op_Increment;(System.UInt128);summary;df-generated |
+| System;UInt128;System.Numerics.IModulusOperators<System.UInt128,System.UInt128,System.UInt128>.op_Modulus;(System.UInt128,System.UInt128);summary;df-generated |
+| System;UInt128;System.Numerics.IMultiplyOperators<System.UInt128,System.UInt128,System.UInt128>.op_CheckedMultiply;(System.UInt128,System.UInt128);summary;df-generated |
+| System;UInt128;System.Numerics.IMultiplyOperators<System.UInt128,System.UInt128,System.UInt128>.op_Multiply;(System.UInt128,System.UInt128);summary;df-generated |
+| System;UInt128;System.Numerics.IShiftOperators<System.UInt128,System.Int32,System.UInt128>.op_LeftShift;(System.UInt128,System.Int32);summary;df-generated |
+| System;UInt128;System.Numerics.IShiftOperators<System.UInt128,System.Int32,System.UInt128>.op_RightShift;(System.UInt128,System.Int32);summary;df-generated |
+| System;UInt128;System.Numerics.IShiftOperators<System.UInt128,System.Int32,System.UInt128>.op_UnsignedRightShift;(System.UInt128,System.Int32);summary;df-generated |
+| System;UInt128;System.Numerics.ISubtractionOperators<System.UInt128,System.UInt128,System.UInt128>.op_CheckedSubtraction;(System.UInt128,System.UInt128);summary;df-generated |
+| System;UInt128;System.Numerics.ISubtractionOperators<System.UInt128,System.UInt128,System.UInt128>.op_Subtraction;(System.UInt128,System.UInt128);summary;df-generated |
+| System;UInt128;System.Numerics.IUnaryNegationOperators<System.UInt128,System.UInt128>.op_CheckedUnaryNegation;(System.UInt128);summary;df-generated |
+| System;UInt128;System.Numerics.IUnaryNegationOperators<System.UInt128,System.UInt128>.op_UnaryNegation;(System.UInt128);summary;df-generated |
+| System;UInt128;System.Numerics.IUnaryPlusOperators<System.UInt128,System.UInt128>.op_UnaryPlus;(System.UInt128);summary;df-generated |
 | System;UInt128;ToString;();summary;df-generated |
 | System;UInt128;ToString;(System.IFormatProvider);summary;df-generated |
 | System;UInt128;ToString;(System.String);summary;df-generated |
@@ -53309,6 +54499,7 @@ neutral
 | System;UInt128;get_One;();summary;df-generated |
 | System;UInt128;get_Radix;();summary;df-generated |
 | System;UInt128;get_Zero;();summary;df-generated |
+| System;UIntPtr;Abs;(System.UIntPtr);summary;df-generated |
 | System;UIntPtr;CompareTo;(System.Object);summary;df-generated |
 | System;UIntPtr;CompareTo;(System.UIntPtr);summary;df-generated |
 | System;UIntPtr;DivRem;(System.UIntPtr,System.UIntPtr);summary;df-generated |
@@ -53337,6 +54528,10 @@ neutral
 | System;UIntPtr;IsZero;(System.UIntPtr);summary;df-generated |
 | System;UIntPtr;LeadingZeroCount;(System.UIntPtr);summary;df-generated |
 | System;UIntPtr;Log2;(System.UIntPtr);summary;df-generated |
+| System;UIntPtr;MaxMagnitude;(System.UIntPtr,System.UIntPtr);summary;df-generated |
+| System;UIntPtr;MaxMagnitudeNumber;(System.UIntPtr,System.UIntPtr);summary;df-generated |
+| System;UIntPtr;MinMagnitude;(System.UIntPtr,System.UIntPtr);summary;df-generated |
+| System;UIntPtr;MinMagnitudeNumber;(System.UIntPtr,System.UIntPtr);summary;df-generated |
 | System;UIntPtr;Parse;(System.ReadOnlySpan<System.Byte>,System.Globalization.NumberStyles,System.IFormatProvider);summary;df-generated |
 | System;UIntPtr;Parse;(System.ReadOnlySpan<System.Byte>,System.IFormatProvider);summary;df-generated |
 | System;UIntPtr;Parse;(System.ReadOnlySpan<System.Char>,System.Globalization.NumberStyles,System.IFormatProvider);summary;df-generated |
@@ -53350,6 +54545,7 @@ neutral
 | System;UIntPtr;RotateRight;(System.UIntPtr,System.Int32);summary;df-generated |
 | System;UIntPtr;Sign;(System.UIntPtr);summary;df-generated |
 | System;UIntPtr;Subtract;(System.UIntPtr,System.Int32);summary;df-generated |
+| System;UIntPtr;System.Numerics.IAdditionOperators<nuint,nuint,nuint>.op_Addition;(System.UIntPtr,System.UIntPtr);summary;df-generated |
 | System;UIntPtr;System.Numerics.IBitwiseOperators<nuint,nuint,nuint>.op_BitwiseAnd;(System.UIntPtr,System.UIntPtr);summary;df-generated |
 | System;UIntPtr;System.Numerics.IBitwiseOperators<nuint,nuint,nuint>.op_BitwiseOr;(System.UIntPtr,System.UIntPtr);summary;df-generated |
 | System;UIntPtr;System.Numerics.IBitwiseOperators<nuint,nuint,nuint>.op_ExclusiveOr;(System.UIntPtr,System.UIntPtr);summary;df-generated |
@@ -53361,6 +54557,8 @@ neutral
 | System;UIntPtr;System.Numerics.IDecrementOperators<nuint>.op_CheckedDecrement;(System.UIntPtr);summary;df-generated |
 | System;UIntPtr;System.Numerics.IDecrementOperators<nuint>.op_Decrement;(System.UIntPtr);summary;df-generated |
 | System;UIntPtr;System.Numerics.IDivisionOperators<nuint,nuint,nuint>.op_Division;(System.UIntPtr,System.UIntPtr);summary;df-generated |
+| System;UIntPtr;System.Numerics.IEqualityOperators<nuint,nuint,System.Boolean>.op_Equality;(System.UIntPtr,System.UIntPtr);summary;df-generated |
+| System;UIntPtr;System.Numerics.IEqualityOperators<nuint,nuint,System.Boolean>.op_Inequality;(System.UIntPtr,System.UIntPtr);summary;df-generated |
 | System;UIntPtr;System.Numerics.IIncrementOperators<nuint>.op_CheckedIncrement;(System.UIntPtr);summary;df-generated |
 | System;UIntPtr;System.Numerics.IIncrementOperators<nuint>.op_Increment;(System.UIntPtr);summary;df-generated |
 | System;UIntPtr;System.Numerics.IModulusOperators<nuint,nuint,nuint>.op_Modulus;(System.UIntPtr,System.UIntPtr);summary;df-generated |

From 338ab96593586950dabee168a1428a7bf6e59af1 Mon Sep 17 00:00:00 2001
From: "REDMOND\\brodes" <brodes@microsoft.com>
Date: Mon, 30 Sep 2024 10:46:39 -0400
Subject: [PATCH 053/347] Correct comment.

---
 cpp/ql/src/Security/CWE/CWE-704/WcharCharConversion.ql | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/cpp/ql/src/Security/CWE/CWE-704/WcharCharConversion.ql b/cpp/ql/src/Security/CWE/CWE-704/WcharCharConversion.ql
index 33fcad2cbf6f..7c9ae8b99319 100644
--- a/cpp/ql/src/Security/CWE/CWE-704/WcharCharConversion.ql
+++ b/cpp/ql/src/Security/CWE/CWE-704/WcharCharConversion.ql
@@ -20,10 +20,8 @@ class WideCharPointerType extends PointerType {
 }
 
 /**
- * Recurse through types to find any intermediate type or final type
- * that suggests the type is unlikely to be a string.
- * Specifically looking for any unsigned character, or datatype with name containing "byte"
- * or datatype uint8_t.
+ * Given type `cur`, recurses through all intermediate types to find 
+ * any intermediate type equal to type `targ`
  */
 predicate hasIntermediateType(Type cur, Type targ) {
   cur = targ

From c4737c7fbb564935062937296ec9c4d3cbdaf00b Mon Sep 17 00:00:00 2001
From: "REDMOND\\brodes" <brodes@microsoft.com>
Date: Mon, 30 Sep 2024 10:58:45 -0400
Subject: [PATCH 054/347] Changing from hasIntermediateType to getABaseType.

---
 .../Security/CWE/CWE-704/WcharCharConversion.ql  | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/cpp/ql/src/Security/CWE/CWE-704/WcharCharConversion.ql b/cpp/ql/src/Security/CWE/CWE-704/WcharCharConversion.ql
index 7c9ae8b99319..5e6e8a66b00b 100644
--- a/cpp/ql/src/Security/CWE/CWE-704/WcharCharConversion.ql
+++ b/cpp/ql/src/Security/CWE/CWE-704/WcharCharConversion.ql
@@ -20,15 +20,15 @@ class WideCharPointerType extends PointerType {
 }
 
 /**
- * Given type `cur`, recurses through all intermediate types to find 
- * any intermediate type equal to type `targ`
+ * Given type `t`, recurses through and returns all
+ * intermediate base types, including `t`.
  */
-predicate hasIntermediateType(Type cur, Type targ) {
-  cur = targ
+Type getABaseType(Type t) {
+  result = t
   or
-  hasIntermediateType(cur.(DerivedType).getBaseType(), targ)
+  result = getABaseType(t.(DerivedType).getBaseType())
   or
-  hasIntermediateType(cur.(TypedefType).getBaseType(), targ)
+  result = getABaseType(t.(TypedefType).getBaseType())
 }
 
 /**
@@ -40,7 +40,7 @@ class UnlikelyToBeAStringType extends Type {
       targ.(CharType).isUnsigned() or
       targ.getName().toLowerCase().matches(["uint8_t", "%byte%"])
     |
-      hasIntermediateType(this, targ)
+      getABaseType(this) = targ
     )
   }
 }
@@ -59,7 +59,7 @@ class UnicodeMacroDependentWidthType extends Type {
           "TCHAR"
         ]
     |
-      hasIntermediateType(this, targ)
+      getABaseType(this) = targ
     )
   }
 }

From 51e787b31657ea2ed27c09aa02a29936d0455153 Mon Sep 17 00:00:00 2001
From: "REDMOND\\brodes" <brodes@microsoft.com>
Date: Mon, 30 Sep 2024 11:02:43 -0400
Subject: [PATCH 055/347] Switching to looking for explicit declaration of
 unsigned char, to avoid cases where unsigned char is the default char width
 for `char`.

---
 cpp/ql/src/Security/CWE/CWE-704/WcharCharConversion.ql | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/cpp/ql/src/Security/CWE/CWE-704/WcharCharConversion.ql b/cpp/ql/src/Security/CWE/CWE-704/WcharCharConversion.ql
index 5e6e8a66b00b..f8a57aa0c54d 100644
--- a/cpp/ql/src/Security/CWE/CWE-704/WcharCharConversion.ql
+++ b/cpp/ql/src/Security/CWE/CWE-704/WcharCharConversion.ql
@@ -37,7 +37,9 @@ Type getABaseType(Type t) {
 class UnlikelyToBeAStringType extends Type {
   UnlikelyToBeAStringType() {
     exists(Type targ |
-      targ.(CharType).isUnsigned() or
+      // NOTE: not using CharType isUnsigned, but rather look for any explicitly declared unsigned 
+      // char types. Assuming these are used for buffers, not strings.
+      targ.(CharType).getName().toLowerCase().matches(["unsigned%"]) or
       targ.getName().toLowerCase().matches(["uint8_t", "%byte%"])
     |
       getABaseType(this) = targ

From 31324fc7785e07524e6bc80b0032b347cb92e30d Mon Sep 17 00:00:00 2001
From: "REDMOND\\brodes" <brodes@microsoft.com>
Date: Mon, 30 Sep 2024 11:05:38 -0400
Subject: [PATCH 056/347] Altering ordering for exists statement to be clearer.

---
 cpp/ql/src/Security/CWE/CWE-704/WcharCharConversion.ql | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/cpp/ql/src/Security/CWE/CWE-704/WcharCharConversion.ql b/cpp/ql/src/Security/CWE/CWE-704/WcharCharConversion.ql
index f8a57aa0c54d..c31b4c8a6188 100644
--- a/cpp/ql/src/Security/CWE/CWE-704/WcharCharConversion.ql
+++ b/cpp/ql/src/Security/CWE/CWE-704/WcharCharConversion.ql
@@ -36,13 +36,11 @@ Type getABaseType(Type t) {
  */
 class UnlikelyToBeAStringType extends Type {
   UnlikelyToBeAStringType() {
-    exists(Type targ |
-      // NOTE: not using CharType isUnsigned, but rather look for any explicitly declared unsigned 
+    exists(Type targ | getABaseType(this) = targ |
+      // NOTE: not using CharType isUnsigned, but rather look for any explicitly declared unsigned
       // char types. Assuming these are used for buffers, not strings.
       targ.(CharType).getName().toLowerCase().matches(["unsigned%"]) or
       targ.getName().toLowerCase().matches(["uint8_t", "%byte%"])
-    |
-      getABaseType(this) = targ
     )
   }
 }

From c91f7f4918709e78f03234538c75bdac08ef3d13 Mon Sep 17 00:00:00 2001
From: "REDMOND\\brodes" <brodes@microsoft.com>
Date: Mon, 30 Sep 2024 11:07:09 -0400
Subject: [PATCH 057/347] Altering exists predicate ordering to be clearer.

---
 cpp/ql/src/Security/CWE/CWE-704/WcharCharConversion.ql | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/cpp/ql/src/Security/CWE/CWE-704/WcharCharConversion.ql b/cpp/ql/src/Security/CWE/CWE-704/WcharCharConversion.ql
index c31b4c8a6188..05a8a705575e 100644
--- a/cpp/ql/src/Security/CWE/CWE-704/WcharCharConversion.ql
+++ b/cpp/ql/src/Security/CWE/CWE-704/WcharCharConversion.ql
@@ -49,7 +49,7 @@ class UnlikelyToBeAStringType extends Type {
 // see https://learn.microsoft.com/en-us/windows/win32/winprog/windows-data-types
 class UnicodeMacroDependentWidthType extends Type {
   UnicodeMacroDependentWidthType() {
-    exists(Type targ |
+    exists(Type targ | getABaseType(this) = targ |
       targ.getName() in [
           "LPCTSTR",
           "LPTSTR",
@@ -58,8 +58,6 @@ class UnicodeMacroDependentWidthType extends Type {
           "TBYTE",
           "TCHAR"
         ]
-    |
-      getABaseType(this) = targ
     )
   }
 }

From 318e75c0946281888f21fcc8da2c250f44db75a2 Mon Sep 17 00:00:00 2001
From: "REDMOND\\brodes" <brodes@microsoft.com>
Date: Mon, 30 Sep 2024 11:10:28 -0400
Subject: [PATCH 058/347] Changing name of predicate to be clearer, and
 removing an unused parameter.

---
 cpp/ql/src/Security/CWE/CWE-704/WcharCharConversion.ql | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/cpp/ql/src/Security/CWE/CWE-704/WcharCharConversion.ql b/cpp/ql/src/Security/CWE/CWE-704/WcharCharConversion.ql
index 05a8a705575e..5ef519268704 100644
--- a/cpp/ql/src/Security/CWE/CWE-704/WcharCharConversion.ql
+++ b/cpp/ql/src/Security/CWE/CWE-704/WcharCharConversion.ql
@@ -78,9 +78,9 @@ class UnicodeMacroInvocation extends MacroInvocation {
  * the flag would indicate if UNICODE typing is set correctly to allow
  * or disallow a widening cast.
  */
-predicate isLikelyDynamicChecked(Expr e, GuardCondition gc) {
+predicate isLikelyDynamicallyChecked(Expr e) {
   e.getType() instanceof UnicodeMacroDependentWidthType and
-  exists(BitwiseAndExpr bai, UnicodeMacroInvocation umi | bai.getAnOperand() = umi.getExpr() |
+  exists(GuardCondition gc, BitwiseAndExpr bai, UnicodeMacroInvocation umi | bai.getAnOperand() = umi.getExpr() |
     // bai == 0 is false when reaching `e.getBasicBlock()`.
     // That is, bai != 0 when reaching `e.getBasicBlock()`.
     gc.ensuresEq(bai, 0, e.getBasicBlock(), false)
@@ -106,7 +106,7 @@ where
   // Avoid cases where the cast is guarded by a check to determine if
   // unicode encoding is enabled in such a way to disallow the dangerous cast
   // at runtime.
-  not isLikelyDynamicChecked(e1, _)
+  not isLikelyDynamicallyChecked(e1)
 select e1,
   "Conversion from " + e1.getType().toString() + " to " + e2.getType().toString() +
     ". Use of invalid string can lead to undefined behavior."

From 9e9469f3ca9d8331792dc908a467ea72765b08b0 Mon Sep 17 00:00:00 2001
From: Ben Rodes <brodes@microsoft.com>
Date: Mon, 30 Sep 2024 11:17:48 -0400
Subject: [PATCH 059/347] Update
 cpp/ql/src/change-notes/2024-09-26-wcharcharconversion-false-positives.md

Co-authored-by: Jeroen Ketema <93738568+jketema@users.noreply.github.com>
---
 .../2024-09-26-wcharcharconversion-false-positives.md         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/cpp/ql/src/change-notes/2024-09-26-wcharcharconversion-false-positives.md b/cpp/ql/src/change-notes/2024-09-26-wcharcharconversion-false-positives.md
index 7398013e9ef0..b0fa7a953c59 100644
--- a/cpp/ql/src/change-notes/2024-09-26-wcharcharconversion-false-positives.md
+++ b/cpp/ql/src/change-notes/2024-09-26-wcharcharconversion-false-positives.md
@@ -1,5 +1,5 @@
 ---
 category: minorAnalysis
 ---
-* Removed false positives caused by failure to detect byte arrays
-* Removed false positives caused by failure to recognize dynamic checks prior to possible dangerous widening
\ No newline at end of file
+* The `cpp/incorrect-string-type-conversion` query now produces fewer false positives caused by failure to detect byte arrays.
+* The `cpp/incorrect-string-type-conversion` query now produces fewer false positives caused by failure to recognize dynamic checks prior to possible dangerous widening.
\ No newline at end of file

From 162519185d78f2888c84ea884c302f249045df2e Mon Sep 17 00:00:00 2001
From: "REDMOND\\brodes" <brodes@microsoft.com>
Date: Mon, 30 Sep 2024 11:19:31 -0400
Subject: [PATCH 060/347] Removing unnecessary bracket/singleton set literal.

---
 cpp/ql/src/Security/CWE/CWE-704/WcharCharConversion.ql | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cpp/ql/src/Security/CWE/CWE-704/WcharCharConversion.ql b/cpp/ql/src/Security/CWE/CWE-704/WcharCharConversion.ql
index 5ef519268704..da09e8a61a66 100644
--- a/cpp/ql/src/Security/CWE/CWE-704/WcharCharConversion.ql
+++ b/cpp/ql/src/Security/CWE/CWE-704/WcharCharConversion.ql
@@ -39,7 +39,7 @@ class UnlikelyToBeAStringType extends Type {
     exists(Type targ | getABaseType(this) = targ |
       // NOTE: not using CharType isUnsigned, but rather look for any explicitly declared unsigned
       // char types. Assuming these are used for buffers, not strings.
-      targ.(CharType).getName().toLowerCase().matches(["unsigned%"]) or
+      targ.(CharType).getName().toLowerCase().matches("unsigned%") or
       targ.getName().toLowerCase().matches(["uint8_t", "%byte%"])
     )
   }

From c496503053ac6a11c989cafde0ce34835752f24e Mon Sep 17 00:00:00 2001
From: "REDMOND\\brodes" <brodes@microsoft.com>
Date: Mon, 30 Sep 2024 11:23:08 -0400
Subject: [PATCH 061/347] Formatting.

---
 cpp/ql/src/Security/CWE/CWE-704/WcharCharConversion.ql | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/cpp/ql/src/Security/CWE/CWE-704/WcharCharConversion.ql b/cpp/ql/src/Security/CWE/CWE-704/WcharCharConversion.ql
index da09e8a61a66..e3f15bd12b5d 100644
--- a/cpp/ql/src/Security/CWE/CWE-704/WcharCharConversion.ql
+++ b/cpp/ql/src/Security/CWE/CWE-704/WcharCharConversion.ql
@@ -80,7 +80,9 @@ class UnicodeMacroInvocation extends MacroInvocation {
  */
 predicate isLikelyDynamicallyChecked(Expr e) {
   e.getType() instanceof UnicodeMacroDependentWidthType and
-  exists(GuardCondition gc, BitwiseAndExpr bai, UnicodeMacroInvocation umi | bai.getAnOperand() = umi.getExpr() |
+  exists(GuardCondition gc, BitwiseAndExpr bai, UnicodeMacroInvocation umi |
+    bai.getAnOperand() = umi.getExpr()
+  |
     // bai == 0 is false when reaching `e.getBasicBlock()`.
     // That is, bai != 0 when reaching `e.getBasicBlock()`.
     gc.ensuresEq(bai, 0, e.getBasicBlock(), false)

From 684aedf6aa6b3cdf9e9a31c612f9d1f051d40f40 Mon Sep 17 00:00:00 2001
From: Chris Smowton <chris@smowton.net>
Date: Mon, 30 Sep 2024 18:24:49 +0100
Subject: [PATCH 062/347] Golang vendor dir extraction: add extractor option

---
 go/codeql-extractor.yml                        | 7 +++++++
 go/extractor/extractor.go                      | 2 +-
 go/extractor/util/extractvendordirs.go         | 3 ++-
 go/ql/integration-tests/extract-vendor/test.py | 3 +++
 4 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/go/codeql-extractor.yml b/go/codeql-extractor.yml
index f21c0ed7466d..49c8c75232f3 100644
--- a/go/codeql-extractor.yml
+++ b/go/codeql-extractor.yml
@@ -27,3 +27,10 @@ options:
       The default is 'false'.
     type: string
     pattern: "^(false|true)$"
+  extract_vendor_dirs:
+    title: Whether to include Go vendor directories in the CodeQL database.
+    description: >
+      A value indicating whether Go vendor directories should be included in the CodeQL database.
+      The default is 'false'.
+    type: string
+    pattern: "^(false|true)$"
diff --git a/go/extractor/extractor.go b/go/extractor/extractor.go
index f372cc161805..eeb1513e7247 100644
--- a/go/extractor/extractor.go
+++ b/go/extractor/extractor.go
@@ -233,7 +233,7 @@ func ExtractWithFlags(buildFlags []string, patterns []string, extractTests bool)
 	// Construct a list of directory segments to exclude from extraction, starting with ".."
 	excludedDirs := []string{`\.\.`}
 
-	// If CODEQL_EXTRACTOR_GO_EXTRACT_VENDOR_DIRS is "true", we extract `vendor` directories;
+	// If CODEQL_EXTRACTOR_GO_[OPTION_]EXTRACT_VENDOR_DIRS is "true", we extract `vendor` directories;
 	// otherwise (the default) is to exclude them from extraction
 	includeVendor := util.IsVendorDirExtractionEnabled()
 	if !includeVendor {
diff --git a/go/extractor/util/extractvendordirs.go b/go/extractor/util/extractvendordirs.go
index 778d5120cf20..eadf5d24740e 100644
--- a/go/extractor/util/extractvendordirs.go
+++ b/go/extractor/util/extractvendordirs.go
@@ -5,5 +5,6 @@ import (
 )
 
 func IsVendorDirExtractionEnabled() bool {
-	return os.Getenv("CODEQL_EXTRACTOR_GO_EXTRACT_VENDOR_DIRS") == "true"
+	return os.Getenv("CODEQL_EXTRACTOR_GO_EXTRACT_VENDOR_DIRS") == "true" ||
+		os.Getenv("CODEQL_EXTRACTOR_GO_OPTION_EXTRACT_VENDOR_DIRS") == "true"
 }
diff --git a/go/ql/integration-tests/extract-vendor/test.py b/go/ql/integration-tests/extract-vendor/test.py
index 04dfd61c38f3..ff28cc6fe9a3 100644
--- a/go/ql/integration-tests/extract-vendor/test.py
+++ b/go/ql/integration-tests/extract-vendor/test.py
@@ -4,3 +4,6 @@
 def test(codeql, go):
     os.environ["CODEQL_EXTRACTOR_GO_EXTRACT_VENDOR_DIRS"] = "true"
     codeql.database.create(source_root="src")
+
+def test_extractor_option(codeql, go):
+    codeql.database.create(source_root="src", extractor_option = "extract_vendor_dirs=true")

From c9d6c8091368ccfd6d88b59c12f63c52ad0dbf90 Mon Sep 17 00:00:00 2001
From: Chris Smowton <chris@smowton.net>
Date: Mon, 30 Sep 2024 18:44:20 +0100
Subject: [PATCH 063/347] Log when vendor dir extraction is active

---
 go/extractor/extractor.go | 21 +++++++++++++++------
 1 file changed, 15 insertions(+), 6 deletions(-)

diff --git a/go/extractor/extractor.go b/go/extractor/extractor.go
index eeb1513e7247..69aeeddc2a47 100644
--- a/go/extractor/extractor.go
+++ b/go/extractor/extractor.go
@@ -81,11 +81,23 @@ func ExtractWithFlags(buildFlags []string, patterns []string, extractTests bool)
 		}
 	}
 
-	testMessage := ""
+	// If CODEQL_EXTRACTOR_GO_[OPTION_]EXTRACT_VENDOR_DIRS is "true", we extract `vendor` directories;
+	// otherwise (the default) is to exclude them from extraction
+	includeVendor := util.IsVendorDirExtractionEnabled()
+
+	modeNotifications := make([]string, 0, 2)
 	if extractTests {
-		testMessage = " (test extraction enabled)"
+		modeNotifications = append(modeNotifications, "test extraction enabled")
+	}
+	if includeVendor {
+		modeNotifications = append(modeNotifications, "extracting vendor directories")
 	}
-	log.Printf("Running packages.Load%s.", testMessage)
+
+	modeMessage := strings.Join(modeNotifications, ", ")
+	if modeMessage != "" {
+		modeMessage = " (" + modeMessage + ")"
+	}
+	log.Printf("Running packages.Load%s.", modeMessage)
 
 	// This includes test packages if either we're tracing a `go test` command,
 	// or if CODEQL_EXTRACTOR_GO_OPTION_EXTRACT_TESTS is set to "true".
@@ -233,9 +245,6 @@ func ExtractWithFlags(buildFlags []string, patterns []string, extractTests bool)
 	// Construct a list of directory segments to exclude from extraction, starting with ".."
 	excludedDirs := []string{`\.\.`}
 
-	// If CODEQL_EXTRACTOR_GO_[OPTION_]EXTRACT_VENDOR_DIRS is "true", we extract `vendor` directories;
-	// otherwise (the default) is to exclude them from extraction
-	includeVendor := util.IsVendorDirExtractionEnabled()
 	if !includeVendor {
 		excludedDirs = append(excludedDirs, "vendor")
 	}

From be389b4c19d1ad3bf5f347238eca0b535f50cebd Mon Sep 17 00:00:00 2001
From: Chris Smowton <chris@smowton.net>
Date: Mon, 30 Sep 2024 19:54:14 +0100
Subject: [PATCH 064/347] Go: deduplicate integration tests

---
 .../test-extraction-autobuild/test.py         |  4 --
 .../test-extraction-traced/src/Makefile       |  2 -
 .../test-extraction-traced/src/go.mod         |  3 --
 .../test-extraction-traced/src/go.sum         | 45 -------------------
 .../test-extraction-traced/src/testme.go      |  5 ---
 .../src/testme_blackbox_test.go               | 15 -------
 .../test-extraction-traced/src/testme_test.go | 19 --------
 .../test-extraction-traced/test.expected      |  9 ----
 .../test-extraction-traced/test.py            |  4 --
 .../test-extraction-traced/test.ql            |  9 ----
 .../src/Makefile                              |  0
 .../src/go.mod                                |  0
 .../src/go.sum                                |  0
 .../src/testme.go                             |  0
 .../src/testme_blackbox_test.go               |  0
 .../src/testme_test.go                        |  0
 .../test.expected                             |  0
 .../integration-tests/test-extraction/test.py |  7 +++
 .../test.ql                                   |  0
 19 files changed, 7 insertions(+), 115 deletions(-)
 delete mode 100644 go/ql/integration-tests/test-extraction-autobuild/test.py
 delete mode 100644 go/ql/integration-tests/test-extraction-traced/src/Makefile
 delete mode 100644 go/ql/integration-tests/test-extraction-traced/src/go.mod
 delete mode 100644 go/ql/integration-tests/test-extraction-traced/src/go.sum
 delete mode 100644 go/ql/integration-tests/test-extraction-traced/src/testme.go
 delete mode 100644 go/ql/integration-tests/test-extraction-traced/src/testme_blackbox_test.go
 delete mode 100644 go/ql/integration-tests/test-extraction-traced/src/testme_test.go
 delete mode 100644 go/ql/integration-tests/test-extraction-traced/test.expected
 delete mode 100644 go/ql/integration-tests/test-extraction-traced/test.py
 delete mode 100644 go/ql/integration-tests/test-extraction-traced/test.ql
 rename go/ql/integration-tests/{test-extraction-autobuild => test-extraction}/src/Makefile (100%)
 rename go/ql/integration-tests/{test-extraction-autobuild => test-extraction}/src/go.mod (100%)
 rename go/ql/integration-tests/{test-extraction-autobuild => test-extraction}/src/go.sum (100%)
 rename go/ql/integration-tests/{test-extraction-autobuild => test-extraction}/src/testme.go (100%)
 rename go/ql/integration-tests/{test-extraction-autobuild => test-extraction}/src/testme_blackbox_test.go (100%)
 rename go/ql/integration-tests/{test-extraction-autobuild => test-extraction}/src/testme_test.go (100%)
 rename go/ql/integration-tests/{test-extraction-autobuild => test-extraction}/test.expected (100%)
 create mode 100644 go/ql/integration-tests/test-extraction/test.py
 rename go/ql/integration-tests/{test-extraction-autobuild => test-extraction}/test.ql (100%)

diff --git a/go/ql/integration-tests/test-extraction-autobuild/test.py b/go/ql/integration-tests/test-extraction-autobuild/test.py
deleted file mode 100644
index 0dc91b5212c5..000000000000
--- a/go/ql/integration-tests/test-extraction-autobuild/test.py
+++ /dev/null
@@ -1,4 +0,0 @@
-import os
-
-def test(codeql, go):
-    codeql.database.create(source_root="src", extractor_option = ["extract_tests=true"])
diff --git a/go/ql/integration-tests/test-extraction-traced/src/Makefile b/go/ql/integration-tests/test-extraction-traced/src/Makefile
deleted file mode 100644
index 266e02877884..000000000000
--- a/go/ql/integration-tests/test-extraction-traced/src/Makefile
+++ /dev/null
@@ -1,2 +0,0 @@
-all:
-	go get
diff --git a/go/ql/integration-tests/test-extraction-traced/src/go.mod b/go/ql/integration-tests/test-extraction-traced/src/go.mod
deleted file mode 100644
index c4a9f55df6c1..000000000000
--- a/go/ql/integration-tests/test-extraction-traced/src/go.mod
+++ /dev/null
@@ -1,3 +0,0 @@
-go 1.14
-
-module testsample
diff --git a/go/ql/integration-tests/test-extraction-traced/src/go.sum b/go/ql/integration-tests/test-extraction-traced/src/go.sum
deleted file mode 100644
index a8e1b59ae4b1..000000000000
--- a/go/ql/integration-tests/test-extraction-traced/src/go.sum
+++ /dev/null
@@ -1,45 +0,0 @@
-github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
-golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
-golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
-golang.org/x/crypto v0.19.0/go.mod h1:Iy9bg/ha4yyC70EfRS8jz+B6ybOBKMaSxLj6P6oBDfU=
-golang.org/x/crypto v0.21.0/go.mod h1:0BP7YvVV9gBbVKyeTG0Gyn+gZm94bibOW5BjDEYAOMs=
-golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
-golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
-golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
-golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
-golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
-golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg=
-golang.org/x/net v0.21.0/go.mod h1:bIjVDfnllIU7BJ2DNgfnXvpSvtn8VRwhlsaeUTyUS44=
-golang.org/x/net v0.23.0 h1:7EYJ93RZ9vYSZAIb2x3lnuvqO5zneoD6IvWjuhfxjTs=
-golang.org/x/net v0.23.0/go.mod h1:JKghWKKOSdJwpW2GEx0Ja7fmaKnMsbu+MWVZTokSYmg=
-golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
-golang.org/x/sys v0.18.0 h1:DBdB3niSjOA/O0blCZBqDefyWNYveAYMNF1Wum0DYQ4=
-golang.org/x/sys v0.18.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
-golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
-golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
-golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k=
-golang.org/x/term v0.8.0/go.mod h1:xPskH00ivmX89bAKVGSKKtLOWNx2+17Eiy94tnKShWo=
-golang.org/x/term v0.17.0/go.mod h1:lLRBjIVuehSbZlaOtGMbcMncT+aqLLLmKrsjNrUguwk=
-golang.org/x/term v0.18.0/go.mod h1:ILwASektA3OnRv7amZ1xhE/KTR+u50pbXfZ03+6Nx58=
-golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
-golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
-golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
-golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8=
-golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
-golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
-golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
-golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
-golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU=
-golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
diff --git a/go/ql/integration-tests/test-extraction-traced/src/testme.go b/go/ql/integration-tests/test-extraction-traced/src/testme.go
deleted file mode 100644
index e24138553ce9..000000000000
--- a/go/ql/integration-tests/test-extraction-traced/src/testme.go
+++ /dev/null
@@ -1,5 +0,0 @@
-package testsample
-
-func PublicFunction() int { return 1 }
-
-func privateFunction() int { return 2 }
diff --git a/go/ql/integration-tests/test-extraction-traced/src/testme_blackbox_test.go b/go/ql/integration-tests/test-extraction-traced/src/testme_blackbox_test.go
deleted file mode 100644
index 18a507b5aa38..000000000000
--- a/go/ql/integration-tests/test-extraction-traced/src/testme_blackbox_test.go
+++ /dev/null
@@ -1,15 +0,0 @@
-package testsample_test
-
-import (
-	"testing"
-	"testsample"
-)
-
-func TestTestMe(t *testing.T) {
-
-	publicResult := testsample.PublicFunction()
-	if publicResult != 1 {
-		t.Errorf("Expected 1, got %d", publicResult)
-	}
-
-}
diff --git a/go/ql/integration-tests/test-extraction-traced/src/testme_test.go b/go/ql/integration-tests/test-extraction-traced/src/testme_test.go
deleted file mode 100644
index 183d7cd3dffe..000000000000
--- a/go/ql/integration-tests/test-extraction-traced/src/testme_test.go
+++ /dev/null
@@ -1,19 +0,0 @@
-package testsample
-
-import (
-	"testing"
-)
-
-func TestTestMe(t *testing.T) {
-
-	publicResult := PublicFunction()
-	if publicResult != 1 {
-		t.Errorf("Expected 1, got %d", publicResult)
-	}
-
-	privateResult := privateFunction()
-	if privateResult != 2 {
-		t.Errorf("Expected 2, got %d", privateResult)
-	}
-
-}
diff --git a/go/ql/integration-tests/test-extraction-traced/test.expected b/go/ql/integration-tests/test-extraction-traced/test.expected
deleted file mode 100644
index 9e1585fc5ef8..000000000000
--- a/go/ql/integration-tests/test-extraction-traced/test.expected
+++ /dev/null
@@ -1,9 +0,0 @@
-#select
-| src/testme.go:0:0:0:0 | src/testme.go |
-| src/testme_blackbox_test.go:0:0:0:0 | src/testme_blackbox_test.go |
-| src/testme_test.go:0:0:0:0 | src/testme_test.go |
-calls
-| src/testme_blackbox_test.go:10:18:10:44 | call to PublicFunction | src/testme.go:3:1:3:38 | function declaration |
-| src/testme_test.go:9:18:9:33 | call to PublicFunction | src/testme.go:3:1:3:38 | function declaration |
-| src/testme_test.go:14:19:14:35 | call to privateFunction | src/testme.go:5:1:5:39 | function declaration |
-extractionErrors
diff --git a/go/ql/integration-tests/test-extraction-traced/test.py b/go/ql/integration-tests/test-extraction-traced/test.py
deleted file mode 100644
index 2887d3fa0d09..000000000000
--- a/go/ql/integration-tests/test-extraction-traced/test.py
+++ /dev/null
@@ -1,4 +0,0 @@
-import os
-
-def test(codeql, go):
-    codeql.database.create(source_root="src", command="go test -c")
diff --git a/go/ql/integration-tests/test-extraction-traced/test.ql b/go/ql/integration-tests/test-extraction-traced/test.ql
deleted file mode 100644
index 15eae8959862..000000000000
--- a/go/ql/integration-tests/test-extraction-traced/test.ql
+++ /dev/null
@@ -1,9 +0,0 @@
-import go
-import semmle.go.DiagnosticsReporting
-
-from GoFile f
-select f
-
-query predicate calls(CallExpr ce, FuncDecl f) { f = ce.getTarget().getFuncDecl() }
-
-query predicate extractionErrors(string msg, int sev) { reportableDiagnostics(_, msg, sev) }
diff --git a/go/ql/integration-tests/test-extraction-autobuild/src/Makefile b/go/ql/integration-tests/test-extraction/src/Makefile
similarity index 100%
rename from go/ql/integration-tests/test-extraction-autobuild/src/Makefile
rename to go/ql/integration-tests/test-extraction/src/Makefile
diff --git a/go/ql/integration-tests/test-extraction-autobuild/src/go.mod b/go/ql/integration-tests/test-extraction/src/go.mod
similarity index 100%
rename from go/ql/integration-tests/test-extraction-autobuild/src/go.mod
rename to go/ql/integration-tests/test-extraction/src/go.mod
diff --git a/go/ql/integration-tests/test-extraction-autobuild/src/go.sum b/go/ql/integration-tests/test-extraction/src/go.sum
similarity index 100%
rename from go/ql/integration-tests/test-extraction-autobuild/src/go.sum
rename to go/ql/integration-tests/test-extraction/src/go.sum
diff --git a/go/ql/integration-tests/test-extraction-autobuild/src/testme.go b/go/ql/integration-tests/test-extraction/src/testme.go
similarity index 100%
rename from go/ql/integration-tests/test-extraction-autobuild/src/testme.go
rename to go/ql/integration-tests/test-extraction/src/testme.go
diff --git a/go/ql/integration-tests/test-extraction-autobuild/src/testme_blackbox_test.go b/go/ql/integration-tests/test-extraction/src/testme_blackbox_test.go
similarity index 100%
rename from go/ql/integration-tests/test-extraction-autobuild/src/testme_blackbox_test.go
rename to go/ql/integration-tests/test-extraction/src/testme_blackbox_test.go
diff --git a/go/ql/integration-tests/test-extraction-autobuild/src/testme_test.go b/go/ql/integration-tests/test-extraction/src/testme_test.go
similarity index 100%
rename from go/ql/integration-tests/test-extraction-autobuild/src/testme_test.go
rename to go/ql/integration-tests/test-extraction/src/testme_test.go
diff --git a/go/ql/integration-tests/test-extraction-autobuild/test.expected b/go/ql/integration-tests/test-extraction/test.expected
similarity index 100%
rename from go/ql/integration-tests/test-extraction-autobuild/test.expected
rename to go/ql/integration-tests/test-extraction/test.expected
diff --git a/go/ql/integration-tests/test-extraction/test.py b/go/ql/integration-tests/test-extraction/test.py
new file mode 100644
index 000000000000..6419ae83f38c
--- /dev/null
+++ b/go/ql/integration-tests/test-extraction/test.py
@@ -0,0 +1,7 @@
+import os
+
+def test_traced(codeql, go):
+    codeql.database.create(source_root="src", command="go test -c")
+
+def test_autobuild(codeql, go):
+    codeql.database.create(source_root="src", extractor_option = ["extract_tests=true"])
diff --git a/go/ql/integration-tests/test-extraction-autobuild/test.ql b/go/ql/integration-tests/test-extraction/test.ql
similarity index 100%
rename from go/ql/integration-tests/test-extraction-autobuild/test.ql
rename to go/ql/integration-tests/test-extraction/test.ql

From e97878ed63c546fbca7b5db5c995fd091ce7ce66 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]" <github-actions@github.com>
Date: Mon, 30 Sep 2024 19:49:00 +0000
Subject: [PATCH 065/347] Post-release preparation for codeql-cli-2.19.1

---
 cpp/ql/lib/qlpack.yml                         | 2 +-
 cpp/ql/src/qlpack.yml                         | 2 +-
 csharp/ql/campaigns/Solorigate/lib/qlpack.yml | 2 +-
 csharp/ql/campaigns/Solorigate/src/qlpack.yml | 2 +-
 csharp/ql/lib/qlpack.yml                      | 2 +-
 csharp/ql/src/qlpack.yml                      | 2 +-
 go/ql/consistency-queries/qlpack.yml          | 2 +-
 go/ql/lib/qlpack.yml                          | 2 +-
 go/ql/src/qlpack.yml                          | 2 +-
 java/ql/automodel/src/qlpack.yml              | 2 +-
 java/ql/lib/qlpack.yml                        | 2 +-
 java/ql/src/qlpack.yml                        | 2 +-
 javascript/ql/lib/qlpack.yml                  | 2 +-
 javascript/ql/src/qlpack.yml                  | 2 +-
 misc/suite-helpers/qlpack.yml                 | 2 +-
 python/ql/lib/qlpack.yml                      | 2 +-
 python/ql/src/qlpack.yml                      | 2 +-
 ruby/ql/lib/qlpack.yml                        | 2 +-
 ruby/ql/src/qlpack.yml                        | 2 +-
 shared/controlflow/qlpack.yml                 | 2 +-
 shared/dataflow/qlpack.yml                    | 2 +-
 shared/mad/qlpack.yml                         | 2 +-
 shared/rangeanalysis/qlpack.yml               | 2 +-
 shared/regex/qlpack.yml                       | 2 +-
 shared/ssa/qlpack.yml                         | 2 +-
 shared/threat-models/qlpack.yml               | 2 +-
 shared/tutorial/qlpack.yml                    | 2 +-
 shared/typeflow/qlpack.yml                    | 2 +-
 shared/typetracking/qlpack.yml                | 2 +-
 shared/typos/qlpack.yml                       | 2 +-
 shared/util/qlpack.yml                        | 2 +-
 shared/xml/qlpack.yml                         | 2 +-
 shared/yaml/qlpack.yml                        | 2 +-
 swift/ql/lib/qlpack.yml                       | 2 +-
 swift/ql/src/qlpack.yml                       | 2 +-
 35 files changed, 35 insertions(+), 35 deletions(-)

diff --git a/cpp/ql/lib/qlpack.yml b/cpp/ql/lib/qlpack.yml
index f1a2ac3942f2..ba5db8c6e6f9 100644
--- a/cpp/ql/lib/qlpack.yml
+++ b/cpp/ql/lib/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/cpp-all
-version: 2.0.1
+version: 2.0.2-dev
 groups: cpp
 dbscheme: semmlecode.cpp.dbscheme
 extractor: cpp
diff --git a/cpp/ql/src/qlpack.yml b/cpp/ql/src/qlpack.yml
index e541f95cd85f..d01ac2f048c2 100644
--- a/cpp/ql/src/qlpack.yml
+++ b/cpp/ql/src/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/cpp-queries
-version: 1.2.4
+version: 1.2.5-dev
 groups:
   - cpp
   - queries
diff --git a/csharp/ql/campaigns/Solorigate/lib/qlpack.yml b/csharp/ql/campaigns/Solorigate/lib/qlpack.yml
index 871d2ed3619a..3cab08a0f3ec 100644
--- a/csharp/ql/campaigns/Solorigate/lib/qlpack.yml
+++ b/csharp/ql/campaigns/Solorigate/lib/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/csharp-solorigate-all
-version: 1.7.26
+version: 1.7.27-dev
 groups:
   - csharp
   - solorigate
diff --git a/csharp/ql/campaigns/Solorigate/src/qlpack.yml b/csharp/ql/campaigns/Solorigate/src/qlpack.yml
index 00c3209afe98..c46baf0b2518 100644
--- a/csharp/ql/campaigns/Solorigate/src/qlpack.yml
+++ b/csharp/ql/campaigns/Solorigate/src/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/csharp-solorigate-queries
-version: 1.7.26
+version: 1.7.27-dev
 groups:
   - csharp
   - solorigate
diff --git a/csharp/ql/lib/qlpack.yml b/csharp/ql/lib/qlpack.yml
index a8e9c68cfb44..55a99929ac87 100644
--- a/csharp/ql/lib/qlpack.yml
+++ b/csharp/ql/lib/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/csharp-all
-version: 3.0.0
+version: 3.0.1-dev
 groups: csharp
 dbscheme: semmlecode.csharp.dbscheme
 extractor: csharp
diff --git a/csharp/ql/src/qlpack.yml b/csharp/ql/src/qlpack.yml
index 82e9607d7ab7..6209cc5f88d5 100644
--- a/csharp/ql/src/qlpack.yml
+++ b/csharp/ql/src/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/csharp-queries
-version: 1.0.9
+version: 1.0.10-dev
 groups:
   - csharp
   - queries
diff --git a/go/ql/consistency-queries/qlpack.yml b/go/ql/consistency-queries/qlpack.yml
index 9800f5090fac..5a7ca8082a53 100644
--- a/go/ql/consistency-queries/qlpack.yml
+++ b/go/ql/consistency-queries/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql-go-consistency-queries
-version: 1.0.9
+version: 1.0.10-dev
 groups:
   - go
   - queries
diff --git a/go/ql/lib/qlpack.yml b/go/ql/lib/qlpack.yml
index b6987a250d1a..9cb5e3620117 100644
--- a/go/ql/lib/qlpack.yml
+++ b/go/ql/lib/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/go-all
-version: 2.1.0
+version: 2.1.1-dev
 groups: go
 dbscheme: go.dbscheme
 extractor: go
diff --git a/go/ql/src/qlpack.yml b/go/ql/src/qlpack.yml
index e783026f6cfd..0b3f5076bb6d 100644
--- a/go/ql/src/qlpack.yml
+++ b/go/ql/src/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/go-queries
-version: 1.1.0
+version: 1.1.1-dev
 groups:
   - go
   - queries
diff --git a/java/ql/automodel/src/qlpack.yml b/java/ql/automodel/src/qlpack.yml
index 1e1fdbb9f38d..fe961cb4392c 100644
--- a/java/ql/automodel/src/qlpack.yml
+++ b/java/ql/automodel/src/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/java-automodel-queries
-version: 1.0.9
+version: 1.0.10-dev
 groups:
     - java
     - automodel
diff --git a/java/ql/lib/qlpack.yml b/java/ql/lib/qlpack.yml
index 9c69e18a30b8..0d4f67146c1b 100644
--- a/java/ql/lib/qlpack.yml
+++ b/java/ql/lib/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/java-all
-version: 4.1.0
+version: 4.1.1-dev
 groups: java
 dbscheme: config/semmlecode.dbscheme
 extractor: java
diff --git a/java/ql/src/qlpack.yml b/java/ql/src/qlpack.yml
index 635ef97836fe..c8e95f52ca4a 100644
--- a/java/ql/src/qlpack.yml
+++ b/java/ql/src/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/java-queries
-version: 1.1.6
+version: 1.1.7-dev
 groups:
   - java
   - queries
diff --git a/javascript/ql/lib/qlpack.yml b/javascript/ql/lib/qlpack.yml
index a93cb421a869..bea3bbacd5fa 100644
--- a/javascript/ql/lib/qlpack.yml
+++ b/javascript/ql/lib/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/javascript-all
-version: 2.0.1
+version: 2.0.2-dev
 groups: javascript
 dbscheme: semmlecode.javascript.dbscheme
 extractor: javascript
diff --git a/javascript/ql/src/qlpack.yml b/javascript/ql/src/qlpack.yml
index 49489696e79a..407aa03f7802 100644
--- a/javascript/ql/src/qlpack.yml
+++ b/javascript/ql/src/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/javascript-queries
-version: 1.2.1
+version: 1.2.2-dev
 groups:
   - javascript
   - queries
diff --git a/misc/suite-helpers/qlpack.yml b/misc/suite-helpers/qlpack.yml
index a4d970e31297..76c86b26be6b 100644
--- a/misc/suite-helpers/qlpack.yml
+++ b/misc/suite-helpers/qlpack.yml
@@ -1,4 +1,4 @@
 name: codeql/suite-helpers
-version: 1.0.9
+version: 1.0.10-dev
 groups: shared
 warnOnImplicitThis: true
diff --git a/python/ql/lib/qlpack.yml b/python/ql/lib/qlpack.yml
index 316f7a1cc1e6..445940cdd889 100644
--- a/python/ql/lib/qlpack.yml
+++ b/python/ql/lib/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/python-all
-version: 2.1.0
+version: 2.1.1-dev
 groups: python
 dbscheme: semmlecode.python.dbscheme
 extractor: python
diff --git a/python/ql/src/qlpack.yml b/python/ql/src/qlpack.yml
index 02c861d40e1d..3f5ee4e78041 100644
--- a/python/ql/src/qlpack.yml
+++ b/python/ql/src/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/python-queries
-version: 1.3.0
+version: 1.3.1-dev
 groups:
   - python
   - queries
diff --git a/ruby/ql/lib/qlpack.yml b/ruby/ql/lib/qlpack.yml
index da808214ea50..dc0b471a171d 100644
--- a/ruby/ql/lib/qlpack.yml
+++ b/ruby/ql/lib/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/ruby-all
-version: 2.0.1
+version: 2.0.2-dev
 groups: ruby
 extractor: ruby
 dbscheme: ruby.dbscheme
diff --git a/ruby/ql/src/qlpack.yml b/ruby/ql/src/qlpack.yml
index 47651d248c01..b7eee713fbaa 100644
--- a/ruby/ql/src/qlpack.yml
+++ b/ruby/ql/src/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/ruby-queries
-version: 1.1.4
+version: 1.1.5-dev
 groups:
   - ruby
   - queries
diff --git a/shared/controlflow/qlpack.yml b/shared/controlflow/qlpack.yml
index fc8bdde934d4..532b2fa69a09 100644
--- a/shared/controlflow/qlpack.yml
+++ b/shared/controlflow/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/controlflow
-version: 1.0.9
+version: 1.0.10-dev
 groups: shared
 library: true
 dependencies:
diff --git a/shared/dataflow/qlpack.yml b/shared/dataflow/qlpack.yml
index 2ad3f8bc73c0..df5c8c4c38af 100644
--- a/shared/dataflow/qlpack.yml
+++ b/shared/dataflow/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/dataflow
-version: 1.1.3
+version: 1.1.4-dev
 groups: shared
 library: true
 dependencies:
diff --git a/shared/mad/qlpack.yml b/shared/mad/qlpack.yml
index ed0c1f7113c5..ef3755c80bc4 100644
--- a/shared/mad/qlpack.yml
+++ b/shared/mad/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/mad
-version: 1.0.9
+version: 1.0.10-dev
 groups: shared
 library: true
 dependencies:
diff --git a/shared/rangeanalysis/qlpack.yml b/shared/rangeanalysis/qlpack.yml
index aaf1b1903576..b4deed51c9d8 100644
--- a/shared/rangeanalysis/qlpack.yml
+++ b/shared/rangeanalysis/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/rangeanalysis
-version: 1.0.9
+version: 1.0.10-dev
 groups: shared
 library: true
 dependencies:
diff --git a/shared/regex/qlpack.yml b/shared/regex/qlpack.yml
index d8b03f4ad2f5..5593197f674b 100644
--- a/shared/regex/qlpack.yml
+++ b/shared/regex/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/regex
-version: 1.0.9
+version: 1.0.10-dev
 groups: shared
 library: true
 dependencies:
diff --git a/shared/ssa/qlpack.yml b/shared/ssa/qlpack.yml
index 1bd2bea757b3..7bc3773a575f 100644
--- a/shared/ssa/qlpack.yml
+++ b/shared/ssa/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/ssa
-version: 1.0.9
+version: 1.0.10-dev
 groups: shared
 library: true
 dependencies:
diff --git a/shared/threat-models/qlpack.yml b/shared/threat-models/qlpack.yml
index 434466938b1c..dd4331d7e749 100644
--- a/shared/threat-models/qlpack.yml
+++ b/shared/threat-models/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/threat-models
-version: 1.0.9
+version: 1.0.10-dev
 library: true
 groups: shared
 dataExtensions:
diff --git a/shared/tutorial/qlpack.yml b/shared/tutorial/qlpack.yml
index 9a89b262a321..2390ce7ad116 100644
--- a/shared/tutorial/qlpack.yml
+++ b/shared/tutorial/qlpack.yml
@@ -1,7 +1,7 @@
 name: codeql/tutorial
 description: Library for the CodeQL detective tutorials, helping new users learn to
   write CodeQL queries.
-version: 1.0.9
+version: 1.0.10-dev
 groups: shared
 library: true
 warnOnImplicitThis: true
diff --git a/shared/typeflow/qlpack.yml b/shared/typeflow/qlpack.yml
index 21b1ddbc9654..04f843aacb5f 100644
--- a/shared/typeflow/qlpack.yml
+++ b/shared/typeflow/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/typeflow
-version: 1.0.9
+version: 1.0.10-dev
 groups: shared
 library: true
 dependencies:
diff --git a/shared/typetracking/qlpack.yml b/shared/typetracking/qlpack.yml
index 6f7282c54e9e..e48446dc3e0b 100644
--- a/shared/typetracking/qlpack.yml
+++ b/shared/typetracking/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/typetracking
-version: 1.0.9
+version: 1.0.10-dev
 groups: shared
 library: true
 dependencies:
diff --git a/shared/typos/qlpack.yml b/shared/typos/qlpack.yml
index 3e644f92d6d1..5eccd54b2afa 100644
--- a/shared/typos/qlpack.yml
+++ b/shared/typos/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/typos
-version: 1.0.9
+version: 1.0.10-dev
 groups: shared
 library: true
 warnOnImplicitThis: true
diff --git a/shared/util/qlpack.yml b/shared/util/qlpack.yml
index ab191310e567..508143471db4 100644
--- a/shared/util/qlpack.yml
+++ b/shared/util/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/util
-version: 1.0.9
+version: 1.0.10-dev
 groups: shared
 library: true
 dependencies: null
diff --git a/shared/xml/qlpack.yml b/shared/xml/qlpack.yml
index f43260879fb6..a81184e65886 100644
--- a/shared/xml/qlpack.yml
+++ b/shared/xml/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/xml
-version: 1.0.9
+version: 1.0.10-dev
 groups: shared
 library: true
 dependencies:
diff --git a/shared/yaml/qlpack.yml b/shared/yaml/qlpack.yml
index 4a63da564e55..1df4193b862f 100644
--- a/shared/yaml/qlpack.yml
+++ b/shared/yaml/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/yaml
-version: 1.0.9
+version: 1.0.10-dev
 groups: shared
 library: true
 warnOnImplicitThis: true
diff --git a/swift/ql/lib/qlpack.yml b/swift/ql/lib/qlpack.yml
index dd1896b3c291..1904a1b1ca48 100644
--- a/swift/ql/lib/qlpack.yml
+++ b/swift/ql/lib/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/swift-all
-version: 2.0.1
+version: 2.0.2-dev
 groups: swift
 extractor: swift
 dbscheme: swift.dbscheme
diff --git a/swift/ql/src/qlpack.yml b/swift/ql/src/qlpack.yml
index 8f33acf16a69..6fbae9403605 100644
--- a/swift/ql/src/qlpack.yml
+++ b/swift/ql/src/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/swift-queries
-version: 1.0.9
+version: 1.0.10-dev
 groups:
   - swift
   - queries

From 9357762e06ffec5e188319f3d2ea86dba5048295 Mon Sep 17 00:00:00 2001
From: Rasmus Lerchedahl Petersen <yoff@github.com>
Date: Tue, 1 Oct 2024 00:03:04 +0200
Subject: [PATCH 066/347] Python: remove superflous code This is handled by
 parameter-argument matching

---
 .../semmle/python/dataflow/new/internal/DataFlowDispatch.qll  | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/python/ql/lib/semmle/python/dataflow/new/internal/DataFlowDispatch.qll b/python/ql/lib/semmle/python/dataflow/new/internal/DataFlowDispatch.qll
index 28c1c652df46..88a6ed903146 100644
--- a/python/ql/lib/semmle/python/dataflow/new/internal/DataFlowDispatch.qll
+++ b/python/ql/lib/semmle/python/dataflow/new/internal/DataFlowDispatch.qll
@@ -372,10 +372,6 @@ abstract class DataFlowFunction extends DataFlowCallable, TFunction {
       result.getParameter() = func.getArg(index + this.positionalOffset())
     )
     or
-    exists(int index1, int index2 | ppos.isPositionalLowerBound(index1) and index2 >= index1 |
-      result.getParameter() = func.getArg(index2 + this.positionalOffset())
-    )
-    or
     exists(string name | ppos.isKeyword(name) | result.getParameter() = func.getArgByName(name))
     or
     // `*args`

From 1d6626c82151357893106ff277c4aeb4f35ea6c8 Mon Sep 17 00:00:00 2001
From: Tom Hvitved <hvitved@github.com>
Date: Fri, 27 Sep 2024 15:02:37 +0200
Subject: [PATCH 067/347] Rust: Implement `IdentPat.toString()`

---
 rust/ql/.generated.list                       |  1 -
 rust/ql/.gitattributes                        |  1 -
 .../rust/elements/internal/IdentPatImpl.qll   |  6 ++-
 .../generated/IdentPat/IdentPat.expected      |  4 +-
 .../IdentPat/IdentPat_getName.expected        |  4 +-
 .../IdentPat/IdentPat_getPat.expected         |  2 +-
 .../generated/LetStmt/LetStmt_getPat.expected |  8 ++--
 .../SlicePat/SlicePat_getPat.expected         |  6 +--
 .../TuplePat/TuplePat_getField.expected       | 10 ++--
 .../ql/test/extractor-tests/utf8/ast.expected |  2 +-
 .../CONSISTENCY/CfgConsistency.expected       |  2 +-
 .../library-tests/controlflow/Cfg.expected    | 46 +++++++++----------
 12 files changed, 46 insertions(+), 46 deletions(-)

diff --git a/rust/ql/.generated.list b/rust/ql/.generated.list
index eb997e2eeffc..2c4bb309f4c0 100644
--- a/rust/ql/.generated.list
+++ b/rust/ql/.generated.list
@@ -239,7 +239,6 @@ lib/codeql/rust/elements/internal/GenericParamImpl.qll f435f80d7f275803c1311d362
 lib/codeql/rust/elements/internal/GenericParamListConstructor.qll 7221146d1724e0add3a8e70e0e46670142589eb7143425e1871ac4358a8c8bdb 2fbb7576444d6b2da6164245e2660d592d276ae2c1ca9f2bda5656b1c5c0a73a
 lib/codeql/rust/elements/internal/GenericParamListImpl.qll 524aa0949df6d4d2cb9bee6226650f63a6f181d7644933fa265673b281074885 27b0210e5eaa2040bc8a093e35e1394befb6994b25369544738d0447ef269a9c
 lib/codeql/rust/elements/internal/IdentPatConstructor.qll 09792f5a070996b65f095dc6b1b9e0fb096a56648eed26c0643c59f82377cab0 0bb1a9fcdc62b5197aef3dd6e0ea4d679dde10d5be54b57b5209727ba66e078b
-lib/codeql/rust/elements/internal/IdentPatImpl.qll 10b2758419b48d34013d0e1ea55006a72ea351e5298c9cde4d988f510d4094eb 63bdb210d7bcab42888b4f44688966a33951061573b0a9a734b5b262cbfa2cd8
 lib/codeql/rust/elements/internal/IfExprConstructor.qll 03088b54c8fa623f93a5b5a7eb896f680e8b0e9025488157a02c48aaebc6ad56 906f916c3690d0721a31dd31b302dcdcec4233bb507683007d82cf10793a648f
 lib/codeql/rust/elements/internal/IfExprImpl.qll 96dc5be0a650a74f96e0c2214eb58f1af5278ad1695ad790b660fdecb6738c14 06a292fcc459297ef3a0ef5c75c887f993ccd6350eb3fb0d2493e5b7c7199b6b
 lib/codeql/rust/elements/internal/ImplConstructor.qll 24edccca59f70d812d1458b412a45310ddc096d095332f6e3258903c54c1bb44 7eb673b3ab33a0873ee5ce189105425066b376821cce0fc9eb8ace22995f0bc7
diff --git a/rust/ql/.gitattributes b/rust/ql/.gitattributes
index b3526b1ec22f..932ff725a476 100644
--- a/rust/ql/.gitattributes
+++ b/rust/ql/.gitattributes
@@ -241,7 +241,6 @@
 /lib/codeql/rust/elements/internal/GenericParamListConstructor.qll linguist-generated
 /lib/codeql/rust/elements/internal/GenericParamListImpl.qll linguist-generated
 /lib/codeql/rust/elements/internal/IdentPatConstructor.qll linguist-generated
-/lib/codeql/rust/elements/internal/IdentPatImpl.qll linguist-generated
 /lib/codeql/rust/elements/internal/IfExprConstructor.qll linguist-generated
 /lib/codeql/rust/elements/internal/IfExprImpl.qll linguist-generated
 /lib/codeql/rust/elements/internal/ImplConstructor.qll linguist-generated
diff --git a/rust/ql/lib/codeql/rust/elements/internal/IdentPatImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/IdentPatImpl.qll
index 6f90f3d6d032..0c6092074774 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/IdentPatImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/IdentPatImpl.qll
@@ -1,4 +1,3 @@
-// generated by codegen, remove this comment if you wish to edit this file
 /**
  * This module provides a hand-modifiable wrapper around the generated class `IdentPat`.
  *
@@ -12,6 +11,7 @@ private import codeql.rust.elements.internal.generated.IdentPat
  * be referenced directly.
  */
 module Impl {
+  // the following QLdoc is generated: if you need to edit it, do it in the schema file
   /**
    * A binding pattern. For example:
    * ```rust
@@ -27,5 +27,7 @@ module Impl {
    * };
    * ```
    */
-  class IdentPat extends Generated::IdentPat { }
+  class IdentPat extends Generated::IdentPat {
+    override string toString() { result = this.getName().getText() }
+  }
 }
diff --git a/rust/ql/test/extractor-tests/generated/IdentPat/IdentPat.expected b/rust/ql/test/extractor-tests/generated/IdentPat/IdentPat.expected
index 53a4c59d3986..5f7d899ccab9 100644
--- a/rust/ql/test/extractor-tests/generated/IdentPat/IdentPat.expected
+++ b/rust/ql/test/extractor-tests/generated/IdentPat/IdentPat.expected
@@ -1,2 +1,2 @@
-| gen_ident_pat.rs:6:22:6:22 | IdentPat | getNumberOfAttrs: | 0 | hasName: | yes | hasPat: | no |
-| gen_ident_pat.rs:10:9:10:25 | IdentPat | getNumberOfAttrs: | 0 | hasName: | yes | hasPat: | yes |
+| gen_ident_pat.rs:6:22:6:22 | y | getNumberOfAttrs: | 0 | hasName: | yes | hasPat: | no |
+| gen_ident_pat.rs:10:9:10:25 | y | getNumberOfAttrs: | 0 | hasName: | yes | hasPat: | yes |
diff --git a/rust/ql/test/extractor-tests/generated/IdentPat/IdentPat_getName.expected b/rust/ql/test/extractor-tests/generated/IdentPat/IdentPat_getName.expected
index 2a49521ead99..45273e9c8a41 100644
--- a/rust/ql/test/extractor-tests/generated/IdentPat/IdentPat_getName.expected
+++ b/rust/ql/test/extractor-tests/generated/IdentPat/IdentPat_getName.expected
@@ -1,2 +1,2 @@
-| gen_ident_pat.rs:6:22:6:22 | IdentPat | gen_ident_pat.rs:6:22:6:22 | Name |
-| gen_ident_pat.rs:10:9:10:25 | IdentPat | gen_ident_pat.rs:10:9:10:9 | Name |
+| gen_ident_pat.rs:6:22:6:22 | y | gen_ident_pat.rs:6:22:6:22 | Name |
+| gen_ident_pat.rs:10:9:10:25 | y | gen_ident_pat.rs:10:9:10:9 | Name |
diff --git a/rust/ql/test/extractor-tests/generated/IdentPat/IdentPat_getPat.expected b/rust/ql/test/extractor-tests/generated/IdentPat/IdentPat_getPat.expected
index 705456753b9c..2e2f0d9228e0 100644
--- a/rust/ql/test/extractor-tests/generated/IdentPat/IdentPat_getPat.expected
+++ b/rust/ql/test/extractor-tests/generated/IdentPat/IdentPat_getPat.expected
@@ -1 +1 @@
-| gen_ident_pat.rs:10:9:10:25 | IdentPat | gen_ident_pat.rs:10:11:10:25 | TupleStructPat |
+| gen_ident_pat.rs:10:9:10:25 | y | gen_ident_pat.rs:10:11:10:25 | TupleStructPat |
diff --git a/rust/ql/test/extractor-tests/generated/LetStmt/LetStmt_getPat.expected b/rust/ql/test/extractor-tests/generated/LetStmt/LetStmt_getPat.expected
index 37462e8cfb64..93810df10e36 100644
--- a/rust/ql/test/extractor-tests/generated/LetStmt/LetStmt_getPat.expected
+++ b/rust/ql/test/extractor-tests/generated/LetStmt/LetStmt_getPat.expected
@@ -1,6 +1,6 @@
-| gen_let_stmt.rs:5:5:5:15 | LetStmt | gen_let_stmt.rs:5:9:5:9 | IdentPat |
-| gen_let_stmt.rs:6:5:6:20 | LetStmt | gen_let_stmt.rs:6:9:6:9 | IdentPat |
-| gen_let_stmt.rs:7:5:7:15 | LetStmt | gen_let_stmt.rs:7:9:7:9 | IdentPat |
-| gen_let_stmt.rs:8:5:8:10 | LetStmt | gen_let_stmt.rs:8:9:8:9 | IdentPat |
+| gen_let_stmt.rs:5:5:5:15 | LetStmt | gen_let_stmt.rs:5:9:5:9 | x |
+| gen_let_stmt.rs:6:5:6:20 | LetStmt | gen_let_stmt.rs:6:9:6:9 | x |
+| gen_let_stmt.rs:7:5:7:15 | LetStmt | gen_let_stmt.rs:7:9:7:9 | x |
+| gen_let_stmt.rs:8:5:8:10 | LetStmt | gen_let_stmt.rs:8:9:8:9 | x |
 | gen_let_stmt.rs:9:5:9:24 | LetStmt | gen_let_stmt.rs:9:9:9:14 | TuplePat |
 | gen_let_stmt.rs:10:5:12:6 | LetStmt | gen_let_stmt.rs:10:9:10:15 | TupleStructPat |
diff --git a/rust/ql/test/extractor-tests/generated/SlicePat/SlicePat_getPat.expected b/rust/ql/test/extractor-tests/generated/SlicePat/SlicePat_getPat.expected
index 7c5355875f33..e874d3a22ee4 100644
--- a/rust/ql/test/extractor-tests/generated/SlicePat/SlicePat_getPat.expected
+++ b/rust/ql/test/extractor-tests/generated/SlicePat/SlicePat_getPat.expected
@@ -6,8 +6,8 @@
 | gen_slice_pat.rs:7:9:7:18 | SlicePat | 0 | gen_slice_pat.rs:7:10:7:10 | LiteralPat |
 | gen_slice_pat.rs:7:9:7:18 | SlicePat | 1 | gen_slice_pat.rs:7:13:7:13 | LiteralPat |
 | gen_slice_pat.rs:7:9:7:18 | SlicePat | 2 | gen_slice_pat.rs:7:16:7:17 | RestPat |
-| gen_slice_pat.rs:8:9:8:24 | SlicePat | 0 | gen_slice_pat.rs:8:10:8:10 | IdentPat |
-| gen_slice_pat.rs:8:9:8:24 | SlicePat | 1 | gen_slice_pat.rs:8:13:8:13 | IdentPat |
+| gen_slice_pat.rs:8:9:8:24 | SlicePat | 0 | gen_slice_pat.rs:8:10:8:10 | x |
+| gen_slice_pat.rs:8:9:8:24 | SlicePat | 1 | gen_slice_pat.rs:8:13:8:13 | y |
 | gen_slice_pat.rs:8:9:8:24 | SlicePat | 2 | gen_slice_pat.rs:8:16:8:17 | RestPat |
-| gen_slice_pat.rs:8:9:8:24 | SlicePat | 3 | gen_slice_pat.rs:8:20:8:20 | IdentPat |
+| gen_slice_pat.rs:8:9:8:24 | SlicePat | 3 | gen_slice_pat.rs:8:20:8:20 | z |
 | gen_slice_pat.rs:8:9:8:24 | SlicePat | 4 | gen_slice_pat.rs:8:23:8:23 | LiteralPat |
diff --git a/rust/ql/test/extractor-tests/generated/TuplePat/TuplePat_getField.expected b/rust/ql/test/extractor-tests/generated/TuplePat/TuplePat_getField.expected
index 8f42a4e1393e..59d028b43ca9 100644
--- a/rust/ql/test/extractor-tests/generated/TuplePat/TuplePat_getField.expected
+++ b/rust/ql/test/extractor-tests/generated/TuplePat/TuplePat_getField.expected
@@ -1,6 +1,6 @@
-| gen_tuple_pat.rs:5:9:5:14 | TuplePat | 0 | gen_tuple_pat.rs:5:10:5:10 | IdentPat |
-| gen_tuple_pat.rs:5:9:5:14 | TuplePat | 1 | gen_tuple_pat.rs:5:13:5:13 | IdentPat |
-| gen_tuple_pat.rs:6:9:6:22 | TuplePat | 0 | gen_tuple_pat.rs:6:10:6:10 | IdentPat |
-| gen_tuple_pat.rs:6:9:6:22 | TuplePat | 1 | gen_tuple_pat.rs:6:13:6:13 | IdentPat |
+| gen_tuple_pat.rs:5:9:5:14 | TuplePat | 0 | gen_tuple_pat.rs:5:10:5:10 | x |
+| gen_tuple_pat.rs:5:9:5:14 | TuplePat | 1 | gen_tuple_pat.rs:5:13:5:13 | y |
+| gen_tuple_pat.rs:6:9:6:22 | TuplePat | 0 | gen_tuple_pat.rs:6:10:6:10 | a |
+| gen_tuple_pat.rs:6:9:6:22 | TuplePat | 1 | gen_tuple_pat.rs:6:13:6:13 | b |
 | gen_tuple_pat.rs:6:9:6:22 | TuplePat | 2 | gen_tuple_pat.rs:6:16:6:17 | RestPat |
-| gen_tuple_pat.rs:6:9:6:22 | TuplePat | 3 | gen_tuple_pat.rs:6:21:6:21 | IdentPat |
+| gen_tuple_pat.rs:6:9:6:22 | TuplePat | 3 | gen_tuple_pat.rs:6:21:6:21 | z |
diff --git a/rust/ql/test/extractor-tests/utf8/ast.expected b/rust/ql/test/extractor-tests/utf8/ast.expected
index 2ebf1fb7f03d..5f353287fbb1 100644
--- a/rust/ql/test/extractor-tests/utf8/ast.expected
+++ b/rust/ql/test/extractor-tests/utf8/ast.expected
@@ -34,6 +34,6 @@
 | utf8-identifiers.rs:10:15:12:1 | BlockExpr |
 | utf8-identifiers.rs:10:15:12:1 | StmtList |
 | utf8-identifiers.rs:11:5:11:24 | LetStmt |
-| utf8-identifiers.rs:11:9:11:9 | IdentPat |
 | utf8-identifiers.rs:11:9:11:9 | Name |
+| utf8-identifiers.rs:11:9:11:9 | \u03b1 |
 | utf8-identifiers.rs:11:14:11:23 | 0.00001f64 |
diff --git a/rust/ql/test/library-tests/controlflow/CONSISTENCY/CfgConsistency.expected b/rust/ql/test/library-tests/controlflow/CONSISTENCY/CfgConsistency.expected
index a997162e6cdc..ec8ec04bf3ea 100644
--- a/rust/ql/test/library-tests/controlflow/CONSISTENCY/CfgConsistency.expected
+++ b/rust/ql/test/library-tests/controlflow/CONSISTENCY/CfgConsistency.expected
@@ -1,5 +1,5 @@
 deadEnd
-| test.rs:55:13:55:17 | IdentPat |
+| test.rs:55:13:55:17 | b |
 | test.rs:224:28:224:33 | ... < ... |
 | test.rs:239:30:239:48 | BlockExpr |
 scopeNoFirst
diff --git a/rust/ql/test/library-tests/controlflow/Cfg.expected b/rust/ql/test/library-tests/controlflow/Cfg.expected
index 43cc44ea2cbe..52715de2a267 100644
--- a/rust/ql/test/library-tests/controlflow/Cfg.expected
+++ b/rust/ql/test/library-tests/controlflow/Cfg.expected
@@ -14,8 +14,8 @@
 | test.rs:8:5:24:5 | enter test_break_and_continue | test.rs:9:9:9:22 | LetStmt |  |
 | test.rs:8:5:24:5 | exit test_break_and_continue (normal) | test.rs:8:5:24:5 | exit test_break_and_continue |  |
 | test.rs:9:9:9:22 | LetStmt | test.rs:9:21:9:21 | PathExpr |  |
-| test.rs:9:13:9:17 | IdentPat | test.rs:10:9:22:9 | ExprStmt | match, no-match |
-| test.rs:9:21:9:21 | PathExpr | test.rs:9:13:9:17 | IdentPat |  |
+| test.rs:9:13:9:17 | i | test.rs:10:9:22:9 | ExprStmt | match, no-match |
+| test.rs:9:21:9:21 | PathExpr | test.rs:9:13:9:17 | i |  |
 | test.rs:10:9:22:9 | ExprStmt | test.rs:11:13:11:24 | ExprStmt |  |
 | test.rs:10:9:22:9 | LoopExpr | test.rs:23:9:23:20 | ExprStmt |  |
 | test.rs:10:14:22:9 | BlockExpr | test.rs:11:13:11:24 | ExprStmt |  |
@@ -99,13 +99,13 @@
 | test.rs:49:17:49:32 | ExprStmt | test.rs:49:17:49:31 | ContinueExpr |  |
 | test.rs:54:5:60:5 | enter test_while | test.rs:55:9:55:25 | LetStmt |  |
 | test.rs:55:9:55:25 | LetStmt | test.rs:55:21:55:24 | true |  |
-| test.rs:55:21:55:24 | true | test.rs:55:13:55:17 | IdentPat |  |
+| test.rs:55:21:55:24 | true | test.rs:55:13:55:17 | b |  |
 | test.rs:69:1:72:1 | enter test_nested_function | test.rs:70:5:70:28 | LetStmt |  |
 | test.rs:69:1:72:1 | exit test_nested_function (normal) | test.rs:69:1:72:1 | exit test_nested_function |  |
 | test.rs:69:40:72:1 | BlockExpr | test.rs:69:1:72:1 | exit test_nested_function (normal) |  |
 | test.rs:70:5:70:28 | LetStmt | test.rs:70:19:70:27 | ClosureExpr |  |
-| test.rs:70:9:70:15 | IdentPat | test.rs:71:5:71:11 | PathExpr | match, no-match |
-| test.rs:70:19:70:27 | ClosureExpr | test.rs:70:9:70:15 | IdentPat |  |
+| test.rs:70:9:70:15 | add_one | test.rs:71:5:71:11 | PathExpr | match, no-match |
+| test.rs:70:19:70:27 | ClosureExpr | test.rs:70:9:70:15 | add_one |  |
 | test.rs:70:19:70:27 | enter ClosureExpr | test.rs:70:23:70:23 | PathExpr |  |
 | test.rs:70:19:70:27 | exit ClosureExpr (normal) | test.rs:70:19:70:27 | exit ClosureExpr |  |
 | test.rs:70:23:70:23 | PathExpr | test.rs:70:27:70:27 | 1 |  |
@@ -212,8 +212,8 @@
 | test.rs:129:5:136:5 | exit test_if_assignment (normal) | test.rs:129:5:136:5 | exit test_if_assignment |  |
 | test.rs:129:42:136:5 | BlockExpr | test.rs:129:5:136:5 | exit test_if_assignment (normal) |  |
 | test.rs:130:9:130:26 | LetStmt | test.rs:130:21:130:25 | false |  |
-| test.rs:130:13:130:17 | IdentPat | test.rs:131:12:131:12 | PathExpr | match, no-match |
-| test.rs:130:21:130:25 | false | test.rs:130:13:130:17 | IdentPat |  |
+| test.rs:130:13:130:17 | x | test.rs:131:12:131:12 | PathExpr | match, no-match |
+| test.rs:130:21:130:25 | false | test.rs:130:13:130:17 | x |  |
 | test.rs:131:9:135:9 | IfExpr | test.rs:129:42:136:5 | BlockExpr |  |
 | test.rs:131:12:131:12 | PathExpr | test.rs:131:16:131:19 | true |  |
 | test.rs:131:12:131:19 | ... = ... | test.rs:132:13:132:13 | 1 | true |
@@ -288,50 +288,50 @@
 | test.rs:177:5:180:5 | exit test_and_operator (normal) | test.rs:177:5:180:5 | exit test_and_operator |  |
 | test.rs:177:61:180:5 | BlockExpr | test.rs:177:5:180:5 | exit test_and_operator (normal) |  |
 | test.rs:178:9:178:28 | LetStmt | test.rs:178:17:178:27 | ... && ... |  |
-| test.rs:178:13:178:13 | IdentPat | test.rs:179:9:179:9 | PathExpr | match, no-match |
-| test.rs:178:17:178:17 | PathExpr | test.rs:178:13:178:13 | IdentPat | false |
+| test.rs:178:13:178:13 | d | test.rs:179:9:179:9 | PathExpr | match, no-match |
+| test.rs:178:17:178:17 | PathExpr | test.rs:178:13:178:13 | d | false |
 | test.rs:178:17:178:17 | PathExpr | test.rs:178:22:178:22 | PathExpr | true |
 | test.rs:178:17:178:22 | ... && ... | test.rs:178:17:178:17 | PathExpr |  |
 | test.rs:178:17:178:27 | ... && ... | test.rs:178:17:178:22 | ... && ... |  |
-| test.rs:178:22:178:22 | PathExpr | test.rs:178:13:178:13 | IdentPat | false |
+| test.rs:178:22:178:22 | PathExpr | test.rs:178:13:178:13 | d | false |
 | test.rs:178:22:178:22 | PathExpr | test.rs:178:27:178:27 | PathExpr | true |
-| test.rs:178:27:178:27 | PathExpr | test.rs:178:13:178:13 | IdentPat |  |
+| test.rs:178:27:178:27 | PathExpr | test.rs:178:13:178:13 | d |  |
 | test.rs:179:9:179:9 | PathExpr | test.rs:177:61:180:5 | BlockExpr |  |
 | test.rs:182:5:185:5 | enter test_or_operator | test.rs:183:9:183:28 | LetStmt |  |
 | test.rs:182:5:185:5 | exit test_or_operator (normal) | test.rs:182:5:185:5 | exit test_or_operator |  |
 | test.rs:182:60:185:5 | BlockExpr | test.rs:182:5:185:5 | exit test_or_operator (normal) |  |
 | test.rs:183:9:183:28 | LetStmt | test.rs:183:17:183:27 | ... \|\| ... |  |
-| test.rs:183:13:183:13 | IdentPat | test.rs:184:9:184:9 | PathExpr | match, no-match |
-| test.rs:183:17:183:17 | PathExpr | test.rs:183:13:183:13 | IdentPat | true |
+| test.rs:183:13:183:13 | d | test.rs:184:9:184:9 | PathExpr | match, no-match |
+| test.rs:183:17:183:17 | PathExpr | test.rs:183:13:183:13 | d | true |
 | test.rs:183:17:183:17 | PathExpr | test.rs:183:22:183:22 | PathExpr | false |
 | test.rs:183:17:183:22 | ... \|\| ... | test.rs:183:17:183:17 | PathExpr |  |
 | test.rs:183:17:183:27 | ... \|\| ... | test.rs:183:17:183:22 | ... \|\| ... |  |
-| test.rs:183:22:183:22 | PathExpr | test.rs:183:13:183:13 | IdentPat | true |
+| test.rs:183:22:183:22 | PathExpr | test.rs:183:13:183:13 | d | true |
 | test.rs:183:22:183:22 | PathExpr | test.rs:183:27:183:27 | PathExpr | false |
-| test.rs:183:27:183:27 | PathExpr | test.rs:183:13:183:13 | IdentPat |  |
+| test.rs:183:27:183:27 | PathExpr | test.rs:183:13:183:13 | d |  |
 | test.rs:184:9:184:9 | PathExpr | test.rs:182:60:185:5 | BlockExpr |  |
 | test.rs:187:5:190:5 | enter test_or_operator_2 | test.rs:188:9:188:36 | LetStmt |  |
 | test.rs:187:5:190:5 | exit test_or_operator_2 (normal) | test.rs:187:5:190:5 | exit test_or_operator_2 |  |
 | test.rs:187:61:190:5 | BlockExpr | test.rs:187:5:190:5 | exit test_or_operator_2 (normal) |  |
 | test.rs:188:9:188:36 | LetStmt | test.rs:188:17:188:35 | ... \|\| ... |  |
-| test.rs:188:13:188:13 | IdentPat | test.rs:189:9:189:9 | PathExpr | match, no-match |
-| test.rs:188:17:188:17 | PathExpr | test.rs:188:13:188:13 | IdentPat | true |
+| test.rs:188:13:188:13 | d | test.rs:189:9:189:9 | PathExpr | match, no-match |
+| test.rs:188:17:188:17 | PathExpr | test.rs:188:13:188:13 | d | true |
 | test.rs:188:17:188:17 | PathExpr | test.rs:188:23:188:23 | PathExpr | false |
 | test.rs:188:17:188:30 | ... \|\| ... | test.rs:188:17:188:17 | PathExpr |  |
 | test.rs:188:17:188:35 | ... \|\| ... | test.rs:188:17:188:30 | ... \|\| ... |  |
-| test.rs:188:22:188:30 | ParenExpr | test.rs:188:13:188:13 | IdentPat | true |
+| test.rs:188:22:188:30 | ParenExpr | test.rs:188:13:188:13 | d | true |
 | test.rs:188:22:188:30 | ParenExpr | test.rs:188:35:188:35 | PathExpr | false |
 | test.rs:188:23:188:23 | PathExpr | test.rs:188:28:188:29 | 28 |  |
 | test.rs:188:23:188:29 | ... == ... | test.rs:188:22:188:30 | ParenExpr |  |
 | test.rs:188:28:188:29 | 28 | test.rs:188:23:188:29 | ... == ... |  |
-| test.rs:188:35:188:35 | PathExpr | test.rs:188:13:188:13 | IdentPat |  |
+| test.rs:188:35:188:35 | PathExpr | test.rs:188:13:188:13 | d |  |
 | test.rs:189:9:189:9 | PathExpr | test.rs:187:61:190:5 | BlockExpr |  |
 | test.rs:192:5:195:5 | enter test_not_operator | test.rs:193:9:193:19 | LetStmt |  |
 | test.rs:192:5:195:5 | exit test_not_operator (normal) | test.rs:192:5:195:5 | exit test_not_operator |  |
 | test.rs:192:43:195:5 | BlockExpr | test.rs:192:5:195:5 | exit test_not_operator (normal) |  |
 | test.rs:193:9:193:19 | LetStmt | test.rs:193:18:193:18 | PathExpr |  |
-| test.rs:193:13:193:13 | IdentPat | test.rs:194:9:194:9 | PathExpr | match, no-match |
-| test.rs:193:17:193:18 | ! ... | test.rs:193:13:193:13 | IdentPat |  |
+| test.rs:193:13:193:13 | d | test.rs:194:9:194:9 | PathExpr | match, no-match |
+| test.rs:193:17:193:18 | ! ... | test.rs:193:13:193:13 | d |  |
 | test.rs:193:18:193:18 | PathExpr | test.rs:193:17:193:18 | ! ... |  |
 | test.rs:194:9:194:9 | PathExpr | test.rs:192:43:195:5 | BlockExpr |  |
 | test.rs:197:5:203:5 | enter test_if_and_operator | test.rs:198:12:198:22 | ... && ... |  |
@@ -416,8 +416,8 @@
 | test.rs:251:1:264:1 | exit labelled_block (normal) | test.rs:251:1:264:1 | exit labelled_block |  |
 | test.rs:251:28:264:1 | BlockExpr | test.rs:251:1:264:1 | exit labelled_block (normal) |  |
 | test.rs:252:5:263:6 | LetStmt | test.rs:253:9:253:19 | ExprStmt |  |
-| test.rs:252:9:252:14 | IdentPat | test.rs:251:28:264:1 | BlockExpr | match, no-match |
-| test.rs:252:18:263:5 | BlockExpr | test.rs:252:9:252:14 | IdentPat |  |
+| test.rs:252:9:252:14 | result | test.rs:251:28:264:1 | BlockExpr | match, no-match |
+| test.rs:252:18:263:5 | BlockExpr | test.rs:252:9:252:14 | result |  |
 | test.rs:253:9:253:16 | PathExpr | test.rs:253:9:253:18 | CallExpr |  |
 | test.rs:253:9:253:18 | CallExpr | test.rs:254:9:256:9 | ExprStmt |  |
 | test.rs:253:9:253:19 | ExprStmt | test.rs:253:9:253:16 | PathExpr |  |

From a282efc43e7a004c48c280ebdd9fced583e63f30 Mon Sep 17 00:00:00 2001
From: Tom Hvitved <hvitved@github.com>
Date: Tue, 1 Oct 2024 09:09:14 +0200
Subject: [PATCH 068/347] Rust: Add inline test expectations library

---
 rust/ql/.generated.list                           |  1 -
 rust/ql/.gitattributes                            |  1 -
 .../codeql/rust/elements/internal/CommentImpl.qll | 11 +++++++++--
 rust/ql/test/utils/InlineExpectationsTest.qll     |  8 ++++++++
 .../utils/internal/InlineExpectationsTestImpl.qll | 15 +++++++++++++++
 5 files changed, 32 insertions(+), 4 deletions(-)
 create mode 100644 rust/ql/test/utils/InlineExpectationsTest.qll
 create mode 100644 rust/ql/test/utils/internal/InlineExpectationsTestImpl.qll

diff --git a/rust/ql/.generated.list b/rust/ql/.generated.list
index 2c4bb309f4c0..18337b8a6d78 100644
--- a/rust/ql/.generated.list
+++ b/rust/ql/.generated.list
@@ -193,7 +193,6 @@ lib/codeql/rust/elements/internal/ClosureBinderImpl.qll 58c6b17d34d678802ce3484f
 lib/codeql/rust/elements/internal/ClosureExprConstructor.qll a348229d2b25c7ebd43b58461830b7915e92d31ae83436ec831e0c4873f6218a 70a1d2ac33db3ac4da5826b0e8628f2f29a8f9cdfd8e4fd0e488d90ce0031a38
 lib/codeql/rust/elements/internal/ClosureExprImpl.qll 5ae3d211273b3effc3bff9f06bcef480f8264084e0509e69b8ff29bc29f47b05 ff562bc8d15ecb76ada3111c7c74dd990a0e80f41a32477f5f2f7db9e8f71102
 lib/codeql/rust/elements/internal/CommentConstructor.qll 0b4a6a976d667bf7595500dfb91b9cfc87460a501837ba5382d9a8d8321d7736 7d02d8c94a319dc48e7978d5270e33fc5c308d443768ff96b618236d250123f1
-lib/codeql/rust/elements/internal/CommentImpl.qll c1b7f2fca9cfb7e611b25486ca5f06c4996f4436b72ed3a76e27a6409af4ec01 36f7d7c6d2dadda4d3423afc4f23bdaf275978b6f3d9ca71bf145afc92858f9c
 lib/codeql/rust/elements/internal/ConstArgConstructor.qll f63021dc1ca2276786da3a981d06c18d7a360b5e75c08bca5d1afece4f7c4a83 487a870cbf5ed6554d671a8e159edd9261d853eba2d28ce2bd459759f47f11f2
 lib/codeql/rust/elements/internal/ConstArgImpl.qll 234fe6533c208a1731cdb423aa3a28909bd7e042dbc28bbedfd4f62e42b6f21e c576a49006f7a10483041fc07f2f0d089710ac61840be61a2e71140db709f9c6
 lib/codeql/rust/elements/internal/ConstBlockPatConstructor.qll ddb4a0045635d477e87360ecafec0ba90ddcffc6e62996eb6e7edd5a5d65b860 442061d0497a615b3f008b990f5e3c4f045110f76500eff81a7f44ffd1319acf
diff --git a/rust/ql/.gitattributes b/rust/ql/.gitattributes
index 932ff725a476..8e15852654c4 100644
--- a/rust/ql/.gitattributes
+++ b/rust/ql/.gitattributes
@@ -195,7 +195,6 @@
 /lib/codeql/rust/elements/internal/ClosureExprConstructor.qll linguist-generated
 /lib/codeql/rust/elements/internal/ClosureExprImpl.qll linguist-generated
 /lib/codeql/rust/elements/internal/CommentConstructor.qll linguist-generated
-/lib/codeql/rust/elements/internal/CommentImpl.qll linguist-generated
 /lib/codeql/rust/elements/internal/ConstArgConstructor.qll linguist-generated
 /lib/codeql/rust/elements/internal/ConstArgImpl.qll linguist-generated
 /lib/codeql/rust/elements/internal/ConstBlockPatConstructor.qll linguist-generated
diff --git a/rust/ql/lib/codeql/rust/elements/internal/CommentImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/CommentImpl.qll
index 0e5b68b0f358..32a4f415ab7c 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/CommentImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/CommentImpl.qll
@@ -1,4 +1,3 @@
-// generated by codegen, remove this comment if you wish to edit this file
 /**
  * This module provides a hand-modifiable wrapper around the generated class `Comment`.
  *
@@ -12,6 +11,7 @@ private import codeql.rust.elements.internal.generated.Comment
  * be referenced directly.
  */
 module Impl {
+  // the following QLdoc is generated: if you need to edit it, do it in the schema file
   /**
    * A comment. For example:
    * ```rust
@@ -19,5 +19,12 @@ module Impl {
    * /// This is a doc comment
    * ```
    */
-  class Comment extends Generated::Comment { }
+  class Comment extends Generated::Comment {
+    /**
+     * Gets the text of this comment, excluding the comment marker.
+     */
+    string getCommentText() {
+      exists(string s | s = this.getText() | result = s.regexpCapture("///?\\s*(.*)", 1))
+    }
+  }
 }
diff --git a/rust/ql/test/utils/InlineExpectationsTest.qll b/rust/ql/test/utils/InlineExpectationsTest.qll
new file mode 100644
index 000000000000..840e04ccbe01
--- /dev/null
+++ b/rust/ql/test/utils/InlineExpectationsTest.qll
@@ -0,0 +1,8 @@
+/**
+ * Inline expectation tests for Rust.
+ * See `shared/util/codeql/util/test/InlineExpectationsTest.qll`
+ */
+
+private import codeql.util.test.InlineExpectationsTest
+private import internal.InlineExpectationsTestImpl
+import Make<Impl>
diff --git a/rust/ql/test/utils/internal/InlineExpectationsTestImpl.qll b/rust/ql/test/utils/internal/InlineExpectationsTestImpl.qll
new file mode 100644
index 000000000000..74b8a39431de
--- /dev/null
+++ b/rust/ql/test/utils/internal/InlineExpectationsTestImpl.qll
@@ -0,0 +1,15 @@
+private import rust as R
+private import R
+private import codeql.util.test.InlineExpectationsTest
+
+module Impl implements InlineExpectationsTestSig {
+  /**
+   * A class representing line comments in C# used by the InlineExpectations core code
+   */
+  class ExpectationComment extends R::Comment {
+    /** Gets the contents of the given comment, _without_ the preceding comment marker (`//`). */
+    string getContents() { result = this.getCommentText() }
+  }
+
+  class Location = R::Location;
+}

From bd68986fa4669251b440e6a6e7f22b0f0485fbd8 Mon Sep 17 00:00:00 2001
From: Rasmus Lerchedahl Petersen <yoff@github.com>
Date: Tue, 1 Oct 2024 10:01:22 +0200
Subject: [PATCH 069/347] Python: add test showing `dict` can take multiple
 arguments

---
 .../test/library-tests/dataflow/coverage/test_builtins.py  | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/python/ql/test/library-tests/dataflow/coverage/test_builtins.py b/python/ql/test/library-tests/dataflow/coverage/test_builtins.py
index 245923370765..2de6adeb20bf 100644
--- a/python/ql/test/library-tests/dataflow/coverage/test_builtins.py
+++ b/python/ql/test/library-tests/dataflow/coverage/test_builtins.py
@@ -142,6 +142,13 @@ def test_dict_from_dict():
     SINK(d2["k"]) #$ flow="SOURCE, l:-2 -> d2['k']"
     SINK_F(d2["k1"])
 
+def test_dict_from_multiple_args():
+    d = dict([("k", SOURCE), ("k1", NONSOURCE)], k2 = SOURCE, k3 = NONSOURCE)
+    SINK(d["k"]) #$ MISSING: flow="SOURCE, l:-1 -> d['k']"
+    SINK_F(d["k1"])
+    SINK(d["k2"]) #$ flow="SOURCE, l:-3 -> d['k2']"
+    SINK_F(d["k3"])
+
 ## Container methods
 
 ### List

From b0efffd8f05e7418eb24ff9f935383eb072449f3 Mon Sep 17 00:00:00 2001
From: Tom Hvitved <hvitved@github.com>
Date: Fri, 27 Sep 2024 15:03:35 +0200
Subject: [PATCH 070/347] Rust: AST support for variables

---
 rust/ql/lib/codeql/rust/elements/Variable.qll |   9 +
 .../rust/elements/internal/VariableImpl.qll   | 340 ++++++++++++++++++
 rust/ql/lib/rust.qll                          |   1 +
 .../LetExpr/LetExpr_getExpr.expected          |   2 +-
 .../MatchArm/MatchArm_getExpr.expected        |   2 +-
 .../MatchExpr/MatchExpr_getExpr.expected      |   4 +-
 .../library-tests/controlflow/Cfg.expected    | 208 +++++------
 .../CONSISTENCY/CfgConsistency.expected       |   5 +
 .../variables/variables.expected              | 144 ++++++++
 .../test/library-tests/variables/variables.ql |  41 +++
 .../test/library-tests/variables/variables.rs | 325 +++++++++++++++++
 11 files changed, 973 insertions(+), 108 deletions(-)
 create mode 100644 rust/ql/lib/codeql/rust/elements/Variable.qll
 create mode 100644 rust/ql/lib/codeql/rust/elements/internal/VariableImpl.qll
 create mode 100644 rust/ql/test/library-tests/variables/CONSISTENCY/CfgConsistency.expected
 create mode 100644 rust/ql/test/library-tests/variables/variables.expected
 create mode 100644 rust/ql/test/library-tests/variables/variables.ql
 create mode 100644 rust/ql/test/library-tests/variables/variables.rs

diff --git a/rust/ql/lib/codeql/rust/elements/Variable.qll b/rust/ql/lib/codeql/rust/elements/Variable.qll
new file mode 100644
index 000000000000..76c2d9f19f72
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/Variable.qll
@@ -0,0 +1,9 @@
+/**
+ * This module provides classes related to variables.
+ */
+
+private import internal.VariableImpl
+
+final class Variable = Impl::Variable;
+
+final class VariableAccess = Impl::VariableAccess;
diff --git a/rust/ql/lib/codeql/rust/elements/internal/VariableImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/VariableImpl.qll
new file mode 100644
index 000000000000..9ddf1d9755a1
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/VariableImpl.qll
@@ -0,0 +1,340 @@
+private import rust
+private import codeql.rust.elements.internal.generated.ParentChild
+private import codeql.rust.elements.internal.PathExprImpl::Impl as PathExprImpl
+
+module Impl {
+  /**
+   * A variable scope. Either a block `{ ... }`, the guard/rhs
+   * of a match arm, or the body of a closure.
+   */
+  abstract class VariableScope extends AstNode { }
+
+  class BlockExprScope extends VariableScope, BlockExpr { }
+
+  abstract class MatchArmScope extends VariableScope {
+    MatchArm arm;
+
+    bindingset[arm]
+    MatchArmScope() { exists(arm) }
+
+    Pat getPat() { result = arm.getPat() }
+  }
+
+  class MatchArmExprScope extends MatchArmScope {
+    MatchArmExprScope() { this = arm.getExpr() }
+  }
+
+  class MatchArmGuardScope extends MatchArmScope {
+    MatchArmGuardScope() { this = arm.getGuard() }
+  }
+
+  class ClosureBodyScope extends VariableScope {
+    ClosureBodyScope() { this = any(ClosureExpr ce).getBody() }
+  }
+
+  private Pat getImmediatePatParent(AstNode n) {
+    result = getImmediateParent(n)
+    or
+    result.(RecordPat).getRecordPatFieldList().getAField().getPat() = n
+  }
+
+  private Pat getAPatAncestor(Pat p) {
+    (p instanceof IdentPat or p instanceof OrPat) and
+    exists(Pat p0 | result = getImmediatePatParent(p0) |
+      p0 = p
+      or
+      p0 = getAPatAncestor(p) and
+      not p0 instanceof OrPat
+    )
+  }
+
+  /** Gets the immediately enclosing `|` pattern of `p`, if any */
+  private OrPat getEnclosingOrPat(Pat p) { result = getAPatAncestor(p) }
+
+  /** Gets the outermost enclosing `|` pattern parent of `p`, if any. */
+  private OrPat getOutermostEnclosingOrPat(IdentPat p) {
+    result = getEnclosingOrPat+(p) and
+    not exists(getEnclosingOrPat(result))
+  }
+
+  /**
+   * Holds if `p` declares a variable named `name` at `definingNode`. Normally,
+   * `definingNode = p`, except in cases like
+   *
+   * ```rust
+   * match either {
+   *     Either::Left(x) | Either::Right(x) => println!(x),
+   * }
+   * ```
+   *
+   * where `definingNode` is the entire `Either::Left(x) | Either::Right(x)`
+   * pattern.
+   */
+  private predicate variableDecl(AstNode definingNode, IdentPat p, string name) {
+    (
+      definingNode = getOutermostEnclosingOrPat(p)
+      or
+      not exists(getOutermostEnclosingOrPat(p)) and
+      definingNode = p.getName()
+    ) and
+    name = p.getName().getText()
+  }
+
+  /** A variable. */
+  class Variable extends MkVariable {
+    private AstNode definingNode;
+    private string name;
+
+    Variable() { this = MkVariable(definingNode, name) }
+
+    /** Gets the name of this variable. */
+    string getName() { result = name }
+
+    /** Gets the location of this variable. */
+    Location getLocation() { result = definingNode.getLocation() }
+
+    /** Gets a textual representation of this variable. */
+    string toString() { result = this.getName() }
+
+    /** Gets an access to this variable. */
+    VariableAccess getAnAccess() { result.getVariable() = this }
+  }
+
+  /** A path expression that may access a local variable. */
+  private class VariableAccessCand extends PathExpr {
+    string name_;
+
+    VariableAccessCand() {
+      exists(Path p, PathSegment ps |
+        p = this.getPath() and
+        not p.hasQualifier() and
+        ps = p.getPart() and
+        not ps.hasGenericArgList() and
+        not ps.hasParamList() and
+        not ps.hasPathType() and
+        not ps.hasReturnTypeSyntax() and
+        name_ = ps.getNameRef().getText()
+      )
+    }
+
+    string getName() { result = name_ }
+  }
+
+  private AstNode getAnAncestorInVariableScope(AstNode n) {
+    (
+      n instanceof Pat or
+      n instanceof VariableAccessCand or
+      n instanceof LetStmt or
+      n instanceof VariableScope
+    ) and
+    exists(AstNode n0 | result = getImmediateParent(n0) |
+      n0 = n
+      or
+      n0 = getAnAncestorInVariableScope(n) and
+      not n0 instanceof VariableScope
+    )
+  }
+
+  /** Gets the immediately enclosing variable scope of `n`. */
+  private VariableScope getEnclosingScope(AstNode n) { result = getAnAncestorInVariableScope(n) }
+
+  private Pat getAVariablePatAncestor(Variable v) {
+    exists(AstNode definingNode, string name |
+      v = MkVariable(definingNode, name) and
+      variableDecl(definingNode, result, name)
+    )
+    or
+    exists(Pat mid |
+      mid = getAVariablePatAncestor(v) and
+      result = getImmediatePatParent(mid)
+    )
+  }
+
+  /**
+   * Holds if `v` is named `name` and is declared inside variable scope
+   * `scope`, and `v` is bound starting from `(line, column)`.
+   */
+  private predicate variableDeclInScope(
+    Variable v, VariableScope scope, string name, int line, int column
+  ) {
+    name = v.getName() and
+    exists(Pat pat | pat = getAVariablePatAncestor(v) |
+      scope =
+        any(MatchArmScope arm |
+          arm.getPat() = pat and
+          arm.getLocation().hasLocationInfo(_, line, column, _, _)
+        )
+      or
+      exists(Function f |
+        f.getParamList().getAParam().getPat() = pat and
+        scope = f.getBody() and
+        scope.getLocation().hasLocationInfo(_, line, column, _, _)
+      )
+      or
+      exists(LetStmt let |
+        let.getPat() = pat and
+        scope = getEnclosingScope(let) and
+        // for `let` statements, variables are bound _after_ the statement, i.e.
+        // not in the RHS
+        let.getLocation().hasLocationInfo(_, _, _, line, column)
+      )
+      or
+      exists(IfExpr ie, LetExpr let |
+        let.getPat() = pat and
+        ie.getCondition() = let and
+        scope = ie.getThen() and
+        scope.getLocation().hasLocationInfo(_, line, column, _, _)
+      )
+      or
+      exists(ForExpr fe |
+        fe.getPat() = pat and
+        scope = fe.getLoopBody() and
+        scope.getLocation().hasLocationInfo(_, line, column, _, _)
+      )
+      or
+      exists(ClosureExpr ce |
+        ce.getParamList().getAParam().getPat() = pat and
+        scope = ce.getBody() and
+        scope.getLocation().hasLocationInfo(_, line, column, _, _)
+      )
+    )
+  }
+
+  /**
+   * Holds if `cand` may access a variable named `name` at
+   * `(startline, startcolumn, endline, endcolumn)` in the variable scope
+   * `scope`.
+   *
+   * `nestLevel` is the number of nested scopes that need to be traversed
+   * to reach `scope` from `cand`.
+   */
+  private predicate variableAccessCandInScope(
+    VariableAccessCand cand, VariableScope scope, string name, int nestLevel, int startline,
+    int startcolumn, int endline, int endcolumn
+  ) {
+    name = cand.getName() and
+    scope = [cand.(VariableScope), getEnclosingScope(cand)] and
+    cand.getLocation().hasLocationInfo(_, startline, startcolumn, endline, endcolumn) and
+    nestLevel = 0
+    or
+    exists(VariableScope inner |
+      variableAccessCandInScope(cand, inner, name, nestLevel - 1, _, _, _, _) and
+      scope = getEnclosingScope(inner) and
+      // Use the location of the inner scope as the location of the access, instead of the
+      // actual access location. This allows us to collapse multiple accesses in inner
+      // scopes to a single entity
+      scope.getLocation().hasLocationInfo(_, startline, startcolumn, endline, endcolumn)
+    )
+  }
+
+  private newtype TVariableOrAccessCand =
+    TVariableOrAccessCandVariable(Variable v) or
+    TVariableOrAccessCandVariableAccessCand(VariableAccessCand va)
+
+  private class VariableOrAccessCand extends TVariableOrAccessCand {
+    Variable asVariable() { this = TVariableOrAccessCandVariable(result) }
+
+    VariableAccessCand asVariableAccessCand() {
+      this = TVariableOrAccessCandVariableAccessCand(result)
+    }
+
+    string toString() {
+      result = this.asVariable().toString() or result = this.asVariableAccessCand().toString()
+    }
+
+    Location getLocation() {
+      result = this.asVariable().getLocation() or result = this.asVariableAccessCand().getLocation()
+    }
+
+    pragma[nomagic]
+    predicate rankBy(
+      string name, VariableScope scope, int startline, int startcolumn, int endline, int endcolumn
+    ) {
+      variableDeclInScope(this.asVariable(), scope, name, startline, startcolumn) and
+      endline = -1 and
+      endcolumn = -1
+      or
+      variableAccessCandInScope(this.asVariableAccessCand(), scope, name, _, startline, startcolumn,
+        endline, endcolumn)
+    }
+  }
+
+  /**
+   * Gets the rank of `v` amongst all other declarations or access candidates
+   * to a variable named `name` in the variable scope `scope`.
+   */
+  private int rankVariableOrAccess(VariableScope scope, string name, VariableOrAccessCand v) {
+    v =
+      rank[result + 1](VariableOrAccessCand v0, int startline, int startcolumn, int endline,
+        int endcolumn |
+        v0.rankBy(name, scope, startline, startcolumn, endline, endcolumn)
+      |
+        v0 order by startline, startcolumn, endline, endcolumn
+      )
+  }
+
+  /**
+   * Holds if `v` can reach rank `rnk` in the variable scope `scope`. This is needed to
+   * take shadowing into account, for example in
+   *
+   * ```rust
+   * let x = 0;  // rank 0
+   * use(x);     // rank 1
+   * let x = ""; // rank 2
+   * use(x);     // rank 3
+   * ```
+   *
+   * the declaration at rank 0 can only reach the access at rank 1, while the declaration
+   * at rank 2 can only reach the access at rank 3.
+   */
+  private predicate variableReachesRank(VariableScope scope, string name, Variable v, int rnk) {
+    rnk = rankVariableOrAccess(scope, name, TVariableOrAccessCandVariable(v))
+    or
+    variableReachesRank(scope, name, v, rnk - 1) and
+    rnk = rankVariableOrAccess(scope, name, TVariableOrAccessCandVariableAccessCand(_))
+  }
+
+  private predicate variableReachesCand(
+    VariableScope scope, string name, Variable v, VariableAccessCand cand, int nestLevel
+  ) {
+    exists(int rnk |
+      variableReachesRank(scope, name, v, rnk) and
+      rnk = rankVariableOrAccess(scope, name, TVariableOrAccessCandVariableAccessCand(cand)) and
+      variableAccessCandInScope(cand, scope, name, nestLevel, _, _, _, _)
+    )
+  }
+
+  /** A variable access. */
+  class VariableAccess extends PathExprImpl::PathExpr instanceof VariableAccessCand {
+    private string name;
+    private Variable v;
+
+    VariableAccess() { variableAccess(_, name, v, this) }
+
+    /** Gets the variable being accessed. */
+    Variable getVariable() { result = v }
+
+    override string toString() { result = name }
+
+    override string getAPrimaryQlClass() { result = "VariableAccess" }
+  }
+
+  cached
+  private module Cached {
+    cached
+    newtype TVariable =
+      MkVariable(AstNode definingNode, string name) { variableDecl(definingNode, _, name) }
+
+    cached
+    predicate variableAccess(VariableScope scope, string name, Variable v, VariableAccessCand cand) {
+      v =
+        min(Variable v0, int nestLevel |
+          variableReachesCand(scope, name, v0, cand, nestLevel)
+        |
+          v0 order by nestLevel
+        )
+    }
+  }
+
+  private import Cached
+}
diff --git a/rust/ql/lib/rust.qll b/rust/ql/lib/rust.qll
index 72d2bd5498d2..7723400c41b6 100644
--- a/rust/ql/lib/rust.qll
+++ b/rust/ql/lib/rust.qll
@@ -4,3 +4,4 @@ import codeql.rust.elements
 import codeql.Locations
 import codeql.files.FileSystem
 import codeql.rust.elements.LogicalOperation
+import codeql.rust.elements.Variable
diff --git a/rust/ql/test/extractor-tests/generated/LetExpr/LetExpr_getExpr.expected b/rust/ql/test/extractor-tests/generated/LetExpr/LetExpr_getExpr.expected
index 66fab8ec8099..f90fa5862299 100644
--- a/rust/ql/test/extractor-tests/generated/LetExpr/LetExpr_getExpr.expected
+++ b/rust/ql/test/extractor-tests/generated/LetExpr/LetExpr_getExpr.expected
@@ -1 +1 @@
-| gen_let_expr.rs:5:8:5:31 | LetExpr | gen_let_expr.rs:5:22:5:31 | PathExpr |
+| gen_let_expr.rs:5:8:5:31 | LetExpr | gen_let_expr.rs:5:22:5:31 | maybe_some |
diff --git a/rust/ql/test/extractor-tests/generated/MatchArm/MatchArm_getExpr.expected b/rust/ql/test/extractor-tests/generated/MatchArm/MatchArm_getExpr.expected
index ea9eaff95307..493ea8d9bb03 100644
--- a/rust/ql/test/extractor-tests/generated/MatchArm/MatchArm_getExpr.expected
+++ b/rust/ql/test/extractor-tests/generated/MatchArm/MatchArm_getExpr.expected
@@ -1,4 +1,4 @@
-| gen_match_arm.rs:6:9:6:29 | MatchArm | gen_match_arm.rs:6:28:6:28 | PathExpr |
+| gen_match_arm.rs:6:9:6:29 | MatchArm | gen_match_arm.rs:6:28:6:28 | y |
 | gen_match_arm.rs:7:9:7:26 | MatchArm | gen_match_arm.rs:7:25:7:25 | 0 |
 | gen_match_arm.rs:10:9:10:35 | MatchArm | gen_match_arm.rs:10:30:10:34 | ... / ... |
 | gen_match_arm.rs:11:9:11:15 | MatchArm | gen_match_arm.rs:11:14:11:14 | 0 |
diff --git a/rust/ql/test/extractor-tests/generated/MatchExpr/MatchExpr_getExpr.expected b/rust/ql/test/extractor-tests/generated/MatchExpr/MatchExpr_getExpr.expected
index 631592c910d6..924eb3f807fa 100644
--- a/rust/ql/test/extractor-tests/generated/MatchExpr/MatchExpr_getExpr.expected
+++ b/rust/ql/test/extractor-tests/generated/MatchExpr/MatchExpr_getExpr.expected
@@ -1,2 +1,2 @@
-| gen_match_expr.rs:5:5:8:5 | MatchExpr | gen_match_expr.rs:5:11:5:11 | PathExpr |
-| gen_match_expr.rs:9:5:12:5 | MatchExpr | gen_match_expr.rs:9:11:9:11 | PathExpr |
+| gen_match_expr.rs:5:5:8:5 | MatchExpr | gen_match_expr.rs:5:11:5:11 | x |
+| gen_match_expr.rs:9:5:12:5 | MatchExpr | gen_match_expr.rs:9:11:9:11 | x |
diff --git a/rust/ql/test/library-tests/controlflow/Cfg.expected b/rust/ql/test/library-tests/controlflow/Cfg.expected
index 52715de2a267..d0ab3bd10d63 100644
--- a/rust/ql/test/library-tests/controlflow/Cfg.expected
+++ b/rust/ql/test/library-tests/controlflow/Cfg.expected
@@ -13,9 +13,9 @@
 | test.rs:3:21:3:22 | 42 | test.rs:3:5:3:23 | CallExpr |  |
 | test.rs:8:5:24:5 | enter test_break_and_continue | test.rs:9:9:9:22 | LetStmt |  |
 | test.rs:8:5:24:5 | exit test_break_and_continue (normal) | test.rs:8:5:24:5 | exit test_break_and_continue |  |
-| test.rs:9:9:9:22 | LetStmt | test.rs:9:21:9:21 | PathExpr |  |
+| test.rs:9:9:9:22 | LetStmt | test.rs:9:21:9:21 | n |  |
 | test.rs:9:13:9:17 | i | test.rs:10:9:22:9 | ExprStmt | match, no-match |
-| test.rs:9:21:9:21 | PathExpr | test.rs:9:13:9:17 | i |  |
+| test.rs:9:21:9:21 | n | test.rs:9:13:9:17 | i |  |
 | test.rs:10:9:22:9 | ExprStmt | test.rs:11:13:11:24 | ExprStmt |  |
 | test.rs:10:9:22:9 | LoopExpr | test.rs:23:9:23:20 | ExprStmt |  |
 | test.rs:10:14:22:9 | BlockExpr | test.rs:11:13:11:24 | ExprStmt |  |
@@ -67,15 +67,15 @@
 | test.rs:27:9:36:9 | LoopExpr | test.rs:37:9:37:12 | true |  |
 | test.rs:27:22:36:9 | BlockExpr | test.rs:29:17:33:17 | ExprStmt |  |
 | test.rs:28:13:35:13 | LoopExpr | test.rs:27:22:36:9 | BlockExpr |  |
-| test.rs:29:17:33:17 | ExprStmt | test.rs:29:20:29:20 | PathExpr |  |
+| test.rs:29:17:33:17 | ExprStmt | test.rs:29:20:29:20 | b |  |
 | test.rs:29:17:33:17 | IfExpr | test.rs:34:17:34:29 | ExprStmt |  |
-| test.rs:29:20:29:20 | PathExpr | test.rs:30:21:30:26 | ExprStmt | true |
-| test.rs:29:20:29:20 | PathExpr | test.rs:31:27:31:27 | PathExpr | false |
+| test.rs:29:20:29:20 | b | test.rs:30:21:30:26 | ExprStmt | true |
+| test.rs:29:20:29:20 | b | test.rs:31:27:31:27 | b | false |
 | test.rs:30:21:30:25 | BreakExpr | test.rs:28:13:35:13 | LoopExpr | break |
 | test.rs:30:21:30:26 | ExprStmt | test.rs:30:21:30:25 | BreakExpr |  |
 | test.rs:31:24:33:17 | IfExpr | test.rs:29:17:33:17 | IfExpr |  |
-| test.rs:31:27:31:27 | PathExpr | test.rs:31:24:33:17 | IfExpr | false |
-| test.rs:31:27:31:27 | PathExpr | test.rs:32:21:32:33 | ExprStmt | true |
+| test.rs:31:27:31:27 | b | test.rs:31:24:33:17 | IfExpr | false |
+| test.rs:31:27:31:27 | b | test.rs:32:21:32:33 | ExprStmt | true |
 | test.rs:32:21:32:32 | BreakExpr | test.rs:27:9:36:9 | LoopExpr | break('outer) |
 | test.rs:32:21:32:33 | ExprStmt | test.rs:32:21:32:32 | BreakExpr |  |
 | test.rs:34:17:34:28 | BreakExpr | test.rs:28:13:35:13 | LoopExpr | break('inner) |
@@ -84,15 +84,15 @@
 | test.rs:40:5:52:5 | enter test_continue_with_labels | test.rs:42:13:42:14 | ExprStmt |  |
 | test.rs:42:13:42:13 | 1 | test.rs:44:17:48:17 | ExprStmt |  |
 | test.rs:42:13:42:14 | ExprStmt | test.rs:42:13:42:13 | 1 |  |
-| test.rs:44:17:48:17 | ExprStmt | test.rs:44:20:44:20 | PathExpr |  |
+| test.rs:44:17:48:17 | ExprStmt | test.rs:44:20:44:20 | b |  |
 | test.rs:44:17:48:17 | IfExpr | test.rs:49:17:49:32 | ExprStmt |  |
-| test.rs:44:20:44:20 | PathExpr | test.rs:45:21:45:29 | ExprStmt | true |
-| test.rs:44:20:44:20 | PathExpr | test.rs:46:27:46:27 | PathExpr | false |
+| test.rs:44:20:44:20 | b | test.rs:45:21:45:29 | ExprStmt | true |
+| test.rs:44:20:44:20 | b | test.rs:46:27:46:27 | b | false |
 | test.rs:45:21:45:28 | ContinueExpr | test.rs:44:17:48:17 | ExprStmt | continue |
 | test.rs:45:21:45:29 | ExprStmt | test.rs:45:21:45:28 | ContinueExpr |  |
 | test.rs:46:24:48:17 | IfExpr | test.rs:44:17:48:17 | IfExpr |  |
-| test.rs:46:27:46:27 | PathExpr | test.rs:46:24:48:17 | IfExpr | false |
-| test.rs:46:27:46:27 | PathExpr | test.rs:47:21:47:36 | ExprStmt | true |
+| test.rs:46:27:46:27 | b | test.rs:46:24:48:17 | IfExpr | false |
+| test.rs:46:27:46:27 | b | test.rs:47:21:47:36 | ExprStmt | true |
 | test.rs:47:21:47:35 | ContinueExpr | test.rs:42:13:42:14 | ExprStmt | continue('outer) |
 | test.rs:47:21:47:36 | ExprStmt | test.rs:47:21:47:35 | ContinueExpr |  |
 | test.rs:49:17:49:31 | ContinueExpr | test.rs:44:17:48:17 | ExprStmt | continue('inner) |
@@ -104,30 +104,30 @@
 | test.rs:69:1:72:1 | exit test_nested_function (normal) | test.rs:69:1:72:1 | exit test_nested_function |  |
 | test.rs:69:40:72:1 | BlockExpr | test.rs:69:1:72:1 | exit test_nested_function (normal) |  |
 | test.rs:70:5:70:28 | LetStmt | test.rs:70:19:70:27 | ClosureExpr |  |
-| test.rs:70:9:70:15 | add_one | test.rs:71:5:71:11 | PathExpr | match, no-match |
+| test.rs:70:9:70:15 | add_one | test.rs:71:5:71:11 | add_one | match, no-match |
 | test.rs:70:19:70:27 | ClosureExpr | test.rs:70:9:70:15 | add_one |  |
-| test.rs:70:19:70:27 | enter ClosureExpr | test.rs:70:23:70:23 | PathExpr |  |
+| test.rs:70:19:70:27 | enter ClosureExpr | test.rs:70:23:70:23 | i |  |
 | test.rs:70:19:70:27 | exit ClosureExpr (normal) | test.rs:70:19:70:27 | exit ClosureExpr |  |
-| test.rs:70:23:70:23 | PathExpr | test.rs:70:27:70:27 | 1 |  |
+| test.rs:70:23:70:23 | i | test.rs:70:27:70:27 | 1 |  |
 | test.rs:70:23:70:27 | ... + ... | test.rs:70:19:70:27 | exit ClosureExpr (normal) |  |
 | test.rs:70:27:70:27 | 1 | test.rs:70:23:70:27 | ... + ... |  |
-| test.rs:71:5:71:11 | PathExpr | test.rs:71:13:71:19 | PathExpr |  |
+| test.rs:71:5:71:11 | add_one | test.rs:71:13:71:19 | add_one |  |
 | test.rs:71:5:71:23 | CallExpr | test.rs:69:40:72:1 | BlockExpr |  |
-| test.rs:71:13:71:19 | PathExpr | test.rs:71:21:71:21 | PathExpr |  |
+| test.rs:71:13:71:19 | add_one | test.rs:71:21:71:21 | n |  |
 | test.rs:71:13:71:22 | CallExpr | test.rs:71:5:71:23 | CallExpr |  |
-| test.rs:71:21:71:21 | PathExpr | test.rs:71:13:71:22 | CallExpr |  |
-| test.rs:76:5:82:5 | enter test_if_else | test.rs:77:12:77:12 | PathExpr |  |
+| test.rs:71:21:71:21 | n | test.rs:71:13:71:22 | CallExpr |  |
+| test.rs:76:5:82:5 | enter test_if_else | test.rs:77:12:77:12 | n |  |
 | test.rs:76:5:82:5 | exit test_if_else (normal) | test.rs:76:5:82:5 | exit test_if_else |  |
 | test.rs:76:36:82:5 | BlockExpr | test.rs:76:5:82:5 | exit test_if_else (normal) |  |
 | test.rs:77:9:81:9 | IfExpr | test.rs:76:36:82:5 | BlockExpr |  |
-| test.rs:77:12:77:12 | PathExpr | test.rs:77:17:77:17 | 0 |  |
+| test.rs:77:12:77:12 | n | test.rs:77:17:77:17 | 0 |  |
 | test.rs:77:12:77:17 | ... <= ... | test.rs:78:13:78:13 | 0 | true |
-| test.rs:77:12:77:17 | ... <= ... | test.rs:80:13:80:13 | PathExpr | false |
+| test.rs:77:12:77:17 | ... <= ... | test.rs:80:13:80:13 | n | false |
 | test.rs:77:17:77:17 | 0 | test.rs:77:12:77:17 | ... <= ... |  |
 | test.rs:77:19:79:9 | BlockExpr | test.rs:77:9:81:9 | IfExpr |  |
 | test.rs:78:13:78:13 | 0 | test.rs:77:19:79:9 | BlockExpr |  |
 | test.rs:79:16:81:9 | BlockExpr | test.rs:77:9:81:9 | IfExpr |  |
-| test.rs:80:13:80:13 | PathExpr | test.rs:80:17:80:17 | 1 |  |
+| test.rs:80:13:80:13 | n | test.rs:80:17:80:17 | 1 |  |
 | test.rs:80:13:80:17 | ... - ... | test.rs:79:16:81:9 | BlockExpr |  |
 | test.rs:80:17:80:17 | 1 | test.rs:80:13:80:17 | ... - ... |  |
 | test.rs:84:5:90:5 | enter test_if_let_else | test.rs:85:12:85:26 | LetExpr |  |
@@ -135,10 +135,10 @@
 | test.rs:84:48:90:5 | BlockExpr | test.rs:84:5:90:5 | exit test_if_let_else (normal) |  |
 | test.rs:85:9:89:9 | IfExpr | test.rs:84:48:90:5 | BlockExpr |  |
 | test.rs:85:12:85:26 | LetExpr | test.rs:85:16:85:22 | TupleStructPat |  |
-| test.rs:85:16:85:22 | TupleStructPat | test.rs:86:13:86:13 | PathExpr | match |
+| test.rs:85:16:85:22 | TupleStructPat | test.rs:86:13:86:13 | n | match |
 | test.rs:85:16:85:22 | TupleStructPat | test.rs:88:13:88:13 | 0 | no-match |
 | test.rs:85:28:87:9 | BlockExpr | test.rs:85:9:89:9 | IfExpr |  |
-| test.rs:86:13:86:13 | PathExpr | test.rs:85:28:87:9 | BlockExpr |  |
+| test.rs:86:13:86:13 | n | test.rs:85:28:87:9 | BlockExpr |  |
 | test.rs:87:16:89:9 | BlockExpr | test.rs:85:9:89:9 | IfExpr |  |
 | test.rs:88:13:88:13 | 0 | test.rs:87:16:89:9 | BlockExpr |  |
 | test.rs:92:5:97:5 | enter test_if_let | test.rs:93:9:95:9 | ExprStmt |  |
@@ -148,9 +148,9 @@
 | test.rs:93:9:95:9 | IfExpr | test.rs:96:9:96:9 | 0 |  |
 | test.rs:93:12:93:26 | LetExpr | test.rs:93:16:93:22 | TupleStructPat |  |
 | test.rs:93:16:93:22 | TupleStructPat | test.rs:93:9:95:9 | IfExpr | no-match |
-| test.rs:93:16:93:22 | TupleStructPat | test.rs:94:13:94:13 | PathExpr | match |
+| test.rs:93:16:93:22 | TupleStructPat | test.rs:94:13:94:13 | n | match |
 | test.rs:93:28:95:9 | BlockExpr | test.rs:93:9:95:9 | IfExpr |  |
-| test.rs:94:13:94:13 | PathExpr | test.rs:93:28:95:9 | BlockExpr |  |
+| test.rs:94:13:94:13 | n | test.rs:93:28:95:9 | BlockExpr |  |
 | test.rs:96:9:96:9 | 0 | test.rs:92:43:97:5 | BlockExpr |  |
 | test.rs:99:5:105:5 | enter test_nested_if | test.rs:100:16:100:16 | PathExpr |  |
 | test.rs:99:5:105:5 | exit test_nested_if (normal) | test.rs:99:5:105:5 | exit test_nested_if |  |
@@ -160,30 +160,30 @@
 | test.rs:100:12:100:49 | ParenExpr | test.rs:103:13:103:13 | 0 | false |
 | test.rs:100:13:100:48 | IfExpr | test.rs:100:12:100:49 | ParenExpr |  |
 | test.rs:100:16:100:16 | PathExpr | test.rs:100:20:100:20 | 0 |  |
-| test.rs:100:16:100:20 | ... < ... | test.rs:100:24:100:24 | PathExpr | true |
-| test.rs:100:16:100:20 | ... < ... | test.rs:100:41:100:41 | PathExpr | false |
+| test.rs:100:16:100:20 | ... < ... | test.rs:100:24:100:24 | a | true |
+| test.rs:100:16:100:20 | ... < ... | test.rs:100:41:100:41 | a | false |
 | test.rs:100:20:100:20 | 0 | test.rs:100:16:100:20 | ... < ... |  |
 | test.rs:100:22:100:32 | BlockExpr | test.rs:100:13:100:48 | IfExpr |  |
-| test.rs:100:24:100:24 | PathExpr | test.rs:100:29:100:30 | 10 |  |
+| test.rs:100:24:100:24 | a | test.rs:100:29:100:30 | 10 |  |
 | test.rs:100:24:100:30 | ... < ... | test.rs:100:22:100:32 | BlockExpr |  |
 | test.rs:100:28:100:30 | - ... | test.rs:100:24:100:30 | ... < ... |  |
 | test.rs:100:29:100:30 | 10 | test.rs:100:28:100:30 | - ... |  |
 | test.rs:100:39:100:48 | BlockExpr | test.rs:100:13:100:48 | IfExpr |  |
-| test.rs:100:41:100:41 | PathExpr | test.rs:100:45:100:46 | 10 |  |
+| test.rs:100:41:100:41 | a | test.rs:100:45:100:46 | 10 |  |
 | test.rs:100:41:100:46 | ... > ... | test.rs:100:39:100:48 | BlockExpr |  |
 | test.rs:100:45:100:46 | 10 | test.rs:100:41:100:46 | ... > ... |  |
 | test.rs:100:51:102:9 | BlockExpr | test.rs:100:9:104:9 | IfExpr |  |
 | test.rs:101:13:101:13 | 1 | test.rs:100:51:102:9 | BlockExpr |  |
 | test.rs:102:16:104:9 | BlockExpr | test.rs:100:9:104:9 | IfExpr |  |
 | test.rs:103:13:103:13 | 0 | test.rs:102:16:104:9 | BlockExpr |  |
-| test.rs:107:5:116:5 | enter test_nested_if_match | test.rs:108:19:108:19 | PathExpr |  |
+| test.rs:107:5:116:5 | enter test_nested_if_match | test.rs:108:19:108:19 | a |  |
 | test.rs:107:5:116:5 | exit test_nested_if_match (normal) | test.rs:107:5:116:5 | exit test_nested_if_match |  |
 | test.rs:107:44:116:5 | BlockExpr | test.rs:107:5:116:5 | exit test_nested_if_match (normal) |  |
 | test.rs:108:9:115:9 | IfExpr | test.rs:107:44:116:5 | BlockExpr |  |
 | test.rs:108:12:111:10 | ParenExpr | test.rs:112:13:112:13 | 1 | true |
 | test.rs:108:12:111:10 | ParenExpr | test.rs:114:13:114:13 | 0 | false |
 | test.rs:108:13:111:9 | MatchExpr | test.rs:108:12:111:10 | ParenExpr |  |
-| test.rs:108:19:108:19 | PathExpr | test.rs:109:13:109:13 | LiteralPat |  |
+| test.rs:108:19:108:19 | a | test.rs:109:13:109:13 | LiteralPat |  |
 | test.rs:109:13:109:13 | LiteralPat | test.rs:109:18:109:21 | true | match |
 | test.rs:109:13:109:13 | LiteralPat | test.rs:110:13:110:13 | WildcardPat | no-match |
 | test.rs:109:18:109:21 | true | test.rs:108:13:111:9 | MatchExpr |  |
@@ -199,9 +199,9 @@
 | test.rs:119:9:126:9 | IfExpr | test.rs:118:44:127:5 | BlockExpr |  |
 | test.rs:119:12:122:9 | BlockExpr | test.rs:123:13:123:13 | 1 | true |
 | test.rs:119:12:122:9 | BlockExpr | test.rs:125:13:125:13 | 0 | false |
-| test.rs:120:13:120:14 | TupleExpr | test.rs:121:13:121:13 | PathExpr |  |
+| test.rs:120:13:120:14 | TupleExpr | test.rs:121:13:121:13 | a |  |
 | test.rs:120:13:120:15 | ExprStmt | test.rs:120:13:120:14 | TupleExpr |  |
-| test.rs:121:13:121:13 | PathExpr | test.rs:121:17:121:17 | 0 |  |
+| test.rs:121:13:121:13 | a | test.rs:121:17:121:17 | 0 |  |
 | test.rs:121:13:121:17 | ... > ... | test.rs:119:12:122:9 | BlockExpr | false, true |
 | test.rs:121:17:121:17 | 0 | test.rs:121:13:121:17 | ... > ... |  |
 | test.rs:122:11:124:9 | BlockExpr | test.rs:119:9:126:9 | IfExpr |  |
@@ -212,10 +212,10 @@
 | test.rs:129:5:136:5 | exit test_if_assignment (normal) | test.rs:129:5:136:5 | exit test_if_assignment |  |
 | test.rs:129:42:136:5 | BlockExpr | test.rs:129:5:136:5 | exit test_if_assignment (normal) |  |
 | test.rs:130:9:130:26 | LetStmt | test.rs:130:21:130:25 | false |  |
-| test.rs:130:13:130:17 | x | test.rs:131:12:131:12 | PathExpr | match, no-match |
+| test.rs:130:13:130:17 | x | test.rs:131:12:131:12 | x | match, no-match |
 | test.rs:130:21:130:25 | false | test.rs:130:13:130:17 | x |  |
 | test.rs:131:9:135:9 | IfExpr | test.rs:129:42:136:5 | BlockExpr |  |
-| test.rs:131:12:131:12 | PathExpr | test.rs:131:16:131:19 | true |  |
+| test.rs:131:12:131:12 | x | test.rs:131:16:131:19 | true |  |
 | test.rs:131:12:131:19 | ... = ... | test.rs:132:13:132:13 | 1 | true |
 | test.rs:131:12:131:19 | ... = ... | test.rs:134:13:134:13 | 0 | false |
 | test.rs:131:16:131:19 | true | test.rs:131:12:131:19 | ... = ... |  |
@@ -232,19 +232,19 @@
 | test.rs:139:13:144:9 | LoopExpr | test.rs:139:12:144:10 | ParenExpr |  |
 | test.rs:139:18:144:9 | BlockExpr | test.rs:140:13:142:14 | ExprStmt |  |
 | test.rs:140:13:142:13 | IfExpr | test.rs:143:13:143:19 | ExprStmt |  |
-| test.rs:140:13:142:14 | ExprStmt | test.rs:140:16:140:16 | PathExpr |  |
-| test.rs:140:16:140:16 | PathExpr | test.rs:140:20:140:20 | 0 |  |
+| test.rs:140:13:142:14 | ExprStmt | test.rs:140:16:140:16 | a |  |
+| test.rs:140:16:140:16 | a | test.rs:140:20:140:20 | 0 |  |
 | test.rs:140:16:140:20 | ... > ... | test.rs:140:13:142:13 | IfExpr | false |
 | test.rs:140:16:140:20 | ... > ... | test.rs:141:17:141:29 | ExprStmt | true |
 | test.rs:140:20:140:20 | 0 | test.rs:140:16:140:20 | ... > ... |  |
 | test.rs:141:17:141:28 | BreakExpr | test.rs:139:13:144:9 | LoopExpr | break |
-| test.rs:141:17:141:29 | ExprStmt | test.rs:141:23:141:23 | PathExpr |  |
-| test.rs:141:23:141:23 | PathExpr | test.rs:141:27:141:28 | 10 |  |
+| test.rs:141:17:141:29 | ExprStmt | test.rs:141:23:141:23 | a |  |
+| test.rs:141:23:141:23 | a | test.rs:141:27:141:28 | 10 |  |
 | test.rs:141:23:141:28 | ... > ... | test.rs:141:17:141:28 | BreakExpr |  |
 | test.rs:141:27:141:28 | 10 | test.rs:141:23:141:28 | ... > ... |  |
-| test.rs:143:13:143:13 | PathExpr | test.rs:143:17:143:18 | 10 |  |
+| test.rs:143:13:143:13 | a | test.rs:143:17:143:18 | 10 |  |
 | test.rs:143:13:143:18 | ... < ... | test.rs:139:18:144:9 | BlockExpr |  |
-| test.rs:143:13:143:19 | ExprStmt | test.rs:143:13:143:13 | PathExpr |  |
+| test.rs:143:13:143:19 | ExprStmt | test.rs:143:13:143:13 | a |  |
 | test.rs:143:17:143:18 | 10 | test.rs:143:13:143:18 | ... < ... |  |
 | test.rs:144:12:146:9 | BlockExpr | test.rs:139:9:148:9 | IfExpr |  |
 | test.rs:145:13:145:13 | 1 | test.rs:144:12:146:9 | BlockExpr |  |
@@ -259,19 +259,19 @@
 | test.rs:152:13:157:9 | LoopExpr | test.rs:152:12:157:10 | ParenExpr |  |
 | test.rs:152:26:157:9 | BlockExpr | test.rs:153:13:155:14 | ExprStmt |  |
 | test.rs:153:13:155:13 | IfExpr | test.rs:156:13:156:19 | ExprStmt |  |
-| test.rs:153:13:155:14 | ExprStmt | test.rs:153:16:153:16 | PathExpr |  |
-| test.rs:153:16:153:16 | PathExpr | test.rs:153:20:153:20 | 0 |  |
+| test.rs:153:13:155:14 | ExprStmt | test.rs:153:16:153:16 | a |  |
+| test.rs:153:16:153:16 | a | test.rs:153:20:153:20 | 0 |  |
 | test.rs:153:16:153:20 | ... > ... | test.rs:153:13:155:13 | IfExpr | false |
 | test.rs:153:16:153:20 | ... > ... | test.rs:154:17:154:36 | ExprStmt | true |
 | test.rs:153:20:153:20 | 0 | test.rs:153:16:153:20 | ... > ... |  |
 | test.rs:154:17:154:35 | BreakExpr | test.rs:152:13:157:9 | LoopExpr | break('label) |
-| test.rs:154:17:154:36 | ExprStmt | test.rs:154:30:154:30 | PathExpr |  |
-| test.rs:154:30:154:30 | PathExpr | test.rs:154:34:154:35 | 10 |  |
+| test.rs:154:17:154:36 | ExprStmt | test.rs:154:30:154:30 | a |  |
+| test.rs:154:30:154:30 | a | test.rs:154:34:154:35 | 10 |  |
 | test.rs:154:30:154:35 | ... > ... | test.rs:154:17:154:35 | BreakExpr |  |
 | test.rs:154:34:154:35 | 10 | test.rs:154:30:154:35 | ... > ... |  |
-| test.rs:156:13:156:13 | PathExpr | test.rs:156:17:156:18 | 10 |  |
+| test.rs:156:13:156:13 | a | test.rs:156:17:156:18 | 10 |  |
 | test.rs:156:13:156:18 | ... < ... | test.rs:152:26:157:9 | BlockExpr |  |
-| test.rs:156:13:156:19 | ExprStmt | test.rs:156:13:156:13 | PathExpr |  |
+| test.rs:156:13:156:19 | ExprStmt | test.rs:156:13:156:13 | a |  |
 | test.rs:156:17:156:18 | 10 | test.rs:156:13:156:18 | ... < ... |  |
 | test.rs:157:12:159:9 | BlockExpr | test.rs:152:9:161:9 | IfExpr |  |
 | test.rs:158:13:158:13 | 1 | test.rs:157:12:159:9 | BlockExpr |  |
@@ -280,72 +280,72 @@
 | test.rs:164:5:172:5 | enter test_labelled_block | test.rs:166:13:166:31 | ExprStmt |  |
 | test.rs:164:5:172:5 | exit test_labelled_block (normal) | test.rs:164:5:172:5 | exit test_labelled_block |  |
 | test.rs:166:13:166:30 | BreakExpr | test.rs:164:5:172:5 | exit test_labelled_block (normal) | break('block) |
-| test.rs:166:13:166:31 | ExprStmt | test.rs:166:26:166:26 | PathExpr |  |
-| test.rs:166:26:166:26 | PathExpr | test.rs:166:30:166:30 | 0 |  |
+| test.rs:166:13:166:31 | ExprStmt | test.rs:166:26:166:26 | a |  |
+| test.rs:166:26:166:26 | a | test.rs:166:30:166:30 | 0 |  |
 | test.rs:166:26:166:30 | ... > ... | test.rs:166:13:166:30 | BreakExpr |  |
 | test.rs:166:30:166:30 | 0 | test.rs:166:26:166:30 | ... > ... |  |
 | test.rs:177:5:180:5 | enter test_and_operator | test.rs:178:9:178:28 | LetStmt |  |
 | test.rs:177:5:180:5 | exit test_and_operator (normal) | test.rs:177:5:180:5 | exit test_and_operator |  |
 | test.rs:177:61:180:5 | BlockExpr | test.rs:177:5:180:5 | exit test_and_operator (normal) |  |
 | test.rs:178:9:178:28 | LetStmt | test.rs:178:17:178:27 | ... && ... |  |
-| test.rs:178:13:178:13 | d | test.rs:179:9:179:9 | PathExpr | match, no-match |
-| test.rs:178:17:178:17 | PathExpr | test.rs:178:13:178:13 | d | false |
-| test.rs:178:17:178:17 | PathExpr | test.rs:178:22:178:22 | PathExpr | true |
-| test.rs:178:17:178:22 | ... && ... | test.rs:178:17:178:17 | PathExpr |  |
+| test.rs:178:13:178:13 | d | test.rs:179:9:179:9 | d | match, no-match |
+| test.rs:178:17:178:17 | a | test.rs:178:13:178:13 | d | false |
+| test.rs:178:17:178:17 | a | test.rs:178:22:178:22 | b | true |
+| test.rs:178:17:178:22 | ... && ... | test.rs:178:17:178:17 | a |  |
 | test.rs:178:17:178:27 | ... && ... | test.rs:178:17:178:22 | ... && ... |  |
-| test.rs:178:22:178:22 | PathExpr | test.rs:178:13:178:13 | d | false |
-| test.rs:178:22:178:22 | PathExpr | test.rs:178:27:178:27 | PathExpr | true |
-| test.rs:178:27:178:27 | PathExpr | test.rs:178:13:178:13 | d |  |
-| test.rs:179:9:179:9 | PathExpr | test.rs:177:61:180:5 | BlockExpr |  |
+| test.rs:178:22:178:22 | b | test.rs:178:13:178:13 | d | false |
+| test.rs:178:22:178:22 | b | test.rs:178:27:178:27 | c | true |
+| test.rs:178:27:178:27 | c | test.rs:178:13:178:13 | d |  |
+| test.rs:179:9:179:9 | d | test.rs:177:61:180:5 | BlockExpr |  |
 | test.rs:182:5:185:5 | enter test_or_operator | test.rs:183:9:183:28 | LetStmt |  |
 | test.rs:182:5:185:5 | exit test_or_operator (normal) | test.rs:182:5:185:5 | exit test_or_operator |  |
 | test.rs:182:60:185:5 | BlockExpr | test.rs:182:5:185:5 | exit test_or_operator (normal) |  |
 | test.rs:183:9:183:28 | LetStmt | test.rs:183:17:183:27 | ... \|\| ... |  |
-| test.rs:183:13:183:13 | d | test.rs:184:9:184:9 | PathExpr | match, no-match |
-| test.rs:183:17:183:17 | PathExpr | test.rs:183:13:183:13 | d | true |
-| test.rs:183:17:183:17 | PathExpr | test.rs:183:22:183:22 | PathExpr | false |
-| test.rs:183:17:183:22 | ... \|\| ... | test.rs:183:17:183:17 | PathExpr |  |
+| test.rs:183:13:183:13 | d | test.rs:184:9:184:9 | d | match, no-match |
+| test.rs:183:17:183:17 | a | test.rs:183:13:183:13 | d | true |
+| test.rs:183:17:183:17 | a | test.rs:183:22:183:22 | b | false |
+| test.rs:183:17:183:22 | ... \|\| ... | test.rs:183:17:183:17 | a |  |
 | test.rs:183:17:183:27 | ... \|\| ... | test.rs:183:17:183:22 | ... \|\| ... |  |
-| test.rs:183:22:183:22 | PathExpr | test.rs:183:13:183:13 | d | true |
-| test.rs:183:22:183:22 | PathExpr | test.rs:183:27:183:27 | PathExpr | false |
-| test.rs:183:27:183:27 | PathExpr | test.rs:183:13:183:13 | d |  |
-| test.rs:184:9:184:9 | PathExpr | test.rs:182:60:185:5 | BlockExpr |  |
+| test.rs:183:22:183:22 | b | test.rs:183:13:183:13 | d | true |
+| test.rs:183:22:183:22 | b | test.rs:183:27:183:27 | c | false |
+| test.rs:183:27:183:27 | c | test.rs:183:13:183:13 | d |  |
+| test.rs:184:9:184:9 | d | test.rs:182:60:185:5 | BlockExpr |  |
 | test.rs:187:5:190:5 | enter test_or_operator_2 | test.rs:188:9:188:36 | LetStmt |  |
 | test.rs:187:5:190:5 | exit test_or_operator_2 (normal) | test.rs:187:5:190:5 | exit test_or_operator_2 |  |
 | test.rs:187:61:190:5 | BlockExpr | test.rs:187:5:190:5 | exit test_or_operator_2 (normal) |  |
 | test.rs:188:9:188:36 | LetStmt | test.rs:188:17:188:35 | ... \|\| ... |  |
-| test.rs:188:13:188:13 | d | test.rs:189:9:189:9 | PathExpr | match, no-match |
-| test.rs:188:17:188:17 | PathExpr | test.rs:188:13:188:13 | d | true |
-| test.rs:188:17:188:17 | PathExpr | test.rs:188:23:188:23 | PathExpr | false |
-| test.rs:188:17:188:30 | ... \|\| ... | test.rs:188:17:188:17 | PathExpr |  |
+| test.rs:188:13:188:13 | d | test.rs:189:9:189:9 | d | match, no-match |
+| test.rs:188:17:188:17 | a | test.rs:188:13:188:13 | d | true |
+| test.rs:188:17:188:17 | a | test.rs:188:23:188:23 | b | false |
+| test.rs:188:17:188:30 | ... \|\| ... | test.rs:188:17:188:17 | a |  |
 | test.rs:188:17:188:35 | ... \|\| ... | test.rs:188:17:188:30 | ... \|\| ... |  |
 | test.rs:188:22:188:30 | ParenExpr | test.rs:188:13:188:13 | d | true |
-| test.rs:188:22:188:30 | ParenExpr | test.rs:188:35:188:35 | PathExpr | false |
-| test.rs:188:23:188:23 | PathExpr | test.rs:188:28:188:29 | 28 |  |
+| test.rs:188:22:188:30 | ParenExpr | test.rs:188:35:188:35 | c | false |
+| test.rs:188:23:188:23 | b | test.rs:188:28:188:29 | 28 |  |
 | test.rs:188:23:188:29 | ... == ... | test.rs:188:22:188:30 | ParenExpr |  |
 | test.rs:188:28:188:29 | 28 | test.rs:188:23:188:29 | ... == ... |  |
-| test.rs:188:35:188:35 | PathExpr | test.rs:188:13:188:13 | d |  |
-| test.rs:189:9:189:9 | PathExpr | test.rs:187:61:190:5 | BlockExpr |  |
+| test.rs:188:35:188:35 | c | test.rs:188:13:188:13 | d |  |
+| test.rs:189:9:189:9 | d | test.rs:187:61:190:5 | BlockExpr |  |
 | test.rs:192:5:195:5 | enter test_not_operator | test.rs:193:9:193:19 | LetStmt |  |
 | test.rs:192:5:195:5 | exit test_not_operator (normal) | test.rs:192:5:195:5 | exit test_not_operator |  |
 | test.rs:192:43:195:5 | BlockExpr | test.rs:192:5:195:5 | exit test_not_operator (normal) |  |
-| test.rs:193:9:193:19 | LetStmt | test.rs:193:18:193:18 | PathExpr |  |
-| test.rs:193:13:193:13 | d | test.rs:194:9:194:9 | PathExpr | match, no-match |
+| test.rs:193:9:193:19 | LetStmt | test.rs:193:18:193:18 | a |  |
+| test.rs:193:13:193:13 | d | test.rs:194:9:194:9 | d | match, no-match |
 | test.rs:193:17:193:18 | ! ... | test.rs:193:13:193:13 | d |  |
-| test.rs:193:18:193:18 | PathExpr | test.rs:193:17:193:18 | ! ... |  |
-| test.rs:194:9:194:9 | PathExpr | test.rs:192:43:195:5 | BlockExpr |  |
+| test.rs:193:18:193:18 | a | test.rs:193:17:193:18 | ! ... |  |
+| test.rs:194:9:194:9 | d | test.rs:192:43:195:5 | BlockExpr |  |
 | test.rs:197:5:203:5 | enter test_if_and_operator | test.rs:198:12:198:22 | ... && ... |  |
 | test.rs:197:5:203:5 | exit test_if_and_operator (normal) | test.rs:197:5:203:5 | exit test_if_and_operator |  |
 | test.rs:197:63:203:5 | BlockExpr | test.rs:197:5:203:5 | exit test_if_and_operator (normal) |  |
 | test.rs:198:9:202:9 | IfExpr | test.rs:197:63:203:5 | BlockExpr |  |
-| test.rs:198:12:198:12 | PathExpr | test.rs:198:17:198:17 | PathExpr | true |
-| test.rs:198:12:198:12 | PathExpr | test.rs:201:13:201:17 | false | false |
-| test.rs:198:12:198:17 | ... && ... | test.rs:198:12:198:12 | PathExpr |  |
+| test.rs:198:12:198:12 | a | test.rs:198:17:198:17 | b | true |
+| test.rs:198:12:198:12 | a | test.rs:201:13:201:17 | false | false |
+| test.rs:198:12:198:17 | ... && ... | test.rs:198:12:198:12 | a |  |
 | test.rs:198:12:198:22 | ... && ... | test.rs:198:12:198:17 | ... && ... |  |
-| test.rs:198:17:198:17 | PathExpr | test.rs:198:22:198:22 | PathExpr | true |
-| test.rs:198:17:198:17 | PathExpr | test.rs:201:13:201:17 | false | false |
-| test.rs:198:22:198:22 | PathExpr | test.rs:199:13:199:16 | true | true |
-| test.rs:198:22:198:22 | PathExpr | test.rs:201:13:201:17 | false | false |
+| test.rs:198:17:198:17 | b | test.rs:198:22:198:22 | c | true |
+| test.rs:198:17:198:17 | b | test.rs:201:13:201:17 | false | false |
+| test.rs:198:22:198:22 | c | test.rs:199:13:199:16 | true | true |
+| test.rs:198:22:198:22 | c | test.rs:201:13:201:17 | false | false |
 | test.rs:198:24:200:9 | BlockExpr | test.rs:198:9:202:9 | IfExpr |  |
 | test.rs:199:13:199:16 | true | test.rs:198:24:200:9 | BlockExpr |  |
 | test.rs:200:16:202:9 | BlockExpr | test.rs:198:9:202:9 | IfExpr |  |
@@ -354,41 +354,41 @@
 | test.rs:205:5:211:5 | exit test_if_or_operator (normal) | test.rs:205:5:211:5 | exit test_if_or_operator |  |
 | test.rs:205:62:211:5 | BlockExpr | test.rs:205:5:211:5 | exit test_if_or_operator (normal) |  |
 | test.rs:206:9:210:9 | IfExpr | test.rs:205:62:211:5 | BlockExpr |  |
-| test.rs:206:12:206:12 | PathExpr | test.rs:206:17:206:17 | PathExpr | false |
-| test.rs:206:12:206:12 | PathExpr | test.rs:207:13:207:16 | true | true |
-| test.rs:206:12:206:17 | ... \|\| ... | test.rs:206:12:206:12 | PathExpr |  |
+| test.rs:206:12:206:12 | a | test.rs:206:17:206:17 | b | false |
+| test.rs:206:12:206:12 | a | test.rs:207:13:207:16 | true | true |
+| test.rs:206:12:206:17 | ... \|\| ... | test.rs:206:12:206:12 | a |  |
 | test.rs:206:12:206:22 | ... \|\| ... | test.rs:206:12:206:17 | ... \|\| ... |  |
-| test.rs:206:17:206:17 | PathExpr | test.rs:206:22:206:22 | PathExpr | false |
-| test.rs:206:17:206:17 | PathExpr | test.rs:207:13:207:16 | true | true |
-| test.rs:206:22:206:22 | PathExpr | test.rs:207:13:207:16 | true | true |
-| test.rs:206:22:206:22 | PathExpr | test.rs:209:13:209:17 | false | false |
+| test.rs:206:17:206:17 | b | test.rs:206:22:206:22 | c | false |
+| test.rs:206:17:206:17 | b | test.rs:207:13:207:16 | true | true |
+| test.rs:206:22:206:22 | c | test.rs:207:13:207:16 | true | true |
+| test.rs:206:22:206:22 | c | test.rs:209:13:209:17 | false | false |
 | test.rs:206:24:208:9 | BlockExpr | test.rs:206:9:210:9 | IfExpr |  |
 | test.rs:207:13:207:16 | true | test.rs:206:24:208:9 | BlockExpr |  |
 | test.rs:208:16:210:9 | BlockExpr | test.rs:206:9:210:9 | IfExpr |  |
 | test.rs:209:13:209:17 | false | test.rs:208:16:210:9 | BlockExpr |  |
-| test.rs:213:5:219:5 | enter test_if_not_operator | test.rs:214:13:214:13 | PathExpr |  |
+| test.rs:213:5:219:5 | enter test_if_not_operator | test.rs:214:13:214:13 | a |  |
 | test.rs:213:5:219:5 | exit test_if_not_operator (normal) | test.rs:213:5:219:5 | exit test_if_not_operator |  |
 | test.rs:213:46:219:5 | BlockExpr | test.rs:213:5:219:5 | exit test_if_not_operator (normal) |  |
 | test.rs:214:9:218:9 | IfExpr | test.rs:213:46:219:5 | BlockExpr |  |
 | test.rs:214:12:214:13 | ! ... | test.rs:215:13:215:16 | true | true |
 | test.rs:214:12:214:13 | ! ... | test.rs:217:13:217:17 | false | false |
-| test.rs:214:13:214:13 | PathExpr | test.rs:214:12:214:13 | ! ... | false, true |
+| test.rs:214:13:214:13 | a | test.rs:214:12:214:13 | ! ... | false, true |
 | test.rs:214:15:216:9 | BlockExpr | test.rs:214:9:218:9 | IfExpr |  |
 | test.rs:215:13:215:16 | true | test.rs:214:15:216:9 | BlockExpr |  |
 | test.rs:216:16:218:9 | BlockExpr | test.rs:214:9:218:9 | IfExpr |  |
 | test.rs:217:13:217:17 | false | test.rs:216:16:218:9 | BlockExpr |  |
-| test.rs:222:1:228:1 | enter test_match | test.rs:223:11:223:21 | PathExpr |  |
+| test.rs:222:1:228:1 | enter test_match | test.rs:223:11:223:21 | maybe_digit |  |
 | test.rs:222:1:228:1 | exit test_match (normal) | test.rs:222:1:228:1 | exit test_match |  |
 | test.rs:222:48:228:1 | BlockExpr | test.rs:222:1:228:1 | exit test_match (normal) |  |
 | test.rs:223:5:227:5 | MatchExpr | test.rs:222:48:228:1 | BlockExpr |  |
-| test.rs:223:11:223:21 | PathExpr | test.rs:224:9:224:23 | TupleStructPat |  |
-| test.rs:224:9:224:23 | TupleStructPat | test.rs:224:28:224:28 | PathExpr | match |
+| test.rs:223:11:223:21 | maybe_digit | test.rs:224:9:224:23 | TupleStructPat |  |
+| test.rs:224:9:224:23 | TupleStructPat | test.rs:224:28:224:28 | x | match |
 | test.rs:224:9:224:23 | TupleStructPat | test.rs:225:9:225:23 | TupleStructPat | no-match |
-| test.rs:224:28:224:28 | PathExpr | test.rs:224:32:224:33 | 10 |  |
+| test.rs:224:28:224:28 | x | test.rs:224:32:224:33 | 10 |  |
 | test.rs:224:32:224:33 | 10 | test.rs:224:28:224:33 | ... < ... |  |
-| test.rs:225:9:225:23 | TupleStructPat | test.rs:225:28:225:28 | PathExpr | match |
+| test.rs:225:9:225:23 | TupleStructPat | test.rs:225:28:225:28 | x | match |
 | test.rs:225:9:225:23 | TupleStructPat | test.rs:226:9:226:20 | PathPat | no-match |
-| test.rs:225:28:225:28 | PathExpr | test.rs:223:5:227:5 | MatchExpr |  |
+| test.rs:225:28:225:28 | x | test.rs:223:5:227:5 | MatchExpr |  |
 | test.rs:226:9:226:20 | PathPat | test.rs:226:25:226:25 | 5 | match |
 | test.rs:226:25:226:25 | 5 | test.rs:223:5:227:5 | MatchExpr |  |
 | test.rs:231:5:236:5 | enter test_infinite_loop | test.rs:232:9:234:9 | ExprStmt |  |
@@ -398,12 +398,12 @@
 | test.rs:238:5:241:5 | enter test_let_match | test.rs:239:9:239:49 | LetStmt |  |
 | test.rs:238:5:241:5 | exit test_let_match (normal) | test.rs:238:5:241:5 | exit test_let_match |  |
 | test.rs:238:39:241:5 | BlockExpr | test.rs:238:5:241:5 | exit test_let_match (normal) |  |
-| test.rs:239:9:239:49 | LetStmt | test.rs:239:23:239:23 | PathExpr |  |
+| test.rs:239:9:239:49 | LetStmt | test.rs:239:23:239:23 | a |  |
 | test.rs:239:13:239:19 | TupleStructPat | test.rs:239:32:239:46 | "Expected some" | no-match |
-| test.rs:239:13:239:19 | TupleStructPat | test.rs:240:9:240:9 | PathExpr | match |
-| test.rs:239:23:239:23 | PathExpr | test.rs:239:13:239:19 | TupleStructPat |  |
+| test.rs:239:13:239:19 | TupleStructPat | test.rs:240:9:240:9 | n | match |
+| test.rs:239:23:239:23 | a | test.rs:239:13:239:19 | TupleStructPat |  |
 | test.rs:239:32:239:46 | "Expected some" | test.rs:239:30:239:48 | BlockExpr |  |
-| test.rs:240:9:240:9 | PathExpr | test.rs:238:39:241:5 | BlockExpr |  |
+| test.rs:240:9:240:9 | n | test.rs:238:39:241:5 | BlockExpr |  |
 | test.rs:244:1:249:1 | enter dead_code | test.rs:245:5:247:5 | ExprStmt |  |
 | test.rs:244:1:249:1 | exit dead_code (normal) | test.rs:244:1:249:1 | exit dead_code |  |
 | test.rs:245:5:247:5 | ExprStmt | test.rs:245:9:245:12 | true |  |
diff --git a/rust/ql/test/library-tests/variables/CONSISTENCY/CfgConsistency.expected b/rust/ql/test/library-tests/variables/CONSISTENCY/CfgConsistency.expected
new file mode 100644
index 000000000000..56ae06526e76
--- /dev/null
+++ b/rust/ql/test/library-tests/variables/CONSISTENCY/CfgConsistency.expected
@@ -0,0 +1,5 @@
+deadEnd
+| variables.rs:2:5:2:22 | ExprStmt |
+| variables.rs:6:5:6:22 | ExprStmt |
+| variables.rs:200:16:200:21 | ... > ... |
+| variables.rs:295:5:295:42 | LetStmt |
diff --git a/rust/ql/test/library-tests/variables/variables.expected b/rust/ql/test/library-tests/variables/variables.expected
new file mode 100644
index 000000000000..18ee16a3da9c
--- /dev/null
+++ b/rust/ql/test/library-tests/variables/variables.expected
@@ -0,0 +1,144 @@
+testFailures
+failures
+variable
+| variables.rs:1:14:1:14 | s |
+| variables.rs:5:14:5:14 | i |
+| variables.rs:10:9:10:10 | x1 |
+| variables.rs:15:13:15:14 | x2 |
+| variables.rs:22:9:22:10 | x3 |
+| variables.rs:24:9:24:10 | x3 |
+| variables.rs:30:9:30:10 | x4 |
+| variables.rs:33:13:33:14 | x4 |
+| variables.rs:47:13:47:14 | a1 |
+| variables.rs:48:13:48:14 | b1 |
+| variables.rs:51:13:51:13 | x |
+| variables.rs:52:13:52:13 | y |
+| variables.rs:62:9:62:10 | p1 |
+| variables.rs:64:12:64:13 | a2 |
+| variables.rs:65:12:65:13 | b2 |
+| variables.rs:72:9:72:10 | s1 |
+| variables.rs:74:21:74:22 | s2 |
+| variables.rs:81:14:81:15 | x5 |
+| variables.rs:89:9:89:10 | x6 |
+| variables.rs:90:9:90:10 | y1 |
+| variables.rs:94:14:94:15 | y1 |
+| variables.rs:99:9:99:12 | None |
+| variables.rs:106:9:106:15 | numbers |
+| variables.rs:110:13:110:17 | first |
+| variables.rs:111:13:111:17 | third |
+| variables.rs:112:13:112:17 | fifth |
+| variables.rs:122:13:122:17 | first |
+| variables.rs:124:13:124:16 | last |
+| variables.rs:133:9:133:10 | p2 |
+| variables.rs:137:16:137:17 | x7 |
+| variables.rs:147:9:147:11 | msg |
+| variables.rs:151:17:151:27 | id_variable |
+| variables.rs:156:26:156:27 | id |
+| variables.rs:167:9:167:14 | either |
+| variables.rs:169:9:169:44 | a3 |
+| variables.rs:181:9:181:10 | tv |
+| variables.rs:183:9:183:81 | a4 |
+| variables.rs:187:9:187:83 | a5 |
+| variables.rs:191:9:191:83 | a6 |
+| variables.rs:197:9:197:14 | either |
+| variables.rs:199:9:199:44 | a7 |
+| variables.rs:207:9:207:14 | either |
+| variables.rs:210:13:210:13 | e |
+| variables.rs:211:14:211:51 | a11 |
+| variables.rs:214:33:214:35 | a12 |
+| variables.rs:224:5:224:6 | a8 |
+| variables.rs:226:9:226:10 | b3 |
+| variables.rs:227:9:227:10 | c1 |
+| variables.rs:235:6:235:41 | a9 |
+| variables.rs:242:13:242:15 | a10 |
+| variables.rs:243:13:243:14 | b4 |
+| variables.rs:244:13:244:14 | c2 |
+| variables.rs:265:13:265:15 | a10 |
+| variables.rs:266:13:266:14 | b4 |
+| variables.rs:278:9:278:23 | example_closure |
+| variables.rs:279:10:279:10 | x |
+| variables.rs:281:9:281:10 | n1 |
+| variables.rs:286:9:286:26 | immutable_variable |
+| variables.rs:287:10:287:10 | x |
+| variables.rs:289:9:289:10 | n2 |
+| variables.rs:295:9:295:9 | v |
+| variables.rs:297:9:297:12 | text |
+variableAccess
+| variables.rs:11:15:11:16 | x1 | variables.rs:10:9:10:10 | x1 |
+| variables.rs:16:15:16:16 | x2 | variables.rs:15:13:15:14 | x2 |
+| variables.rs:17:5:17:6 | x2 | variables.rs:15:13:15:14 | x2 |
+| variables.rs:18:15:18:16 | x2 | variables.rs:15:13:15:14 | x2 |
+| variables.rs:23:15:23:16 | x3 | variables.rs:22:9:22:10 | x3 |
+| variables.rs:25:9:25:10 | x3 | variables.rs:22:9:22:10 | x3 |
+| variables.rs:26:15:26:16 | x3 | variables.rs:24:9:24:10 | x3 |
+| variables.rs:31:15:31:16 | x4 | variables.rs:30:9:30:10 | x4 |
+| variables.rs:34:19:34:20 | x4 | variables.rs:33:13:33:14 | x4 |
+| variables.rs:36:15:36:16 | x4 | variables.rs:30:9:30:10 | x4 |
+| variables.rs:55:15:55:16 | a1 | variables.rs:47:13:47:14 | a1 |
+| variables.rs:56:15:56:16 | b1 | variables.rs:48:13:48:14 | b1 |
+| variables.rs:57:15:57:15 | x | variables.rs:51:13:51:13 | x |
+| variables.rs:58:15:58:15 | y | variables.rs:52:13:52:13 | y |
+| variables.rs:66:9:66:10 | p1 | variables.rs:62:9:62:10 | p1 |
+| variables.rs:67:15:67:16 | a2 | variables.rs:64:12:64:13 | a2 |
+| variables.rs:68:15:68:16 | b2 | variables.rs:65:12:65:13 | b2 |
+| variables.rs:75:11:75:12 | s1 | variables.rs:72:9:72:10 | s1 |
+| variables.rs:76:19:76:20 | s2 | variables.rs:74:21:74:22 | s2 |
+| variables.rs:85:15:85:16 | x5 | variables.rs:81:14:81:15 | x5 |
+| variables.rs:92:11:92:12 | x6 | variables.rs:89:9:89:10 | x6 |
+| variables.rs:97:23:97:24 | y1 | variables.rs:94:14:94:15 | y1 |
+| variables.rs:102:15:102:16 | y1 | variables.rs:90:9:90:10 | y1 |
+| variables.rs:108:11:108:17 | numbers | variables.rs:106:9:106:15 | numbers |
+| variables.rs:114:23:114:27 | first | variables.rs:110:13:110:17 | first |
+| variables.rs:115:23:115:27 | third | variables.rs:111:13:111:17 | third |
+| variables.rs:116:23:116:27 | fifth | variables.rs:112:13:112:17 | fifth |
+| variables.rs:120:11:120:17 | numbers | variables.rs:106:9:106:15 | numbers |
+| variables.rs:126:23:126:27 | first | variables.rs:122:13:122:17 | first |
+| variables.rs:127:23:127:26 | last | variables.rs:124:13:124:16 | last |
+| variables.rs:135:11:135:12 | p2 | variables.rs:133:9:133:10 | p2 |
+| variables.rs:138:24:138:25 | x7 | variables.rs:137:16:137:17 | x7 |
+| variables.rs:149:11:149:13 | msg | variables.rs:147:9:147:11 | msg |
+| variables.rs:152:24:152:34 | id_variable | variables.rs:151:17:151:27 | id_variable |
+| variables.rs:157:23:157:24 | id | variables.rs:156:26:156:27 | id |
+| variables.rs:168:11:168:16 | either | variables.rs:167:9:167:14 | either |
+| variables.rs:170:26:170:27 | a3 | variables.rs:169:9:169:44 | a3 |
+| variables.rs:182:11:182:12 | tv | variables.rs:181:9:181:10 | tv |
+| variables.rs:184:26:184:27 | a4 | variables.rs:183:9:183:81 | a4 |
+| variables.rs:186:11:186:12 | tv | variables.rs:181:9:181:10 | tv |
+| variables.rs:188:26:188:27 | a5 | variables.rs:187:9:187:83 | a5 |
+| variables.rs:190:11:190:12 | tv | variables.rs:181:9:181:10 | tv |
+| variables.rs:192:26:192:27 | a6 | variables.rs:191:9:191:83 | a6 |
+| variables.rs:198:11:198:16 | either | variables.rs:197:9:197:14 | either |
+| variables.rs:200:16:200:17 | a7 | variables.rs:199:9:199:44 | a7 |
+| variables.rs:201:26:201:27 | a7 | variables.rs:199:9:199:44 | a7 |
+| variables.rs:209:11:209:16 | either | variables.rs:207:9:207:14 | either |
+| variables.rs:213:23:213:25 | a11 | variables.rs:211:14:211:51 | a11 |
+| variables.rs:215:15:215:15 | e | variables.rs:210:13:210:13 | e |
+| variables.rs:216:28:216:30 | a12 | variables.rs:214:33:214:35 | a12 |
+| variables.rs:229:15:229:16 | a8 | variables.rs:224:5:224:6 | a8 |
+| variables.rs:230:15:230:16 | b3 | variables.rs:226:9:226:10 | b3 |
+| variables.rs:231:15:231:16 | c1 | variables.rs:227:9:227:10 | c1 |
+| variables.rs:237:15:237:16 | a9 | variables.rs:235:6:235:41 | a9 |
+| variables.rs:246:15:246:17 | a10 | variables.rs:242:13:242:15 | a10 |
+| variables.rs:247:15:247:16 | b4 | variables.rs:243:13:243:14 | b4 |
+| variables.rs:248:15:248:16 | c2 | variables.rs:244:13:244:14 | c2 |
+| variables.rs:251:9:251:10 | c2 | variables.rs:244:13:244:14 | c2 |
+| variables.rs:252:9:252:10 | b4 | variables.rs:243:13:243:14 | b4 |
+| variables.rs:253:9:253:11 | a10 | variables.rs:242:13:242:15 | a10 |
+| variables.rs:255:9:255:11 | a10 | variables.rs:242:13:242:15 | a10 |
+| variables.rs:256:9:256:10 | b4 | variables.rs:243:13:243:14 | b4 |
+| variables.rs:257:9:257:10 | c2 | variables.rs:244:13:244:14 | c2 |
+| variables.rs:259:15:259:17 | a10 | variables.rs:242:13:242:15 | a10 |
+| variables.rs:260:15:260:16 | b4 | variables.rs:243:13:243:14 | b4 |
+| variables.rs:261:15:261:16 | c2 | variables.rs:244:13:244:14 | c2 |
+| variables.rs:268:23:268:25 | a10 | variables.rs:265:13:265:15 | a10 |
+| variables.rs:269:23:269:24 | b4 | variables.rs:266:13:266:14 | b4 |
+| variables.rs:273:15:273:17 | a10 | variables.rs:242:13:242:15 | a10 |
+| variables.rs:274:15:274:16 | b4 | variables.rs:243:13:243:14 | b4 |
+| variables.rs:280:9:280:9 | x | variables.rs:279:10:279:10 | x |
+| variables.rs:282:9:282:23 | example_closure | variables.rs:278:9:278:23 | example_closure |
+| variables.rs:283:15:283:16 | n1 | variables.rs:281:9:281:10 | n1 |
+| variables.rs:288:9:288:9 | x | variables.rs:287:10:287:10 | x |
+| variables.rs:290:9:290:26 | immutable_variable | variables.rs:286:9:286:26 | immutable_variable |
+| variables.rs:291:15:291:16 | n2 | variables.rs:289:9:289:10 | n2 |
+| variables.rs:298:12:298:12 | v | variables.rs:295:9:295:9 | v |
+| variables.rs:299:19:299:22 | text | variables.rs:297:9:297:12 | text |
diff --git a/rust/ql/test/library-tests/variables/variables.ql b/rust/ql/test/library-tests/variables/variables.ql
new file mode 100644
index 000000000000..b96f6ceabcae
--- /dev/null
+++ b/rust/ql/test/library-tests/variables/variables.ql
@@ -0,0 +1,41 @@
+import rust
+import utils.InlineExpectationsTest
+
+query predicate variable(Variable v) { any() }
+
+query predicate variableAccess(VariableAccess va, Variable v) { v = va.getVariable() }
+
+module VariableAccessTest implements TestSig {
+  string getARelevantTag() { result = "access" }
+
+  private predicate declAt(Variable v, string filepath, int line) {
+    v.getLocation().hasLocationInfo(filepath, _, _, line, _)
+  }
+
+  private predicate commmentAt(string text, string filepath, int line) {
+    exists(Comment c |
+      c.getLocation().hasLocationInfo(filepath, line, _, _, _) and
+      c.getCommentText() = text
+    )
+  }
+
+  private predicate decl(Variable v, string value) {
+    exists(string filepath, int line | declAt(v, filepath, line) |
+      commmentAt(value, filepath, line)
+      or
+      not commmentAt(_, filepath, line) and
+      value = v.getName()
+    )
+  }
+
+  predicate hasActualResult(Location location, string element, string tag, string value) {
+    exists(VariableAccess va |
+      location = va.getLocation() and
+      element = va.toString() and
+      tag = "access" and
+      decl(va.getVariable(), value)
+    )
+  }
+}
+
+import MakeTest<VariableAccessTest>
diff --git a/rust/ql/test/library-tests/variables/variables.rs b/rust/ql/test/library-tests/variables/variables.rs
new file mode 100644
index 000000000000..f9d3e89938c3
--- /dev/null
+++ b/rust/ql/test/library-tests/variables/variables.rs
@@ -0,0 +1,325 @@
+fn print_str(s: &str) {
+    println!("{}", s);
+}
+
+fn print_i64(i: i64) {
+    println!("{}", i);
+}
+
+fn immutable_variable() {
+    let x1 = "a"; // x1
+    print_str(x1); // $ access=x1
+}
+
+fn mutable_variable() {
+    let mut x2 = 4; // x2
+    print_i64(x2); // $ access=x2
+    x2 = 5; // $ access=x2
+    print_i64(x2); // $ access=x2
+}
+
+fn variable_shadow1() {
+    let x3 = 1; // x3_1
+    print_i64(x3); // $ access=x3_1
+    let x3 = // x3_2
+        x3 + 1; // $ access=x3_1
+    print_i64(x3); // $ access=x3_2
+}
+
+fn variable_shadow2() {
+    let x4 = "a"; // x4_1
+    print_str(x4); // $ access=x4_1
+    {
+        let x4 = "b"; // x4_2
+        print_str(x4); // $ access=x4_2
+    }
+    print_str(x4); // $ access=x4_1
+}
+
+struct Point<'a> {
+    x: &'a str,
+    y: &'a str,
+}
+
+fn let_pattern1() {
+    let (
+        (
+            a1, // a1
+            b1, // b1
+        ),
+        Point {
+            x, // x
+            y, // y
+        },
+    ) = (("a", "b"), Point { x: "x", y: "y" });
+    print_str(a1); // $ access=a1
+    print_str(b1); // $ access=b1
+    print_str(x); // $ access=x
+    print_str(y); // $ access=y
+}
+
+fn let_pattern2() {
+    let p1 = Point { x: "a", y: "b" }; // p1
+    let Point {
+        x: a2, // a2
+        y: b2, // b2
+    } = p1; // $ access=p1
+    print_str(a2); // $ access=a2
+    print_str(b2); // $ access=b2
+}
+
+fn let_pattern3() {
+    let s1 = Some(String::from("Hello!")); // s1
+
+    if let Some(ref s2) // s2
+        = s1 { // $ access=s1
+        print_str(s2); // $ access=s2
+    }
+}
+
+fn let_pattern4() {
+    let Some(x5): Option<&str> = Some("x5") else {
+        // x5
+        todo!()
+    };
+    print_str(x5); // $ access=x5
+}
+
+fn match_pattern1() {
+    let x6 = Some(5); // x6
+    let y1 = 10; // y1_1
+
+    match x6 { // $ access=x6
+        Some(50) => print_str("Got 50"),
+        Some(y1) // y1_2
+        =>
+        {
+            print_i64(y1)// $ access=y1_2
+        } 
+        None => print_str("NONE"),
+    }
+
+    print_i64(y1); // $ access=y1_1
+}
+
+fn match_pattern2() {
+    let numbers = (2, 4, 8, 16, 32); // numbers
+
+    match numbers { // $ access=numbers
+        (
+            first, _, // first
+            third, _, // third
+            fifth // fifth
+        ) => {
+            print_i64(first); // $ access=first
+            print_i64(third); // $ access=third
+            print_i64(fifth); // $ access=fifth
+        }
+    }
+
+    match numbers { // $ access=numbers
+        (
+            first, // first
+            ..,
+            last // last
+        ) => {
+            print_i64(first); // $ access=first
+            print_i64(last); // $ access=last
+        }
+    }
+}
+
+fn match_pattern3() {
+    let p2 = Point { x: "x", y: "y" }; // p2
+
+    match p2 { // $ access=p2
+        Point {
+            x: x7, .. // x7
+        } => print_str(x7), // $ access=x7
+    }
+}
+
+enum Message {
+    Hello { id: i64 },
+}
+
+fn match_pattern4() {
+    let msg = Message::Hello { id: 0 }; // msg
+
+    match msg { // $ access=msg
+        Message::Hello {
+            id: id_variable @ 3..=7, // id_variable
+        } => print_i64(id_variable), // $ access=id_variable
+        Message::Hello { id: 10..=12 } => {
+            println!("Found an id in another range")
+        }
+        Message::Hello { id } => // id
+            print_i64(id), // $ access=id
+    }
+}
+
+enum Either {
+    Left(i64),
+    Right(i64),
+}
+
+fn match_pattern5() {
+    let either = Either::Left(32); // either
+    match either { // $ access=either
+        Either::Left(a3) | Either::Right(a3) // a3
+            => print_i64(a3), // $ access=a3
+    }
+}
+
+enum ThreeValued {
+    First(i64),
+    Second(i64),
+    Third(i64),
+}
+
+fn match_pattern6() {
+    let tv = ThreeValued::Second(62); // tv
+    match tv { // $ access=tv
+        ThreeValued::First(a4) | ThreeValued::Second(a4) | ThreeValued::Third(a4) // a4
+            => print_i64(a4), // $ access=a4
+    }
+    match tv { // $ access=tv
+        (ThreeValued::First(a5) | ThreeValued::Second(a5)) | ThreeValued::Third(a5) // a5
+            => print_i64(a5), // $ access=a5
+    }
+    match tv { // $ access=tv
+        ThreeValued::First(a6) | (ThreeValued::Second(a6) | ThreeValued::Third(a6)) // a6
+            => print_i64(a6), // $ access=a6
+    }
+}
+
+fn match_pattern7() {
+    let either = Either::Left(32); // either
+    match either { // $ access=either
+        Either::Left(a7) | Either::Right(a7) // a7
+            if a7 > 0 // $ access=a7
+            => print_i64(a7), // $ access=a7
+        _ => (),
+    }
+}
+
+fn match_pattern8() {
+    let either = Either::Left(32); // either
+
+    match either { // $ access=either
+        ref e @ // e
+            (Either::Left(a11) | Either::Right(a11)) // a11
+        => {
+            print_i64(a11); // $ access=a11
+            if let Either::Left(a12) // a12
+            = e { // $ access=e
+                print_i64(*a12); // $ access=a12
+            }
+        }
+        _ => (),
+    }
+}
+
+fn param_pattern1(
+    a8: &str, // a8
+    (
+        b3, // b3
+        c1, // c1
+    ): (&str, &str)) -> () {
+    print_str(a8); // $ access=a8
+    print_str(b3); // $ access=b3
+    print_str(c1); // $ access=c1
+}
+
+fn param_pattern2(
+    (Either::Left(a9) | Either::Right(a9)): Either // a9
+) -> () {
+    print_i64(a9); // $ access=a9
+}
+
+fn destruct_assignment() {
+    let (
+        mut a10, // a10
+        mut b4, // b4
+        mut c2 // c2
+    ) = (1, 2, 3);
+    print_i64(a10); // $ access=a10
+    print_i64(b4); // $ access=b4
+    print_i64(c2); // $ access=c2
+
+    (
+        c2, // $ access=c2
+        b4, // $ access=b4
+        a10 // $ access=a10
+    ) = (
+        a10, // $ access=a10
+        b4, // $ access=b4
+        c2 // $ access=c2
+    );
+    print_i64(a10); // $ access=a10
+    print_i64(b4); // $ access=b4
+    print_i64(c2); // $ access=c2
+
+    match (4, 5) {
+        (
+            a10, // a10_2
+            b4 // b4
+        ) => {
+            print_i64(a10); // $ access=a10_2
+            print_i64(b4); // $ access=b4
+        }
+    }
+
+    print_i64(a10); // $ access=a10
+    print_i64(b4); // $ access=b4
+}
+
+fn closure_variable() {
+    let example_closure = // example_closure
+        |x: i64| // x_1
+        x; // $ access=x_1
+    let n1 = // n1
+        example_closure(5); // $ access=example_closure
+    print_i64(n1); // $ access=n1
+
+    immutable_variable();
+    let immutable_variable =
+        |x: i64| // x_2
+        x; // $ access=x_2
+    let n2 = // n2
+        immutable_variable(6); // $ access=immutable_variable
+    print_i64(n2); // $ access=n2
+}
+
+fn for_variable() {
+    let v = &["apples", "cake", "coffee"]; // v
+
+    for text // text
+        in v { // $ access=v
+        print_str(text); // $ access=text
+    }
+}
+
+fn main() {
+    immutable_variable();
+    mutable_variable();
+    variable_shadow1();
+    variable_shadow2();
+    let_pattern1();
+    let_pattern2();
+    let_pattern3();
+    let_pattern4();
+    match_pattern1();
+    match_pattern2();
+    match_pattern3();
+    match_pattern4();
+    match_pattern5();
+    match_pattern6();
+    match_pattern7();
+    match_pattern8();
+    param_pattern1("a", ("b", "c"));
+    param_pattern2(Either::Left(45));
+    destruct_assignment();
+    closure_variable();
+    for_variable();
+}

From e0a3c8a1c4e3abd0eebf2dabc08c4e78a1117734 Mon Sep 17 00:00:00 2001
From: Rasmus Lerchedahl Petersen <yoff@github.com>
Date: Tue, 1 Oct 2024 10:12:39 +0200
Subject: [PATCH 071/347] Python: add change note

---
 .../ql/lib/change-notes/2024-10-01-comprehension-flow.md   | 7 +++++++
 1 file changed, 7 insertions(+)
 create mode 100644 python/ql/lib/change-notes/2024-10-01-comprehension-flow.md

diff --git a/python/ql/lib/change-notes/2024-10-01-comprehension-flow.md b/python/ql/lib/change-notes/2024-10-01-comprehension-flow.md
new file mode 100644
index 000000000000..5981251970c4
--- /dev/null
+++ b/python/ql/lib/change-notes/2024-10-01-comprehension-flow.md
@@ -0,0 +1,7 @@
+```yaml
+---
+category: minorAnalysis
+---
+* More precise modelling of the dataflow through comprehensions. In particular, captured variables are now handled correctly.
+* Dataflow out of yield is added, allowing proper tracing through generators.
+```
\ No newline at end of file

From 60abea17e62bef99989fede63c15804217e3a9f3 Mon Sep 17 00:00:00 2001
From: Calum Grant <calumgrant@github.com>
Date: Mon, 16 Sep 2024 15:10:17 +0100
Subject: [PATCH 072/347] C++: Test for cpp/uninitialized-local

---
 .../semmle/tests/UninitializedLocal.expected      |  4 ++++
 .../Security/CWE/CWE-457/semmle/tests/errors.cpp  | 15 +++++++++++++++
 2 files changed, 19 insertions(+)
 create mode 100644 cpp/ql/test/query-tests/Security/CWE/CWE-457/semmle/tests/errors.cpp

diff --git a/cpp/ql/test/query-tests/Security/CWE/CWE-457/semmle/tests/UninitializedLocal.expected b/cpp/ql/test/query-tests/Security/CWE/CWE-457/semmle/tests/UninitializedLocal.expected
index a8b3c7782e7c..385105e6e19b 100644
--- a/cpp/ql/test/query-tests/Security/CWE/CWE-457/semmle/tests/UninitializedLocal.expected
+++ b/cpp/ql/test/query-tests/Security/CWE/CWE-457/semmle/tests/UninitializedLocal.expected
@@ -1,5 +1,7 @@
 edges
 nodes
+| errors.cpp:4:7:4:7 | definition of x | semmle.label | definition of x |
+| errors.cpp:13:7:13:7 | definition of x | semmle.label | definition of x |
 | test.cpp:11:6:11:8 | definition of foo | semmle.label | definition of foo |
 | test.cpp:111:6:111:8 | definition of foo | semmle.label | definition of foo |
 | test.cpp:226:7:226:7 | definition of x | semmle.label | definition of x |
@@ -14,6 +16,8 @@ nodes
 | test.cpp:472:6:472:6 | definition of x | semmle.label | definition of x |
 | test.cpp:479:6:479:6 | definition of x | semmle.label | definition of x |
 #select
+| errors.cpp:6:10:6:10 | x | errors.cpp:4:7:4:7 | definition of x | errors.cpp:4:7:4:7 | definition of x | The variable $@ may not be initialized at this access. | errors.cpp:4:7:4:7 | x | x |
+| errors.cpp:14:18:14:18 | x | errors.cpp:13:7:13:7 | definition of x | errors.cpp:13:7:13:7 | definition of x | The variable $@ may not be initialized at this access. | errors.cpp:13:7:13:7 | x | x |
 | test.cpp:12:6:12:8 | foo | test.cpp:11:6:11:8 | definition of foo | test.cpp:11:6:11:8 | definition of foo | The variable $@ may not be initialized at this access. | test.cpp:11:6:11:8 | foo | foo |
 | test.cpp:113:6:113:8 | foo | test.cpp:111:6:111:8 | definition of foo | test.cpp:111:6:111:8 | definition of foo | The variable $@ may not be initialized at this access. | test.cpp:111:6:111:8 | foo | foo |
 | test.cpp:227:3:227:3 | x | test.cpp:226:7:226:7 | definition of x | test.cpp:226:7:226:7 | definition of x | The variable $@ may not be initialized at this access. | test.cpp:226:7:226:7 | x | x |
diff --git a/cpp/ql/test/query-tests/Security/CWE/CWE-457/semmle/tests/errors.cpp b/cpp/ql/test/query-tests/Security/CWE/CWE-457/semmle/tests/errors.cpp
new file mode 100644
index 000000000000..07bb61f943ed
--- /dev/null
+++ b/cpp/ql/test/query-tests/Security/CWE/CWE-457/semmle/tests/errors.cpp
@@ -0,0 +1,15 @@
+// semmle-extractor-options: --expect_errors
+
+int f1() {
+  int x;
+  initialize(&x); // error expression - initialize() is not defined
+  return x;       // GOOD - assume x is initialized
+}
+
+void * operator new(unsigned long, bool);
+void operator delete(void*, bool);
+
+int f2() {
+  int x;
+  new(true) int (x);  // BAD, ignore implicit error expression
+}

From 62509a10c293d1fb9cbdf21837e6fe4e1e46b11c Mon Sep 17 00:00:00 2001
From: yoff <lerchedahl@gmail.com>
Date: Tue, 1 Oct 2024 11:39:12 +0200
Subject: [PATCH 073/347] Update
 python/ql/test/library-tests/dataflow/coverage/test_builtins.py

Co-authored-by: Rasmus Wriedt Larsen <rasmuswriedtlarsen@gmail.com>
---
 python/ql/test/library-tests/dataflow/coverage/test_builtins.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/python/ql/test/library-tests/dataflow/coverage/test_builtins.py b/python/ql/test/library-tests/dataflow/coverage/test_builtins.py
index 2de6adeb20bf..29afa9bfdb25 100644
--- a/python/ql/test/library-tests/dataflow/coverage/test_builtins.py
+++ b/python/ql/test/library-tests/dataflow/coverage/test_builtins.py
@@ -142,6 +142,7 @@ def test_dict_from_dict():
     SINK(d2["k"]) #$ flow="SOURCE, l:-2 -> d2['k']"
     SINK_F(d2["k1"])
 
+@expects(4)
 def test_dict_from_multiple_args():
     d = dict([("k", SOURCE), ("k1", NONSOURCE)], k2 = SOURCE, k3 = NONSOURCE)
     SINK(d["k"]) #$ MISSING: flow="SOURCE, l:-1 -> d['k']"

From d689db23d85433e6bd4814f210bd25151add8fbc Mon Sep 17 00:00:00 2001
From: Chris Smowton <chris@smowton.net>
Date: Tue, 1 Oct 2024 10:43:28 +0100
Subject: [PATCH 074/347] Warn on use of old option

---
 go/extractor/configurebaseline/configurebaseline.go | 3 ++-
 go/extractor/extractor.go                           | 6 +++++-
 go/extractor/util/extractvendordirs.go              | 7 ++++---
 3 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/go/extractor/configurebaseline/configurebaseline.go b/go/extractor/configurebaseline/configurebaseline.go
index f8e2c998f8c1..04037d61425e 100644
--- a/go/extractor/configurebaseline/configurebaseline.go
+++ b/go/extractor/configurebaseline/configurebaseline.go
@@ -28,7 +28,8 @@ type BaselineConfig struct {
 func GetConfigBaselineAsJSON(rootDir string) ([]byte, error) {
 	vendorDirs := make([]string, 0)
 
-	if util.IsVendorDirExtractionEnabled() {
+	extractVendorDirs, _ := util.IsVendorDirExtractionEnabled()
+	if extractVendorDirs {
 		// The user wants vendor directories scanned; emit an empty report.
 	} else {
 		filepath.WalkDir(rootDir, func(dirPath string, d fs.DirEntry, err error) error {
diff --git a/go/extractor/extractor.go b/go/extractor/extractor.go
index 69aeeddc2a47..b1d476d10948 100644
--- a/go/extractor/extractor.go
+++ b/go/extractor/extractor.go
@@ -83,7 +83,11 @@ func ExtractWithFlags(buildFlags []string, patterns []string, extractTests bool)
 
 	// If CODEQL_EXTRACTOR_GO_[OPTION_]EXTRACT_VENDOR_DIRS is "true", we extract `vendor` directories;
 	// otherwise (the default) is to exclude them from extraction
-	includeVendor := util.IsVendorDirExtractionEnabled()
+	includeVendor, oldOptionUsed := util.IsVendorDirExtractionEnabled()
+
+	if oldOptionUsed {
+		log.Println("Warning: obsolete option \"CODEQL_EXTRACTOR_GO_EXTRACT_VENDOR_DIRS\" was set. Use \"CODEQL_EXTRACTOR_GO_OPTION_EXTRACT_VENDOR_DIRS\" or pass `--extractor-option extract_vendor_dirs=true` instead.")
+	}
 
 	modeNotifications := make([]string, 0, 2)
 	if extractTests {
diff --git a/go/extractor/util/extractvendordirs.go b/go/extractor/util/extractvendordirs.go
index eadf5d24740e..adeb2461f892 100644
--- a/go/extractor/util/extractvendordirs.go
+++ b/go/extractor/util/extractvendordirs.go
@@ -4,7 +4,8 @@ import (
 	"os"
 )
 
-func IsVendorDirExtractionEnabled() bool {
-	return os.Getenv("CODEQL_EXTRACTOR_GO_EXTRACT_VENDOR_DIRS") == "true" ||
-		os.Getenv("CODEQL_EXTRACTOR_GO_OPTION_EXTRACT_VENDOR_DIRS") == "true"
+func IsVendorDirExtractionEnabled() (bool, bool) {
+	oldOptionVal := os.Getenv("CODEQL_EXTRACTOR_GO_EXTRACT_VENDOR_DIRS")
+	return (oldOptionVal == "true" ||
+		os.Getenv("CODEQL_EXTRACTOR_GO_OPTION_EXTRACT_VENDOR_DIRS") == "true"), oldOptionVal != ""
 }

From 2eac11edd604be61b40d392dd9a4a441be865e3b Mon Sep 17 00:00:00 2001
From: yoff <lerchedahl@gmail.com>
Date: Tue, 1 Oct 2024 11:47:42 +0200
Subject: [PATCH 075/347] Update
 python/ql/lib/change-notes/2024-09-24-std-lib-models.md

Co-authored-by: Rasmus Wriedt Larsen <rasmuswriedtlarsen@gmail.com>
---
 python/ql/lib/change-notes/2024-09-24-std-lib-models.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/python/ql/lib/change-notes/2024-09-24-std-lib-models.md b/python/ql/lib/change-notes/2024-09-24-std-lib-models.md
index 20b522576a30..3166e0c8ff0f 100644
--- a/python/ql/lib/change-notes/2024-09-24-std-lib-models.md
+++ b/python/ql/lib/change-notes/2024-09-24-std-lib-models.md
@@ -1,4 +1,4 @@
 ---
 category: minorAnalysis
 ---
-* Added several models of standard library functions and classes. This should make the analysis much more complete in cases where the standard library is not extracted.
\ No newline at end of file
+* Added several models of standard library functions and classes, in anticipation of no longer extracting the standard library in a future release.
\ No newline at end of file

From 4b5aa1497ba86cdfb652d7b6a0c1eb40a9ed322d Mon Sep 17 00:00:00 2001
From: Calum Grant <calumgrant@github.com>
Date: Tue, 1 Oct 2024 11:00:44 +0100
Subject: [PATCH 076/347] C++: Implement Function::hasErrors()

---
 cpp/ql/lib/semmle/code/cpp/Function.qll                   | 8 ++++++++
 cpp/ql/lib/semmle/code/cpp/exprs/Expr.qll                 | 7 +++++++
 .../Likely Bugs/Memory Management/UninitializedLocal.ql   | 3 ++-
 .../CWE/CWE-457/semmle/tests/UninitializedLocal.expected  | 1 -
 4 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/cpp/ql/lib/semmle/code/cpp/Function.qll b/cpp/ql/lib/semmle/code/cpp/Function.qll
index 0648c6260ce5..1234791576b1 100644
--- a/cpp/ql/lib/semmle/code/cpp/Function.qll
+++ b/cpp/ql/lib/semmle/code/cpp/Function.qll
@@ -500,6 +500,14 @@ class Function extends Declaration, ControlFlowNode, AccessHolder, @function {
    * Gets the nearest enclosing AccessHolder.
    */
   override AccessHolder getEnclosingAccessHolder() { result = this.getDeclaringType() }
+
+  /**
+   * Holds if this function has extraction errors that create an `ErrorExpr`.
+   */
+  predicate hasErrors() {
+    // Exclude allocator call arguments because they are are always extracted as `ErrorExpr`.
+    exists(ErrorExpr e | e.getEnclosingFunction() = this and not e.isFirstAllocatorCallArgument())
+  }
 }
 
 pragma[noinline]
diff --git a/cpp/ql/lib/semmle/code/cpp/exprs/Expr.qll b/cpp/ql/lib/semmle/code/cpp/exprs/Expr.qll
index 91b57049a54e..7faef545c0e4 100644
--- a/cpp/ql/lib/semmle/code/cpp/exprs/Expr.qll
+++ b/cpp/ql/lib/semmle/code/cpp/exprs/Expr.qll
@@ -744,6 +744,13 @@ class ErrorExpr extends Expr, @errorexpr {
   override string toString() { result = "<error expr>" }
 
   override string getAPrimaryQlClass() { result = "ErrorExpr" }
+
+  /**
+   * Holds if this error expression is the first argument to a `new` allocation call.
+   */
+  predicate isFirstAllocatorCallArgument() { 
+    this = any(NewOrNewArrayExpr new).getAllocatorCall().getArgument(0)
+  }
 }
 
 /**
diff --git a/cpp/ql/src/Likely Bugs/Memory Management/UninitializedLocal.ql b/cpp/ql/src/Likely Bugs/Memory Management/UninitializedLocal.ql
index 35bee25c9f5f..226cbfd322b9 100644
--- a/cpp/ql/src/Likely Bugs/Memory Management/UninitializedLocal.ql	
+++ b/cpp/ql/src/Likely Bugs/Memory Management/UninitializedLocal.ql	
@@ -89,5 +89,6 @@ from
 where
   conf.hasFlowPath(source, sink) and
   isSinkImpl(sink.getInstruction(), va) and
-  v = va.getTarget()
+  v = va.getTarget() and
+  not v.getFunction().hasErrors()
 select va, source, sink, "The variable $@ may not be initialized at this access.", v, v.getName()
diff --git a/cpp/ql/test/query-tests/Security/CWE/CWE-457/semmle/tests/UninitializedLocal.expected b/cpp/ql/test/query-tests/Security/CWE/CWE-457/semmle/tests/UninitializedLocal.expected
index 385105e6e19b..30896607a18d 100644
--- a/cpp/ql/test/query-tests/Security/CWE/CWE-457/semmle/tests/UninitializedLocal.expected
+++ b/cpp/ql/test/query-tests/Security/CWE/CWE-457/semmle/tests/UninitializedLocal.expected
@@ -16,7 +16,6 @@ nodes
 | test.cpp:472:6:472:6 | definition of x | semmle.label | definition of x |
 | test.cpp:479:6:479:6 | definition of x | semmle.label | definition of x |
 #select
-| errors.cpp:6:10:6:10 | x | errors.cpp:4:7:4:7 | definition of x | errors.cpp:4:7:4:7 | definition of x | The variable $@ may not be initialized at this access. | errors.cpp:4:7:4:7 | x | x |
 | errors.cpp:14:18:14:18 | x | errors.cpp:13:7:13:7 | definition of x | errors.cpp:13:7:13:7 | definition of x | The variable $@ may not be initialized at this access. | errors.cpp:13:7:13:7 | x | x |
 | test.cpp:12:6:12:8 | foo | test.cpp:11:6:11:8 | definition of foo | test.cpp:11:6:11:8 | definition of foo | The variable $@ may not be initialized at this access. | test.cpp:11:6:11:8 | foo | foo |
 | test.cpp:113:6:113:8 | foo | test.cpp:111:6:111:8 | definition of foo | test.cpp:111:6:111:8 | definition of foo | The variable $@ may not be initialized at this access. | test.cpp:111:6:111:8 | foo | foo |

From 59a77d70c0d90eb9e78f068bea92e594b41501d7 Mon Sep 17 00:00:00 2001
From: Calum Grant <calumgrant@github.com>
Date: Tue, 1 Oct 2024 11:01:23 +0100
Subject: [PATCH 077/347] C++: Use Function::hasErrors in queries

---
 cpp/ql/src/Best Practices/Unused Entities/UnusedLocals.ql       | 2 +-
 .../Likely Bugs/Memory Management/ReturnStackAllocatedMemory.ql | 2 +-
 .../Likely Bugs/Memory Management/UsingExpiredStackAddress.ql   | 2 +-
 cpp/ql/src/jsf/4.13 Functions/AV Rule 114.ql                    | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/cpp/ql/src/Best Practices/Unused Entities/UnusedLocals.ql b/cpp/ql/src/Best Practices/Unused Entities/UnusedLocals.ql
index 1d02474bfbb7..f824ecf53e76 100644
--- a/cpp/ql/src/Best Practices/Unused Entities/UnusedLocals.ql	
+++ b/cpp/ql/src/Best Practices/Unused Entities/UnusedLocals.ql	
@@ -57,5 +57,5 @@ where
   not declarationHasSideEffects(v) and
   not exists(AsmStmt s | f = s.getEnclosingFunction()) and
   not v.getAnAttribute().getName() = "unused" and
-  not any(ErrorExpr e).getEnclosingFunction() = f // unextracted expr may use `v`
+  not f.hasErrors()
 select v, "Variable " + v.getName() + " is not used."
diff --git a/cpp/ql/src/Likely Bugs/Memory Management/ReturnStackAllocatedMemory.ql b/cpp/ql/src/Likely Bugs/Memory Management/ReturnStackAllocatedMemory.ql
index 16679d67fd2e..02678beaf124 100644
--- a/cpp/ql/src/Likely Bugs/Memory Management/ReturnStackAllocatedMemory.ql	
+++ b/cpp/ql/src/Likely Bugs/Memory Management/ReturnStackAllocatedMemory.ql	
@@ -29,7 +29,7 @@ class ReturnStackAllocatedMemoryConfig extends MustFlowConfiguration {
   override predicate isSource(Instruction source) {
     exists(Function func |
       // Rule out FPs caused by extraction errors.
-      not any(ErrorExpr e).getEnclosingFunction() = func and
+      not func.hasErrors() and
       not intentionallyReturnsStackPointer(func) and
       func = source.getEnclosingFunction()
     |
diff --git a/cpp/ql/src/Likely Bugs/Memory Management/UsingExpiredStackAddress.ql b/cpp/ql/src/Likely Bugs/Memory Management/UsingExpiredStackAddress.ql
index 678cb95a7214..0df59b5f01db 100644
--- a/cpp/ql/src/Likely Bugs/Memory Management/UsingExpiredStackAddress.ql	
+++ b/cpp/ql/src/Likely Bugs/Memory Management/UsingExpiredStackAddress.ql	
@@ -24,7 +24,7 @@ predicate instructionHasVariable(VariableAddressInstruction vai, StackVariable v
   // Pointer-to-member types aren't properly handled in the dbscheme.
   not vai.getResultType() instanceof PointerToMemberType and
   // Rule out FPs caused by extraction errors.
-  not any(ErrorExpr e).getEnclosingFunction() = f
+  not f.hasErrors()
 }
 
 /**
diff --git a/cpp/ql/src/jsf/4.13 Functions/AV Rule 114.ql b/cpp/ql/src/jsf/4.13 Functions/AV Rule 114.ql
index ac5db25ea6b5..9027c064ac67 100644
--- a/cpp/ql/src/jsf/4.13 Functions/AV Rule 114.ql	
+++ b/cpp/ql/src/jsf/4.13 Functions/AV Rule 114.ql	
@@ -49,7 +49,7 @@ predicate functionsMissingReturnStmt(Function f, ControlFlowNode blame) {
 predicate functionImperfectlyExtracted(Function f) {
   exists(CompilerError e | f.getBlock().getLocation().subsumes(e.getLocation()))
   or
-  exists(ErrorExpr ee | ee.getEnclosingFunction() = f)
+  f.hasErrors()
   or
   count(f.getType()) > 1
   or

From 4712ae1cfc5073be85a102753a540e573da54803 Mon Sep 17 00:00:00 2001
From: Calum Grant <calumgrant@github.com>
Date: Tue, 1 Oct 2024 11:01:51 +0100
Subject: [PATCH 078/347] C++: Use refactored isFirstAllocatorCallArgument()

---
 .../cpp/ir/implementation/raw/internal/TranslatedElement.qll    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cpp/ql/lib/semmle/code/cpp/ir/implementation/raw/internal/TranslatedElement.qll b/cpp/ql/lib/semmle/code/cpp/ir/implementation/raw/internal/TranslatedElement.qll
index 0f9bc370f7a5..1047dc2b8a7b 100644
--- a/cpp/ql/lib/semmle/code/cpp/ir/implementation/raw/internal/TranslatedElement.qll
+++ b/cpp/ql/lib/semmle/code/cpp/ir/implementation/raw/internal/TranslatedElement.qll
@@ -151,7 +151,7 @@ private predicate ignoreExprOnly(Expr expr) {
   // The extractor deliberately emits an `ErrorExpr` as the first argument to
   // the allocator call, if any, of a `NewOrNewArrayExpr`. That `ErrorExpr`
   // should not be translated.
-  exists(NewOrNewArrayExpr new | expr = new.getAllocatorCall().getArgument(0))
+  expr.(ErrorExpr).isFirstAllocatorCallArgument()
   or
   not translateFunction(getEnclosingFunction(expr)) and
   not Raw::varHasIRFunc(getEnclosingVariable(expr))

From fe00c8819d373a5ab46ac6c7e6cc735f8665304d Mon Sep 17 00:00:00 2001
From: Calum Grant <calumgrant@github.com>
Date: Tue, 1 Oct 2024 11:26:47 +0100
Subject: [PATCH 079/347] C++: Fix formatting

---
 cpp/ql/lib/semmle/code/cpp/exprs/Expr.qll | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cpp/ql/lib/semmle/code/cpp/exprs/Expr.qll b/cpp/ql/lib/semmle/code/cpp/exprs/Expr.qll
index 7faef545c0e4..4eaf83e2c03f 100644
--- a/cpp/ql/lib/semmle/code/cpp/exprs/Expr.qll
+++ b/cpp/ql/lib/semmle/code/cpp/exprs/Expr.qll
@@ -748,7 +748,7 @@ class ErrorExpr extends Expr, @errorexpr {
   /**
    * Holds if this error expression is the first argument to a `new` allocation call.
    */
-  predicate isFirstAllocatorCallArgument() { 
+  predicate isFirstAllocatorCallArgument() {
     this = any(NewOrNewArrayExpr new).getAllocatorCall().getArgument(0)
   }
 }

From 2b6aab108d1721691e2bb265f2452182d2c4f8dc Mon Sep 17 00:00:00 2001
From: yoff <lerchedahl@gmail.com>
Date: Tue, 1 Oct 2024 12:36:20 +0200
Subject: [PATCH 080/347] Update
 python/ql/lib/semmle/python/dataflow/new/internal/DataFlowDispatch.qll

Co-authored-by: Taus <tausbn@github.com>
---
 .../semmle/python/dataflow/new/internal/DataFlowDispatch.qll    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/python/ql/lib/semmle/python/dataflow/new/internal/DataFlowDispatch.qll b/python/ql/lib/semmle/python/dataflow/new/internal/DataFlowDispatch.qll
index b1db806d343e..061687ad879c 100644
--- a/python/ql/lib/semmle/python/dataflow/new/internal/DataFlowDispatch.qll
+++ b/python/ql/lib/semmle/python/dataflow/new/internal/DataFlowDispatch.qll
@@ -1385,7 +1385,7 @@ private predicate sameEnclosingCallable(Node node1, Node node2) {
 // =============================================================================
 newtype TDataFlowCall =
   TNormalCall(CallNode call, Function target, CallType type) { resolveCall(call, target, type) } or
-  /** A call to the generated function inside a comprhension */
+  /** A call to the generated function inside a comprehension */
   TComprehensionCall(Comp c) or
   TPotentialLibraryCall(CallNode call) or
   /** A synthesized call inside a summarized callable */

From 64890a1a6b426ef1b0f1caa8e5dd2d75b5154511 Mon Sep 17 00:00:00 2001
From: Rasmus Lerchedahl Petersen <yoff@github.com>
Date: Tue, 1 Oct 2024 12:37:45 +0200
Subject: [PATCH 081/347] Python: valid change note

---
 python/ql/lib/change-notes/2024-10-01-comprehension-flow.md | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/python/ql/lib/change-notes/2024-10-01-comprehension-flow.md b/python/ql/lib/change-notes/2024-10-01-comprehension-flow.md
index 5981251970c4..bc3165f05f33 100644
--- a/python/ql/lib/change-notes/2024-10-01-comprehension-flow.md
+++ b/python/ql/lib/change-notes/2024-10-01-comprehension-flow.md
@@ -1,7 +1,5 @@
-```yaml
 ---
 category: minorAnalysis
 ---
 * More precise modelling of the dataflow through comprehensions. In particular, captured variables are now handled correctly.
-* Dataflow out of yield is added, allowing proper tracing through generators.
-```
\ No newline at end of file
+* Dataflow out of yield is added, allowing proper tracing through generators.
\ No newline at end of file

From cef8744a3776fdff4e3f6566080a4d0e590b9b59 Mon Sep 17 00:00:00 2001
From: Rasmus Lerchedahl Petersen <yoff@github.com>
Date: Tue, 1 Oct 2024 12:56:21 +0200
Subject: [PATCH 082/347] Python: consolidate models in one file

---
 .../semmle/python/frameworks/Stdlib.model.yml | 154 ++++++++++++++++-
 .../python/frameworks/Stdlib/StdLib.model.yml | 161 ------------------
 2 files changed, 153 insertions(+), 162 deletions(-)
 delete mode 100644 python/ql/lib/semmle/python/frameworks/Stdlib/StdLib.model.yml

diff --git a/python/ql/lib/semmle/python/frameworks/Stdlib.model.yml b/python/ql/lib/semmle/python/frameworks/Stdlib.model.yml
index 53d918d07ac3..946c4d5ed4f6 100644
--- a/python/ql/lib/semmle/python/frameworks/Stdlib.model.yml
+++ b/python/ql/lib/semmle/python/frameworks/Stdlib.model.yml
@@ -21,9 +21,161 @@ extensions:
       - ['argparse.ArgumentParser', 'Member[parse_args,parse_known_args].WithArity[0].ReturnValue', 'commandargs']
 
       - ['os', 'Member[read].ReturnValue', 'file']
+
+  - addsTo:
+      pack: codeql/python-all
+      extensible: sinkModel
+    data:
+      - ["zipfile.ZipFile","Member[extractall].Argument[0,path:]", "path-injection"]
+
   - addsTo:
       pack: codeql/python-all
       extensible: summaryModel
     data:
-      - ['argparse.ArgumentParser', 'Member[parse_args,parse_known_args]', 'Argument[0,args:]', 'ReturnValue', 'taint']
+      # See https://docs.python.org/3/library/argparse.html#argparse.ArgumentParser
+      - ["argparse.ArgumentParser", "Member[_parse_known_args,_read_args_from_files]", "Argument[0,arg_strings:]", "ReturnValue", "taint"]
       # note: taint of attribute lookups is handled in QL
+      - ["argparse.ArgumentParser", "Member[parse_args,parse_known_args]", "Argument[0,args:]", "ReturnValue", "taint"]
+      # See https://docs.python.org/3/library/cgi.html#higher-level-interface
+      - ["cgi.FieldStorage", "Member[getfirst,getlist,getvalue]", "Argument[self]", "ReturnValue", "taint"]
+      # See
+      #  - https://docs.python.org/3/glossary.html#term-mapping 
+      #  - https://docs.python.org/3/library/stdtypes.html#dict.get
+      - ["collections.abc.Mapping", "Member[get]", "Argument[1,default:]", "ReturnValue", "taint"]
+      # See https://docs.python.org/3/library/contextlib.html#contextlib.ExitStack
+      - ["contextlib.ExitStack", "Member[enter_context]", "Argument[0,cm:]", "ReturnValue", "taint"]
+      # See https://docs.python.org/3/library/copy.html#copy.deepcopy
+      - ["copy", "Member[copy,deepcopy]", "Argument[0,x:]", "ReturnValue", "value"]
+      # See
+      #  - https://docs.python.org/3/library/ctypes.html#ctypes.create_string_buffer
+      #  - https://docs.python.org/3/library/ctypes.html#ctypes.create_unicode_buffer
+      - ["ctypes", "Member[create_string_buffer,create_unicode_buffer]", "Argument[0,init:,init_or_size:]", "ReturnValue", "taint"]
+      # See https://docs.python.org/3.11/distutils/apiref.html#distutils.util.change_root
+      - ["distutils", "Member[util].Member[change_root]", "Argument[0,new_root:,1,pathname:]", "ReturnValue", "taint"]
+      # See https://docs.python.org/3/library/email.header.html#email.header.Header
+      - ["email.header.Header!", "Subclass.Call", "Argument[0,s:]", "ReturnValue", "taint"]
+      # See https://docs.python.org/3/library/email.utils.html#email.utils.parseaddr
+      - ["email", "Member[utils].Member[parseaddr]", "Argument[0,addr:]", "ReturnValue", "taint"]
+      - ["email", "Member[utils].Member[parseaddr]", "Argument[0,addr:]", "ReturnValue.TupleElement[0,1]", "taint"]
+      # See See https://docs.python.org/3/library/fnmatch.html#fnmatch.filter
+      - ["fnmatch", "Member[filter]", "Argument[0,names:].ListElement", "ReturnValue.ListElement", "value"]
+      - ["fnmatch", "Member[filter]", "Argument[0,names:]", "ReturnValue", "taint"]
+      # See https://docs.python.org/3/library/getopt.html#getopt.getopt
+      - ["getopt", "Member[getopt]", "Argument[0,args:]", "ReturnValue.TupleElement[1]", "taint"]
+      - ["getopt", "Member[getopt]", "Argument[1,shortopts:,2,longopts:]", "ReturnValue.TupleElement[0].ListElement.TupleElement[0]", "taint"]
+      # See https://docs.python.org/3/library/gettext.html#gettext.gettext
+      - ["gettext", "Member[gettext]", "Argument[0,message:]", "ReturnValue", "taint"]
+      # See https://docs.python.org/3/library/gzip.html#gzip.GzipFile
+      - ["gzip.GzipFile!", "Subclass.Call", "Argument[0,filename:]", "ReturnValue", "taint"]
+      # See
+      #  - https://docs.python.org/3/library/html.html#html.escape
+      #  - https://docs.python.org/3/library/html.html#html.unescape
+      - ["html", "Member[escape,unescape]", "Argument[0,s:]", "ReturnValue", "taint"]
+      # See https://docs.python.org/3/library/html.parser.html#html.parser.HTMLParser.feed
+      - ["html.parser.HTMLParser", "Member[feed]", "Argument[0,data:]", "Argument[self]", "taint"]
+      # See https://docs.python.org/3.11/library/imp.html#imp.find_module
+      - ["imp", "Member[find_module]", "Argument[0,name:,1,path:]", "ReturnValue", "taint"]
+      # See https://docs.python.org/3/library/logging.html#logging.getLevelName
+      #   specifically the no matching case 
+      - ["logging", "Member[getLevelName]", "Argument[0,level:]", "ReturnValue", "taint"]
+      # See https://docs.python.org/3/library/logging.html#logging.LogRecord.getMessage
+      - ["logging.LogRecord", "Member[getMessage]", "Argument[self]", "ReturnValue", "taint"]
+      # See https://docs.python.org/3/library/mimetypes.html#mimetypes.guess_type
+      - ["mimetypes", "Member[guess_type]", "Argument[0,url:]", "ReturnValue", "taint"]
+      # See https://github.com/python/cpython/blob/main/Lib/nturl2path.py
+      #   No user-facing documentation, unfortunately.
+      - ["nturl2path", "Member[pathname2url]", "Argument[0,p:]", "ReturnValue", "taint"]
+      - ["nturl2path", "Member[url2pathname]", "Argument[0,url:]", "ReturnValue", "taint"]
+      # See https://docs.python.org/3/library/optparse.html#optparse.OptionParser.parse_args
+      - ["optparse.OptionParser", "Member[parse_args]", "Argument[0,args:,1,values:]", "ReturnValue.TupleElement[0,1]", "taint"]
+      # See https://github.com/python/cpython/blob/3.10/Lib/pathlib.py#L972-L973
+      - ["pathlib.Path", ".Member[__enter__]", "Argument[self]", "ReturnValue", "taint"]
+      # See https://docs.python.org/3/library/os.html#os.PathLike.__fspath__
+      - ["pathlib.PurePath", "Member[__fspath__]", "Argument[self]", "ReturnValue", "taint"]
+      # See
+      #  - https://docs.python.org/3/library/asyncio-queue.html#asyncio.Queue.get
+      #  - https://docs.python.org/3/library/asyncio-queue.html#asyncio.Queue.get_nowait
+      - ["queue.Queue", "Member[get,get_nowait]", "Argument[self].ListElement", "ReturnValue", "value"]
+      - ["queue.Queue", "Member[get,get_nowait]", "Argument[self]", "ReturnValue", "taint"]
+      # See
+      #  - https://docs.python.org/3/library/asyncio-queue.html#asyncio.Queue.put
+      #  - https://docs.python.org/3/library/asyncio-queue.html#asyncio.Queue.put_nowait
+      - ["queue.Queue", "Member[put,put_nowait]", "Argument[0,item:]", "Argument[self].ListElement", "value"]
+      - ["queue.Queue", "Member[put,put_nowait]", "Argument[0,item:]", "Argument[self]", "taint"]
+      # See 
+      #  - https://docs.python.org/3/library/random.html#random.choice
+      #  - https://docs.python.org/3/library/random.html#module-random
+      - ["random", "Member[choice]", "Argument[0,seq:].ListElement", "ReturnValue", "value"]
+      - ["random", "Member[choice]", "Argument[0,seq:].SetElement", "ReturnValue", "value"]
+      - ["random", "Member[choice]", "Argument[0,seq:]", "ReturnValue", "taint"]
+      - ["random.Random", "Member[choice]", "Argument[0,seq:].ListElement", "ReturnValue", "value"]
+      - ["random.Random", "Member[choice]", "Argument[0,seq:].SetElement", "ReturnValue", "value"]
+      - ["random.Random", "Member[choice]", "Argument[0,seq:]", "ReturnValue", "taint"]
+      # See https://docs.python.org/3/library/shlex.html#shlex.quote
+      - ["shlex", "Member[quote]", "Argument[0,s:]", "ReturnValue", "taint"]
+      # See https://docs.python.org/3/library/shutil.html#shutil.rmtree
+      - ["shutil", "Member[rmtree]", "Argument[0,path:]", "Argument[2,onerror:,onexc:].Parameter[1]", "taint"]
+      # See https://docs.python.org/3/library/shutil.html#shutil.which
+      - ["shutil", "Member[which]", "Argument[0,cmd:,2,path:]", "ReturnValue", "taint"]
+      # See https://docs.python.org/3/library/subprocess.html#subprocess.Popen
+      - ["subprocess.Popen!", "Subclass.Call", "Argument[0,args:]", "ReturnValue", "taint"]
+      # See
+      #  - https://docs.python.org/3/library/tarfile.html#tarfile.open
+      #  - https://docs.python.org/3/library/tarfile.html#tarfile.TarFile.open
+      - ["tarfile", "Member[open]", "Argument[0,name:,2,fileobj:]", "ReturnValue", "taint"]
+      - ["tarfile.TarFile", "Member[open]", "Argument[0,name:,2,fileobj:]", "ReturnValue", "taint"]
+      # See https://docs.python.org/3/library/tempfile.html#tempfile.mkdtemp
+      - ["tempfile", "Member[mkdtemp]", "Argument[0,suffix:,1,prefix:,2,dir:]", "ReturnValue", "taint"]
+      # See https://docs.python.org/3/library/tempfile.html#tempfile.mkstemp
+      - ["tempfile", "Member[mkstemp]", "Argument[0,suffix:,1,prefix:,2,dir:]", "ReturnValue.TupleElement[0,1]", "taint"]
+      # See https://docs.python.org/3/library/textwrap.html#textwrap.dedent
+      - ["textwrap", "Member[dedent]", "Argument[0,text:]", "ReturnValue", "taint"]
+      # See https://docs.python.org/3/library/traceback.html#traceback.StackSummary.from_list
+      - ["traceback.StackSummary", "Member[from_list]", "Argument[0,a_list:]", "ReturnValue", "taint"]
+      # See https://docs.python.org/3/library/typing.html#typing.cast
+      - ["typing", "Member[cast]", "Argument[1,val:]", "ReturnValue", "value"]
+      # See https://docs.python.org/3/library/urllib.parse.html#urllib.parse.quote
+      - ["urllib", "Member[parse].Member[quote]", "Argument[0,string:]", "ReturnValue", "taint"]
+      # See https://docs.python.org/3/library/urllib.parse.html#urllib.parse.quote_plus
+      - ["urllib", "Member[parse].Member[quote_plus]", "Argument[0,string:]", "ReturnValue", "taint"]
+      # See https://epydoc.sourceforge.net/stdlib/urllib-module.html
+      - ["urllib", "Member[parse].Member[splitquery]", "Argument[0,url:]", "ReturnValue.TupleElement[0,1]", "taint"]
+      # See https://docs.python.org/3/library/urllib.parse.html#urllib.parse.unquote
+      - ["urllib", "Member[parse].Member[unquote]", "Argument[0,string:]", "ReturnValue", "taint"]
+      # See https://docs.python.org/3/library/urllib.parse.html#urllib.parse.unquote_plus
+      - ["urllib", "Member[parse].Member[unquote_plus]", "Argument[0,string:]", "ReturnValue", "taint"]
+      # We could consider a more precise source than the first argument, namely tuple or dict content.
+      # See https://docs.python.org/3/library/urllib.parse.html#urllib.parse.urlencode
+      - ["urllib", "Member[parse].Member[urlencode]", "Argument[0,query:]", "ReturnValue", "taint"]
+      # See https://docs.python.org/3/library/urllib.parse.html#urllib.parse.urljoin
+      - ["urllib", "Member[parse].Member[urljoin]", "Argument[0,base:,1,url:]", "ReturnValue", "taint"]
+      # See the internal documentation
+      #   https://github.com/python/cpython/blob/3.12/Lib/zipfile/_path/__init__.py#L103-L105
+      - ["zipfile.CompleteDirs", "Member[namelist]", "Argument[self]", "ReturnValue", "taint"]
+      # See https://docs.python.org/3/library/zipfile.html#zipfile.ZipFile
+      #   it may be necessary to read the code to understand the taint propagation
+      #   Constructor: https://github.com/python/cpython/blob/3.12/Lib/zipfile/__init__.py#L1266
+      - ["zipfile.ZipFile!", "Subclass.Call", "Argument[0,file:]", "ReturnValue", "taint"]
+      - ["zipfile.ZipFile!", "Subclass.Call", "Argument[0,file:]", "ReturnValue.Attribute[filelist].ListElement.Attribute[filename]", "value"]
+      #   _extract_member: https://github.com/python/cpython/blob/3.12/Lib/zipfile/__init__.py#L1761
+      - ["zipfile.ZipFile", "Member[_extract_member]", "Argument[1,targetpath:]", "ReturnValue", "taint"]
+      #   infolist: https://github.com/python/cpython/blob/3.12/Lib/zipfile/__init__.py#L1498-L1501
+      - ["zipfile.ZipFile", "Member[infolist]", "Argument[self]", "ReturnValue", "taint"]
+      - ["zipfile.ZipFile", "Member[infolist]", "Argument[self].Attribute[filelist]", "ReturnValue", "value"]
+      #   namelist: https://github.com/python/cpython/blob/3.12/Lib/zipfile/__init__.py#L1494-L1496
+      - ["zipfile.ZipFile", "Member[namelist]", "Argument[self]", "ReturnValue", "taint"]
+
+  - addsTo:
+      pack: codeql/python-all
+      extensible: neutralModel
+    data: []
+
+  - addsTo:
+      pack: codeql/python-all
+      extensible: typeModel
+    data: []
+
+  - addsTo:
+      pack: codeql/python-all
+      extensible: typeVariableModel
+    data: []
\ No newline at end of file
diff --git a/python/ql/lib/semmle/python/frameworks/Stdlib/StdLib.model.yml b/python/ql/lib/semmle/python/frameworks/Stdlib/StdLib.model.yml
deleted file mode 100644
index 19a97b16537e..000000000000
--- a/python/ql/lib/semmle/python/frameworks/Stdlib/StdLib.model.yml
+++ /dev/null
@@ -1,161 +0,0 @@
-extensions:
-  - addsTo:
-      pack: codeql/python-all
-      extensible: sourceModel
-    data: []
-
-  - addsTo:
-      pack: codeql/python-all
-      extensible: sinkModel
-    data:
-      - ["zipfile.ZipFile","Member[extractall].Argument[0,path:]", "path-injection"]
-
-  - addsTo:
-      pack: codeql/python-all
-      extensible: summaryModel
-    data:
-      # See
-      #  - https://docs.python.org/3/glossary.html#term-mapping 
-      #  - https://docs.python.org/3/library/stdtypes.html#dict.get
-      - ["collections.abc.Mapping", "Member[get]", "Argument[1,default:]", "ReturnValue", "taint"]
-      # See https://docs.python.org/3/library/argparse.html#argparse.ArgumentParser
-      - ["argparse.ArgumentParser", "Member[_parse_known_args,_read_args_from_files]", "Argument[0,arg_strings:]", "ReturnValue", "taint"]
-      - ["argparse.ArgumentParser", "Member[parse_args,parse_known_args]", "Argument[0,args:]", "ReturnValue", "taint"]
-      # See https://docs.python.org/3/library/cgi.html#higher-level-interface
-      - ["cgi.FieldStorage", "Member[getfirst,getlist,getvalue]", "Argument[self]", "ReturnValue", "taint"]
-      # See https://docs.python.org/3/library/contextlib.html#contextlib.ExitStack
-      - ["contextlib.ExitStack", "Member[enter_context]", "Argument[0,cm:]", "ReturnValue", "taint"]
-      # See https://docs.python.org/3/library/copy.html#copy.deepcopy
-      - ["copy", "Member[copy,deepcopy]", "Argument[0,x:]", "ReturnValue", "value"]
-      # See
-      #  - https://docs.python.org/3/library/ctypes.html#ctypes.create_string_buffer
-      #  - https://docs.python.org/3/library/ctypes.html#ctypes.create_unicode_buffer
-      - ["ctypes", "Member[create_string_buffer,create_unicode_buffer]", "Argument[0,init:,init_or_size:]", "ReturnValue", "taint"]
-      # See https://docs.python.org/3.11/distutils/apiref.html#distutils.util.change_root
-      - ["distutils", "Member[util].Member[change_root]", "Argument[0,new_root:,1,pathname:]", "ReturnValue", "taint"]
-      # See https://docs.python.org/3/library/email.header.html#email.header.Header
-      - ["email.header.Header!", "Subclass.Call", "Argument[0,s:]", "ReturnValue", "taint"]
-      # See https://docs.python.org/3/library/email.utils.html#email.utils.parseaddr
-      - ["email", "Member[utils].Member[parseaddr]", "Argument[0,addr:]", "ReturnValue", "taint"]
-      - ["email", "Member[utils].Member[parseaddr]", "Argument[0,addr:]", "ReturnValue.TupleElement[0,1]", "taint"]
-      # See See https://docs.python.org/3/library/fnmatch.html#fnmatch.filter
-      - ["fnmatch", "Member[filter]", "Argument[0,names:].ListElement", "ReturnValue.ListElement", "value"]
-      - ["fnmatch", "Member[filter]", "Argument[0,names:]", "ReturnValue", "taint"]
-      # See https://docs.python.org/3/library/getopt.html#getopt.getopt
-      - ["getopt", "Member[getopt]", "Argument[0,args:]", "ReturnValue.TupleElement[1]", "taint"]
-      - ["getopt", "Member[getopt]", "Argument[1,shortopts:,2,longopts:]", "ReturnValue.TupleElement[0].ListElement.TupleElement[0]", "taint"]
-      # See https://docs.python.org/3/library/gettext.html#gettext.gettext
-      - ["gettext", "Member[gettext]", "Argument[0,message:]", "ReturnValue", "taint"]
-      # See https://docs.python.org/3/library/gzip.html#gzip.GzipFile
-      - ["gzip.GzipFile!", "Subclass.Call", "Argument[0,filename:]", "ReturnValue", "taint"]
-      # See
-      #  - https://docs.python.org/3/library/html.html#html.escape
-      #  - https://docs.python.org/3/library/html.html#html.unescape
-      - ["html", "Member[escape,unescape]", "Argument[0,s:]", "ReturnValue", "taint"]
-      # See https://docs.python.org/3/library/html.parser.html#html.parser.HTMLParser.feed
-      - ["html.parser.HTMLParser", "Member[feed]", "Argument[0,data:]", "Argument[self]", "taint"]
-      # See https://docs.python.org/3.11/library/imp.html#imp.find_module
-      - ["imp", "Member[find_module]", "Argument[0,name:,1,path:]", "ReturnValue", "taint"]
-      # See https://docs.python.org/3/library/logging.html#logging.getLevelName
-      #   specifically the no matching case 
-      - ["logging", "Member[getLevelName]", "Argument[0,level:]", "ReturnValue", "taint"]
-      # See https://docs.python.org/3/library/logging.html#logging.LogRecord.getMessage
-      - ["logging.LogRecord", "Member[getMessage]", "Argument[self]", "ReturnValue", "taint"]
-      # See https://docs.python.org/3/library/mimetypes.html#mimetypes.guess_type
-      - ["mimetypes", "Member[guess_type]", "Argument[0,url:]", "ReturnValue", "taint"]
-      # See https://github.com/python/cpython/blob/main/Lib/nturl2path.py
-      #   No user-facing documentation, unfortunately.
-      - ["nturl2path", "Member[pathname2url]", "Argument[0,p:]", "ReturnValue", "taint"]
-      - ["nturl2path", "Member[url2pathname]", "Argument[0,url:]", "ReturnValue", "taint"]
-      # See https://docs.python.org/3/library/optparse.html#optparse.OptionParser.parse_args
-      - ["optparse.OptionParser", "Member[parse_args]", "Argument[0,args:,1,values:]", "ReturnValue.TupleElement[0,1]", "taint"]
-      # See https://github.com/python/cpython/blob/3.10/Lib/pathlib.py#L972-L973
-      - ["pathlib.Path", ".Member[__enter__]", "Argument[self]", "ReturnValue", "taint"]
-      # See https://docs.python.org/3/library/os.html#os.PathLike.__fspath__
-      - ["pathlib.PurePath", "Member[__fspath__]", "Argument[self]", "ReturnValue", "taint"]
-      # See
-      #  - https://docs.python.org/3/library/asyncio-queue.html#asyncio.Queue.get
-      #  - https://docs.python.org/3/library/asyncio-queue.html#asyncio.Queue.get_nowait
-      - ["queue.Queue", "Member[get,get_nowait]", "Argument[self].ListElement", "ReturnValue", "value"]
-      - ["queue.Queue", "Member[get,get_nowait]", "Argument[self]", "ReturnValue", "taint"]
-      # See
-      #  - https://docs.python.org/3/library/asyncio-queue.html#asyncio.Queue.put
-      #  - https://docs.python.org/3/library/asyncio-queue.html#asyncio.Queue.put_nowait
-      - ["queue.Queue", "Member[put,put_nowait]", "Argument[0,item:]", "Argument[self].ListElement", "value"]
-      - ["queue.Queue", "Member[put,put_nowait]", "Argument[0,item:]", "Argument[self]", "taint"]
-      # See 
-      #  - https://docs.python.org/3/library/random.html#random.choice
-      #  - https://docs.python.org/3/library/random.html#module-random
-      - ["random", "Member[choice]", "Argument[0,seq:].ListElement", "ReturnValue", "value"]
-      - ["random", "Member[choice]", "Argument[0,seq:].SetElement", "ReturnValue", "value"]
-      - ["random", "Member[choice]", "Argument[0,seq:]", "ReturnValue", "taint"]
-      - ["random.Random", "Member[choice]", "Argument[0,seq:].ListElement", "ReturnValue", "value"]
-      - ["random.Random", "Member[choice]", "Argument[0,seq:].SetElement", "ReturnValue", "value"]
-      - ["random.Random", "Member[choice]", "Argument[0,seq:]", "ReturnValue", "taint"]
-      # See https://docs.python.org/3/library/shlex.html#shlex.quote
-      - ["shlex", "Member[quote]", "Argument[0,s:]", "ReturnValue", "taint"]
-      # See https://docs.python.org/3/library/shutil.html#shutil.rmtree
-      - ["shutil", "Member[rmtree]", "Argument[0,path:]", "Argument[2,onerror:,onexc:].Parameter[1]", "taint"]
-      # See https://docs.python.org/3/library/shutil.html#shutil.which
-      - ["shutil", "Member[which]", "Argument[0,cmd:,2,path:]", "ReturnValue", "taint"]
-      # See https://docs.python.org/3/library/subprocess.html#subprocess.Popen
-      - ["subprocess.Popen!", "Subclass.Call", "Argument[0,args:]", "ReturnValue", "taint"]
-      # See
-      #  - https://docs.python.org/3/library/tarfile.html#tarfile.open
-      #  - https://docs.python.org/3/library/tarfile.html#tarfile.TarFile.open
-      - ["tarfile", "Member[open]", "Argument[0,name:,2,fileobj:]", "ReturnValue", "taint"]
-      - ["tarfile.TarFile", "Member[open]", "Argument[0,name:,2,fileobj:]", "ReturnValue", "taint"]
-      # See https://docs.python.org/3/library/tempfile.html#tempfile.mkdtemp
-      - ["tempfile", "Member[mkdtemp]", "Argument[0,suffix:,1,prefix:,2,dir:]", "ReturnValue", "taint"]
-      # See https://docs.python.org/3/library/tempfile.html#tempfile.mkstemp
-      - ["tempfile", "Member[mkstemp]", "Argument[0,suffix:,1,prefix:,2,dir:]", "ReturnValue.TupleElement[0,1]", "taint"]
-      # See https://docs.python.org/3/library/textwrap.html#textwrap.dedent
-      - ["textwrap", "Member[dedent]", "Argument[0,text:]", "ReturnValue", "taint"]
-      # See https://docs.python.org/3/library/traceback.html#traceback.StackSummary.from_list
-      - ["traceback.StackSummary", "Member[from_list]", "Argument[0,a_list:]", "ReturnValue", "taint"]
-      # See https://docs.python.org/3/library/typing.html#typing.cast
-      - ["typing", "Member[cast]", "Argument[1,val:]", "ReturnValue", "value"]
-      # See https://docs.python.org/3/library/urllib.parse.html#urllib.parse.quote
-      - ["urllib", "Member[parse].Member[quote]", "Argument[0,string:]", "ReturnValue", "taint"]
-      # See https://docs.python.org/3/library/urllib.parse.html#urllib.parse.quote_plus
-      - ["urllib", "Member[parse].Member[quote_plus]", "Argument[0,string:]", "ReturnValue", "taint"]
-      # See https://epydoc.sourceforge.net/stdlib/urllib-module.html
-      - ["urllib", "Member[parse].Member[splitquery]", "Argument[0,url:]", "ReturnValue.TupleElement[0,1]", "taint"]
-      # See https://docs.python.org/3/library/urllib.parse.html#urllib.parse.unquote
-      - ["urllib", "Member[parse].Member[unquote]", "Argument[0,string:]", "ReturnValue", "taint"]
-      # See https://docs.python.org/3/library/urllib.parse.html#urllib.parse.unquote_plus
-      - ["urllib", "Member[parse].Member[unquote_plus]", "Argument[0,string:]", "ReturnValue", "taint"]
-      # We could consider a more precise source than the first argument, namely tuple or dict content.
-      # See https://docs.python.org/3/library/urllib.parse.html#urllib.parse.urlencode
-      - ["urllib", "Member[parse].Member[urlencode]", "Argument[0,query:]", "ReturnValue", "taint"]
-      # See https://docs.python.org/3/library/urllib.parse.html#urllib.parse.urljoin
-      - ["urllib", "Member[parse].Member[urljoin]", "Argument[0,base:,1,url:]", "ReturnValue", "taint"]
-      # See the internal documentation
-      #   https://github.com/python/cpython/blob/3.12/Lib/zipfile/_path/__init__.py#L103-L105
-      - ["zipfile.CompleteDirs", "Member[namelist]", "Argument[self]", "ReturnValue", "taint"]
-      # See https://docs.python.org/3/library/zipfile.html#zipfile.ZipFile
-      #   it may be necessary to read the code to understand the taint propagation
-      #   Constructor: https://github.com/python/cpython/blob/3.12/Lib/zipfile/__init__.py#L1266
-      - ["zipfile.ZipFile!", "Subclass.Call", "Argument[0,file:]", "ReturnValue", "taint"]
-      - ["zipfile.ZipFile!", "Subclass.Call", "Argument[0,file:]", "ReturnValue.Attribute[filelist].ListElement.Attribute[filename]", "value"]
-      #   _extract_member: https://github.com/python/cpython/blob/3.12/Lib/zipfile/__init__.py#L1761
-      - ["zipfile.ZipFile", "Member[_extract_member]", "Argument[1,targetpath:]", "ReturnValue", "taint"]
-      #   infolist: https://github.com/python/cpython/blob/3.12/Lib/zipfile/__init__.py#L1498-L1501
-      - ["zipfile.ZipFile", "Member[infolist]", "Argument[self]", "ReturnValue", "taint"]
-      - ["zipfile.ZipFile", "Member[infolist]", "Argument[self].Attribute[filelist]", "ReturnValue", "value"]
-      #   namelist: https://github.com/python/cpython/blob/3.12/Lib/zipfile/__init__.py#L1494-L1496
-      - ["zipfile.ZipFile", "Member[namelist]", "Argument[self]", "ReturnValue", "taint"]
-  - addsTo:
-      pack: codeql/python-all
-      extensible: neutralModel
-    data: []
-
-  - addsTo:
-      pack: codeql/python-all
-      extensible: typeModel
-    data: []
-
-  - addsTo:
-      pack: codeql/python-all
-      extensible: typeVariableModel
-    data: []

From 05910de8d1321cb523cfb29be365756a6961f129 Mon Sep 17 00:00:00 2001
From: Rasmus Lerchedahl Petersen <yoff@github.com>
Date: Tue, 1 Oct 2024 13:21:22 +0200
Subject: [PATCH 083/347] Python: MaD expectations

---
 .../CWE-022-UnsafeUnpacking/UnsafeUnpack.expected      |  2 +-
 .../Security/CWE-409/DecompressionBombs.expected       | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/python/ql/test/experimental/query-tests/Security/CWE-022-UnsafeUnpacking/UnsafeUnpack.expected b/python/ql/test/experimental/query-tests/Security/CWE-022-UnsafeUnpacking/UnsafeUnpack.expected
index 0c6c30857220..38d8719bfd0a 100644
--- a/python/ql/test/experimental/query-tests/Security/CWE-022-UnsafeUnpacking/UnsafeUnpack.expected
+++ b/python/ql/test/experimental/query-tests/Security/CWE-022-UnsafeUnpacking/UnsafeUnpack.expected
@@ -75,7 +75,7 @@ edges
 | UnsafeUnpack.py:161:19:161:21 | ControlFlowNode for tar | UnsafeUnpack.py:163:33:163:35 | ControlFlowNode for tar | provenance |  |
 | UnsafeUnpack.py:161:25:161:46 | ControlFlowNode for Attribute() | UnsafeUnpack.py:161:19:161:21 | ControlFlowNode for tar | provenance |  |
 | UnsafeUnpack.py:161:38:161:45 | ControlFlowNode for savepath | UnsafeUnpack.py:161:25:161:46 | ControlFlowNode for Attribute() | provenance | Config |
-| UnsafeUnpack.py:161:38:161:45 | ControlFlowNode for savepath | UnsafeUnpack.py:161:25:161:46 | ControlFlowNode for Attribute() | provenance | MaD:54 |
+| UnsafeUnpack.py:161:38:161:45 | ControlFlowNode for savepath | UnsafeUnpack.py:161:25:161:46 | ControlFlowNode for Attribute() | provenance | MaD:67 |
 | UnsafeUnpack.py:163:23:163:28 | ControlFlowNode for member | UnsafeUnpack.py:166:37:166:42 | ControlFlowNode for member | provenance |  |
 | UnsafeUnpack.py:163:33:163:35 | ControlFlowNode for tar | UnsafeUnpack.py:163:23:163:28 | ControlFlowNode for member | provenance |  |
 | UnsafeUnpack.py:166:23:166:28 | [post] ControlFlowNode for result | UnsafeUnpack.py:167:67:167:72 | ControlFlowNode for result | provenance |  |
diff --git a/python/ql/test/experimental/query-tests/Security/CWE-409/DecompressionBombs.expected b/python/ql/test/experimental/query-tests/Security/CWE-409/DecompressionBombs.expected
index 073533bcc092..2b16f9ef178f 100644
--- a/python/ql/test/experimental/query-tests/Security/CWE-409/DecompressionBombs.expected
+++ b/python/ql/test/experimental/query-tests/Security/CWE-409/DecompressionBombs.expected
@@ -1,23 +1,23 @@
 edges
 | test.py:10:16:10:24 | ControlFlowNode for file_path | test.py:11:21:11:29 | ControlFlowNode for file_path | provenance |  |
 | test.py:11:5:11:35 | ControlFlowNode for Attribute() | test.py:11:5:11:52 | ControlFlowNode for Attribute() | provenance | Config |
-| test.py:11:21:11:29 | ControlFlowNode for file_path | test.py:11:5:11:35 | ControlFlowNode for Attribute() | provenance | MaD:69 |
+| test.py:11:21:11:29 | ControlFlowNode for file_path | test.py:11:5:11:35 | ControlFlowNode for Attribute() | provenance | MaD:82 |
 | test.py:11:21:11:29 | ControlFlowNode for file_path | test.py:11:5:11:52 | ControlFlowNode for Attribute() | provenance | Config |
 | test.py:11:21:11:29 | ControlFlowNode for file_path | test.py:12:21:12:29 | ControlFlowNode for file_path | provenance |  |
 | test.py:12:5:12:35 | ControlFlowNode for Attribute() | test.py:12:5:12:48 | ControlFlowNode for Attribute() | provenance | Config |
-| test.py:12:21:12:29 | ControlFlowNode for file_path | test.py:12:5:12:35 | ControlFlowNode for Attribute() | provenance | MaD:69 |
+| test.py:12:21:12:29 | ControlFlowNode for file_path | test.py:12:5:12:35 | ControlFlowNode for Attribute() | provenance | MaD:82 |
 | test.py:12:21:12:29 | ControlFlowNode for file_path | test.py:12:5:12:48 | ControlFlowNode for Attribute() | provenance | Config |
 | test.py:12:21:12:29 | ControlFlowNode for file_path | test.py:14:26:14:34 | ControlFlowNode for file_path | provenance |  |
 | test.py:14:10:14:35 | ControlFlowNode for Attribute() | test.py:15:14:15:29 | ControlFlowNode for Attribute() | provenance | Config |
-| test.py:14:26:14:34 | ControlFlowNode for file_path | test.py:14:10:14:35 | ControlFlowNode for Attribute() | provenance | MaD:69 |
+| test.py:14:26:14:34 | ControlFlowNode for file_path | test.py:14:10:14:35 | ControlFlowNode for Attribute() | provenance | MaD:82 |
 | test.py:14:26:14:34 | ControlFlowNode for file_path | test.py:15:14:15:29 | ControlFlowNode for Attribute() | provenance | Config |
 | test.py:14:26:14:34 | ControlFlowNode for file_path | test.py:18:26:18:34 | ControlFlowNode for file_path | provenance |  |
 | test.py:18:10:18:35 | ControlFlowNode for Attribute() | test.py:19:14:19:39 | ControlFlowNode for Attribute() | provenance | Config |
-| test.py:18:26:18:34 | ControlFlowNode for file_path | test.py:18:10:18:35 | ControlFlowNode for Attribute() | provenance | MaD:69 |
+| test.py:18:26:18:34 | ControlFlowNode for file_path | test.py:18:10:18:35 | ControlFlowNode for Attribute() | provenance | MaD:82 |
 | test.py:18:26:18:34 | ControlFlowNode for file_path | test.py:19:14:19:39 | ControlFlowNode for Attribute() | provenance | Config |
 | test.py:18:26:18:34 | ControlFlowNode for file_path | test.py:22:21:22:29 | ControlFlowNode for file_path | provenance |  |
 | test.py:22:5:22:30 | ControlFlowNode for Attribute() | test.py:22:5:22:60 | ControlFlowNode for Attribute() | provenance | Config |
-| test.py:22:21:22:29 | ControlFlowNode for file_path | test.py:22:5:22:30 | ControlFlowNode for Attribute() | provenance | MaD:69 |
+| test.py:22:21:22:29 | ControlFlowNode for file_path | test.py:22:5:22:30 | ControlFlowNode for Attribute() | provenance | MaD:82 |
 | test.py:22:21:22:29 | ControlFlowNode for file_path | test.py:22:5:22:60 | ControlFlowNode for Attribute() | provenance | Config |
 | test.py:22:21:22:29 | ControlFlowNode for file_path | test.py:24:18:24:26 | ControlFlowNode for file_path | provenance |  |
 | test.py:24:18:24:26 | ControlFlowNode for file_path | test.py:24:5:24:52 | ControlFlowNode for Attribute() | provenance | Config |

From a172063e6a88c7841c4df65eed23e69494b04e53 Mon Sep 17 00:00:00 2001
From: Tom Hvitved <hvitved@github.com>
Date: Tue, 1 Oct 2024 13:37:56 +0200
Subject: [PATCH 084/347] Rust: Document `VariableOrAccessCand`

---
 .../rust/elements/internal/VariableImpl.qll   | 47 +++++++++++++++++++
 .../internal/InlineExpectationsTestImpl.qll   |  3 --
 2 files changed, 47 insertions(+), 3 deletions(-)

diff --git a/rust/ql/lib/codeql/rust/elements/internal/VariableImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/VariableImpl.qll
index 9ddf1d9755a1..58c9a4fb6ebf 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/VariableImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/VariableImpl.qll
@@ -231,6 +231,53 @@ module Impl {
     TVariableOrAccessCandVariable(Variable v) or
     TVariableOrAccessCandVariableAccessCand(VariableAccessCand va)
 
+  /**
+   * A variable declaration or variable access candidate.
+   *
+   * In order to determine whether a candidate is an actual variable access,
+   * we rank declarations and candidates by their position in source code.
+   *
+   * The ranking must take variable names into account, but also variable scopes;
+   * below a comment `rank(scope, name, i)` means that the declaration/access on
+   * the given line has rank `i` amongst all declarations/accesses inside variable
+   * scope `scope`, for variable name `name`:
+   *
+   * ```rust
+   * fn f() {           // scope0
+   *     let x = 0;     // rank(scope0, "x", 0)
+   *     use(x);        // rank(scope0, "x", 1)
+   *     let x =        // rank(scope0, "x", 3)
+   *         x + 1;     // rank(scope0, "x", 2)
+   *     let y =        // rank(scope0, "y", 0)
+   *         x;         // rank(scope0, "x", 4)
+   *
+   *     {              // scope1
+   *         use(x);    // rank(scope1, "x", 0), rank(scope0, "x", 4)
+   *         use(y);    // rank(scope1, "y", 0), rank(scope0, "y", 1)
+   *         let x = 2; // rank(scope1, "x", 1)
+   *         use(x);    // rank(scope1, "x", 2), rank(scope0, "x", 4)
+   *     }
+   * }
+   * ```
+   *
+   * Variable declarations are only ranked in the scope that they bind into, while
+   * accesses candidates propagate outwards through scopes, as they may access
+   * declarations from outer scopes.
+   *
+   * For an access candidate with ranks `{ rank(scope_i, name, rnk_i) | i in I }` and
+   * declarations `d in D` with ranks `rnk(scope_d, name, rnk_d)`,  the target is
+   * calculated as
+   * ```
+   * max_{i in I} (
+   *   max_{d in D | scope_d = scope_i and rnk_d < rnk_i} (
+   *     d
+   *   )
+   * )
+   * ```
+   *
+   * i.e., its the nearest declaration before the access in the same (or outer) scope
+   * as the access.
+   */
   private class VariableOrAccessCand extends TVariableOrAccessCand {
     Variable asVariable() { this = TVariableOrAccessCandVariable(result) }
 
diff --git a/rust/ql/test/utils/internal/InlineExpectationsTestImpl.qll b/rust/ql/test/utils/internal/InlineExpectationsTestImpl.qll
index 74b8a39431de..2e851f529512 100644
--- a/rust/ql/test/utils/internal/InlineExpectationsTestImpl.qll
+++ b/rust/ql/test/utils/internal/InlineExpectationsTestImpl.qll
@@ -3,9 +3,6 @@ private import R
 private import codeql.util.test.InlineExpectationsTest
 
 module Impl implements InlineExpectationsTestSig {
-  /**
-   * A class representing line comments in C# used by the InlineExpectations core code
-   */
   class ExpectationComment extends R::Comment {
     /** Gets the contents of the given comment, _without_ the preceding comment marker (`//`). */
     string getContents() { result = this.getCommentText() }

From 91e26d0f4473626cdea80840f55717252cc4aaab Mon Sep 17 00:00:00 2001
From: Tom Hvitved <hvitved@github.com>
Date: Tue, 1 Oct 2024 13:45:58 +0200
Subject: [PATCH 085/347] Rust: Add another variable test

---
 .../CONSISTENCY/CfgConsistency.expected       |  2 +-
 .../variables/variables.expected              | 94 ++++++++++---------
 .../test/library-tests/variables/variables.rs | 16 ++++
 3 files changed, 66 insertions(+), 46 deletions(-)

diff --git a/rust/ql/test/library-tests/variables/CONSISTENCY/CfgConsistency.expected b/rust/ql/test/library-tests/variables/CONSISTENCY/CfgConsistency.expected
index 56ae06526e76..5457cb7c9d96 100644
--- a/rust/ql/test/library-tests/variables/CONSISTENCY/CfgConsistency.expected
+++ b/rust/ql/test/library-tests/variables/CONSISTENCY/CfgConsistency.expected
@@ -2,4 +2,4 @@ deadEnd
 | variables.rs:2:5:2:22 | ExprStmt |
 | variables.rs:6:5:6:22 | ExprStmt |
 | variables.rs:200:16:200:21 | ... > ... |
-| variables.rs:295:5:295:42 | LetStmt |
+| variables.rs:310:5:310:42 | LetStmt |
diff --git a/rust/ql/test/library-tests/variables/variables.expected b/rust/ql/test/library-tests/variables/variables.expected
index 18ee16a3da9c..ba563aeab6ef 100644
--- a/rust/ql/test/library-tests/variables/variables.expected
+++ b/rust/ql/test/library-tests/variables/variables.expected
@@ -46,23 +46,25 @@ variable
 | variables.rs:210:13:210:13 | e |
 | variables.rs:211:14:211:51 | a11 |
 | variables.rs:214:33:214:35 | a12 |
-| variables.rs:224:5:224:6 | a8 |
-| variables.rs:226:9:226:10 | b3 |
-| variables.rs:227:9:227:10 | c1 |
-| variables.rs:235:6:235:41 | a9 |
-| variables.rs:242:13:242:15 | a10 |
-| variables.rs:243:13:243:14 | b4 |
-| variables.rs:244:13:244:14 | c2 |
-| variables.rs:265:13:265:15 | a10 |
-| variables.rs:266:13:266:14 | b4 |
-| variables.rs:278:9:278:23 | example_closure |
-| variables.rs:279:10:279:10 | x |
-| variables.rs:281:9:281:10 | n1 |
-| variables.rs:286:9:286:26 | immutable_variable |
-| variables.rs:287:10:287:10 | x |
-| variables.rs:289:9:289:10 | n2 |
-| variables.rs:295:9:295:9 | v |
-| variables.rs:297:9:297:12 | text |
+| variables.rs:231:9:231:10 | fv |
+| variables.rs:233:9:233:109 | a13 |
+| variables.rs:239:5:239:6 | a8 |
+| variables.rs:241:9:241:10 | b3 |
+| variables.rs:242:9:242:10 | c1 |
+| variables.rs:250:6:250:41 | a9 |
+| variables.rs:257:13:257:15 | a10 |
+| variables.rs:258:13:258:14 | b4 |
+| variables.rs:259:13:259:14 | c2 |
+| variables.rs:280:13:280:15 | a10 |
+| variables.rs:281:13:281:14 | b4 |
+| variables.rs:293:9:293:23 | example_closure |
+| variables.rs:294:10:294:10 | x |
+| variables.rs:296:9:296:10 | n1 |
+| variables.rs:301:9:301:26 | immutable_variable |
+| variables.rs:302:10:302:10 | x |
+| variables.rs:304:9:304:10 | n2 |
+| variables.rs:310:9:310:9 | v |
+| variables.rs:312:9:312:12 | text |
 variableAccess
 | variables.rs:11:15:11:16 | x1 | variables.rs:10:9:10:10 | x1 |
 | variables.rs:16:15:16:16 | x2 | variables.rs:15:13:15:14 | x2 |
@@ -114,31 +116,33 @@ variableAccess
 | variables.rs:213:23:213:25 | a11 | variables.rs:211:14:211:51 | a11 |
 | variables.rs:215:15:215:15 | e | variables.rs:210:13:210:13 | e |
 | variables.rs:216:28:216:30 | a12 | variables.rs:214:33:214:35 | a12 |
-| variables.rs:229:15:229:16 | a8 | variables.rs:224:5:224:6 | a8 |
-| variables.rs:230:15:230:16 | b3 | variables.rs:226:9:226:10 | b3 |
-| variables.rs:231:15:231:16 | c1 | variables.rs:227:9:227:10 | c1 |
-| variables.rs:237:15:237:16 | a9 | variables.rs:235:6:235:41 | a9 |
-| variables.rs:246:15:246:17 | a10 | variables.rs:242:13:242:15 | a10 |
-| variables.rs:247:15:247:16 | b4 | variables.rs:243:13:243:14 | b4 |
-| variables.rs:248:15:248:16 | c2 | variables.rs:244:13:244:14 | c2 |
-| variables.rs:251:9:251:10 | c2 | variables.rs:244:13:244:14 | c2 |
-| variables.rs:252:9:252:10 | b4 | variables.rs:243:13:243:14 | b4 |
-| variables.rs:253:9:253:11 | a10 | variables.rs:242:13:242:15 | a10 |
-| variables.rs:255:9:255:11 | a10 | variables.rs:242:13:242:15 | a10 |
-| variables.rs:256:9:256:10 | b4 | variables.rs:243:13:243:14 | b4 |
-| variables.rs:257:9:257:10 | c2 | variables.rs:244:13:244:14 | c2 |
-| variables.rs:259:15:259:17 | a10 | variables.rs:242:13:242:15 | a10 |
-| variables.rs:260:15:260:16 | b4 | variables.rs:243:13:243:14 | b4 |
-| variables.rs:261:15:261:16 | c2 | variables.rs:244:13:244:14 | c2 |
-| variables.rs:268:23:268:25 | a10 | variables.rs:265:13:265:15 | a10 |
-| variables.rs:269:23:269:24 | b4 | variables.rs:266:13:266:14 | b4 |
-| variables.rs:273:15:273:17 | a10 | variables.rs:242:13:242:15 | a10 |
-| variables.rs:274:15:274:16 | b4 | variables.rs:243:13:243:14 | b4 |
-| variables.rs:280:9:280:9 | x | variables.rs:279:10:279:10 | x |
-| variables.rs:282:9:282:23 | example_closure | variables.rs:278:9:278:23 | example_closure |
-| variables.rs:283:15:283:16 | n1 | variables.rs:281:9:281:10 | n1 |
-| variables.rs:288:9:288:9 | x | variables.rs:287:10:287:10 | x |
-| variables.rs:290:9:290:26 | immutable_variable | variables.rs:286:9:286:26 | immutable_variable |
-| variables.rs:291:15:291:16 | n2 | variables.rs:289:9:289:10 | n2 |
-| variables.rs:298:12:298:12 | v | variables.rs:295:9:295:9 | v |
-| variables.rs:299:19:299:22 | text | variables.rs:297:9:297:12 | text |
+| variables.rs:232:11:232:12 | fv | variables.rs:231:9:231:10 | fv |
+| variables.rs:234:26:234:28 | a13 | variables.rs:233:9:233:109 | a13 |
+| variables.rs:244:15:244:16 | a8 | variables.rs:239:5:239:6 | a8 |
+| variables.rs:245:15:245:16 | b3 | variables.rs:241:9:241:10 | b3 |
+| variables.rs:246:15:246:16 | c1 | variables.rs:242:9:242:10 | c1 |
+| variables.rs:252:15:252:16 | a9 | variables.rs:250:6:250:41 | a9 |
+| variables.rs:261:15:261:17 | a10 | variables.rs:257:13:257:15 | a10 |
+| variables.rs:262:15:262:16 | b4 | variables.rs:258:13:258:14 | b4 |
+| variables.rs:263:15:263:16 | c2 | variables.rs:259:13:259:14 | c2 |
+| variables.rs:266:9:266:10 | c2 | variables.rs:259:13:259:14 | c2 |
+| variables.rs:267:9:267:10 | b4 | variables.rs:258:13:258:14 | b4 |
+| variables.rs:268:9:268:11 | a10 | variables.rs:257:13:257:15 | a10 |
+| variables.rs:270:9:270:11 | a10 | variables.rs:257:13:257:15 | a10 |
+| variables.rs:271:9:271:10 | b4 | variables.rs:258:13:258:14 | b4 |
+| variables.rs:272:9:272:10 | c2 | variables.rs:259:13:259:14 | c2 |
+| variables.rs:274:15:274:17 | a10 | variables.rs:257:13:257:15 | a10 |
+| variables.rs:275:15:275:16 | b4 | variables.rs:258:13:258:14 | b4 |
+| variables.rs:276:15:276:16 | c2 | variables.rs:259:13:259:14 | c2 |
+| variables.rs:283:23:283:25 | a10 | variables.rs:280:13:280:15 | a10 |
+| variables.rs:284:23:284:24 | b4 | variables.rs:281:13:281:14 | b4 |
+| variables.rs:288:15:288:17 | a10 | variables.rs:257:13:257:15 | a10 |
+| variables.rs:289:15:289:16 | b4 | variables.rs:258:13:258:14 | b4 |
+| variables.rs:295:9:295:9 | x | variables.rs:294:10:294:10 | x |
+| variables.rs:297:9:297:23 | example_closure | variables.rs:293:9:293:23 | example_closure |
+| variables.rs:298:15:298:16 | n1 | variables.rs:296:9:296:10 | n1 |
+| variables.rs:303:9:303:9 | x | variables.rs:302:10:302:10 | x |
+| variables.rs:305:9:305:26 | immutable_variable | variables.rs:301:9:301:26 | immutable_variable |
+| variables.rs:306:15:306:16 | n2 | variables.rs:304:9:304:10 | n2 |
+| variables.rs:313:12:313:12 | v | variables.rs:310:9:310:9 | v |
+| variables.rs:314:19:314:22 | text | variables.rs:312:9:312:12 | text |
diff --git a/rust/ql/test/library-tests/variables/variables.rs b/rust/ql/test/library-tests/variables/variables.rs
index f9d3e89938c3..8a0e83c9eff7 100644
--- a/rust/ql/test/library-tests/variables/variables.rs
+++ b/rust/ql/test/library-tests/variables/variables.rs
@@ -220,6 +220,21 @@ fn match_pattern8() {
     }
 }
 
+enum FourValued {
+    First(i64),
+    Second(i64),
+    Third(i64),
+    Fourth(i64),
+}
+
+fn match_pattern9() {
+    let fv = FourValued::Second(62); // tv
+    match fv { // $ access=tv
+        FourValued::First(a13) | (FourValued::Second(a13) | FourValued::Third(a13)) | FourValued::Fourth(a13) // a13
+            => print_i64(a13), // $ access=a13
+    }
+}
+
 fn param_pattern1(
     a8: &str, // a8
     (
@@ -317,6 +332,7 @@ fn main() {
     match_pattern6();
     match_pattern7();
     match_pattern8();
+    match_pattern9();
     param_pattern1("a", ("b", "c"));
     param_pattern2(Either::Left(45));
     destruct_assignment();

From f39dc41903dfbd7e4f863688e72a2342945a1eae Mon Sep 17 00:00:00 2001
From: Rasmus Lerchedahl Petersen <yoff@github.com>
Date: Tue, 1 Oct 2024 13:53:25 +0200
Subject: [PATCH 086/347] Python: use imprecise content in cp We had
 accidentally used precise content leadingto blowup

---
 .../semmle/python/dataflow/new/internal/DataFlowPrivate.qll   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/python/ql/lib/semmle/python/dataflow/new/internal/DataFlowPrivate.qll b/python/ql/lib/semmle/python/dataflow/new/internal/DataFlowPrivate.qll
index 5b2457cd762e..4d97f04d28d8 100644
--- a/python/ql/lib/semmle/python/dataflow/new/internal/DataFlowPrivate.qll
+++ b/python/ql/lib/semmle/python/dataflow/new/internal/DataFlowPrivate.qll
@@ -195,7 +195,7 @@ predicate yieldStoreStep(Node nodeFrom, Content c, Node nodeTo) {
       c instanceof SetElementContent
       or
       comp instanceof DictComp and
-      c instanceof DictionaryElementContent
+      c instanceof DictionaryElementAnyContent
     )
     or
     not exists(Comp comp | func = comp.getFunction()) and
@@ -204,7 +204,7 @@ predicate yieldStoreStep(Node nodeFrom, Content c, Node nodeTo) {
       or
       c instanceof SetElementContent
       or
-      c instanceof DictionaryElementContent
+      c instanceof DictionaryElementAnyContent
     )
   )
 }

From 901f756c692860c48131fdeba3e2230a2ea6dabd Mon Sep 17 00:00:00 2001
From: Ian Lynagh <igfoo@github.com>
Date: Tue, 1 Oct 2024 12:36:38 +0100
Subject: [PATCH 087/347] Java: Add a test for parameter names

---
 .../library-tests/MemberRefExpr/parameters.expected    | 10 ++++++++++
 java/ql/test/library-tests/MemberRefExpr/parameters.ql |  5 +++++
 2 files changed, 15 insertions(+)
 create mode 100644 java/ql/test/library-tests/MemberRefExpr/parameters.expected
 create mode 100644 java/ql/test/library-tests/MemberRefExpr/parameters.ql

diff --git a/java/ql/test/library-tests/MemberRefExpr/parameters.expected b/java/ql/test/library-tests/MemberRefExpr/parameters.expected
new file mode 100644
index 000000000000..12f149b5d243
--- /dev/null
+++ b/java/ql/test/library-tests/MemberRefExpr/parameters.expected
@@ -0,0 +1,10 @@
+| Test.java:3:22:3:24 | o |
+| Test.java:7:22:7:26 | i |
+| Test.java:45:22:45:26 | s |
+| Test.java:49:29:49:42 | p0 |
+| Test.java:50:29:50:42 | p0 |
+| Test.java:51:29:51:39 | p0 |
+| Test.java:52:40:52:64 | p0 |
+| Test.java:70:13:70:22 | p0 |
+| Test.java:71:13:71:26 | p0 |
+| Test.java:75:31:75:47 | p0 |
diff --git a/java/ql/test/library-tests/MemberRefExpr/parameters.ql b/java/ql/test/library-tests/MemberRefExpr/parameters.ql
new file mode 100644
index 000000000000..d4b8690b4850
--- /dev/null
+++ b/java/ql/test/library-tests/MemberRefExpr/parameters.ql
@@ -0,0 +1,5 @@
+import java
+
+from Parameter p
+where p.fromSource()
+select p

From 323b7cb96f84c86176a82ea1b30c52062be86248 Mon Sep 17 00:00:00 2001
From: Ian Lynagh <igfoo@github.com>
Date: Tue, 1 Oct 2024 12:37:34 +0100
Subject: [PATCH 088/347] Java: Follow change of implicit parameter names

---
 .../MemberRefExpr/parameters.expected              | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/java/ql/test/library-tests/MemberRefExpr/parameters.expected b/java/ql/test/library-tests/MemberRefExpr/parameters.expected
index 12f149b5d243..2981f022fef6 100644
--- a/java/ql/test/library-tests/MemberRefExpr/parameters.expected
+++ b/java/ql/test/library-tests/MemberRefExpr/parameters.expected
@@ -1,10 +1,10 @@
 | Test.java:3:22:3:24 | o |
 | Test.java:7:22:7:26 | i |
 | Test.java:45:22:45:26 | s |
-| Test.java:49:29:49:42 | p0 |
-| Test.java:50:29:50:42 | p0 |
-| Test.java:51:29:51:39 | p0 |
-| Test.java:52:40:52:64 | p0 |
-| Test.java:70:13:70:22 | p0 |
-| Test.java:71:13:71:26 | p0 |
-| Test.java:75:31:75:47 | p0 |
+| Test.java:49:29:49:42 | this |
+| Test.java:50:29:50:42 | this |
+| Test.java:51:29:51:39 | this |
+| Test.java:52:40:52:64 | this |
+| Test.java:70:13:70:22 | length |
+| Test.java:71:13:71:26 | length |
+| Test.java:75:31:75:47 | this |

From 38b1eb7c71a0dd77b59e493d3222a56f13c5ca31 Mon Sep 17 00:00:00 2001
From: Rasmus Lerchedahl Petersen <yoff@github.com>
Date: Tue, 1 Oct 2024 16:24:15 +0200
Subject: [PATCH 089/347] Python: just use `ListElementContent` for iterables

---
 .../dataflow/new/internal/DataFlowPrivate.qll | 27 ++-----------------
 .../lib/semmle/python/frameworks/Stdlib.qll   |  4 +++
 .../dataflow/coverage/test_builtins.py        |  4 +--
 3 files changed, 8 insertions(+), 27 deletions(-)

diff --git a/python/ql/lib/semmle/python/dataflow/new/internal/DataFlowPrivate.qll b/python/ql/lib/semmle/python/dataflow/new/internal/DataFlowPrivate.qll
index 4d97f04d28d8..3d2329f0ad98 100644
--- a/python/ql/lib/semmle/python/dataflow/new/internal/DataFlowPrivate.qll
+++ b/python/ql/lib/semmle/python/dataflow/new/internal/DataFlowPrivate.qll
@@ -179,33 +179,10 @@ private predicate synthDictSplatArgumentNodeStoreStep(
  * data from `x.name` is stored into the `yield` (and can subsequently be read out of the iterable).
  */
 predicate yieldStoreStep(Node nodeFrom, Content c, Node nodeTo) {
-  exists(Yield yield, Function func |
+  exists(Yield yield |
     nodeTo.asCfgNode() = yield.getAFlowNode() and
     nodeFrom.asCfgNode() = yield.getValue().getAFlowNode() and
-    func.containsInScope(yield)
-  |
-    exists(Comp comp | func = comp.getFunction() |
-      (
-        comp instanceof ListComp or
-        comp instanceof GeneratorExp
-      ) and
-      c instanceof ListElementContent
-      or
-      comp instanceof SetComp and
-      c instanceof SetElementContent
-      or
-      comp instanceof DictComp and
-      c instanceof DictionaryElementAnyContent
-    )
-    or
-    not exists(Comp comp | func = comp.getFunction()) and
-    (
-      c instanceof ListElementContent
-      or
-      c instanceof SetElementContent
-      or
-      c instanceof DictionaryElementAnyContent
-    )
+    c instanceof ListElementContent
   )
 }
 
diff --git a/python/ql/lib/semmle/python/frameworks/Stdlib.qll b/python/ql/lib/semmle/python/frameworks/Stdlib.qll
index 3c23b3929911..6d73258d65b8 100644
--- a/python/ql/lib/semmle/python/frameworks/Stdlib.qll
+++ b/python/ql/lib/semmle/python/frameworks/Stdlib.qll
@@ -4224,6 +4224,10 @@ module StdlibPrivate {
         preservesValue = true
       )
       or
+      input = "Argument[0].ListElement.TupleElement[1]" and
+      output = "ReturnValue.DictionaryElementAny" and
+      preservesValue = true
+      or
       exists(DataFlow::DictionaryElementContent dc, string key | key = dc.getKey() |
         input = "Argument[" + key + ":]" and
         output = "ReturnValue.DictionaryElement[" + key + "]" and
diff --git a/python/ql/test/library-tests/dataflow/coverage/test_builtins.py b/python/ql/test/library-tests/dataflow/coverage/test_builtins.py
index 245923370765..d0791ffae47b 100644
--- a/python/ql/test/library-tests/dataflow/coverage/test_builtins.py
+++ b/python/ql/test/library-tests/dataflow/coverage/test_builtins.py
@@ -132,8 +132,8 @@ def test_dict_from_keyword():
 @expects(2)
 def test_dict_from_list():
     d = dict([("k", SOURCE), ("k1", NONSOURCE)])
-    SINK(d["k"]) #$ MISSING: flow="SOURCE, l:-1 -> d[k]"
-    SINK_F(d["k1"])
+    SINK(d["k"]) #$ flow="SOURCE, l:-1 -> d['k']"
+    SINK_F(d["k1"]) #$ SPURIOUS: flow="SOURCE, l:-2 -> d['k1']"  // due to imprecise list content
 
 @expects(2)
 def test_dict_from_dict():

From a9b3c0d91b4988bf27e9c0e5b7d8494043932500 Mon Sep 17 00:00:00 2001
From: Calum Grant <calumgrant@github.com>
Date: Tue, 1 Oct 2024 15:47:12 +0100
Subject: [PATCH 090/347] C++: Address review comments

---
 cpp/ql/lib/semmle/code/cpp/Function.qll                    | 7 +++++--
 cpp/ql/lib/semmle/code/cpp/exprs/Expr.qll                  | 7 -------
 .../ir/implementation/raw/internal/TranslatedElement.qll   | 2 +-
 .../Likely Bugs/Memory Management/UninitializedLocal.ql    | 4 ++--
 .../CWE/CWE-457/semmle/tests/UninitializedLocal.expected   | 1 -
 5 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/cpp/ql/lib/semmle/code/cpp/Function.qll b/cpp/ql/lib/semmle/code/cpp/Function.qll
index 1234791576b1..7cfa779338f7 100644
--- a/cpp/ql/lib/semmle/code/cpp/Function.qll
+++ b/cpp/ql/lib/semmle/code/cpp/Function.qll
@@ -505,8 +505,11 @@ class Function extends Declaration, ControlFlowNode, AccessHolder, @function {
    * Holds if this function has extraction errors that create an `ErrorExpr`.
    */
   predicate hasErrors() {
-    // Exclude allocator call arguments because they are are always extracted as `ErrorExpr`.
-    exists(ErrorExpr e | e.getEnclosingFunction() = this and not e.isFirstAllocatorCallArgument())
+    exists(ErrorExpr e |
+      e.getEnclosingFunction() = this and
+      // Exclude the first allocator call argument because it is always extracted as `ErrorExpr`.
+      not exists(NewOrNewArrayExpr new | e = new.getAllocatorCall().getArgument(0))
+    )
   }
 }
 
diff --git a/cpp/ql/lib/semmle/code/cpp/exprs/Expr.qll b/cpp/ql/lib/semmle/code/cpp/exprs/Expr.qll
index 4eaf83e2c03f..91b57049a54e 100644
--- a/cpp/ql/lib/semmle/code/cpp/exprs/Expr.qll
+++ b/cpp/ql/lib/semmle/code/cpp/exprs/Expr.qll
@@ -744,13 +744,6 @@ class ErrorExpr extends Expr, @errorexpr {
   override string toString() { result = "<error expr>" }
 
   override string getAPrimaryQlClass() { result = "ErrorExpr" }
-
-  /**
-   * Holds if this error expression is the first argument to a `new` allocation call.
-   */
-  predicate isFirstAllocatorCallArgument() {
-    this = any(NewOrNewArrayExpr new).getAllocatorCall().getArgument(0)
-  }
 }
 
 /**
diff --git a/cpp/ql/lib/semmle/code/cpp/ir/implementation/raw/internal/TranslatedElement.qll b/cpp/ql/lib/semmle/code/cpp/ir/implementation/raw/internal/TranslatedElement.qll
index 1047dc2b8a7b..0f9bc370f7a5 100644
--- a/cpp/ql/lib/semmle/code/cpp/ir/implementation/raw/internal/TranslatedElement.qll
+++ b/cpp/ql/lib/semmle/code/cpp/ir/implementation/raw/internal/TranslatedElement.qll
@@ -151,7 +151,7 @@ private predicate ignoreExprOnly(Expr expr) {
   // The extractor deliberately emits an `ErrorExpr` as the first argument to
   // the allocator call, if any, of a `NewOrNewArrayExpr`. That `ErrorExpr`
   // should not be translated.
-  expr.(ErrorExpr).isFirstAllocatorCallArgument()
+  exists(NewOrNewArrayExpr new | expr = new.getAllocatorCall().getArgument(0))
   or
   not translateFunction(getEnclosingFunction(expr)) and
   not Raw::varHasIRFunc(getEnclosingVariable(expr))
diff --git a/cpp/ql/src/Likely Bugs/Memory Management/UninitializedLocal.ql b/cpp/ql/src/Likely Bugs/Memory Management/UninitializedLocal.ql
index 226cbfd322b9..763a142f1b90 100644
--- a/cpp/ql/src/Likely Bugs/Memory Management/UninitializedLocal.ql	
+++ b/cpp/ql/src/Likely Bugs/Memory Management/UninitializedLocal.ql	
@@ -65,6 +65,7 @@ predicate isSinkImpl(Instruction sink, VariableAccess va) {
   exists(LoadInstruction load |
     va = load.getUnconvertedResultExpression() and
     not va = commonException() and
+    not va.getTarget().(LocalVariable).getFunction().hasErrors() and
     sink = load.getSourceValue()
   )
 }
@@ -89,6 +90,5 @@ from
 where
   conf.hasFlowPath(source, sink) and
   isSinkImpl(sink.getInstruction(), va) and
-  v = va.getTarget() and
-  not v.getFunction().hasErrors()
+  v = va.getTarget()
 select va, source, sink, "The variable $@ may not be initialized at this access.", v, v.getName()
diff --git a/cpp/ql/test/query-tests/Security/CWE/CWE-457/semmle/tests/UninitializedLocal.expected b/cpp/ql/test/query-tests/Security/CWE/CWE-457/semmle/tests/UninitializedLocal.expected
index 30896607a18d..6773f5aef942 100644
--- a/cpp/ql/test/query-tests/Security/CWE/CWE-457/semmle/tests/UninitializedLocal.expected
+++ b/cpp/ql/test/query-tests/Security/CWE/CWE-457/semmle/tests/UninitializedLocal.expected
@@ -1,6 +1,5 @@
 edges
 nodes
-| errors.cpp:4:7:4:7 | definition of x | semmle.label | definition of x |
 | errors.cpp:13:7:13:7 | definition of x | semmle.label | definition of x |
 | test.cpp:11:6:11:8 | definition of foo | semmle.label | definition of foo |
 | test.cpp:111:6:111:8 | definition of foo | semmle.label | definition of foo |

From 315890680cc38d86c49c37e18d104fee2cb95775 Mon Sep 17 00:00:00 2001
From: Rasmus Lerchedahl Petersen <yoff@github.com>
Date: Tue, 1 Oct 2024 16:48:43 +0200
Subject: [PATCH 091/347] Python: dict only has one positional argument

---
 python/ql/lib/semmle/python/frameworks/Stdlib.qll | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/python/ql/lib/semmle/python/frameworks/Stdlib.qll b/python/ql/lib/semmle/python/frameworks/Stdlib.qll
index ca8b10d8578a..37cb23a472db 100644
--- a/python/ql/lib/semmle/python/frameworks/Stdlib.qll
+++ b/python/ql/lib/semmle/python/frameworks/Stdlib.qll
@@ -4219,7 +4219,7 @@ module StdlibPrivate {
 
     override predicate propagatesFlow(string input, string output, boolean preservesValue) {
       exists(DataFlow::DictionaryElementContent dc, string key | key = dc.getKey() |
-        input = "Argument[0..].DictionaryElement[" + key + "]" and
+        input = "Argument[0].DictionaryElement[" + key + "]" and
         output = "ReturnValue.DictionaryElement[" + key + "]" and
         preservesValue = true
       )

From 9a82ea48f2708439ce6c2b56b79f907a4171cb9f Mon Sep 17 00:00:00 2001
From: Chris Smowton <chris@smowton.net>
Date: Tue, 1 Oct 2024 15:41:17 +0100
Subject: [PATCH 092/347] Add test for cross-package references with test
 extraction

---
 go/ql/integration-tests/test-extraction/src/go.mod   |  2 +-
 .../test-extraction/src/pkg1/def.go                  |  7 +++++++
 .../test-extraction/src/pkg1/def_test.go             |  5 +++++
 .../test-extraction/src/pkg2/use.go                  | 12 ++++++++++++
 .../integration-tests/test-extraction/test.expected  |  4 ++++
 5 files changed, 29 insertions(+), 1 deletion(-)
 create mode 100644 go/ql/integration-tests/test-extraction/src/pkg1/def.go
 create mode 100644 go/ql/integration-tests/test-extraction/src/pkg1/def_test.go
 create mode 100644 go/ql/integration-tests/test-extraction/src/pkg2/use.go

diff --git a/go/ql/integration-tests/test-extraction/src/go.mod b/go/ql/integration-tests/test-extraction/src/go.mod
index c4a9f55df6c1..dae010718cf0 100644
--- a/go/ql/integration-tests/test-extraction/src/go.mod
+++ b/go/ql/integration-tests/test-extraction/src/go.mod
@@ -1,3 +1,3 @@
-go 1.14
+go 1.18
 
 module testsample
diff --git a/go/ql/integration-tests/test-extraction/src/pkg1/def.go b/go/ql/integration-tests/test-extraction/src/pkg1/def.go
new file mode 100644
index 000000000000..2492919f76df
--- /dev/null
+++ b/go/ql/integration-tests/test-extraction/src/pkg1/def.go
@@ -0,0 +1,7 @@
+package pkg1
+
+type Generic[T any] struct {
+	element T
+}
+
+func TestMe() { }
diff --git a/go/ql/integration-tests/test-extraction/src/pkg1/def_test.go b/go/ql/integration-tests/test-extraction/src/pkg1/def_test.go
new file mode 100644
index 000000000000..f321ab577c90
--- /dev/null
+++ b/go/ql/integration-tests/test-extraction/src/pkg1/def_test.go
@@ -0,0 +1,5 @@
+package pkg1
+
+func UsePkg1() {
+	TestMe()
+}
diff --git a/go/ql/integration-tests/test-extraction/src/pkg2/use.go b/go/ql/integration-tests/test-extraction/src/pkg2/use.go
new file mode 100644
index 000000000000..8caabc3847e7
--- /dev/null
+++ b/go/ql/integration-tests/test-extraction/src/pkg2/use.go
@@ -0,0 +1,12 @@
+package pkg2
+
+import (
+	"testsample/pkg1"
+)
+
+// This tests the case of cross-package generic type references
+// in the presence of test extraction. We need to make sure we
+// extract packages, including test variants, in the right order
+// such that we've seen pkg1.Generic before we try to use it here.
+
+type Specialised = pkg1.Generic[string]
diff --git a/go/ql/integration-tests/test-extraction/test.expected b/go/ql/integration-tests/test-extraction/test.expected
index 9e1585fc5ef8..c4135434743d 100644
--- a/go/ql/integration-tests/test-extraction/test.expected
+++ b/go/ql/integration-tests/test-extraction/test.expected
@@ -1,8 +1,12 @@
 #select
+| src/pkg1/def.go:0:0:0:0 | src/pkg1/def.go |
+| src/pkg1/def_test.go:0:0:0:0 | src/pkg1/def_test.go |
+| src/pkg2/use.go:0:0:0:0 | src/pkg2/use.go |
 | src/testme.go:0:0:0:0 | src/testme.go |
 | src/testme_blackbox_test.go:0:0:0:0 | src/testme_blackbox_test.go |
 | src/testme_test.go:0:0:0:0 | src/testme_test.go |
 calls
+| src/pkg1/def_test.go:4:2:4:9 | call to TestMe | src/pkg1/def.go:7:1:7:17 | function declaration |
 | src/testme_blackbox_test.go:10:18:10:44 | call to PublicFunction | src/testme.go:3:1:3:38 | function declaration |
 | src/testme_test.go:9:18:9:33 | call to PublicFunction | src/testme.go:3:1:3:38 | function declaration |
 | src/testme_test.go:14:19:14:35 | call to privateFunction | src/testme.go:5:1:5:39 | function declaration |

From 6ef2aed3aa0d1f57602261f4e8a2de680a43d3aa Mon Sep 17 00:00:00 2001
From: Chris Smowton <chris@smowton.net>
Date: Tue, 1 Oct 2024 15:52:30 +0100
Subject: [PATCH 093/347] Add blackbox, out-of-package test

---
 .../test-extraction/src/pkg1/def_blackbox_test.go        | 9 +++++++++
 go/ql/integration-tests/test-extraction/test.expected    | 2 ++
 go/ql/integration-tests/test-extraction/test.py          | 2 +-
 3 files changed, 12 insertions(+), 1 deletion(-)
 create mode 100644 go/ql/integration-tests/test-extraction/src/pkg1/def_blackbox_test.go

diff --git a/go/ql/integration-tests/test-extraction/src/pkg1/def_blackbox_test.go b/go/ql/integration-tests/test-extraction/src/pkg1/def_blackbox_test.go
new file mode 100644
index 000000000000..09c9474567a6
--- /dev/null
+++ b/go/ql/integration-tests/test-extraction/src/pkg1/def_blackbox_test.go
@@ -0,0 +1,9 @@
+package pkg1_test
+
+import (
+	"testsample/pkg1"
+)
+
+func UsePkg1() {
+	pkg1.TestMe()
+}
diff --git a/go/ql/integration-tests/test-extraction/test.expected b/go/ql/integration-tests/test-extraction/test.expected
index c4135434743d..eda27075ad43 100644
--- a/go/ql/integration-tests/test-extraction/test.expected
+++ b/go/ql/integration-tests/test-extraction/test.expected
@@ -1,11 +1,13 @@
 #select
 | src/pkg1/def.go:0:0:0:0 | src/pkg1/def.go |
+| src/pkg1/def_blackbox_test.go:0:0:0:0 | src/pkg1/def_blackbox_test.go |
 | src/pkg1/def_test.go:0:0:0:0 | src/pkg1/def_test.go |
 | src/pkg2/use.go:0:0:0:0 | src/pkg2/use.go |
 | src/testme.go:0:0:0:0 | src/testme.go |
 | src/testme_blackbox_test.go:0:0:0:0 | src/testme_blackbox_test.go |
 | src/testme_test.go:0:0:0:0 | src/testme_test.go |
 calls
+| src/pkg1/def_blackbox_test.go:8:2:8:14 | call to TestMe | src/pkg1/def.go:7:1:7:17 | function declaration |
 | src/pkg1/def_test.go:4:2:4:9 | call to TestMe | src/pkg1/def.go:7:1:7:17 | function declaration |
 | src/testme_blackbox_test.go:10:18:10:44 | call to PublicFunction | src/testme.go:3:1:3:38 | function declaration |
 | src/testme_test.go:9:18:9:33 | call to PublicFunction | src/testme.go:3:1:3:38 | function declaration |
diff --git a/go/ql/integration-tests/test-extraction/test.py b/go/ql/integration-tests/test-extraction/test.py
index 6419ae83f38c..e25b46801146 100644
--- a/go/ql/integration-tests/test-extraction/test.py
+++ b/go/ql/integration-tests/test-extraction/test.py
@@ -1,7 +1,7 @@
 import os
 
 def test_traced(codeql, go):
-    codeql.database.create(source_root="src", command="go test -c")
+    codeql.database.create(source_root="src", command="go test -c ./...")
 
 def test_autobuild(codeql, go):
     codeql.database.create(source_root="src", extractor_option = ["extract_tests=true"])

From cd1f10cdea4b0dc52cf8ef66923e2b6ea9fb98e3 Mon Sep 17 00:00:00 2001
From: Calum Grant <calumgrant@github.com>
Date: Tue, 1 Oct 2024 16:15:24 +0100
Subject: [PATCH 094/347] C++: Reinstate accidentally-deleted comment

---
 cpp/ql/src/Best Practices/Unused Entities/UnusedLocals.ql | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cpp/ql/src/Best Practices/Unused Entities/UnusedLocals.ql b/cpp/ql/src/Best Practices/Unused Entities/UnusedLocals.ql
index f824ecf53e76..5ae8468d0fc4 100644
--- a/cpp/ql/src/Best Practices/Unused Entities/UnusedLocals.ql	
+++ b/cpp/ql/src/Best Practices/Unused Entities/UnusedLocals.ql	
@@ -57,5 +57,5 @@ where
   not declarationHasSideEffects(v) and
   not exists(AsmStmt s | f = s.getEnclosingFunction()) and
   not v.getAnAttribute().getName() = "unused" and
-  not f.hasErrors()
+  not f.hasErrors() // Unextracted expressions may use `v`
 select v, "Variable " + v.getName() + " is not used."

From 3a54c10f369826f3d0491267f582dd4cf33c8bd5 Mon Sep 17 00:00:00 2001
From: Geoffrey White <40627776+geoffw0@users.noreply.github.com>
Date: Tue, 1 Oct 2024 17:35:30 +0100
Subject: [PATCH 095/347] Rust: For now exclude top-level AST elements from LOC
 counts.  This is not ideal.

---
 rust/ql/lib/codeql/files/FileSystem.qll                     | 2 ++
 rust/ql/test/query-tests/diagnostics/LinesOfCode.expected   | 2 +-
 .../test/query-tests/diagnostics/LinesOfUserCode.expected   | 2 +-
 .../query-tests/diagnostics/LinesOfUserCodeInFiles.expected | 6 +++---
 rust/ql/test/query-tests/diagnostics/SummaryStats.expected  | 4 ++--
 5 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/rust/ql/lib/codeql/files/FileSystem.qll b/rust/ql/lib/codeql/files/FileSystem.qll
index ee7a2235476e..a5410ece9712 100644
--- a/rust/ql/lib/codeql/files/FileSystem.qll
+++ b/rust/ql/lib/codeql/files/FileSystem.qll
@@ -5,6 +5,7 @@ private import codeql.util.FileSystem
 private import codeql.rust.elements.SourceFile
 private import codeql.rust.elements.AstNode
 private import codeql.rust.elements.Comment
+private import codeql.rust.elements.internal.generated.ParentChild
 
 private module Input implements InputSig {
   abstract class ContainerBase extends @container {
@@ -47,6 +48,7 @@ class File extends Container, Impl::File {
         exists(AstNode node, Location loc |
           not node instanceof Comment and
           not node instanceof SourceFile and
+          not getImmediateParent(node) instanceof SourceFile and // ignore top-level elements for now as we're getting their locations wrong when a comment is attached
           loc = node.getLocation()
         |
           node.getFile() = this and
diff --git a/rust/ql/test/query-tests/diagnostics/LinesOfCode.expected b/rust/ql/test/query-tests/diagnostics/LinesOfCode.expected
index d6a21ebb49cf..3885b955c3f3 100644
--- a/rust/ql/test/query-tests/diagnostics/LinesOfCode.expected
+++ b/rust/ql/test/query-tests/diagnostics/LinesOfCode.expected
@@ -1 +1 @@
-| 49 |
+| 46 |
diff --git a/rust/ql/test/query-tests/diagnostics/LinesOfUserCode.expected b/rust/ql/test/query-tests/diagnostics/LinesOfUserCode.expected
index d6a21ebb49cf..3885b955c3f3 100644
--- a/rust/ql/test/query-tests/diagnostics/LinesOfUserCode.expected
+++ b/rust/ql/test/query-tests/diagnostics/LinesOfUserCode.expected
@@ -1 +1 @@
-| 49 |
+| 46 |
diff --git a/rust/ql/test/query-tests/diagnostics/LinesOfUserCodeInFiles.expected b/rust/ql/test/query-tests/diagnostics/LinesOfUserCodeInFiles.expected
index dde3c7fe35a7..52ee2055e8fe 100644
--- a/rust/ql/test/query-tests/diagnostics/LinesOfUserCodeInFiles.expected
+++ b/rust/ql/test/query-tests/diagnostics/LinesOfUserCodeInFiles.expected
@@ -1,6 +1,6 @@
-| my_struct.rs:0:0:0:0 | my_struct.rs | 21 |
-| main.rs:0:0:0:0 | main.rs | 8 |
-| my_macro.rs:0:0:0:0 | my_macro.rs | 8 |
+| my_struct.rs:0:0:0:0 | my_struct.rs | 20 |
+| main.rs:0:0:0:0 | main.rs | 7 |
+| my_macro.rs:0:0:0:0 | my_macro.rs | 7 |
 | lib.rs:0:0:0:0 | lib.rs | 6 |
 | does_not_compile.rs:0:0:0:0 | does_not_compile.rs | 3 |
 | error.rs:0:0:0:0 | error.rs | 3 |
diff --git a/rust/ql/test/query-tests/diagnostics/SummaryStats.expected b/rust/ql/test/query-tests/diagnostics/SummaryStats.expected
index 6c5eafcc38e3..da1e6cd7b60c 100644
--- a/rust/ql/test/query-tests/diagnostics/SummaryStats.expected
+++ b/rust/ql/test/query-tests/diagnostics/SummaryStats.expected
@@ -1,5 +1,5 @@
 | Elements extracted | 216 |
 | Elements unextracted | 0 |
 | Files extracted | 6 |
-| Lines of code extracted | 49 |
-| Lines of user code extracted | 49 |
+| Lines of code extracted | 46 |
+| Lines of user code extracted | 46 |

From 5444a5bf8adce0b37cd34c05319b2a9813fa3301 Mon Sep 17 00:00:00 2001
From: Tom Hvitved <hvitved@github.com>
Date: Mon, 30 Sep 2024 16:57:31 +0200
Subject: [PATCH 096/347] Rust: Extend `while` and `for` CFG tests

---
 .../CONSISTENCY/CfgConsistency.expected       |   6 +-
 .../library-tests/controlflow/Cfg.expected    | 690 +++++++++---------
 .../ql/test/library-tests/controlflow/test.rs |  10 +-
 3 files changed, 356 insertions(+), 350 deletions(-)

diff --git a/rust/ql/test/library-tests/controlflow/CONSISTENCY/CfgConsistency.expected b/rust/ql/test/library-tests/controlflow/CONSISTENCY/CfgConsistency.expected
index ec8ec04bf3ea..49f433fff2c8 100644
--- a/rust/ql/test/library-tests/controlflow/CONSISTENCY/CfgConsistency.expected
+++ b/rust/ql/test/library-tests/controlflow/CONSISTENCY/CfgConsistency.expected
@@ -1,6 +1,6 @@
 deadEnd
 | test.rs:55:13:55:17 | b |
-| test.rs:224:28:224:33 | ... < ... |
-| test.rs:239:30:239:48 | BlockExpr |
+| test.rs:230:28:230:33 | ... < ... |
+| test.rs:245:30:245:48 | BlockExpr |
 scopeNoFirst
-| test.rs:62:5:66:5 | test_for |
+| test.rs:65:5:72:5 | test_for |
diff --git a/rust/ql/test/library-tests/controlflow/Cfg.expected b/rust/ql/test/library-tests/controlflow/Cfg.expected
index d0ab3bd10d63..f7d5365cf182 100644
--- a/rust/ql/test/library-tests/controlflow/Cfg.expected
+++ b/rust/ql/test/library-tests/controlflow/Cfg.expected
@@ -97,350 +97,350 @@
 | test.rs:47:21:47:36 | ExprStmt | test.rs:47:21:47:35 | ContinueExpr |  |
 | test.rs:49:17:49:31 | ContinueExpr | test.rs:44:17:48:17 | ExprStmt | continue('inner) |
 | test.rs:49:17:49:32 | ExprStmt | test.rs:49:17:49:31 | ContinueExpr |  |
-| test.rs:54:5:60:5 | enter test_while | test.rs:55:9:55:25 | LetStmt |  |
+| test.rs:54:5:63:5 | enter test_while | test.rs:55:9:55:25 | LetStmt |  |
 | test.rs:55:9:55:25 | LetStmt | test.rs:55:21:55:24 | true |  |
 | test.rs:55:21:55:24 | true | test.rs:55:13:55:17 | b |  |
-| test.rs:69:1:72:1 | enter test_nested_function | test.rs:70:5:70:28 | LetStmt |  |
-| test.rs:69:1:72:1 | exit test_nested_function (normal) | test.rs:69:1:72:1 | exit test_nested_function |  |
-| test.rs:69:40:72:1 | BlockExpr | test.rs:69:1:72:1 | exit test_nested_function (normal) |  |
-| test.rs:70:5:70:28 | LetStmt | test.rs:70:19:70:27 | ClosureExpr |  |
-| test.rs:70:9:70:15 | add_one | test.rs:71:5:71:11 | add_one | match, no-match |
-| test.rs:70:19:70:27 | ClosureExpr | test.rs:70:9:70:15 | add_one |  |
-| test.rs:70:19:70:27 | enter ClosureExpr | test.rs:70:23:70:23 | i |  |
-| test.rs:70:19:70:27 | exit ClosureExpr (normal) | test.rs:70:19:70:27 | exit ClosureExpr |  |
-| test.rs:70:23:70:23 | i | test.rs:70:27:70:27 | 1 |  |
-| test.rs:70:23:70:27 | ... + ... | test.rs:70:19:70:27 | exit ClosureExpr (normal) |  |
-| test.rs:70:27:70:27 | 1 | test.rs:70:23:70:27 | ... + ... |  |
-| test.rs:71:5:71:11 | add_one | test.rs:71:13:71:19 | add_one |  |
-| test.rs:71:5:71:23 | CallExpr | test.rs:69:40:72:1 | BlockExpr |  |
-| test.rs:71:13:71:19 | add_one | test.rs:71:21:71:21 | n |  |
-| test.rs:71:13:71:22 | CallExpr | test.rs:71:5:71:23 | CallExpr |  |
-| test.rs:71:21:71:21 | n | test.rs:71:13:71:22 | CallExpr |  |
-| test.rs:76:5:82:5 | enter test_if_else | test.rs:77:12:77:12 | n |  |
-| test.rs:76:5:82:5 | exit test_if_else (normal) | test.rs:76:5:82:5 | exit test_if_else |  |
-| test.rs:76:36:82:5 | BlockExpr | test.rs:76:5:82:5 | exit test_if_else (normal) |  |
-| test.rs:77:9:81:9 | IfExpr | test.rs:76:36:82:5 | BlockExpr |  |
-| test.rs:77:12:77:12 | n | test.rs:77:17:77:17 | 0 |  |
-| test.rs:77:12:77:17 | ... <= ... | test.rs:78:13:78:13 | 0 | true |
-| test.rs:77:12:77:17 | ... <= ... | test.rs:80:13:80:13 | n | false |
-| test.rs:77:17:77:17 | 0 | test.rs:77:12:77:17 | ... <= ... |  |
-| test.rs:77:19:79:9 | BlockExpr | test.rs:77:9:81:9 | IfExpr |  |
-| test.rs:78:13:78:13 | 0 | test.rs:77:19:79:9 | BlockExpr |  |
-| test.rs:79:16:81:9 | BlockExpr | test.rs:77:9:81:9 | IfExpr |  |
-| test.rs:80:13:80:13 | n | test.rs:80:17:80:17 | 1 |  |
-| test.rs:80:13:80:17 | ... - ... | test.rs:79:16:81:9 | BlockExpr |  |
-| test.rs:80:17:80:17 | 1 | test.rs:80:13:80:17 | ... - ... |  |
-| test.rs:84:5:90:5 | enter test_if_let_else | test.rs:85:12:85:26 | LetExpr |  |
-| test.rs:84:5:90:5 | exit test_if_let_else (normal) | test.rs:84:5:90:5 | exit test_if_let_else |  |
-| test.rs:84:48:90:5 | BlockExpr | test.rs:84:5:90:5 | exit test_if_let_else (normal) |  |
-| test.rs:85:9:89:9 | IfExpr | test.rs:84:48:90:5 | BlockExpr |  |
-| test.rs:85:12:85:26 | LetExpr | test.rs:85:16:85:22 | TupleStructPat |  |
-| test.rs:85:16:85:22 | TupleStructPat | test.rs:86:13:86:13 | n | match |
-| test.rs:85:16:85:22 | TupleStructPat | test.rs:88:13:88:13 | 0 | no-match |
-| test.rs:85:28:87:9 | BlockExpr | test.rs:85:9:89:9 | IfExpr |  |
-| test.rs:86:13:86:13 | n | test.rs:85:28:87:9 | BlockExpr |  |
-| test.rs:87:16:89:9 | BlockExpr | test.rs:85:9:89:9 | IfExpr |  |
-| test.rs:88:13:88:13 | 0 | test.rs:87:16:89:9 | BlockExpr |  |
-| test.rs:92:5:97:5 | enter test_if_let | test.rs:93:9:95:9 | ExprStmt |  |
-| test.rs:92:5:97:5 | exit test_if_let (normal) | test.rs:92:5:97:5 | exit test_if_let |  |
-| test.rs:92:43:97:5 | BlockExpr | test.rs:92:5:97:5 | exit test_if_let (normal) |  |
-| test.rs:93:9:95:9 | ExprStmt | test.rs:93:12:93:26 | LetExpr |  |
-| test.rs:93:9:95:9 | IfExpr | test.rs:96:9:96:9 | 0 |  |
-| test.rs:93:12:93:26 | LetExpr | test.rs:93:16:93:22 | TupleStructPat |  |
-| test.rs:93:16:93:22 | TupleStructPat | test.rs:93:9:95:9 | IfExpr | no-match |
-| test.rs:93:16:93:22 | TupleStructPat | test.rs:94:13:94:13 | n | match |
-| test.rs:93:28:95:9 | BlockExpr | test.rs:93:9:95:9 | IfExpr |  |
-| test.rs:94:13:94:13 | n | test.rs:93:28:95:9 | BlockExpr |  |
-| test.rs:96:9:96:9 | 0 | test.rs:92:43:97:5 | BlockExpr |  |
-| test.rs:99:5:105:5 | enter test_nested_if | test.rs:100:16:100:16 | PathExpr |  |
-| test.rs:99:5:105:5 | exit test_nested_if (normal) | test.rs:99:5:105:5 | exit test_nested_if |  |
-| test.rs:99:38:105:5 | BlockExpr | test.rs:99:5:105:5 | exit test_nested_if (normal) |  |
-| test.rs:100:9:104:9 | IfExpr | test.rs:99:38:105:5 | BlockExpr |  |
-| test.rs:100:12:100:49 | ParenExpr | test.rs:101:13:101:13 | 1 | true |
-| test.rs:100:12:100:49 | ParenExpr | test.rs:103:13:103:13 | 0 | false |
-| test.rs:100:13:100:48 | IfExpr | test.rs:100:12:100:49 | ParenExpr |  |
-| test.rs:100:16:100:16 | PathExpr | test.rs:100:20:100:20 | 0 |  |
-| test.rs:100:16:100:20 | ... < ... | test.rs:100:24:100:24 | a | true |
-| test.rs:100:16:100:20 | ... < ... | test.rs:100:41:100:41 | a | false |
-| test.rs:100:20:100:20 | 0 | test.rs:100:16:100:20 | ... < ... |  |
-| test.rs:100:22:100:32 | BlockExpr | test.rs:100:13:100:48 | IfExpr |  |
-| test.rs:100:24:100:24 | a | test.rs:100:29:100:30 | 10 |  |
-| test.rs:100:24:100:30 | ... < ... | test.rs:100:22:100:32 | BlockExpr |  |
-| test.rs:100:28:100:30 | - ... | test.rs:100:24:100:30 | ... < ... |  |
-| test.rs:100:29:100:30 | 10 | test.rs:100:28:100:30 | - ... |  |
-| test.rs:100:39:100:48 | BlockExpr | test.rs:100:13:100:48 | IfExpr |  |
-| test.rs:100:41:100:41 | a | test.rs:100:45:100:46 | 10 |  |
-| test.rs:100:41:100:46 | ... > ... | test.rs:100:39:100:48 | BlockExpr |  |
-| test.rs:100:45:100:46 | 10 | test.rs:100:41:100:46 | ... > ... |  |
-| test.rs:100:51:102:9 | BlockExpr | test.rs:100:9:104:9 | IfExpr |  |
-| test.rs:101:13:101:13 | 1 | test.rs:100:51:102:9 | BlockExpr |  |
-| test.rs:102:16:104:9 | BlockExpr | test.rs:100:9:104:9 | IfExpr |  |
-| test.rs:103:13:103:13 | 0 | test.rs:102:16:104:9 | BlockExpr |  |
-| test.rs:107:5:116:5 | enter test_nested_if_match | test.rs:108:19:108:19 | a |  |
-| test.rs:107:5:116:5 | exit test_nested_if_match (normal) | test.rs:107:5:116:5 | exit test_nested_if_match |  |
-| test.rs:107:44:116:5 | BlockExpr | test.rs:107:5:116:5 | exit test_nested_if_match (normal) |  |
-| test.rs:108:9:115:9 | IfExpr | test.rs:107:44:116:5 | BlockExpr |  |
-| test.rs:108:12:111:10 | ParenExpr | test.rs:112:13:112:13 | 1 | true |
-| test.rs:108:12:111:10 | ParenExpr | test.rs:114:13:114:13 | 0 | false |
-| test.rs:108:13:111:9 | MatchExpr | test.rs:108:12:111:10 | ParenExpr |  |
-| test.rs:108:19:108:19 | a | test.rs:109:13:109:13 | LiteralPat |  |
-| test.rs:109:13:109:13 | LiteralPat | test.rs:109:18:109:21 | true | match |
-| test.rs:109:13:109:13 | LiteralPat | test.rs:110:13:110:13 | WildcardPat | no-match |
-| test.rs:109:18:109:21 | true | test.rs:108:13:111:9 | MatchExpr |  |
-| test.rs:110:13:110:13 | WildcardPat | test.rs:110:18:110:22 | false | match |
-| test.rs:110:18:110:22 | false | test.rs:108:13:111:9 | MatchExpr |  |
-| test.rs:111:12:113:9 | BlockExpr | test.rs:108:9:115:9 | IfExpr |  |
-| test.rs:112:13:112:13 | 1 | test.rs:111:12:113:9 | BlockExpr |  |
-| test.rs:113:16:115:9 | BlockExpr | test.rs:108:9:115:9 | IfExpr |  |
-| test.rs:114:13:114:13 | 0 | test.rs:113:16:115:9 | BlockExpr |  |
-| test.rs:118:5:127:5 | enter test_nested_if_block | test.rs:120:13:120:15 | ExprStmt |  |
-| test.rs:118:5:127:5 | exit test_nested_if_block (normal) | test.rs:118:5:127:5 | exit test_nested_if_block |  |
-| test.rs:118:44:127:5 | BlockExpr | test.rs:118:5:127:5 | exit test_nested_if_block (normal) |  |
-| test.rs:119:9:126:9 | IfExpr | test.rs:118:44:127:5 | BlockExpr |  |
-| test.rs:119:12:122:9 | BlockExpr | test.rs:123:13:123:13 | 1 | true |
-| test.rs:119:12:122:9 | BlockExpr | test.rs:125:13:125:13 | 0 | false |
-| test.rs:120:13:120:14 | TupleExpr | test.rs:121:13:121:13 | a |  |
-| test.rs:120:13:120:15 | ExprStmt | test.rs:120:13:120:14 | TupleExpr |  |
-| test.rs:121:13:121:13 | a | test.rs:121:17:121:17 | 0 |  |
-| test.rs:121:13:121:17 | ... > ... | test.rs:119:12:122:9 | BlockExpr | false, true |
-| test.rs:121:17:121:17 | 0 | test.rs:121:13:121:17 | ... > ... |  |
-| test.rs:122:11:124:9 | BlockExpr | test.rs:119:9:126:9 | IfExpr |  |
-| test.rs:123:13:123:13 | 1 | test.rs:122:11:124:9 | BlockExpr |  |
-| test.rs:124:16:126:9 | BlockExpr | test.rs:119:9:126:9 | IfExpr |  |
-| test.rs:125:13:125:13 | 0 | test.rs:124:16:126:9 | BlockExpr |  |
-| test.rs:129:5:136:5 | enter test_if_assignment | test.rs:130:9:130:26 | LetStmt |  |
-| test.rs:129:5:136:5 | exit test_if_assignment (normal) | test.rs:129:5:136:5 | exit test_if_assignment |  |
-| test.rs:129:42:136:5 | BlockExpr | test.rs:129:5:136:5 | exit test_if_assignment (normal) |  |
-| test.rs:130:9:130:26 | LetStmt | test.rs:130:21:130:25 | false |  |
-| test.rs:130:13:130:17 | x | test.rs:131:12:131:12 | x | match, no-match |
-| test.rs:130:21:130:25 | false | test.rs:130:13:130:17 | x |  |
-| test.rs:131:9:135:9 | IfExpr | test.rs:129:42:136:5 | BlockExpr |  |
-| test.rs:131:12:131:12 | x | test.rs:131:16:131:19 | true |  |
-| test.rs:131:12:131:19 | ... = ... | test.rs:132:13:132:13 | 1 | true |
-| test.rs:131:12:131:19 | ... = ... | test.rs:134:13:134:13 | 0 | false |
-| test.rs:131:16:131:19 | true | test.rs:131:12:131:19 | ... = ... |  |
-| test.rs:131:21:133:9 | BlockExpr | test.rs:131:9:135:9 | IfExpr |  |
-| test.rs:132:13:132:13 | 1 | test.rs:131:21:133:9 | BlockExpr |  |
-| test.rs:133:16:135:9 | BlockExpr | test.rs:131:9:135:9 | IfExpr |  |
-| test.rs:134:13:134:13 | 0 | test.rs:133:16:135:9 | BlockExpr |  |
-| test.rs:138:5:149:5 | enter test_if_loop1 | test.rs:140:13:142:14 | ExprStmt |  |
-| test.rs:138:5:149:5 | exit test_if_loop1 (normal) | test.rs:138:5:149:5 | exit test_if_loop1 |  |
-| test.rs:138:37:149:5 | BlockExpr | test.rs:138:5:149:5 | exit test_if_loop1 (normal) |  |
-| test.rs:139:9:148:9 | IfExpr | test.rs:138:37:149:5 | BlockExpr |  |
-| test.rs:139:12:144:10 | ParenExpr | test.rs:145:13:145:13 | 1 | true |
-| test.rs:139:12:144:10 | ParenExpr | test.rs:147:13:147:13 | 0 | false |
-| test.rs:139:13:144:9 | LoopExpr | test.rs:139:12:144:10 | ParenExpr |  |
-| test.rs:139:18:144:9 | BlockExpr | test.rs:140:13:142:14 | ExprStmt |  |
-| test.rs:140:13:142:13 | IfExpr | test.rs:143:13:143:19 | ExprStmt |  |
-| test.rs:140:13:142:14 | ExprStmt | test.rs:140:16:140:16 | a |  |
-| test.rs:140:16:140:16 | a | test.rs:140:20:140:20 | 0 |  |
-| test.rs:140:16:140:20 | ... > ... | test.rs:140:13:142:13 | IfExpr | false |
-| test.rs:140:16:140:20 | ... > ... | test.rs:141:17:141:29 | ExprStmt | true |
-| test.rs:140:20:140:20 | 0 | test.rs:140:16:140:20 | ... > ... |  |
-| test.rs:141:17:141:28 | BreakExpr | test.rs:139:13:144:9 | LoopExpr | break |
-| test.rs:141:17:141:29 | ExprStmt | test.rs:141:23:141:23 | a |  |
-| test.rs:141:23:141:23 | a | test.rs:141:27:141:28 | 10 |  |
-| test.rs:141:23:141:28 | ... > ... | test.rs:141:17:141:28 | BreakExpr |  |
-| test.rs:141:27:141:28 | 10 | test.rs:141:23:141:28 | ... > ... |  |
-| test.rs:143:13:143:13 | a | test.rs:143:17:143:18 | 10 |  |
-| test.rs:143:13:143:18 | ... < ... | test.rs:139:18:144:9 | BlockExpr |  |
-| test.rs:143:13:143:19 | ExprStmt | test.rs:143:13:143:13 | a |  |
-| test.rs:143:17:143:18 | 10 | test.rs:143:13:143:18 | ... < ... |  |
-| test.rs:144:12:146:9 | BlockExpr | test.rs:139:9:148:9 | IfExpr |  |
-| test.rs:145:13:145:13 | 1 | test.rs:144:12:146:9 | BlockExpr |  |
-| test.rs:146:16:148:9 | BlockExpr | test.rs:139:9:148:9 | IfExpr |  |
-| test.rs:147:13:147:13 | 0 | test.rs:146:16:148:9 | BlockExpr |  |
-| test.rs:151:5:162:5 | enter test_if_loop2 | test.rs:153:13:155:14 | ExprStmt |  |
-| test.rs:151:5:162:5 | exit test_if_loop2 (normal) | test.rs:151:5:162:5 | exit test_if_loop2 |  |
-| test.rs:151:37:162:5 | BlockExpr | test.rs:151:5:162:5 | exit test_if_loop2 (normal) |  |
-| test.rs:152:9:161:9 | IfExpr | test.rs:151:37:162:5 | BlockExpr |  |
-| test.rs:152:12:157:10 | ParenExpr | test.rs:158:13:158:13 | 1 | true |
-| test.rs:152:12:157:10 | ParenExpr | test.rs:160:13:160:13 | 0 | false |
-| test.rs:152:13:157:9 | LoopExpr | test.rs:152:12:157:10 | ParenExpr |  |
-| test.rs:152:26:157:9 | BlockExpr | test.rs:153:13:155:14 | ExprStmt |  |
-| test.rs:153:13:155:13 | IfExpr | test.rs:156:13:156:19 | ExprStmt |  |
-| test.rs:153:13:155:14 | ExprStmt | test.rs:153:16:153:16 | a |  |
-| test.rs:153:16:153:16 | a | test.rs:153:20:153:20 | 0 |  |
-| test.rs:153:16:153:20 | ... > ... | test.rs:153:13:155:13 | IfExpr | false |
-| test.rs:153:16:153:20 | ... > ... | test.rs:154:17:154:36 | ExprStmt | true |
-| test.rs:153:20:153:20 | 0 | test.rs:153:16:153:20 | ... > ... |  |
-| test.rs:154:17:154:35 | BreakExpr | test.rs:152:13:157:9 | LoopExpr | break('label) |
-| test.rs:154:17:154:36 | ExprStmt | test.rs:154:30:154:30 | a |  |
-| test.rs:154:30:154:30 | a | test.rs:154:34:154:35 | 10 |  |
-| test.rs:154:30:154:35 | ... > ... | test.rs:154:17:154:35 | BreakExpr |  |
-| test.rs:154:34:154:35 | 10 | test.rs:154:30:154:35 | ... > ... |  |
-| test.rs:156:13:156:13 | a | test.rs:156:17:156:18 | 10 |  |
-| test.rs:156:13:156:18 | ... < ... | test.rs:152:26:157:9 | BlockExpr |  |
-| test.rs:156:13:156:19 | ExprStmt | test.rs:156:13:156:13 | a |  |
-| test.rs:156:17:156:18 | 10 | test.rs:156:13:156:18 | ... < ... |  |
-| test.rs:157:12:159:9 | BlockExpr | test.rs:152:9:161:9 | IfExpr |  |
-| test.rs:158:13:158:13 | 1 | test.rs:157:12:159:9 | BlockExpr |  |
-| test.rs:159:16:161:9 | BlockExpr | test.rs:152:9:161:9 | IfExpr |  |
-| test.rs:160:13:160:13 | 0 | test.rs:159:16:161:9 | BlockExpr |  |
-| test.rs:164:5:172:5 | enter test_labelled_block | test.rs:166:13:166:31 | ExprStmt |  |
-| test.rs:164:5:172:5 | exit test_labelled_block (normal) | test.rs:164:5:172:5 | exit test_labelled_block |  |
-| test.rs:166:13:166:30 | BreakExpr | test.rs:164:5:172:5 | exit test_labelled_block (normal) | break('block) |
-| test.rs:166:13:166:31 | ExprStmt | test.rs:166:26:166:26 | a |  |
-| test.rs:166:26:166:26 | a | test.rs:166:30:166:30 | 0 |  |
-| test.rs:166:26:166:30 | ... > ... | test.rs:166:13:166:30 | BreakExpr |  |
-| test.rs:166:30:166:30 | 0 | test.rs:166:26:166:30 | ... > ... |  |
-| test.rs:177:5:180:5 | enter test_and_operator | test.rs:178:9:178:28 | LetStmt |  |
-| test.rs:177:5:180:5 | exit test_and_operator (normal) | test.rs:177:5:180:5 | exit test_and_operator |  |
-| test.rs:177:61:180:5 | BlockExpr | test.rs:177:5:180:5 | exit test_and_operator (normal) |  |
-| test.rs:178:9:178:28 | LetStmt | test.rs:178:17:178:27 | ... && ... |  |
-| test.rs:178:13:178:13 | d | test.rs:179:9:179:9 | d | match, no-match |
-| test.rs:178:17:178:17 | a | test.rs:178:13:178:13 | d | false |
-| test.rs:178:17:178:17 | a | test.rs:178:22:178:22 | b | true |
-| test.rs:178:17:178:22 | ... && ... | test.rs:178:17:178:17 | a |  |
-| test.rs:178:17:178:27 | ... && ... | test.rs:178:17:178:22 | ... && ... |  |
-| test.rs:178:22:178:22 | b | test.rs:178:13:178:13 | d | false |
-| test.rs:178:22:178:22 | b | test.rs:178:27:178:27 | c | true |
-| test.rs:178:27:178:27 | c | test.rs:178:13:178:13 | d |  |
-| test.rs:179:9:179:9 | d | test.rs:177:61:180:5 | BlockExpr |  |
-| test.rs:182:5:185:5 | enter test_or_operator | test.rs:183:9:183:28 | LetStmt |  |
-| test.rs:182:5:185:5 | exit test_or_operator (normal) | test.rs:182:5:185:5 | exit test_or_operator |  |
-| test.rs:182:60:185:5 | BlockExpr | test.rs:182:5:185:5 | exit test_or_operator (normal) |  |
-| test.rs:183:9:183:28 | LetStmt | test.rs:183:17:183:27 | ... \|\| ... |  |
-| test.rs:183:13:183:13 | d | test.rs:184:9:184:9 | d | match, no-match |
-| test.rs:183:17:183:17 | a | test.rs:183:13:183:13 | d | true |
-| test.rs:183:17:183:17 | a | test.rs:183:22:183:22 | b | false |
-| test.rs:183:17:183:22 | ... \|\| ... | test.rs:183:17:183:17 | a |  |
-| test.rs:183:17:183:27 | ... \|\| ... | test.rs:183:17:183:22 | ... \|\| ... |  |
-| test.rs:183:22:183:22 | b | test.rs:183:13:183:13 | d | true |
-| test.rs:183:22:183:22 | b | test.rs:183:27:183:27 | c | false |
-| test.rs:183:27:183:27 | c | test.rs:183:13:183:13 | d |  |
-| test.rs:184:9:184:9 | d | test.rs:182:60:185:5 | BlockExpr |  |
-| test.rs:187:5:190:5 | enter test_or_operator_2 | test.rs:188:9:188:36 | LetStmt |  |
-| test.rs:187:5:190:5 | exit test_or_operator_2 (normal) | test.rs:187:5:190:5 | exit test_or_operator_2 |  |
-| test.rs:187:61:190:5 | BlockExpr | test.rs:187:5:190:5 | exit test_or_operator_2 (normal) |  |
-| test.rs:188:9:188:36 | LetStmt | test.rs:188:17:188:35 | ... \|\| ... |  |
-| test.rs:188:13:188:13 | d | test.rs:189:9:189:9 | d | match, no-match |
-| test.rs:188:17:188:17 | a | test.rs:188:13:188:13 | d | true |
-| test.rs:188:17:188:17 | a | test.rs:188:23:188:23 | b | false |
-| test.rs:188:17:188:30 | ... \|\| ... | test.rs:188:17:188:17 | a |  |
-| test.rs:188:17:188:35 | ... \|\| ... | test.rs:188:17:188:30 | ... \|\| ... |  |
-| test.rs:188:22:188:30 | ParenExpr | test.rs:188:13:188:13 | d | true |
-| test.rs:188:22:188:30 | ParenExpr | test.rs:188:35:188:35 | c | false |
-| test.rs:188:23:188:23 | b | test.rs:188:28:188:29 | 28 |  |
-| test.rs:188:23:188:29 | ... == ... | test.rs:188:22:188:30 | ParenExpr |  |
-| test.rs:188:28:188:29 | 28 | test.rs:188:23:188:29 | ... == ... |  |
-| test.rs:188:35:188:35 | c | test.rs:188:13:188:13 | d |  |
-| test.rs:189:9:189:9 | d | test.rs:187:61:190:5 | BlockExpr |  |
-| test.rs:192:5:195:5 | enter test_not_operator | test.rs:193:9:193:19 | LetStmt |  |
-| test.rs:192:5:195:5 | exit test_not_operator (normal) | test.rs:192:5:195:5 | exit test_not_operator |  |
-| test.rs:192:43:195:5 | BlockExpr | test.rs:192:5:195:5 | exit test_not_operator (normal) |  |
-| test.rs:193:9:193:19 | LetStmt | test.rs:193:18:193:18 | a |  |
-| test.rs:193:13:193:13 | d | test.rs:194:9:194:9 | d | match, no-match |
-| test.rs:193:17:193:18 | ! ... | test.rs:193:13:193:13 | d |  |
-| test.rs:193:18:193:18 | a | test.rs:193:17:193:18 | ! ... |  |
-| test.rs:194:9:194:9 | d | test.rs:192:43:195:5 | BlockExpr |  |
-| test.rs:197:5:203:5 | enter test_if_and_operator | test.rs:198:12:198:22 | ... && ... |  |
-| test.rs:197:5:203:5 | exit test_if_and_operator (normal) | test.rs:197:5:203:5 | exit test_if_and_operator |  |
-| test.rs:197:63:203:5 | BlockExpr | test.rs:197:5:203:5 | exit test_if_and_operator (normal) |  |
-| test.rs:198:9:202:9 | IfExpr | test.rs:197:63:203:5 | BlockExpr |  |
-| test.rs:198:12:198:12 | a | test.rs:198:17:198:17 | b | true |
-| test.rs:198:12:198:12 | a | test.rs:201:13:201:17 | false | false |
-| test.rs:198:12:198:17 | ... && ... | test.rs:198:12:198:12 | a |  |
-| test.rs:198:12:198:22 | ... && ... | test.rs:198:12:198:17 | ... && ... |  |
-| test.rs:198:17:198:17 | b | test.rs:198:22:198:22 | c | true |
-| test.rs:198:17:198:17 | b | test.rs:201:13:201:17 | false | false |
-| test.rs:198:22:198:22 | c | test.rs:199:13:199:16 | true | true |
-| test.rs:198:22:198:22 | c | test.rs:201:13:201:17 | false | false |
-| test.rs:198:24:200:9 | BlockExpr | test.rs:198:9:202:9 | IfExpr |  |
-| test.rs:199:13:199:16 | true | test.rs:198:24:200:9 | BlockExpr |  |
-| test.rs:200:16:202:9 | BlockExpr | test.rs:198:9:202:9 | IfExpr |  |
-| test.rs:201:13:201:17 | false | test.rs:200:16:202:9 | BlockExpr |  |
-| test.rs:205:5:211:5 | enter test_if_or_operator | test.rs:206:12:206:22 | ... \|\| ... |  |
-| test.rs:205:5:211:5 | exit test_if_or_operator (normal) | test.rs:205:5:211:5 | exit test_if_or_operator |  |
-| test.rs:205:62:211:5 | BlockExpr | test.rs:205:5:211:5 | exit test_if_or_operator (normal) |  |
-| test.rs:206:9:210:9 | IfExpr | test.rs:205:62:211:5 | BlockExpr |  |
-| test.rs:206:12:206:12 | a | test.rs:206:17:206:17 | b | false |
-| test.rs:206:12:206:12 | a | test.rs:207:13:207:16 | true | true |
-| test.rs:206:12:206:17 | ... \|\| ... | test.rs:206:12:206:12 | a |  |
-| test.rs:206:12:206:22 | ... \|\| ... | test.rs:206:12:206:17 | ... \|\| ... |  |
-| test.rs:206:17:206:17 | b | test.rs:206:22:206:22 | c | false |
-| test.rs:206:17:206:17 | b | test.rs:207:13:207:16 | true | true |
-| test.rs:206:22:206:22 | c | test.rs:207:13:207:16 | true | true |
-| test.rs:206:22:206:22 | c | test.rs:209:13:209:17 | false | false |
-| test.rs:206:24:208:9 | BlockExpr | test.rs:206:9:210:9 | IfExpr |  |
-| test.rs:207:13:207:16 | true | test.rs:206:24:208:9 | BlockExpr |  |
-| test.rs:208:16:210:9 | BlockExpr | test.rs:206:9:210:9 | IfExpr |  |
-| test.rs:209:13:209:17 | false | test.rs:208:16:210:9 | BlockExpr |  |
-| test.rs:213:5:219:5 | enter test_if_not_operator | test.rs:214:13:214:13 | a |  |
-| test.rs:213:5:219:5 | exit test_if_not_operator (normal) | test.rs:213:5:219:5 | exit test_if_not_operator |  |
-| test.rs:213:46:219:5 | BlockExpr | test.rs:213:5:219:5 | exit test_if_not_operator (normal) |  |
-| test.rs:214:9:218:9 | IfExpr | test.rs:213:46:219:5 | BlockExpr |  |
-| test.rs:214:12:214:13 | ! ... | test.rs:215:13:215:16 | true | true |
-| test.rs:214:12:214:13 | ! ... | test.rs:217:13:217:17 | false | false |
-| test.rs:214:13:214:13 | a | test.rs:214:12:214:13 | ! ... | false, true |
-| test.rs:214:15:216:9 | BlockExpr | test.rs:214:9:218:9 | IfExpr |  |
-| test.rs:215:13:215:16 | true | test.rs:214:15:216:9 | BlockExpr |  |
-| test.rs:216:16:218:9 | BlockExpr | test.rs:214:9:218:9 | IfExpr |  |
-| test.rs:217:13:217:17 | false | test.rs:216:16:218:9 | BlockExpr |  |
-| test.rs:222:1:228:1 | enter test_match | test.rs:223:11:223:21 | maybe_digit |  |
-| test.rs:222:1:228:1 | exit test_match (normal) | test.rs:222:1:228:1 | exit test_match |  |
-| test.rs:222:48:228:1 | BlockExpr | test.rs:222:1:228:1 | exit test_match (normal) |  |
-| test.rs:223:5:227:5 | MatchExpr | test.rs:222:48:228:1 | BlockExpr |  |
-| test.rs:223:11:223:21 | maybe_digit | test.rs:224:9:224:23 | TupleStructPat |  |
-| test.rs:224:9:224:23 | TupleStructPat | test.rs:224:28:224:28 | x | match |
-| test.rs:224:9:224:23 | TupleStructPat | test.rs:225:9:225:23 | TupleStructPat | no-match |
-| test.rs:224:28:224:28 | x | test.rs:224:32:224:33 | 10 |  |
-| test.rs:224:32:224:33 | 10 | test.rs:224:28:224:33 | ... < ... |  |
-| test.rs:225:9:225:23 | TupleStructPat | test.rs:225:28:225:28 | x | match |
-| test.rs:225:9:225:23 | TupleStructPat | test.rs:226:9:226:20 | PathPat | no-match |
-| test.rs:225:28:225:28 | x | test.rs:223:5:227:5 | MatchExpr |  |
-| test.rs:226:9:226:20 | PathPat | test.rs:226:25:226:25 | 5 | match |
-| test.rs:226:25:226:25 | 5 | test.rs:223:5:227:5 | MatchExpr |  |
-| test.rs:231:5:236:5 | enter test_infinite_loop | test.rs:232:9:234:9 | ExprStmt |  |
-| test.rs:232:9:234:9 | ExprStmt | test.rs:233:13:233:13 | 1 |  |
-| test.rs:232:14:234:9 | BlockExpr | test.rs:233:13:233:13 | 1 |  |
-| test.rs:233:13:233:13 | 1 | test.rs:232:14:234:9 | BlockExpr |  |
-| test.rs:238:5:241:5 | enter test_let_match | test.rs:239:9:239:49 | LetStmt |  |
-| test.rs:238:5:241:5 | exit test_let_match (normal) | test.rs:238:5:241:5 | exit test_let_match |  |
-| test.rs:238:39:241:5 | BlockExpr | test.rs:238:5:241:5 | exit test_let_match (normal) |  |
-| test.rs:239:9:239:49 | LetStmt | test.rs:239:23:239:23 | a |  |
-| test.rs:239:13:239:19 | TupleStructPat | test.rs:239:32:239:46 | "Expected some" | no-match |
-| test.rs:239:13:239:19 | TupleStructPat | test.rs:240:9:240:9 | n | match |
-| test.rs:239:23:239:23 | a | test.rs:239:13:239:19 | TupleStructPat |  |
-| test.rs:239:32:239:46 | "Expected some" | test.rs:239:30:239:48 | BlockExpr |  |
-| test.rs:240:9:240:9 | n | test.rs:238:39:241:5 | BlockExpr |  |
-| test.rs:244:1:249:1 | enter dead_code | test.rs:245:5:247:5 | ExprStmt |  |
-| test.rs:244:1:249:1 | exit dead_code (normal) | test.rs:244:1:249:1 | exit dead_code |  |
-| test.rs:245:5:247:5 | ExprStmt | test.rs:245:9:245:12 | true |  |
-| test.rs:245:8:245:13 | ParenExpr | test.rs:246:9:246:17 | ExprStmt | true |
-| test.rs:245:9:245:12 | true | test.rs:245:8:245:13 | ParenExpr |  |
-| test.rs:246:9:246:16 | ReturnExpr | test.rs:244:1:249:1 | exit dead_code (normal) | return |
-| test.rs:246:9:246:17 | ExprStmt | test.rs:246:16:246:16 | 0 |  |
-| test.rs:246:16:246:16 | 0 | test.rs:246:9:246:16 | ReturnExpr |  |
-| test.rs:251:1:264:1 | enter labelled_block | test.rs:252:5:263:6 | LetStmt |  |
-| test.rs:251:1:264:1 | exit labelled_block (normal) | test.rs:251:1:264:1 | exit labelled_block |  |
-| test.rs:251:28:264:1 | BlockExpr | test.rs:251:1:264:1 | exit labelled_block (normal) |  |
-| test.rs:252:5:263:6 | LetStmt | test.rs:253:9:253:19 | ExprStmt |  |
-| test.rs:252:9:252:14 | result | test.rs:251:28:264:1 | BlockExpr | match, no-match |
-| test.rs:252:18:263:5 | BlockExpr | test.rs:252:9:252:14 | result |  |
-| test.rs:253:9:253:16 | PathExpr | test.rs:253:9:253:18 | CallExpr |  |
-| test.rs:253:9:253:18 | CallExpr | test.rs:254:9:256:9 | ExprStmt |  |
-| test.rs:253:9:253:19 | ExprStmt | test.rs:253:9:253:16 | PathExpr |  |
-| test.rs:254:9:256:9 | ExprStmt | test.rs:254:12:254:28 | PathExpr |  |
-| test.rs:254:9:256:9 | IfExpr | test.rs:257:9:257:24 | ExprStmt |  |
-| test.rs:254:12:254:28 | PathExpr | test.rs:254:12:254:30 | CallExpr |  |
-| test.rs:254:12:254:30 | CallExpr | test.rs:254:9:256:9 | IfExpr | false |
-| test.rs:254:12:254:30 | CallExpr | test.rs:255:13:255:27 | ExprStmt | true |
-| test.rs:255:13:255:26 | BreakExpr | test.rs:251:1:264:1 | exit labelled_block (normal) | break('block) |
-| test.rs:255:13:255:27 | ExprStmt | test.rs:255:26:255:26 | 1 |  |
-| test.rs:255:26:255:26 | 1 | test.rs:255:13:255:26 | BreakExpr |  |
-| test.rs:257:9:257:21 | PathExpr | test.rs:257:9:257:23 | CallExpr |  |
-| test.rs:257:9:257:23 | CallExpr | test.rs:258:9:260:9 | ExprStmt |  |
-| test.rs:257:9:257:24 | ExprStmt | test.rs:257:9:257:21 | PathExpr |  |
-| test.rs:258:9:260:9 | ExprStmt | test.rs:258:12:258:28 | PathExpr |  |
-| test.rs:258:9:260:9 | IfExpr | test.rs:261:9:261:24 | ExprStmt |  |
-| test.rs:258:12:258:28 | PathExpr | test.rs:258:12:258:30 | CallExpr |  |
-| test.rs:258:12:258:30 | CallExpr | test.rs:258:9:260:9 | IfExpr | false |
-| test.rs:258:12:258:30 | CallExpr | test.rs:259:13:259:27 | ExprStmt | true |
-| test.rs:259:13:259:26 | BreakExpr | test.rs:251:1:264:1 | exit labelled_block (normal) | break('block) |
-| test.rs:259:13:259:27 | ExprStmt | test.rs:259:26:259:26 | 2 |  |
-| test.rs:259:26:259:26 | 2 | test.rs:259:13:259:26 | BreakExpr |  |
-| test.rs:261:9:261:21 | PathExpr | test.rs:261:9:261:23 | CallExpr |  |
-| test.rs:261:9:261:23 | CallExpr | test.rs:262:9:262:9 | 3 |  |
-| test.rs:261:9:261:24 | ExprStmt | test.rs:261:9:261:21 | PathExpr |  |
-| test.rs:262:9:262:9 | 3 | test.rs:252:18:263:5 | BlockExpr |  |
+| test.rs:75:1:78:1 | enter test_nested_function | test.rs:76:5:76:28 | LetStmt |  |
+| test.rs:75:1:78:1 | exit test_nested_function (normal) | test.rs:75:1:78:1 | exit test_nested_function |  |
+| test.rs:75:40:78:1 | BlockExpr | test.rs:75:1:78:1 | exit test_nested_function (normal) |  |
+| test.rs:76:5:76:28 | LetStmt | test.rs:76:19:76:27 | ClosureExpr |  |
+| test.rs:76:9:76:15 | add_one | test.rs:77:5:77:11 | add_one | match, no-match |
+| test.rs:76:19:76:27 | ClosureExpr | test.rs:76:9:76:15 | add_one |  |
+| test.rs:76:19:76:27 | enter ClosureExpr | test.rs:76:23:76:23 | i |  |
+| test.rs:76:19:76:27 | exit ClosureExpr (normal) | test.rs:76:19:76:27 | exit ClosureExpr |  |
+| test.rs:76:23:76:23 | i | test.rs:76:27:76:27 | 1 |  |
+| test.rs:76:23:76:27 | ... + ... | test.rs:76:19:76:27 | exit ClosureExpr (normal) |  |
+| test.rs:76:27:76:27 | 1 | test.rs:76:23:76:27 | ... + ... |  |
+| test.rs:77:5:77:11 | add_one | test.rs:77:13:77:19 | add_one |  |
+| test.rs:77:5:77:23 | CallExpr | test.rs:75:40:78:1 | BlockExpr |  |
+| test.rs:77:13:77:19 | add_one | test.rs:77:21:77:21 | n |  |
+| test.rs:77:13:77:22 | CallExpr | test.rs:77:5:77:23 | CallExpr |  |
+| test.rs:77:21:77:21 | n | test.rs:77:13:77:22 | CallExpr |  |
+| test.rs:82:5:88:5 | enter test_if_else | test.rs:83:12:83:12 | n |  |
+| test.rs:82:5:88:5 | exit test_if_else (normal) | test.rs:82:5:88:5 | exit test_if_else |  |
+| test.rs:82:36:88:5 | BlockExpr | test.rs:82:5:88:5 | exit test_if_else (normal) |  |
+| test.rs:83:9:87:9 | IfExpr | test.rs:82:36:88:5 | BlockExpr |  |
+| test.rs:83:12:83:12 | n | test.rs:83:17:83:17 | 0 |  |
+| test.rs:83:12:83:17 | ... <= ... | test.rs:84:13:84:13 | 0 | true |
+| test.rs:83:12:83:17 | ... <= ... | test.rs:86:13:86:13 | n | false |
+| test.rs:83:17:83:17 | 0 | test.rs:83:12:83:17 | ... <= ... |  |
+| test.rs:83:19:85:9 | BlockExpr | test.rs:83:9:87:9 | IfExpr |  |
+| test.rs:84:13:84:13 | 0 | test.rs:83:19:85:9 | BlockExpr |  |
+| test.rs:85:16:87:9 | BlockExpr | test.rs:83:9:87:9 | IfExpr |  |
+| test.rs:86:13:86:13 | n | test.rs:86:17:86:17 | 1 |  |
+| test.rs:86:13:86:17 | ... - ... | test.rs:85:16:87:9 | BlockExpr |  |
+| test.rs:86:17:86:17 | 1 | test.rs:86:13:86:17 | ... - ... |  |
+| test.rs:90:5:96:5 | enter test_if_let_else | test.rs:91:12:91:26 | LetExpr |  |
+| test.rs:90:5:96:5 | exit test_if_let_else (normal) | test.rs:90:5:96:5 | exit test_if_let_else |  |
+| test.rs:90:48:96:5 | BlockExpr | test.rs:90:5:96:5 | exit test_if_let_else (normal) |  |
+| test.rs:91:9:95:9 | IfExpr | test.rs:90:48:96:5 | BlockExpr |  |
+| test.rs:91:12:91:26 | LetExpr | test.rs:91:16:91:22 | TupleStructPat |  |
+| test.rs:91:16:91:22 | TupleStructPat | test.rs:92:13:92:13 | n | match |
+| test.rs:91:16:91:22 | TupleStructPat | test.rs:94:13:94:13 | 0 | no-match |
+| test.rs:91:28:93:9 | BlockExpr | test.rs:91:9:95:9 | IfExpr |  |
+| test.rs:92:13:92:13 | n | test.rs:91:28:93:9 | BlockExpr |  |
+| test.rs:93:16:95:9 | BlockExpr | test.rs:91:9:95:9 | IfExpr |  |
+| test.rs:94:13:94:13 | 0 | test.rs:93:16:95:9 | BlockExpr |  |
+| test.rs:98:5:103:5 | enter test_if_let | test.rs:99:9:101:9 | ExprStmt |  |
+| test.rs:98:5:103:5 | exit test_if_let (normal) | test.rs:98:5:103:5 | exit test_if_let |  |
+| test.rs:98:43:103:5 | BlockExpr | test.rs:98:5:103:5 | exit test_if_let (normal) |  |
+| test.rs:99:9:101:9 | ExprStmt | test.rs:99:12:99:26 | LetExpr |  |
+| test.rs:99:9:101:9 | IfExpr | test.rs:102:9:102:9 | 0 |  |
+| test.rs:99:12:99:26 | LetExpr | test.rs:99:16:99:22 | TupleStructPat |  |
+| test.rs:99:16:99:22 | TupleStructPat | test.rs:99:9:101:9 | IfExpr | no-match |
+| test.rs:99:16:99:22 | TupleStructPat | test.rs:100:13:100:13 | n | match |
+| test.rs:99:28:101:9 | BlockExpr | test.rs:99:9:101:9 | IfExpr |  |
+| test.rs:100:13:100:13 | n | test.rs:99:28:101:9 | BlockExpr |  |
+| test.rs:102:9:102:9 | 0 | test.rs:98:43:103:5 | BlockExpr |  |
+| test.rs:105:5:111:5 | enter test_nested_if | test.rs:106:16:106:16 | PathExpr |  |
+| test.rs:105:5:111:5 | exit test_nested_if (normal) | test.rs:105:5:111:5 | exit test_nested_if |  |
+| test.rs:105:38:111:5 | BlockExpr | test.rs:105:5:111:5 | exit test_nested_if (normal) |  |
+| test.rs:106:9:110:9 | IfExpr | test.rs:105:38:111:5 | BlockExpr |  |
+| test.rs:106:12:106:49 | ParenExpr | test.rs:107:13:107:13 | 1 | true |
+| test.rs:106:12:106:49 | ParenExpr | test.rs:109:13:109:13 | 0 | false |
+| test.rs:106:13:106:48 | IfExpr | test.rs:106:12:106:49 | ParenExpr |  |
+| test.rs:106:16:106:16 | PathExpr | test.rs:106:20:106:20 | 0 |  |
+| test.rs:106:16:106:20 | ... < ... | test.rs:106:24:106:24 | a | true |
+| test.rs:106:16:106:20 | ... < ... | test.rs:106:41:106:41 | a | false |
+| test.rs:106:20:106:20 | 0 | test.rs:106:16:106:20 | ... < ... |  |
+| test.rs:106:22:106:32 | BlockExpr | test.rs:106:13:106:48 | IfExpr |  |
+| test.rs:106:24:106:24 | a | test.rs:106:29:106:30 | 10 |  |
+| test.rs:106:24:106:30 | ... < ... | test.rs:106:22:106:32 | BlockExpr |  |
+| test.rs:106:28:106:30 | - ... | test.rs:106:24:106:30 | ... < ... |  |
+| test.rs:106:29:106:30 | 10 | test.rs:106:28:106:30 | - ... |  |
+| test.rs:106:39:106:48 | BlockExpr | test.rs:106:13:106:48 | IfExpr |  |
+| test.rs:106:41:106:41 | a | test.rs:106:45:106:46 | 10 |  |
+| test.rs:106:41:106:46 | ... > ... | test.rs:106:39:106:48 | BlockExpr |  |
+| test.rs:106:45:106:46 | 10 | test.rs:106:41:106:46 | ... > ... |  |
+| test.rs:106:51:108:9 | BlockExpr | test.rs:106:9:110:9 | IfExpr |  |
+| test.rs:107:13:107:13 | 1 | test.rs:106:51:108:9 | BlockExpr |  |
+| test.rs:108:16:110:9 | BlockExpr | test.rs:106:9:110:9 | IfExpr |  |
+| test.rs:109:13:109:13 | 0 | test.rs:108:16:110:9 | BlockExpr |  |
+| test.rs:113:5:122:5 | enter test_nested_if_match | test.rs:114:19:114:19 | a |  |
+| test.rs:113:5:122:5 | exit test_nested_if_match (normal) | test.rs:113:5:122:5 | exit test_nested_if_match |  |
+| test.rs:113:44:122:5 | BlockExpr | test.rs:113:5:122:5 | exit test_nested_if_match (normal) |  |
+| test.rs:114:9:121:9 | IfExpr | test.rs:113:44:122:5 | BlockExpr |  |
+| test.rs:114:12:117:10 | ParenExpr | test.rs:118:13:118:13 | 1 | true |
+| test.rs:114:12:117:10 | ParenExpr | test.rs:120:13:120:13 | 0 | false |
+| test.rs:114:13:117:9 | MatchExpr | test.rs:114:12:117:10 | ParenExpr |  |
+| test.rs:114:19:114:19 | a | test.rs:115:13:115:13 | LiteralPat |  |
+| test.rs:115:13:115:13 | LiteralPat | test.rs:115:18:115:21 | true | match |
+| test.rs:115:13:115:13 | LiteralPat | test.rs:116:13:116:13 | WildcardPat | no-match |
+| test.rs:115:18:115:21 | true | test.rs:114:13:117:9 | MatchExpr |  |
+| test.rs:116:13:116:13 | WildcardPat | test.rs:116:18:116:22 | false | match |
+| test.rs:116:18:116:22 | false | test.rs:114:13:117:9 | MatchExpr |  |
+| test.rs:117:12:119:9 | BlockExpr | test.rs:114:9:121:9 | IfExpr |  |
+| test.rs:118:13:118:13 | 1 | test.rs:117:12:119:9 | BlockExpr |  |
+| test.rs:119:16:121:9 | BlockExpr | test.rs:114:9:121:9 | IfExpr |  |
+| test.rs:120:13:120:13 | 0 | test.rs:119:16:121:9 | BlockExpr |  |
+| test.rs:124:5:133:5 | enter test_nested_if_block | test.rs:126:13:126:15 | ExprStmt |  |
+| test.rs:124:5:133:5 | exit test_nested_if_block (normal) | test.rs:124:5:133:5 | exit test_nested_if_block |  |
+| test.rs:124:44:133:5 | BlockExpr | test.rs:124:5:133:5 | exit test_nested_if_block (normal) |  |
+| test.rs:125:9:132:9 | IfExpr | test.rs:124:44:133:5 | BlockExpr |  |
+| test.rs:125:12:128:9 | BlockExpr | test.rs:129:13:129:13 | 1 | true |
+| test.rs:125:12:128:9 | BlockExpr | test.rs:131:13:131:13 | 0 | false |
+| test.rs:126:13:126:14 | TupleExpr | test.rs:127:13:127:13 | a |  |
+| test.rs:126:13:126:15 | ExprStmt | test.rs:126:13:126:14 | TupleExpr |  |
+| test.rs:127:13:127:13 | a | test.rs:127:17:127:17 | 0 |  |
+| test.rs:127:13:127:17 | ... > ... | test.rs:125:12:128:9 | BlockExpr | false, true |
+| test.rs:127:17:127:17 | 0 | test.rs:127:13:127:17 | ... > ... |  |
+| test.rs:128:11:130:9 | BlockExpr | test.rs:125:9:132:9 | IfExpr |  |
+| test.rs:129:13:129:13 | 1 | test.rs:128:11:130:9 | BlockExpr |  |
+| test.rs:130:16:132:9 | BlockExpr | test.rs:125:9:132:9 | IfExpr |  |
+| test.rs:131:13:131:13 | 0 | test.rs:130:16:132:9 | BlockExpr |  |
+| test.rs:135:5:142:5 | enter test_if_assignment | test.rs:136:9:136:26 | LetStmt |  |
+| test.rs:135:5:142:5 | exit test_if_assignment (normal) | test.rs:135:5:142:5 | exit test_if_assignment |  |
+| test.rs:135:42:142:5 | BlockExpr | test.rs:135:5:142:5 | exit test_if_assignment (normal) |  |
+| test.rs:136:9:136:26 | LetStmt | test.rs:136:21:136:25 | false |  |
+| test.rs:136:13:136:17 | x | test.rs:137:12:137:12 | x | match, no-match |
+| test.rs:136:21:136:25 | false | test.rs:136:13:136:17 | x |  |
+| test.rs:137:9:141:9 | IfExpr | test.rs:135:42:142:5 | BlockExpr |  |
+| test.rs:137:12:137:12 | x | test.rs:137:16:137:19 | true |  |
+| test.rs:137:12:137:19 | ... = ... | test.rs:138:13:138:13 | 1 | true |
+| test.rs:137:12:137:19 | ... = ... | test.rs:140:13:140:13 | 0 | false |
+| test.rs:137:16:137:19 | true | test.rs:137:12:137:19 | ... = ... |  |
+| test.rs:137:21:139:9 | BlockExpr | test.rs:137:9:141:9 | IfExpr |  |
+| test.rs:138:13:138:13 | 1 | test.rs:137:21:139:9 | BlockExpr |  |
+| test.rs:139:16:141:9 | BlockExpr | test.rs:137:9:141:9 | IfExpr |  |
+| test.rs:140:13:140:13 | 0 | test.rs:139:16:141:9 | BlockExpr |  |
+| test.rs:144:5:155:5 | enter test_if_loop1 | test.rs:146:13:148:14 | ExprStmt |  |
+| test.rs:144:5:155:5 | exit test_if_loop1 (normal) | test.rs:144:5:155:5 | exit test_if_loop1 |  |
+| test.rs:144:37:155:5 | BlockExpr | test.rs:144:5:155:5 | exit test_if_loop1 (normal) |  |
+| test.rs:145:9:154:9 | IfExpr | test.rs:144:37:155:5 | BlockExpr |  |
+| test.rs:145:12:150:10 | ParenExpr | test.rs:151:13:151:13 | 1 | true |
+| test.rs:145:12:150:10 | ParenExpr | test.rs:153:13:153:13 | 0 | false |
+| test.rs:145:13:150:9 | LoopExpr | test.rs:145:12:150:10 | ParenExpr |  |
+| test.rs:145:18:150:9 | BlockExpr | test.rs:146:13:148:14 | ExprStmt |  |
+| test.rs:146:13:148:13 | IfExpr | test.rs:149:13:149:19 | ExprStmt |  |
+| test.rs:146:13:148:14 | ExprStmt | test.rs:146:16:146:16 | a |  |
+| test.rs:146:16:146:16 | a | test.rs:146:20:146:20 | 0 |  |
+| test.rs:146:16:146:20 | ... > ... | test.rs:146:13:148:13 | IfExpr | false |
+| test.rs:146:16:146:20 | ... > ... | test.rs:147:17:147:29 | ExprStmt | true |
+| test.rs:146:20:146:20 | 0 | test.rs:146:16:146:20 | ... > ... |  |
+| test.rs:147:17:147:28 | BreakExpr | test.rs:145:13:150:9 | LoopExpr | break |
+| test.rs:147:17:147:29 | ExprStmt | test.rs:147:23:147:23 | a |  |
+| test.rs:147:23:147:23 | a | test.rs:147:27:147:28 | 10 |  |
+| test.rs:147:23:147:28 | ... > ... | test.rs:147:17:147:28 | BreakExpr |  |
+| test.rs:147:27:147:28 | 10 | test.rs:147:23:147:28 | ... > ... |  |
+| test.rs:149:13:149:13 | a | test.rs:149:17:149:18 | 10 |  |
+| test.rs:149:13:149:18 | ... < ... | test.rs:145:18:150:9 | BlockExpr |  |
+| test.rs:149:13:149:19 | ExprStmt | test.rs:149:13:149:13 | a |  |
+| test.rs:149:17:149:18 | 10 | test.rs:149:13:149:18 | ... < ... |  |
+| test.rs:150:12:152:9 | BlockExpr | test.rs:145:9:154:9 | IfExpr |  |
+| test.rs:151:13:151:13 | 1 | test.rs:150:12:152:9 | BlockExpr |  |
+| test.rs:152:16:154:9 | BlockExpr | test.rs:145:9:154:9 | IfExpr |  |
+| test.rs:153:13:153:13 | 0 | test.rs:152:16:154:9 | BlockExpr |  |
+| test.rs:157:5:168:5 | enter test_if_loop2 | test.rs:159:13:161:14 | ExprStmt |  |
+| test.rs:157:5:168:5 | exit test_if_loop2 (normal) | test.rs:157:5:168:5 | exit test_if_loop2 |  |
+| test.rs:157:37:168:5 | BlockExpr | test.rs:157:5:168:5 | exit test_if_loop2 (normal) |  |
+| test.rs:158:9:167:9 | IfExpr | test.rs:157:37:168:5 | BlockExpr |  |
+| test.rs:158:12:163:10 | ParenExpr | test.rs:164:13:164:13 | 1 | true |
+| test.rs:158:12:163:10 | ParenExpr | test.rs:166:13:166:13 | 0 | false |
+| test.rs:158:13:163:9 | LoopExpr | test.rs:158:12:163:10 | ParenExpr |  |
+| test.rs:158:26:163:9 | BlockExpr | test.rs:159:13:161:14 | ExprStmt |  |
+| test.rs:159:13:161:13 | IfExpr | test.rs:162:13:162:19 | ExprStmt |  |
+| test.rs:159:13:161:14 | ExprStmt | test.rs:159:16:159:16 | a |  |
+| test.rs:159:16:159:16 | a | test.rs:159:20:159:20 | 0 |  |
+| test.rs:159:16:159:20 | ... > ... | test.rs:159:13:161:13 | IfExpr | false |
+| test.rs:159:16:159:20 | ... > ... | test.rs:160:17:160:36 | ExprStmt | true |
+| test.rs:159:20:159:20 | 0 | test.rs:159:16:159:20 | ... > ... |  |
+| test.rs:160:17:160:35 | BreakExpr | test.rs:158:13:163:9 | LoopExpr | break('label) |
+| test.rs:160:17:160:36 | ExprStmt | test.rs:160:30:160:30 | a |  |
+| test.rs:160:30:160:30 | a | test.rs:160:34:160:35 | 10 |  |
+| test.rs:160:30:160:35 | ... > ... | test.rs:160:17:160:35 | BreakExpr |  |
+| test.rs:160:34:160:35 | 10 | test.rs:160:30:160:35 | ... > ... |  |
+| test.rs:162:13:162:13 | a | test.rs:162:17:162:18 | 10 |  |
+| test.rs:162:13:162:18 | ... < ... | test.rs:158:26:163:9 | BlockExpr |  |
+| test.rs:162:13:162:19 | ExprStmt | test.rs:162:13:162:13 | a |  |
+| test.rs:162:17:162:18 | 10 | test.rs:162:13:162:18 | ... < ... |  |
+| test.rs:163:12:165:9 | BlockExpr | test.rs:158:9:167:9 | IfExpr |  |
+| test.rs:164:13:164:13 | 1 | test.rs:163:12:165:9 | BlockExpr |  |
+| test.rs:165:16:167:9 | BlockExpr | test.rs:158:9:167:9 | IfExpr |  |
+| test.rs:166:13:166:13 | 0 | test.rs:165:16:167:9 | BlockExpr |  |
+| test.rs:170:5:178:5 | enter test_labelled_block | test.rs:172:13:172:31 | ExprStmt |  |
+| test.rs:170:5:178:5 | exit test_labelled_block (normal) | test.rs:170:5:178:5 | exit test_labelled_block |  |
+| test.rs:172:13:172:30 | BreakExpr | test.rs:170:5:178:5 | exit test_labelled_block (normal) | break('block) |
+| test.rs:172:13:172:31 | ExprStmt | test.rs:172:26:172:26 | a |  |
+| test.rs:172:26:172:26 | a | test.rs:172:30:172:30 | 0 |  |
+| test.rs:172:26:172:30 | ... > ... | test.rs:172:13:172:30 | BreakExpr |  |
+| test.rs:172:30:172:30 | 0 | test.rs:172:26:172:30 | ... > ... |  |
+| test.rs:183:5:186:5 | enter test_and_operator | test.rs:184:9:184:28 | LetStmt |  |
+| test.rs:183:5:186:5 | exit test_and_operator (normal) | test.rs:183:5:186:5 | exit test_and_operator |  |
+| test.rs:183:61:186:5 | BlockExpr | test.rs:183:5:186:5 | exit test_and_operator (normal) |  |
+| test.rs:184:9:184:28 | LetStmt | test.rs:184:17:184:27 | ... && ... |  |
+| test.rs:184:13:184:13 | d | test.rs:185:9:185:9 | d | match, no-match |
+| test.rs:184:17:184:17 | a | test.rs:184:13:184:13 | d | false |
+| test.rs:184:17:184:17 | a | test.rs:184:22:184:22 | b | true |
+| test.rs:184:17:184:22 | ... && ... | test.rs:184:17:184:17 | a |  |
+| test.rs:184:17:184:27 | ... && ... | test.rs:184:17:184:22 | ... && ... |  |
+| test.rs:184:22:184:22 | b | test.rs:184:13:184:13 | d | false |
+| test.rs:184:22:184:22 | b | test.rs:184:27:184:27 | c | true |
+| test.rs:184:27:184:27 | c | test.rs:184:13:184:13 | d |  |
+| test.rs:185:9:185:9 | d | test.rs:183:61:186:5 | BlockExpr |  |
+| test.rs:188:5:191:5 | enter test_or_operator | test.rs:189:9:189:28 | LetStmt |  |
+| test.rs:188:5:191:5 | exit test_or_operator (normal) | test.rs:188:5:191:5 | exit test_or_operator |  |
+| test.rs:188:60:191:5 | BlockExpr | test.rs:188:5:191:5 | exit test_or_operator (normal) |  |
+| test.rs:189:9:189:28 | LetStmt | test.rs:189:17:189:27 | ... \|\| ... |  |
+| test.rs:189:13:189:13 | d | test.rs:190:9:190:9 | d | match, no-match |
+| test.rs:189:17:189:17 | a | test.rs:189:13:189:13 | d | true |
+| test.rs:189:17:189:17 | a | test.rs:189:22:189:22 | b | false |
+| test.rs:189:17:189:22 | ... \|\| ... | test.rs:189:17:189:17 | a |  |
+| test.rs:189:17:189:27 | ... \|\| ... | test.rs:189:17:189:22 | ... \|\| ... |  |
+| test.rs:189:22:189:22 | b | test.rs:189:13:189:13 | d | true |
+| test.rs:189:22:189:22 | b | test.rs:189:27:189:27 | c | false |
+| test.rs:189:27:189:27 | c | test.rs:189:13:189:13 | d |  |
+| test.rs:190:9:190:9 | d | test.rs:188:60:191:5 | BlockExpr |  |
+| test.rs:193:5:196:5 | enter test_or_operator_2 | test.rs:194:9:194:36 | LetStmt |  |
+| test.rs:193:5:196:5 | exit test_or_operator_2 (normal) | test.rs:193:5:196:5 | exit test_or_operator_2 |  |
+| test.rs:193:61:196:5 | BlockExpr | test.rs:193:5:196:5 | exit test_or_operator_2 (normal) |  |
+| test.rs:194:9:194:36 | LetStmt | test.rs:194:17:194:35 | ... \|\| ... |  |
+| test.rs:194:13:194:13 | d | test.rs:195:9:195:9 | d | match, no-match |
+| test.rs:194:17:194:17 | a | test.rs:194:13:194:13 | d | true |
+| test.rs:194:17:194:17 | a | test.rs:194:23:194:23 | b | false |
+| test.rs:194:17:194:30 | ... \|\| ... | test.rs:194:17:194:17 | a |  |
+| test.rs:194:17:194:35 | ... \|\| ... | test.rs:194:17:194:30 | ... \|\| ... |  |
+| test.rs:194:22:194:30 | ParenExpr | test.rs:194:13:194:13 | d | true |
+| test.rs:194:22:194:30 | ParenExpr | test.rs:194:35:194:35 | c | false |
+| test.rs:194:23:194:23 | b | test.rs:194:28:194:29 | 28 |  |
+| test.rs:194:23:194:29 | ... == ... | test.rs:194:22:194:30 | ParenExpr |  |
+| test.rs:194:28:194:29 | 28 | test.rs:194:23:194:29 | ... == ... |  |
+| test.rs:194:35:194:35 | c | test.rs:194:13:194:13 | d |  |
+| test.rs:195:9:195:9 | d | test.rs:193:61:196:5 | BlockExpr |  |
+| test.rs:198:5:201:5 | enter test_not_operator | test.rs:199:9:199:19 | LetStmt |  |
+| test.rs:198:5:201:5 | exit test_not_operator (normal) | test.rs:198:5:201:5 | exit test_not_operator |  |
+| test.rs:198:43:201:5 | BlockExpr | test.rs:198:5:201:5 | exit test_not_operator (normal) |  |
+| test.rs:199:9:199:19 | LetStmt | test.rs:199:18:199:18 | a |  |
+| test.rs:199:13:199:13 | d | test.rs:200:9:200:9 | d | match, no-match |
+| test.rs:199:17:199:18 | ! ... | test.rs:199:13:199:13 | d |  |
+| test.rs:199:18:199:18 | a | test.rs:199:17:199:18 | ! ... |  |
+| test.rs:200:9:200:9 | d | test.rs:198:43:201:5 | BlockExpr |  |
+| test.rs:203:5:209:5 | enter test_if_and_operator | test.rs:204:12:204:22 | ... && ... |  |
+| test.rs:203:5:209:5 | exit test_if_and_operator (normal) | test.rs:203:5:209:5 | exit test_if_and_operator |  |
+| test.rs:203:63:209:5 | BlockExpr | test.rs:203:5:209:5 | exit test_if_and_operator (normal) |  |
+| test.rs:204:9:208:9 | IfExpr | test.rs:203:63:209:5 | BlockExpr |  |
+| test.rs:204:12:204:12 | a | test.rs:204:17:204:17 | b | true |
+| test.rs:204:12:204:12 | a | test.rs:207:13:207:17 | false | false |
+| test.rs:204:12:204:17 | ... && ... | test.rs:204:12:204:12 | a |  |
+| test.rs:204:12:204:22 | ... && ... | test.rs:204:12:204:17 | ... && ... |  |
+| test.rs:204:17:204:17 | b | test.rs:204:22:204:22 | c | true |
+| test.rs:204:17:204:17 | b | test.rs:207:13:207:17 | false | false |
+| test.rs:204:22:204:22 | c | test.rs:205:13:205:16 | true | true |
+| test.rs:204:22:204:22 | c | test.rs:207:13:207:17 | false | false |
+| test.rs:204:24:206:9 | BlockExpr | test.rs:204:9:208:9 | IfExpr |  |
+| test.rs:205:13:205:16 | true | test.rs:204:24:206:9 | BlockExpr |  |
+| test.rs:206:16:208:9 | BlockExpr | test.rs:204:9:208:9 | IfExpr |  |
+| test.rs:207:13:207:17 | false | test.rs:206:16:208:9 | BlockExpr |  |
+| test.rs:211:5:217:5 | enter test_if_or_operator | test.rs:212:12:212:22 | ... \|\| ... |  |
+| test.rs:211:5:217:5 | exit test_if_or_operator (normal) | test.rs:211:5:217:5 | exit test_if_or_operator |  |
+| test.rs:211:62:217:5 | BlockExpr | test.rs:211:5:217:5 | exit test_if_or_operator (normal) |  |
+| test.rs:212:9:216:9 | IfExpr | test.rs:211:62:217:5 | BlockExpr |  |
+| test.rs:212:12:212:12 | a | test.rs:212:17:212:17 | b | false |
+| test.rs:212:12:212:12 | a | test.rs:213:13:213:16 | true | true |
+| test.rs:212:12:212:17 | ... \|\| ... | test.rs:212:12:212:12 | a |  |
+| test.rs:212:12:212:22 | ... \|\| ... | test.rs:212:12:212:17 | ... \|\| ... |  |
+| test.rs:212:17:212:17 | b | test.rs:212:22:212:22 | c | false |
+| test.rs:212:17:212:17 | b | test.rs:213:13:213:16 | true | true |
+| test.rs:212:22:212:22 | c | test.rs:213:13:213:16 | true | true |
+| test.rs:212:22:212:22 | c | test.rs:215:13:215:17 | false | false |
+| test.rs:212:24:214:9 | BlockExpr | test.rs:212:9:216:9 | IfExpr |  |
+| test.rs:213:13:213:16 | true | test.rs:212:24:214:9 | BlockExpr |  |
+| test.rs:214:16:216:9 | BlockExpr | test.rs:212:9:216:9 | IfExpr |  |
+| test.rs:215:13:215:17 | false | test.rs:214:16:216:9 | BlockExpr |  |
+| test.rs:219:5:225:5 | enter test_if_not_operator | test.rs:220:13:220:13 | a |  |
+| test.rs:219:5:225:5 | exit test_if_not_operator (normal) | test.rs:219:5:225:5 | exit test_if_not_operator |  |
+| test.rs:219:46:225:5 | BlockExpr | test.rs:219:5:225:5 | exit test_if_not_operator (normal) |  |
+| test.rs:220:9:224:9 | IfExpr | test.rs:219:46:225:5 | BlockExpr |  |
+| test.rs:220:12:220:13 | ! ... | test.rs:221:13:221:16 | true | true |
+| test.rs:220:12:220:13 | ! ... | test.rs:223:13:223:17 | false | false |
+| test.rs:220:13:220:13 | a | test.rs:220:12:220:13 | ! ... | false, true |
+| test.rs:220:15:222:9 | BlockExpr | test.rs:220:9:224:9 | IfExpr |  |
+| test.rs:221:13:221:16 | true | test.rs:220:15:222:9 | BlockExpr |  |
+| test.rs:222:16:224:9 | BlockExpr | test.rs:220:9:224:9 | IfExpr |  |
+| test.rs:223:13:223:17 | false | test.rs:222:16:224:9 | BlockExpr |  |
+| test.rs:228:1:234:1 | enter test_match | test.rs:229:11:229:21 | maybe_digit |  |
+| test.rs:228:1:234:1 | exit test_match (normal) | test.rs:228:1:234:1 | exit test_match |  |
+| test.rs:228:48:234:1 | BlockExpr | test.rs:228:1:234:1 | exit test_match (normal) |  |
+| test.rs:229:5:233:5 | MatchExpr | test.rs:228:48:234:1 | BlockExpr |  |
+| test.rs:229:11:229:21 | maybe_digit | test.rs:230:9:230:23 | TupleStructPat |  |
+| test.rs:230:9:230:23 | TupleStructPat | test.rs:230:28:230:28 | x | match |
+| test.rs:230:9:230:23 | TupleStructPat | test.rs:231:9:231:23 | TupleStructPat | no-match |
+| test.rs:230:28:230:28 | x | test.rs:230:32:230:33 | 10 |  |
+| test.rs:230:32:230:33 | 10 | test.rs:230:28:230:33 | ... < ... |  |
+| test.rs:231:9:231:23 | TupleStructPat | test.rs:231:28:231:28 | x | match |
+| test.rs:231:9:231:23 | TupleStructPat | test.rs:232:9:232:20 | PathPat | no-match |
+| test.rs:231:28:231:28 | x | test.rs:229:5:233:5 | MatchExpr |  |
+| test.rs:232:9:232:20 | PathPat | test.rs:232:25:232:25 | 5 | match |
+| test.rs:232:25:232:25 | 5 | test.rs:229:5:233:5 | MatchExpr |  |
+| test.rs:237:5:242:5 | enter test_infinite_loop | test.rs:238:9:240:9 | ExprStmt |  |
+| test.rs:238:9:240:9 | ExprStmt | test.rs:239:13:239:13 | 1 |  |
+| test.rs:238:14:240:9 | BlockExpr | test.rs:239:13:239:13 | 1 |  |
+| test.rs:239:13:239:13 | 1 | test.rs:238:14:240:9 | BlockExpr |  |
+| test.rs:244:5:247:5 | enter test_let_match | test.rs:245:9:245:49 | LetStmt |  |
+| test.rs:244:5:247:5 | exit test_let_match (normal) | test.rs:244:5:247:5 | exit test_let_match |  |
+| test.rs:244:39:247:5 | BlockExpr | test.rs:244:5:247:5 | exit test_let_match (normal) |  |
+| test.rs:245:9:245:49 | LetStmt | test.rs:245:23:245:23 | a |  |
+| test.rs:245:13:245:19 | TupleStructPat | test.rs:245:32:245:46 | "Expected some" | no-match |
+| test.rs:245:13:245:19 | TupleStructPat | test.rs:246:9:246:9 | n | match |
+| test.rs:245:23:245:23 | a | test.rs:245:13:245:19 | TupleStructPat |  |
+| test.rs:245:32:245:46 | "Expected some" | test.rs:245:30:245:48 | BlockExpr |  |
+| test.rs:246:9:246:9 | n | test.rs:244:39:247:5 | BlockExpr |  |
+| test.rs:250:1:255:1 | enter dead_code | test.rs:251:5:253:5 | ExprStmt |  |
+| test.rs:250:1:255:1 | exit dead_code (normal) | test.rs:250:1:255:1 | exit dead_code |  |
+| test.rs:251:5:253:5 | ExprStmt | test.rs:251:9:251:12 | true |  |
+| test.rs:251:8:251:13 | ParenExpr | test.rs:252:9:252:17 | ExprStmt | true |
+| test.rs:251:9:251:12 | true | test.rs:251:8:251:13 | ParenExpr |  |
+| test.rs:252:9:252:16 | ReturnExpr | test.rs:250:1:255:1 | exit dead_code (normal) | return |
+| test.rs:252:9:252:17 | ExprStmt | test.rs:252:16:252:16 | 0 |  |
+| test.rs:252:16:252:16 | 0 | test.rs:252:9:252:16 | ReturnExpr |  |
+| test.rs:257:1:270:1 | enter labelled_block | test.rs:258:5:269:6 | LetStmt |  |
+| test.rs:257:1:270:1 | exit labelled_block (normal) | test.rs:257:1:270:1 | exit labelled_block |  |
+| test.rs:257:28:270:1 | BlockExpr | test.rs:257:1:270:1 | exit labelled_block (normal) |  |
+| test.rs:258:5:269:6 | LetStmt | test.rs:259:9:259:19 | ExprStmt |  |
+| test.rs:258:9:258:14 | result | test.rs:257:28:270:1 | BlockExpr | match, no-match |
+| test.rs:258:18:269:5 | BlockExpr | test.rs:258:9:258:14 | result |  |
+| test.rs:259:9:259:16 | PathExpr | test.rs:259:9:259:18 | CallExpr |  |
+| test.rs:259:9:259:18 | CallExpr | test.rs:260:9:262:9 | ExprStmt |  |
+| test.rs:259:9:259:19 | ExprStmt | test.rs:259:9:259:16 | PathExpr |  |
+| test.rs:260:9:262:9 | ExprStmt | test.rs:260:12:260:28 | PathExpr |  |
+| test.rs:260:9:262:9 | IfExpr | test.rs:263:9:263:24 | ExprStmt |  |
+| test.rs:260:12:260:28 | PathExpr | test.rs:260:12:260:30 | CallExpr |  |
+| test.rs:260:12:260:30 | CallExpr | test.rs:260:9:262:9 | IfExpr | false |
+| test.rs:260:12:260:30 | CallExpr | test.rs:261:13:261:27 | ExprStmt | true |
+| test.rs:261:13:261:26 | BreakExpr | test.rs:257:1:270:1 | exit labelled_block (normal) | break('block) |
+| test.rs:261:13:261:27 | ExprStmt | test.rs:261:26:261:26 | 1 |  |
+| test.rs:261:26:261:26 | 1 | test.rs:261:13:261:26 | BreakExpr |  |
+| test.rs:263:9:263:21 | PathExpr | test.rs:263:9:263:23 | CallExpr |  |
+| test.rs:263:9:263:23 | CallExpr | test.rs:264:9:266:9 | ExprStmt |  |
+| test.rs:263:9:263:24 | ExprStmt | test.rs:263:9:263:21 | PathExpr |  |
+| test.rs:264:9:266:9 | ExprStmt | test.rs:264:12:264:28 | PathExpr |  |
+| test.rs:264:9:266:9 | IfExpr | test.rs:267:9:267:24 | ExprStmt |  |
+| test.rs:264:12:264:28 | PathExpr | test.rs:264:12:264:30 | CallExpr |  |
+| test.rs:264:12:264:30 | CallExpr | test.rs:264:9:266:9 | IfExpr | false |
+| test.rs:264:12:264:30 | CallExpr | test.rs:265:13:265:27 | ExprStmt | true |
+| test.rs:265:13:265:26 | BreakExpr | test.rs:257:1:270:1 | exit labelled_block (normal) | break('block) |
+| test.rs:265:13:265:27 | ExprStmt | test.rs:265:26:265:26 | 2 |  |
+| test.rs:265:26:265:26 | 2 | test.rs:265:13:265:26 | BreakExpr |  |
+| test.rs:267:9:267:21 | PathExpr | test.rs:267:9:267:23 | CallExpr |  |
+| test.rs:267:9:267:23 | CallExpr | test.rs:268:9:268:9 | 3 |  |
+| test.rs:267:9:267:24 | ExprStmt | test.rs:267:9:267:21 | PathExpr |  |
+| test.rs:268:9:268:9 | 3 | test.rs:258:18:269:5 | BlockExpr |  |
diff --git a/rust/ql/test/library-tests/controlflow/test.rs b/rust/ql/test/library-tests/controlflow/test.rs
index 220241832186..dd1659ee997b 100644
--- a/rust/ql/test/library-tests/controlflow/test.rs
+++ b/rust/ql/test/library-tests/controlflow/test.rs
@@ -51,16 +51,22 @@ mod loop_expression {
         }
     }
 
-    fn test_while() {
+    fn test_while(i: i64) {
         let mut b = true;
         while b {
             1;
+            if (i > 0) {
+                break;
+            }
             b = false;
         }
     }
 
-    fn test_for() {
+    fn test_for(j: i64) {
         for i in 0..10 {
+            if (i == j) {
+                break;
+            }
             1;
         }
     }

From f3e373442442c544193f960b86ebfa0f08dbdf5f Mon Sep 17 00:00:00 2001
From: Tom Hvitved <hvitved@github.com>
Date: Mon, 30 Sep 2024 16:58:44 +0200
Subject: [PATCH 097/347] Rust: Implement CFG for `WhileExpr`s

---
 .../rust/controlflow/internal/Completion.qll  |  2 +
 .../internal/ControlFlowGraphImpl.qll         | 63 +++++++++++++++----
 .../CONSISTENCY/CfgConsistency.expected       |  1 -
 .../library-tests/controlflow/Cfg.expected    | 22 +++++++
 4 files changed, 74 insertions(+), 14 deletions(-)

diff --git a/rust/ql/lib/codeql/rust/controlflow/internal/Completion.qll b/rust/ql/lib/codeql/rust/controlflow/internal/Completion.qll
index 7e51f62a535b..e9c5d95f910c 100644
--- a/rust/ql/lib/codeql/rust/controlflow/internal/Completion.qll
+++ b/rust/ql/lib/codeql/rust/controlflow/internal/Completion.qll
@@ -84,6 +84,8 @@ class BooleanCompletion extends ConditionalCompletion, TBooleanCompletion {
   private predicate isValidForSpecific0(AstNode e) {
     e = any(IfExpr c).getCondition()
     or
+    e = any(WhileExpr c).getCondition()
+    or
     any(MatchArm arm).getGuard() = e
     or
     exists(BinaryExpr expr |
diff --git a/rust/ql/lib/codeql/rust/controlflow/internal/ControlFlowGraphImpl.qll b/rust/ql/lib/codeql/rust/controlflow/internal/ControlFlowGraphImpl.qll
index 1e4c2ec431d8..2cbf49b9e2b1 100644
--- a/rust/ql/lib/codeql/rust/controlflow/internal/ControlFlowGraphImpl.qll
+++ b/rust/ql/lib/codeql/rust/controlflow/internal/ControlFlowGraphImpl.qll
@@ -277,45 +277,82 @@ class LetStmtTree extends PreOrderTree instanceof LetStmt {
 
 class LiteralExprTree extends LeafTree instanceof LiteralExpr { }
 
-class LoopExprTree extends PostOrderTree instanceof LoopExpr {
+abstract class LoopingExprTree extends PostOrderTree {
   override predicate propagatesAbnormal(AstNode child) { none() }
 
-  override predicate first(AstNode node) { first(super.getLoopBody(), node) }
+  abstract BlockExpr getLoopBody();
 
-  /** Whether this `LoopExpr` captures the `c` completion. */
-  private predicate capturesLoopJumpCompletion(LoopJumpCompletion c) {
+  abstract Label getLabel();
+
+  /** Whether this loop captures the `c` completion. */
+  predicate capturesLoopJumpCompletion(LoopJumpCompletion c) {
     not c.hasLabel()
     or
-    c.getLabelName() = super.getLabel().getLifetime().getText()
+    c.getLabelName() = this.getLabel().getLifetime().getText()
   }
 
   override predicate succ(AstNode pred, AstNode succ, Completion c) {
+    // Edge for exiting the loop with a break expressions
+    last(this.getLoopBody(), pred, c) and
+    c.(LoopJumpCompletion).isBreak() and
+    this.capturesLoopJumpCompletion(c) and
+    succ = this
+    or
     // Edge back to the start for final expression and continue expressions
-    last(super.getLoopBody(), pred, c) and
+    last(this.getLoopBody(), pred, c) and
     (
       completionIsNormal(c)
       or
       c.(LoopJumpCompletion).isContinue() and this.capturesLoopJumpCompletion(c)
     ) and
     this.first(succ)
-    or
-    // Edge for exiting the loop with a break expressions
-    last(super.getLoopBody(), pred, c) and
-    c.(LoopJumpCompletion).isBreak() and
-    this.capturesLoopJumpCompletion(c) and
-    succ = this
   }
 
   override predicate last(AstNode last, Completion c) {
     super.last(last, c)
     or
     // Any abnormal completions that this loop does not capture should propagate
-    last(super.getLoopBody(), last, c) and
+    last(this.getLoopBody(), last, c) and
     not completionIsNormal(c) and
     not this.capturesLoopJumpCompletion(c)
   }
 }
 
+class LoopExprTree extends LoopingExprTree instanceof LoopExpr {
+  override BlockExpr getLoopBody() { result = LoopExpr.super.getLoopBody() }
+
+  override Label getLabel() { result = LoopExpr.super.getLabel() }
+
+  override predicate first(AstNode node) { first(this.getLoopBody(), node) }
+}
+
+class WhileExprTree extends LoopingExprTree instanceof WhileExpr {
+  override BlockExpr getLoopBody() { result = WhileExpr.super.getLoopBody() }
+
+  override Label getLabel() { result = WhileExpr.super.getLabel() }
+
+  override predicate first(AstNode node) { first(super.getCondition(), node) }
+
+  override predicate succ(AstNode pred, AstNode succ, Completion c) {
+    super.succ(pred, succ, c)
+    or
+    last(super.getCondition(), pred, c) and
+    c.(BooleanCompletion).succeeded() and
+    first(this.getLoopBody(), succ)
+    or
+    last(super.getCondition(), pred, c) and
+    c.(BooleanCompletion).failed() and
+    succ = this
+  }
+
+  override predicate last(AstNode last, Completion c) {
+    super.last(last, c)
+    or
+    last(super.getCondition(), last, c) and
+    not completionIsNormal(c)
+  }
+}
+
 class MatchArmTree extends ControlFlowTree instanceof MatchArm {
   override predicate propagatesAbnormal(AstNode child) { child = super.getExpr() }
 
diff --git a/rust/ql/test/library-tests/controlflow/CONSISTENCY/CfgConsistency.expected b/rust/ql/test/library-tests/controlflow/CONSISTENCY/CfgConsistency.expected
index 49f433fff2c8..df4c34f39f73 100644
--- a/rust/ql/test/library-tests/controlflow/CONSISTENCY/CfgConsistency.expected
+++ b/rust/ql/test/library-tests/controlflow/CONSISTENCY/CfgConsistency.expected
@@ -1,5 +1,4 @@
 deadEnd
-| test.rs:55:13:55:17 | b |
 | test.rs:230:28:230:33 | ... < ... |
 | test.rs:245:30:245:48 | BlockExpr |
 scopeNoFirst
diff --git a/rust/ql/test/library-tests/controlflow/Cfg.expected b/rust/ql/test/library-tests/controlflow/Cfg.expected
index f7d5365cf182..388ebed628a2 100644
--- a/rust/ql/test/library-tests/controlflow/Cfg.expected
+++ b/rust/ql/test/library-tests/controlflow/Cfg.expected
@@ -98,8 +98,30 @@
 | test.rs:49:17:49:31 | ContinueExpr | test.rs:44:17:48:17 | ExprStmt | continue('inner) |
 | test.rs:49:17:49:32 | ExprStmt | test.rs:49:17:49:31 | ContinueExpr |  |
 | test.rs:54:5:63:5 | enter test_while | test.rs:55:9:55:25 | LetStmt |  |
+| test.rs:54:5:63:5 | exit test_while (normal) | test.rs:54:5:63:5 | exit test_while |  |
+| test.rs:54:27:63:5 | BlockExpr | test.rs:54:5:63:5 | exit test_while (normal) |  |
 | test.rs:55:9:55:25 | LetStmt | test.rs:55:21:55:24 | true |  |
+| test.rs:55:13:55:17 | b | test.rs:56:15:56:15 | b | match, no-match |
 | test.rs:55:21:55:24 | true | test.rs:55:13:55:17 | b |  |
+| test.rs:56:9:62:9 | WhileExpr | test.rs:54:27:63:5 | BlockExpr |  |
+| test.rs:56:15:56:15 | b | test.rs:56:9:62:9 | WhileExpr | false |
+| test.rs:56:15:56:15 | b | test.rs:57:13:57:14 | ExprStmt | true |
+| test.rs:56:17:62:9 | BlockExpr | test.rs:56:15:56:15 | b |  |
+| test.rs:57:13:57:13 | 1 | test.rs:58:13:60:13 | ExprStmt |  |
+| test.rs:57:13:57:14 | ExprStmt | test.rs:57:13:57:13 | 1 |  |
+| test.rs:58:13:60:13 | ExprStmt | test.rs:58:17:58:17 | i |  |
+| test.rs:58:13:60:13 | IfExpr | test.rs:61:13:61:22 | ExprStmt |  |
+| test.rs:58:16:58:22 | ParenExpr | test.rs:58:13:60:13 | IfExpr | false |
+| test.rs:58:16:58:22 | ParenExpr | test.rs:59:17:59:22 | ExprStmt | true |
+| test.rs:58:17:58:17 | i | test.rs:58:21:58:21 | 0 |  |
+| test.rs:58:17:58:21 | ... > ... | test.rs:58:16:58:22 | ParenExpr |  |
+| test.rs:58:21:58:21 | 0 | test.rs:58:17:58:21 | ... > ... |  |
+| test.rs:59:17:59:21 | BreakExpr | test.rs:56:9:62:9 | WhileExpr | break |
+| test.rs:59:17:59:22 | ExprStmt | test.rs:59:17:59:21 | BreakExpr |  |
+| test.rs:61:13:61:13 | PathExpr | test.rs:61:17:61:21 | false |  |
+| test.rs:61:13:61:21 | ... = ... | test.rs:56:17:62:9 | BlockExpr |  |
+| test.rs:61:13:61:22 | ExprStmt | test.rs:61:13:61:13 | PathExpr |  |
+| test.rs:61:17:61:21 | false | test.rs:61:13:61:21 | ... = ... |  |
 | test.rs:75:1:78:1 | enter test_nested_function | test.rs:76:5:76:28 | LetStmt |  |
 | test.rs:75:1:78:1 | exit test_nested_function (normal) | test.rs:75:1:78:1 | exit test_nested_function |  |
 | test.rs:75:40:78:1 | BlockExpr | test.rs:75:1:78:1 | exit test_nested_function (normal) |  |

From 8c1fd8fa7a22a4f5f99aa0ca9f58b3dc6d2a0d00 Mon Sep 17 00:00:00 2001
From: Tom Hvitved <hvitved@github.com>
Date: Tue, 1 Oct 2024 10:27:38 +0200
Subject: [PATCH 098/347] Rust: Implement CFG for `ForExpr`s

---
 .../internal/ControlFlowGraphImpl.qll         | 43 ++++++++++++++++++-
 .../CONSISTENCY/CfgConsistency.expected       |  2 -
 .../library-tests/controlflow/Cfg.expected    | 21 +++++++++
 3 files changed, 62 insertions(+), 4 deletions(-)

diff --git a/rust/ql/lib/codeql/rust/controlflow/internal/ControlFlowGraphImpl.qll b/rust/ql/lib/codeql/rust/controlflow/internal/ControlFlowGraphImpl.qll
index 2cbf49b9e2b1..4535e0be4c1c 100644
--- a/rust/ql/lib/codeql/rust/controlflow/internal/ControlFlowGraphImpl.qll
+++ b/rust/ql/lib/codeql/rust/controlflow/internal/ControlFlowGraphImpl.qll
@@ -284,7 +284,9 @@ abstract class LoopingExprTree extends PostOrderTree {
 
   abstract Label getLabel();
 
-  /** Whether this loop captures the `c` completion. */
+  abstract predicate entry(AstNode node);
+
+  /** Holds if this loop captures the `c` completion. */
   predicate capturesLoopJumpCompletion(LoopJumpCompletion c) {
     not c.hasLabel()
     or
@@ -305,7 +307,7 @@ abstract class LoopingExprTree extends PostOrderTree {
       or
       c.(LoopJumpCompletion).isContinue() and this.capturesLoopJumpCompletion(c)
     ) and
-    this.first(succ)
+    this.entry(succ)
   }
 
   override predicate last(AstNode last, Completion c) {
@@ -323,6 +325,8 @@ class LoopExprTree extends LoopingExprTree instanceof LoopExpr {
 
   override Label getLabel() { result = LoopExpr.super.getLabel() }
 
+  override predicate entry(AstNode node) { this.first(node) }
+
   override predicate first(AstNode node) { first(this.getLoopBody(), node) }
 }
 
@@ -331,6 +335,8 @@ class WhileExprTree extends LoopingExprTree instanceof WhileExpr {
 
   override Label getLabel() { result = WhileExpr.super.getLabel() }
 
+  override predicate entry(AstNode node) { this.first(node) }
+
   override predicate first(AstNode node) { first(super.getCondition(), node) }
 
   override predicate succ(AstNode pred, AstNode succ, Completion c) {
@@ -353,6 +359,39 @@ class WhileExprTree extends LoopingExprTree instanceof WhileExpr {
   }
 }
 
+class ForExprTree extends LoopingExprTree instanceof ForExpr {
+  override BlockExpr getLoopBody() { result = ForExpr.super.getLoopBody() }
+
+  override Label getLabel() { result = ForExpr.super.getLabel() }
+
+  override predicate entry(AstNode n) { first(super.getPat(), n) }
+
+  override predicate first(AstNode node) { first(super.getIterable(), node) }
+
+  override predicate succ(AstNode pred, AstNode succ, Completion c) {
+    super.succ(pred, succ, c)
+    or
+    last(super.getIterable(), pred, c) and
+    first(super.getPat(), succ) and
+    completionIsNormal(c)
+    or
+    last(super.getPat(), pred, c) and
+    c.(MatchCompletion).succeeded() and
+    first(this.getLoopBody(), succ)
+    or
+    last(super.getPat(), pred, c) and
+    c.(MatchCompletion).failed() and
+    succ = this
+  }
+
+  override predicate last(AstNode last, Completion c) {
+    super.last(last, c)
+    or
+    last(super.getIterable(), last, c) and
+    not completionIsNormal(c)
+  }
+}
+
 class MatchArmTree extends ControlFlowTree instanceof MatchArm {
   override predicate propagatesAbnormal(AstNode child) { child = super.getExpr() }
 
diff --git a/rust/ql/test/library-tests/controlflow/CONSISTENCY/CfgConsistency.expected b/rust/ql/test/library-tests/controlflow/CONSISTENCY/CfgConsistency.expected
index df4c34f39f73..64911eb1788f 100644
--- a/rust/ql/test/library-tests/controlflow/CONSISTENCY/CfgConsistency.expected
+++ b/rust/ql/test/library-tests/controlflow/CONSISTENCY/CfgConsistency.expected
@@ -1,5 +1,3 @@
 deadEnd
 | test.rs:230:28:230:33 | ... < ... |
 | test.rs:245:30:245:48 | BlockExpr |
-scopeNoFirst
-| test.rs:65:5:72:5 | test_for |
diff --git a/rust/ql/test/library-tests/controlflow/Cfg.expected b/rust/ql/test/library-tests/controlflow/Cfg.expected
index 388ebed628a2..67756a2bca27 100644
--- a/rust/ql/test/library-tests/controlflow/Cfg.expected
+++ b/rust/ql/test/library-tests/controlflow/Cfg.expected
@@ -122,6 +122,27 @@
 | test.rs:61:13:61:21 | ... = ... | test.rs:56:17:62:9 | BlockExpr |  |
 | test.rs:61:13:61:22 | ExprStmt | test.rs:61:13:61:13 | PathExpr |  |
 | test.rs:61:17:61:21 | false | test.rs:61:13:61:21 | ... = ... |  |
+| test.rs:65:5:72:5 | enter test_for | test.rs:66:18:66:18 | 0 |  |
+| test.rs:65:5:72:5 | exit test_for (normal) | test.rs:65:5:72:5 | exit test_for |  |
+| test.rs:65:25:72:5 | BlockExpr | test.rs:65:5:72:5 | exit test_for (normal) |  |
+| test.rs:66:9:71:9 | ForExpr | test.rs:65:25:72:5 | BlockExpr |  |
+| test.rs:66:13:66:13 | i | test.rs:66:9:71:9 | ForExpr | no-match |
+| test.rs:66:13:66:13 | i | test.rs:67:13:69:13 | ExprStmt | match |
+| test.rs:66:18:66:18 | 0 | test.rs:66:21:66:22 | 10 |  |
+| test.rs:66:18:66:22 | RangeExpr | test.rs:66:13:66:13 | i |  |
+| test.rs:66:21:66:22 | 10 | test.rs:66:18:66:22 | RangeExpr |  |
+| test.rs:66:24:71:9 | BlockExpr | test.rs:66:13:66:13 | i |  |
+| test.rs:67:13:69:13 | ExprStmt | test.rs:67:17:67:17 | i |  |
+| test.rs:67:13:69:13 | IfExpr | test.rs:70:13:70:14 | ExprStmt |  |
+| test.rs:67:16:67:23 | ParenExpr | test.rs:67:13:69:13 | IfExpr | false |
+| test.rs:67:16:67:23 | ParenExpr | test.rs:68:17:68:22 | ExprStmt | true |
+| test.rs:67:17:67:17 | i | test.rs:67:22:67:22 | j |  |
+| test.rs:67:17:67:22 | ... == ... | test.rs:67:16:67:23 | ParenExpr |  |
+| test.rs:67:22:67:22 | j | test.rs:67:17:67:22 | ... == ... |  |
+| test.rs:68:17:68:21 | BreakExpr | test.rs:66:9:71:9 | ForExpr | break |
+| test.rs:68:17:68:22 | ExprStmt | test.rs:68:17:68:21 | BreakExpr |  |
+| test.rs:70:13:70:13 | 1 | test.rs:66:24:71:9 | BlockExpr |  |
+| test.rs:70:13:70:14 | ExprStmt | test.rs:70:13:70:13 | 1 |  |
 | test.rs:75:1:78:1 | enter test_nested_function | test.rs:76:5:76:28 | LetStmt |  |
 | test.rs:75:1:78:1 | exit test_nested_function (normal) | test.rs:75:1:78:1 | exit test_nested_function |  |
 | test.rs:75:40:78:1 | BlockExpr | test.rs:75:1:78:1 | exit test_nested_function (normal) |  |

From a507854288824de825761439bf1fbb233813ffd2 Mon Sep 17 00:00:00 2001
From: Tom Hvitved <hvitved@github.com>
Date: Tue, 1 Oct 2024 10:34:15 +0200
Subject: [PATCH 099/347] Rust: Fix bug in
 `BooleanCompletion.isValidForSpecific0`

---
 rust/ql/lib/codeql/rust/controlflow/internal/Completion.qll  | 2 +-
 .../controlflow/CONSISTENCY/CfgConsistency.expected          | 1 -
 rust/ql/test/library-tests/controlflow/Cfg.expected          | 5 +++++
 .../variables/CONSISTENCY/CfgConsistency.expected            | 1 -
 4 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/rust/ql/lib/codeql/rust/controlflow/internal/Completion.qll b/rust/ql/lib/codeql/rust/controlflow/internal/Completion.qll
index e9c5d95f910c..facb3849f71f 100644
--- a/rust/ql/lib/codeql/rust/controlflow/internal/Completion.qll
+++ b/rust/ql/lib/codeql/rust/controlflow/internal/Completion.qll
@@ -86,7 +86,7 @@ class BooleanCompletion extends ConditionalCompletion, TBooleanCompletion {
     or
     e = any(WhileExpr c).getCondition()
     or
-    any(MatchArm arm).getGuard() = e
+    any(MatchGuard guard).getCondition() = e
     or
     exists(BinaryExpr expr |
       expr.getOperatorName() = ["&&", "||"] and
diff --git a/rust/ql/test/library-tests/controlflow/CONSISTENCY/CfgConsistency.expected b/rust/ql/test/library-tests/controlflow/CONSISTENCY/CfgConsistency.expected
index 64911eb1788f..10964769c6e7 100644
--- a/rust/ql/test/library-tests/controlflow/CONSISTENCY/CfgConsistency.expected
+++ b/rust/ql/test/library-tests/controlflow/CONSISTENCY/CfgConsistency.expected
@@ -1,3 +1,2 @@
 deadEnd
-| test.rs:230:28:230:33 | ... < ... |
 | test.rs:245:30:245:48 | BlockExpr |
diff --git a/rust/ql/test/library-tests/controlflow/Cfg.expected b/rust/ql/test/library-tests/controlflow/Cfg.expected
index 67756a2bca27..30ffb3673c14 100644
--- a/rust/ql/test/library-tests/controlflow/Cfg.expected
+++ b/rust/ql/test/library-tests/controlflow/Cfg.expected
@@ -428,7 +428,12 @@
 | test.rs:230:9:230:23 | TupleStructPat | test.rs:230:28:230:28 | x | match |
 | test.rs:230:9:230:23 | TupleStructPat | test.rs:231:9:231:23 | TupleStructPat | no-match |
 | test.rs:230:28:230:28 | x | test.rs:230:32:230:33 | 10 |  |
+| test.rs:230:28:230:33 | ... < ... | test.rs:230:38:230:38 | x | true |
+| test.rs:230:28:230:33 | ... < ... | test.rs:231:9:231:23 | TupleStructPat | false |
 | test.rs:230:32:230:33 | 10 | test.rs:230:28:230:33 | ... < ... |  |
+| test.rs:230:38:230:38 | x | test.rs:230:42:230:42 | 5 |  |
+| test.rs:230:38:230:42 | ... + ... | test.rs:229:5:233:5 | MatchExpr |  |
+| test.rs:230:42:230:42 | 5 | test.rs:230:38:230:42 | ... + ... |  |
 | test.rs:231:9:231:23 | TupleStructPat | test.rs:231:28:231:28 | x | match |
 | test.rs:231:9:231:23 | TupleStructPat | test.rs:232:9:232:20 | PathPat | no-match |
 | test.rs:231:28:231:28 | x | test.rs:229:5:233:5 | MatchExpr |  |
diff --git a/rust/ql/test/library-tests/variables/CONSISTENCY/CfgConsistency.expected b/rust/ql/test/library-tests/variables/CONSISTENCY/CfgConsistency.expected
index 5457cb7c9d96..f7c02f86bb8d 100644
--- a/rust/ql/test/library-tests/variables/CONSISTENCY/CfgConsistency.expected
+++ b/rust/ql/test/library-tests/variables/CONSISTENCY/CfgConsistency.expected
@@ -1,5 +1,4 @@
 deadEnd
 | variables.rs:2:5:2:22 | ExprStmt |
 | variables.rs:6:5:6:22 | ExprStmt |
-| variables.rs:200:16:200:21 | ... > ... |
 | variables.rs:310:5:310:42 | LetStmt |

From 17770af491b69035e616fe2f61c7e1d509e1b808 Mon Sep 17 00:00:00 2001
From: Tom Hvitved <hvitved@github.com>
Date: Tue, 1 Oct 2024 10:39:09 +0200
Subject: [PATCH 100/347] Rust: Account for `let` statement `else` blocks in
 `deadEnd`

---
 rust/ql/consistency-queries/CfgConsistency.ql               | 6 ++++++
 .../controlflow/CONSISTENCY/CfgConsistency.expected         | 2 --
 2 files changed, 6 insertions(+), 2 deletions(-)
 delete mode 100644 rust/ql/test/library-tests/controlflow/CONSISTENCY/CfgConsistency.expected

diff --git a/rust/ql/consistency-queries/CfgConsistency.ql b/rust/ql/consistency-queries/CfgConsistency.ql
index ef7f9b6f2551..52b44170a397 100644
--- a/rust/ql/consistency-queries/CfgConsistency.ql
+++ b/rust/ql/consistency-queries/CfgConsistency.ql
@@ -25,3 +25,9 @@ query predicate scopeNoFirst(CfgScope scope) {
   not scope = any(Function f | not exists(f.getBody())) and
   not scope = any(ClosureExpr c | not exists(c.getBody()))
 }
+
+query predicate deadEnd(CfgImpl::Node node) {
+  Consistency::deadEnd(node) and
+  // `else` blocks in `let` statements diverge, so they are by definition dead ends
+  not node.getAstNode() = any(LetStmt let).getLetElse().getBlockExpr()
+}
diff --git a/rust/ql/test/library-tests/controlflow/CONSISTENCY/CfgConsistency.expected b/rust/ql/test/library-tests/controlflow/CONSISTENCY/CfgConsistency.expected
deleted file mode 100644
index 10964769c6e7..000000000000
--- a/rust/ql/test/library-tests/controlflow/CONSISTENCY/CfgConsistency.expected
+++ /dev/null
@@ -1,2 +0,0 @@
-deadEnd
-| test.rs:245:30:245:48 | BlockExpr |

From bbd0aa929fa196432d0d2b02075b00ce3f688826 Mon Sep 17 00:00:00 2001
From: Tom Hvitved <hvitved@github.com>
Date: Tue, 1 Oct 2024 11:11:42 +0200
Subject: [PATCH 101/347] Rust: Add more missing CFG trees

---
 .../internal/ControlFlowGraphImpl.qll         | 35 +++++++++++++++++++
 .../Abi/CONSISTENCY/CfgConsistency.expected   |  2 --
 .../CONSISTENCY/CfgConsistency.expected       |  2 --
 .../CONSISTENCY/CfgConsistency.expected       |  2 --
 .../CONSISTENCY/CfgConsistency.expected       |  2 --
 .../CONSISTENCY/CfgConsistency.expected       |  2 --
 .../CONSISTENCY/CfgConsistency.expected       |  2 --
 .../Attr/CONSISTENCY/CfgConsistency.expected  |  2 --
 .../CONSISTENCY/CfgConsistency.expected       |  2 --
 .../Const/CONSISTENCY/CfgConsistency.expected |  2 --
 .../CONSISTENCY/CfgConsistency.expected       |  2 --
 .../CONSISTENCY/CfgConsistency.expected       |  2 --
 .../CONSISTENCY/CfgConsistency.expected       |  2 --
 .../Enum/CONSISTENCY/CfgConsistency.expected  |  2 --
 .../CONSISTENCY/CfgConsistency.expected       |  2 --
 .../CONSISTENCY/CfgConsistency.expected       |  2 --
 .../CONSISTENCY/CfgConsistency.expected       |  2 --
 .../CONSISTENCY/CfgConsistency.expected       |  2 --
 .../CONSISTENCY/CfgConsistency.expected       |  2 --
 .../CONSISTENCY/CfgConsistency.expected       |  2 --
 .../CONSISTENCY/CfgConsistency.expected       |  2 --
 .../CONSISTENCY/CfgConsistency.expected       |  2 --
 .../CONSISTENCY/CfgConsistency.expected       |  2 --
 .../CONSISTENCY/CfgConsistency.expected       |  2 --
 .../CONSISTENCY/CfgConsistency.expected       |  2 --
 .../Impl/CONSISTENCY/CfgConsistency.expected  |  2 --
 .../CONSISTENCY/CfgConsistency.expected       |  2 --
 .../CONSISTENCY/CfgConsistency.expected       |  2 --
 .../CONSISTENCY/CfgConsistency.expected       |  2 --
 .../Label/CONSISTENCY/CfgConsistency.expected |  2 --
 .../CONSISTENCY/CfgConsistency.expected       |  2 --
 .../CONSISTENCY/CfgConsistency.expected       |  2 --
 .../CONSISTENCY/CfgConsistency.expected       |  2 --
 .../CONSISTENCY/CfgConsistency.expected       |  2 --
 .../CONSISTENCY/CfgConsistency.expected       |  2 --
 .../CONSISTENCY/CfgConsistency.expected       |  2 --
 .../CONSISTENCY/CfgConsistency.expected       |  2 --
 .../CONSISTENCY/CfgConsistency.expected       |  2 --
 .../CONSISTENCY/CfgConsistency.expected       |  2 --
 .../CONSISTENCY/CfgConsistency.expected       |  2 --
 .../CONSISTENCY/CfgConsistency.expected       |  2 --
 .../CONSISTENCY/CfgConsistency.expected       |  2 --
 .../CONSISTENCY/CfgConsistency.expected       |  2 --
 .../CONSISTENCY/CfgConsistency.expected       |  2 --
 .../CONSISTENCY/CfgConsistency.expected       |  2 --
 .../CONSISTENCY/CfgConsistency.expected       |  2 --
 .../Meta/CONSISTENCY/CfgConsistency.expected  |  2 --
 .../Name/CONSISTENCY/CfgConsistency.expected  |  2 --
 .../CONSISTENCY/CfgConsistency.expected       |  2 --
 .../CONSISTENCY/CfgConsistency.expected       |  2 --
 .../Param/CONSISTENCY/CfgConsistency.expected |  2 --
 .../CONSISTENCY/CfgConsistency.expected       |  2 --
 .../CONSISTENCY/CfgConsistency.expected       |  2 --
 .../CONSISTENCY/CfgConsistency.expected       |  2 --
 .../CONSISTENCY/CfgConsistency.expected       |  2 --
 .../CONSISTENCY/CfgConsistency.expected       |  2 --
 .../CONSISTENCY/CfgConsistency.expected       |  2 --
 .../CONSISTENCY/CfgConsistency.expected       |  2 --
 .../CONSISTENCY/CfgConsistency.expected       |  2 --
 .../CONSISTENCY/CfgConsistency.expected       |  2 --
 .../CONSISTENCY/CfgConsistency.expected       |  2 --
 .../CONSISTENCY/CfgConsistency.expected       |  2 --
 .../CONSISTENCY/CfgConsistency.expected       |  2 --
 .../CONSISTENCY/CfgConsistency.expected       |  2 --
 .../CONSISTENCY/CfgConsistency.expected       |  2 --
 .../CONSISTENCY/CfgConsistency.expected       |  2 --
 .../CONSISTENCY/CfgConsistency.expected       |  2 --
 .../CONSISTENCY/CfgConsistency.expected       |  2 --
 .../CONSISTENCY/CfgConsistency.expected       |  2 --
 .../CONSISTENCY/CfgConsistency.expected       |  2 --
 .../CONSISTENCY/CfgConsistency.expected       |  2 --
 .../CONSISTENCY/CfgConsistency.expected       |  2 --
 .../CONSISTENCY/CfgConsistency.expected       |  2 --
 .../CONSISTENCY/CfgConsistency.expected       |  2 --
 .../Trait/CONSISTENCY/CfgConsistency.expected |  2 --
 .../CONSISTENCY/CfgConsistency.expected       |  2 --
 .../CONSISTENCY/CfgConsistency.expected       |  2 --
 .../CONSISTENCY/CfgConsistency.expected       |  2 --
 .../CONSISTENCY/CfgConsistency.expected       |  2 --
 .../CONSISTENCY/CfgConsistency.expected       |  2 --
 .../CONSISTENCY/CfgConsistency.expected       |  2 --
 .../CONSISTENCY/CfgConsistency.expected       |  2 --
 .../CONSISTENCY/CfgConsistency.expected       |  2 --
 .../CONSISTENCY/CfgConsistency.expected       |  2 --
 .../CONSISTENCY/CfgConsistency.expected       |  2 --
 .../Union/CONSISTENCY/CfgConsistency.expected |  2 --
 .../Use/CONSISTENCY/CfgConsistency.expected   |  2 --
 .../CONSISTENCY/CfgConsistency.expected       |  2 --
 .../CONSISTENCY/CfgConsistency.expected       |  2 --
 .../CONSISTENCY/CfgConsistency.expected       |  2 --
 .../CONSISTENCY/CfgConsistency.expected       |  2 --
 .../CONSISTENCY/CfgConsistency.expected       |  2 --
 .../CONSISTENCY/CfgConsistency.expected       |  2 --
 .../CONSISTENCY/CfgConsistency.expected       |  2 --
 .../CONSISTENCY/CfgConsistency.expected       |  2 --
 .../CONSISTENCY/CfgConsistency.expected       |  4 ---
 .../CONSISTENCY/CfgConsistency.expected       |  4 ---
 .../CONSISTENCY/CfgConsistency.expected       |  8 -----
 98 files changed, 35 insertions(+), 204 deletions(-)
 delete mode 100644 rust/ql/test/extractor-tests/generated/Abi/CONSISTENCY/CfgConsistency.expected
 delete mode 100644 rust/ql/test/extractor-tests/generated/ArgList/CONSISTENCY/CfgConsistency.expected
 delete mode 100644 rust/ql/test/extractor-tests/generated/ArrayExpr/CONSISTENCY/CfgConsistency.expected
 delete mode 100644 rust/ql/test/extractor-tests/generated/ArrayType/CONSISTENCY/CfgConsistency.expected
 delete mode 100644 rust/ql/test/extractor-tests/generated/AssocItemList/CONSISTENCY/CfgConsistency.expected
 delete mode 100644 rust/ql/test/extractor-tests/generated/AssocTypeArg/CONSISTENCY/CfgConsistency.expected
 delete mode 100644 rust/ql/test/extractor-tests/generated/Attr/CONSISTENCY/CfgConsistency.expected
 delete mode 100644 rust/ql/test/extractor-tests/generated/ClosureBinder/CONSISTENCY/CfgConsistency.expected
 delete mode 100644 rust/ql/test/extractor-tests/generated/Const/CONSISTENCY/CfgConsistency.expected
 delete mode 100644 rust/ql/test/extractor-tests/generated/ConstArg/CONSISTENCY/CfgConsistency.expected
 delete mode 100644 rust/ql/test/extractor-tests/generated/ConstParam/CONSISTENCY/CfgConsistency.expected
 delete mode 100644 rust/ql/test/extractor-tests/generated/DynTraitType/CONSISTENCY/CfgConsistency.expected
 delete mode 100644 rust/ql/test/extractor-tests/generated/Enum/CONSISTENCY/CfgConsistency.expected
 delete mode 100644 rust/ql/test/extractor-tests/generated/ExprStmt/CONSISTENCY/CfgConsistency.expected
 delete mode 100644 rust/ql/test/extractor-tests/generated/ExternBlock/CONSISTENCY/CfgConsistency.expected
 delete mode 100644 rust/ql/test/extractor-tests/generated/ExternCrate/CONSISTENCY/CfgConsistency.expected
 delete mode 100644 rust/ql/test/extractor-tests/generated/ExternItemList/CONSISTENCY/CfgConsistency.expected
 delete mode 100644 rust/ql/test/extractor-tests/generated/FnPtrType/CONSISTENCY/CfgConsistency.expected
 delete mode 100644 rust/ql/test/extractor-tests/generated/ForExpr/CONSISTENCY/CfgConsistency.expected
 delete mode 100644 rust/ql/test/extractor-tests/generated/ForType/CONSISTENCY/CfgConsistency.expected
 delete mode 100644 rust/ql/test/extractor-tests/generated/FormatArgsArg/CONSISTENCY/CfgConsistency.expected
 delete mode 100644 rust/ql/test/extractor-tests/generated/FormatArgsExpr/CONSISTENCY/CfgConsistency.expected
 delete mode 100644 rust/ql/test/extractor-tests/generated/GenericParamList/CONSISTENCY/CfgConsistency.expected
 delete mode 100644 rust/ql/test/extractor-tests/generated/IfExpr/CONSISTENCY/CfgConsistency.expected
 delete mode 100644 rust/ql/test/extractor-tests/generated/Impl/CONSISTENCY/CfgConsistency.expected
 delete mode 100644 rust/ql/test/extractor-tests/generated/ImplTraitType/CONSISTENCY/CfgConsistency.expected
 delete mode 100644 rust/ql/test/extractor-tests/generated/InferType/CONSISTENCY/CfgConsistency.expected
 delete mode 100644 rust/ql/test/extractor-tests/generated/ItemList/CONSISTENCY/CfgConsistency.expected
 delete mode 100644 rust/ql/test/extractor-tests/generated/Label/CONSISTENCY/CfgConsistency.expected
 delete mode 100644 rust/ql/test/extractor-tests/generated/LetElse/CONSISTENCY/CfgConsistency.expected
 delete mode 100644 rust/ql/test/extractor-tests/generated/LetExpr/CONSISTENCY/CfgConsistency.expected
 delete mode 100644 rust/ql/test/extractor-tests/generated/Lifetime/CONSISTENCY/CfgConsistency.expected
 delete mode 100644 rust/ql/test/extractor-tests/generated/LifetimeArg/CONSISTENCY/CfgConsistency.expected
 delete mode 100644 rust/ql/test/extractor-tests/generated/LifetimeParam/CONSISTENCY/CfgConsistency.expected
 delete mode 100644 rust/ql/test/extractor-tests/generated/LoopExpr/CONSISTENCY/CfgConsistency.expected
 delete mode 100644 rust/ql/test/extractor-tests/generated/MacroCall/CONSISTENCY/CfgConsistency.expected
 delete mode 100644 rust/ql/test/extractor-tests/generated/MacroDef/CONSISTENCY/CfgConsistency.expected
 delete mode 100644 rust/ql/test/extractor-tests/generated/MacroExpr/CONSISTENCY/CfgConsistency.expected
 delete mode 100644 rust/ql/test/extractor-tests/generated/MacroPat/CONSISTENCY/CfgConsistency.expected
 delete mode 100644 rust/ql/test/extractor-tests/generated/MacroRules/CONSISTENCY/CfgConsistency.expected
 delete mode 100644 rust/ql/test/extractor-tests/generated/MacroType/CONSISTENCY/CfgConsistency.expected
 delete mode 100644 rust/ql/test/extractor-tests/generated/MatchArm/CONSISTENCY/CfgConsistency.expected
 delete mode 100644 rust/ql/test/extractor-tests/generated/MatchArmList/CONSISTENCY/CfgConsistency.expected
 delete mode 100644 rust/ql/test/extractor-tests/generated/MatchExpr/CONSISTENCY/CfgConsistency.expected
 delete mode 100644 rust/ql/test/extractor-tests/generated/MatchGuard/CONSISTENCY/CfgConsistency.expected
 delete mode 100644 rust/ql/test/extractor-tests/generated/Meta/CONSISTENCY/CfgConsistency.expected
 delete mode 100644 rust/ql/test/extractor-tests/generated/Name/CONSISTENCY/CfgConsistency.expected
 delete mode 100644 rust/ql/test/extractor-tests/generated/NameRef/CONSISTENCY/CfgConsistency.expected
 delete mode 100644 rust/ql/test/extractor-tests/generated/NeverType/CONSISTENCY/CfgConsistency.expected
 delete mode 100644 rust/ql/test/extractor-tests/generated/Param/CONSISTENCY/CfgConsistency.expected
 delete mode 100644 rust/ql/test/extractor-tests/generated/ParamList/CONSISTENCY/CfgConsistency.expected
 delete mode 100644 rust/ql/test/extractor-tests/generated/ParenExpr/CONSISTENCY/CfgConsistency.expected
 delete mode 100644 rust/ql/test/extractor-tests/generated/ParenPat/CONSISTENCY/CfgConsistency.expected
 delete mode 100644 rust/ql/test/extractor-tests/generated/ParenType/CONSISTENCY/CfgConsistency.expected
 delete mode 100644 rust/ql/test/extractor-tests/generated/PathSegment/CONSISTENCY/CfgConsistency.expected
 delete mode 100644 rust/ql/test/extractor-tests/generated/PathType/CONSISTENCY/CfgConsistency.expected
 delete mode 100644 rust/ql/test/extractor-tests/generated/PtrType/CONSISTENCY/CfgConsistency.expected
 delete mode 100644 rust/ql/test/extractor-tests/generated/RecordExprFieldList/CONSISTENCY/CfgConsistency.expected
 delete mode 100644 rust/ql/test/extractor-tests/generated/RecordField/CONSISTENCY/CfgConsistency.expected
 delete mode 100644 rust/ql/test/extractor-tests/generated/RecordFieldList/CONSISTENCY/CfgConsistency.expected
 delete mode 100644 rust/ql/test/extractor-tests/generated/RecordPatFieldList/CONSISTENCY/CfgConsistency.expected
 delete mode 100644 rust/ql/test/extractor-tests/generated/RefType/CONSISTENCY/CfgConsistency.expected
 delete mode 100644 rust/ql/test/extractor-tests/generated/Rename/CONSISTENCY/CfgConsistency.expected
 delete mode 100644 rust/ql/test/extractor-tests/generated/RestPat/CONSISTENCY/CfgConsistency.expected
 delete mode 100644 rust/ql/test/extractor-tests/generated/RetType/CONSISTENCY/CfgConsistency.expected
 delete mode 100644 rust/ql/test/extractor-tests/generated/ReturnTypeSyntax/CONSISTENCY/CfgConsistency.expected
 delete mode 100644 rust/ql/test/extractor-tests/generated/SelfParam/CONSISTENCY/CfgConsistency.expected
 delete mode 100644 rust/ql/test/extractor-tests/generated/SliceType/CONSISTENCY/CfgConsistency.expected
 delete mode 100644 rust/ql/test/extractor-tests/generated/SourceFile/CONSISTENCY/CfgConsistency.expected
 delete mode 100644 rust/ql/test/extractor-tests/generated/Static/CONSISTENCY/CfgConsistency.expected
 delete mode 100644 rust/ql/test/extractor-tests/generated/StmtList/CONSISTENCY/CfgConsistency.expected
 delete mode 100644 rust/ql/test/extractor-tests/generated/Struct/CONSISTENCY/CfgConsistency.expected
 delete mode 100644 rust/ql/test/extractor-tests/generated/TokenTree/CONSISTENCY/CfgConsistency.expected
 delete mode 100644 rust/ql/test/extractor-tests/generated/Trait/CONSISTENCY/CfgConsistency.expected
 delete mode 100644 rust/ql/test/extractor-tests/generated/TraitAlias/CONSISTENCY/CfgConsistency.expected
 delete mode 100644 rust/ql/test/extractor-tests/generated/TryExpr/CONSISTENCY/CfgConsistency.expected
 delete mode 100644 rust/ql/test/extractor-tests/generated/TupleField/CONSISTENCY/CfgConsistency.expected
 delete mode 100644 rust/ql/test/extractor-tests/generated/TupleFieldList/CONSISTENCY/CfgConsistency.expected
 delete mode 100644 rust/ql/test/extractor-tests/generated/TupleType/CONSISTENCY/CfgConsistency.expected
 delete mode 100644 rust/ql/test/extractor-tests/generated/TypeAlias/CONSISTENCY/CfgConsistency.expected
 delete mode 100644 rust/ql/test/extractor-tests/generated/TypeArg/CONSISTENCY/CfgConsistency.expected
 delete mode 100644 rust/ql/test/extractor-tests/generated/TypeBound/CONSISTENCY/CfgConsistency.expected
 delete mode 100644 rust/ql/test/extractor-tests/generated/TypeBoundList/CONSISTENCY/CfgConsistency.expected
 delete mode 100644 rust/ql/test/extractor-tests/generated/TypeParam/CONSISTENCY/CfgConsistency.expected
 delete mode 100644 rust/ql/test/extractor-tests/generated/Union/CONSISTENCY/CfgConsistency.expected
 delete mode 100644 rust/ql/test/extractor-tests/generated/Use/CONSISTENCY/CfgConsistency.expected
 delete mode 100644 rust/ql/test/extractor-tests/generated/UseTree/CONSISTENCY/CfgConsistency.expected
 delete mode 100644 rust/ql/test/extractor-tests/generated/UseTreeList/CONSISTENCY/CfgConsistency.expected
 delete mode 100644 rust/ql/test/extractor-tests/generated/Variant/CONSISTENCY/CfgConsistency.expected
 delete mode 100644 rust/ql/test/extractor-tests/generated/VariantList/CONSISTENCY/CfgConsistency.expected
 delete mode 100644 rust/ql/test/extractor-tests/generated/Visibility/CONSISTENCY/CfgConsistency.expected
 delete mode 100644 rust/ql/test/extractor-tests/generated/WhereClause/CONSISTENCY/CfgConsistency.expected
 delete mode 100644 rust/ql/test/extractor-tests/generated/WherePred/CONSISTENCY/CfgConsistency.expected
 delete mode 100644 rust/ql/test/extractor-tests/generated/WhileExpr/CONSISTENCY/CfgConsistency.expected
 delete mode 100644 rust/ql/test/library-tests/variables/CONSISTENCY/CfgConsistency.expected
 delete mode 100644 rust/ql/test/query-tests/diagnostics/CONSISTENCY/CfgConsistency.expected
 delete mode 100644 rust/ql/test/query-tests/unusedentities/CONSISTENCY/CfgConsistency.expected

diff --git a/rust/ql/lib/codeql/rust/controlflow/internal/ControlFlowGraphImpl.qll b/rust/ql/lib/codeql/rust/controlflow/internal/ControlFlowGraphImpl.qll
index 4535e0be4c1c..177651bf1ca8 100644
--- a/rust/ql/lib/codeql/rust/controlflow/internal/ControlFlowGraphImpl.qll
+++ b/rust/ql/lib/codeql/rust/controlflow/internal/ControlFlowGraphImpl.qll
@@ -61,6 +61,10 @@ import CfgImpl
 /** Holds if `p` is a trivial pattern that is always guaranteed to match. */
 predicate trivialPat(Pat p) { p instanceof WildcardPat or p instanceof IdentPat }
 
+class ArrayExprTree extends StandardPostOrderTree, ArrayExpr {
+  override AstNode getChildNode(int i) { result = this.getExpr(i) }
+}
+
 class AsmExprTree extends LeafTree instanceof AsmExpr { }
 
 class AwaitExprTree extends StandardPostOrderTree instanceof AwaitExpr {
@@ -392,6 +396,9 @@ class ForExprTree extends LoopingExprTree instanceof ForExpr {
   }
 }
 
+// TODO: replace with expanded macro once the extractor supports it
+class MacroExprTree extends LeafTree, MacroExpr { }
+
 class MatchArmTree extends ControlFlowTree instanceof MatchArm {
   override predicate propagatesAbnormal(AstNode child) { child = super.getExpr() }
 
@@ -452,6 +459,10 @@ class MethodCallExprTree extends StandardPostOrderTree instanceof MethodCallExpr
   }
 }
 
+class NameTree extends LeafTree, Name { }
+
+class NameRefTree extends LeafTree, NameRef { }
+
 class OffsetOfExprTree extends LeafTree instanceof OffsetOfExpr { }
 
 class ParenExprTree extends StandardPostOrderTree, ParenExpr {
@@ -461,6 +472,18 @@ class ParenExprTree extends StandardPostOrderTree, ParenExpr {
 // This covers all patterns as they all extend `Pat`
 class PatExprTree extends LeafTree instanceof Pat { }
 
+class PathTree extends StandardPostOrderTree, Path {
+  override AstNode getChildNode(int i) {
+    i = 0 and result = this.getQualifier()
+    or
+    i = 1 and result = this.getPart()
+  }
+}
+
+class PathSegmentTree extends StandardPostOrderTree, PathSegment {
+  override AstNode getChildNode(int i) { i = 0 and result = this.getNameRef() }
+}
+
 class PathExprTree extends LeafTree instanceof PathExpr { }
 
 class PrefixExprTree extends StandardPostOrderTree instanceof PrefixExpr {
@@ -499,6 +522,14 @@ class ReturnExprTree extends PostOrderTree instanceof ReturnExpr {
   }
 }
 
+class StaticTree extends StandardPostOrderTree, Static {
+  override AstNode getChildNode(int i) {
+    i = 0 and result = this.getName()
+    or
+    i = 1 and result = this.getBody()
+  }
+}
+
 class TupleExprTree extends StandardPostOrderTree instanceof TupleExpr {
   override AstNode getChildNode(int i) { result = super.getField(i) }
 }
@@ -507,6 +538,10 @@ class TypeRefTree extends LeafTree instanceof TypeRef { }
 
 class UnderscoreExprTree extends LeafTree instanceof UnderscoreExpr { }
 
+class UseTree_ extends StandardPreOrderTree, Use {
+  override AstNode getChildNode(int i) { i = 0 and result = this.getUseTree().getPath() }
+}
+
 // NOTE: `yield` is a reserved but unused keyword.
 class YieldExprTree extends StandardPostOrderTree instanceof YieldExpr {
   override AstNode getChildNode(int i) { i = 0 and result = super.getExpr() }
diff --git a/rust/ql/test/extractor-tests/generated/Abi/CONSISTENCY/CfgConsistency.expected b/rust/ql/test/extractor-tests/generated/Abi/CONSISTENCY/CfgConsistency.expected
deleted file mode 100644
index 8d4bdf6cd3dc..000000000000
--- a/rust/ql/test/extractor-tests/generated/Abi/CONSISTENCY/CfgConsistency.expected
+++ /dev/null
@@ -1,2 +0,0 @@
-scopeNoFirst
-| gen_abi.rs:3:1:6:1 | test_abi |
diff --git a/rust/ql/test/extractor-tests/generated/ArgList/CONSISTENCY/CfgConsistency.expected b/rust/ql/test/extractor-tests/generated/ArgList/CONSISTENCY/CfgConsistency.expected
deleted file mode 100644
index 9d248b750b83..000000000000
--- a/rust/ql/test/extractor-tests/generated/ArgList/CONSISTENCY/CfgConsistency.expected
+++ /dev/null
@@ -1,2 +0,0 @@
-scopeNoFirst
-| gen_arg_list.rs:3:1:6:1 | test_arg_list |
diff --git a/rust/ql/test/extractor-tests/generated/ArrayExpr/CONSISTENCY/CfgConsistency.expected b/rust/ql/test/extractor-tests/generated/ArrayExpr/CONSISTENCY/CfgConsistency.expected
deleted file mode 100644
index 4bf8e4062121..000000000000
--- a/rust/ql/test/extractor-tests/generated/ArrayExpr/CONSISTENCY/CfgConsistency.expected
+++ /dev/null
@@ -1,2 +0,0 @@
-deadEnd
-| gen_array_expr.rs:5:5:5:14 | ExprStmt |
diff --git a/rust/ql/test/extractor-tests/generated/ArrayType/CONSISTENCY/CfgConsistency.expected b/rust/ql/test/extractor-tests/generated/ArrayType/CONSISTENCY/CfgConsistency.expected
deleted file mode 100644
index 62342a759d5b..000000000000
--- a/rust/ql/test/extractor-tests/generated/ArrayType/CONSISTENCY/CfgConsistency.expected
+++ /dev/null
@@ -1,2 +0,0 @@
-scopeNoFirst
-| gen_array_type.rs:3:1:6:1 | test_array_type |
diff --git a/rust/ql/test/extractor-tests/generated/AssocItemList/CONSISTENCY/CfgConsistency.expected b/rust/ql/test/extractor-tests/generated/AssocItemList/CONSISTENCY/CfgConsistency.expected
deleted file mode 100644
index cc7eef9075c0..000000000000
--- a/rust/ql/test/extractor-tests/generated/AssocItemList/CONSISTENCY/CfgConsistency.expected
+++ /dev/null
@@ -1,2 +0,0 @@
-scopeNoFirst
-| gen_assoc_item_list.rs:3:1:6:1 | test_assoc_item_list |
diff --git a/rust/ql/test/extractor-tests/generated/AssocTypeArg/CONSISTENCY/CfgConsistency.expected b/rust/ql/test/extractor-tests/generated/AssocTypeArg/CONSISTENCY/CfgConsistency.expected
deleted file mode 100644
index 0b79831a0c6c..000000000000
--- a/rust/ql/test/extractor-tests/generated/AssocTypeArg/CONSISTENCY/CfgConsistency.expected
+++ /dev/null
@@ -1,2 +0,0 @@
-scopeNoFirst
-| gen_assoc_type_arg.rs:3:1:6:1 | test_assoc_type_arg |
diff --git a/rust/ql/test/extractor-tests/generated/Attr/CONSISTENCY/CfgConsistency.expected b/rust/ql/test/extractor-tests/generated/Attr/CONSISTENCY/CfgConsistency.expected
deleted file mode 100644
index 0b123c1df9bf..000000000000
--- a/rust/ql/test/extractor-tests/generated/Attr/CONSISTENCY/CfgConsistency.expected
+++ /dev/null
@@ -1,2 +0,0 @@
-scopeNoFirst
-| gen_attr.rs:3:1:6:1 | test_attr |
diff --git a/rust/ql/test/extractor-tests/generated/ClosureBinder/CONSISTENCY/CfgConsistency.expected b/rust/ql/test/extractor-tests/generated/ClosureBinder/CONSISTENCY/CfgConsistency.expected
deleted file mode 100644
index f60c0a4be22e..000000000000
--- a/rust/ql/test/extractor-tests/generated/ClosureBinder/CONSISTENCY/CfgConsistency.expected
+++ /dev/null
@@ -1,2 +0,0 @@
-scopeNoFirst
-| gen_closure_binder.rs:3:1:6:1 | test_closure_binder |
diff --git a/rust/ql/test/extractor-tests/generated/Const/CONSISTENCY/CfgConsistency.expected b/rust/ql/test/extractor-tests/generated/Const/CONSISTENCY/CfgConsistency.expected
deleted file mode 100644
index ee1cb7311e75..000000000000
--- a/rust/ql/test/extractor-tests/generated/Const/CONSISTENCY/CfgConsistency.expected
+++ /dev/null
@@ -1,2 +0,0 @@
-scopeNoFirst
-| gen_const.rs:3:1:6:1 | test_const |
diff --git a/rust/ql/test/extractor-tests/generated/ConstArg/CONSISTENCY/CfgConsistency.expected b/rust/ql/test/extractor-tests/generated/ConstArg/CONSISTENCY/CfgConsistency.expected
deleted file mode 100644
index bc07de34ae2a..000000000000
--- a/rust/ql/test/extractor-tests/generated/ConstArg/CONSISTENCY/CfgConsistency.expected
+++ /dev/null
@@ -1,2 +0,0 @@
-scopeNoFirst
-| gen_const_arg.rs:3:1:6:1 | test_const_arg |
diff --git a/rust/ql/test/extractor-tests/generated/ConstParam/CONSISTENCY/CfgConsistency.expected b/rust/ql/test/extractor-tests/generated/ConstParam/CONSISTENCY/CfgConsistency.expected
deleted file mode 100644
index 634709095ffd..000000000000
--- a/rust/ql/test/extractor-tests/generated/ConstParam/CONSISTENCY/CfgConsistency.expected
+++ /dev/null
@@ -1,2 +0,0 @@
-scopeNoFirst
-| gen_const_param.rs:3:1:6:1 | test_const_param |
diff --git a/rust/ql/test/extractor-tests/generated/DynTraitType/CONSISTENCY/CfgConsistency.expected b/rust/ql/test/extractor-tests/generated/DynTraitType/CONSISTENCY/CfgConsistency.expected
deleted file mode 100644
index 4753404b64da..000000000000
--- a/rust/ql/test/extractor-tests/generated/DynTraitType/CONSISTENCY/CfgConsistency.expected
+++ /dev/null
@@ -1,2 +0,0 @@
-scopeNoFirst
-| gen_dyn_trait_type.rs:3:1:6:1 | test_dyn_trait_type |
diff --git a/rust/ql/test/extractor-tests/generated/Enum/CONSISTENCY/CfgConsistency.expected b/rust/ql/test/extractor-tests/generated/Enum/CONSISTENCY/CfgConsistency.expected
deleted file mode 100644
index 112cd9bc2ff8..000000000000
--- a/rust/ql/test/extractor-tests/generated/Enum/CONSISTENCY/CfgConsistency.expected
+++ /dev/null
@@ -1,2 +0,0 @@
-scopeNoFirst
-| gen_enum.rs:3:1:6:1 | test_enum |
diff --git a/rust/ql/test/extractor-tests/generated/ExprStmt/CONSISTENCY/CfgConsistency.expected b/rust/ql/test/extractor-tests/generated/ExprStmt/CONSISTENCY/CfgConsistency.expected
deleted file mode 100644
index 1013a9a4bb51..000000000000
--- a/rust/ql/test/extractor-tests/generated/ExprStmt/CONSISTENCY/CfgConsistency.expected
+++ /dev/null
@@ -1,2 +0,0 @@
-deadEnd
-| gen_expr_stmt.rs:6:5:6:12 | CallExpr |
diff --git a/rust/ql/test/extractor-tests/generated/ExternBlock/CONSISTENCY/CfgConsistency.expected b/rust/ql/test/extractor-tests/generated/ExternBlock/CONSISTENCY/CfgConsistency.expected
deleted file mode 100644
index dcd514c03c23..000000000000
--- a/rust/ql/test/extractor-tests/generated/ExternBlock/CONSISTENCY/CfgConsistency.expected
+++ /dev/null
@@ -1,2 +0,0 @@
-scopeNoFirst
-| gen_extern_block.rs:3:1:6:1 | test_extern_block |
diff --git a/rust/ql/test/extractor-tests/generated/ExternCrate/CONSISTENCY/CfgConsistency.expected b/rust/ql/test/extractor-tests/generated/ExternCrate/CONSISTENCY/CfgConsistency.expected
deleted file mode 100644
index a3657bdec4eb..000000000000
--- a/rust/ql/test/extractor-tests/generated/ExternCrate/CONSISTENCY/CfgConsistency.expected
+++ /dev/null
@@ -1,2 +0,0 @@
-scopeNoFirst
-| gen_extern_crate.rs:3:1:6:1 | test_extern_crate |
diff --git a/rust/ql/test/extractor-tests/generated/ExternItemList/CONSISTENCY/CfgConsistency.expected b/rust/ql/test/extractor-tests/generated/ExternItemList/CONSISTENCY/CfgConsistency.expected
deleted file mode 100644
index 004b9a6b6a2e..000000000000
--- a/rust/ql/test/extractor-tests/generated/ExternItemList/CONSISTENCY/CfgConsistency.expected
+++ /dev/null
@@ -1,2 +0,0 @@
-scopeNoFirst
-| gen_extern_item_list.rs:3:1:6:1 | test_extern_item_list |
diff --git a/rust/ql/test/extractor-tests/generated/FnPtrType/CONSISTENCY/CfgConsistency.expected b/rust/ql/test/extractor-tests/generated/FnPtrType/CONSISTENCY/CfgConsistency.expected
deleted file mode 100644
index ee3d592a18f5..000000000000
--- a/rust/ql/test/extractor-tests/generated/FnPtrType/CONSISTENCY/CfgConsistency.expected
+++ /dev/null
@@ -1,2 +0,0 @@
-scopeNoFirst
-| gen_fn_ptr_type.rs:3:1:6:1 | test_fn_ptr_type |
diff --git a/rust/ql/test/extractor-tests/generated/ForExpr/CONSISTENCY/CfgConsistency.expected b/rust/ql/test/extractor-tests/generated/ForExpr/CONSISTENCY/CfgConsistency.expected
deleted file mode 100644
index 536401b32bd6..000000000000
--- a/rust/ql/test/extractor-tests/generated/ForExpr/CONSISTENCY/CfgConsistency.expected
+++ /dev/null
@@ -1,2 +0,0 @@
-scopeNoFirst
-| gen_for_expr.rs:3:1:6:1 | test_for_expr |
diff --git a/rust/ql/test/extractor-tests/generated/ForType/CONSISTENCY/CfgConsistency.expected b/rust/ql/test/extractor-tests/generated/ForType/CONSISTENCY/CfgConsistency.expected
deleted file mode 100644
index 9b87a1cae09b..000000000000
--- a/rust/ql/test/extractor-tests/generated/ForType/CONSISTENCY/CfgConsistency.expected
+++ /dev/null
@@ -1,2 +0,0 @@
-scopeNoFirst
-| gen_for_type.rs:3:1:6:1 | test_for_type |
diff --git a/rust/ql/test/extractor-tests/generated/FormatArgsArg/CONSISTENCY/CfgConsistency.expected b/rust/ql/test/extractor-tests/generated/FormatArgsArg/CONSISTENCY/CfgConsistency.expected
deleted file mode 100644
index 80e93a811d5c..000000000000
--- a/rust/ql/test/extractor-tests/generated/FormatArgsArg/CONSISTENCY/CfgConsistency.expected
+++ /dev/null
@@ -1,2 +0,0 @@
-scopeNoFirst
-| gen_format_args_arg.rs:3:1:6:1 | test_format_args_arg |
diff --git a/rust/ql/test/extractor-tests/generated/FormatArgsExpr/CONSISTENCY/CfgConsistency.expected b/rust/ql/test/extractor-tests/generated/FormatArgsExpr/CONSISTENCY/CfgConsistency.expected
deleted file mode 100644
index 7fb70c61bde5..000000000000
--- a/rust/ql/test/extractor-tests/generated/FormatArgsExpr/CONSISTENCY/CfgConsistency.expected
+++ /dev/null
@@ -1,2 +0,0 @@
-scopeNoFirst
-| gen_format_args_expr.rs:3:1:6:1 | test_format_args_expr |
diff --git a/rust/ql/test/extractor-tests/generated/GenericParamList/CONSISTENCY/CfgConsistency.expected b/rust/ql/test/extractor-tests/generated/GenericParamList/CONSISTENCY/CfgConsistency.expected
deleted file mode 100644
index 1468fc6dd52d..000000000000
--- a/rust/ql/test/extractor-tests/generated/GenericParamList/CONSISTENCY/CfgConsistency.expected
+++ /dev/null
@@ -1,2 +0,0 @@
-scopeNoFirst
-| gen_generic_param_list.rs:3:1:6:1 | test_generic_param_list |
diff --git a/rust/ql/test/extractor-tests/generated/IfExpr/CONSISTENCY/CfgConsistency.expected b/rust/ql/test/extractor-tests/generated/IfExpr/CONSISTENCY/CfgConsistency.expected
deleted file mode 100644
index 8049e813d65e..000000000000
--- a/rust/ql/test/extractor-tests/generated/IfExpr/CONSISTENCY/CfgConsistency.expected
+++ /dev/null
@@ -1,2 +0,0 @@
-deadEnd
-| gen_if_expr.rs:6:9:6:38 | ExprStmt |
diff --git a/rust/ql/test/extractor-tests/generated/Impl/CONSISTENCY/CfgConsistency.expected b/rust/ql/test/extractor-tests/generated/Impl/CONSISTENCY/CfgConsistency.expected
deleted file mode 100644
index 43501141e2be..000000000000
--- a/rust/ql/test/extractor-tests/generated/Impl/CONSISTENCY/CfgConsistency.expected
+++ /dev/null
@@ -1,2 +0,0 @@
-scopeNoFirst
-| gen_impl.rs:3:1:6:1 | test_impl |
diff --git a/rust/ql/test/extractor-tests/generated/ImplTraitType/CONSISTENCY/CfgConsistency.expected b/rust/ql/test/extractor-tests/generated/ImplTraitType/CONSISTENCY/CfgConsistency.expected
deleted file mode 100644
index a88979d04764..000000000000
--- a/rust/ql/test/extractor-tests/generated/ImplTraitType/CONSISTENCY/CfgConsistency.expected
+++ /dev/null
@@ -1,2 +0,0 @@
-scopeNoFirst
-| gen_impl_trait_type.rs:3:1:6:1 | test_impl_trait_type |
diff --git a/rust/ql/test/extractor-tests/generated/InferType/CONSISTENCY/CfgConsistency.expected b/rust/ql/test/extractor-tests/generated/InferType/CONSISTENCY/CfgConsistency.expected
deleted file mode 100644
index 2eaf72e19646..000000000000
--- a/rust/ql/test/extractor-tests/generated/InferType/CONSISTENCY/CfgConsistency.expected
+++ /dev/null
@@ -1,2 +0,0 @@
-scopeNoFirst
-| gen_infer_type.rs:3:1:6:1 | test_infer_type |
diff --git a/rust/ql/test/extractor-tests/generated/ItemList/CONSISTENCY/CfgConsistency.expected b/rust/ql/test/extractor-tests/generated/ItemList/CONSISTENCY/CfgConsistency.expected
deleted file mode 100644
index 47b7abefadc3..000000000000
--- a/rust/ql/test/extractor-tests/generated/ItemList/CONSISTENCY/CfgConsistency.expected
+++ /dev/null
@@ -1,2 +0,0 @@
-scopeNoFirst
-| gen_item_list.rs:3:1:6:1 | test_item_list |
diff --git a/rust/ql/test/extractor-tests/generated/Label/CONSISTENCY/CfgConsistency.expected b/rust/ql/test/extractor-tests/generated/Label/CONSISTENCY/CfgConsistency.expected
deleted file mode 100644
index 8409c37b3651..000000000000
--- a/rust/ql/test/extractor-tests/generated/Label/CONSISTENCY/CfgConsistency.expected
+++ /dev/null
@@ -1,2 +0,0 @@
-deadEnd
-| gen_label.rs:6:9:6:41 | ExprStmt |
diff --git a/rust/ql/test/extractor-tests/generated/LetElse/CONSISTENCY/CfgConsistency.expected b/rust/ql/test/extractor-tests/generated/LetElse/CONSISTENCY/CfgConsistency.expected
deleted file mode 100644
index 3e531a4f531c..000000000000
--- a/rust/ql/test/extractor-tests/generated/LetElse/CONSISTENCY/CfgConsistency.expected
+++ /dev/null
@@ -1,2 +0,0 @@
-scopeNoFirst
-| gen_let_else.rs:3:1:6:1 | test_let_else |
diff --git a/rust/ql/test/extractor-tests/generated/LetExpr/CONSISTENCY/CfgConsistency.expected b/rust/ql/test/extractor-tests/generated/LetExpr/CONSISTENCY/CfgConsistency.expected
deleted file mode 100644
index b095048ef145..000000000000
--- a/rust/ql/test/extractor-tests/generated/LetExpr/CONSISTENCY/CfgConsistency.expected
+++ /dev/null
@@ -1,2 +0,0 @@
-deadEnd
-| gen_let_expr.rs:6:9:6:26 | ExprStmt |
diff --git a/rust/ql/test/extractor-tests/generated/Lifetime/CONSISTENCY/CfgConsistency.expected b/rust/ql/test/extractor-tests/generated/Lifetime/CONSISTENCY/CfgConsistency.expected
deleted file mode 100644
index 5ce6674c6dbc..000000000000
--- a/rust/ql/test/extractor-tests/generated/Lifetime/CONSISTENCY/CfgConsistency.expected
+++ /dev/null
@@ -1,2 +0,0 @@
-scopeNoFirst
-| gen_lifetime.rs:3:1:6:1 | test_lifetime |
diff --git a/rust/ql/test/extractor-tests/generated/LifetimeArg/CONSISTENCY/CfgConsistency.expected b/rust/ql/test/extractor-tests/generated/LifetimeArg/CONSISTENCY/CfgConsistency.expected
deleted file mode 100644
index e7fb5e883146..000000000000
--- a/rust/ql/test/extractor-tests/generated/LifetimeArg/CONSISTENCY/CfgConsistency.expected
+++ /dev/null
@@ -1,2 +0,0 @@
-scopeNoFirst
-| gen_lifetime_arg.rs:3:1:6:1 | test_lifetime_arg |
diff --git a/rust/ql/test/extractor-tests/generated/LifetimeParam/CONSISTENCY/CfgConsistency.expected b/rust/ql/test/extractor-tests/generated/LifetimeParam/CONSISTENCY/CfgConsistency.expected
deleted file mode 100644
index e8267e036098..000000000000
--- a/rust/ql/test/extractor-tests/generated/LifetimeParam/CONSISTENCY/CfgConsistency.expected
+++ /dev/null
@@ -1,2 +0,0 @@
-scopeNoFirst
-| gen_lifetime_param.rs:3:1:6:1 | test_lifetime_param |
diff --git a/rust/ql/test/extractor-tests/generated/LoopExpr/CONSISTENCY/CfgConsistency.expected b/rust/ql/test/extractor-tests/generated/LoopExpr/CONSISTENCY/CfgConsistency.expected
deleted file mode 100644
index 51c4af3241b0..000000000000
--- a/rust/ql/test/extractor-tests/generated/LoopExpr/CONSISTENCY/CfgConsistency.expected
+++ /dev/null
@@ -1,2 +0,0 @@
-deadEnd
-| gen_loop_expr.rs:6:9:6:42 | ExprStmt |
diff --git a/rust/ql/test/extractor-tests/generated/MacroCall/CONSISTENCY/CfgConsistency.expected b/rust/ql/test/extractor-tests/generated/MacroCall/CONSISTENCY/CfgConsistency.expected
deleted file mode 100644
index 6d53cc3fb6cb..000000000000
--- a/rust/ql/test/extractor-tests/generated/MacroCall/CONSISTENCY/CfgConsistency.expected
+++ /dev/null
@@ -1,2 +0,0 @@
-scopeNoFirst
-| gen_macro_call.rs:3:1:6:1 | test_macro_call |
diff --git a/rust/ql/test/extractor-tests/generated/MacroDef/CONSISTENCY/CfgConsistency.expected b/rust/ql/test/extractor-tests/generated/MacroDef/CONSISTENCY/CfgConsistency.expected
deleted file mode 100644
index 35a5ed182593..000000000000
--- a/rust/ql/test/extractor-tests/generated/MacroDef/CONSISTENCY/CfgConsistency.expected
+++ /dev/null
@@ -1,2 +0,0 @@
-scopeNoFirst
-| gen_macro_def.rs:3:1:6:1 | test_macro_def |
diff --git a/rust/ql/test/extractor-tests/generated/MacroExpr/CONSISTENCY/CfgConsistency.expected b/rust/ql/test/extractor-tests/generated/MacroExpr/CONSISTENCY/CfgConsistency.expected
deleted file mode 100644
index f1bbf3a66f5a..000000000000
--- a/rust/ql/test/extractor-tests/generated/MacroExpr/CONSISTENCY/CfgConsistency.expected
+++ /dev/null
@@ -1,2 +0,0 @@
-scopeNoFirst
-| gen_macro_expr.rs:3:1:6:1 | test_macro_expr |
diff --git a/rust/ql/test/extractor-tests/generated/MacroPat/CONSISTENCY/CfgConsistency.expected b/rust/ql/test/extractor-tests/generated/MacroPat/CONSISTENCY/CfgConsistency.expected
deleted file mode 100644
index bc683af91462..000000000000
--- a/rust/ql/test/extractor-tests/generated/MacroPat/CONSISTENCY/CfgConsistency.expected
+++ /dev/null
@@ -1,2 +0,0 @@
-scopeNoFirst
-| gen_macro_pat.rs:3:1:6:1 | test_macro_pat |
diff --git a/rust/ql/test/extractor-tests/generated/MacroRules/CONSISTENCY/CfgConsistency.expected b/rust/ql/test/extractor-tests/generated/MacroRules/CONSISTENCY/CfgConsistency.expected
deleted file mode 100644
index 5705ce551635..000000000000
--- a/rust/ql/test/extractor-tests/generated/MacroRules/CONSISTENCY/CfgConsistency.expected
+++ /dev/null
@@ -1,2 +0,0 @@
-scopeNoFirst
-| gen_macro_rules.rs:3:1:6:1 | test_macro_rules |
diff --git a/rust/ql/test/extractor-tests/generated/MacroType/CONSISTENCY/CfgConsistency.expected b/rust/ql/test/extractor-tests/generated/MacroType/CONSISTENCY/CfgConsistency.expected
deleted file mode 100644
index 12fc80e517d5..000000000000
--- a/rust/ql/test/extractor-tests/generated/MacroType/CONSISTENCY/CfgConsistency.expected
+++ /dev/null
@@ -1,2 +0,0 @@
-scopeNoFirst
-| gen_macro_type.rs:3:1:6:1 | test_macro_type |
diff --git a/rust/ql/test/extractor-tests/generated/MatchArm/CONSISTENCY/CfgConsistency.expected b/rust/ql/test/extractor-tests/generated/MatchArm/CONSISTENCY/CfgConsistency.expected
deleted file mode 100644
index e558c7c1c28d..000000000000
--- a/rust/ql/test/extractor-tests/generated/MatchArm/CONSISTENCY/CfgConsistency.expected
+++ /dev/null
@@ -1,2 +0,0 @@
-deadEnd
-| gen_match_arm.rs:10:20:10:25 | ... != ... |
diff --git a/rust/ql/test/extractor-tests/generated/MatchArmList/CONSISTENCY/CfgConsistency.expected b/rust/ql/test/extractor-tests/generated/MatchArmList/CONSISTENCY/CfgConsistency.expected
deleted file mode 100644
index 1f87a7f2ff2f..000000000000
--- a/rust/ql/test/extractor-tests/generated/MatchArmList/CONSISTENCY/CfgConsistency.expected
+++ /dev/null
@@ -1,2 +0,0 @@
-scopeNoFirst
-| gen_match_arm_list.rs:3:1:6:1 | test_match_arm_list |
diff --git a/rust/ql/test/extractor-tests/generated/MatchExpr/CONSISTENCY/CfgConsistency.expected b/rust/ql/test/extractor-tests/generated/MatchExpr/CONSISTENCY/CfgConsistency.expected
deleted file mode 100644
index 8d6730211c8e..000000000000
--- a/rust/ql/test/extractor-tests/generated/MatchExpr/CONSISTENCY/CfgConsistency.expected
+++ /dev/null
@@ -1,2 +0,0 @@
-deadEnd
-| gen_match_expr.rs:10:20:10:25 | ... != ... |
diff --git a/rust/ql/test/extractor-tests/generated/MatchGuard/CONSISTENCY/CfgConsistency.expected b/rust/ql/test/extractor-tests/generated/MatchGuard/CONSISTENCY/CfgConsistency.expected
deleted file mode 100644
index c43c4e80a15f..000000000000
--- a/rust/ql/test/extractor-tests/generated/MatchGuard/CONSISTENCY/CfgConsistency.expected
+++ /dev/null
@@ -1,2 +0,0 @@
-scopeNoFirst
-| gen_match_guard.rs:3:1:6:1 | test_match_guard |
diff --git a/rust/ql/test/extractor-tests/generated/Meta/CONSISTENCY/CfgConsistency.expected b/rust/ql/test/extractor-tests/generated/Meta/CONSISTENCY/CfgConsistency.expected
deleted file mode 100644
index 5b99494cfb9b..000000000000
--- a/rust/ql/test/extractor-tests/generated/Meta/CONSISTENCY/CfgConsistency.expected
+++ /dev/null
@@ -1,2 +0,0 @@
-scopeNoFirst
-| gen_meta.rs:3:1:6:1 | test_meta |
diff --git a/rust/ql/test/extractor-tests/generated/Name/CONSISTENCY/CfgConsistency.expected b/rust/ql/test/extractor-tests/generated/Name/CONSISTENCY/CfgConsistency.expected
deleted file mode 100644
index ab6b629565a7..000000000000
--- a/rust/ql/test/extractor-tests/generated/Name/CONSISTENCY/CfgConsistency.expected
+++ /dev/null
@@ -1,2 +0,0 @@
-scopeNoFirst
-| gen_name.rs:3:1:6:1 | test_name |
diff --git a/rust/ql/test/extractor-tests/generated/NameRef/CONSISTENCY/CfgConsistency.expected b/rust/ql/test/extractor-tests/generated/NameRef/CONSISTENCY/CfgConsistency.expected
deleted file mode 100644
index 00229745d5e8..000000000000
--- a/rust/ql/test/extractor-tests/generated/NameRef/CONSISTENCY/CfgConsistency.expected
+++ /dev/null
@@ -1,2 +0,0 @@
-scopeNoFirst
-| gen_name_ref.rs:3:1:6:1 | test_name_ref |
diff --git a/rust/ql/test/extractor-tests/generated/NeverType/CONSISTENCY/CfgConsistency.expected b/rust/ql/test/extractor-tests/generated/NeverType/CONSISTENCY/CfgConsistency.expected
deleted file mode 100644
index f439296033cc..000000000000
--- a/rust/ql/test/extractor-tests/generated/NeverType/CONSISTENCY/CfgConsistency.expected
+++ /dev/null
@@ -1,2 +0,0 @@
-scopeNoFirst
-| gen_never_type.rs:3:1:6:1 | test_never_type |
diff --git a/rust/ql/test/extractor-tests/generated/Param/CONSISTENCY/CfgConsistency.expected b/rust/ql/test/extractor-tests/generated/Param/CONSISTENCY/CfgConsistency.expected
deleted file mode 100644
index 4ae2cf3ef7a7..000000000000
--- a/rust/ql/test/extractor-tests/generated/Param/CONSISTENCY/CfgConsistency.expected
+++ /dev/null
@@ -1,2 +0,0 @@
-scopeNoFirst
-| gen_param.rs:3:1:6:1 | test_param |
diff --git a/rust/ql/test/extractor-tests/generated/ParamList/CONSISTENCY/CfgConsistency.expected b/rust/ql/test/extractor-tests/generated/ParamList/CONSISTENCY/CfgConsistency.expected
deleted file mode 100644
index 5ec0293119d0..000000000000
--- a/rust/ql/test/extractor-tests/generated/ParamList/CONSISTENCY/CfgConsistency.expected
+++ /dev/null
@@ -1,2 +0,0 @@
-scopeNoFirst
-| gen_param_list.rs:3:1:6:1 | test_param_list |
diff --git a/rust/ql/test/extractor-tests/generated/ParenExpr/CONSISTENCY/CfgConsistency.expected b/rust/ql/test/extractor-tests/generated/ParenExpr/CONSISTENCY/CfgConsistency.expected
deleted file mode 100644
index d6456a3eeaf3..000000000000
--- a/rust/ql/test/extractor-tests/generated/ParenExpr/CONSISTENCY/CfgConsistency.expected
+++ /dev/null
@@ -1,2 +0,0 @@
-scopeNoFirst
-| gen_paren_expr.rs:3:1:6:1 | test_paren_expr |
diff --git a/rust/ql/test/extractor-tests/generated/ParenPat/CONSISTENCY/CfgConsistency.expected b/rust/ql/test/extractor-tests/generated/ParenPat/CONSISTENCY/CfgConsistency.expected
deleted file mode 100644
index 8bae5ce6c3bf..000000000000
--- a/rust/ql/test/extractor-tests/generated/ParenPat/CONSISTENCY/CfgConsistency.expected
+++ /dev/null
@@ -1,2 +0,0 @@
-scopeNoFirst
-| gen_paren_pat.rs:3:1:6:1 | test_paren_pat |
diff --git a/rust/ql/test/extractor-tests/generated/ParenType/CONSISTENCY/CfgConsistency.expected b/rust/ql/test/extractor-tests/generated/ParenType/CONSISTENCY/CfgConsistency.expected
deleted file mode 100644
index 2b51b5ff5c74..000000000000
--- a/rust/ql/test/extractor-tests/generated/ParenType/CONSISTENCY/CfgConsistency.expected
+++ /dev/null
@@ -1,2 +0,0 @@
-scopeNoFirst
-| gen_paren_type.rs:3:1:6:1 | test_paren_type |
diff --git a/rust/ql/test/extractor-tests/generated/PathSegment/CONSISTENCY/CfgConsistency.expected b/rust/ql/test/extractor-tests/generated/PathSegment/CONSISTENCY/CfgConsistency.expected
deleted file mode 100644
index ce4905c17cbb..000000000000
--- a/rust/ql/test/extractor-tests/generated/PathSegment/CONSISTENCY/CfgConsistency.expected
+++ /dev/null
@@ -1,2 +0,0 @@
-scopeNoFirst
-| gen_path_segment.rs:3:1:6:1 | test_path_segment |
diff --git a/rust/ql/test/extractor-tests/generated/PathType/CONSISTENCY/CfgConsistency.expected b/rust/ql/test/extractor-tests/generated/PathType/CONSISTENCY/CfgConsistency.expected
deleted file mode 100644
index d274a77daf7b..000000000000
--- a/rust/ql/test/extractor-tests/generated/PathType/CONSISTENCY/CfgConsistency.expected
+++ /dev/null
@@ -1,2 +0,0 @@
-scopeNoFirst
-| gen_path_type.rs:3:1:6:1 | test_path_type |
diff --git a/rust/ql/test/extractor-tests/generated/PtrType/CONSISTENCY/CfgConsistency.expected b/rust/ql/test/extractor-tests/generated/PtrType/CONSISTENCY/CfgConsistency.expected
deleted file mode 100644
index a85b631b54dd..000000000000
--- a/rust/ql/test/extractor-tests/generated/PtrType/CONSISTENCY/CfgConsistency.expected
+++ /dev/null
@@ -1,2 +0,0 @@
-scopeNoFirst
-| gen_ptr_type.rs:3:1:6:1 | test_ptr_type |
diff --git a/rust/ql/test/extractor-tests/generated/RecordExprFieldList/CONSISTENCY/CfgConsistency.expected b/rust/ql/test/extractor-tests/generated/RecordExprFieldList/CONSISTENCY/CfgConsistency.expected
deleted file mode 100644
index 979b32ad4d84..000000000000
--- a/rust/ql/test/extractor-tests/generated/RecordExprFieldList/CONSISTENCY/CfgConsistency.expected
+++ /dev/null
@@ -1,2 +0,0 @@
-scopeNoFirst
-| gen_record_expr_field_list.rs:3:1:6:1 | test_record_expr_field_list |
diff --git a/rust/ql/test/extractor-tests/generated/RecordField/CONSISTENCY/CfgConsistency.expected b/rust/ql/test/extractor-tests/generated/RecordField/CONSISTENCY/CfgConsistency.expected
deleted file mode 100644
index 233c2442b42b..000000000000
--- a/rust/ql/test/extractor-tests/generated/RecordField/CONSISTENCY/CfgConsistency.expected
+++ /dev/null
@@ -1,2 +0,0 @@
-scopeNoFirst
-| gen_record_field.rs:3:1:6:1 | test_record_field |
diff --git a/rust/ql/test/extractor-tests/generated/RecordFieldList/CONSISTENCY/CfgConsistency.expected b/rust/ql/test/extractor-tests/generated/RecordFieldList/CONSISTENCY/CfgConsistency.expected
deleted file mode 100644
index 28fe2e3666a4..000000000000
--- a/rust/ql/test/extractor-tests/generated/RecordFieldList/CONSISTENCY/CfgConsistency.expected
+++ /dev/null
@@ -1,2 +0,0 @@
-scopeNoFirst
-| gen_record_field_list.rs:3:1:6:1 | test_record_field_list |
diff --git a/rust/ql/test/extractor-tests/generated/RecordPatFieldList/CONSISTENCY/CfgConsistency.expected b/rust/ql/test/extractor-tests/generated/RecordPatFieldList/CONSISTENCY/CfgConsistency.expected
deleted file mode 100644
index 90d25f25c4dc..000000000000
--- a/rust/ql/test/extractor-tests/generated/RecordPatFieldList/CONSISTENCY/CfgConsistency.expected
+++ /dev/null
@@ -1,2 +0,0 @@
-scopeNoFirst
-| gen_record_pat_field_list.rs:3:1:6:1 | test_record_pat_field_list |
diff --git a/rust/ql/test/extractor-tests/generated/RefType/CONSISTENCY/CfgConsistency.expected b/rust/ql/test/extractor-tests/generated/RefType/CONSISTENCY/CfgConsistency.expected
deleted file mode 100644
index c8e70e9406c7..000000000000
--- a/rust/ql/test/extractor-tests/generated/RefType/CONSISTENCY/CfgConsistency.expected
+++ /dev/null
@@ -1,2 +0,0 @@
-scopeNoFirst
-| gen_ref_type.rs:3:1:6:1 | test_ref_type |
diff --git a/rust/ql/test/extractor-tests/generated/Rename/CONSISTENCY/CfgConsistency.expected b/rust/ql/test/extractor-tests/generated/Rename/CONSISTENCY/CfgConsistency.expected
deleted file mode 100644
index da7a362c6c57..000000000000
--- a/rust/ql/test/extractor-tests/generated/Rename/CONSISTENCY/CfgConsistency.expected
+++ /dev/null
@@ -1,2 +0,0 @@
-scopeNoFirst
-| gen_rename.rs:3:1:6:1 | test_rename |
diff --git a/rust/ql/test/extractor-tests/generated/RestPat/CONSISTENCY/CfgConsistency.expected b/rust/ql/test/extractor-tests/generated/RestPat/CONSISTENCY/CfgConsistency.expected
deleted file mode 100644
index 4a73b0c3aca5..000000000000
--- a/rust/ql/test/extractor-tests/generated/RestPat/CONSISTENCY/CfgConsistency.expected
+++ /dev/null
@@ -1,2 +0,0 @@
-scopeNoFirst
-| gen_rest_pat.rs:3:1:6:1 | test_rest_pat |
diff --git a/rust/ql/test/extractor-tests/generated/RetType/CONSISTENCY/CfgConsistency.expected b/rust/ql/test/extractor-tests/generated/RetType/CONSISTENCY/CfgConsistency.expected
deleted file mode 100644
index c203f29b4243..000000000000
--- a/rust/ql/test/extractor-tests/generated/RetType/CONSISTENCY/CfgConsistency.expected
+++ /dev/null
@@ -1,2 +0,0 @@
-scopeNoFirst
-| gen_ret_type.rs:3:1:6:1 | test_ret_type |
diff --git a/rust/ql/test/extractor-tests/generated/ReturnTypeSyntax/CONSISTENCY/CfgConsistency.expected b/rust/ql/test/extractor-tests/generated/ReturnTypeSyntax/CONSISTENCY/CfgConsistency.expected
deleted file mode 100644
index 74c6038da131..000000000000
--- a/rust/ql/test/extractor-tests/generated/ReturnTypeSyntax/CONSISTENCY/CfgConsistency.expected
+++ /dev/null
@@ -1,2 +0,0 @@
-scopeNoFirst
-| gen_return_type_syntax.rs:3:1:6:1 | test_return_type_syntax |
diff --git a/rust/ql/test/extractor-tests/generated/SelfParam/CONSISTENCY/CfgConsistency.expected b/rust/ql/test/extractor-tests/generated/SelfParam/CONSISTENCY/CfgConsistency.expected
deleted file mode 100644
index ffd6ee6bb3a7..000000000000
--- a/rust/ql/test/extractor-tests/generated/SelfParam/CONSISTENCY/CfgConsistency.expected
+++ /dev/null
@@ -1,2 +0,0 @@
-scopeNoFirst
-| gen_self_param.rs:3:1:6:1 | test_self_param |
diff --git a/rust/ql/test/extractor-tests/generated/SliceType/CONSISTENCY/CfgConsistency.expected b/rust/ql/test/extractor-tests/generated/SliceType/CONSISTENCY/CfgConsistency.expected
deleted file mode 100644
index 1785d38746fb..000000000000
--- a/rust/ql/test/extractor-tests/generated/SliceType/CONSISTENCY/CfgConsistency.expected
+++ /dev/null
@@ -1,2 +0,0 @@
-scopeNoFirst
-| gen_slice_type.rs:3:1:6:1 | test_slice_type |
diff --git a/rust/ql/test/extractor-tests/generated/SourceFile/CONSISTENCY/CfgConsistency.expected b/rust/ql/test/extractor-tests/generated/SourceFile/CONSISTENCY/CfgConsistency.expected
deleted file mode 100644
index 77f954842667..000000000000
--- a/rust/ql/test/extractor-tests/generated/SourceFile/CONSISTENCY/CfgConsistency.expected
+++ /dev/null
@@ -1,2 +0,0 @@
-scopeNoFirst
-| gen_source_file.rs:3:1:6:1 | test_source_file |
diff --git a/rust/ql/test/extractor-tests/generated/Static/CONSISTENCY/CfgConsistency.expected b/rust/ql/test/extractor-tests/generated/Static/CONSISTENCY/CfgConsistency.expected
deleted file mode 100644
index 405775d54459..000000000000
--- a/rust/ql/test/extractor-tests/generated/Static/CONSISTENCY/CfgConsistency.expected
+++ /dev/null
@@ -1,2 +0,0 @@
-scopeNoFirst
-| gen_static.rs:3:1:6:1 | test_static |
diff --git a/rust/ql/test/extractor-tests/generated/StmtList/CONSISTENCY/CfgConsistency.expected b/rust/ql/test/extractor-tests/generated/StmtList/CONSISTENCY/CfgConsistency.expected
deleted file mode 100644
index 3772daffc17e..000000000000
--- a/rust/ql/test/extractor-tests/generated/StmtList/CONSISTENCY/CfgConsistency.expected
+++ /dev/null
@@ -1,2 +0,0 @@
-scopeNoFirst
-| gen_stmt_list.rs:3:1:6:1 | test_stmt_list |
diff --git a/rust/ql/test/extractor-tests/generated/Struct/CONSISTENCY/CfgConsistency.expected b/rust/ql/test/extractor-tests/generated/Struct/CONSISTENCY/CfgConsistency.expected
deleted file mode 100644
index 6aedff0227a8..000000000000
--- a/rust/ql/test/extractor-tests/generated/Struct/CONSISTENCY/CfgConsistency.expected
+++ /dev/null
@@ -1,2 +0,0 @@
-scopeNoFirst
-| gen_struct.rs:3:1:6:1 | test_struct |
diff --git a/rust/ql/test/extractor-tests/generated/TokenTree/CONSISTENCY/CfgConsistency.expected b/rust/ql/test/extractor-tests/generated/TokenTree/CONSISTENCY/CfgConsistency.expected
deleted file mode 100644
index b1414f7d8ac5..000000000000
--- a/rust/ql/test/extractor-tests/generated/TokenTree/CONSISTENCY/CfgConsistency.expected
+++ /dev/null
@@ -1,2 +0,0 @@
-scopeNoFirst
-| gen_token_tree.rs:3:1:6:1 | test_token_tree |
diff --git a/rust/ql/test/extractor-tests/generated/Trait/CONSISTENCY/CfgConsistency.expected b/rust/ql/test/extractor-tests/generated/Trait/CONSISTENCY/CfgConsistency.expected
deleted file mode 100644
index 9988046e52da..000000000000
--- a/rust/ql/test/extractor-tests/generated/Trait/CONSISTENCY/CfgConsistency.expected
+++ /dev/null
@@ -1,2 +0,0 @@
-scopeNoFirst
-| gen_trait.rs:3:1:6:1 | test_trait |
diff --git a/rust/ql/test/extractor-tests/generated/TraitAlias/CONSISTENCY/CfgConsistency.expected b/rust/ql/test/extractor-tests/generated/TraitAlias/CONSISTENCY/CfgConsistency.expected
deleted file mode 100644
index 5216d265777e..000000000000
--- a/rust/ql/test/extractor-tests/generated/TraitAlias/CONSISTENCY/CfgConsistency.expected
+++ /dev/null
@@ -1,2 +0,0 @@
-scopeNoFirst
-| gen_trait_alias.rs:3:1:6:1 | test_trait_alias |
diff --git a/rust/ql/test/extractor-tests/generated/TryExpr/CONSISTENCY/CfgConsistency.expected b/rust/ql/test/extractor-tests/generated/TryExpr/CONSISTENCY/CfgConsistency.expected
deleted file mode 100644
index 9cd4cb86f31a..000000000000
--- a/rust/ql/test/extractor-tests/generated/TryExpr/CONSISTENCY/CfgConsistency.expected
+++ /dev/null
@@ -1,2 +0,0 @@
-scopeNoFirst
-| gen_try_expr.rs:3:1:6:1 | test_try_expr |
diff --git a/rust/ql/test/extractor-tests/generated/TupleField/CONSISTENCY/CfgConsistency.expected b/rust/ql/test/extractor-tests/generated/TupleField/CONSISTENCY/CfgConsistency.expected
deleted file mode 100644
index ba75cb574e11..000000000000
--- a/rust/ql/test/extractor-tests/generated/TupleField/CONSISTENCY/CfgConsistency.expected
+++ /dev/null
@@ -1,2 +0,0 @@
-scopeNoFirst
-| gen_tuple_field.rs:3:1:6:1 | test_tuple_field |
diff --git a/rust/ql/test/extractor-tests/generated/TupleFieldList/CONSISTENCY/CfgConsistency.expected b/rust/ql/test/extractor-tests/generated/TupleFieldList/CONSISTENCY/CfgConsistency.expected
deleted file mode 100644
index 94ad834a83f7..000000000000
--- a/rust/ql/test/extractor-tests/generated/TupleFieldList/CONSISTENCY/CfgConsistency.expected
+++ /dev/null
@@ -1,2 +0,0 @@
-scopeNoFirst
-| gen_tuple_field_list.rs:3:1:6:1 | test_tuple_field_list |
diff --git a/rust/ql/test/extractor-tests/generated/TupleType/CONSISTENCY/CfgConsistency.expected b/rust/ql/test/extractor-tests/generated/TupleType/CONSISTENCY/CfgConsistency.expected
deleted file mode 100644
index df23cd353b8e..000000000000
--- a/rust/ql/test/extractor-tests/generated/TupleType/CONSISTENCY/CfgConsistency.expected
+++ /dev/null
@@ -1,2 +0,0 @@
-scopeNoFirst
-| gen_tuple_type.rs:3:1:6:1 | test_tuple_type |
diff --git a/rust/ql/test/extractor-tests/generated/TypeAlias/CONSISTENCY/CfgConsistency.expected b/rust/ql/test/extractor-tests/generated/TypeAlias/CONSISTENCY/CfgConsistency.expected
deleted file mode 100644
index 5473c4f4d29f..000000000000
--- a/rust/ql/test/extractor-tests/generated/TypeAlias/CONSISTENCY/CfgConsistency.expected
+++ /dev/null
@@ -1,2 +0,0 @@
-scopeNoFirst
-| gen_type_alias.rs:3:1:6:1 | test_type_alias |
diff --git a/rust/ql/test/extractor-tests/generated/TypeArg/CONSISTENCY/CfgConsistency.expected b/rust/ql/test/extractor-tests/generated/TypeArg/CONSISTENCY/CfgConsistency.expected
deleted file mode 100644
index a4ef31c67be5..000000000000
--- a/rust/ql/test/extractor-tests/generated/TypeArg/CONSISTENCY/CfgConsistency.expected
+++ /dev/null
@@ -1,2 +0,0 @@
-scopeNoFirst
-| gen_type_arg.rs:3:1:6:1 | test_type_arg |
diff --git a/rust/ql/test/extractor-tests/generated/TypeBound/CONSISTENCY/CfgConsistency.expected b/rust/ql/test/extractor-tests/generated/TypeBound/CONSISTENCY/CfgConsistency.expected
deleted file mode 100644
index 65b362b2ce06..000000000000
--- a/rust/ql/test/extractor-tests/generated/TypeBound/CONSISTENCY/CfgConsistency.expected
+++ /dev/null
@@ -1,2 +0,0 @@
-scopeNoFirst
-| gen_type_bound.rs:3:1:6:1 | test_type_bound |
diff --git a/rust/ql/test/extractor-tests/generated/TypeBoundList/CONSISTENCY/CfgConsistency.expected b/rust/ql/test/extractor-tests/generated/TypeBoundList/CONSISTENCY/CfgConsistency.expected
deleted file mode 100644
index 11f983ef491e..000000000000
--- a/rust/ql/test/extractor-tests/generated/TypeBoundList/CONSISTENCY/CfgConsistency.expected
+++ /dev/null
@@ -1,2 +0,0 @@
-scopeNoFirst
-| gen_type_bound_list.rs:3:1:6:1 | test_type_bound_list |
diff --git a/rust/ql/test/extractor-tests/generated/TypeParam/CONSISTENCY/CfgConsistency.expected b/rust/ql/test/extractor-tests/generated/TypeParam/CONSISTENCY/CfgConsistency.expected
deleted file mode 100644
index d852e7f00743..000000000000
--- a/rust/ql/test/extractor-tests/generated/TypeParam/CONSISTENCY/CfgConsistency.expected
+++ /dev/null
@@ -1,2 +0,0 @@
-scopeNoFirst
-| gen_type_param.rs:3:1:6:1 | test_type_param |
diff --git a/rust/ql/test/extractor-tests/generated/Union/CONSISTENCY/CfgConsistency.expected b/rust/ql/test/extractor-tests/generated/Union/CONSISTENCY/CfgConsistency.expected
deleted file mode 100644
index 2e1da077f375..000000000000
--- a/rust/ql/test/extractor-tests/generated/Union/CONSISTENCY/CfgConsistency.expected
+++ /dev/null
@@ -1,2 +0,0 @@
-scopeNoFirst
-| gen_union.rs:3:1:6:1 | test_union |
diff --git a/rust/ql/test/extractor-tests/generated/Use/CONSISTENCY/CfgConsistency.expected b/rust/ql/test/extractor-tests/generated/Use/CONSISTENCY/CfgConsistency.expected
deleted file mode 100644
index eb0529d66f9a..000000000000
--- a/rust/ql/test/extractor-tests/generated/Use/CONSISTENCY/CfgConsistency.expected
+++ /dev/null
@@ -1,2 +0,0 @@
-scopeNoFirst
-| gen_use.rs:3:1:6:1 | test_use |
diff --git a/rust/ql/test/extractor-tests/generated/UseTree/CONSISTENCY/CfgConsistency.expected b/rust/ql/test/extractor-tests/generated/UseTree/CONSISTENCY/CfgConsistency.expected
deleted file mode 100644
index 0f5a9b35a2df..000000000000
--- a/rust/ql/test/extractor-tests/generated/UseTree/CONSISTENCY/CfgConsistency.expected
+++ /dev/null
@@ -1,2 +0,0 @@
-scopeNoFirst
-| gen_use_tree.rs:3:1:6:1 | test_use_tree |
diff --git a/rust/ql/test/extractor-tests/generated/UseTreeList/CONSISTENCY/CfgConsistency.expected b/rust/ql/test/extractor-tests/generated/UseTreeList/CONSISTENCY/CfgConsistency.expected
deleted file mode 100644
index d754f9e4cf63..000000000000
--- a/rust/ql/test/extractor-tests/generated/UseTreeList/CONSISTENCY/CfgConsistency.expected
+++ /dev/null
@@ -1,2 +0,0 @@
-scopeNoFirst
-| gen_use_tree_list.rs:3:1:6:1 | test_use_tree_list |
diff --git a/rust/ql/test/extractor-tests/generated/Variant/CONSISTENCY/CfgConsistency.expected b/rust/ql/test/extractor-tests/generated/Variant/CONSISTENCY/CfgConsistency.expected
deleted file mode 100644
index e60f96aeee22..000000000000
--- a/rust/ql/test/extractor-tests/generated/Variant/CONSISTENCY/CfgConsistency.expected
+++ /dev/null
@@ -1,2 +0,0 @@
-scopeNoFirst
-| gen_variant.rs:3:1:6:1 | test_variant |
diff --git a/rust/ql/test/extractor-tests/generated/VariantList/CONSISTENCY/CfgConsistency.expected b/rust/ql/test/extractor-tests/generated/VariantList/CONSISTENCY/CfgConsistency.expected
deleted file mode 100644
index 16e583712b31..000000000000
--- a/rust/ql/test/extractor-tests/generated/VariantList/CONSISTENCY/CfgConsistency.expected
+++ /dev/null
@@ -1,2 +0,0 @@
-scopeNoFirst
-| gen_variant_list.rs:3:1:6:1 | test_variant_list |
diff --git a/rust/ql/test/extractor-tests/generated/Visibility/CONSISTENCY/CfgConsistency.expected b/rust/ql/test/extractor-tests/generated/Visibility/CONSISTENCY/CfgConsistency.expected
deleted file mode 100644
index 331e57ed0a41..000000000000
--- a/rust/ql/test/extractor-tests/generated/Visibility/CONSISTENCY/CfgConsistency.expected
+++ /dev/null
@@ -1,2 +0,0 @@
-scopeNoFirst
-| gen_visibility.rs:3:1:6:1 | test_visibility |
diff --git a/rust/ql/test/extractor-tests/generated/WhereClause/CONSISTENCY/CfgConsistency.expected b/rust/ql/test/extractor-tests/generated/WhereClause/CONSISTENCY/CfgConsistency.expected
deleted file mode 100644
index 2606d6d4113f..000000000000
--- a/rust/ql/test/extractor-tests/generated/WhereClause/CONSISTENCY/CfgConsistency.expected
+++ /dev/null
@@ -1,2 +0,0 @@
-scopeNoFirst
-| gen_where_clause.rs:3:1:6:1 | test_where_clause |
diff --git a/rust/ql/test/extractor-tests/generated/WherePred/CONSISTENCY/CfgConsistency.expected b/rust/ql/test/extractor-tests/generated/WherePred/CONSISTENCY/CfgConsistency.expected
deleted file mode 100644
index e5601587a5fe..000000000000
--- a/rust/ql/test/extractor-tests/generated/WherePred/CONSISTENCY/CfgConsistency.expected
+++ /dev/null
@@ -1,2 +0,0 @@
-scopeNoFirst
-| gen_where_pred.rs:3:1:6:1 | test_where_pred |
diff --git a/rust/ql/test/extractor-tests/generated/WhileExpr/CONSISTENCY/CfgConsistency.expected b/rust/ql/test/extractor-tests/generated/WhileExpr/CONSISTENCY/CfgConsistency.expected
deleted file mode 100644
index b9d575da0447..000000000000
--- a/rust/ql/test/extractor-tests/generated/WhileExpr/CONSISTENCY/CfgConsistency.expected
+++ /dev/null
@@ -1,2 +0,0 @@
-scopeNoFirst
-| gen_while_expr.rs:3:1:6:1 | test_while_expr |
diff --git a/rust/ql/test/library-tests/variables/CONSISTENCY/CfgConsistency.expected b/rust/ql/test/library-tests/variables/CONSISTENCY/CfgConsistency.expected
deleted file mode 100644
index f7c02f86bb8d..000000000000
--- a/rust/ql/test/library-tests/variables/CONSISTENCY/CfgConsistency.expected
+++ /dev/null
@@ -1,4 +0,0 @@
-deadEnd
-| variables.rs:2:5:2:22 | ExprStmt |
-| variables.rs:6:5:6:22 | ExprStmt |
-| variables.rs:310:5:310:42 | LetStmt |
diff --git a/rust/ql/test/query-tests/diagnostics/CONSISTENCY/CfgConsistency.expected b/rust/ql/test/query-tests/diagnostics/CONSISTENCY/CfgConsistency.expected
deleted file mode 100644
index 8aa73f9d3c1f..000000000000
--- a/rust/ql/test/query-tests/diagnostics/CONSISTENCY/CfgConsistency.expected
+++ /dev/null
@@ -1,4 +0,0 @@
-deadEnd
-| error.rs:2:5:2:32 | ExprStmt |
-| my_macro.rs:16:9:16:19 | ExprStmt |
-| my_struct.rs:17:9:17:34 | ExprStmt |
diff --git a/rust/ql/test/query-tests/unusedentities/CONSISTENCY/CfgConsistency.expected b/rust/ql/test/query-tests/unusedentities/CONSISTENCY/CfgConsistency.expected
deleted file mode 100644
index f88f86c81777..000000000000
--- a/rust/ql/test/query-tests/unusedentities/CONSISTENCY/CfgConsistency.expected
+++ /dev/null
@@ -1,8 +0,0 @@
-deadEnd
-| main.rs:14:2:14:23 | ExprStmt |
-| main.rs:38:2:38:23 | ExprStmt |
-| main.rs:93:2:93:44 | ExprStmt |
-| main.rs:107:2:107:20 | LetStmt |
-| main.rs:151:2:151:53 | ExprStmt |
-scopeNoFirst
-| main.rs:125:1:133:1 | statics |

From 26c69b8f8a2dc619360ba63e2173c1d14402db5e Mon Sep 17 00:00:00 2001
From: Tom Hvitved <hvitved@github.com>
Date: Tue, 1 Oct 2024 14:54:44 +0200
Subject: [PATCH 102/347] Rust: Add more CFG tests

---
 .../library-tests/controlflow/Cfg.expected    | 762 +++++++++---------
 .../ql/test/library-tests/controlflow/test.rs |  21 +-
 2 files changed, 413 insertions(+), 370 deletions(-)

diff --git a/rust/ql/test/library-tests/controlflow/Cfg.expected b/rust/ql/test/library-tests/controlflow/Cfg.expected
index 30ffb3673c14..d5097158874d 100644
--- a/rust/ql/test/library-tests/controlflow/Cfg.expected
+++ b/rust/ql/test/library-tests/controlflow/Cfg.expected
@@ -122,373 +122,397 @@
 | test.rs:61:13:61:21 | ... = ... | test.rs:56:17:62:9 | BlockExpr |  |
 | test.rs:61:13:61:22 | ExprStmt | test.rs:61:13:61:13 | PathExpr |  |
 | test.rs:61:17:61:21 | false | test.rs:61:13:61:21 | ... = ... |  |
-| test.rs:65:5:72:5 | enter test_for | test.rs:66:18:66:18 | 0 |  |
-| test.rs:65:5:72:5 | exit test_for (normal) | test.rs:65:5:72:5 | exit test_for |  |
-| test.rs:65:25:72:5 | BlockExpr | test.rs:65:5:72:5 | exit test_for (normal) |  |
-| test.rs:66:9:71:9 | ForExpr | test.rs:65:25:72:5 | BlockExpr |  |
-| test.rs:66:13:66:13 | i | test.rs:66:9:71:9 | ForExpr | no-match |
-| test.rs:66:13:66:13 | i | test.rs:67:13:69:13 | ExprStmt | match |
-| test.rs:66:18:66:18 | 0 | test.rs:66:21:66:22 | 10 |  |
-| test.rs:66:18:66:22 | RangeExpr | test.rs:66:13:66:13 | i |  |
-| test.rs:66:21:66:22 | 10 | test.rs:66:18:66:22 | RangeExpr |  |
-| test.rs:66:24:71:9 | BlockExpr | test.rs:66:13:66:13 | i |  |
-| test.rs:67:13:69:13 | ExprStmt | test.rs:67:17:67:17 | i |  |
-| test.rs:67:13:69:13 | IfExpr | test.rs:70:13:70:14 | ExprStmt |  |
-| test.rs:67:16:67:23 | ParenExpr | test.rs:67:13:69:13 | IfExpr | false |
-| test.rs:67:16:67:23 | ParenExpr | test.rs:68:17:68:22 | ExprStmt | true |
-| test.rs:67:17:67:17 | i | test.rs:67:22:67:22 | j |  |
-| test.rs:67:17:67:22 | ... == ... | test.rs:67:16:67:23 | ParenExpr |  |
-| test.rs:67:22:67:22 | j | test.rs:67:17:67:22 | ... == ... |  |
-| test.rs:68:17:68:21 | BreakExpr | test.rs:66:9:71:9 | ForExpr | break |
-| test.rs:68:17:68:22 | ExprStmt | test.rs:68:17:68:21 | BreakExpr |  |
-| test.rs:70:13:70:13 | 1 | test.rs:66:24:71:9 | BlockExpr |  |
-| test.rs:70:13:70:14 | ExprStmt | test.rs:70:13:70:13 | 1 |  |
-| test.rs:75:1:78:1 | enter test_nested_function | test.rs:76:5:76:28 | LetStmt |  |
-| test.rs:75:1:78:1 | exit test_nested_function (normal) | test.rs:75:1:78:1 | exit test_nested_function |  |
-| test.rs:75:40:78:1 | BlockExpr | test.rs:75:1:78:1 | exit test_nested_function (normal) |  |
-| test.rs:76:5:76:28 | LetStmt | test.rs:76:19:76:27 | ClosureExpr |  |
-| test.rs:76:9:76:15 | add_one | test.rs:77:5:77:11 | add_one | match, no-match |
-| test.rs:76:19:76:27 | ClosureExpr | test.rs:76:9:76:15 | add_one |  |
-| test.rs:76:19:76:27 | enter ClosureExpr | test.rs:76:23:76:23 | i |  |
-| test.rs:76:19:76:27 | exit ClosureExpr (normal) | test.rs:76:19:76:27 | exit ClosureExpr |  |
-| test.rs:76:23:76:23 | i | test.rs:76:27:76:27 | 1 |  |
-| test.rs:76:23:76:27 | ... + ... | test.rs:76:19:76:27 | exit ClosureExpr (normal) |  |
-| test.rs:76:27:76:27 | 1 | test.rs:76:23:76:27 | ... + ... |  |
-| test.rs:77:5:77:11 | add_one | test.rs:77:13:77:19 | add_one |  |
-| test.rs:77:5:77:23 | CallExpr | test.rs:75:40:78:1 | BlockExpr |  |
-| test.rs:77:13:77:19 | add_one | test.rs:77:21:77:21 | n |  |
-| test.rs:77:13:77:22 | CallExpr | test.rs:77:5:77:23 | CallExpr |  |
-| test.rs:77:21:77:21 | n | test.rs:77:13:77:22 | CallExpr |  |
-| test.rs:82:5:88:5 | enter test_if_else | test.rs:83:12:83:12 | n |  |
-| test.rs:82:5:88:5 | exit test_if_else (normal) | test.rs:82:5:88:5 | exit test_if_else |  |
-| test.rs:82:36:88:5 | BlockExpr | test.rs:82:5:88:5 | exit test_if_else (normal) |  |
-| test.rs:83:9:87:9 | IfExpr | test.rs:82:36:88:5 | BlockExpr |  |
-| test.rs:83:12:83:12 | n | test.rs:83:17:83:17 | 0 |  |
-| test.rs:83:12:83:17 | ... <= ... | test.rs:84:13:84:13 | 0 | true |
-| test.rs:83:12:83:17 | ... <= ... | test.rs:86:13:86:13 | n | false |
-| test.rs:83:17:83:17 | 0 | test.rs:83:12:83:17 | ... <= ... |  |
-| test.rs:83:19:85:9 | BlockExpr | test.rs:83:9:87:9 | IfExpr |  |
-| test.rs:84:13:84:13 | 0 | test.rs:83:19:85:9 | BlockExpr |  |
-| test.rs:85:16:87:9 | BlockExpr | test.rs:83:9:87:9 | IfExpr |  |
-| test.rs:86:13:86:13 | n | test.rs:86:17:86:17 | 1 |  |
-| test.rs:86:13:86:17 | ... - ... | test.rs:85:16:87:9 | BlockExpr |  |
-| test.rs:86:17:86:17 | 1 | test.rs:86:13:86:17 | ... - ... |  |
-| test.rs:90:5:96:5 | enter test_if_let_else | test.rs:91:12:91:26 | LetExpr |  |
-| test.rs:90:5:96:5 | exit test_if_let_else (normal) | test.rs:90:5:96:5 | exit test_if_let_else |  |
-| test.rs:90:48:96:5 | BlockExpr | test.rs:90:5:96:5 | exit test_if_let_else (normal) |  |
-| test.rs:91:9:95:9 | IfExpr | test.rs:90:48:96:5 | BlockExpr |  |
-| test.rs:91:12:91:26 | LetExpr | test.rs:91:16:91:22 | TupleStructPat |  |
-| test.rs:91:16:91:22 | TupleStructPat | test.rs:92:13:92:13 | n | match |
-| test.rs:91:16:91:22 | TupleStructPat | test.rs:94:13:94:13 | 0 | no-match |
-| test.rs:91:28:93:9 | BlockExpr | test.rs:91:9:95:9 | IfExpr |  |
-| test.rs:92:13:92:13 | n | test.rs:91:28:93:9 | BlockExpr |  |
-| test.rs:93:16:95:9 | BlockExpr | test.rs:91:9:95:9 | IfExpr |  |
-| test.rs:94:13:94:13 | 0 | test.rs:93:16:95:9 | BlockExpr |  |
-| test.rs:98:5:103:5 | enter test_if_let | test.rs:99:9:101:9 | ExprStmt |  |
-| test.rs:98:5:103:5 | exit test_if_let (normal) | test.rs:98:5:103:5 | exit test_if_let |  |
-| test.rs:98:43:103:5 | BlockExpr | test.rs:98:5:103:5 | exit test_if_let (normal) |  |
-| test.rs:99:9:101:9 | ExprStmt | test.rs:99:12:99:26 | LetExpr |  |
-| test.rs:99:9:101:9 | IfExpr | test.rs:102:9:102:9 | 0 |  |
-| test.rs:99:12:99:26 | LetExpr | test.rs:99:16:99:22 | TupleStructPat |  |
-| test.rs:99:16:99:22 | TupleStructPat | test.rs:99:9:101:9 | IfExpr | no-match |
-| test.rs:99:16:99:22 | TupleStructPat | test.rs:100:13:100:13 | n | match |
-| test.rs:99:28:101:9 | BlockExpr | test.rs:99:9:101:9 | IfExpr |  |
-| test.rs:100:13:100:13 | n | test.rs:99:28:101:9 | BlockExpr |  |
-| test.rs:102:9:102:9 | 0 | test.rs:98:43:103:5 | BlockExpr |  |
-| test.rs:105:5:111:5 | enter test_nested_if | test.rs:106:16:106:16 | PathExpr |  |
-| test.rs:105:5:111:5 | exit test_nested_if (normal) | test.rs:105:5:111:5 | exit test_nested_if |  |
-| test.rs:105:38:111:5 | BlockExpr | test.rs:105:5:111:5 | exit test_nested_if (normal) |  |
-| test.rs:106:9:110:9 | IfExpr | test.rs:105:38:111:5 | BlockExpr |  |
-| test.rs:106:12:106:49 | ParenExpr | test.rs:107:13:107:13 | 1 | true |
-| test.rs:106:12:106:49 | ParenExpr | test.rs:109:13:109:13 | 0 | false |
-| test.rs:106:13:106:48 | IfExpr | test.rs:106:12:106:49 | ParenExpr |  |
-| test.rs:106:16:106:16 | PathExpr | test.rs:106:20:106:20 | 0 |  |
-| test.rs:106:16:106:20 | ... < ... | test.rs:106:24:106:24 | a | true |
-| test.rs:106:16:106:20 | ... < ... | test.rs:106:41:106:41 | a | false |
-| test.rs:106:20:106:20 | 0 | test.rs:106:16:106:20 | ... < ... |  |
-| test.rs:106:22:106:32 | BlockExpr | test.rs:106:13:106:48 | IfExpr |  |
-| test.rs:106:24:106:24 | a | test.rs:106:29:106:30 | 10 |  |
-| test.rs:106:24:106:30 | ... < ... | test.rs:106:22:106:32 | BlockExpr |  |
-| test.rs:106:28:106:30 | - ... | test.rs:106:24:106:30 | ... < ... |  |
-| test.rs:106:29:106:30 | 10 | test.rs:106:28:106:30 | - ... |  |
-| test.rs:106:39:106:48 | BlockExpr | test.rs:106:13:106:48 | IfExpr |  |
-| test.rs:106:41:106:41 | a | test.rs:106:45:106:46 | 10 |  |
-| test.rs:106:41:106:46 | ... > ... | test.rs:106:39:106:48 | BlockExpr |  |
-| test.rs:106:45:106:46 | 10 | test.rs:106:41:106:46 | ... > ... |  |
-| test.rs:106:51:108:9 | BlockExpr | test.rs:106:9:110:9 | IfExpr |  |
-| test.rs:107:13:107:13 | 1 | test.rs:106:51:108:9 | BlockExpr |  |
-| test.rs:108:16:110:9 | BlockExpr | test.rs:106:9:110:9 | IfExpr |  |
-| test.rs:109:13:109:13 | 0 | test.rs:108:16:110:9 | BlockExpr |  |
-| test.rs:113:5:122:5 | enter test_nested_if_match | test.rs:114:19:114:19 | a |  |
-| test.rs:113:5:122:5 | exit test_nested_if_match (normal) | test.rs:113:5:122:5 | exit test_nested_if_match |  |
-| test.rs:113:44:122:5 | BlockExpr | test.rs:113:5:122:5 | exit test_nested_if_match (normal) |  |
-| test.rs:114:9:121:9 | IfExpr | test.rs:113:44:122:5 | BlockExpr |  |
-| test.rs:114:12:117:10 | ParenExpr | test.rs:118:13:118:13 | 1 | true |
-| test.rs:114:12:117:10 | ParenExpr | test.rs:120:13:120:13 | 0 | false |
-| test.rs:114:13:117:9 | MatchExpr | test.rs:114:12:117:10 | ParenExpr |  |
-| test.rs:114:19:114:19 | a | test.rs:115:13:115:13 | LiteralPat |  |
-| test.rs:115:13:115:13 | LiteralPat | test.rs:115:18:115:21 | true | match |
-| test.rs:115:13:115:13 | LiteralPat | test.rs:116:13:116:13 | WildcardPat | no-match |
-| test.rs:115:18:115:21 | true | test.rs:114:13:117:9 | MatchExpr |  |
-| test.rs:116:13:116:13 | WildcardPat | test.rs:116:18:116:22 | false | match |
-| test.rs:116:18:116:22 | false | test.rs:114:13:117:9 | MatchExpr |  |
-| test.rs:117:12:119:9 | BlockExpr | test.rs:114:9:121:9 | IfExpr |  |
-| test.rs:118:13:118:13 | 1 | test.rs:117:12:119:9 | BlockExpr |  |
-| test.rs:119:16:121:9 | BlockExpr | test.rs:114:9:121:9 | IfExpr |  |
-| test.rs:120:13:120:13 | 0 | test.rs:119:16:121:9 | BlockExpr |  |
-| test.rs:124:5:133:5 | enter test_nested_if_block | test.rs:126:13:126:15 | ExprStmt |  |
-| test.rs:124:5:133:5 | exit test_nested_if_block (normal) | test.rs:124:5:133:5 | exit test_nested_if_block |  |
-| test.rs:124:44:133:5 | BlockExpr | test.rs:124:5:133:5 | exit test_nested_if_block (normal) |  |
-| test.rs:125:9:132:9 | IfExpr | test.rs:124:44:133:5 | BlockExpr |  |
-| test.rs:125:12:128:9 | BlockExpr | test.rs:129:13:129:13 | 1 | true |
-| test.rs:125:12:128:9 | BlockExpr | test.rs:131:13:131:13 | 0 | false |
-| test.rs:126:13:126:14 | TupleExpr | test.rs:127:13:127:13 | a |  |
-| test.rs:126:13:126:15 | ExprStmt | test.rs:126:13:126:14 | TupleExpr |  |
-| test.rs:127:13:127:13 | a | test.rs:127:17:127:17 | 0 |  |
-| test.rs:127:13:127:17 | ... > ... | test.rs:125:12:128:9 | BlockExpr | false, true |
-| test.rs:127:17:127:17 | 0 | test.rs:127:13:127:17 | ... > ... |  |
-| test.rs:128:11:130:9 | BlockExpr | test.rs:125:9:132:9 | IfExpr |  |
-| test.rs:129:13:129:13 | 1 | test.rs:128:11:130:9 | BlockExpr |  |
-| test.rs:130:16:132:9 | BlockExpr | test.rs:125:9:132:9 | IfExpr |  |
-| test.rs:131:13:131:13 | 0 | test.rs:130:16:132:9 | BlockExpr |  |
-| test.rs:135:5:142:5 | enter test_if_assignment | test.rs:136:9:136:26 | LetStmt |  |
-| test.rs:135:5:142:5 | exit test_if_assignment (normal) | test.rs:135:5:142:5 | exit test_if_assignment |  |
-| test.rs:135:42:142:5 | BlockExpr | test.rs:135:5:142:5 | exit test_if_assignment (normal) |  |
-| test.rs:136:9:136:26 | LetStmt | test.rs:136:21:136:25 | false |  |
-| test.rs:136:13:136:17 | x | test.rs:137:12:137:12 | x | match, no-match |
-| test.rs:136:21:136:25 | false | test.rs:136:13:136:17 | x |  |
-| test.rs:137:9:141:9 | IfExpr | test.rs:135:42:142:5 | BlockExpr |  |
-| test.rs:137:12:137:12 | x | test.rs:137:16:137:19 | true |  |
-| test.rs:137:12:137:19 | ... = ... | test.rs:138:13:138:13 | 1 | true |
-| test.rs:137:12:137:19 | ... = ... | test.rs:140:13:140:13 | 0 | false |
-| test.rs:137:16:137:19 | true | test.rs:137:12:137:19 | ... = ... |  |
-| test.rs:137:21:139:9 | BlockExpr | test.rs:137:9:141:9 | IfExpr |  |
-| test.rs:138:13:138:13 | 1 | test.rs:137:21:139:9 | BlockExpr |  |
-| test.rs:139:16:141:9 | BlockExpr | test.rs:137:9:141:9 | IfExpr |  |
+| test.rs:65:5:72:5 | enter test_while_let | test.rs:66:9:66:29 | LetStmt |  |
+| test.rs:66:9:66:29 | LetStmt | test.rs:66:24:66:24 | 1 |  |
+| test.rs:66:13:66:20 | iter | test.rs:67:15:67:39 | LetExpr | match, no-match |
+| test.rs:66:24:66:24 | 1 | test.rs:66:27:66:28 | 10 |  |
+| test.rs:66:24:66:28 | RangeExpr | test.rs:66:13:66:20 | iter |  |
+| test.rs:66:27:66:28 | 10 | test.rs:66:24:66:28 | RangeExpr |  |
+| test.rs:67:15:67:39 | LetExpr | test.rs:67:19:67:25 | TupleStructPat |  |
+| test.rs:74:5:81:5 | enter test_for | test.rs:75:18:75:18 | 0 |  |
+| test.rs:74:5:81:5 | exit test_for (normal) | test.rs:74:5:81:5 | exit test_for |  |
+| test.rs:74:25:81:5 | BlockExpr | test.rs:74:5:81:5 | exit test_for (normal) |  |
+| test.rs:75:9:80:9 | ForExpr | test.rs:74:25:81:5 | BlockExpr |  |
+| test.rs:75:13:75:13 | i | test.rs:75:9:80:9 | ForExpr | no-match |
+| test.rs:75:13:75:13 | i | test.rs:76:13:78:13 | ExprStmt | match |
+| test.rs:75:18:75:18 | 0 | test.rs:75:21:75:22 | 10 |  |
+| test.rs:75:18:75:22 | RangeExpr | test.rs:75:13:75:13 | i |  |
+| test.rs:75:21:75:22 | 10 | test.rs:75:18:75:22 | RangeExpr |  |
+| test.rs:75:24:80:9 | BlockExpr | test.rs:75:13:75:13 | i |  |
+| test.rs:76:13:78:13 | ExprStmt | test.rs:76:17:76:17 | i |  |
+| test.rs:76:13:78:13 | IfExpr | test.rs:79:13:79:14 | ExprStmt |  |
+| test.rs:76:16:76:23 | ParenExpr | test.rs:76:13:78:13 | IfExpr | false |
+| test.rs:76:16:76:23 | ParenExpr | test.rs:77:17:77:22 | ExprStmt | true |
+| test.rs:76:17:76:17 | i | test.rs:76:22:76:22 | j |  |
+| test.rs:76:17:76:22 | ... == ... | test.rs:76:16:76:23 | ParenExpr |  |
+| test.rs:76:22:76:22 | j | test.rs:76:17:76:22 | ... == ... |  |
+| test.rs:77:17:77:21 | BreakExpr | test.rs:75:9:80:9 | ForExpr | break |
+| test.rs:77:17:77:22 | ExprStmt | test.rs:77:17:77:21 | BreakExpr |  |
+| test.rs:79:13:79:13 | 1 | test.rs:75:24:80:9 | BlockExpr |  |
+| test.rs:79:13:79:14 | ExprStmt | test.rs:79:13:79:13 | 1 |  |
+| test.rs:84:1:87:1 | enter test_nested_function | test.rs:85:5:85:28 | LetStmt |  |
+| test.rs:84:1:87:1 | exit test_nested_function (normal) | test.rs:84:1:87:1 | exit test_nested_function |  |
+| test.rs:84:40:87:1 | BlockExpr | test.rs:84:1:87:1 | exit test_nested_function (normal) |  |
+| test.rs:85:5:85:28 | LetStmt | test.rs:85:19:85:27 | ClosureExpr |  |
+| test.rs:85:9:85:15 | add_one | test.rs:86:5:86:11 | add_one | match, no-match |
+| test.rs:85:19:85:27 | ClosureExpr | test.rs:85:9:85:15 | add_one |  |
+| test.rs:85:19:85:27 | enter ClosureExpr | test.rs:85:23:85:23 | i |  |
+| test.rs:85:19:85:27 | exit ClosureExpr (normal) | test.rs:85:19:85:27 | exit ClosureExpr |  |
+| test.rs:85:23:85:23 | i | test.rs:85:27:85:27 | 1 |  |
+| test.rs:85:23:85:27 | ... + ... | test.rs:85:19:85:27 | exit ClosureExpr (normal) |  |
+| test.rs:85:27:85:27 | 1 | test.rs:85:23:85:27 | ... + ... |  |
+| test.rs:86:5:86:11 | add_one | test.rs:86:13:86:19 | add_one |  |
+| test.rs:86:5:86:23 | CallExpr | test.rs:84:40:87:1 | BlockExpr |  |
+| test.rs:86:13:86:19 | add_one | test.rs:86:21:86:21 | n |  |
+| test.rs:86:13:86:22 | CallExpr | test.rs:86:5:86:23 | CallExpr |  |
+| test.rs:86:21:86:21 | n | test.rs:86:13:86:22 | CallExpr |  |
+| test.rs:91:5:97:5 | enter test_if_else | test.rs:92:12:92:12 | n |  |
+| test.rs:91:5:97:5 | exit test_if_else (normal) | test.rs:91:5:97:5 | exit test_if_else |  |
+| test.rs:91:36:97:5 | BlockExpr | test.rs:91:5:97:5 | exit test_if_else (normal) |  |
+| test.rs:92:9:96:9 | IfExpr | test.rs:91:36:97:5 | BlockExpr |  |
+| test.rs:92:12:92:12 | n | test.rs:92:17:92:17 | 0 |  |
+| test.rs:92:12:92:17 | ... <= ... | test.rs:93:13:93:13 | 0 | true |
+| test.rs:92:12:92:17 | ... <= ... | test.rs:95:13:95:13 | n | false |
+| test.rs:92:17:92:17 | 0 | test.rs:92:12:92:17 | ... <= ... |  |
+| test.rs:92:19:94:9 | BlockExpr | test.rs:92:9:96:9 | IfExpr |  |
+| test.rs:93:13:93:13 | 0 | test.rs:92:19:94:9 | BlockExpr |  |
+| test.rs:94:16:96:9 | BlockExpr | test.rs:92:9:96:9 | IfExpr |  |
+| test.rs:95:13:95:13 | n | test.rs:95:17:95:17 | 1 |  |
+| test.rs:95:13:95:17 | ... - ... | test.rs:94:16:96:9 | BlockExpr |  |
+| test.rs:95:17:95:17 | 1 | test.rs:95:13:95:17 | ... - ... |  |
+| test.rs:99:5:105:5 | enter test_if_let_else | test.rs:100:12:100:26 | LetExpr |  |
+| test.rs:99:5:105:5 | exit test_if_let_else (normal) | test.rs:99:5:105:5 | exit test_if_let_else |  |
+| test.rs:99:48:105:5 | BlockExpr | test.rs:99:5:105:5 | exit test_if_let_else (normal) |  |
+| test.rs:100:9:104:9 | IfExpr | test.rs:99:48:105:5 | BlockExpr |  |
+| test.rs:100:12:100:26 | LetExpr | test.rs:100:16:100:22 | TupleStructPat |  |
+| test.rs:100:16:100:22 | TupleStructPat | test.rs:101:13:101:13 | n | match |
+| test.rs:100:16:100:22 | TupleStructPat | test.rs:103:13:103:13 | 0 | no-match |
+| test.rs:100:28:102:9 | BlockExpr | test.rs:100:9:104:9 | IfExpr |  |
+| test.rs:101:13:101:13 | n | test.rs:100:28:102:9 | BlockExpr |  |
+| test.rs:102:16:104:9 | BlockExpr | test.rs:100:9:104:9 | IfExpr |  |
+| test.rs:103:13:103:13 | 0 | test.rs:102:16:104:9 | BlockExpr |  |
+| test.rs:107:5:112:5 | enter test_if_let | test.rs:108:9:110:9 | ExprStmt |  |
+| test.rs:107:5:112:5 | exit test_if_let (normal) | test.rs:107:5:112:5 | exit test_if_let |  |
+| test.rs:107:43:112:5 | BlockExpr | test.rs:107:5:112:5 | exit test_if_let (normal) |  |
+| test.rs:108:9:110:9 | ExprStmt | test.rs:108:12:108:26 | LetExpr |  |
+| test.rs:108:9:110:9 | IfExpr | test.rs:111:9:111:9 | 0 |  |
+| test.rs:108:12:108:26 | LetExpr | test.rs:108:16:108:22 | TupleStructPat |  |
+| test.rs:108:16:108:22 | TupleStructPat | test.rs:108:9:110:9 | IfExpr | no-match |
+| test.rs:108:16:108:22 | TupleStructPat | test.rs:109:13:109:13 | n | match |
+| test.rs:108:28:110:9 | BlockExpr | test.rs:108:9:110:9 | IfExpr |  |
+| test.rs:109:13:109:13 | n | test.rs:108:28:110:9 | BlockExpr |  |
+| test.rs:111:9:111:9 | 0 | test.rs:107:43:112:5 | BlockExpr |  |
+| test.rs:114:5:120:5 | enter test_nested_if | test.rs:115:16:115:16 | PathExpr |  |
+| test.rs:114:5:120:5 | exit test_nested_if (normal) | test.rs:114:5:120:5 | exit test_nested_if |  |
+| test.rs:114:38:120:5 | BlockExpr | test.rs:114:5:120:5 | exit test_nested_if (normal) |  |
+| test.rs:115:9:119:9 | IfExpr | test.rs:114:38:120:5 | BlockExpr |  |
+| test.rs:115:12:115:49 | ParenExpr | test.rs:116:13:116:13 | 1 | true |
+| test.rs:115:12:115:49 | ParenExpr | test.rs:118:13:118:13 | 0 | false |
+| test.rs:115:13:115:48 | IfExpr | test.rs:115:12:115:49 | ParenExpr |  |
+| test.rs:115:16:115:16 | PathExpr | test.rs:115:20:115:20 | 0 |  |
+| test.rs:115:16:115:20 | ... < ... | test.rs:115:24:115:24 | a | true |
+| test.rs:115:16:115:20 | ... < ... | test.rs:115:41:115:41 | a | false |
+| test.rs:115:20:115:20 | 0 | test.rs:115:16:115:20 | ... < ... |  |
+| test.rs:115:22:115:32 | BlockExpr | test.rs:115:13:115:48 | IfExpr |  |
+| test.rs:115:24:115:24 | a | test.rs:115:29:115:30 | 10 |  |
+| test.rs:115:24:115:30 | ... < ... | test.rs:115:22:115:32 | BlockExpr |  |
+| test.rs:115:28:115:30 | - ... | test.rs:115:24:115:30 | ... < ... |  |
+| test.rs:115:29:115:30 | 10 | test.rs:115:28:115:30 | - ... |  |
+| test.rs:115:39:115:48 | BlockExpr | test.rs:115:13:115:48 | IfExpr |  |
+| test.rs:115:41:115:41 | a | test.rs:115:45:115:46 | 10 |  |
+| test.rs:115:41:115:46 | ... > ... | test.rs:115:39:115:48 | BlockExpr |  |
+| test.rs:115:45:115:46 | 10 | test.rs:115:41:115:46 | ... > ... |  |
+| test.rs:115:51:117:9 | BlockExpr | test.rs:115:9:119:9 | IfExpr |  |
+| test.rs:116:13:116:13 | 1 | test.rs:115:51:117:9 | BlockExpr |  |
+| test.rs:117:16:119:9 | BlockExpr | test.rs:115:9:119:9 | IfExpr |  |
+| test.rs:118:13:118:13 | 0 | test.rs:117:16:119:9 | BlockExpr |  |
+| test.rs:122:5:131:5 | enter test_nested_if_match | test.rs:123:19:123:19 | a |  |
+| test.rs:122:5:131:5 | exit test_nested_if_match (normal) | test.rs:122:5:131:5 | exit test_nested_if_match |  |
+| test.rs:122:44:131:5 | BlockExpr | test.rs:122:5:131:5 | exit test_nested_if_match (normal) |  |
+| test.rs:123:9:130:9 | IfExpr | test.rs:122:44:131:5 | BlockExpr |  |
+| test.rs:123:12:126:10 | ParenExpr | test.rs:127:13:127:13 | 1 | true |
+| test.rs:123:12:126:10 | ParenExpr | test.rs:129:13:129:13 | 0 | false |
+| test.rs:123:13:126:9 | MatchExpr | test.rs:123:12:126:10 | ParenExpr |  |
+| test.rs:123:19:123:19 | a | test.rs:124:13:124:13 | LiteralPat |  |
+| test.rs:124:13:124:13 | LiteralPat | test.rs:124:18:124:21 | true | match |
+| test.rs:124:13:124:13 | LiteralPat | test.rs:125:13:125:13 | WildcardPat | no-match |
+| test.rs:124:18:124:21 | true | test.rs:123:13:126:9 | MatchExpr |  |
+| test.rs:125:13:125:13 | WildcardPat | test.rs:125:18:125:22 | false | match |
+| test.rs:125:18:125:22 | false | test.rs:123:13:126:9 | MatchExpr |  |
+| test.rs:126:12:128:9 | BlockExpr | test.rs:123:9:130:9 | IfExpr |  |
+| test.rs:127:13:127:13 | 1 | test.rs:126:12:128:9 | BlockExpr |  |
+| test.rs:128:16:130:9 | BlockExpr | test.rs:123:9:130:9 | IfExpr |  |
+| test.rs:129:13:129:13 | 0 | test.rs:128:16:130:9 | BlockExpr |  |
+| test.rs:133:5:142:5 | enter test_nested_if_block | test.rs:135:13:135:15 | ExprStmt |  |
+| test.rs:133:5:142:5 | exit test_nested_if_block (normal) | test.rs:133:5:142:5 | exit test_nested_if_block |  |
+| test.rs:133:44:142:5 | BlockExpr | test.rs:133:5:142:5 | exit test_nested_if_block (normal) |  |
+| test.rs:134:9:141:9 | IfExpr | test.rs:133:44:142:5 | BlockExpr |  |
+| test.rs:134:12:137:9 | BlockExpr | test.rs:138:13:138:13 | 1 | true |
+| test.rs:134:12:137:9 | BlockExpr | test.rs:140:13:140:13 | 0 | false |
+| test.rs:135:13:135:14 | TupleExpr | test.rs:136:13:136:13 | a |  |
+| test.rs:135:13:135:15 | ExprStmt | test.rs:135:13:135:14 | TupleExpr |  |
+| test.rs:136:13:136:13 | a | test.rs:136:17:136:17 | 0 |  |
+| test.rs:136:13:136:17 | ... > ... | test.rs:134:12:137:9 | BlockExpr | false, true |
+| test.rs:136:17:136:17 | 0 | test.rs:136:13:136:17 | ... > ... |  |
+| test.rs:137:11:139:9 | BlockExpr | test.rs:134:9:141:9 | IfExpr |  |
+| test.rs:138:13:138:13 | 1 | test.rs:137:11:139:9 | BlockExpr |  |
+| test.rs:139:16:141:9 | BlockExpr | test.rs:134:9:141:9 | IfExpr |  |
 | test.rs:140:13:140:13 | 0 | test.rs:139:16:141:9 | BlockExpr |  |
-| test.rs:144:5:155:5 | enter test_if_loop1 | test.rs:146:13:148:14 | ExprStmt |  |
-| test.rs:144:5:155:5 | exit test_if_loop1 (normal) | test.rs:144:5:155:5 | exit test_if_loop1 |  |
-| test.rs:144:37:155:5 | BlockExpr | test.rs:144:5:155:5 | exit test_if_loop1 (normal) |  |
-| test.rs:145:9:154:9 | IfExpr | test.rs:144:37:155:5 | BlockExpr |  |
-| test.rs:145:12:150:10 | ParenExpr | test.rs:151:13:151:13 | 1 | true |
-| test.rs:145:12:150:10 | ParenExpr | test.rs:153:13:153:13 | 0 | false |
-| test.rs:145:13:150:9 | LoopExpr | test.rs:145:12:150:10 | ParenExpr |  |
-| test.rs:145:18:150:9 | BlockExpr | test.rs:146:13:148:14 | ExprStmt |  |
-| test.rs:146:13:148:13 | IfExpr | test.rs:149:13:149:19 | ExprStmt |  |
-| test.rs:146:13:148:14 | ExprStmt | test.rs:146:16:146:16 | a |  |
-| test.rs:146:16:146:16 | a | test.rs:146:20:146:20 | 0 |  |
-| test.rs:146:16:146:20 | ... > ... | test.rs:146:13:148:13 | IfExpr | false |
-| test.rs:146:16:146:20 | ... > ... | test.rs:147:17:147:29 | ExprStmt | true |
-| test.rs:146:20:146:20 | 0 | test.rs:146:16:146:20 | ... > ... |  |
-| test.rs:147:17:147:28 | BreakExpr | test.rs:145:13:150:9 | LoopExpr | break |
-| test.rs:147:17:147:29 | ExprStmt | test.rs:147:23:147:23 | a |  |
-| test.rs:147:23:147:23 | a | test.rs:147:27:147:28 | 10 |  |
-| test.rs:147:23:147:28 | ... > ... | test.rs:147:17:147:28 | BreakExpr |  |
-| test.rs:147:27:147:28 | 10 | test.rs:147:23:147:28 | ... > ... |  |
-| test.rs:149:13:149:13 | a | test.rs:149:17:149:18 | 10 |  |
-| test.rs:149:13:149:18 | ... < ... | test.rs:145:18:150:9 | BlockExpr |  |
-| test.rs:149:13:149:19 | ExprStmt | test.rs:149:13:149:13 | a |  |
-| test.rs:149:17:149:18 | 10 | test.rs:149:13:149:18 | ... < ... |  |
-| test.rs:150:12:152:9 | BlockExpr | test.rs:145:9:154:9 | IfExpr |  |
-| test.rs:151:13:151:13 | 1 | test.rs:150:12:152:9 | BlockExpr |  |
-| test.rs:152:16:154:9 | BlockExpr | test.rs:145:9:154:9 | IfExpr |  |
-| test.rs:153:13:153:13 | 0 | test.rs:152:16:154:9 | BlockExpr |  |
-| test.rs:157:5:168:5 | enter test_if_loop2 | test.rs:159:13:161:14 | ExprStmt |  |
-| test.rs:157:5:168:5 | exit test_if_loop2 (normal) | test.rs:157:5:168:5 | exit test_if_loop2 |  |
-| test.rs:157:37:168:5 | BlockExpr | test.rs:157:5:168:5 | exit test_if_loop2 (normal) |  |
-| test.rs:158:9:167:9 | IfExpr | test.rs:157:37:168:5 | BlockExpr |  |
-| test.rs:158:12:163:10 | ParenExpr | test.rs:164:13:164:13 | 1 | true |
-| test.rs:158:12:163:10 | ParenExpr | test.rs:166:13:166:13 | 0 | false |
-| test.rs:158:13:163:9 | LoopExpr | test.rs:158:12:163:10 | ParenExpr |  |
-| test.rs:158:26:163:9 | BlockExpr | test.rs:159:13:161:14 | ExprStmt |  |
-| test.rs:159:13:161:13 | IfExpr | test.rs:162:13:162:19 | ExprStmt |  |
-| test.rs:159:13:161:14 | ExprStmt | test.rs:159:16:159:16 | a |  |
-| test.rs:159:16:159:16 | a | test.rs:159:20:159:20 | 0 |  |
-| test.rs:159:16:159:20 | ... > ... | test.rs:159:13:161:13 | IfExpr | false |
-| test.rs:159:16:159:20 | ... > ... | test.rs:160:17:160:36 | ExprStmt | true |
-| test.rs:159:20:159:20 | 0 | test.rs:159:16:159:20 | ... > ... |  |
-| test.rs:160:17:160:35 | BreakExpr | test.rs:158:13:163:9 | LoopExpr | break('label) |
-| test.rs:160:17:160:36 | ExprStmt | test.rs:160:30:160:30 | a |  |
-| test.rs:160:30:160:30 | a | test.rs:160:34:160:35 | 10 |  |
-| test.rs:160:30:160:35 | ... > ... | test.rs:160:17:160:35 | BreakExpr |  |
-| test.rs:160:34:160:35 | 10 | test.rs:160:30:160:35 | ... > ... |  |
-| test.rs:162:13:162:13 | a | test.rs:162:17:162:18 | 10 |  |
-| test.rs:162:13:162:18 | ... < ... | test.rs:158:26:163:9 | BlockExpr |  |
-| test.rs:162:13:162:19 | ExprStmt | test.rs:162:13:162:13 | a |  |
-| test.rs:162:17:162:18 | 10 | test.rs:162:13:162:18 | ... < ... |  |
-| test.rs:163:12:165:9 | BlockExpr | test.rs:158:9:167:9 | IfExpr |  |
-| test.rs:164:13:164:13 | 1 | test.rs:163:12:165:9 | BlockExpr |  |
-| test.rs:165:16:167:9 | BlockExpr | test.rs:158:9:167:9 | IfExpr |  |
-| test.rs:166:13:166:13 | 0 | test.rs:165:16:167:9 | BlockExpr |  |
-| test.rs:170:5:178:5 | enter test_labelled_block | test.rs:172:13:172:31 | ExprStmt |  |
-| test.rs:170:5:178:5 | exit test_labelled_block (normal) | test.rs:170:5:178:5 | exit test_labelled_block |  |
-| test.rs:172:13:172:30 | BreakExpr | test.rs:170:5:178:5 | exit test_labelled_block (normal) | break('block) |
-| test.rs:172:13:172:31 | ExprStmt | test.rs:172:26:172:26 | a |  |
-| test.rs:172:26:172:26 | a | test.rs:172:30:172:30 | 0 |  |
-| test.rs:172:26:172:30 | ... > ... | test.rs:172:13:172:30 | BreakExpr |  |
-| test.rs:172:30:172:30 | 0 | test.rs:172:26:172:30 | ... > ... |  |
-| test.rs:183:5:186:5 | enter test_and_operator | test.rs:184:9:184:28 | LetStmt |  |
-| test.rs:183:5:186:5 | exit test_and_operator (normal) | test.rs:183:5:186:5 | exit test_and_operator |  |
-| test.rs:183:61:186:5 | BlockExpr | test.rs:183:5:186:5 | exit test_and_operator (normal) |  |
-| test.rs:184:9:184:28 | LetStmt | test.rs:184:17:184:27 | ... && ... |  |
-| test.rs:184:13:184:13 | d | test.rs:185:9:185:9 | d | match, no-match |
-| test.rs:184:17:184:17 | a | test.rs:184:13:184:13 | d | false |
-| test.rs:184:17:184:17 | a | test.rs:184:22:184:22 | b | true |
-| test.rs:184:17:184:22 | ... && ... | test.rs:184:17:184:17 | a |  |
-| test.rs:184:17:184:27 | ... && ... | test.rs:184:17:184:22 | ... && ... |  |
-| test.rs:184:22:184:22 | b | test.rs:184:13:184:13 | d | false |
-| test.rs:184:22:184:22 | b | test.rs:184:27:184:27 | c | true |
-| test.rs:184:27:184:27 | c | test.rs:184:13:184:13 | d |  |
-| test.rs:185:9:185:9 | d | test.rs:183:61:186:5 | BlockExpr |  |
-| test.rs:188:5:191:5 | enter test_or_operator | test.rs:189:9:189:28 | LetStmt |  |
-| test.rs:188:5:191:5 | exit test_or_operator (normal) | test.rs:188:5:191:5 | exit test_or_operator |  |
-| test.rs:188:60:191:5 | BlockExpr | test.rs:188:5:191:5 | exit test_or_operator (normal) |  |
-| test.rs:189:9:189:28 | LetStmt | test.rs:189:17:189:27 | ... \|\| ... |  |
-| test.rs:189:13:189:13 | d | test.rs:190:9:190:9 | d | match, no-match |
-| test.rs:189:17:189:17 | a | test.rs:189:13:189:13 | d | true |
-| test.rs:189:17:189:17 | a | test.rs:189:22:189:22 | b | false |
-| test.rs:189:17:189:22 | ... \|\| ... | test.rs:189:17:189:17 | a |  |
-| test.rs:189:17:189:27 | ... \|\| ... | test.rs:189:17:189:22 | ... \|\| ... |  |
-| test.rs:189:22:189:22 | b | test.rs:189:13:189:13 | d | true |
-| test.rs:189:22:189:22 | b | test.rs:189:27:189:27 | c | false |
-| test.rs:189:27:189:27 | c | test.rs:189:13:189:13 | d |  |
-| test.rs:190:9:190:9 | d | test.rs:188:60:191:5 | BlockExpr |  |
-| test.rs:193:5:196:5 | enter test_or_operator_2 | test.rs:194:9:194:36 | LetStmt |  |
-| test.rs:193:5:196:5 | exit test_or_operator_2 (normal) | test.rs:193:5:196:5 | exit test_or_operator_2 |  |
-| test.rs:193:61:196:5 | BlockExpr | test.rs:193:5:196:5 | exit test_or_operator_2 (normal) |  |
-| test.rs:194:9:194:36 | LetStmt | test.rs:194:17:194:35 | ... \|\| ... |  |
-| test.rs:194:13:194:13 | d | test.rs:195:9:195:9 | d | match, no-match |
-| test.rs:194:17:194:17 | a | test.rs:194:13:194:13 | d | true |
-| test.rs:194:17:194:17 | a | test.rs:194:23:194:23 | b | false |
-| test.rs:194:17:194:30 | ... \|\| ... | test.rs:194:17:194:17 | a |  |
-| test.rs:194:17:194:35 | ... \|\| ... | test.rs:194:17:194:30 | ... \|\| ... |  |
-| test.rs:194:22:194:30 | ParenExpr | test.rs:194:13:194:13 | d | true |
-| test.rs:194:22:194:30 | ParenExpr | test.rs:194:35:194:35 | c | false |
-| test.rs:194:23:194:23 | b | test.rs:194:28:194:29 | 28 |  |
-| test.rs:194:23:194:29 | ... == ... | test.rs:194:22:194:30 | ParenExpr |  |
-| test.rs:194:28:194:29 | 28 | test.rs:194:23:194:29 | ... == ... |  |
-| test.rs:194:35:194:35 | c | test.rs:194:13:194:13 | d |  |
-| test.rs:195:9:195:9 | d | test.rs:193:61:196:5 | BlockExpr |  |
-| test.rs:198:5:201:5 | enter test_not_operator | test.rs:199:9:199:19 | LetStmt |  |
-| test.rs:198:5:201:5 | exit test_not_operator (normal) | test.rs:198:5:201:5 | exit test_not_operator |  |
-| test.rs:198:43:201:5 | BlockExpr | test.rs:198:5:201:5 | exit test_not_operator (normal) |  |
-| test.rs:199:9:199:19 | LetStmt | test.rs:199:18:199:18 | a |  |
-| test.rs:199:13:199:13 | d | test.rs:200:9:200:9 | d | match, no-match |
-| test.rs:199:17:199:18 | ! ... | test.rs:199:13:199:13 | d |  |
-| test.rs:199:18:199:18 | a | test.rs:199:17:199:18 | ! ... |  |
-| test.rs:200:9:200:9 | d | test.rs:198:43:201:5 | BlockExpr |  |
-| test.rs:203:5:209:5 | enter test_if_and_operator | test.rs:204:12:204:22 | ... && ... |  |
-| test.rs:203:5:209:5 | exit test_if_and_operator (normal) | test.rs:203:5:209:5 | exit test_if_and_operator |  |
-| test.rs:203:63:209:5 | BlockExpr | test.rs:203:5:209:5 | exit test_if_and_operator (normal) |  |
-| test.rs:204:9:208:9 | IfExpr | test.rs:203:63:209:5 | BlockExpr |  |
-| test.rs:204:12:204:12 | a | test.rs:204:17:204:17 | b | true |
-| test.rs:204:12:204:12 | a | test.rs:207:13:207:17 | false | false |
-| test.rs:204:12:204:17 | ... && ... | test.rs:204:12:204:12 | a |  |
-| test.rs:204:12:204:22 | ... && ... | test.rs:204:12:204:17 | ... && ... |  |
-| test.rs:204:17:204:17 | b | test.rs:204:22:204:22 | c | true |
-| test.rs:204:17:204:17 | b | test.rs:207:13:207:17 | false | false |
-| test.rs:204:22:204:22 | c | test.rs:205:13:205:16 | true | true |
-| test.rs:204:22:204:22 | c | test.rs:207:13:207:17 | false | false |
-| test.rs:204:24:206:9 | BlockExpr | test.rs:204:9:208:9 | IfExpr |  |
-| test.rs:205:13:205:16 | true | test.rs:204:24:206:9 | BlockExpr |  |
-| test.rs:206:16:208:9 | BlockExpr | test.rs:204:9:208:9 | IfExpr |  |
-| test.rs:207:13:207:17 | false | test.rs:206:16:208:9 | BlockExpr |  |
-| test.rs:211:5:217:5 | enter test_if_or_operator | test.rs:212:12:212:22 | ... \|\| ... |  |
-| test.rs:211:5:217:5 | exit test_if_or_operator (normal) | test.rs:211:5:217:5 | exit test_if_or_operator |  |
-| test.rs:211:62:217:5 | BlockExpr | test.rs:211:5:217:5 | exit test_if_or_operator (normal) |  |
-| test.rs:212:9:216:9 | IfExpr | test.rs:211:62:217:5 | BlockExpr |  |
-| test.rs:212:12:212:12 | a | test.rs:212:17:212:17 | b | false |
-| test.rs:212:12:212:12 | a | test.rs:213:13:213:16 | true | true |
-| test.rs:212:12:212:17 | ... \|\| ... | test.rs:212:12:212:12 | a |  |
-| test.rs:212:12:212:22 | ... \|\| ... | test.rs:212:12:212:17 | ... \|\| ... |  |
-| test.rs:212:17:212:17 | b | test.rs:212:22:212:22 | c | false |
-| test.rs:212:17:212:17 | b | test.rs:213:13:213:16 | true | true |
-| test.rs:212:22:212:22 | c | test.rs:213:13:213:16 | true | true |
-| test.rs:212:22:212:22 | c | test.rs:215:13:215:17 | false | false |
-| test.rs:212:24:214:9 | BlockExpr | test.rs:212:9:216:9 | IfExpr |  |
-| test.rs:213:13:213:16 | true | test.rs:212:24:214:9 | BlockExpr |  |
-| test.rs:214:16:216:9 | BlockExpr | test.rs:212:9:216:9 | IfExpr |  |
-| test.rs:215:13:215:17 | false | test.rs:214:16:216:9 | BlockExpr |  |
-| test.rs:219:5:225:5 | enter test_if_not_operator | test.rs:220:13:220:13 | a |  |
-| test.rs:219:5:225:5 | exit test_if_not_operator (normal) | test.rs:219:5:225:5 | exit test_if_not_operator |  |
-| test.rs:219:46:225:5 | BlockExpr | test.rs:219:5:225:5 | exit test_if_not_operator (normal) |  |
-| test.rs:220:9:224:9 | IfExpr | test.rs:219:46:225:5 | BlockExpr |  |
-| test.rs:220:12:220:13 | ! ... | test.rs:221:13:221:16 | true | true |
-| test.rs:220:12:220:13 | ! ... | test.rs:223:13:223:17 | false | false |
-| test.rs:220:13:220:13 | a | test.rs:220:12:220:13 | ! ... | false, true |
-| test.rs:220:15:222:9 | BlockExpr | test.rs:220:9:224:9 | IfExpr |  |
-| test.rs:221:13:221:16 | true | test.rs:220:15:222:9 | BlockExpr |  |
-| test.rs:222:16:224:9 | BlockExpr | test.rs:220:9:224:9 | IfExpr |  |
-| test.rs:223:13:223:17 | false | test.rs:222:16:224:9 | BlockExpr |  |
-| test.rs:228:1:234:1 | enter test_match | test.rs:229:11:229:21 | maybe_digit |  |
-| test.rs:228:1:234:1 | exit test_match (normal) | test.rs:228:1:234:1 | exit test_match |  |
-| test.rs:228:48:234:1 | BlockExpr | test.rs:228:1:234:1 | exit test_match (normal) |  |
-| test.rs:229:5:233:5 | MatchExpr | test.rs:228:48:234:1 | BlockExpr |  |
-| test.rs:229:11:229:21 | maybe_digit | test.rs:230:9:230:23 | TupleStructPat |  |
-| test.rs:230:9:230:23 | TupleStructPat | test.rs:230:28:230:28 | x | match |
-| test.rs:230:9:230:23 | TupleStructPat | test.rs:231:9:231:23 | TupleStructPat | no-match |
-| test.rs:230:28:230:28 | x | test.rs:230:32:230:33 | 10 |  |
-| test.rs:230:28:230:33 | ... < ... | test.rs:230:38:230:38 | x | true |
-| test.rs:230:28:230:33 | ... < ... | test.rs:231:9:231:23 | TupleStructPat | false |
-| test.rs:230:32:230:33 | 10 | test.rs:230:28:230:33 | ... < ... |  |
-| test.rs:230:38:230:38 | x | test.rs:230:42:230:42 | 5 |  |
-| test.rs:230:38:230:42 | ... + ... | test.rs:229:5:233:5 | MatchExpr |  |
-| test.rs:230:42:230:42 | 5 | test.rs:230:38:230:42 | ... + ... |  |
-| test.rs:231:9:231:23 | TupleStructPat | test.rs:231:28:231:28 | x | match |
-| test.rs:231:9:231:23 | TupleStructPat | test.rs:232:9:232:20 | PathPat | no-match |
-| test.rs:231:28:231:28 | x | test.rs:229:5:233:5 | MatchExpr |  |
-| test.rs:232:9:232:20 | PathPat | test.rs:232:25:232:25 | 5 | match |
-| test.rs:232:25:232:25 | 5 | test.rs:229:5:233:5 | MatchExpr |  |
-| test.rs:237:5:242:5 | enter test_infinite_loop | test.rs:238:9:240:9 | ExprStmt |  |
-| test.rs:238:9:240:9 | ExprStmt | test.rs:239:13:239:13 | 1 |  |
-| test.rs:238:14:240:9 | BlockExpr | test.rs:239:13:239:13 | 1 |  |
-| test.rs:239:13:239:13 | 1 | test.rs:238:14:240:9 | BlockExpr |  |
-| test.rs:244:5:247:5 | enter test_let_match | test.rs:245:9:245:49 | LetStmt |  |
-| test.rs:244:5:247:5 | exit test_let_match (normal) | test.rs:244:5:247:5 | exit test_let_match |  |
-| test.rs:244:39:247:5 | BlockExpr | test.rs:244:5:247:5 | exit test_let_match (normal) |  |
-| test.rs:245:9:245:49 | LetStmt | test.rs:245:23:245:23 | a |  |
-| test.rs:245:13:245:19 | TupleStructPat | test.rs:245:32:245:46 | "Expected some" | no-match |
-| test.rs:245:13:245:19 | TupleStructPat | test.rs:246:9:246:9 | n | match |
-| test.rs:245:23:245:23 | a | test.rs:245:13:245:19 | TupleStructPat |  |
-| test.rs:245:32:245:46 | "Expected some" | test.rs:245:30:245:48 | BlockExpr |  |
-| test.rs:246:9:246:9 | n | test.rs:244:39:247:5 | BlockExpr |  |
-| test.rs:250:1:255:1 | enter dead_code | test.rs:251:5:253:5 | ExprStmt |  |
-| test.rs:250:1:255:1 | exit dead_code (normal) | test.rs:250:1:255:1 | exit dead_code |  |
-| test.rs:251:5:253:5 | ExprStmt | test.rs:251:9:251:12 | true |  |
-| test.rs:251:8:251:13 | ParenExpr | test.rs:252:9:252:17 | ExprStmt | true |
-| test.rs:251:9:251:12 | true | test.rs:251:8:251:13 | ParenExpr |  |
-| test.rs:252:9:252:16 | ReturnExpr | test.rs:250:1:255:1 | exit dead_code (normal) | return |
-| test.rs:252:9:252:17 | ExprStmt | test.rs:252:16:252:16 | 0 |  |
-| test.rs:252:16:252:16 | 0 | test.rs:252:9:252:16 | ReturnExpr |  |
-| test.rs:257:1:270:1 | enter labelled_block | test.rs:258:5:269:6 | LetStmt |  |
-| test.rs:257:1:270:1 | exit labelled_block (normal) | test.rs:257:1:270:1 | exit labelled_block |  |
-| test.rs:257:28:270:1 | BlockExpr | test.rs:257:1:270:1 | exit labelled_block (normal) |  |
-| test.rs:258:5:269:6 | LetStmt | test.rs:259:9:259:19 | ExprStmt |  |
-| test.rs:258:9:258:14 | result | test.rs:257:28:270:1 | BlockExpr | match, no-match |
-| test.rs:258:18:269:5 | BlockExpr | test.rs:258:9:258:14 | result |  |
-| test.rs:259:9:259:16 | PathExpr | test.rs:259:9:259:18 | CallExpr |  |
-| test.rs:259:9:259:18 | CallExpr | test.rs:260:9:262:9 | ExprStmt |  |
-| test.rs:259:9:259:19 | ExprStmt | test.rs:259:9:259:16 | PathExpr |  |
-| test.rs:260:9:262:9 | ExprStmt | test.rs:260:12:260:28 | PathExpr |  |
-| test.rs:260:9:262:9 | IfExpr | test.rs:263:9:263:24 | ExprStmt |  |
-| test.rs:260:12:260:28 | PathExpr | test.rs:260:12:260:30 | CallExpr |  |
-| test.rs:260:12:260:30 | CallExpr | test.rs:260:9:262:9 | IfExpr | false |
-| test.rs:260:12:260:30 | CallExpr | test.rs:261:13:261:27 | ExprStmt | true |
-| test.rs:261:13:261:26 | BreakExpr | test.rs:257:1:270:1 | exit labelled_block (normal) | break('block) |
-| test.rs:261:13:261:27 | ExprStmt | test.rs:261:26:261:26 | 1 |  |
-| test.rs:261:26:261:26 | 1 | test.rs:261:13:261:26 | BreakExpr |  |
-| test.rs:263:9:263:21 | PathExpr | test.rs:263:9:263:23 | CallExpr |  |
-| test.rs:263:9:263:23 | CallExpr | test.rs:264:9:266:9 | ExprStmt |  |
-| test.rs:263:9:263:24 | ExprStmt | test.rs:263:9:263:21 | PathExpr |  |
-| test.rs:264:9:266:9 | ExprStmt | test.rs:264:12:264:28 | PathExpr |  |
-| test.rs:264:9:266:9 | IfExpr | test.rs:267:9:267:24 | ExprStmt |  |
-| test.rs:264:12:264:28 | PathExpr | test.rs:264:12:264:30 | CallExpr |  |
-| test.rs:264:12:264:30 | CallExpr | test.rs:264:9:266:9 | IfExpr | false |
-| test.rs:264:12:264:30 | CallExpr | test.rs:265:13:265:27 | ExprStmt | true |
-| test.rs:265:13:265:26 | BreakExpr | test.rs:257:1:270:1 | exit labelled_block (normal) | break('block) |
-| test.rs:265:13:265:27 | ExprStmt | test.rs:265:26:265:26 | 2 |  |
-| test.rs:265:26:265:26 | 2 | test.rs:265:13:265:26 | BreakExpr |  |
-| test.rs:267:9:267:21 | PathExpr | test.rs:267:9:267:23 | CallExpr |  |
-| test.rs:267:9:267:23 | CallExpr | test.rs:268:9:268:9 | 3 |  |
-| test.rs:267:9:267:24 | ExprStmt | test.rs:267:9:267:21 | PathExpr |  |
-| test.rs:268:9:268:9 | 3 | test.rs:258:18:269:5 | BlockExpr |  |
+| test.rs:144:5:151:5 | enter test_if_assignment | test.rs:145:9:145:26 | LetStmt |  |
+| test.rs:144:5:151:5 | exit test_if_assignment (normal) | test.rs:144:5:151:5 | exit test_if_assignment |  |
+| test.rs:144:42:151:5 | BlockExpr | test.rs:144:5:151:5 | exit test_if_assignment (normal) |  |
+| test.rs:145:9:145:26 | LetStmt | test.rs:145:21:145:25 | false |  |
+| test.rs:145:13:145:17 | x | test.rs:146:12:146:12 | x | match, no-match |
+| test.rs:145:21:145:25 | false | test.rs:145:13:145:17 | x |  |
+| test.rs:146:9:150:9 | IfExpr | test.rs:144:42:151:5 | BlockExpr |  |
+| test.rs:146:12:146:12 | x | test.rs:146:16:146:19 | true |  |
+| test.rs:146:12:146:19 | ... = ... | test.rs:147:13:147:13 | 1 | true |
+| test.rs:146:12:146:19 | ... = ... | test.rs:149:13:149:13 | 0 | false |
+| test.rs:146:16:146:19 | true | test.rs:146:12:146:19 | ... = ... |  |
+| test.rs:146:21:148:9 | BlockExpr | test.rs:146:9:150:9 | IfExpr |  |
+| test.rs:147:13:147:13 | 1 | test.rs:146:21:148:9 | BlockExpr |  |
+| test.rs:148:16:150:9 | BlockExpr | test.rs:146:9:150:9 | IfExpr |  |
+| test.rs:149:13:149:13 | 0 | test.rs:148:16:150:9 | BlockExpr |  |
+| test.rs:153:5:164:5 | enter test_if_loop1 | test.rs:155:13:157:14 | ExprStmt |  |
+| test.rs:153:5:164:5 | exit test_if_loop1 (normal) | test.rs:153:5:164:5 | exit test_if_loop1 |  |
+| test.rs:153:37:164:5 | BlockExpr | test.rs:153:5:164:5 | exit test_if_loop1 (normal) |  |
+| test.rs:154:9:163:9 | IfExpr | test.rs:153:37:164:5 | BlockExpr |  |
+| test.rs:154:12:159:10 | ParenExpr | test.rs:160:13:160:13 | 1 | true |
+| test.rs:154:12:159:10 | ParenExpr | test.rs:162:13:162:13 | 0 | false |
+| test.rs:154:13:159:9 | LoopExpr | test.rs:154:12:159:10 | ParenExpr |  |
+| test.rs:154:18:159:9 | BlockExpr | test.rs:155:13:157:14 | ExprStmt |  |
+| test.rs:155:13:157:13 | IfExpr | test.rs:158:13:158:19 | ExprStmt |  |
+| test.rs:155:13:157:14 | ExprStmt | test.rs:155:16:155:16 | a |  |
+| test.rs:155:16:155:16 | a | test.rs:155:20:155:20 | 0 |  |
+| test.rs:155:16:155:20 | ... > ... | test.rs:155:13:157:13 | IfExpr | false |
+| test.rs:155:16:155:20 | ... > ... | test.rs:156:17:156:29 | ExprStmt | true |
+| test.rs:155:20:155:20 | 0 | test.rs:155:16:155:20 | ... > ... |  |
+| test.rs:156:17:156:28 | BreakExpr | test.rs:154:13:159:9 | LoopExpr | break |
+| test.rs:156:17:156:29 | ExprStmt | test.rs:156:23:156:23 | a |  |
+| test.rs:156:23:156:23 | a | test.rs:156:27:156:28 | 10 |  |
+| test.rs:156:23:156:28 | ... > ... | test.rs:156:17:156:28 | BreakExpr |  |
+| test.rs:156:27:156:28 | 10 | test.rs:156:23:156:28 | ... > ... |  |
+| test.rs:158:13:158:13 | a | test.rs:158:17:158:18 | 10 |  |
+| test.rs:158:13:158:18 | ... < ... | test.rs:154:18:159:9 | BlockExpr |  |
+| test.rs:158:13:158:19 | ExprStmt | test.rs:158:13:158:13 | a |  |
+| test.rs:158:17:158:18 | 10 | test.rs:158:13:158:18 | ... < ... |  |
+| test.rs:159:12:161:9 | BlockExpr | test.rs:154:9:163:9 | IfExpr |  |
+| test.rs:160:13:160:13 | 1 | test.rs:159:12:161:9 | BlockExpr |  |
+| test.rs:161:16:163:9 | BlockExpr | test.rs:154:9:163:9 | IfExpr |  |
+| test.rs:162:13:162:13 | 0 | test.rs:161:16:163:9 | BlockExpr |  |
+| test.rs:166:5:177:5 | enter test_if_loop2 | test.rs:168:13:170:14 | ExprStmt |  |
+| test.rs:166:5:177:5 | exit test_if_loop2 (normal) | test.rs:166:5:177:5 | exit test_if_loop2 |  |
+| test.rs:166:37:177:5 | BlockExpr | test.rs:166:5:177:5 | exit test_if_loop2 (normal) |  |
+| test.rs:167:9:176:9 | IfExpr | test.rs:166:37:177:5 | BlockExpr |  |
+| test.rs:167:12:172:10 | ParenExpr | test.rs:173:13:173:13 | 1 | true |
+| test.rs:167:12:172:10 | ParenExpr | test.rs:175:13:175:13 | 0 | false |
+| test.rs:167:13:172:9 | LoopExpr | test.rs:167:12:172:10 | ParenExpr |  |
+| test.rs:167:26:172:9 | BlockExpr | test.rs:168:13:170:14 | ExprStmt |  |
+| test.rs:168:13:170:13 | IfExpr | test.rs:171:13:171:19 | ExprStmt |  |
+| test.rs:168:13:170:14 | ExprStmt | test.rs:168:16:168:16 | a |  |
+| test.rs:168:16:168:16 | a | test.rs:168:20:168:20 | 0 |  |
+| test.rs:168:16:168:20 | ... > ... | test.rs:168:13:170:13 | IfExpr | false |
+| test.rs:168:16:168:20 | ... > ... | test.rs:169:17:169:36 | ExprStmt | true |
+| test.rs:168:20:168:20 | 0 | test.rs:168:16:168:20 | ... > ... |  |
+| test.rs:169:17:169:35 | BreakExpr | test.rs:167:13:172:9 | LoopExpr | break('label) |
+| test.rs:169:17:169:36 | ExprStmt | test.rs:169:30:169:30 | a |  |
+| test.rs:169:30:169:30 | a | test.rs:169:34:169:35 | 10 |  |
+| test.rs:169:30:169:35 | ... > ... | test.rs:169:17:169:35 | BreakExpr |  |
+| test.rs:169:34:169:35 | 10 | test.rs:169:30:169:35 | ... > ... |  |
+| test.rs:171:13:171:13 | a | test.rs:171:17:171:18 | 10 |  |
+| test.rs:171:13:171:18 | ... < ... | test.rs:167:26:172:9 | BlockExpr |  |
+| test.rs:171:13:171:19 | ExprStmt | test.rs:171:13:171:13 | a |  |
+| test.rs:171:17:171:18 | 10 | test.rs:171:13:171:18 | ... < ... |  |
+| test.rs:172:12:174:9 | BlockExpr | test.rs:167:9:176:9 | IfExpr |  |
+| test.rs:173:13:173:13 | 1 | test.rs:172:12:174:9 | BlockExpr |  |
+| test.rs:174:16:176:9 | BlockExpr | test.rs:167:9:176:9 | IfExpr |  |
+| test.rs:175:13:175:13 | 0 | test.rs:174:16:176:9 | BlockExpr |  |
+| test.rs:179:5:187:5 | enter test_labelled_block | test.rs:181:13:181:31 | ExprStmt |  |
+| test.rs:179:5:187:5 | exit test_labelled_block (normal) | test.rs:179:5:187:5 | exit test_labelled_block |  |
+| test.rs:181:13:181:30 | BreakExpr | test.rs:179:5:187:5 | exit test_labelled_block (normal) | break('block) |
+| test.rs:181:13:181:31 | ExprStmt | test.rs:181:26:181:26 | a |  |
+| test.rs:181:26:181:26 | a | test.rs:181:30:181:30 | 0 |  |
+| test.rs:181:26:181:30 | ... > ... | test.rs:181:13:181:30 | BreakExpr |  |
+| test.rs:181:30:181:30 | 0 | test.rs:181:26:181:30 | ... > ... |  |
+| test.rs:192:5:195:5 | enter test_and_operator | test.rs:193:9:193:28 | LetStmt |  |
+| test.rs:192:5:195:5 | exit test_and_operator (normal) | test.rs:192:5:195:5 | exit test_and_operator |  |
+| test.rs:192:61:195:5 | BlockExpr | test.rs:192:5:195:5 | exit test_and_operator (normal) |  |
+| test.rs:193:9:193:28 | LetStmt | test.rs:193:17:193:27 | ... && ... |  |
+| test.rs:193:13:193:13 | d | test.rs:194:9:194:9 | d | match, no-match |
+| test.rs:193:17:193:17 | a | test.rs:193:13:193:13 | d | false |
+| test.rs:193:17:193:17 | a | test.rs:193:22:193:22 | b | true |
+| test.rs:193:17:193:22 | ... && ... | test.rs:193:17:193:17 | a |  |
+| test.rs:193:17:193:27 | ... && ... | test.rs:193:17:193:22 | ... && ... |  |
+| test.rs:193:22:193:22 | b | test.rs:193:13:193:13 | d | false |
+| test.rs:193:22:193:22 | b | test.rs:193:27:193:27 | c | true |
+| test.rs:193:27:193:27 | c | test.rs:193:13:193:13 | d |  |
+| test.rs:194:9:194:9 | d | test.rs:192:61:195:5 | BlockExpr |  |
+| test.rs:197:5:200:5 | enter test_or_operator | test.rs:198:9:198:28 | LetStmt |  |
+| test.rs:197:5:200:5 | exit test_or_operator (normal) | test.rs:197:5:200:5 | exit test_or_operator |  |
+| test.rs:197:60:200:5 | BlockExpr | test.rs:197:5:200:5 | exit test_or_operator (normal) |  |
+| test.rs:198:9:198:28 | LetStmt | test.rs:198:17:198:27 | ... \|\| ... |  |
+| test.rs:198:13:198:13 | d | test.rs:199:9:199:9 | d | match, no-match |
+| test.rs:198:17:198:17 | a | test.rs:198:13:198:13 | d | true |
+| test.rs:198:17:198:17 | a | test.rs:198:22:198:22 | b | false |
+| test.rs:198:17:198:22 | ... \|\| ... | test.rs:198:17:198:17 | a |  |
+| test.rs:198:17:198:27 | ... \|\| ... | test.rs:198:17:198:22 | ... \|\| ... |  |
+| test.rs:198:22:198:22 | b | test.rs:198:13:198:13 | d | true |
+| test.rs:198:22:198:22 | b | test.rs:198:27:198:27 | c | false |
+| test.rs:198:27:198:27 | c | test.rs:198:13:198:13 | d |  |
+| test.rs:199:9:199:9 | d | test.rs:197:60:200:5 | BlockExpr |  |
+| test.rs:202:5:205:5 | enter test_or_operator_2 | test.rs:203:9:203:36 | LetStmt |  |
+| test.rs:202:5:205:5 | exit test_or_operator_2 (normal) | test.rs:202:5:205:5 | exit test_or_operator_2 |  |
+| test.rs:202:61:205:5 | BlockExpr | test.rs:202:5:205:5 | exit test_or_operator_2 (normal) |  |
+| test.rs:203:9:203:36 | LetStmt | test.rs:203:17:203:35 | ... \|\| ... |  |
+| test.rs:203:13:203:13 | d | test.rs:204:9:204:9 | d | match, no-match |
+| test.rs:203:17:203:17 | a | test.rs:203:13:203:13 | d | true |
+| test.rs:203:17:203:17 | a | test.rs:203:23:203:23 | b | false |
+| test.rs:203:17:203:30 | ... \|\| ... | test.rs:203:17:203:17 | a |  |
+| test.rs:203:17:203:35 | ... \|\| ... | test.rs:203:17:203:30 | ... \|\| ... |  |
+| test.rs:203:22:203:30 | ParenExpr | test.rs:203:13:203:13 | d | true |
+| test.rs:203:22:203:30 | ParenExpr | test.rs:203:35:203:35 | c | false |
+| test.rs:203:23:203:23 | b | test.rs:203:28:203:29 | 28 |  |
+| test.rs:203:23:203:29 | ... == ... | test.rs:203:22:203:30 | ParenExpr |  |
+| test.rs:203:28:203:29 | 28 | test.rs:203:23:203:29 | ... == ... |  |
+| test.rs:203:35:203:35 | c | test.rs:203:13:203:13 | d |  |
+| test.rs:204:9:204:9 | d | test.rs:202:61:205:5 | BlockExpr |  |
+| test.rs:207:5:210:5 | enter test_not_operator | test.rs:208:9:208:19 | LetStmt |  |
+| test.rs:207:5:210:5 | exit test_not_operator (normal) | test.rs:207:5:210:5 | exit test_not_operator |  |
+| test.rs:207:43:210:5 | BlockExpr | test.rs:207:5:210:5 | exit test_not_operator (normal) |  |
+| test.rs:208:9:208:19 | LetStmt | test.rs:208:18:208:18 | a |  |
+| test.rs:208:13:208:13 | d | test.rs:209:9:209:9 | d | match, no-match |
+| test.rs:208:17:208:18 | ! ... | test.rs:208:13:208:13 | d |  |
+| test.rs:208:18:208:18 | a | test.rs:208:17:208:18 | ! ... |  |
+| test.rs:209:9:209:9 | d | test.rs:207:43:210:5 | BlockExpr |  |
+| test.rs:212:5:218:5 | enter test_if_and_operator | test.rs:213:12:213:22 | ... && ... |  |
+| test.rs:212:5:218:5 | exit test_if_and_operator (normal) | test.rs:212:5:218:5 | exit test_if_and_operator |  |
+| test.rs:212:63:218:5 | BlockExpr | test.rs:212:5:218:5 | exit test_if_and_operator (normal) |  |
+| test.rs:213:9:217:9 | IfExpr | test.rs:212:63:218:5 | BlockExpr |  |
+| test.rs:213:12:213:12 | a | test.rs:213:17:213:17 | b | true |
+| test.rs:213:12:213:12 | a | test.rs:216:13:216:17 | false | false |
+| test.rs:213:12:213:17 | ... && ... | test.rs:213:12:213:12 | a |  |
+| test.rs:213:12:213:22 | ... && ... | test.rs:213:12:213:17 | ... && ... |  |
+| test.rs:213:17:213:17 | b | test.rs:213:22:213:22 | c | true |
+| test.rs:213:17:213:17 | b | test.rs:216:13:216:17 | false | false |
+| test.rs:213:22:213:22 | c | test.rs:214:13:214:16 | true | true |
+| test.rs:213:22:213:22 | c | test.rs:216:13:216:17 | false | false |
+| test.rs:213:24:215:9 | BlockExpr | test.rs:213:9:217:9 | IfExpr |  |
+| test.rs:214:13:214:16 | true | test.rs:213:24:215:9 | BlockExpr |  |
+| test.rs:215:16:217:9 | BlockExpr | test.rs:213:9:217:9 | IfExpr |  |
+| test.rs:216:13:216:17 | false | test.rs:215:16:217:9 | BlockExpr |  |
+| test.rs:220:5:226:5 | enter test_if_or_operator | test.rs:221:12:221:22 | ... \|\| ... |  |
+| test.rs:220:5:226:5 | exit test_if_or_operator (normal) | test.rs:220:5:226:5 | exit test_if_or_operator |  |
+| test.rs:220:62:226:5 | BlockExpr | test.rs:220:5:226:5 | exit test_if_or_operator (normal) |  |
+| test.rs:221:9:225:9 | IfExpr | test.rs:220:62:226:5 | BlockExpr |  |
+| test.rs:221:12:221:12 | a | test.rs:221:17:221:17 | b | false |
+| test.rs:221:12:221:12 | a | test.rs:222:13:222:16 | true | true |
+| test.rs:221:12:221:17 | ... \|\| ... | test.rs:221:12:221:12 | a |  |
+| test.rs:221:12:221:22 | ... \|\| ... | test.rs:221:12:221:17 | ... \|\| ... |  |
+| test.rs:221:17:221:17 | b | test.rs:221:22:221:22 | c | false |
+| test.rs:221:17:221:17 | b | test.rs:222:13:222:16 | true | true |
+| test.rs:221:22:221:22 | c | test.rs:222:13:222:16 | true | true |
+| test.rs:221:22:221:22 | c | test.rs:224:13:224:17 | false | false |
+| test.rs:221:24:223:9 | BlockExpr | test.rs:221:9:225:9 | IfExpr |  |
+| test.rs:222:13:222:16 | true | test.rs:221:24:223:9 | BlockExpr |  |
+| test.rs:223:16:225:9 | BlockExpr | test.rs:221:9:225:9 | IfExpr |  |
+| test.rs:224:13:224:17 | false | test.rs:223:16:225:9 | BlockExpr |  |
+| test.rs:228:5:234:5 | enter test_if_not_operator | test.rs:229:13:229:13 | a |  |
+| test.rs:228:5:234:5 | exit test_if_not_operator (normal) | test.rs:228:5:234:5 | exit test_if_not_operator |  |
+| test.rs:228:46:234:5 | BlockExpr | test.rs:228:5:234:5 | exit test_if_not_operator (normal) |  |
+| test.rs:229:9:233:9 | IfExpr | test.rs:228:46:234:5 | BlockExpr |  |
+| test.rs:229:12:229:13 | ! ... | test.rs:230:13:230:16 | true | true |
+| test.rs:229:12:229:13 | ! ... | test.rs:232:13:232:17 | false | false |
+| test.rs:229:13:229:13 | a | test.rs:229:12:229:13 | ! ... | false, true |
+| test.rs:229:15:231:9 | BlockExpr | test.rs:229:9:233:9 | IfExpr |  |
+| test.rs:230:13:230:16 | true | test.rs:229:15:231:9 | BlockExpr |  |
+| test.rs:231:16:233:9 | BlockExpr | test.rs:229:9:233:9 | IfExpr |  |
+| test.rs:232:13:232:17 | false | test.rs:231:16:233:9 | BlockExpr |  |
+| test.rs:237:1:243:1 | enter test_match | test.rs:238:11:238:21 | maybe_digit |  |
+| test.rs:237:1:243:1 | exit test_match (normal) | test.rs:237:1:243:1 | exit test_match |  |
+| test.rs:237:48:243:1 | BlockExpr | test.rs:237:1:243:1 | exit test_match (normal) |  |
+| test.rs:238:5:242:5 | MatchExpr | test.rs:237:48:243:1 | BlockExpr |  |
+| test.rs:238:11:238:21 | maybe_digit | test.rs:239:9:239:23 | TupleStructPat |  |
+| test.rs:239:9:239:23 | TupleStructPat | test.rs:239:28:239:28 | x | match |
+| test.rs:239:9:239:23 | TupleStructPat | test.rs:240:9:240:23 | TupleStructPat | no-match |
+| test.rs:239:28:239:28 | x | test.rs:239:32:239:33 | 10 |  |
+| test.rs:239:28:239:33 | ... < ... | test.rs:239:38:239:38 | x | true |
+| test.rs:239:28:239:33 | ... < ... | test.rs:240:9:240:23 | TupleStructPat | false |
+| test.rs:239:32:239:33 | 10 | test.rs:239:28:239:33 | ... < ... |  |
+| test.rs:239:38:239:38 | x | test.rs:239:42:239:42 | 5 |  |
+| test.rs:239:38:239:42 | ... + ... | test.rs:238:5:242:5 | MatchExpr |  |
+| test.rs:239:42:239:42 | 5 | test.rs:239:38:239:42 | ... + ... |  |
+| test.rs:240:9:240:23 | TupleStructPat | test.rs:240:28:240:28 | x | match |
+| test.rs:240:9:240:23 | TupleStructPat | test.rs:241:9:241:20 | PathPat | no-match |
+| test.rs:240:28:240:28 | x | test.rs:238:5:242:5 | MatchExpr |  |
+| test.rs:241:9:241:20 | PathPat | test.rs:241:25:241:25 | 5 | match |
+| test.rs:241:25:241:25 | 5 | test.rs:238:5:242:5 | MatchExpr |  |
+| test.rs:246:5:251:5 | enter test_infinite_loop | test.rs:247:9:249:9 | ExprStmt |  |
+| test.rs:247:9:249:9 | ExprStmt | test.rs:248:13:248:13 | 1 |  |
+| test.rs:247:14:249:9 | BlockExpr | test.rs:248:13:248:13 | 1 |  |
+| test.rs:248:13:248:13 | 1 | test.rs:247:14:249:9 | BlockExpr |  |
+| test.rs:253:5:256:5 | enter test_let_match | test.rs:254:9:254:49 | LetStmt |  |
+| test.rs:253:5:256:5 | exit test_let_match (normal) | test.rs:253:5:256:5 | exit test_let_match |  |
+| test.rs:253:39:256:5 | BlockExpr | test.rs:253:5:256:5 | exit test_let_match (normal) |  |
+| test.rs:254:9:254:49 | LetStmt | test.rs:254:23:254:23 | a |  |
+| test.rs:254:13:254:19 | TupleStructPat | test.rs:254:32:254:46 | "Expected some" | no-match |
+| test.rs:254:13:254:19 | TupleStructPat | test.rs:255:9:255:9 | n | match |
+| test.rs:254:23:254:23 | a | test.rs:254:13:254:19 | TupleStructPat |  |
+| test.rs:254:32:254:46 | "Expected some" | test.rs:254:30:254:48 | BlockExpr |  |
+| test.rs:255:9:255:9 | n | test.rs:253:39:256:5 | BlockExpr |  |
+| test.rs:259:1:264:1 | enter dead_code | test.rs:260:5:262:5 | ExprStmt |  |
+| test.rs:259:1:264:1 | exit dead_code (normal) | test.rs:259:1:264:1 | exit dead_code |  |
+| test.rs:260:5:262:5 | ExprStmt | test.rs:260:9:260:12 | true |  |
+| test.rs:260:8:260:13 | ParenExpr | test.rs:261:9:261:17 | ExprStmt | true |
+| test.rs:260:9:260:12 | true | test.rs:260:8:260:13 | ParenExpr |  |
+| test.rs:261:9:261:16 | ReturnExpr | test.rs:259:1:264:1 | exit dead_code (normal) | return |
+| test.rs:261:9:261:17 | ExprStmt | test.rs:261:16:261:16 | 0 |  |
+| test.rs:261:16:261:16 | 0 | test.rs:261:9:261:16 | ReturnExpr |  |
+| test.rs:266:1:279:1 | enter labelled_block1 | test.rs:267:5:278:6 | LetStmt |  |
+| test.rs:266:1:279:1 | exit labelled_block1 (normal) | test.rs:266:1:279:1 | exit labelled_block1 |  |
+| test.rs:266:29:279:1 | BlockExpr | test.rs:266:1:279:1 | exit labelled_block1 (normal) |  |
+| test.rs:267:5:278:6 | LetStmt | test.rs:268:9:268:19 | ExprStmt |  |
+| test.rs:267:9:267:14 | result | test.rs:266:29:279:1 | BlockExpr | match, no-match |
+| test.rs:267:18:278:5 | BlockExpr | test.rs:267:9:267:14 | result |  |
+| test.rs:268:9:268:16 | PathExpr | test.rs:268:9:268:18 | CallExpr |  |
+| test.rs:268:9:268:18 | CallExpr | test.rs:269:9:271:9 | ExprStmt |  |
+| test.rs:268:9:268:19 | ExprStmt | test.rs:268:9:268:16 | PathExpr |  |
+| test.rs:269:9:271:9 | ExprStmt | test.rs:269:12:269:28 | PathExpr |  |
+| test.rs:269:9:271:9 | IfExpr | test.rs:272:9:272:24 | ExprStmt |  |
+| test.rs:269:12:269:28 | PathExpr | test.rs:269:12:269:30 | CallExpr |  |
+| test.rs:269:12:269:30 | CallExpr | test.rs:269:9:271:9 | IfExpr | false |
+| test.rs:269:12:269:30 | CallExpr | test.rs:270:13:270:27 | ExprStmt | true |
+| test.rs:270:13:270:26 | BreakExpr | test.rs:266:1:279:1 | exit labelled_block1 (normal) | break('block) |
+| test.rs:270:13:270:27 | ExprStmt | test.rs:270:26:270:26 | 1 |  |
+| test.rs:270:26:270:26 | 1 | test.rs:270:13:270:26 | BreakExpr |  |
+| test.rs:272:9:272:21 | PathExpr | test.rs:272:9:272:23 | CallExpr |  |
+| test.rs:272:9:272:23 | CallExpr | test.rs:273:9:275:9 | ExprStmt |  |
+| test.rs:272:9:272:24 | ExprStmt | test.rs:272:9:272:21 | PathExpr |  |
+| test.rs:273:9:275:9 | ExprStmt | test.rs:273:12:273:28 | PathExpr |  |
+| test.rs:273:9:275:9 | IfExpr | test.rs:276:9:276:24 | ExprStmt |  |
+| test.rs:273:12:273:28 | PathExpr | test.rs:273:12:273:30 | CallExpr |  |
+| test.rs:273:12:273:30 | CallExpr | test.rs:273:9:275:9 | IfExpr | false |
+| test.rs:273:12:273:30 | CallExpr | test.rs:274:13:274:27 | ExprStmt | true |
+| test.rs:274:13:274:26 | BreakExpr | test.rs:266:1:279:1 | exit labelled_block1 (normal) | break('block) |
+| test.rs:274:13:274:27 | ExprStmt | test.rs:274:26:274:26 | 2 |  |
+| test.rs:274:26:274:26 | 2 | test.rs:274:13:274:26 | BreakExpr |  |
+| test.rs:276:9:276:21 | PathExpr | test.rs:276:9:276:23 | CallExpr |  |
+| test.rs:276:9:276:23 | CallExpr | test.rs:277:9:277:9 | 3 |  |
+| test.rs:276:9:276:24 | ExprStmt | test.rs:276:9:276:21 | PathExpr |  |
+| test.rs:277:9:277:9 | 3 | test.rs:267:18:278:5 | BlockExpr |  |
+| test.rs:281:1:289:1 | enter labelled_block2 | test.rs:282:5:288:6 | LetStmt |  |
+| test.rs:281:1:289:1 | exit labelled_block2 (normal) | test.rs:281:1:289:1 | exit labelled_block2 |  |
+| test.rs:281:29:289:1 | BlockExpr | test.rs:281:1:289:1 | exit labelled_block2 (normal) |  |
+| test.rs:282:5:288:6 | LetStmt | test.rs:283:9:283:34 | LetStmt |  |
+| test.rs:282:9:282:14 | result | test.rs:281:29:289:1 | BlockExpr | match, no-match |
+| test.rs:282:18:288:5 | BlockExpr | test.rs:282:9:282:14 | result |  |
+| test.rs:283:9:283:34 | LetStmt | test.rs:283:30:283:33 | PathExpr |  |
+| test.rs:283:13:283:13 | x | test.rs:284:9:286:10 | LetStmt | match, no-match |
+| test.rs:283:30:283:33 | PathExpr | test.rs:283:13:283:13 | x |  |
+| test.rs:284:9:286:10 | LetStmt | test.rs:284:23:284:23 | x |  |
+| test.rs:284:13:284:19 | TupleStructPat | test.rs:285:13:285:27 | ExprStmt | no-match |
+| test.rs:284:13:284:19 | TupleStructPat | test.rs:287:9:287:9 | x | match |
+| test.rs:284:23:284:23 | x | test.rs:284:13:284:19 | TupleStructPat |  |
+| test.rs:285:13:285:26 | BreakExpr | test.rs:281:1:289:1 | exit labelled_block2 (normal) | break('block) |
+| test.rs:285:13:285:27 | ExprStmt | test.rs:285:26:285:26 | 1 |  |
+| test.rs:285:26:285:26 | 1 | test.rs:285:13:285:26 | BreakExpr |  |
+| test.rs:287:9:287:9 | x | test.rs:282:18:288:5 | BlockExpr |  |
diff --git a/rust/ql/test/library-tests/controlflow/test.rs b/rust/ql/test/library-tests/controlflow/test.rs
index dd1659ee997b..22d8b9f24a60 100644
--- a/rust/ql/test/library-tests/controlflow/test.rs
+++ b/rust/ql/test/library-tests/controlflow/test.rs
@@ -62,6 +62,15 @@ mod loop_expression {
         }
     }
 
+    fn test_while_let() {
+        let mut iter = 1..10;
+        while let Some(x) = iter.next() {
+            if (i = 5) {
+                break;
+            }
+        }
+    }
+
     fn test_for(j: i64) {
         for i in 0..10 {
             if (i == j) {
@@ -254,7 +263,7 @@ fn dead_code() -> i64 {
     return 1;
 }
 
-fn labelled_block() -> i64 {
+fn labelled_block1() -> i64 {
     let result = 'block: {
         do_thing();
         if condition_not_met() {
@@ -268,3 +277,13 @@ fn labelled_block() -> i64 {
         3
     };
 }
+
+fn labelled_block2() -> i64 {
+    let result = 'block: {
+        let x: Option<i64> = None;
+        let Some(y) = x else {
+            break 'block 1;
+        };
+        x
+    };
+}

From 071076875cf5a6f7e133f08fab6ed403ffbf3f64 Mon Sep 17 00:00:00 2001
From: Tom Hvitved <hvitved@github.com>
Date: Tue, 1 Oct 2024 15:02:00 +0200
Subject: [PATCH 103/347] Rust: Make more CFG nodes leaves

---
 .../internal/ControlFlowGraphImpl.qll         | 26 ++-----------------
 1 file changed, 2 insertions(+), 24 deletions(-)

diff --git a/rust/ql/lib/codeql/rust/controlflow/internal/ControlFlowGraphImpl.qll b/rust/ql/lib/codeql/rust/controlflow/internal/ControlFlowGraphImpl.qll
index 177651bf1ca8..62a58df2d1f0 100644
--- a/rust/ql/lib/codeql/rust/controlflow/internal/ControlFlowGraphImpl.qll
+++ b/rust/ql/lib/codeql/rust/controlflow/internal/ControlFlowGraphImpl.qll
@@ -230,6 +230,8 @@ class IndexExprTree extends StandardPostOrderTree instanceof IndexExpr {
   }
 }
 
+class ItemTree extends LeafTree, Item { }
+
 // `LetExpr` is a pre-order tree such that the pattern itself ends up
 // dominating successors in the graph in the same way that patterns do in
 // `match` expressions.
@@ -472,18 +474,6 @@ class ParenExprTree extends StandardPostOrderTree, ParenExpr {
 // This covers all patterns as they all extend `Pat`
 class PatExprTree extends LeafTree instanceof Pat { }
 
-class PathTree extends StandardPostOrderTree, Path {
-  override AstNode getChildNode(int i) {
-    i = 0 and result = this.getQualifier()
-    or
-    i = 1 and result = this.getPart()
-  }
-}
-
-class PathSegmentTree extends StandardPostOrderTree, PathSegment {
-  override AstNode getChildNode(int i) { i = 0 and result = this.getNameRef() }
-}
-
 class PathExprTree extends LeafTree instanceof PathExpr { }
 
 class PrefixExprTree extends StandardPostOrderTree instanceof PrefixExpr {
@@ -522,14 +512,6 @@ class ReturnExprTree extends PostOrderTree instanceof ReturnExpr {
   }
 }
 
-class StaticTree extends StandardPostOrderTree, Static {
-  override AstNode getChildNode(int i) {
-    i = 0 and result = this.getName()
-    or
-    i = 1 and result = this.getBody()
-  }
-}
-
 class TupleExprTree extends StandardPostOrderTree instanceof TupleExpr {
   override AstNode getChildNode(int i) { result = super.getField(i) }
 }
@@ -538,10 +520,6 @@ class TypeRefTree extends LeafTree instanceof TypeRef { }
 
 class UnderscoreExprTree extends LeafTree instanceof UnderscoreExpr { }
 
-class UseTree_ extends StandardPreOrderTree, Use {
-  override AstNode getChildNode(int i) { i = 0 and result = this.getUseTree().getPath() }
-}
-
 // NOTE: `yield` is a reserved but unused keyword.
 class YieldExprTree extends StandardPostOrderTree instanceof YieldExpr {
   override AstNode getChildNode(int i) { i = 0 and result = super.getExpr() }

From 85957767c99b5c78900886f6be95b11af650b9a0 Mon Sep 17 00:00:00 2001
From: Tom Hvitved <hvitved@github.com>
Date: Tue, 1 Oct 2024 15:07:35 +0200
Subject: [PATCH 104/347] Rust: Fix CFG for `while let` loops

---
 .../controlflow/internal/ControlFlowGraphImpl.qll  | 12 +++++++++---
 .../ql/test/library-tests/controlflow/Cfg.expected | 14 ++++++++++++++
 2 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/rust/ql/lib/codeql/rust/controlflow/internal/ControlFlowGraphImpl.qll b/rust/ql/lib/codeql/rust/controlflow/internal/ControlFlowGraphImpl.qll
index 62a58df2d1f0..c32e828a5584 100644
--- a/rust/ql/lib/codeql/rust/controlflow/internal/ControlFlowGraphImpl.qll
+++ b/rust/ql/lib/codeql/rust/controlflow/internal/ControlFlowGraphImpl.qll
@@ -193,7 +193,7 @@ class IfExprTree extends PostOrderTree instanceof IfExpr {
     child = [super.getCondition(), super.getThen(), super.getElse()]
   }
 
-  ConditionalCompletion conditionCompletion(Completion c) {
+  private ConditionalCompletion conditionCompletion(Completion c) {
     if super.getCondition() instanceof LetExpr
     then result = c.(MatchCompletion)
     else result = c.(BooleanCompletion)
@@ -345,15 +345,21 @@ class WhileExprTree extends LoopingExprTree instanceof WhileExpr {
 
   override predicate first(AstNode node) { first(super.getCondition(), node) }
 
+  private ConditionalCompletion conditionCompletion(Completion c) {
+    if super.getCondition() instanceof LetExpr
+    then result = c.(MatchCompletion)
+    else result = c.(BooleanCompletion)
+  }
+
   override predicate succ(AstNode pred, AstNode succ, Completion c) {
     super.succ(pred, succ, c)
     or
     last(super.getCondition(), pred, c) and
-    c.(BooleanCompletion).succeeded() and
+    this.conditionCompletion(c).succeeded() and
     first(this.getLoopBody(), succ)
     or
     last(super.getCondition(), pred, c) and
-    c.(BooleanCompletion).failed() and
+    this.conditionCompletion(c).failed() and
     succ = this
   }
 
diff --git a/rust/ql/test/library-tests/controlflow/Cfg.expected b/rust/ql/test/library-tests/controlflow/Cfg.expected
index d5097158874d..c04e7e20be2f 100644
--- a/rust/ql/test/library-tests/controlflow/Cfg.expected
+++ b/rust/ql/test/library-tests/controlflow/Cfg.expected
@@ -123,12 +123,26 @@
 | test.rs:61:13:61:22 | ExprStmt | test.rs:61:13:61:13 | PathExpr |  |
 | test.rs:61:17:61:21 | false | test.rs:61:13:61:21 | ... = ... |  |
 | test.rs:65:5:72:5 | enter test_while_let | test.rs:66:9:66:29 | LetStmt |  |
+| test.rs:65:5:72:5 | exit test_while_let (normal) | test.rs:65:5:72:5 | exit test_while_let |  |
+| test.rs:65:25:72:5 | BlockExpr | test.rs:65:5:72:5 | exit test_while_let (normal) |  |
 | test.rs:66:9:66:29 | LetStmt | test.rs:66:24:66:24 | 1 |  |
 | test.rs:66:13:66:20 | iter | test.rs:67:15:67:39 | LetExpr | match, no-match |
 | test.rs:66:24:66:24 | 1 | test.rs:66:27:66:28 | 10 |  |
 | test.rs:66:24:66:28 | RangeExpr | test.rs:66:13:66:20 | iter |  |
 | test.rs:66:27:66:28 | 10 | test.rs:66:24:66:28 | RangeExpr |  |
+| test.rs:67:9:71:9 | WhileExpr | test.rs:65:25:72:5 | BlockExpr |  |
 | test.rs:67:15:67:39 | LetExpr | test.rs:67:19:67:25 | TupleStructPat |  |
+| test.rs:67:19:67:25 | TupleStructPat | test.rs:67:9:71:9 | WhileExpr | no-match |
+| test.rs:67:19:67:25 | TupleStructPat | test.rs:68:17:68:17 | PathExpr | match |
+| test.rs:67:41:71:9 | BlockExpr | test.rs:67:15:67:39 | LetExpr |  |
+| test.rs:68:13:70:13 | IfExpr | test.rs:67:41:71:9 | BlockExpr |  |
+| test.rs:68:16:68:22 | ParenExpr | test.rs:68:13:70:13 | IfExpr | false |
+| test.rs:68:16:68:22 | ParenExpr | test.rs:69:17:69:22 | ExprStmt | true |
+| test.rs:68:17:68:17 | PathExpr | test.rs:68:21:68:21 | 5 |  |
+| test.rs:68:17:68:21 | ... = ... | test.rs:68:16:68:22 | ParenExpr |  |
+| test.rs:68:21:68:21 | 5 | test.rs:68:17:68:21 | ... = ... |  |
+| test.rs:69:17:69:21 | BreakExpr | test.rs:67:9:71:9 | WhileExpr | break |
+| test.rs:69:17:69:22 | ExprStmt | test.rs:69:17:69:21 | BreakExpr |  |
 | test.rs:74:5:81:5 | enter test_for | test.rs:75:18:75:18 | 0 |  |
 | test.rs:74:5:81:5 | exit test_for (normal) | test.rs:74:5:81:5 | exit test_for |  |
 | test.rs:74:25:81:5 | BlockExpr | test.rs:74:5:81:5 | exit test_for (normal) |  |

From e8cb3490e6aac54fe2da5a7de908399b34aca237 Mon Sep 17 00:00:00 2001
From: Tom Hvitved <hvitved@github.com>
Date: Tue, 1 Oct 2024 20:21:49 +0200
Subject: [PATCH 105/347] Rust: Refine `deadEnd` consistency check

---
 rust/ql/consistency-queries/CfgConsistency.ql | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/rust/ql/consistency-queries/CfgConsistency.ql b/rust/ql/consistency-queries/CfgConsistency.ql
index 52b44170a397..68e0e82076eb 100644
--- a/rust/ql/consistency-queries/CfgConsistency.ql
+++ b/rust/ql/consistency-queries/CfgConsistency.ql
@@ -26,8 +26,13 @@ query predicate scopeNoFirst(CfgScope scope) {
   not scope = any(ClosureExpr c | not exists(c.getBody()))
 }
 
+/** Holds if  `be` is the `else` branch of a `let` statement that results in a panic. */
+private predicate letElsePanic(BlockExpr be) {
+  be = any(LetStmt let).getLetElse().getBlockExpr() and
+  exists(Completion c | CfgImpl::last(be, _, c) | completionIsNormal(c))
+}
+
 query predicate deadEnd(CfgImpl::Node node) {
   Consistency::deadEnd(node) and
-  // `else` blocks in `let` statements diverge, so they are by definition dead ends
-  not node.getAstNode() = any(LetStmt let).getLetElse().getBlockExpr()
+  not letElsePanic(node.getAstNode())
 }

From 8b66dc16adbb77b62bfa9d5cfe2a47a7e639ac12 Mon Sep 17 00:00:00 2001
From: Tom Hvitved <hvitved@github.com>
Date: Tue, 1 Oct 2024 20:47:42 +0200
Subject: [PATCH 106/347] Rust: Fix CFG for labelled block expressions

---
 .../internal/ControlFlowGraphImpl.qll         | 30 +++++++++++++++++--
 .../library-tests/controlflow/Cfg.expected    | 17 ++++++++---
 2 files changed, 41 insertions(+), 6 deletions(-)

diff --git a/rust/ql/lib/codeql/rust/controlflow/internal/ControlFlowGraphImpl.qll b/rust/ql/lib/codeql/rust/controlflow/internal/ControlFlowGraphImpl.qll
index c32e828a5584..89d6750f1e28 100644
--- a/rust/ql/lib/codeql/rust/controlflow/internal/ControlFlowGraphImpl.qll
+++ b/rust/ql/lib/codeql/rust/controlflow/internal/ControlFlowGraphImpl.qll
@@ -136,7 +136,7 @@ class LogicalAndBinaryOpExprTree extends PreOrderTree, LogicalAndExpr {
   }
 }
 
-class BlockExprBaseTree extends StandardPostOrderTree instanceof BlockExpr {
+class BlockExprTree extends StandardPostOrderTree, BlockExpr {
   override AstNode getChildNode(int i) {
     result = super.getStmtList().getStatement(i)
     or
@@ -144,6 +144,32 @@ class BlockExprBaseTree extends StandardPostOrderTree instanceof BlockExpr {
     (exists(super.getStmtList().getStatement(i - 1)) or i = 0) and
     result = super.getStmtList().getTailExpr()
   }
+
+  override predicate propagatesAbnormal(AstNode child) { none() }
+
+  /** Holds if this block captures the break completion `c`. */
+  private predicate capturesBreakCompletion(LoopJumpCompletion c) {
+    c.isBreak() and
+    c.getLabelName() = this.getLabel().getLifetime().getText()
+  }
+
+  override predicate succ(AstNode pred, AstNode succ, Completion c) {
+    super.succ(pred, succ, c)
+    or
+    // Edge for exiting the block with a break expressions
+    last(this.getChildNode(_), pred, c) and
+    this.capturesBreakCompletion(c) and
+    succ = this
+  }
+
+  override predicate last(AstNode last, Completion c) {
+    super.last(last, c)
+    or
+    // Any abnormal completions that this block does not capture should propagate
+    last(this.getChildNode(_), last, c) and
+    not completionIsNormal(c) and
+    not this.capturesBreakCompletion(c)
+  }
 }
 
 class BreakExprTree extends PostOrderTree instanceof BreakExpr {
@@ -293,7 +319,7 @@ abstract class LoopingExprTree extends PostOrderTree {
   abstract predicate entry(AstNode node);
 
   /** Holds if this loop captures the `c` completion. */
-  predicate capturesLoopJumpCompletion(LoopJumpCompletion c) {
+  private predicate capturesLoopJumpCompletion(LoopJumpCompletion c) {
     not c.hasLabel()
     or
     c.getLabelName() = this.getLabel().getLifetime().getText()
diff --git a/rust/ql/test/library-tests/controlflow/Cfg.expected b/rust/ql/test/library-tests/controlflow/Cfg.expected
index c04e7e20be2f..e9e0addf52be 100644
--- a/rust/ql/test/library-tests/controlflow/Cfg.expected
+++ b/rust/ql/test/library-tests/controlflow/Cfg.expected
@@ -343,11 +343,20 @@
 | test.rs:175:13:175:13 | 0 | test.rs:174:16:176:9 | BlockExpr |  |
 | test.rs:179:5:187:5 | enter test_labelled_block | test.rs:181:13:181:31 | ExprStmt |  |
 | test.rs:179:5:187:5 | exit test_labelled_block (normal) | test.rs:179:5:187:5 | exit test_labelled_block |  |
-| test.rs:181:13:181:30 | BreakExpr | test.rs:179:5:187:5 | exit test_labelled_block (normal) | break('block) |
+| test.rs:179:43:187:5 | BlockExpr | test.rs:179:5:187:5 | exit test_labelled_block (normal) |  |
+| test.rs:180:9:186:9 | IfExpr | test.rs:179:43:187:5 | BlockExpr |  |
+| test.rs:180:12:182:10 | ParenExpr | test.rs:183:13:183:13 | 1 | true |
+| test.rs:180:12:182:10 | ParenExpr | test.rs:185:13:185:13 | 0 | false |
+| test.rs:180:13:182:9 | BlockExpr | test.rs:180:12:182:10 | ParenExpr |  |
+| test.rs:181:13:181:30 | BreakExpr | test.rs:180:13:182:9 | BlockExpr | break('block) |
 | test.rs:181:13:181:31 | ExprStmt | test.rs:181:26:181:26 | a |  |
 | test.rs:181:26:181:26 | a | test.rs:181:30:181:30 | 0 |  |
 | test.rs:181:26:181:30 | ... > ... | test.rs:181:13:181:30 | BreakExpr |  |
 | test.rs:181:30:181:30 | 0 | test.rs:181:26:181:30 | ... > ... |  |
+| test.rs:182:12:184:9 | BlockExpr | test.rs:180:9:186:9 | IfExpr |  |
+| test.rs:183:13:183:13 | 1 | test.rs:182:12:184:9 | BlockExpr |  |
+| test.rs:184:16:186:9 | BlockExpr | test.rs:180:9:186:9 | IfExpr |  |
+| test.rs:185:13:185:13 | 0 | test.rs:184:16:186:9 | BlockExpr |  |
 | test.rs:192:5:195:5 | enter test_and_operator | test.rs:193:9:193:28 | LetStmt |  |
 | test.rs:192:5:195:5 | exit test_and_operator (normal) | test.rs:192:5:195:5 | exit test_and_operator |  |
 | test.rs:192:61:195:5 | BlockExpr | test.rs:192:5:195:5 | exit test_and_operator (normal) |  |
@@ -495,7 +504,7 @@
 | test.rs:269:12:269:28 | PathExpr | test.rs:269:12:269:30 | CallExpr |  |
 | test.rs:269:12:269:30 | CallExpr | test.rs:269:9:271:9 | IfExpr | false |
 | test.rs:269:12:269:30 | CallExpr | test.rs:270:13:270:27 | ExprStmt | true |
-| test.rs:270:13:270:26 | BreakExpr | test.rs:266:1:279:1 | exit labelled_block1 (normal) | break('block) |
+| test.rs:270:13:270:26 | BreakExpr | test.rs:267:18:278:5 | BlockExpr | break('block) |
 | test.rs:270:13:270:27 | ExprStmt | test.rs:270:26:270:26 | 1 |  |
 | test.rs:270:26:270:26 | 1 | test.rs:270:13:270:26 | BreakExpr |  |
 | test.rs:272:9:272:21 | PathExpr | test.rs:272:9:272:23 | CallExpr |  |
@@ -506,7 +515,7 @@
 | test.rs:273:12:273:28 | PathExpr | test.rs:273:12:273:30 | CallExpr |  |
 | test.rs:273:12:273:30 | CallExpr | test.rs:273:9:275:9 | IfExpr | false |
 | test.rs:273:12:273:30 | CallExpr | test.rs:274:13:274:27 | ExprStmt | true |
-| test.rs:274:13:274:26 | BreakExpr | test.rs:266:1:279:1 | exit labelled_block1 (normal) | break('block) |
+| test.rs:274:13:274:26 | BreakExpr | test.rs:267:18:278:5 | BlockExpr | break('block) |
 | test.rs:274:13:274:27 | ExprStmt | test.rs:274:26:274:26 | 2 |  |
 | test.rs:274:26:274:26 | 2 | test.rs:274:13:274:26 | BreakExpr |  |
 | test.rs:276:9:276:21 | PathExpr | test.rs:276:9:276:23 | CallExpr |  |
@@ -526,7 +535,7 @@
 | test.rs:284:13:284:19 | TupleStructPat | test.rs:285:13:285:27 | ExprStmt | no-match |
 | test.rs:284:13:284:19 | TupleStructPat | test.rs:287:9:287:9 | x | match |
 | test.rs:284:23:284:23 | x | test.rs:284:13:284:19 | TupleStructPat |  |
-| test.rs:285:13:285:26 | BreakExpr | test.rs:281:1:289:1 | exit labelled_block2 (normal) | break('block) |
+| test.rs:285:13:285:26 | BreakExpr | test.rs:282:18:288:5 | BlockExpr | break('block) |
 | test.rs:285:13:285:27 | ExprStmt | test.rs:285:26:285:26 | 1 |  |
 | test.rs:285:26:285:26 | 1 | test.rs:285:13:285:26 | BreakExpr |  |
 | test.rs:287:9:287:9 | x | test.rs:282:18:288:5 | BlockExpr |  |

From c4eafb2cf3c91f8bac9e7059c01a2b0fda961f94 Mon Sep 17 00:00:00 2001
From: Tom Hvitved <hvitved@github.com>
Date: Tue, 1 Oct 2024 21:13:38 +0200
Subject: [PATCH 107/347] Rust: Skip `ParenExpr`s in the CFG

---
 rust/ql/consistency-queries/CfgConsistency.ql |  1 +
 .../rust/controlflow/internal/Completion.qll  |  2 +
 .../internal/ControlFlowGraphImpl.qll         | 14 ++++-
 .../library-tests/controlflow/Cfg.expected    | 56 ++++++++-----------
 4 files changed, 38 insertions(+), 35 deletions(-)

diff --git a/rust/ql/consistency-queries/CfgConsistency.ql b/rust/ql/consistency-queries/CfgConsistency.ql
index 68e0e82076eb..6964b7bbcb18 100644
--- a/rust/ql/consistency-queries/CfgConsistency.ql
+++ b/rust/ql/consistency-queries/CfgConsistency.ql
@@ -11,6 +11,7 @@ import codeql.rust.controlflow.internal.Completion
 query predicate nonPostOrderExpr(Expr e, string cls) {
   cls = e.getPrimaryQlClasses() and
   not e instanceof LetExpr and
+  not e instanceof ParenExpr and
   not e instanceof LogicalAndExpr and // todo
   not e instanceof LogicalOrExpr and
   exists(AstNode last, Completion c |
diff --git a/rust/ql/lib/codeql/rust/controlflow/internal/Completion.qll b/rust/ql/lib/codeql/rust/controlflow/internal/Completion.qll
index facb3849f71f..4034db5fe288 100644
--- a/rust/ql/lib/codeql/rust/controlflow/internal/Completion.qll
+++ b/rust/ql/lib/codeql/rust/controlflow/internal/Completion.qll
@@ -94,6 +94,8 @@ class BooleanCompletion extends ConditionalCompletion, TBooleanCompletion {
     )
     or
     exists(Expr parent | this.isValidForSpecific0(parent) |
+      e = parent.(ParenExpr).getExpr()
+      or
       parent =
         any(PrefixExpr expr |
           expr.getOperatorName() = "!" and
diff --git a/rust/ql/lib/codeql/rust/controlflow/internal/ControlFlowGraphImpl.qll b/rust/ql/lib/codeql/rust/controlflow/internal/ControlFlowGraphImpl.qll
index 89d6750f1e28..236d848c70e4 100644
--- a/rust/ql/lib/codeql/rust/controlflow/internal/ControlFlowGraphImpl.qll
+++ b/rust/ql/lib/codeql/rust/controlflow/internal/ControlFlowGraphImpl.qll
@@ -499,8 +499,18 @@ class NameRefTree extends LeafTree, NameRef { }
 
 class OffsetOfExprTree extends LeafTree instanceof OffsetOfExpr { }
 
-class ParenExprTree extends StandardPostOrderTree, ParenExpr {
-  override AstNode getChildNode(int i) { i = 0 and result = super.getExpr() }
+class ParenExprTree extends ControlFlowTree, ParenExpr {
+  private ControlFlowTree expr;
+
+  ParenExprTree() { expr = super.getExpr() }
+
+  override predicate propagatesAbnormal(AstNode child) { expr.propagatesAbnormal(child) }
+
+  override predicate first(AstNode first) { expr.first(first) }
+
+  override predicate last(AstNode last, Completion c) { expr.last(last, c) }
+
+  override predicate succ(AstNode pred, AstNode succ, Completion c) { none() }
 }
 
 // This covers all patterns as they all extend `Pat`
diff --git a/rust/ql/test/library-tests/controlflow/Cfg.expected b/rust/ql/test/library-tests/controlflow/Cfg.expected
index e9e0addf52be..aff1576a8294 100644
--- a/rust/ql/test/library-tests/controlflow/Cfg.expected
+++ b/rust/ql/test/library-tests/controlflow/Cfg.expected
@@ -111,10 +111,9 @@
 | test.rs:57:13:57:14 | ExprStmt | test.rs:57:13:57:13 | 1 |  |
 | test.rs:58:13:60:13 | ExprStmt | test.rs:58:17:58:17 | i |  |
 | test.rs:58:13:60:13 | IfExpr | test.rs:61:13:61:22 | ExprStmt |  |
-| test.rs:58:16:58:22 | ParenExpr | test.rs:58:13:60:13 | IfExpr | false |
-| test.rs:58:16:58:22 | ParenExpr | test.rs:59:17:59:22 | ExprStmt | true |
 | test.rs:58:17:58:17 | i | test.rs:58:21:58:21 | 0 |  |
-| test.rs:58:17:58:21 | ... > ... | test.rs:58:16:58:22 | ParenExpr |  |
+| test.rs:58:17:58:21 | ... > ... | test.rs:58:13:60:13 | IfExpr | false |
+| test.rs:58:17:58:21 | ... > ... | test.rs:59:17:59:22 | ExprStmt | true |
 | test.rs:58:21:58:21 | 0 | test.rs:58:17:58:21 | ... > ... |  |
 | test.rs:59:17:59:21 | BreakExpr | test.rs:56:9:62:9 | WhileExpr | break |
 | test.rs:59:17:59:22 | ExprStmt | test.rs:59:17:59:21 | BreakExpr |  |
@@ -136,10 +135,9 @@
 | test.rs:67:19:67:25 | TupleStructPat | test.rs:68:17:68:17 | PathExpr | match |
 | test.rs:67:41:71:9 | BlockExpr | test.rs:67:15:67:39 | LetExpr |  |
 | test.rs:68:13:70:13 | IfExpr | test.rs:67:41:71:9 | BlockExpr |  |
-| test.rs:68:16:68:22 | ParenExpr | test.rs:68:13:70:13 | IfExpr | false |
-| test.rs:68:16:68:22 | ParenExpr | test.rs:69:17:69:22 | ExprStmt | true |
 | test.rs:68:17:68:17 | PathExpr | test.rs:68:21:68:21 | 5 |  |
-| test.rs:68:17:68:21 | ... = ... | test.rs:68:16:68:22 | ParenExpr |  |
+| test.rs:68:17:68:21 | ... = ... | test.rs:68:13:70:13 | IfExpr | false |
+| test.rs:68:17:68:21 | ... = ... | test.rs:69:17:69:22 | ExprStmt | true |
 | test.rs:68:21:68:21 | 5 | test.rs:68:17:68:21 | ... = ... |  |
 | test.rs:69:17:69:21 | BreakExpr | test.rs:67:9:71:9 | WhileExpr | break |
 | test.rs:69:17:69:22 | ExprStmt | test.rs:69:17:69:21 | BreakExpr |  |
@@ -155,10 +153,9 @@
 | test.rs:75:24:80:9 | BlockExpr | test.rs:75:13:75:13 | i |  |
 | test.rs:76:13:78:13 | ExprStmt | test.rs:76:17:76:17 | i |  |
 | test.rs:76:13:78:13 | IfExpr | test.rs:79:13:79:14 | ExprStmt |  |
-| test.rs:76:16:76:23 | ParenExpr | test.rs:76:13:78:13 | IfExpr | false |
-| test.rs:76:16:76:23 | ParenExpr | test.rs:77:17:77:22 | ExprStmt | true |
 | test.rs:76:17:76:17 | i | test.rs:76:22:76:22 | j |  |
-| test.rs:76:17:76:22 | ... == ... | test.rs:76:16:76:23 | ParenExpr |  |
+| test.rs:76:17:76:22 | ... == ... | test.rs:76:13:78:13 | IfExpr | false |
+| test.rs:76:17:76:22 | ... == ... | test.rs:77:17:77:22 | ExprStmt | true |
 | test.rs:76:22:76:22 | j | test.rs:76:17:76:22 | ... == ... |  |
 | test.rs:77:17:77:21 | BreakExpr | test.rs:75:9:80:9 | ForExpr | break |
 | test.rs:77:17:77:22 | ExprStmt | test.rs:77:17:77:21 | BreakExpr |  |
@@ -220,21 +217,20 @@
 | test.rs:114:5:120:5 | exit test_nested_if (normal) | test.rs:114:5:120:5 | exit test_nested_if |  |
 | test.rs:114:38:120:5 | BlockExpr | test.rs:114:5:120:5 | exit test_nested_if (normal) |  |
 | test.rs:115:9:119:9 | IfExpr | test.rs:114:38:120:5 | BlockExpr |  |
-| test.rs:115:12:115:49 | ParenExpr | test.rs:116:13:116:13 | 1 | true |
-| test.rs:115:12:115:49 | ParenExpr | test.rs:118:13:118:13 | 0 | false |
-| test.rs:115:13:115:48 | IfExpr | test.rs:115:12:115:49 | ParenExpr |  |
+| test.rs:115:13:115:48 | IfExpr | test.rs:116:13:116:13 | 1 | true |
+| test.rs:115:13:115:48 | IfExpr | test.rs:118:13:118:13 | 0 | false |
 | test.rs:115:16:115:16 | PathExpr | test.rs:115:20:115:20 | 0 |  |
 | test.rs:115:16:115:20 | ... < ... | test.rs:115:24:115:24 | a | true |
 | test.rs:115:16:115:20 | ... < ... | test.rs:115:41:115:41 | a | false |
 | test.rs:115:20:115:20 | 0 | test.rs:115:16:115:20 | ... < ... |  |
-| test.rs:115:22:115:32 | BlockExpr | test.rs:115:13:115:48 | IfExpr |  |
+| test.rs:115:22:115:32 | BlockExpr | test.rs:115:13:115:48 | IfExpr | false, true |
 | test.rs:115:24:115:24 | a | test.rs:115:29:115:30 | 10 |  |
-| test.rs:115:24:115:30 | ... < ... | test.rs:115:22:115:32 | BlockExpr |  |
+| test.rs:115:24:115:30 | ... < ... | test.rs:115:22:115:32 | BlockExpr | false, true |
 | test.rs:115:28:115:30 | - ... | test.rs:115:24:115:30 | ... < ... |  |
 | test.rs:115:29:115:30 | 10 | test.rs:115:28:115:30 | - ... |  |
-| test.rs:115:39:115:48 | BlockExpr | test.rs:115:13:115:48 | IfExpr |  |
+| test.rs:115:39:115:48 | BlockExpr | test.rs:115:13:115:48 | IfExpr | false, true |
 | test.rs:115:41:115:41 | a | test.rs:115:45:115:46 | 10 |  |
-| test.rs:115:41:115:46 | ... > ... | test.rs:115:39:115:48 | BlockExpr |  |
+| test.rs:115:41:115:46 | ... > ... | test.rs:115:39:115:48 | BlockExpr | false, true |
 | test.rs:115:45:115:46 | 10 | test.rs:115:41:115:46 | ... > ... |  |
 | test.rs:115:51:117:9 | BlockExpr | test.rs:115:9:119:9 | IfExpr |  |
 | test.rs:116:13:116:13 | 1 | test.rs:115:51:117:9 | BlockExpr |  |
@@ -244,9 +240,8 @@
 | test.rs:122:5:131:5 | exit test_nested_if_match (normal) | test.rs:122:5:131:5 | exit test_nested_if_match |  |
 | test.rs:122:44:131:5 | BlockExpr | test.rs:122:5:131:5 | exit test_nested_if_match (normal) |  |
 | test.rs:123:9:130:9 | IfExpr | test.rs:122:44:131:5 | BlockExpr |  |
-| test.rs:123:12:126:10 | ParenExpr | test.rs:127:13:127:13 | 1 | true |
-| test.rs:123:12:126:10 | ParenExpr | test.rs:129:13:129:13 | 0 | false |
-| test.rs:123:13:126:9 | MatchExpr | test.rs:123:12:126:10 | ParenExpr |  |
+| test.rs:123:13:126:9 | MatchExpr | test.rs:127:13:127:13 | 1 | true |
+| test.rs:123:13:126:9 | MatchExpr | test.rs:129:13:129:13 | 0 | false |
 | test.rs:123:19:123:19 | a | test.rs:124:13:124:13 | LiteralPat |  |
 | test.rs:124:13:124:13 | LiteralPat | test.rs:124:18:124:21 | true | match |
 | test.rs:124:13:124:13 | LiteralPat | test.rs:125:13:125:13 | WildcardPat | no-match |
@@ -291,9 +286,8 @@
 | test.rs:153:5:164:5 | exit test_if_loop1 (normal) | test.rs:153:5:164:5 | exit test_if_loop1 |  |
 | test.rs:153:37:164:5 | BlockExpr | test.rs:153:5:164:5 | exit test_if_loop1 (normal) |  |
 | test.rs:154:9:163:9 | IfExpr | test.rs:153:37:164:5 | BlockExpr |  |
-| test.rs:154:12:159:10 | ParenExpr | test.rs:160:13:160:13 | 1 | true |
-| test.rs:154:12:159:10 | ParenExpr | test.rs:162:13:162:13 | 0 | false |
-| test.rs:154:13:159:9 | LoopExpr | test.rs:154:12:159:10 | ParenExpr |  |
+| test.rs:154:13:159:9 | LoopExpr | test.rs:160:13:160:13 | 1 | true |
+| test.rs:154:13:159:9 | LoopExpr | test.rs:162:13:162:13 | 0 | false |
 | test.rs:154:18:159:9 | BlockExpr | test.rs:155:13:157:14 | ExprStmt |  |
 | test.rs:155:13:157:13 | IfExpr | test.rs:158:13:158:19 | ExprStmt |  |
 | test.rs:155:13:157:14 | ExprStmt | test.rs:155:16:155:16 | a |  |
@@ -318,9 +312,8 @@
 | test.rs:166:5:177:5 | exit test_if_loop2 (normal) | test.rs:166:5:177:5 | exit test_if_loop2 |  |
 | test.rs:166:37:177:5 | BlockExpr | test.rs:166:5:177:5 | exit test_if_loop2 (normal) |  |
 | test.rs:167:9:176:9 | IfExpr | test.rs:166:37:177:5 | BlockExpr |  |
-| test.rs:167:12:172:10 | ParenExpr | test.rs:173:13:173:13 | 1 | true |
-| test.rs:167:12:172:10 | ParenExpr | test.rs:175:13:175:13 | 0 | false |
-| test.rs:167:13:172:9 | LoopExpr | test.rs:167:12:172:10 | ParenExpr |  |
+| test.rs:167:13:172:9 | LoopExpr | test.rs:173:13:173:13 | 1 | true |
+| test.rs:167:13:172:9 | LoopExpr | test.rs:175:13:175:13 | 0 | false |
 | test.rs:167:26:172:9 | BlockExpr | test.rs:168:13:170:14 | ExprStmt |  |
 | test.rs:168:13:170:13 | IfExpr | test.rs:171:13:171:19 | ExprStmt |  |
 | test.rs:168:13:170:14 | ExprStmt | test.rs:168:16:168:16 | a |  |
@@ -345,9 +338,8 @@
 | test.rs:179:5:187:5 | exit test_labelled_block (normal) | test.rs:179:5:187:5 | exit test_labelled_block |  |
 | test.rs:179:43:187:5 | BlockExpr | test.rs:179:5:187:5 | exit test_labelled_block (normal) |  |
 | test.rs:180:9:186:9 | IfExpr | test.rs:179:43:187:5 | BlockExpr |  |
-| test.rs:180:12:182:10 | ParenExpr | test.rs:183:13:183:13 | 1 | true |
-| test.rs:180:12:182:10 | ParenExpr | test.rs:185:13:185:13 | 0 | false |
-| test.rs:180:13:182:9 | BlockExpr | test.rs:180:12:182:10 | ParenExpr |  |
+| test.rs:180:13:182:9 | BlockExpr | test.rs:183:13:183:13 | 1 | true |
+| test.rs:180:13:182:9 | BlockExpr | test.rs:185:13:185:13 | 0 | false |
 | test.rs:181:13:181:30 | BreakExpr | test.rs:180:13:182:9 | BlockExpr | break('block) |
 | test.rs:181:13:181:31 | ExprStmt | test.rs:181:26:181:26 | a |  |
 | test.rs:181:26:181:26 | a | test.rs:181:30:181:30 | 0 |  |
@@ -392,10 +384,9 @@
 | test.rs:203:17:203:17 | a | test.rs:203:23:203:23 | b | false |
 | test.rs:203:17:203:30 | ... \|\| ... | test.rs:203:17:203:17 | a |  |
 | test.rs:203:17:203:35 | ... \|\| ... | test.rs:203:17:203:30 | ... \|\| ... |  |
-| test.rs:203:22:203:30 | ParenExpr | test.rs:203:13:203:13 | d | true |
-| test.rs:203:22:203:30 | ParenExpr | test.rs:203:35:203:35 | c | false |
 | test.rs:203:23:203:23 | b | test.rs:203:28:203:29 | 28 |  |
-| test.rs:203:23:203:29 | ... == ... | test.rs:203:22:203:30 | ParenExpr |  |
+| test.rs:203:23:203:29 | ... == ... | test.rs:203:13:203:13 | d | true |
+| test.rs:203:23:203:29 | ... == ... | test.rs:203:35:203:35 | c | false |
 | test.rs:203:28:203:29 | 28 | test.rs:203:23:203:29 | ... == ... |  |
 | test.rs:203:35:203:35 | c | test.rs:203:13:203:13 | d |  |
 | test.rs:204:9:204:9 | d | test.rs:202:61:205:5 | BlockExpr |  |
@@ -485,8 +476,7 @@
 | test.rs:259:1:264:1 | enter dead_code | test.rs:260:5:262:5 | ExprStmt |  |
 | test.rs:259:1:264:1 | exit dead_code (normal) | test.rs:259:1:264:1 | exit dead_code |  |
 | test.rs:260:5:262:5 | ExprStmt | test.rs:260:9:260:12 | true |  |
-| test.rs:260:8:260:13 | ParenExpr | test.rs:261:9:261:17 | ExprStmt | true |
-| test.rs:260:9:260:12 | true | test.rs:260:8:260:13 | ParenExpr |  |
+| test.rs:260:9:260:12 | true | test.rs:261:9:261:17 | ExprStmt | true |
 | test.rs:261:9:261:16 | ReturnExpr | test.rs:259:1:264:1 | exit dead_code (normal) | return |
 | test.rs:261:9:261:17 | ExprStmt | test.rs:261:16:261:16 | 0 |  |
 | test.rs:261:16:261:16 | 0 | test.rs:261:9:261:16 | ReturnExpr |  |

From 8f0b7f0969fd9d0f1cdd2811fdc807d4e3283e7f Mon Sep 17 00:00:00 2001
From: Tom Hvitved <hvitved@github.com>
Date: Tue, 1 Oct 2024 21:27:36 +0200
Subject: [PATCH 108/347] Rust: Use `propagatesAbnormal` in two places

---
 .../internal/ControlFlowGraphImpl.qll          | 18 ++++--------------
 1 file changed, 4 insertions(+), 14 deletions(-)

diff --git a/rust/ql/lib/codeql/rust/controlflow/internal/ControlFlowGraphImpl.qll b/rust/ql/lib/codeql/rust/controlflow/internal/ControlFlowGraphImpl.qll
index 236d848c70e4..da156cd7767c 100644
--- a/rust/ql/lib/codeql/rust/controlflow/internal/ControlFlowGraphImpl.qll
+++ b/rust/ql/lib/codeql/rust/controlflow/internal/ControlFlowGraphImpl.qll
@@ -369,6 +369,8 @@ class WhileExprTree extends LoopingExprTree instanceof WhileExpr {
 
   override predicate entry(AstNode node) { this.first(node) }
 
+  override predicate propagatesAbnormal(AstNode child) { child = super.getCondition() }
+
   override predicate first(AstNode node) { first(super.getCondition(), node) }
 
   private ConditionalCompletion conditionCompletion(Completion c) {
@@ -388,13 +390,6 @@ class WhileExprTree extends LoopingExprTree instanceof WhileExpr {
     this.conditionCompletion(c).failed() and
     succ = this
   }
-
-  override predicate last(AstNode last, Completion c) {
-    super.last(last, c)
-    or
-    last(super.getCondition(), last, c) and
-    not completionIsNormal(c)
-  }
 }
 
 class ForExprTree extends LoopingExprTree instanceof ForExpr {
@@ -404,6 +399,8 @@ class ForExprTree extends LoopingExprTree instanceof ForExpr {
 
   override predicate entry(AstNode n) { first(super.getPat(), n) }
 
+  override predicate propagatesAbnormal(AstNode child) { child = super.getIterable() }
+
   override predicate first(AstNode node) { first(super.getIterable(), node) }
 
   override predicate succ(AstNode pred, AstNode succ, Completion c) {
@@ -421,13 +418,6 @@ class ForExprTree extends LoopingExprTree instanceof ForExpr {
     c.(MatchCompletion).failed() and
     succ = this
   }
-
-  override predicate last(AstNode last, Completion c) {
-    super.last(last, c)
-    or
-    last(super.getIterable(), last, c) and
-    not completionIsNormal(c)
-  }
 }
 
 // TODO: replace with expanded macro once the extractor supports it

From e18389718c87b60696db70c65b02cfb4a8526212 Mon Sep 17 00:00:00 2001
From: Ed Minnix <egregius313@github.com>
Date: Thu, 29 Aug 2024 13:34:55 -0400
Subject: [PATCH 109/347] Implement stdin models

Unfortunately due to how variable and varargs work, these are better
done in QL
---
 go/ql/lib/semmle/go/frameworks/stdlib/Fmt.qll |  9 ++++
 go/ql/lib/semmle/go/frameworks/stdlib/Os.qll  | 10 ++++
 .../dataflow/flowsources/local/stdin/go.mod   |  3 ++
 .../flowsources/local/stdin/source.ext.yml    |  7 +++
 .../flowsources/local/stdin/source.ql         | 19 ++++++++
 .../flowsources/local/stdin/test.expected     |  2 +
 .../flowsources/local/stdin/test.ext.yml      |  7 +++
 .../dataflow/flowsources/local/stdin/test.go  | 48 +++++++++++++++++++
 .../dataflow/flowsources/local/stdin/test.ql  | 15 ++++++
 9 files changed, 120 insertions(+)
 create mode 100644 go/ql/test/library-tests/semmle/go/dataflow/flowsources/local/stdin/go.mod
 create mode 100644 go/ql/test/library-tests/semmle/go/dataflow/flowsources/local/stdin/source.ext.yml
 create mode 100644 go/ql/test/library-tests/semmle/go/dataflow/flowsources/local/stdin/source.ql
 create mode 100644 go/ql/test/library-tests/semmle/go/dataflow/flowsources/local/stdin/test.expected
 create mode 100644 go/ql/test/library-tests/semmle/go/dataflow/flowsources/local/stdin/test.ext.yml
 create mode 100644 go/ql/test/library-tests/semmle/go/dataflow/flowsources/local/stdin/test.go
 create mode 100644 go/ql/test/library-tests/semmle/go/dataflow/flowsources/local/stdin/test.ql

diff --git a/go/ql/lib/semmle/go/frameworks/stdlib/Fmt.qll b/go/ql/lib/semmle/go/frameworks/stdlib/Fmt.qll
index 950b67483f00..54794ea21c9e 100644
--- a/go/ql/lib/semmle/go/frameworks/stdlib/Fmt.qll
+++ b/go/ql/lib/semmle/go/frameworks/stdlib/Fmt.qll
@@ -112,6 +112,15 @@ module Fmt {
     Scanner() { this.hasQualifiedName("fmt", ["Scan", "Scanf", "Scanln"]) }
   }
 
+  private class ScannerSource extends SourceNode {
+    ScannerSource() {
+      // All of the arguments which are sources are varargs.
+      this.asExpr() = any(Scanner s).getACall().getAnImplicitVarargsArgument().asExpr()
+    }
+
+    override string getThreatModel() { result = "stdin" }
+  }
+
   /**
    * The `Fscan` function or one of its variants,
    * all of which read from a specified `io.Reader`.
diff --git a/go/ql/lib/semmle/go/frameworks/stdlib/Os.qll b/go/ql/lib/semmle/go/frameworks/stdlib/Os.qll
index 72ea4cc6c573..3e443d942b16 100644
--- a/go/ql/lib/semmle/go/frameworks/stdlib/Os.qll
+++ b/go/ql/lib/semmle/go/frameworks/stdlib/Os.qll
@@ -43,4 +43,14 @@ module Os {
       input = inp and output = outp
     }
   }
+
+  private class Stdin extends SourceNode {
+    Stdin() {
+      exists(Variable osStdin | osStdin.hasQualifiedName("os", "Stdin") |
+        this.asExpr() = osStdin.getARead().asExpr()
+      )
+    }
+
+    override string getThreatModel() { result = "stdin" }
+  }
 }
diff --git a/go/ql/test/library-tests/semmle/go/dataflow/flowsources/local/stdin/go.mod b/go/ql/test/library-tests/semmle/go/dataflow/flowsources/local/stdin/go.mod
new file mode 100644
index 000000000000..2334541a2f0d
--- /dev/null
+++ b/go/ql/test/library-tests/semmle/go/dataflow/flowsources/local/stdin/go.mod
@@ -0,0 +1,3 @@
+module test
+
+go 1.22.6
diff --git a/go/ql/test/library-tests/semmle/go/dataflow/flowsources/local/stdin/source.ext.yml b/go/ql/test/library-tests/semmle/go/dataflow/flowsources/local/stdin/source.ext.yml
new file mode 100644
index 000000000000..92156e87f400
--- /dev/null
+++ b/go/ql/test/library-tests/semmle/go/dataflow/flowsources/local/stdin/source.ext.yml
@@ -0,0 +1,7 @@
+extensions:
+
+  - addsTo:
+      pack: codeql/threat-models
+      extensible: threatModelConfiguration
+    data:
+      - ["stdin", true, 0]
diff --git a/go/ql/test/library-tests/semmle/go/dataflow/flowsources/local/stdin/source.ql b/go/ql/test/library-tests/semmle/go/dataflow/flowsources/local/stdin/source.ql
new file mode 100644
index 000000000000..db6bbb1a2d16
--- /dev/null
+++ b/go/ql/test/library-tests/semmle/go/dataflow/flowsources/local/stdin/source.ql
@@ -0,0 +1,19 @@
+import go
+import ModelValidation
+import TestUtilities.InlineExpectationsTest
+
+module SourceTest implements TestSig {
+  string getARelevantTag() { result = "source" }
+
+  predicate hasActualResult(Location location, string element, string tag, string value) {
+    exists(ThreatModelFlowSource s |
+      s.hasLocationInfo(location.getFile().getAbsolutePath(), location.getStartLine(),
+        location.getStartColumn(), location.getEndLine(), location.getEndColumn()) and
+      element = s.toString() and
+      value = "" and
+      tag = "source"
+    )
+  }
+}
+
+import MakeTest<SourceTest>
diff --git a/go/ql/test/library-tests/semmle/go/dataflow/flowsources/local/stdin/test.expected b/go/ql/test/library-tests/semmle/go/dataflow/flowsources/local/stdin/test.expected
new file mode 100644
index 000000000000..55e9aed2e93c
--- /dev/null
+++ b/go/ql/test/library-tests/semmle/go/dataflow/flowsources/local/stdin/test.expected
@@ -0,0 +1,2 @@
+testFailures
+invalidModelRow
diff --git a/go/ql/test/library-tests/semmle/go/dataflow/flowsources/local/stdin/test.ext.yml b/go/ql/test/library-tests/semmle/go/dataflow/flowsources/local/stdin/test.ext.yml
new file mode 100644
index 000000000000..92156e87f400
--- /dev/null
+++ b/go/ql/test/library-tests/semmle/go/dataflow/flowsources/local/stdin/test.ext.yml
@@ -0,0 +1,7 @@
+extensions:
+
+  - addsTo:
+      pack: codeql/threat-models
+      extensible: threatModelConfiguration
+    data:
+      - ["stdin", true, 0]
diff --git a/go/ql/test/library-tests/semmle/go/dataflow/flowsources/local/stdin/test.go b/go/ql/test/library-tests/semmle/go/dataflow/flowsources/local/stdin/test.go
new file mode 100644
index 000000000000..4166dc4000b0
--- /dev/null
+++ b/go/ql/test/library-tests/semmle/go/dataflow/flowsources/local/stdin/test.go
@@ -0,0 +1,48 @@
+package test
+
+import (
+	"bufio"
+	"fmt"
+	"os"
+)
+
+func sink(string) {
+
+}
+
+func readStdinBuffer() {
+	buf := make([]byte, 1024)
+	n, err := os.Stdin.Read(buf) // $source
+	if err != nil {
+		return
+	}
+	sink(string(buf[:n])) // $hasTaintFlow="type conversion"
+}
+
+func readStdinBuffReader() {
+	buf := make([]byte, 1024)
+	r := bufio.NewReader(os.Stdin) // $source
+	n, err := r.Read(buf)
+	if err != nil {
+		return
+	}
+	sink(string(buf[:n])) // $hasTaintFlow="type conversion"
+}
+
+func scan() {
+	var username, email string
+	fmt.Scan(&username, &email) // $source
+	sink(username)              // $hasTaintFlow="username"
+}
+
+func scanf() {
+	var s string
+	fmt.Scanf("%s", &s) // $source
+	sink(s)             // $hasTaintFlow="s"
+}
+
+func scanl() {
+	var s string
+	fmt.Scanln(&s) // $source
+	sink(s)        // $hasTaintFlow="s"
+}
diff --git a/go/ql/test/library-tests/semmle/go/dataflow/flowsources/local/stdin/test.ql b/go/ql/test/library-tests/semmle/go/dataflow/flowsources/local/stdin/test.ql
new file mode 100644
index 000000000000..7c7f587de571
--- /dev/null
+++ b/go/ql/test/library-tests/semmle/go/dataflow/flowsources/local/stdin/test.ql
@@ -0,0 +1,15 @@
+import go
+import semmle.go.dataflow.ExternalFlow
+import ModelValidation
+import experimental.frameworks.CleverGo
+import TestUtilities.InlineFlowTest
+
+module Config implements DataFlow::ConfigSig {
+  predicate isSource(DataFlow::Node source) { source instanceof ThreatModelFlowSource }
+
+  predicate isSink(DataFlow::Node sink) {
+    sink.asExpr() = any(CallExpr c | c.getTarget().getName() = "sink").getArgument(0)
+  }
+}
+
+import TaintFlowTest<Config>

From d80a1487bed5e3f26ac96ecc24fe2433d14aefde Mon Sep 17 00:00:00 2001
From: Ed Minnix <egregius313@github.com>
Date: Thu, 29 Aug 2024 14:27:45 -0400
Subject: [PATCH 110/347] Add change note

---
 go/ql/lib/change-notes/2024-08-29-add-stdin-threat-models.md | 4 ++++
 1 file changed, 4 insertions(+)
 create mode 100644 go/ql/lib/change-notes/2024-08-29-add-stdin-threat-models.md

diff --git a/go/ql/lib/change-notes/2024-08-29-add-stdin-threat-models.md b/go/ql/lib/change-notes/2024-08-29-add-stdin-threat-models.md
new file mode 100644
index 000000000000..f01c843320de
--- /dev/null
+++ b/go/ql/lib/change-notes/2024-08-29-add-stdin-threat-models.md
@@ -0,0 +1,4 @@
+---
+category: minorAnalysis
+---
+* Local source models with the `stdin` source kind have been added for `os.Stdin`, `fmt.Scan`, `fmt.Scanf`, `fmt.Scanln`. You can optionally include threat models as appropriate when using the CodeQL CLI and in GitHub code scanning. For more information, see [Analyzing your code with CodeQL queries](https://docs.github.com/code-security/codeql-cli/getting-started-with-the-codeql-cli/analyzing-your-code-with-codeql-queries#including-model-packs-to-add-potential-sources-of-tainted-data>) and [Customizing your advanced setup for code scanning](https://docs.github.com/code-security/code-scanning/creating-an-advanced-setup-for-code-scanning/customizing-your-advanced-setup-for-code-scanning#extending-codeql-coverage-with-threat-models).

From 26b49dd0dfaa267b502a1f430b899e42ec3aeb2d Mon Sep 17 00:00:00 2001
From: Ed Minnix <egregius313@github.com>
Date: Thu, 29 Aug 2024 15:06:19 -0400
Subject: [PATCH 111/347] Fix test expectation

---
 .../semmle/go/dataflow/flowsources/local/stdin/source.expected | 3 +++
 1 file changed, 3 insertions(+)
 create mode 100644 go/ql/test/library-tests/semmle/go/dataflow/flowsources/local/stdin/source.expected

diff --git a/go/ql/test/library-tests/semmle/go/dataflow/flowsources/local/stdin/source.expected b/go/ql/test/library-tests/semmle/go/dataflow/flowsources/local/stdin/source.expected
new file mode 100644
index 000000000000..db33d6d2504a
--- /dev/null
+++ b/go/ql/test/library-tests/semmle/go/dataflow/flowsources/local/stdin/source.expected
@@ -0,0 +1,3 @@
+testFailures
+invalidModelRow
+failures

From 1f932d407f9a38282f4b6c74ee197e9250942443 Mon Sep 17 00:00:00 2001
From: Edward Minnix III <egregius313@github.com>
Date: Wed, 4 Sep 2024 09:48:02 -0400
Subject: [PATCH 112/347] Remove unnecessary `asExpr()`

Co-authored-by: Owen Mansel-Chan <62447351+owen-mc@users.noreply.github.com>
---
 go/ql/lib/semmle/go/frameworks/stdlib/Os.qll | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/go/ql/lib/semmle/go/frameworks/stdlib/Os.qll b/go/ql/lib/semmle/go/frameworks/stdlib/Os.qll
index 3e443d942b16..492e4b002411 100644
--- a/go/ql/lib/semmle/go/frameworks/stdlib/Os.qll
+++ b/go/ql/lib/semmle/go/frameworks/stdlib/Os.qll
@@ -47,7 +47,7 @@ module Os {
   private class Stdin extends SourceNode {
     Stdin() {
       exists(Variable osStdin | osStdin.hasQualifiedName("os", "Stdin") |
-        this.asExpr() = osStdin.getARead().asExpr()
+        this = osStdin.getARead()
       )
     }
 

From 91b7a6cbd801a035ec492bd82c6eed1eda9cd759 Mon Sep 17 00:00:00 2001
From: Edward Minnix III <egregius313@github.com>
Date: Wed, 4 Sep 2024 09:48:25 -0400
Subject: [PATCH 113/347] Wording of change note

Co-authored-by: Owen Mansel-Chan <62447351+owen-mc@users.noreply.github.com>
---
 go/ql/lib/change-notes/2024-08-29-add-stdin-threat-models.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/go/ql/lib/change-notes/2024-08-29-add-stdin-threat-models.md b/go/ql/lib/change-notes/2024-08-29-add-stdin-threat-models.md
index f01c843320de..d98ac68f1edc 100644
--- a/go/ql/lib/change-notes/2024-08-29-add-stdin-threat-models.md
+++ b/go/ql/lib/change-notes/2024-08-29-add-stdin-threat-models.md
@@ -1,4 +1,4 @@
 ---
 category: minorAnalysis
 ---
-* Local source models with the `stdin` source kind have been added for `os.Stdin`, `fmt.Scan`, `fmt.Scanf`, `fmt.Scanln`. You can optionally include threat models as appropriate when using the CodeQL CLI and in GitHub code scanning. For more information, see [Analyzing your code with CodeQL queries](https://docs.github.com/code-security/codeql-cli/getting-started-with-the-codeql-cli/analyzing-your-code-with-codeql-queries#including-model-packs-to-add-potential-sources-of-tainted-data>) and [Customizing your advanced setup for code scanning](https://docs.github.com/code-security/code-scanning/creating-an-advanced-setup-for-code-scanning/customizing-your-advanced-setup-for-code-scanning#extending-codeql-coverage-with-threat-models).
+* Local source models with the `stdin` source kind have been added for the variable `os.Stdin` and the functions `fmt.Scan`, `fmt.Scanf` and `fmt.Scanln`. You can optionally include threat models as appropriate when using the CodeQL CLI and in GitHub code scanning. For more information, see [Analyzing your code with CodeQL queries](https://docs.github.com/code-security/codeql-cli/getting-started-with-the-codeql-cli/analyzing-your-code-with-codeql-queries#including-model-packs-to-add-potential-sources-of-tainted-data>) and [Customizing your advanced setup for code scanning](https://docs.github.com/code-security/code-scanning/creating-an-advanced-setup-for-code-scanning/customizing-your-advanced-setup-for-code-scanning#extending-codeql-coverage-with-threat-models).

From f8335e6163d73d38ff2071573611598e600be68c Mon Sep 17 00:00:00 2001
From: Ed Minnix <egregius313@github.com>
Date: Tue, 1 Oct 2024 15:58:07 -0400
Subject: [PATCH 114/347] Fix formatting

---
 go/ql/lib/semmle/go/frameworks/stdlib/Os.qll | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/go/ql/lib/semmle/go/frameworks/stdlib/Os.qll b/go/ql/lib/semmle/go/frameworks/stdlib/Os.qll
index 492e4b002411..fb153451c597 100644
--- a/go/ql/lib/semmle/go/frameworks/stdlib/Os.qll
+++ b/go/ql/lib/semmle/go/frameworks/stdlib/Os.qll
@@ -46,9 +46,7 @@ module Os {
 
   private class Stdin extends SourceNode {
     Stdin() {
-      exists(Variable osStdin | osStdin.hasQualifiedName("os", "Stdin") |
-        this = osStdin.getARead()
-      )
+      exists(Variable osStdin | osStdin.hasQualifiedName("os", "Stdin") | this = osStdin.getARead())
     }
 
     override string getThreatModel() { result = "stdin" }

From 2458d1642670d0ceb8edcf47bcf34006ef2be84e Mon Sep 17 00:00:00 2001
From: Chad Bentz <1760475+felickz@users.noreply.github.com>
Date: Tue, 1 Oct 2024 23:04:22 -0400
Subject: [PATCH 115/347] Clarify threat model flow sources comment in
 LogForgingQuery.qll

---
 .../semmle/code/csharp/security/dataflow/LogForgingQuery.qll    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/csharp/ql/lib/semmle/code/csharp/security/dataflow/LogForgingQuery.qll b/csharp/ql/lib/semmle/code/csharp/security/dataflow/LogForgingQuery.qll
index 8181c9bcb74a..ebb481d2525e 100644
--- a/csharp/ql/lib/semmle/code/csharp/security/dataflow/LogForgingQuery.qll
+++ b/csharp/ql/lib/semmle/code/csharp/security/dataflow/LogForgingQuery.qll
@@ -42,7 +42,7 @@ private module LogForgingConfig implements DataFlow::ConfigSig {
  */
 module LogForging = TaintTracking::Global<LogForgingConfig>;
 
-/** A source of remote user input. */
+/** A source supported by the current threat model. */
 private class ThreatModelSource extends Source instanceof ActiveThreatModelSource { }
 
 private class HtmlSanitizer extends Sanitizer {

From d3695dce4dcfc0332389f1afe9e03dd588f98862 Mon Sep 17 00:00:00 2001
From: Calum Grant <calumgrant@github.com>
Date: Wed, 2 Oct 2024 08:14:23 +0100
Subject: [PATCH 116/347] C++: Add change note

---
 cpp/ql/src/change-notes/2024-10-02-uninitialized-local.md | 4 ++++
 1 file changed, 4 insertions(+)
 create mode 100644 cpp/ql/src/change-notes/2024-10-02-uninitialized-local.md

diff --git a/cpp/ql/src/change-notes/2024-10-02-uninitialized-local.md b/cpp/ql/src/change-notes/2024-10-02-uninitialized-local.md
new file mode 100644
index 000000000000..e34a942f38a6
--- /dev/null
+++ b/cpp/ql/src/change-notes/2024-10-02-uninitialized-local.md
@@ -0,0 +1,4 @@
+---
+category: minorAnalysis
+---
+* Fixed false positives in the `cpp/uninitialized-local` ("Potentially uninitialized local variable") query if there are extraction errors in the function.

From 69e0ad01818ee0f0237a1ccee26d732dbf29e43c Mon Sep 17 00:00:00 2001
From: Tom Hvitved <hvitved@github.com>
Date: Wed, 2 Oct 2024 10:55:52 +0200
Subject: [PATCH 117/347] Rust: Refactor CFG implementation for loops

---
 .../controlflow/internal/ControlFlowGraphImpl.qll  | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/rust/ql/lib/codeql/rust/controlflow/internal/ControlFlowGraphImpl.qll b/rust/ql/lib/codeql/rust/controlflow/internal/ControlFlowGraphImpl.qll
index da156cd7767c..971e4910fabe 100644
--- a/rust/ql/lib/codeql/rust/controlflow/internal/ControlFlowGraphImpl.qll
+++ b/rust/ql/lib/codeql/rust/controlflow/internal/ControlFlowGraphImpl.qll
@@ -316,7 +316,11 @@ abstract class LoopingExprTree extends PostOrderTree {
 
   abstract Label getLabel();
 
-  abstract predicate entry(AstNode node);
+  /**
+   * Gets the node to execute when continuing the loop; either after
+   * executing the last node in the body or after an explicit `continue`.
+   */
+  abstract AstNode getLoopContinue();
 
   /** Holds if this loop captures the `c` completion. */
   private predicate capturesLoopJumpCompletion(LoopJumpCompletion c) {
@@ -339,7 +343,7 @@ abstract class LoopingExprTree extends PostOrderTree {
       or
       c.(LoopJumpCompletion).isContinue() and this.capturesLoopJumpCompletion(c)
     ) and
-    this.entry(succ)
+    first(this.getLoopContinue(), succ)
   }
 
   override predicate last(AstNode last, Completion c) {
@@ -357,7 +361,7 @@ class LoopExprTree extends LoopingExprTree instanceof LoopExpr {
 
   override Label getLabel() { result = LoopExpr.super.getLabel() }
 
-  override predicate entry(AstNode node) { this.first(node) }
+  override AstNode getLoopContinue() { result = this.getLoopBody() }
 
   override predicate first(AstNode node) { first(this.getLoopBody(), node) }
 }
@@ -367,7 +371,7 @@ class WhileExprTree extends LoopingExprTree instanceof WhileExpr {
 
   override Label getLabel() { result = WhileExpr.super.getLabel() }
 
-  override predicate entry(AstNode node) { this.first(node) }
+  override AstNode getLoopContinue() { result = super.getCondition() }
 
   override predicate propagatesAbnormal(AstNode child) { child = super.getCondition() }
 
@@ -397,7 +401,7 @@ class ForExprTree extends LoopingExprTree instanceof ForExpr {
 
   override Label getLabel() { result = ForExpr.super.getLabel() }
 
-  override predicate entry(AstNode n) { first(super.getPat(), n) }
+  override AstNode getLoopContinue() { result = super.getPat() }
 
   override predicate propagatesAbnormal(AstNode child) { child = super.getIterable() }
 

From 9c7216fe4ffde832c9980572629f4a64c7bda734 Mon Sep 17 00:00:00 2001
From: Tom Hvitved <hvitved@github.com>
Date: Wed, 2 Oct 2024 10:59:26 +0200
Subject: [PATCH 118/347] Rust: Add another CFG test

---
 .../library-tests/controlflow/Cfg.expected    | 880 +++++++++---------
 .../ql/test/library-tests/controlflow/test.rs |  14 +
 2 files changed, 462 insertions(+), 432 deletions(-)

diff --git a/rust/ql/test/library-tests/controlflow/Cfg.expected b/rust/ql/test/library-tests/controlflow/Cfg.expected
index aff1576a8294..0e7bf44925cc 100644
--- a/rust/ql/test/library-tests/controlflow/Cfg.expected
+++ b/rust/ql/test/library-tests/controlflow/Cfg.expected
@@ -97,435 +97,451 @@
 | test.rs:47:21:47:36 | ExprStmt | test.rs:47:21:47:35 | ContinueExpr |  |
 | test.rs:49:17:49:31 | ContinueExpr | test.rs:44:17:48:17 | ExprStmt | continue('inner) |
 | test.rs:49:17:49:32 | ExprStmt | test.rs:49:17:49:31 | ContinueExpr |  |
-| test.rs:54:5:63:5 | enter test_while | test.rs:55:9:55:25 | LetStmt |  |
-| test.rs:54:5:63:5 | exit test_while (normal) | test.rs:54:5:63:5 | exit test_while |  |
-| test.rs:54:27:63:5 | BlockExpr | test.rs:54:5:63:5 | exit test_while (normal) |  |
-| test.rs:55:9:55:25 | LetStmt | test.rs:55:21:55:24 | true |  |
-| test.rs:55:13:55:17 | b | test.rs:56:15:56:15 | b | match, no-match |
-| test.rs:55:21:55:24 | true | test.rs:55:13:55:17 | b |  |
-| test.rs:56:9:62:9 | WhileExpr | test.rs:54:27:63:5 | BlockExpr |  |
-| test.rs:56:15:56:15 | b | test.rs:56:9:62:9 | WhileExpr | false |
-| test.rs:56:15:56:15 | b | test.rs:57:13:57:14 | ExprStmt | true |
-| test.rs:56:17:62:9 | BlockExpr | test.rs:56:15:56:15 | b |  |
-| test.rs:57:13:57:13 | 1 | test.rs:58:13:60:13 | ExprStmt |  |
-| test.rs:57:13:57:14 | ExprStmt | test.rs:57:13:57:13 | 1 |  |
-| test.rs:58:13:60:13 | ExprStmt | test.rs:58:17:58:17 | i |  |
-| test.rs:58:13:60:13 | IfExpr | test.rs:61:13:61:22 | ExprStmt |  |
-| test.rs:58:17:58:17 | i | test.rs:58:21:58:21 | 0 |  |
-| test.rs:58:17:58:21 | ... > ... | test.rs:58:13:60:13 | IfExpr | false |
-| test.rs:58:17:58:21 | ... > ... | test.rs:59:17:59:22 | ExprStmt | true |
-| test.rs:58:21:58:21 | 0 | test.rs:58:17:58:21 | ... > ... |  |
-| test.rs:59:17:59:21 | BreakExpr | test.rs:56:9:62:9 | WhileExpr | break |
-| test.rs:59:17:59:22 | ExprStmt | test.rs:59:17:59:21 | BreakExpr |  |
-| test.rs:61:13:61:13 | PathExpr | test.rs:61:17:61:21 | false |  |
-| test.rs:61:13:61:21 | ... = ... | test.rs:56:17:62:9 | BlockExpr |  |
-| test.rs:61:13:61:22 | ExprStmt | test.rs:61:13:61:13 | PathExpr |  |
-| test.rs:61:17:61:21 | false | test.rs:61:13:61:21 | ... = ... |  |
-| test.rs:65:5:72:5 | enter test_while_let | test.rs:66:9:66:29 | LetStmt |  |
-| test.rs:65:5:72:5 | exit test_while_let (normal) | test.rs:65:5:72:5 | exit test_while_let |  |
-| test.rs:65:25:72:5 | BlockExpr | test.rs:65:5:72:5 | exit test_while_let (normal) |  |
-| test.rs:66:9:66:29 | LetStmt | test.rs:66:24:66:24 | 1 |  |
-| test.rs:66:13:66:20 | iter | test.rs:67:15:67:39 | LetExpr | match, no-match |
-| test.rs:66:24:66:24 | 1 | test.rs:66:27:66:28 | 10 |  |
-| test.rs:66:24:66:28 | RangeExpr | test.rs:66:13:66:20 | iter |  |
-| test.rs:66:27:66:28 | 10 | test.rs:66:24:66:28 | RangeExpr |  |
-| test.rs:67:9:71:9 | WhileExpr | test.rs:65:25:72:5 | BlockExpr |  |
-| test.rs:67:15:67:39 | LetExpr | test.rs:67:19:67:25 | TupleStructPat |  |
-| test.rs:67:19:67:25 | TupleStructPat | test.rs:67:9:71:9 | WhileExpr | no-match |
-| test.rs:67:19:67:25 | TupleStructPat | test.rs:68:17:68:17 | PathExpr | match |
-| test.rs:67:41:71:9 | BlockExpr | test.rs:67:15:67:39 | LetExpr |  |
-| test.rs:68:13:70:13 | IfExpr | test.rs:67:41:71:9 | BlockExpr |  |
-| test.rs:68:17:68:17 | PathExpr | test.rs:68:21:68:21 | 5 |  |
-| test.rs:68:17:68:21 | ... = ... | test.rs:68:13:70:13 | IfExpr | false |
-| test.rs:68:17:68:21 | ... = ... | test.rs:69:17:69:22 | ExprStmt | true |
-| test.rs:68:21:68:21 | 5 | test.rs:68:17:68:21 | ... = ... |  |
-| test.rs:69:17:69:21 | BreakExpr | test.rs:67:9:71:9 | WhileExpr | break |
-| test.rs:69:17:69:22 | ExprStmt | test.rs:69:17:69:21 | BreakExpr |  |
-| test.rs:74:5:81:5 | enter test_for | test.rs:75:18:75:18 | 0 |  |
-| test.rs:74:5:81:5 | exit test_for (normal) | test.rs:74:5:81:5 | exit test_for |  |
-| test.rs:74:25:81:5 | BlockExpr | test.rs:74:5:81:5 | exit test_for (normal) |  |
-| test.rs:75:9:80:9 | ForExpr | test.rs:74:25:81:5 | BlockExpr |  |
-| test.rs:75:13:75:13 | i | test.rs:75:9:80:9 | ForExpr | no-match |
-| test.rs:75:13:75:13 | i | test.rs:76:13:78:13 | ExprStmt | match |
-| test.rs:75:18:75:18 | 0 | test.rs:75:21:75:22 | 10 |  |
-| test.rs:75:18:75:22 | RangeExpr | test.rs:75:13:75:13 | i |  |
-| test.rs:75:21:75:22 | 10 | test.rs:75:18:75:22 | RangeExpr |  |
-| test.rs:75:24:80:9 | BlockExpr | test.rs:75:13:75:13 | i |  |
-| test.rs:76:13:78:13 | ExprStmt | test.rs:76:17:76:17 | i |  |
-| test.rs:76:13:78:13 | IfExpr | test.rs:79:13:79:14 | ExprStmt |  |
-| test.rs:76:17:76:17 | i | test.rs:76:22:76:22 | j |  |
-| test.rs:76:17:76:22 | ... == ... | test.rs:76:13:78:13 | IfExpr | false |
-| test.rs:76:17:76:22 | ... == ... | test.rs:77:17:77:22 | ExprStmt | true |
-| test.rs:76:22:76:22 | j | test.rs:76:17:76:22 | ... == ... |  |
-| test.rs:77:17:77:21 | BreakExpr | test.rs:75:9:80:9 | ForExpr | break |
-| test.rs:77:17:77:22 | ExprStmt | test.rs:77:17:77:21 | BreakExpr |  |
-| test.rs:79:13:79:13 | 1 | test.rs:75:24:80:9 | BlockExpr |  |
-| test.rs:79:13:79:14 | ExprStmt | test.rs:79:13:79:13 | 1 |  |
-| test.rs:84:1:87:1 | enter test_nested_function | test.rs:85:5:85:28 | LetStmt |  |
-| test.rs:84:1:87:1 | exit test_nested_function (normal) | test.rs:84:1:87:1 | exit test_nested_function |  |
-| test.rs:84:40:87:1 | BlockExpr | test.rs:84:1:87:1 | exit test_nested_function (normal) |  |
-| test.rs:85:5:85:28 | LetStmt | test.rs:85:19:85:27 | ClosureExpr |  |
-| test.rs:85:9:85:15 | add_one | test.rs:86:5:86:11 | add_one | match, no-match |
-| test.rs:85:19:85:27 | ClosureExpr | test.rs:85:9:85:15 | add_one |  |
-| test.rs:85:19:85:27 | enter ClosureExpr | test.rs:85:23:85:23 | i |  |
-| test.rs:85:19:85:27 | exit ClosureExpr (normal) | test.rs:85:19:85:27 | exit ClosureExpr |  |
-| test.rs:85:23:85:23 | i | test.rs:85:27:85:27 | 1 |  |
-| test.rs:85:23:85:27 | ... + ... | test.rs:85:19:85:27 | exit ClosureExpr (normal) |  |
-| test.rs:85:27:85:27 | 1 | test.rs:85:23:85:27 | ... + ... |  |
-| test.rs:86:5:86:11 | add_one | test.rs:86:13:86:19 | add_one |  |
-| test.rs:86:5:86:23 | CallExpr | test.rs:84:40:87:1 | BlockExpr |  |
-| test.rs:86:13:86:19 | add_one | test.rs:86:21:86:21 | n |  |
-| test.rs:86:13:86:22 | CallExpr | test.rs:86:5:86:23 | CallExpr |  |
-| test.rs:86:21:86:21 | n | test.rs:86:13:86:22 | CallExpr |  |
-| test.rs:91:5:97:5 | enter test_if_else | test.rs:92:12:92:12 | n |  |
-| test.rs:91:5:97:5 | exit test_if_else (normal) | test.rs:91:5:97:5 | exit test_if_else |  |
-| test.rs:91:36:97:5 | BlockExpr | test.rs:91:5:97:5 | exit test_if_else (normal) |  |
-| test.rs:92:9:96:9 | IfExpr | test.rs:91:36:97:5 | BlockExpr |  |
-| test.rs:92:12:92:12 | n | test.rs:92:17:92:17 | 0 |  |
-| test.rs:92:12:92:17 | ... <= ... | test.rs:93:13:93:13 | 0 | true |
-| test.rs:92:12:92:17 | ... <= ... | test.rs:95:13:95:13 | n | false |
-| test.rs:92:17:92:17 | 0 | test.rs:92:12:92:17 | ... <= ... |  |
-| test.rs:92:19:94:9 | BlockExpr | test.rs:92:9:96:9 | IfExpr |  |
-| test.rs:93:13:93:13 | 0 | test.rs:92:19:94:9 | BlockExpr |  |
-| test.rs:94:16:96:9 | BlockExpr | test.rs:92:9:96:9 | IfExpr |  |
-| test.rs:95:13:95:13 | n | test.rs:95:17:95:17 | 1 |  |
-| test.rs:95:13:95:17 | ... - ... | test.rs:94:16:96:9 | BlockExpr |  |
-| test.rs:95:17:95:17 | 1 | test.rs:95:13:95:17 | ... - ... |  |
-| test.rs:99:5:105:5 | enter test_if_let_else | test.rs:100:12:100:26 | LetExpr |  |
-| test.rs:99:5:105:5 | exit test_if_let_else (normal) | test.rs:99:5:105:5 | exit test_if_let_else |  |
-| test.rs:99:48:105:5 | BlockExpr | test.rs:99:5:105:5 | exit test_if_let_else (normal) |  |
-| test.rs:100:9:104:9 | IfExpr | test.rs:99:48:105:5 | BlockExpr |  |
-| test.rs:100:12:100:26 | LetExpr | test.rs:100:16:100:22 | TupleStructPat |  |
-| test.rs:100:16:100:22 | TupleStructPat | test.rs:101:13:101:13 | n | match |
-| test.rs:100:16:100:22 | TupleStructPat | test.rs:103:13:103:13 | 0 | no-match |
-| test.rs:100:28:102:9 | BlockExpr | test.rs:100:9:104:9 | IfExpr |  |
-| test.rs:101:13:101:13 | n | test.rs:100:28:102:9 | BlockExpr |  |
-| test.rs:102:16:104:9 | BlockExpr | test.rs:100:9:104:9 | IfExpr |  |
-| test.rs:103:13:103:13 | 0 | test.rs:102:16:104:9 | BlockExpr |  |
-| test.rs:107:5:112:5 | enter test_if_let | test.rs:108:9:110:9 | ExprStmt |  |
-| test.rs:107:5:112:5 | exit test_if_let (normal) | test.rs:107:5:112:5 | exit test_if_let |  |
-| test.rs:107:43:112:5 | BlockExpr | test.rs:107:5:112:5 | exit test_if_let (normal) |  |
-| test.rs:108:9:110:9 | ExprStmt | test.rs:108:12:108:26 | LetExpr |  |
-| test.rs:108:9:110:9 | IfExpr | test.rs:111:9:111:9 | 0 |  |
-| test.rs:108:12:108:26 | LetExpr | test.rs:108:16:108:22 | TupleStructPat |  |
-| test.rs:108:16:108:22 | TupleStructPat | test.rs:108:9:110:9 | IfExpr | no-match |
-| test.rs:108:16:108:22 | TupleStructPat | test.rs:109:13:109:13 | n | match |
-| test.rs:108:28:110:9 | BlockExpr | test.rs:108:9:110:9 | IfExpr |  |
-| test.rs:109:13:109:13 | n | test.rs:108:28:110:9 | BlockExpr |  |
-| test.rs:111:9:111:9 | 0 | test.rs:107:43:112:5 | BlockExpr |  |
-| test.rs:114:5:120:5 | enter test_nested_if | test.rs:115:16:115:16 | PathExpr |  |
-| test.rs:114:5:120:5 | exit test_nested_if (normal) | test.rs:114:5:120:5 | exit test_nested_if |  |
-| test.rs:114:38:120:5 | BlockExpr | test.rs:114:5:120:5 | exit test_nested_if (normal) |  |
-| test.rs:115:9:119:9 | IfExpr | test.rs:114:38:120:5 | BlockExpr |  |
-| test.rs:115:13:115:48 | IfExpr | test.rs:116:13:116:13 | 1 | true |
-| test.rs:115:13:115:48 | IfExpr | test.rs:118:13:118:13 | 0 | false |
-| test.rs:115:16:115:16 | PathExpr | test.rs:115:20:115:20 | 0 |  |
-| test.rs:115:16:115:20 | ... < ... | test.rs:115:24:115:24 | a | true |
-| test.rs:115:16:115:20 | ... < ... | test.rs:115:41:115:41 | a | false |
-| test.rs:115:20:115:20 | 0 | test.rs:115:16:115:20 | ... < ... |  |
-| test.rs:115:22:115:32 | BlockExpr | test.rs:115:13:115:48 | IfExpr | false, true |
-| test.rs:115:24:115:24 | a | test.rs:115:29:115:30 | 10 |  |
-| test.rs:115:24:115:30 | ... < ... | test.rs:115:22:115:32 | BlockExpr | false, true |
-| test.rs:115:28:115:30 | - ... | test.rs:115:24:115:30 | ... < ... |  |
-| test.rs:115:29:115:30 | 10 | test.rs:115:28:115:30 | - ... |  |
-| test.rs:115:39:115:48 | BlockExpr | test.rs:115:13:115:48 | IfExpr | false, true |
-| test.rs:115:41:115:41 | a | test.rs:115:45:115:46 | 10 |  |
-| test.rs:115:41:115:46 | ... > ... | test.rs:115:39:115:48 | BlockExpr | false, true |
-| test.rs:115:45:115:46 | 10 | test.rs:115:41:115:46 | ... > ... |  |
-| test.rs:115:51:117:9 | BlockExpr | test.rs:115:9:119:9 | IfExpr |  |
-| test.rs:116:13:116:13 | 1 | test.rs:115:51:117:9 | BlockExpr |  |
-| test.rs:117:16:119:9 | BlockExpr | test.rs:115:9:119:9 | IfExpr |  |
-| test.rs:118:13:118:13 | 0 | test.rs:117:16:119:9 | BlockExpr |  |
-| test.rs:122:5:131:5 | enter test_nested_if_match | test.rs:123:19:123:19 | a |  |
-| test.rs:122:5:131:5 | exit test_nested_if_match (normal) | test.rs:122:5:131:5 | exit test_nested_if_match |  |
-| test.rs:122:44:131:5 | BlockExpr | test.rs:122:5:131:5 | exit test_nested_if_match (normal) |  |
-| test.rs:123:9:130:9 | IfExpr | test.rs:122:44:131:5 | BlockExpr |  |
-| test.rs:123:13:126:9 | MatchExpr | test.rs:127:13:127:13 | 1 | true |
-| test.rs:123:13:126:9 | MatchExpr | test.rs:129:13:129:13 | 0 | false |
-| test.rs:123:19:123:19 | a | test.rs:124:13:124:13 | LiteralPat |  |
-| test.rs:124:13:124:13 | LiteralPat | test.rs:124:18:124:21 | true | match |
-| test.rs:124:13:124:13 | LiteralPat | test.rs:125:13:125:13 | WildcardPat | no-match |
-| test.rs:124:18:124:21 | true | test.rs:123:13:126:9 | MatchExpr |  |
-| test.rs:125:13:125:13 | WildcardPat | test.rs:125:18:125:22 | false | match |
-| test.rs:125:18:125:22 | false | test.rs:123:13:126:9 | MatchExpr |  |
-| test.rs:126:12:128:9 | BlockExpr | test.rs:123:9:130:9 | IfExpr |  |
-| test.rs:127:13:127:13 | 1 | test.rs:126:12:128:9 | BlockExpr |  |
-| test.rs:128:16:130:9 | BlockExpr | test.rs:123:9:130:9 | IfExpr |  |
-| test.rs:129:13:129:13 | 0 | test.rs:128:16:130:9 | BlockExpr |  |
-| test.rs:133:5:142:5 | enter test_nested_if_block | test.rs:135:13:135:15 | ExprStmt |  |
-| test.rs:133:5:142:5 | exit test_nested_if_block (normal) | test.rs:133:5:142:5 | exit test_nested_if_block |  |
-| test.rs:133:44:142:5 | BlockExpr | test.rs:133:5:142:5 | exit test_nested_if_block (normal) |  |
-| test.rs:134:9:141:9 | IfExpr | test.rs:133:44:142:5 | BlockExpr |  |
-| test.rs:134:12:137:9 | BlockExpr | test.rs:138:13:138:13 | 1 | true |
-| test.rs:134:12:137:9 | BlockExpr | test.rs:140:13:140:13 | 0 | false |
-| test.rs:135:13:135:14 | TupleExpr | test.rs:136:13:136:13 | a |  |
-| test.rs:135:13:135:15 | ExprStmt | test.rs:135:13:135:14 | TupleExpr |  |
-| test.rs:136:13:136:13 | a | test.rs:136:17:136:17 | 0 |  |
-| test.rs:136:13:136:17 | ... > ... | test.rs:134:12:137:9 | BlockExpr | false, true |
-| test.rs:136:17:136:17 | 0 | test.rs:136:13:136:17 | ... > ... |  |
-| test.rs:137:11:139:9 | BlockExpr | test.rs:134:9:141:9 | IfExpr |  |
-| test.rs:138:13:138:13 | 1 | test.rs:137:11:139:9 | BlockExpr |  |
-| test.rs:139:16:141:9 | BlockExpr | test.rs:134:9:141:9 | IfExpr |  |
-| test.rs:140:13:140:13 | 0 | test.rs:139:16:141:9 | BlockExpr |  |
-| test.rs:144:5:151:5 | enter test_if_assignment | test.rs:145:9:145:26 | LetStmt |  |
-| test.rs:144:5:151:5 | exit test_if_assignment (normal) | test.rs:144:5:151:5 | exit test_if_assignment |  |
-| test.rs:144:42:151:5 | BlockExpr | test.rs:144:5:151:5 | exit test_if_assignment (normal) |  |
-| test.rs:145:9:145:26 | LetStmt | test.rs:145:21:145:25 | false |  |
-| test.rs:145:13:145:17 | x | test.rs:146:12:146:12 | x | match, no-match |
-| test.rs:145:21:145:25 | false | test.rs:145:13:145:17 | x |  |
-| test.rs:146:9:150:9 | IfExpr | test.rs:144:42:151:5 | BlockExpr |  |
-| test.rs:146:12:146:12 | x | test.rs:146:16:146:19 | true |  |
-| test.rs:146:12:146:19 | ... = ... | test.rs:147:13:147:13 | 1 | true |
-| test.rs:146:12:146:19 | ... = ... | test.rs:149:13:149:13 | 0 | false |
-| test.rs:146:16:146:19 | true | test.rs:146:12:146:19 | ... = ... |  |
-| test.rs:146:21:148:9 | BlockExpr | test.rs:146:9:150:9 | IfExpr |  |
-| test.rs:147:13:147:13 | 1 | test.rs:146:21:148:9 | BlockExpr |  |
-| test.rs:148:16:150:9 | BlockExpr | test.rs:146:9:150:9 | IfExpr |  |
-| test.rs:149:13:149:13 | 0 | test.rs:148:16:150:9 | BlockExpr |  |
-| test.rs:153:5:164:5 | enter test_if_loop1 | test.rs:155:13:157:14 | ExprStmt |  |
-| test.rs:153:5:164:5 | exit test_if_loop1 (normal) | test.rs:153:5:164:5 | exit test_if_loop1 |  |
-| test.rs:153:37:164:5 | BlockExpr | test.rs:153:5:164:5 | exit test_if_loop1 (normal) |  |
-| test.rs:154:9:163:9 | IfExpr | test.rs:153:37:164:5 | BlockExpr |  |
-| test.rs:154:13:159:9 | LoopExpr | test.rs:160:13:160:13 | 1 | true |
-| test.rs:154:13:159:9 | LoopExpr | test.rs:162:13:162:13 | 0 | false |
-| test.rs:154:18:159:9 | BlockExpr | test.rs:155:13:157:14 | ExprStmt |  |
-| test.rs:155:13:157:13 | IfExpr | test.rs:158:13:158:19 | ExprStmt |  |
-| test.rs:155:13:157:14 | ExprStmt | test.rs:155:16:155:16 | a |  |
-| test.rs:155:16:155:16 | a | test.rs:155:20:155:20 | 0 |  |
-| test.rs:155:16:155:20 | ... > ... | test.rs:155:13:157:13 | IfExpr | false |
-| test.rs:155:16:155:20 | ... > ... | test.rs:156:17:156:29 | ExprStmt | true |
-| test.rs:155:20:155:20 | 0 | test.rs:155:16:155:20 | ... > ... |  |
-| test.rs:156:17:156:28 | BreakExpr | test.rs:154:13:159:9 | LoopExpr | break |
-| test.rs:156:17:156:29 | ExprStmt | test.rs:156:23:156:23 | a |  |
-| test.rs:156:23:156:23 | a | test.rs:156:27:156:28 | 10 |  |
-| test.rs:156:23:156:28 | ... > ... | test.rs:156:17:156:28 | BreakExpr |  |
-| test.rs:156:27:156:28 | 10 | test.rs:156:23:156:28 | ... > ... |  |
-| test.rs:158:13:158:13 | a | test.rs:158:17:158:18 | 10 |  |
-| test.rs:158:13:158:18 | ... < ... | test.rs:154:18:159:9 | BlockExpr |  |
-| test.rs:158:13:158:19 | ExprStmt | test.rs:158:13:158:13 | a |  |
-| test.rs:158:17:158:18 | 10 | test.rs:158:13:158:18 | ... < ... |  |
-| test.rs:159:12:161:9 | BlockExpr | test.rs:154:9:163:9 | IfExpr |  |
-| test.rs:160:13:160:13 | 1 | test.rs:159:12:161:9 | BlockExpr |  |
-| test.rs:161:16:163:9 | BlockExpr | test.rs:154:9:163:9 | IfExpr |  |
-| test.rs:162:13:162:13 | 0 | test.rs:161:16:163:9 | BlockExpr |  |
-| test.rs:166:5:177:5 | enter test_if_loop2 | test.rs:168:13:170:14 | ExprStmt |  |
-| test.rs:166:5:177:5 | exit test_if_loop2 (normal) | test.rs:166:5:177:5 | exit test_if_loop2 |  |
-| test.rs:166:37:177:5 | BlockExpr | test.rs:166:5:177:5 | exit test_if_loop2 (normal) |  |
-| test.rs:167:9:176:9 | IfExpr | test.rs:166:37:177:5 | BlockExpr |  |
-| test.rs:167:13:172:9 | LoopExpr | test.rs:173:13:173:13 | 1 | true |
-| test.rs:167:13:172:9 | LoopExpr | test.rs:175:13:175:13 | 0 | false |
-| test.rs:167:26:172:9 | BlockExpr | test.rs:168:13:170:14 | ExprStmt |  |
-| test.rs:168:13:170:13 | IfExpr | test.rs:171:13:171:19 | ExprStmt |  |
-| test.rs:168:13:170:14 | ExprStmt | test.rs:168:16:168:16 | a |  |
-| test.rs:168:16:168:16 | a | test.rs:168:20:168:20 | 0 |  |
-| test.rs:168:16:168:20 | ... > ... | test.rs:168:13:170:13 | IfExpr | false |
-| test.rs:168:16:168:20 | ... > ... | test.rs:169:17:169:36 | ExprStmt | true |
-| test.rs:168:20:168:20 | 0 | test.rs:168:16:168:20 | ... > ... |  |
-| test.rs:169:17:169:35 | BreakExpr | test.rs:167:13:172:9 | LoopExpr | break('label) |
-| test.rs:169:17:169:36 | ExprStmt | test.rs:169:30:169:30 | a |  |
-| test.rs:169:30:169:30 | a | test.rs:169:34:169:35 | 10 |  |
-| test.rs:169:30:169:35 | ... > ... | test.rs:169:17:169:35 | BreakExpr |  |
-| test.rs:169:34:169:35 | 10 | test.rs:169:30:169:35 | ... > ... |  |
-| test.rs:171:13:171:13 | a | test.rs:171:17:171:18 | 10 |  |
-| test.rs:171:13:171:18 | ... < ... | test.rs:167:26:172:9 | BlockExpr |  |
-| test.rs:171:13:171:19 | ExprStmt | test.rs:171:13:171:13 | a |  |
-| test.rs:171:17:171:18 | 10 | test.rs:171:13:171:18 | ... < ... |  |
-| test.rs:172:12:174:9 | BlockExpr | test.rs:167:9:176:9 | IfExpr |  |
-| test.rs:173:13:173:13 | 1 | test.rs:172:12:174:9 | BlockExpr |  |
-| test.rs:174:16:176:9 | BlockExpr | test.rs:167:9:176:9 | IfExpr |  |
-| test.rs:175:13:175:13 | 0 | test.rs:174:16:176:9 | BlockExpr |  |
-| test.rs:179:5:187:5 | enter test_labelled_block | test.rs:181:13:181:31 | ExprStmt |  |
-| test.rs:179:5:187:5 | exit test_labelled_block (normal) | test.rs:179:5:187:5 | exit test_labelled_block |  |
-| test.rs:179:43:187:5 | BlockExpr | test.rs:179:5:187:5 | exit test_labelled_block (normal) |  |
-| test.rs:180:9:186:9 | IfExpr | test.rs:179:43:187:5 | BlockExpr |  |
-| test.rs:180:13:182:9 | BlockExpr | test.rs:183:13:183:13 | 1 | true |
-| test.rs:180:13:182:9 | BlockExpr | test.rs:185:13:185:13 | 0 | false |
-| test.rs:181:13:181:30 | BreakExpr | test.rs:180:13:182:9 | BlockExpr | break('block) |
-| test.rs:181:13:181:31 | ExprStmt | test.rs:181:26:181:26 | a |  |
-| test.rs:181:26:181:26 | a | test.rs:181:30:181:30 | 0 |  |
-| test.rs:181:26:181:30 | ... > ... | test.rs:181:13:181:30 | BreakExpr |  |
-| test.rs:181:30:181:30 | 0 | test.rs:181:26:181:30 | ... > ... |  |
-| test.rs:182:12:184:9 | BlockExpr | test.rs:180:9:186:9 | IfExpr |  |
-| test.rs:183:13:183:13 | 1 | test.rs:182:12:184:9 | BlockExpr |  |
-| test.rs:184:16:186:9 | BlockExpr | test.rs:180:9:186:9 | IfExpr |  |
-| test.rs:185:13:185:13 | 0 | test.rs:184:16:186:9 | BlockExpr |  |
-| test.rs:192:5:195:5 | enter test_and_operator | test.rs:193:9:193:28 | LetStmt |  |
-| test.rs:192:5:195:5 | exit test_and_operator (normal) | test.rs:192:5:195:5 | exit test_and_operator |  |
-| test.rs:192:61:195:5 | BlockExpr | test.rs:192:5:195:5 | exit test_and_operator (normal) |  |
-| test.rs:193:9:193:28 | LetStmt | test.rs:193:17:193:27 | ... && ... |  |
-| test.rs:193:13:193:13 | d | test.rs:194:9:194:9 | d | match, no-match |
-| test.rs:193:17:193:17 | a | test.rs:193:13:193:13 | d | false |
-| test.rs:193:17:193:17 | a | test.rs:193:22:193:22 | b | true |
-| test.rs:193:17:193:22 | ... && ... | test.rs:193:17:193:17 | a |  |
-| test.rs:193:17:193:27 | ... && ... | test.rs:193:17:193:22 | ... && ... |  |
-| test.rs:193:22:193:22 | b | test.rs:193:13:193:13 | d | false |
-| test.rs:193:22:193:22 | b | test.rs:193:27:193:27 | c | true |
-| test.rs:193:27:193:27 | c | test.rs:193:13:193:13 | d |  |
-| test.rs:194:9:194:9 | d | test.rs:192:61:195:5 | BlockExpr |  |
-| test.rs:197:5:200:5 | enter test_or_operator | test.rs:198:9:198:28 | LetStmt |  |
-| test.rs:197:5:200:5 | exit test_or_operator (normal) | test.rs:197:5:200:5 | exit test_or_operator |  |
-| test.rs:197:60:200:5 | BlockExpr | test.rs:197:5:200:5 | exit test_or_operator (normal) |  |
-| test.rs:198:9:198:28 | LetStmt | test.rs:198:17:198:27 | ... \|\| ... |  |
-| test.rs:198:13:198:13 | d | test.rs:199:9:199:9 | d | match, no-match |
-| test.rs:198:17:198:17 | a | test.rs:198:13:198:13 | d | true |
-| test.rs:198:17:198:17 | a | test.rs:198:22:198:22 | b | false |
-| test.rs:198:17:198:22 | ... \|\| ... | test.rs:198:17:198:17 | a |  |
-| test.rs:198:17:198:27 | ... \|\| ... | test.rs:198:17:198:22 | ... \|\| ... |  |
-| test.rs:198:22:198:22 | b | test.rs:198:13:198:13 | d | true |
-| test.rs:198:22:198:22 | b | test.rs:198:27:198:27 | c | false |
-| test.rs:198:27:198:27 | c | test.rs:198:13:198:13 | d |  |
-| test.rs:199:9:199:9 | d | test.rs:197:60:200:5 | BlockExpr |  |
-| test.rs:202:5:205:5 | enter test_or_operator_2 | test.rs:203:9:203:36 | LetStmt |  |
-| test.rs:202:5:205:5 | exit test_or_operator_2 (normal) | test.rs:202:5:205:5 | exit test_or_operator_2 |  |
-| test.rs:202:61:205:5 | BlockExpr | test.rs:202:5:205:5 | exit test_or_operator_2 (normal) |  |
-| test.rs:203:9:203:36 | LetStmt | test.rs:203:17:203:35 | ... \|\| ... |  |
-| test.rs:203:13:203:13 | d | test.rs:204:9:204:9 | d | match, no-match |
-| test.rs:203:17:203:17 | a | test.rs:203:13:203:13 | d | true |
-| test.rs:203:17:203:17 | a | test.rs:203:23:203:23 | b | false |
-| test.rs:203:17:203:30 | ... \|\| ... | test.rs:203:17:203:17 | a |  |
-| test.rs:203:17:203:35 | ... \|\| ... | test.rs:203:17:203:30 | ... \|\| ... |  |
-| test.rs:203:23:203:23 | b | test.rs:203:28:203:29 | 28 |  |
-| test.rs:203:23:203:29 | ... == ... | test.rs:203:13:203:13 | d | true |
-| test.rs:203:23:203:29 | ... == ... | test.rs:203:35:203:35 | c | false |
-| test.rs:203:28:203:29 | 28 | test.rs:203:23:203:29 | ... == ... |  |
-| test.rs:203:35:203:35 | c | test.rs:203:13:203:13 | d |  |
-| test.rs:204:9:204:9 | d | test.rs:202:61:205:5 | BlockExpr |  |
-| test.rs:207:5:210:5 | enter test_not_operator | test.rs:208:9:208:19 | LetStmt |  |
-| test.rs:207:5:210:5 | exit test_not_operator (normal) | test.rs:207:5:210:5 | exit test_not_operator |  |
-| test.rs:207:43:210:5 | BlockExpr | test.rs:207:5:210:5 | exit test_not_operator (normal) |  |
-| test.rs:208:9:208:19 | LetStmt | test.rs:208:18:208:18 | a |  |
-| test.rs:208:13:208:13 | d | test.rs:209:9:209:9 | d | match, no-match |
-| test.rs:208:17:208:18 | ! ... | test.rs:208:13:208:13 | d |  |
-| test.rs:208:18:208:18 | a | test.rs:208:17:208:18 | ! ... |  |
-| test.rs:209:9:209:9 | d | test.rs:207:43:210:5 | BlockExpr |  |
-| test.rs:212:5:218:5 | enter test_if_and_operator | test.rs:213:12:213:22 | ... && ... |  |
-| test.rs:212:5:218:5 | exit test_if_and_operator (normal) | test.rs:212:5:218:5 | exit test_if_and_operator |  |
-| test.rs:212:63:218:5 | BlockExpr | test.rs:212:5:218:5 | exit test_if_and_operator (normal) |  |
-| test.rs:213:9:217:9 | IfExpr | test.rs:212:63:218:5 | BlockExpr |  |
-| test.rs:213:12:213:12 | a | test.rs:213:17:213:17 | b | true |
-| test.rs:213:12:213:12 | a | test.rs:216:13:216:17 | false | false |
-| test.rs:213:12:213:17 | ... && ... | test.rs:213:12:213:12 | a |  |
-| test.rs:213:12:213:22 | ... && ... | test.rs:213:12:213:17 | ... && ... |  |
-| test.rs:213:17:213:17 | b | test.rs:213:22:213:22 | c | true |
-| test.rs:213:17:213:17 | b | test.rs:216:13:216:17 | false | false |
-| test.rs:213:22:213:22 | c | test.rs:214:13:214:16 | true | true |
-| test.rs:213:22:213:22 | c | test.rs:216:13:216:17 | false | false |
-| test.rs:213:24:215:9 | BlockExpr | test.rs:213:9:217:9 | IfExpr |  |
-| test.rs:214:13:214:16 | true | test.rs:213:24:215:9 | BlockExpr |  |
-| test.rs:215:16:217:9 | BlockExpr | test.rs:213:9:217:9 | IfExpr |  |
-| test.rs:216:13:216:17 | false | test.rs:215:16:217:9 | BlockExpr |  |
-| test.rs:220:5:226:5 | enter test_if_or_operator | test.rs:221:12:221:22 | ... \|\| ... |  |
-| test.rs:220:5:226:5 | exit test_if_or_operator (normal) | test.rs:220:5:226:5 | exit test_if_or_operator |  |
-| test.rs:220:62:226:5 | BlockExpr | test.rs:220:5:226:5 | exit test_if_or_operator (normal) |  |
-| test.rs:221:9:225:9 | IfExpr | test.rs:220:62:226:5 | BlockExpr |  |
-| test.rs:221:12:221:12 | a | test.rs:221:17:221:17 | b | false |
-| test.rs:221:12:221:12 | a | test.rs:222:13:222:16 | true | true |
-| test.rs:221:12:221:17 | ... \|\| ... | test.rs:221:12:221:12 | a |  |
-| test.rs:221:12:221:22 | ... \|\| ... | test.rs:221:12:221:17 | ... \|\| ... |  |
-| test.rs:221:17:221:17 | b | test.rs:221:22:221:22 | c | false |
-| test.rs:221:17:221:17 | b | test.rs:222:13:222:16 | true | true |
-| test.rs:221:22:221:22 | c | test.rs:222:13:222:16 | true | true |
-| test.rs:221:22:221:22 | c | test.rs:224:13:224:17 | false | false |
-| test.rs:221:24:223:9 | BlockExpr | test.rs:221:9:225:9 | IfExpr |  |
-| test.rs:222:13:222:16 | true | test.rs:221:24:223:9 | BlockExpr |  |
-| test.rs:223:16:225:9 | BlockExpr | test.rs:221:9:225:9 | IfExpr |  |
-| test.rs:224:13:224:17 | false | test.rs:223:16:225:9 | BlockExpr |  |
-| test.rs:228:5:234:5 | enter test_if_not_operator | test.rs:229:13:229:13 | a |  |
-| test.rs:228:5:234:5 | exit test_if_not_operator (normal) | test.rs:228:5:234:5 | exit test_if_not_operator |  |
-| test.rs:228:46:234:5 | BlockExpr | test.rs:228:5:234:5 | exit test_if_not_operator (normal) |  |
-| test.rs:229:9:233:9 | IfExpr | test.rs:228:46:234:5 | BlockExpr |  |
-| test.rs:229:12:229:13 | ! ... | test.rs:230:13:230:16 | true | true |
-| test.rs:229:12:229:13 | ! ... | test.rs:232:13:232:17 | false | false |
-| test.rs:229:13:229:13 | a | test.rs:229:12:229:13 | ! ... | false, true |
-| test.rs:229:15:231:9 | BlockExpr | test.rs:229:9:233:9 | IfExpr |  |
-| test.rs:230:13:230:16 | true | test.rs:229:15:231:9 | BlockExpr |  |
-| test.rs:231:16:233:9 | BlockExpr | test.rs:229:9:233:9 | IfExpr |  |
-| test.rs:232:13:232:17 | false | test.rs:231:16:233:9 | BlockExpr |  |
-| test.rs:237:1:243:1 | enter test_match | test.rs:238:11:238:21 | maybe_digit |  |
-| test.rs:237:1:243:1 | exit test_match (normal) | test.rs:237:1:243:1 | exit test_match |  |
-| test.rs:237:48:243:1 | BlockExpr | test.rs:237:1:243:1 | exit test_match (normal) |  |
-| test.rs:238:5:242:5 | MatchExpr | test.rs:237:48:243:1 | BlockExpr |  |
-| test.rs:238:11:238:21 | maybe_digit | test.rs:239:9:239:23 | TupleStructPat |  |
-| test.rs:239:9:239:23 | TupleStructPat | test.rs:239:28:239:28 | x | match |
-| test.rs:239:9:239:23 | TupleStructPat | test.rs:240:9:240:23 | TupleStructPat | no-match |
-| test.rs:239:28:239:28 | x | test.rs:239:32:239:33 | 10 |  |
-| test.rs:239:28:239:33 | ... < ... | test.rs:239:38:239:38 | x | true |
-| test.rs:239:28:239:33 | ... < ... | test.rs:240:9:240:23 | TupleStructPat | false |
-| test.rs:239:32:239:33 | 10 | test.rs:239:28:239:33 | ... < ... |  |
-| test.rs:239:38:239:38 | x | test.rs:239:42:239:42 | 5 |  |
-| test.rs:239:38:239:42 | ... + ... | test.rs:238:5:242:5 | MatchExpr |  |
-| test.rs:239:42:239:42 | 5 | test.rs:239:38:239:42 | ... + ... |  |
-| test.rs:240:9:240:23 | TupleStructPat | test.rs:240:28:240:28 | x | match |
-| test.rs:240:9:240:23 | TupleStructPat | test.rs:241:9:241:20 | PathPat | no-match |
-| test.rs:240:28:240:28 | x | test.rs:238:5:242:5 | MatchExpr |  |
-| test.rs:241:9:241:20 | PathPat | test.rs:241:25:241:25 | 5 | match |
-| test.rs:241:25:241:25 | 5 | test.rs:238:5:242:5 | MatchExpr |  |
-| test.rs:246:5:251:5 | enter test_infinite_loop | test.rs:247:9:249:9 | ExprStmt |  |
-| test.rs:247:9:249:9 | ExprStmt | test.rs:248:13:248:13 | 1 |  |
-| test.rs:247:14:249:9 | BlockExpr | test.rs:248:13:248:13 | 1 |  |
-| test.rs:248:13:248:13 | 1 | test.rs:247:14:249:9 | BlockExpr |  |
-| test.rs:253:5:256:5 | enter test_let_match | test.rs:254:9:254:49 | LetStmt |  |
-| test.rs:253:5:256:5 | exit test_let_match (normal) | test.rs:253:5:256:5 | exit test_let_match |  |
-| test.rs:253:39:256:5 | BlockExpr | test.rs:253:5:256:5 | exit test_let_match (normal) |  |
-| test.rs:254:9:254:49 | LetStmt | test.rs:254:23:254:23 | a |  |
-| test.rs:254:13:254:19 | TupleStructPat | test.rs:254:32:254:46 | "Expected some" | no-match |
-| test.rs:254:13:254:19 | TupleStructPat | test.rs:255:9:255:9 | n | match |
-| test.rs:254:23:254:23 | a | test.rs:254:13:254:19 | TupleStructPat |  |
-| test.rs:254:32:254:46 | "Expected some" | test.rs:254:30:254:48 | BlockExpr |  |
-| test.rs:255:9:255:9 | n | test.rs:253:39:256:5 | BlockExpr |  |
-| test.rs:259:1:264:1 | enter dead_code | test.rs:260:5:262:5 | ExprStmt |  |
-| test.rs:259:1:264:1 | exit dead_code (normal) | test.rs:259:1:264:1 | exit dead_code |  |
-| test.rs:260:5:262:5 | ExprStmt | test.rs:260:9:260:12 | true |  |
-| test.rs:260:9:260:12 | true | test.rs:261:9:261:17 | ExprStmt | true |
-| test.rs:261:9:261:16 | ReturnExpr | test.rs:259:1:264:1 | exit dead_code (normal) | return |
-| test.rs:261:9:261:17 | ExprStmt | test.rs:261:16:261:16 | 0 |  |
-| test.rs:261:16:261:16 | 0 | test.rs:261:9:261:16 | ReturnExpr |  |
-| test.rs:266:1:279:1 | enter labelled_block1 | test.rs:267:5:278:6 | LetStmt |  |
-| test.rs:266:1:279:1 | exit labelled_block1 (normal) | test.rs:266:1:279:1 | exit labelled_block1 |  |
-| test.rs:266:29:279:1 | BlockExpr | test.rs:266:1:279:1 | exit labelled_block1 (normal) |  |
-| test.rs:267:5:278:6 | LetStmt | test.rs:268:9:268:19 | ExprStmt |  |
-| test.rs:267:9:267:14 | result | test.rs:266:29:279:1 | BlockExpr | match, no-match |
-| test.rs:267:18:278:5 | BlockExpr | test.rs:267:9:267:14 | result |  |
-| test.rs:268:9:268:16 | PathExpr | test.rs:268:9:268:18 | CallExpr |  |
-| test.rs:268:9:268:18 | CallExpr | test.rs:269:9:271:9 | ExprStmt |  |
-| test.rs:268:9:268:19 | ExprStmt | test.rs:268:9:268:16 | PathExpr |  |
-| test.rs:269:9:271:9 | ExprStmt | test.rs:269:12:269:28 | PathExpr |  |
-| test.rs:269:9:271:9 | IfExpr | test.rs:272:9:272:24 | ExprStmt |  |
-| test.rs:269:12:269:28 | PathExpr | test.rs:269:12:269:30 | CallExpr |  |
-| test.rs:269:12:269:30 | CallExpr | test.rs:269:9:271:9 | IfExpr | false |
-| test.rs:269:12:269:30 | CallExpr | test.rs:270:13:270:27 | ExprStmt | true |
-| test.rs:270:13:270:26 | BreakExpr | test.rs:267:18:278:5 | BlockExpr | break('block) |
-| test.rs:270:13:270:27 | ExprStmt | test.rs:270:26:270:26 | 1 |  |
-| test.rs:270:26:270:26 | 1 | test.rs:270:13:270:26 | BreakExpr |  |
-| test.rs:272:9:272:21 | PathExpr | test.rs:272:9:272:23 | CallExpr |  |
-| test.rs:272:9:272:23 | CallExpr | test.rs:273:9:275:9 | ExprStmt |  |
-| test.rs:272:9:272:24 | ExprStmt | test.rs:272:9:272:21 | PathExpr |  |
-| test.rs:273:9:275:9 | ExprStmt | test.rs:273:12:273:28 | PathExpr |  |
-| test.rs:273:9:275:9 | IfExpr | test.rs:276:9:276:24 | ExprStmt |  |
-| test.rs:273:12:273:28 | PathExpr | test.rs:273:12:273:30 | CallExpr |  |
-| test.rs:273:12:273:30 | CallExpr | test.rs:273:9:275:9 | IfExpr | false |
-| test.rs:273:12:273:30 | CallExpr | test.rs:274:13:274:27 | ExprStmt | true |
-| test.rs:274:13:274:26 | BreakExpr | test.rs:267:18:278:5 | BlockExpr | break('block) |
-| test.rs:274:13:274:27 | ExprStmt | test.rs:274:26:274:26 | 2 |  |
-| test.rs:274:26:274:26 | 2 | test.rs:274:13:274:26 | BreakExpr |  |
-| test.rs:276:9:276:21 | PathExpr | test.rs:276:9:276:23 | CallExpr |  |
-| test.rs:276:9:276:23 | CallExpr | test.rs:277:9:277:9 | 3 |  |
-| test.rs:276:9:276:24 | ExprStmt | test.rs:276:9:276:21 | PathExpr |  |
-| test.rs:277:9:277:9 | 3 | test.rs:267:18:278:5 | BlockExpr |  |
-| test.rs:281:1:289:1 | enter labelled_block2 | test.rs:282:5:288:6 | LetStmt |  |
-| test.rs:281:1:289:1 | exit labelled_block2 (normal) | test.rs:281:1:289:1 | exit labelled_block2 |  |
-| test.rs:281:29:289:1 | BlockExpr | test.rs:281:1:289:1 | exit labelled_block2 (normal) |  |
-| test.rs:282:5:288:6 | LetStmt | test.rs:283:9:283:34 | LetStmt |  |
-| test.rs:282:9:282:14 | result | test.rs:281:29:289:1 | BlockExpr | match, no-match |
-| test.rs:282:18:288:5 | BlockExpr | test.rs:282:9:282:14 | result |  |
-| test.rs:283:9:283:34 | LetStmt | test.rs:283:30:283:33 | PathExpr |  |
-| test.rs:283:13:283:13 | x | test.rs:284:9:286:10 | LetStmt | match, no-match |
-| test.rs:283:30:283:33 | PathExpr | test.rs:283:13:283:13 | x |  |
-| test.rs:284:9:286:10 | LetStmt | test.rs:284:23:284:23 | x |  |
-| test.rs:284:13:284:19 | TupleStructPat | test.rs:285:13:285:27 | ExprStmt | no-match |
-| test.rs:284:13:284:19 | TupleStructPat | test.rs:287:9:287:9 | x | match |
-| test.rs:284:23:284:23 | x | test.rs:284:13:284:19 | TupleStructPat |  |
-| test.rs:285:13:285:26 | BreakExpr | test.rs:282:18:288:5 | BlockExpr | break('block) |
-| test.rs:285:13:285:27 | ExprStmt | test.rs:285:26:285:26 | 1 |  |
-| test.rs:285:26:285:26 | 1 | test.rs:285:13:285:26 | BreakExpr |  |
-| test.rs:287:9:287:9 | x | test.rs:282:18:288:5 | BlockExpr |  |
+| test.rs:54:5:66:5 | enter test_loop_label_shadowing | test.rs:56:13:56:14 | ExprStmt |  |
+| test.rs:56:13:56:13 | 1 | test.rs:58:17:62:17 | ExprStmt |  |
+| test.rs:56:13:56:14 | ExprStmt | test.rs:56:13:56:13 | 1 |  |
+| test.rs:58:17:62:17 | ExprStmt | test.rs:58:20:58:20 | b |  |
+| test.rs:58:17:62:17 | IfExpr | test.rs:63:17:63:31 | ExprStmt |  |
+| test.rs:58:20:58:20 | b | test.rs:59:21:59:29 | ExprStmt | true |
+| test.rs:58:20:58:20 | b | test.rs:60:27:60:27 | b | false |
+| test.rs:59:21:59:28 | ContinueExpr | test.rs:58:17:62:17 | ExprStmt | continue |
+| test.rs:59:21:59:29 | ExprStmt | test.rs:59:21:59:28 | ContinueExpr |  |
+| test.rs:60:24:62:17 | IfExpr | test.rs:58:17:62:17 | IfExpr |  |
+| test.rs:60:27:60:27 | b | test.rs:60:24:62:17 | IfExpr | false |
+| test.rs:60:27:60:27 | b | test.rs:61:21:61:35 | ExprStmt | true |
+| test.rs:61:21:61:34 | ContinueExpr | test.rs:58:17:62:17 | ExprStmt | continue('loop) |
+| test.rs:61:21:61:35 | ExprStmt | test.rs:61:21:61:34 | ContinueExpr |  |
+| test.rs:63:17:63:30 | ContinueExpr | test.rs:58:17:62:17 | ExprStmt | continue('loop) |
+| test.rs:63:17:63:31 | ExprStmt | test.rs:63:17:63:30 | ContinueExpr |  |
+| test.rs:68:5:77:5 | enter test_while | test.rs:69:9:69:25 | LetStmt |  |
+| test.rs:68:5:77:5 | exit test_while (normal) | test.rs:68:5:77:5 | exit test_while |  |
+| test.rs:68:27:77:5 | BlockExpr | test.rs:68:5:77:5 | exit test_while (normal) |  |
+| test.rs:69:9:69:25 | LetStmt | test.rs:69:21:69:24 | true |  |
+| test.rs:69:13:69:17 | b | test.rs:70:15:70:15 | b | match, no-match |
+| test.rs:69:21:69:24 | true | test.rs:69:13:69:17 | b |  |
+| test.rs:70:9:76:9 | WhileExpr | test.rs:68:27:77:5 | BlockExpr |  |
+| test.rs:70:15:70:15 | b | test.rs:70:9:76:9 | WhileExpr | false |
+| test.rs:70:15:70:15 | b | test.rs:71:13:71:14 | ExprStmt | true |
+| test.rs:70:17:76:9 | BlockExpr | test.rs:70:15:70:15 | b |  |
+| test.rs:71:13:71:13 | 1 | test.rs:72:13:74:13 | ExprStmt |  |
+| test.rs:71:13:71:14 | ExprStmt | test.rs:71:13:71:13 | 1 |  |
+| test.rs:72:13:74:13 | ExprStmt | test.rs:72:17:72:17 | i |  |
+| test.rs:72:13:74:13 | IfExpr | test.rs:75:13:75:22 | ExprStmt |  |
+| test.rs:72:17:72:17 | i | test.rs:72:21:72:21 | 0 |  |
+| test.rs:72:17:72:21 | ... > ... | test.rs:72:13:74:13 | IfExpr | false |
+| test.rs:72:17:72:21 | ... > ... | test.rs:73:17:73:22 | ExprStmt | true |
+| test.rs:72:21:72:21 | 0 | test.rs:72:17:72:21 | ... > ... |  |
+| test.rs:73:17:73:21 | BreakExpr | test.rs:70:9:76:9 | WhileExpr | break |
+| test.rs:73:17:73:22 | ExprStmt | test.rs:73:17:73:21 | BreakExpr |  |
+| test.rs:75:13:75:13 | PathExpr | test.rs:75:17:75:21 | false |  |
+| test.rs:75:13:75:21 | ... = ... | test.rs:70:17:76:9 | BlockExpr |  |
+| test.rs:75:13:75:22 | ExprStmt | test.rs:75:13:75:13 | PathExpr |  |
+| test.rs:75:17:75:21 | false | test.rs:75:13:75:21 | ... = ... |  |
+| test.rs:79:5:86:5 | enter test_while_let | test.rs:80:9:80:29 | LetStmt |  |
+| test.rs:79:5:86:5 | exit test_while_let (normal) | test.rs:79:5:86:5 | exit test_while_let |  |
+| test.rs:79:25:86:5 | BlockExpr | test.rs:79:5:86:5 | exit test_while_let (normal) |  |
+| test.rs:80:9:80:29 | LetStmt | test.rs:80:24:80:24 | 1 |  |
+| test.rs:80:13:80:20 | iter | test.rs:81:15:81:39 | LetExpr | match, no-match |
+| test.rs:80:24:80:24 | 1 | test.rs:80:27:80:28 | 10 |  |
+| test.rs:80:24:80:28 | RangeExpr | test.rs:80:13:80:20 | iter |  |
+| test.rs:80:27:80:28 | 10 | test.rs:80:24:80:28 | RangeExpr |  |
+| test.rs:81:9:85:9 | WhileExpr | test.rs:79:25:86:5 | BlockExpr |  |
+| test.rs:81:15:81:39 | LetExpr | test.rs:81:19:81:25 | TupleStructPat |  |
+| test.rs:81:19:81:25 | TupleStructPat | test.rs:81:9:85:9 | WhileExpr | no-match |
+| test.rs:81:19:81:25 | TupleStructPat | test.rs:82:17:82:17 | PathExpr | match |
+| test.rs:81:41:85:9 | BlockExpr | test.rs:81:15:81:39 | LetExpr |  |
+| test.rs:82:13:84:13 | IfExpr | test.rs:81:41:85:9 | BlockExpr |  |
+| test.rs:82:17:82:17 | PathExpr | test.rs:82:21:82:21 | 5 |  |
+| test.rs:82:17:82:21 | ... = ... | test.rs:82:13:84:13 | IfExpr | false |
+| test.rs:82:17:82:21 | ... = ... | test.rs:83:17:83:22 | ExprStmt | true |
+| test.rs:82:21:82:21 | 5 | test.rs:82:17:82:21 | ... = ... |  |
+| test.rs:83:17:83:21 | BreakExpr | test.rs:81:9:85:9 | WhileExpr | break |
+| test.rs:83:17:83:22 | ExprStmt | test.rs:83:17:83:21 | BreakExpr |  |
+| test.rs:88:5:95:5 | enter test_for | test.rs:89:18:89:18 | 0 |  |
+| test.rs:88:5:95:5 | exit test_for (normal) | test.rs:88:5:95:5 | exit test_for |  |
+| test.rs:88:25:95:5 | BlockExpr | test.rs:88:5:95:5 | exit test_for (normal) |  |
+| test.rs:89:9:94:9 | ForExpr | test.rs:88:25:95:5 | BlockExpr |  |
+| test.rs:89:13:89:13 | i | test.rs:89:9:94:9 | ForExpr | no-match |
+| test.rs:89:13:89:13 | i | test.rs:90:13:92:13 | ExprStmt | match |
+| test.rs:89:18:89:18 | 0 | test.rs:89:21:89:22 | 10 |  |
+| test.rs:89:18:89:22 | RangeExpr | test.rs:89:13:89:13 | i |  |
+| test.rs:89:21:89:22 | 10 | test.rs:89:18:89:22 | RangeExpr |  |
+| test.rs:89:24:94:9 | BlockExpr | test.rs:89:13:89:13 | i |  |
+| test.rs:90:13:92:13 | ExprStmt | test.rs:90:17:90:17 | i |  |
+| test.rs:90:13:92:13 | IfExpr | test.rs:93:13:93:14 | ExprStmt |  |
+| test.rs:90:17:90:17 | i | test.rs:90:22:90:22 | j |  |
+| test.rs:90:17:90:22 | ... == ... | test.rs:90:13:92:13 | IfExpr | false |
+| test.rs:90:17:90:22 | ... == ... | test.rs:91:17:91:22 | ExprStmt | true |
+| test.rs:90:22:90:22 | j | test.rs:90:17:90:22 | ... == ... |  |
+| test.rs:91:17:91:21 | BreakExpr | test.rs:89:9:94:9 | ForExpr | break |
+| test.rs:91:17:91:22 | ExprStmt | test.rs:91:17:91:21 | BreakExpr |  |
+| test.rs:93:13:93:13 | 1 | test.rs:89:24:94:9 | BlockExpr |  |
+| test.rs:93:13:93:14 | ExprStmt | test.rs:93:13:93:13 | 1 |  |
+| test.rs:98:1:101:1 | enter test_nested_function | test.rs:99:5:99:28 | LetStmt |  |
+| test.rs:98:1:101:1 | exit test_nested_function (normal) | test.rs:98:1:101:1 | exit test_nested_function |  |
+| test.rs:98:40:101:1 | BlockExpr | test.rs:98:1:101:1 | exit test_nested_function (normal) |  |
+| test.rs:99:5:99:28 | LetStmt | test.rs:99:19:99:27 | ClosureExpr |  |
+| test.rs:99:9:99:15 | add_one | test.rs:100:5:100:11 | add_one | match, no-match |
+| test.rs:99:19:99:27 | ClosureExpr | test.rs:99:9:99:15 | add_one |  |
+| test.rs:99:19:99:27 | enter ClosureExpr | test.rs:99:23:99:23 | i |  |
+| test.rs:99:19:99:27 | exit ClosureExpr (normal) | test.rs:99:19:99:27 | exit ClosureExpr |  |
+| test.rs:99:23:99:23 | i | test.rs:99:27:99:27 | 1 |  |
+| test.rs:99:23:99:27 | ... + ... | test.rs:99:19:99:27 | exit ClosureExpr (normal) |  |
+| test.rs:99:27:99:27 | 1 | test.rs:99:23:99:27 | ... + ... |  |
+| test.rs:100:5:100:11 | add_one | test.rs:100:13:100:19 | add_one |  |
+| test.rs:100:5:100:23 | CallExpr | test.rs:98:40:101:1 | BlockExpr |  |
+| test.rs:100:13:100:19 | add_one | test.rs:100:21:100:21 | n |  |
+| test.rs:100:13:100:22 | CallExpr | test.rs:100:5:100:23 | CallExpr |  |
+| test.rs:100:21:100:21 | n | test.rs:100:13:100:22 | CallExpr |  |
+| test.rs:105:5:111:5 | enter test_if_else | test.rs:106:12:106:12 | n |  |
+| test.rs:105:5:111:5 | exit test_if_else (normal) | test.rs:105:5:111:5 | exit test_if_else |  |
+| test.rs:105:36:111:5 | BlockExpr | test.rs:105:5:111:5 | exit test_if_else (normal) |  |
+| test.rs:106:9:110:9 | IfExpr | test.rs:105:36:111:5 | BlockExpr |  |
+| test.rs:106:12:106:12 | n | test.rs:106:17:106:17 | 0 |  |
+| test.rs:106:12:106:17 | ... <= ... | test.rs:107:13:107:13 | 0 | true |
+| test.rs:106:12:106:17 | ... <= ... | test.rs:109:13:109:13 | n | false |
+| test.rs:106:17:106:17 | 0 | test.rs:106:12:106:17 | ... <= ... |  |
+| test.rs:106:19:108:9 | BlockExpr | test.rs:106:9:110:9 | IfExpr |  |
+| test.rs:107:13:107:13 | 0 | test.rs:106:19:108:9 | BlockExpr |  |
+| test.rs:108:16:110:9 | BlockExpr | test.rs:106:9:110:9 | IfExpr |  |
+| test.rs:109:13:109:13 | n | test.rs:109:17:109:17 | 1 |  |
+| test.rs:109:13:109:17 | ... - ... | test.rs:108:16:110:9 | BlockExpr |  |
+| test.rs:109:17:109:17 | 1 | test.rs:109:13:109:17 | ... - ... |  |
+| test.rs:113:5:119:5 | enter test_if_let_else | test.rs:114:12:114:26 | LetExpr |  |
+| test.rs:113:5:119:5 | exit test_if_let_else (normal) | test.rs:113:5:119:5 | exit test_if_let_else |  |
+| test.rs:113:48:119:5 | BlockExpr | test.rs:113:5:119:5 | exit test_if_let_else (normal) |  |
+| test.rs:114:9:118:9 | IfExpr | test.rs:113:48:119:5 | BlockExpr |  |
+| test.rs:114:12:114:26 | LetExpr | test.rs:114:16:114:22 | TupleStructPat |  |
+| test.rs:114:16:114:22 | TupleStructPat | test.rs:115:13:115:13 | n | match |
+| test.rs:114:16:114:22 | TupleStructPat | test.rs:117:13:117:13 | 0 | no-match |
+| test.rs:114:28:116:9 | BlockExpr | test.rs:114:9:118:9 | IfExpr |  |
+| test.rs:115:13:115:13 | n | test.rs:114:28:116:9 | BlockExpr |  |
+| test.rs:116:16:118:9 | BlockExpr | test.rs:114:9:118:9 | IfExpr |  |
+| test.rs:117:13:117:13 | 0 | test.rs:116:16:118:9 | BlockExpr |  |
+| test.rs:121:5:126:5 | enter test_if_let | test.rs:122:9:124:9 | ExprStmt |  |
+| test.rs:121:5:126:5 | exit test_if_let (normal) | test.rs:121:5:126:5 | exit test_if_let |  |
+| test.rs:121:43:126:5 | BlockExpr | test.rs:121:5:126:5 | exit test_if_let (normal) |  |
+| test.rs:122:9:124:9 | ExprStmt | test.rs:122:12:122:26 | LetExpr |  |
+| test.rs:122:9:124:9 | IfExpr | test.rs:125:9:125:9 | 0 |  |
+| test.rs:122:12:122:26 | LetExpr | test.rs:122:16:122:22 | TupleStructPat |  |
+| test.rs:122:16:122:22 | TupleStructPat | test.rs:122:9:124:9 | IfExpr | no-match |
+| test.rs:122:16:122:22 | TupleStructPat | test.rs:123:13:123:13 | n | match |
+| test.rs:122:28:124:9 | BlockExpr | test.rs:122:9:124:9 | IfExpr |  |
+| test.rs:123:13:123:13 | n | test.rs:122:28:124:9 | BlockExpr |  |
+| test.rs:125:9:125:9 | 0 | test.rs:121:43:126:5 | BlockExpr |  |
+| test.rs:128:5:134:5 | enter test_nested_if | test.rs:129:16:129:16 | PathExpr |  |
+| test.rs:128:5:134:5 | exit test_nested_if (normal) | test.rs:128:5:134:5 | exit test_nested_if |  |
+| test.rs:128:38:134:5 | BlockExpr | test.rs:128:5:134:5 | exit test_nested_if (normal) |  |
+| test.rs:129:9:133:9 | IfExpr | test.rs:128:38:134:5 | BlockExpr |  |
+| test.rs:129:13:129:48 | IfExpr | test.rs:130:13:130:13 | 1 | true |
+| test.rs:129:13:129:48 | IfExpr | test.rs:132:13:132:13 | 0 | false |
+| test.rs:129:16:129:16 | PathExpr | test.rs:129:20:129:20 | 0 |  |
+| test.rs:129:16:129:20 | ... < ... | test.rs:129:24:129:24 | a | true |
+| test.rs:129:16:129:20 | ... < ... | test.rs:129:41:129:41 | a | false |
+| test.rs:129:20:129:20 | 0 | test.rs:129:16:129:20 | ... < ... |  |
+| test.rs:129:22:129:32 | BlockExpr | test.rs:129:13:129:48 | IfExpr | false, true |
+| test.rs:129:24:129:24 | a | test.rs:129:29:129:30 | 10 |  |
+| test.rs:129:24:129:30 | ... < ... | test.rs:129:22:129:32 | BlockExpr | false, true |
+| test.rs:129:28:129:30 | - ... | test.rs:129:24:129:30 | ... < ... |  |
+| test.rs:129:29:129:30 | 10 | test.rs:129:28:129:30 | - ... |  |
+| test.rs:129:39:129:48 | BlockExpr | test.rs:129:13:129:48 | IfExpr | false, true |
+| test.rs:129:41:129:41 | a | test.rs:129:45:129:46 | 10 |  |
+| test.rs:129:41:129:46 | ... > ... | test.rs:129:39:129:48 | BlockExpr | false, true |
+| test.rs:129:45:129:46 | 10 | test.rs:129:41:129:46 | ... > ... |  |
+| test.rs:129:51:131:9 | BlockExpr | test.rs:129:9:133:9 | IfExpr |  |
+| test.rs:130:13:130:13 | 1 | test.rs:129:51:131:9 | BlockExpr |  |
+| test.rs:131:16:133:9 | BlockExpr | test.rs:129:9:133:9 | IfExpr |  |
+| test.rs:132:13:132:13 | 0 | test.rs:131:16:133:9 | BlockExpr |  |
+| test.rs:136:5:145:5 | enter test_nested_if_match | test.rs:137:19:137:19 | a |  |
+| test.rs:136:5:145:5 | exit test_nested_if_match (normal) | test.rs:136:5:145:5 | exit test_nested_if_match |  |
+| test.rs:136:44:145:5 | BlockExpr | test.rs:136:5:145:5 | exit test_nested_if_match (normal) |  |
+| test.rs:137:9:144:9 | IfExpr | test.rs:136:44:145:5 | BlockExpr |  |
+| test.rs:137:13:140:9 | MatchExpr | test.rs:141:13:141:13 | 1 | true |
+| test.rs:137:13:140:9 | MatchExpr | test.rs:143:13:143:13 | 0 | false |
+| test.rs:137:19:137:19 | a | test.rs:138:13:138:13 | LiteralPat |  |
+| test.rs:138:13:138:13 | LiteralPat | test.rs:138:18:138:21 | true | match |
+| test.rs:138:13:138:13 | LiteralPat | test.rs:139:13:139:13 | WildcardPat | no-match |
+| test.rs:138:18:138:21 | true | test.rs:137:13:140:9 | MatchExpr |  |
+| test.rs:139:13:139:13 | WildcardPat | test.rs:139:18:139:22 | false | match |
+| test.rs:139:18:139:22 | false | test.rs:137:13:140:9 | MatchExpr |  |
+| test.rs:140:12:142:9 | BlockExpr | test.rs:137:9:144:9 | IfExpr |  |
+| test.rs:141:13:141:13 | 1 | test.rs:140:12:142:9 | BlockExpr |  |
+| test.rs:142:16:144:9 | BlockExpr | test.rs:137:9:144:9 | IfExpr |  |
+| test.rs:143:13:143:13 | 0 | test.rs:142:16:144:9 | BlockExpr |  |
+| test.rs:147:5:156:5 | enter test_nested_if_block | test.rs:149:13:149:15 | ExprStmt |  |
+| test.rs:147:5:156:5 | exit test_nested_if_block (normal) | test.rs:147:5:156:5 | exit test_nested_if_block |  |
+| test.rs:147:44:156:5 | BlockExpr | test.rs:147:5:156:5 | exit test_nested_if_block (normal) |  |
+| test.rs:148:9:155:9 | IfExpr | test.rs:147:44:156:5 | BlockExpr |  |
+| test.rs:148:12:151:9 | BlockExpr | test.rs:152:13:152:13 | 1 | true |
+| test.rs:148:12:151:9 | BlockExpr | test.rs:154:13:154:13 | 0 | false |
+| test.rs:149:13:149:14 | TupleExpr | test.rs:150:13:150:13 | a |  |
+| test.rs:149:13:149:15 | ExprStmt | test.rs:149:13:149:14 | TupleExpr |  |
+| test.rs:150:13:150:13 | a | test.rs:150:17:150:17 | 0 |  |
+| test.rs:150:13:150:17 | ... > ... | test.rs:148:12:151:9 | BlockExpr | false, true |
+| test.rs:150:17:150:17 | 0 | test.rs:150:13:150:17 | ... > ... |  |
+| test.rs:151:11:153:9 | BlockExpr | test.rs:148:9:155:9 | IfExpr |  |
+| test.rs:152:13:152:13 | 1 | test.rs:151:11:153:9 | BlockExpr |  |
+| test.rs:153:16:155:9 | BlockExpr | test.rs:148:9:155:9 | IfExpr |  |
+| test.rs:154:13:154:13 | 0 | test.rs:153:16:155:9 | BlockExpr |  |
+| test.rs:158:5:165:5 | enter test_if_assignment | test.rs:159:9:159:26 | LetStmt |  |
+| test.rs:158:5:165:5 | exit test_if_assignment (normal) | test.rs:158:5:165:5 | exit test_if_assignment |  |
+| test.rs:158:42:165:5 | BlockExpr | test.rs:158:5:165:5 | exit test_if_assignment (normal) |  |
+| test.rs:159:9:159:26 | LetStmt | test.rs:159:21:159:25 | false |  |
+| test.rs:159:13:159:17 | x | test.rs:160:12:160:12 | x | match, no-match |
+| test.rs:159:21:159:25 | false | test.rs:159:13:159:17 | x |  |
+| test.rs:160:9:164:9 | IfExpr | test.rs:158:42:165:5 | BlockExpr |  |
+| test.rs:160:12:160:12 | x | test.rs:160:16:160:19 | true |  |
+| test.rs:160:12:160:19 | ... = ... | test.rs:161:13:161:13 | 1 | true |
+| test.rs:160:12:160:19 | ... = ... | test.rs:163:13:163:13 | 0 | false |
+| test.rs:160:16:160:19 | true | test.rs:160:12:160:19 | ... = ... |  |
+| test.rs:160:21:162:9 | BlockExpr | test.rs:160:9:164:9 | IfExpr |  |
+| test.rs:161:13:161:13 | 1 | test.rs:160:21:162:9 | BlockExpr |  |
+| test.rs:162:16:164:9 | BlockExpr | test.rs:160:9:164:9 | IfExpr |  |
+| test.rs:163:13:163:13 | 0 | test.rs:162:16:164:9 | BlockExpr |  |
+| test.rs:167:5:178:5 | enter test_if_loop1 | test.rs:169:13:171:14 | ExprStmt |  |
+| test.rs:167:5:178:5 | exit test_if_loop1 (normal) | test.rs:167:5:178:5 | exit test_if_loop1 |  |
+| test.rs:167:37:178:5 | BlockExpr | test.rs:167:5:178:5 | exit test_if_loop1 (normal) |  |
+| test.rs:168:9:177:9 | IfExpr | test.rs:167:37:178:5 | BlockExpr |  |
+| test.rs:168:13:173:9 | LoopExpr | test.rs:174:13:174:13 | 1 | true |
+| test.rs:168:13:173:9 | LoopExpr | test.rs:176:13:176:13 | 0 | false |
+| test.rs:168:18:173:9 | BlockExpr | test.rs:169:13:171:14 | ExprStmt |  |
+| test.rs:169:13:171:13 | IfExpr | test.rs:172:13:172:19 | ExprStmt |  |
+| test.rs:169:13:171:14 | ExprStmt | test.rs:169:16:169:16 | a |  |
+| test.rs:169:16:169:16 | a | test.rs:169:20:169:20 | 0 |  |
+| test.rs:169:16:169:20 | ... > ... | test.rs:169:13:171:13 | IfExpr | false |
+| test.rs:169:16:169:20 | ... > ... | test.rs:170:17:170:29 | ExprStmt | true |
+| test.rs:169:20:169:20 | 0 | test.rs:169:16:169:20 | ... > ... |  |
+| test.rs:170:17:170:28 | BreakExpr | test.rs:168:13:173:9 | LoopExpr | break |
+| test.rs:170:17:170:29 | ExprStmt | test.rs:170:23:170:23 | a |  |
+| test.rs:170:23:170:23 | a | test.rs:170:27:170:28 | 10 |  |
+| test.rs:170:23:170:28 | ... > ... | test.rs:170:17:170:28 | BreakExpr |  |
+| test.rs:170:27:170:28 | 10 | test.rs:170:23:170:28 | ... > ... |  |
+| test.rs:172:13:172:13 | a | test.rs:172:17:172:18 | 10 |  |
+| test.rs:172:13:172:18 | ... < ... | test.rs:168:18:173:9 | BlockExpr |  |
+| test.rs:172:13:172:19 | ExprStmt | test.rs:172:13:172:13 | a |  |
+| test.rs:172:17:172:18 | 10 | test.rs:172:13:172:18 | ... < ... |  |
+| test.rs:173:12:175:9 | BlockExpr | test.rs:168:9:177:9 | IfExpr |  |
+| test.rs:174:13:174:13 | 1 | test.rs:173:12:175:9 | BlockExpr |  |
+| test.rs:175:16:177:9 | BlockExpr | test.rs:168:9:177:9 | IfExpr |  |
+| test.rs:176:13:176:13 | 0 | test.rs:175:16:177:9 | BlockExpr |  |
+| test.rs:180:5:191:5 | enter test_if_loop2 | test.rs:182:13:184:14 | ExprStmt |  |
+| test.rs:180:5:191:5 | exit test_if_loop2 (normal) | test.rs:180:5:191:5 | exit test_if_loop2 |  |
+| test.rs:180:37:191:5 | BlockExpr | test.rs:180:5:191:5 | exit test_if_loop2 (normal) |  |
+| test.rs:181:9:190:9 | IfExpr | test.rs:180:37:191:5 | BlockExpr |  |
+| test.rs:181:13:186:9 | LoopExpr | test.rs:187:13:187:13 | 1 | true |
+| test.rs:181:13:186:9 | LoopExpr | test.rs:189:13:189:13 | 0 | false |
+| test.rs:181:26:186:9 | BlockExpr | test.rs:182:13:184:14 | ExprStmt |  |
+| test.rs:182:13:184:13 | IfExpr | test.rs:185:13:185:19 | ExprStmt |  |
+| test.rs:182:13:184:14 | ExprStmt | test.rs:182:16:182:16 | a |  |
+| test.rs:182:16:182:16 | a | test.rs:182:20:182:20 | 0 |  |
+| test.rs:182:16:182:20 | ... > ... | test.rs:182:13:184:13 | IfExpr | false |
+| test.rs:182:16:182:20 | ... > ... | test.rs:183:17:183:36 | ExprStmt | true |
+| test.rs:182:20:182:20 | 0 | test.rs:182:16:182:20 | ... > ... |  |
+| test.rs:183:17:183:35 | BreakExpr | test.rs:181:13:186:9 | LoopExpr | break('label) |
+| test.rs:183:17:183:36 | ExprStmt | test.rs:183:30:183:30 | a |  |
+| test.rs:183:30:183:30 | a | test.rs:183:34:183:35 | 10 |  |
+| test.rs:183:30:183:35 | ... > ... | test.rs:183:17:183:35 | BreakExpr |  |
+| test.rs:183:34:183:35 | 10 | test.rs:183:30:183:35 | ... > ... |  |
+| test.rs:185:13:185:13 | a | test.rs:185:17:185:18 | 10 |  |
+| test.rs:185:13:185:18 | ... < ... | test.rs:181:26:186:9 | BlockExpr |  |
+| test.rs:185:13:185:19 | ExprStmt | test.rs:185:13:185:13 | a |  |
+| test.rs:185:17:185:18 | 10 | test.rs:185:13:185:18 | ... < ... |  |
+| test.rs:186:12:188:9 | BlockExpr | test.rs:181:9:190:9 | IfExpr |  |
+| test.rs:187:13:187:13 | 1 | test.rs:186:12:188:9 | BlockExpr |  |
+| test.rs:188:16:190:9 | BlockExpr | test.rs:181:9:190:9 | IfExpr |  |
+| test.rs:189:13:189:13 | 0 | test.rs:188:16:190:9 | BlockExpr |  |
+| test.rs:193:5:201:5 | enter test_labelled_block | test.rs:195:13:195:31 | ExprStmt |  |
+| test.rs:193:5:201:5 | exit test_labelled_block (normal) | test.rs:193:5:201:5 | exit test_labelled_block |  |
+| test.rs:193:43:201:5 | BlockExpr | test.rs:193:5:201:5 | exit test_labelled_block (normal) |  |
+| test.rs:194:9:200:9 | IfExpr | test.rs:193:43:201:5 | BlockExpr |  |
+| test.rs:194:13:196:9 | BlockExpr | test.rs:197:13:197:13 | 1 | true |
+| test.rs:194:13:196:9 | BlockExpr | test.rs:199:13:199:13 | 0 | false |
+| test.rs:195:13:195:30 | BreakExpr | test.rs:194:13:196:9 | BlockExpr | break('block) |
+| test.rs:195:13:195:31 | ExprStmt | test.rs:195:26:195:26 | a |  |
+| test.rs:195:26:195:26 | a | test.rs:195:30:195:30 | 0 |  |
+| test.rs:195:26:195:30 | ... > ... | test.rs:195:13:195:30 | BreakExpr |  |
+| test.rs:195:30:195:30 | 0 | test.rs:195:26:195:30 | ... > ... |  |
+| test.rs:196:12:198:9 | BlockExpr | test.rs:194:9:200:9 | IfExpr |  |
+| test.rs:197:13:197:13 | 1 | test.rs:196:12:198:9 | BlockExpr |  |
+| test.rs:198:16:200:9 | BlockExpr | test.rs:194:9:200:9 | IfExpr |  |
+| test.rs:199:13:199:13 | 0 | test.rs:198:16:200:9 | BlockExpr |  |
+| test.rs:206:5:209:5 | enter test_and_operator | test.rs:207:9:207:28 | LetStmt |  |
+| test.rs:206:5:209:5 | exit test_and_operator (normal) | test.rs:206:5:209:5 | exit test_and_operator |  |
+| test.rs:206:61:209:5 | BlockExpr | test.rs:206:5:209:5 | exit test_and_operator (normal) |  |
+| test.rs:207:9:207:28 | LetStmt | test.rs:207:17:207:27 | ... && ... |  |
+| test.rs:207:13:207:13 | d | test.rs:208:9:208:9 | d | match, no-match |
+| test.rs:207:17:207:17 | a | test.rs:207:13:207:13 | d | false |
+| test.rs:207:17:207:17 | a | test.rs:207:22:207:22 | b | true |
+| test.rs:207:17:207:22 | ... && ... | test.rs:207:17:207:17 | a |  |
+| test.rs:207:17:207:27 | ... && ... | test.rs:207:17:207:22 | ... && ... |  |
+| test.rs:207:22:207:22 | b | test.rs:207:13:207:13 | d | false |
+| test.rs:207:22:207:22 | b | test.rs:207:27:207:27 | c | true |
+| test.rs:207:27:207:27 | c | test.rs:207:13:207:13 | d |  |
+| test.rs:208:9:208:9 | d | test.rs:206:61:209:5 | BlockExpr |  |
+| test.rs:211:5:214:5 | enter test_or_operator | test.rs:212:9:212:28 | LetStmt |  |
+| test.rs:211:5:214:5 | exit test_or_operator (normal) | test.rs:211:5:214:5 | exit test_or_operator |  |
+| test.rs:211:60:214:5 | BlockExpr | test.rs:211:5:214:5 | exit test_or_operator (normal) |  |
+| test.rs:212:9:212:28 | LetStmt | test.rs:212:17:212:27 | ... \|\| ... |  |
+| test.rs:212:13:212:13 | d | test.rs:213:9:213:9 | d | match, no-match |
+| test.rs:212:17:212:17 | a | test.rs:212:13:212:13 | d | true |
+| test.rs:212:17:212:17 | a | test.rs:212:22:212:22 | b | false |
+| test.rs:212:17:212:22 | ... \|\| ... | test.rs:212:17:212:17 | a |  |
+| test.rs:212:17:212:27 | ... \|\| ... | test.rs:212:17:212:22 | ... \|\| ... |  |
+| test.rs:212:22:212:22 | b | test.rs:212:13:212:13 | d | true |
+| test.rs:212:22:212:22 | b | test.rs:212:27:212:27 | c | false |
+| test.rs:212:27:212:27 | c | test.rs:212:13:212:13 | d |  |
+| test.rs:213:9:213:9 | d | test.rs:211:60:214:5 | BlockExpr |  |
+| test.rs:216:5:219:5 | enter test_or_operator_2 | test.rs:217:9:217:36 | LetStmt |  |
+| test.rs:216:5:219:5 | exit test_or_operator_2 (normal) | test.rs:216:5:219:5 | exit test_or_operator_2 |  |
+| test.rs:216:61:219:5 | BlockExpr | test.rs:216:5:219:5 | exit test_or_operator_2 (normal) |  |
+| test.rs:217:9:217:36 | LetStmt | test.rs:217:17:217:35 | ... \|\| ... |  |
+| test.rs:217:13:217:13 | d | test.rs:218:9:218:9 | d | match, no-match |
+| test.rs:217:17:217:17 | a | test.rs:217:13:217:13 | d | true |
+| test.rs:217:17:217:17 | a | test.rs:217:23:217:23 | b | false |
+| test.rs:217:17:217:30 | ... \|\| ... | test.rs:217:17:217:17 | a |  |
+| test.rs:217:17:217:35 | ... \|\| ... | test.rs:217:17:217:30 | ... \|\| ... |  |
+| test.rs:217:23:217:23 | b | test.rs:217:28:217:29 | 28 |  |
+| test.rs:217:23:217:29 | ... == ... | test.rs:217:13:217:13 | d | true |
+| test.rs:217:23:217:29 | ... == ... | test.rs:217:35:217:35 | c | false |
+| test.rs:217:28:217:29 | 28 | test.rs:217:23:217:29 | ... == ... |  |
+| test.rs:217:35:217:35 | c | test.rs:217:13:217:13 | d |  |
+| test.rs:218:9:218:9 | d | test.rs:216:61:219:5 | BlockExpr |  |
+| test.rs:221:5:224:5 | enter test_not_operator | test.rs:222:9:222:19 | LetStmt |  |
+| test.rs:221:5:224:5 | exit test_not_operator (normal) | test.rs:221:5:224:5 | exit test_not_operator |  |
+| test.rs:221:43:224:5 | BlockExpr | test.rs:221:5:224:5 | exit test_not_operator (normal) |  |
+| test.rs:222:9:222:19 | LetStmt | test.rs:222:18:222:18 | a |  |
+| test.rs:222:13:222:13 | d | test.rs:223:9:223:9 | d | match, no-match |
+| test.rs:222:17:222:18 | ! ... | test.rs:222:13:222:13 | d |  |
+| test.rs:222:18:222:18 | a | test.rs:222:17:222:18 | ! ... |  |
+| test.rs:223:9:223:9 | d | test.rs:221:43:224:5 | BlockExpr |  |
+| test.rs:226:5:232:5 | enter test_if_and_operator | test.rs:227:12:227:22 | ... && ... |  |
+| test.rs:226:5:232:5 | exit test_if_and_operator (normal) | test.rs:226:5:232:5 | exit test_if_and_operator |  |
+| test.rs:226:63:232:5 | BlockExpr | test.rs:226:5:232:5 | exit test_if_and_operator (normal) |  |
+| test.rs:227:9:231:9 | IfExpr | test.rs:226:63:232:5 | BlockExpr |  |
+| test.rs:227:12:227:12 | a | test.rs:227:17:227:17 | b | true |
+| test.rs:227:12:227:12 | a | test.rs:230:13:230:17 | false | false |
+| test.rs:227:12:227:17 | ... && ... | test.rs:227:12:227:12 | a |  |
+| test.rs:227:12:227:22 | ... && ... | test.rs:227:12:227:17 | ... && ... |  |
+| test.rs:227:17:227:17 | b | test.rs:227:22:227:22 | c | true |
+| test.rs:227:17:227:17 | b | test.rs:230:13:230:17 | false | false |
+| test.rs:227:22:227:22 | c | test.rs:228:13:228:16 | true | true |
+| test.rs:227:22:227:22 | c | test.rs:230:13:230:17 | false | false |
+| test.rs:227:24:229:9 | BlockExpr | test.rs:227:9:231:9 | IfExpr |  |
+| test.rs:228:13:228:16 | true | test.rs:227:24:229:9 | BlockExpr |  |
+| test.rs:229:16:231:9 | BlockExpr | test.rs:227:9:231:9 | IfExpr |  |
+| test.rs:230:13:230:17 | false | test.rs:229:16:231:9 | BlockExpr |  |
+| test.rs:234:5:240:5 | enter test_if_or_operator | test.rs:235:12:235:22 | ... \|\| ... |  |
+| test.rs:234:5:240:5 | exit test_if_or_operator (normal) | test.rs:234:5:240:5 | exit test_if_or_operator |  |
+| test.rs:234:62:240:5 | BlockExpr | test.rs:234:5:240:5 | exit test_if_or_operator (normal) |  |
+| test.rs:235:9:239:9 | IfExpr | test.rs:234:62:240:5 | BlockExpr |  |
+| test.rs:235:12:235:12 | a | test.rs:235:17:235:17 | b | false |
+| test.rs:235:12:235:12 | a | test.rs:236:13:236:16 | true | true |
+| test.rs:235:12:235:17 | ... \|\| ... | test.rs:235:12:235:12 | a |  |
+| test.rs:235:12:235:22 | ... \|\| ... | test.rs:235:12:235:17 | ... \|\| ... |  |
+| test.rs:235:17:235:17 | b | test.rs:235:22:235:22 | c | false |
+| test.rs:235:17:235:17 | b | test.rs:236:13:236:16 | true | true |
+| test.rs:235:22:235:22 | c | test.rs:236:13:236:16 | true | true |
+| test.rs:235:22:235:22 | c | test.rs:238:13:238:17 | false | false |
+| test.rs:235:24:237:9 | BlockExpr | test.rs:235:9:239:9 | IfExpr |  |
+| test.rs:236:13:236:16 | true | test.rs:235:24:237:9 | BlockExpr |  |
+| test.rs:237:16:239:9 | BlockExpr | test.rs:235:9:239:9 | IfExpr |  |
+| test.rs:238:13:238:17 | false | test.rs:237:16:239:9 | BlockExpr |  |
+| test.rs:242:5:248:5 | enter test_if_not_operator | test.rs:243:13:243:13 | a |  |
+| test.rs:242:5:248:5 | exit test_if_not_operator (normal) | test.rs:242:5:248:5 | exit test_if_not_operator |  |
+| test.rs:242:46:248:5 | BlockExpr | test.rs:242:5:248:5 | exit test_if_not_operator (normal) |  |
+| test.rs:243:9:247:9 | IfExpr | test.rs:242:46:248:5 | BlockExpr |  |
+| test.rs:243:12:243:13 | ! ... | test.rs:244:13:244:16 | true | true |
+| test.rs:243:12:243:13 | ! ... | test.rs:246:13:246:17 | false | false |
+| test.rs:243:13:243:13 | a | test.rs:243:12:243:13 | ! ... | false, true |
+| test.rs:243:15:245:9 | BlockExpr | test.rs:243:9:247:9 | IfExpr |  |
+| test.rs:244:13:244:16 | true | test.rs:243:15:245:9 | BlockExpr |  |
+| test.rs:245:16:247:9 | BlockExpr | test.rs:243:9:247:9 | IfExpr |  |
+| test.rs:246:13:246:17 | false | test.rs:245:16:247:9 | BlockExpr |  |
+| test.rs:251:1:257:1 | enter test_match | test.rs:252:11:252:21 | maybe_digit |  |
+| test.rs:251:1:257:1 | exit test_match (normal) | test.rs:251:1:257:1 | exit test_match |  |
+| test.rs:251:48:257:1 | BlockExpr | test.rs:251:1:257:1 | exit test_match (normal) |  |
+| test.rs:252:5:256:5 | MatchExpr | test.rs:251:48:257:1 | BlockExpr |  |
+| test.rs:252:11:252:21 | maybe_digit | test.rs:253:9:253:23 | TupleStructPat |  |
+| test.rs:253:9:253:23 | TupleStructPat | test.rs:253:28:253:28 | x | match |
+| test.rs:253:9:253:23 | TupleStructPat | test.rs:254:9:254:23 | TupleStructPat | no-match |
+| test.rs:253:28:253:28 | x | test.rs:253:32:253:33 | 10 |  |
+| test.rs:253:28:253:33 | ... < ... | test.rs:253:38:253:38 | x | true |
+| test.rs:253:28:253:33 | ... < ... | test.rs:254:9:254:23 | TupleStructPat | false |
+| test.rs:253:32:253:33 | 10 | test.rs:253:28:253:33 | ... < ... |  |
+| test.rs:253:38:253:38 | x | test.rs:253:42:253:42 | 5 |  |
+| test.rs:253:38:253:42 | ... + ... | test.rs:252:5:256:5 | MatchExpr |  |
+| test.rs:253:42:253:42 | 5 | test.rs:253:38:253:42 | ... + ... |  |
+| test.rs:254:9:254:23 | TupleStructPat | test.rs:254:28:254:28 | x | match |
+| test.rs:254:9:254:23 | TupleStructPat | test.rs:255:9:255:20 | PathPat | no-match |
+| test.rs:254:28:254:28 | x | test.rs:252:5:256:5 | MatchExpr |  |
+| test.rs:255:9:255:20 | PathPat | test.rs:255:25:255:25 | 5 | match |
+| test.rs:255:25:255:25 | 5 | test.rs:252:5:256:5 | MatchExpr |  |
+| test.rs:260:5:265:5 | enter test_infinite_loop | test.rs:261:9:263:9 | ExprStmt |  |
+| test.rs:261:9:263:9 | ExprStmt | test.rs:262:13:262:13 | 1 |  |
+| test.rs:261:14:263:9 | BlockExpr | test.rs:262:13:262:13 | 1 |  |
+| test.rs:262:13:262:13 | 1 | test.rs:261:14:263:9 | BlockExpr |  |
+| test.rs:267:5:270:5 | enter test_let_match | test.rs:268:9:268:49 | LetStmt |  |
+| test.rs:267:5:270:5 | exit test_let_match (normal) | test.rs:267:5:270:5 | exit test_let_match |  |
+| test.rs:267:39:270:5 | BlockExpr | test.rs:267:5:270:5 | exit test_let_match (normal) |  |
+| test.rs:268:9:268:49 | LetStmt | test.rs:268:23:268:23 | a |  |
+| test.rs:268:13:268:19 | TupleStructPat | test.rs:268:32:268:46 | "Expected some" | no-match |
+| test.rs:268:13:268:19 | TupleStructPat | test.rs:269:9:269:9 | n | match |
+| test.rs:268:23:268:23 | a | test.rs:268:13:268:19 | TupleStructPat |  |
+| test.rs:268:32:268:46 | "Expected some" | test.rs:268:30:268:48 | BlockExpr |  |
+| test.rs:269:9:269:9 | n | test.rs:267:39:270:5 | BlockExpr |  |
+| test.rs:273:1:278:1 | enter dead_code | test.rs:274:5:276:5 | ExprStmt |  |
+| test.rs:273:1:278:1 | exit dead_code (normal) | test.rs:273:1:278:1 | exit dead_code |  |
+| test.rs:274:5:276:5 | ExprStmt | test.rs:274:9:274:12 | true |  |
+| test.rs:274:9:274:12 | true | test.rs:275:9:275:17 | ExprStmt | true |
+| test.rs:275:9:275:16 | ReturnExpr | test.rs:273:1:278:1 | exit dead_code (normal) | return |
+| test.rs:275:9:275:17 | ExprStmt | test.rs:275:16:275:16 | 0 |  |
+| test.rs:275:16:275:16 | 0 | test.rs:275:9:275:16 | ReturnExpr |  |
+| test.rs:280:1:293:1 | enter labelled_block1 | test.rs:281:5:292:6 | LetStmt |  |
+| test.rs:280:1:293:1 | exit labelled_block1 (normal) | test.rs:280:1:293:1 | exit labelled_block1 |  |
+| test.rs:280:29:293:1 | BlockExpr | test.rs:280:1:293:1 | exit labelled_block1 (normal) |  |
+| test.rs:281:5:292:6 | LetStmt | test.rs:282:9:282:19 | ExprStmt |  |
+| test.rs:281:9:281:14 | result | test.rs:280:29:293:1 | BlockExpr | match, no-match |
+| test.rs:281:18:292:5 | BlockExpr | test.rs:281:9:281:14 | result |  |
+| test.rs:282:9:282:16 | PathExpr | test.rs:282:9:282:18 | CallExpr |  |
+| test.rs:282:9:282:18 | CallExpr | test.rs:283:9:285:9 | ExprStmt |  |
+| test.rs:282:9:282:19 | ExprStmt | test.rs:282:9:282:16 | PathExpr |  |
+| test.rs:283:9:285:9 | ExprStmt | test.rs:283:12:283:28 | PathExpr |  |
+| test.rs:283:9:285:9 | IfExpr | test.rs:286:9:286:24 | ExprStmt |  |
+| test.rs:283:12:283:28 | PathExpr | test.rs:283:12:283:30 | CallExpr |  |
+| test.rs:283:12:283:30 | CallExpr | test.rs:283:9:285:9 | IfExpr | false |
+| test.rs:283:12:283:30 | CallExpr | test.rs:284:13:284:27 | ExprStmt | true |
+| test.rs:284:13:284:26 | BreakExpr | test.rs:281:18:292:5 | BlockExpr | break('block) |
+| test.rs:284:13:284:27 | ExprStmt | test.rs:284:26:284:26 | 1 |  |
+| test.rs:284:26:284:26 | 1 | test.rs:284:13:284:26 | BreakExpr |  |
+| test.rs:286:9:286:21 | PathExpr | test.rs:286:9:286:23 | CallExpr |  |
+| test.rs:286:9:286:23 | CallExpr | test.rs:287:9:289:9 | ExprStmt |  |
+| test.rs:286:9:286:24 | ExprStmt | test.rs:286:9:286:21 | PathExpr |  |
+| test.rs:287:9:289:9 | ExprStmt | test.rs:287:12:287:28 | PathExpr |  |
+| test.rs:287:9:289:9 | IfExpr | test.rs:290:9:290:24 | ExprStmt |  |
+| test.rs:287:12:287:28 | PathExpr | test.rs:287:12:287:30 | CallExpr |  |
+| test.rs:287:12:287:30 | CallExpr | test.rs:287:9:289:9 | IfExpr | false |
+| test.rs:287:12:287:30 | CallExpr | test.rs:288:13:288:27 | ExprStmt | true |
+| test.rs:288:13:288:26 | BreakExpr | test.rs:281:18:292:5 | BlockExpr | break('block) |
+| test.rs:288:13:288:27 | ExprStmt | test.rs:288:26:288:26 | 2 |  |
+| test.rs:288:26:288:26 | 2 | test.rs:288:13:288:26 | BreakExpr |  |
+| test.rs:290:9:290:21 | PathExpr | test.rs:290:9:290:23 | CallExpr |  |
+| test.rs:290:9:290:23 | CallExpr | test.rs:291:9:291:9 | 3 |  |
+| test.rs:290:9:290:24 | ExprStmt | test.rs:290:9:290:21 | PathExpr |  |
+| test.rs:291:9:291:9 | 3 | test.rs:281:18:292:5 | BlockExpr |  |
+| test.rs:295:1:303:1 | enter labelled_block2 | test.rs:296:5:302:6 | LetStmt |  |
+| test.rs:295:1:303:1 | exit labelled_block2 (normal) | test.rs:295:1:303:1 | exit labelled_block2 |  |
+| test.rs:295:29:303:1 | BlockExpr | test.rs:295:1:303:1 | exit labelled_block2 (normal) |  |
+| test.rs:296:5:302:6 | LetStmt | test.rs:297:9:297:34 | LetStmt |  |
+| test.rs:296:9:296:14 | result | test.rs:295:29:303:1 | BlockExpr | match, no-match |
+| test.rs:296:18:302:5 | BlockExpr | test.rs:296:9:296:14 | result |  |
+| test.rs:297:9:297:34 | LetStmt | test.rs:297:30:297:33 | PathExpr |  |
+| test.rs:297:13:297:13 | x | test.rs:298:9:300:10 | LetStmt | match, no-match |
+| test.rs:297:30:297:33 | PathExpr | test.rs:297:13:297:13 | x |  |
+| test.rs:298:9:300:10 | LetStmt | test.rs:298:23:298:23 | x |  |
+| test.rs:298:13:298:19 | TupleStructPat | test.rs:299:13:299:27 | ExprStmt | no-match |
+| test.rs:298:13:298:19 | TupleStructPat | test.rs:301:9:301:9 | x | match |
+| test.rs:298:23:298:23 | x | test.rs:298:13:298:19 | TupleStructPat |  |
+| test.rs:299:13:299:26 | BreakExpr | test.rs:296:18:302:5 | BlockExpr | break('block) |
+| test.rs:299:13:299:27 | ExprStmt | test.rs:299:26:299:26 | 1 |  |
+| test.rs:299:26:299:26 | 1 | test.rs:299:13:299:26 | BreakExpr |  |
+| test.rs:301:9:301:9 | x | test.rs:296:18:302:5 | BlockExpr |  |
diff --git a/rust/ql/test/library-tests/controlflow/test.rs b/rust/ql/test/library-tests/controlflow/test.rs
index 22d8b9f24a60..4ad742b30444 100644
--- a/rust/ql/test/library-tests/controlflow/test.rs
+++ b/rust/ql/test/library-tests/controlflow/test.rs
@@ -51,6 +51,20 @@ mod loop_expression {
         }
     }
 
+    fn test_loop_label_shadowing(b: bool) -> ! {
+        'loop: loop {
+            1;
+            'loop: loop {
+                if b {
+                    continue;
+                } else if b {
+                    continue 'loop;
+                }
+                continue 'loop;
+            }
+        }
+    }
+
     fn test_while(i: i64) {
         let mut b = true;
         while b {

From fb9ec2423cc1db4a9285afff76528c7042dd3ffd Mon Sep 17 00:00:00 2001
From: Tom Hvitved <hvitved@github.com>
Date: Wed, 2 Oct 2024 09:54:09 +0200
Subject: [PATCH 119/347] Rust: Implement `UnusedVariable.ql`

---
 rust/ql/lib/codeql/rust/elements/Variable.qll |   4 +
 .../rust/elements/internal/VariableImpl.qll   |  44 ++++
 .../queries/unusedentities/UnusedVariable.ql  |  11 +-
 .../variables/variables.expected              | 106 +++++++++
 .../test/library-tests/variables/variables.ql |   6 +
 .../unusedentities/UnusedVariable.expected    |   4 +
 .../test/query-tests/unusedentities/main.rs   | 204 +++++++++---------
 7 files changed, 273 insertions(+), 106 deletions(-)

diff --git a/rust/ql/lib/codeql/rust/elements/Variable.qll b/rust/ql/lib/codeql/rust/elements/Variable.qll
index 76c2d9f19f72..31cc17a263f8 100644
--- a/rust/ql/lib/codeql/rust/elements/Variable.qll
+++ b/rust/ql/lib/codeql/rust/elements/Variable.qll
@@ -7,3 +7,7 @@ private import internal.VariableImpl
 final class Variable = Impl::Variable;
 
 final class VariableAccess = Impl::VariableAccess;
+
+final class VariableWriteAccess = Impl::VariableWriteAccess;
+
+final class VariableReadAccess = Impl::VariableReadAccess;
diff --git a/rust/ql/lib/codeql/rust/elements/internal/VariableImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/VariableImpl.qll
index 58c9a4fb6ebf..0f7968079157 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/VariableImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/VariableImpl.qll
@@ -98,6 +98,27 @@ module Impl {
 
     /** Gets an access to this variable. */
     VariableAccess getAnAccess() { result.getVariable() = this }
+
+    /**
+     * Gets the pattern that declares this variable.
+     *
+     * Normally, the pattern is unique, except when introduced in an or pattern:
+     *
+     * ```rust
+     * match either {
+     *    Either::Left(x) | Either::Right(x) => println!(x),
+     * }
+     * ```
+     */
+    IdentPat getPat() { variableDecl(definingNode, result, name) }
+
+    /** Gets the initial value of this variable, if any. */
+    Expr getInitializer() {
+      exists(LetStmt let |
+        this.getPat() = let.getPat() and
+        result = let.getInitializer()
+      )
+    }
   }
 
   /** A path expression that may access a local variable. */
@@ -366,6 +387,29 @@ module Impl {
     override string getAPrimaryQlClass() { result = "VariableAccess" }
   }
 
+  /** Holds if `e` occurs in the LHS of a (compound) assignment. */
+  private predicate assignLhs(Expr e) {
+    exists(BinaryExpr be |
+      be.getOperatorName().regexpMatch(".*=") and
+      e = be.getLhs()
+    )
+    or
+    exists(Expr mid |
+      assignLhs(mid) and
+      getImmediateParent(e) = mid
+    )
+  }
+
+  /** A variable write. */
+  class VariableWriteAccess extends VariableAccess {
+    VariableWriteAccess() { assignLhs(this) }
+  }
+
+  /** A variable read. */
+  class VariableReadAccess extends VariableAccess {
+    VariableReadAccess() { not this instanceof VariableWriteAccess }
+  }
+
   cached
   private module Cached {
     cached
diff --git a/rust/ql/src/queries/unusedentities/UnusedVariable.ql b/rust/ql/src/queries/unusedentities/UnusedVariable.ql
index a057db7d1734..5fb0cdfecdc1 100644
--- a/rust/ql/src/queries/unusedentities/UnusedVariable.ql
+++ b/rust/ql/src/queries/unusedentities/UnusedVariable.ql
@@ -3,13 +3,16 @@
  * @description Unused variables may be an indication that the code is incomplete or has a typo.
  * @kind problem
  * @problem.severity recommendation
- * @precision medium
+ * @precision high
  * @id rust/unused-variable
  * @tags maintainability
  */
 
 import rust
 
-from Locatable e
-where none() // TODO: implement query
-select e, "Variable is not used."
+from Variable v
+where
+  not exists(v.getAnAccess()) and
+  not exists(v.getInitializer()) and
+  not v.getName().charAt(0) = "_"
+select v, "Variable is not used."
diff --git a/rust/ql/test/library-tests/variables/variables.expected b/rust/ql/test/library-tests/variables/variables.expected
index ba563aeab6ef..c86e30d4bb57 100644
--- a/rust/ql/test/library-tests/variables/variables.expected
+++ b/rust/ql/test/library-tests/variables/variables.expected
@@ -146,3 +146,109 @@ variableAccess
 | variables.rs:306:15:306:16 | n2 | variables.rs:304:9:304:10 | n2 |
 | variables.rs:313:12:313:12 | v | variables.rs:310:9:310:9 | v |
 | variables.rs:314:19:314:22 | text | variables.rs:312:9:312:12 | text |
+variableWriteAccess
+| variables.rs:17:5:17:6 | x2 | variables.rs:15:13:15:14 | x2 |
+| variables.rs:266:9:266:10 | c2 | variables.rs:259:13:259:14 | c2 |
+| variables.rs:267:9:267:10 | b4 | variables.rs:258:13:258:14 | b4 |
+| variables.rs:268:9:268:11 | a10 | variables.rs:257:13:257:15 | a10 |
+variableReadAccess
+| variables.rs:11:15:11:16 | x1 | variables.rs:10:9:10:10 | x1 |
+| variables.rs:16:15:16:16 | x2 | variables.rs:15:13:15:14 | x2 |
+| variables.rs:18:15:18:16 | x2 | variables.rs:15:13:15:14 | x2 |
+| variables.rs:23:15:23:16 | x3 | variables.rs:22:9:22:10 | x3 |
+| variables.rs:25:9:25:10 | x3 | variables.rs:22:9:22:10 | x3 |
+| variables.rs:26:15:26:16 | x3 | variables.rs:24:9:24:10 | x3 |
+| variables.rs:31:15:31:16 | x4 | variables.rs:30:9:30:10 | x4 |
+| variables.rs:34:19:34:20 | x4 | variables.rs:33:13:33:14 | x4 |
+| variables.rs:36:15:36:16 | x4 | variables.rs:30:9:30:10 | x4 |
+| variables.rs:55:15:55:16 | a1 | variables.rs:47:13:47:14 | a1 |
+| variables.rs:56:15:56:16 | b1 | variables.rs:48:13:48:14 | b1 |
+| variables.rs:57:15:57:15 | x | variables.rs:51:13:51:13 | x |
+| variables.rs:58:15:58:15 | y | variables.rs:52:13:52:13 | y |
+| variables.rs:66:9:66:10 | p1 | variables.rs:62:9:62:10 | p1 |
+| variables.rs:67:15:67:16 | a2 | variables.rs:64:12:64:13 | a2 |
+| variables.rs:68:15:68:16 | b2 | variables.rs:65:12:65:13 | b2 |
+| variables.rs:75:11:75:12 | s1 | variables.rs:72:9:72:10 | s1 |
+| variables.rs:76:19:76:20 | s2 | variables.rs:74:21:74:22 | s2 |
+| variables.rs:85:15:85:16 | x5 | variables.rs:81:14:81:15 | x5 |
+| variables.rs:92:11:92:12 | x6 | variables.rs:89:9:89:10 | x6 |
+| variables.rs:97:23:97:24 | y1 | variables.rs:94:14:94:15 | y1 |
+| variables.rs:102:15:102:16 | y1 | variables.rs:90:9:90:10 | y1 |
+| variables.rs:108:11:108:17 | numbers | variables.rs:106:9:106:15 | numbers |
+| variables.rs:114:23:114:27 | first | variables.rs:110:13:110:17 | first |
+| variables.rs:115:23:115:27 | third | variables.rs:111:13:111:17 | third |
+| variables.rs:116:23:116:27 | fifth | variables.rs:112:13:112:17 | fifth |
+| variables.rs:120:11:120:17 | numbers | variables.rs:106:9:106:15 | numbers |
+| variables.rs:126:23:126:27 | first | variables.rs:122:13:122:17 | first |
+| variables.rs:127:23:127:26 | last | variables.rs:124:13:124:16 | last |
+| variables.rs:135:11:135:12 | p2 | variables.rs:133:9:133:10 | p2 |
+| variables.rs:138:24:138:25 | x7 | variables.rs:137:16:137:17 | x7 |
+| variables.rs:149:11:149:13 | msg | variables.rs:147:9:147:11 | msg |
+| variables.rs:152:24:152:34 | id_variable | variables.rs:151:17:151:27 | id_variable |
+| variables.rs:157:23:157:24 | id | variables.rs:156:26:156:27 | id |
+| variables.rs:168:11:168:16 | either | variables.rs:167:9:167:14 | either |
+| variables.rs:170:26:170:27 | a3 | variables.rs:169:9:169:44 | a3 |
+| variables.rs:182:11:182:12 | tv | variables.rs:181:9:181:10 | tv |
+| variables.rs:184:26:184:27 | a4 | variables.rs:183:9:183:81 | a4 |
+| variables.rs:186:11:186:12 | tv | variables.rs:181:9:181:10 | tv |
+| variables.rs:188:26:188:27 | a5 | variables.rs:187:9:187:83 | a5 |
+| variables.rs:190:11:190:12 | tv | variables.rs:181:9:181:10 | tv |
+| variables.rs:192:26:192:27 | a6 | variables.rs:191:9:191:83 | a6 |
+| variables.rs:198:11:198:16 | either | variables.rs:197:9:197:14 | either |
+| variables.rs:200:16:200:17 | a7 | variables.rs:199:9:199:44 | a7 |
+| variables.rs:201:26:201:27 | a7 | variables.rs:199:9:199:44 | a7 |
+| variables.rs:209:11:209:16 | either | variables.rs:207:9:207:14 | either |
+| variables.rs:213:23:213:25 | a11 | variables.rs:211:14:211:51 | a11 |
+| variables.rs:215:15:215:15 | e | variables.rs:210:13:210:13 | e |
+| variables.rs:216:28:216:30 | a12 | variables.rs:214:33:214:35 | a12 |
+| variables.rs:232:11:232:12 | fv | variables.rs:231:9:231:10 | fv |
+| variables.rs:234:26:234:28 | a13 | variables.rs:233:9:233:109 | a13 |
+| variables.rs:244:15:244:16 | a8 | variables.rs:239:5:239:6 | a8 |
+| variables.rs:245:15:245:16 | b3 | variables.rs:241:9:241:10 | b3 |
+| variables.rs:246:15:246:16 | c1 | variables.rs:242:9:242:10 | c1 |
+| variables.rs:252:15:252:16 | a9 | variables.rs:250:6:250:41 | a9 |
+| variables.rs:261:15:261:17 | a10 | variables.rs:257:13:257:15 | a10 |
+| variables.rs:262:15:262:16 | b4 | variables.rs:258:13:258:14 | b4 |
+| variables.rs:263:15:263:16 | c2 | variables.rs:259:13:259:14 | c2 |
+| variables.rs:270:9:270:11 | a10 | variables.rs:257:13:257:15 | a10 |
+| variables.rs:271:9:271:10 | b4 | variables.rs:258:13:258:14 | b4 |
+| variables.rs:272:9:272:10 | c2 | variables.rs:259:13:259:14 | c2 |
+| variables.rs:274:15:274:17 | a10 | variables.rs:257:13:257:15 | a10 |
+| variables.rs:275:15:275:16 | b4 | variables.rs:258:13:258:14 | b4 |
+| variables.rs:276:15:276:16 | c2 | variables.rs:259:13:259:14 | c2 |
+| variables.rs:283:23:283:25 | a10 | variables.rs:280:13:280:15 | a10 |
+| variables.rs:284:23:284:24 | b4 | variables.rs:281:13:281:14 | b4 |
+| variables.rs:288:15:288:17 | a10 | variables.rs:257:13:257:15 | a10 |
+| variables.rs:289:15:289:16 | b4 | variables.rs:258:13:258:14 | b4 |
+| variables.rs:295:9:295:9 | x | variables.rs:294:10:294:10 | x |
+| variables.rs:297:9:297:23 | example_closure | variables.rs:293:9:293:23 | example_closure |
+| variables.rs:298:15:298:16 | n1 | variables.rs:296:9:296:10 | n1 |
+| variables.rs:303:9:303:9 | x | variables.rs:302:10:302:10 | x |
+| variables.rs:305:9:305:26 | immutable_variable | variables.rs:301:9:301:26 | immutable_variable |
+| variables.rs:306:15:306:16 | n2 | variables.rs:304:9:304:10 | n2 |
+| variables.rs:313:12:313:12 | v | variables.rs:310:9:310:9 | v |
+| variables.rs:314:19:314:22 | text | variables.rs:312:9:312:12 | text |
+variableInitializer
+| variables.rs:10:9:10:10 | x1 | variables.rs:10:14:10:16 | "a" |
+| variables.rs:15:13:15:14 | x2 | variables.rs:15:18:15:18 | 4 |
+| variables.rs:22:9:22:10 | x3 | variables.rs:22:14:22:14 | 1 |
+| variables.rs:24:9:24:10 | x3 | variables.rs:25:9:25:14 | ... + ... |
+| variables.rs:30:9:30:10 | x4 | variables.rs:30:14:30:16 | "a" |
+| variables.rs:33:13:33:14 | x4 | variables.rs:33:18:33:20 | "b" |
+| variables.rs:62:9:62:10 | p1 | variables.rs:62:14:62:37 | RecordExpr |
+| variables.rs:72:9:72:10 | s1 | variables.rs:72:14:72:41 | CallExpr |
+| variables.rs:89:9:89:10 | x6 | variables.rs:89:14:89:20 | CallExpr |
+| variables.rs:90:9:90:10 | y1 | variables.rs:90:14:90:15 | 10 |
+| variables.rs:106:9:106:15 | numbers | variables.rs:106:19:106:35 | TupleExpr |
+| variables.rs:133:9:133:10 | p2 | variables.rs:133:14:133:37 | RecordExpr |
+| variables.rs:147:9:147:11 | msg | variables.rs:147:15:147:38 | RecordExpr |
+| variables.rs:167:9:167:14 | either | variables.rs:167:18:167:33 | CallExpr |
+| variables.rs:181:9:181:10 | tv | variables.rs:181:14:181:36 | CallExpr |
+| variables.rs:197:9:197:14 | either | variables.rs:197:18:197:33 | CallExpr |
+| variables.rs:207:9:207:14 | either | variables.rs:207:18:207:33 | CallExpr |
+| variables.rs:231:9:231:10 | fv | variables.rs:231:14:231:35 | CallExpr |
+| variables.rs:293:9:293:23 | example_closure | variables.rs:294:9:295:9 | ClosureExpr |
+| variables.rs:296:9:296:10 | n1 | variables.rs:297:9:297:26 | CallExpr |
+| variables.rs:301:9:301:26 | immutable_variable | variables.rs:302:9:303:9 | ClosureExpr |
+| variables.rs:304:9:304:10 | n2 | variables.rs:305:9:305:29 | CallExpr |
+| variables.rs:310:9:310:9 | v | variables.rs:310:13:310:41 | RefExpr |
diff --git a/rust/ql/test/library-tests/variables/variables.ql b/rust/ql/test/library-tests/variables/variables.ql
index b96f6ceabcae..dcca73d5cf28 100644
--- a/rust/ql/test/library-tests/variables/variables.ql
+++ b/rust/ql/test/library-tests/variables/variables.ql
@@ -5,6 +5,12 @@ query predicate variable(Variable v) { any() }
 
 query predicate variableAccess(VariableAccess va, Variable v) { v = va.getVariable() }
 
+query predicate variableWriteAccess(VariableWriteAccess va, Variable v) { v = va.getVariable() }
+
+query predicate variableReadAccess(VariableReadAccess va, Variable v) { v = va.getVariable() }
+
+query predicate variableInitializer(Variable v, Expr e) { e = v.getInitializer() }
+
 module VariableAccessTest implements TestSig {
   string getARelevantTag() { result = "access" }
 
diff --git a/rust/ql/test/query-tests/unusedentities/UnusedVariable.expected b/rust/ql/test/query-tests/unusedentities/UnusedVariable.expected
index e69de29bb2d1..f3aadfdff0d8 100644
--- a/rust/ql/test/query-tests/unusedentities/UnusedVariable.expected
+++ b/rust/ql/test/query-tests/unusedentities/UnusedVariable.expected
@@ -0,0 +1,4 @@
+| main.rs:23:9:23:9 | a | Variable is not used. |
+| main.rs:88:13:88:13 | d | Variable is not used. |
+| main.rs:112:9:112:9 | k | Variable is not used. |
+| main.rs:139:5:139:5 | y | Variable is not used. |
diff --git a/rust/ql/test/query-tests/unusedentities/main.rs b/rust/ql/test/query-tests/unusedentities/main.rs
index 8066f7c783e0..c58693ed8667 100644
--- a/rust/ql/test/query-tests/unusedentities/main.rs
+++ b/rust/ql/test/query-tests/unusedentities/main.rs
@@ -1,118 +1,119 @@
-
 //fn cond() -> bool;
 
 // --- locals ---
 
 fn locals_1() {
-	let a = 1; // BAD: unused value [NOT DETECTED]
-	let b = 1;
-	let c = 1;
-	let d = String::from("a"); // BAD: unused value [NOT DETECTED]
-	let e = String::from("b");
-	let _ = 1; // (deliberately unused)
+    let a = 1; // BAD: unused value [NOT DETECTED]
+    let b = 1;
+    let c = 1;
+    let d = String::from("a"); // BAD: unused value [NOT DETECTED]
+    let e = String::from("b");
+    let _ = 1; // (deliberately unused)
 
-	println!("use {}", b);
+    println!("use {}", b);
 
-	if cond() {
-		println!("use {}", c);
-	}
+    if cond() {
+        println!("use {}", c);
+    }
 
-	println!("use {}", e);
+    println!("use {}", e);
 }
 
 fn locals_2() {
-	let a: i32;
-	let b: i32; // BAD: unused variable [NOT DETECTED]
-	let mut c: i32;
-	let mut d: i32;
-	let mut e: i32;
-	let mut f: i32;
-	let g: i32;
-	let h: i32;
-	let i: i32;
-
-	b = 1; // BAD: unused value [NOT DETECTED]
-
-	c = 1; // BAD: unused value [NOT DETECTED]
-	c = 2;
-	println!("use {}", c);
-	c = 3; // BAD: unused value [NOT DETECTED]
-
-	d = 1;
-	if cond() {
-		d = 2; // BAD: unused value [NOT DETECTED]
-		d = 3;
-	} else {
-	}
-	println!("use {}", d);
-
-	e = 1; // BAD: unused value [NOT DETECTED]
-	if cond() {
-		e = 2;
-	} else {
-		e = 3;
-	}
-	println!("use {}", e);
-
-	f = 1;
-	f += 1;
-	println!("use {}", f);
-	f += 1; // BAD: unused value [NOT DETECTED]
-	f = 1;
-	f += 1; // BAD: unused value [NOT DETECTED]
-
-	g = if cond() { 1 } else { 2 }; // BAD: unused value (x2) [NOT DETECTED]
-	h = if cond() { 3 } else { 4 };
-	i = if cond() { h } else { 5 };
-	println!("use {}", i);
-
-	_ = 1; // (deliberately unused) [NOT DETECTED]
+    let a: i32; // BAD: unused variable
+    let b: i32;
+    let mut c: i32;
+    let mut d: i32;
+    let mut e: i32;
+    let mut f: i32;
+    let g: i32;
+    let h: i32;
+    let i: i32;
+
+    b = 1; // BAD: unused value [NOT DETECTED]
+
+    c = 1; // BAD: unused value [NOT DETECTED]
+    c = 2;
+    println!("use {}", c);
+    c = 3; // BAD: unused value [NOT DETECTED]
+
+    d = 1;
+    if cond() {
+        d = 2; // BAD: unused value [NOT DETECTED]
+        d = 3;
+    } else {
+    }
+    println!("use {}", d);
+
+    e = 1; // BAD: unused value [NOT DETECTED]
+    if cond() {
+        e = 2;
+    } else {
+        e = 3;
+    }
+    println!("use {}", e);
+
+    f = 1;
+    f += 1;
+    println!("use {}", f);
+    f += 1; // BAD: unused value [NOT DETECTED]
+    f = 1;
+    f += 1; // BAD: unused value [NOT DETECTED]
+
+    g = if cond() { 1 } else { 2 }; // BAD: unused value (x2) [NOT DETECTED]
+    h = if cond() { 3 } else { 4 };
+    i = if cond() { h } else { 5 };
+    println!("use {}", i);
+
+    _ = 1; // (deliberately unused) [NOT DETECTED]
 }
 
 // --- structs ---
 
 #[derive(Debug)]
 struct MyStruct {
-	val: i64
+    val: i64,
 }
 
 impl MyStruct {
-	fn my_get(&mut self) -> i64 {
-		return self.val;
-	}
+    fn my_get(&mut self) -> i64 {
+        return self.val;
+    }
 }
 
 fn structs() {
-	let a = MyStruct {val : 1 }; // BAD: unused value [NOT DETECTED]
-	let b = MyStruct {val : 2 };
-	let c = MyStruct {val : 3 };
-	let mut d : MyStruct; // BAD: unused variable [NOT DETECTED]
-	let mut e : MyStruct;
-	let mut f : MyStruct;
-
-	println!("lets use {:?} and {}", b, c.val);
-
-	e = MyStruct {val : 4 };
-	println!("lets use {}", e.my_get());
-	e.val = 5;
-	println!("lets use {}", e.my_get());
-
-	f = MyStruct {val : 6 }; // BAD: unused value [NOT DETECTED]
-	f.val = 7; // BAD: unused value [NOT DETECTED]
+    let a = MyStruct { val: 1 }; // BAD: unused value [NOT DETECTED]
+    let b = MyStruct { val: 2 };
+    let c = MyStruct { val: 3 };
+    let mut d: MyStruct; // BAD: unused variable
+    let mut e: MyStruct;
+    let mut f: MyStruct;
+
+    println!("lets use {:?} and {}", b, c.val);
+
+    e = MyStruct { val: 4 };
+    println!("lets use {}", e.my_get());
+    e.val = 5;
+    println!("lets use {}", e.my_get());
+
+    f = MyStruct { val: 6 }; // BAD: unused value [NOT DETECTED]
+    f.val = 7; // BAD: unused value [NOT DETECTED]
 }
 
 // --- arrays ---
 
 fn arrays() {
-	let is = [1, 2, 3]; // BAD: unused values (x3) [NOT DETECTED]
-	let js = [1, 2, 3];
-	let ks = [1, 2, 3];
+    let is = [1, 2, 3]; // BAD: unused values (x3) [NOT DETECTED]
+    let js = [1, 2, 3];
+    let ks = [1, 2, 3];
 
-	println!("lets use {:?}", js);
+    println!("lets use {:?}", js);
 
-	for k in ks {
-		println!("lets use {}", k);
-	}
+    for k // BAD: unused variable [SPURIOUS: macros not yet supported]
+	in ks
+	{
+        println!("lets use {}", k);
+    }
 }
 
 // --- constants and statics ---
@@ -123,30 +124,29 @@ static mut STAT1: i32 = 1;
 static mut STAT2: i32 = 2; // BAD: unused value [NOT DETECTED]
 
 fn statics() {
-	static mut STAT3: i32 = 0;
-	static mut STAT4: i32 = 0; // BAD: unused value [NOT DETECTED]
+    static mut STAT3: i32 = 0;
+    static mut STAT4: i32 = 0; // BAD: unused value [NOT DETECTED]
 
-	unsafe
-	{
-		let total = CON1 + STAT1 + STAT3;
-	}
+    unsafe {
+        let total = CON1 + STAT1 + STAT3;
+    }
 }
 
 // --- parameters ---
 
 fn parameters(
-		x: i32,
-		y: i32, // BAD: unused variable [NOT DETECTED]
-		_z: i32 // (`_` is asking the compiler, and by extension us, to not warn that this is unused)
-	) -> i32 {
-	return x;
+    x: i32,
+    y: i32,  // BAD: unused variable
+    _z: i32, // (`_` is asking the compiler, and by extension us, to not warn that this is unused)
+) -> i32 {
+    return x;
 }
 
 fn main() {
-	locals_1();
-	locals_2();
-	structs();
-	arrays();
-	statics();
-	println!("lets use result {}", parameters(1, 2, 3));
+    locals_1();
+    locals_2();
+    structs();
+    arrays();
+    statics();
+    println!("lets use result {}", parameters(1, 2, 3));
 }

From 8243f871791ba47aee375d97bd3aacf5c20786b4 Mon Sep 17 00:00:00 2001
From: Geoffrey White <40627776+geoffw0@users.noreply.github.com>
Date: Wed, 2 Oct 2024 11:38:23 +0100
Subject: [PATCH 120/347] Rust: Modify the exclusion as suggested in comments.

---
 rust/ql/lib/codeql/files/FileSystem.qll | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/rust/ql/lib/codeql/files/FileSystem.qll b/rust/ql/lib/codeql/files/FileSystem.qll
index a5410ece9712..03b5cd0b183b 100644
--- a/rust/ql/lib/codeql/files/FileSystem.qll
+++ b/rust/ql/lib/codeql/files/FileSystem.qll
@@ -5,7 +5,6 @@ private import codeql.util.FileSystem
 private import codeql.rust.elements.SourceFile
 private import codeql.rust.elements.AstNode
 private import codeql.rust.elements.Comment
-private import codeql.rust.elements.internal.generated.ParentChild
 
 private module Input implements InputSig {
   abstract class ContainerBase extends @container {
@@ -48,7 +47,7 @@ class File extends Container, Impl::File {
         exists(AstNode node, Location loc |
           not node instanceof Comment and
           not node instanceof SourceFile and
-          not getImmediateParent(node) instanceof SourceFile and // ignore top-level elements for now as we're getting their locations wrong when a comment is attached
+          not node instanceof Item and // ignore Items for now as we're getting their locations wrong when a comment is attached
           loc = node.getLocation()
         |
           node.getFile() = this and

From 3a1f6efce413cb8f841ae26a919c32dd6b87a152 Mon Sep 17 00:00:00 2001
From: Tom Hvitved <hvitved@github.com>
Date: Wed, 2 Oct 2024 13:37:24 +0200
Subject: [PATCH 121/347] Address review comments

---
 .../rust/elements/internal/VariableImpl.qll   | 23 +++++++++++++------
 .../test/query-tests/unusedentities/main.rs   |  2 +-
 2 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/rust/ql/lib/codeql/rust/elements/internal/VariableImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/VariableImpl.qll
index 0f7968079157..3f0cabc97b85 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/VariableImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/VariableImpl.qll
@@ -387,27 +387,36 @@ module Impl {
     override string getAPrimaryQlClass() { result = "VariableAccess" }
   }
 
-  /** Holds if `e` occurs in the LHS of a (compound) assignment. */
-  private predicate assignLhs(Expr e) {
-    exists(BinaryExpr be |
-      be.getOperatorName().regexpMatch(".*=") and
+  /** Holds if `e` occurs in the LHS of an assignment or compound assignment. */
+  private predicate assignLhs(Expr e, boolean compound) {
+    exists(BinaryExpr be, string op |
+      op = be.getOperatorName().regexpCapture("(.*)=", 1) and
       e = be.getLhs()
+    |
+      op = "" and compound = false
+      or
+      op != "" and compound = true
     )
     or
     exists(Expr mid |
-      assignLhs(mid) and
+      assignLhs(mid, compound) and
       getImmediateParent(e) = mid
     )
   }
 
   /** A variable write. */
   class VariableWriteAccess extends VariableAccess {
-    VariableWriteAccess() { assignLhs(this) }
+    VariableWriteAccess() { assignLhs(this, _) }
   }
 
   /** A variable read. */
   class VariableReadAccess extends VariableAccess {
-    VariableReadAccess() { not this instanceof VariableWriteAccess }
+    VariableReadAccess() {
+      not this instanceof VariableWriteAccess
+      or
+      // consider LHS in compound assignments both reads and writes
+      assignLhs(this, true)
+    }
   }
 
   cached
diff --git a/rust/ql/test/query-tests/unusedentities/main.rs b/rust/ql/test/query-tests/unusedentities/main.rs
index c58693ed8667..7280f6c2502b 100644
--- a/rust/ql/test/query-tests/unusedentities/main.rs
+++ b/rust/ql/test/query-tests/unusedentities/main.rs
@@ -109,7 +109,7 @@ fn arrays() {
 
     println!("lets use {:?}", js);
 
-    for k // BAD: unused variable [SPURIOUS: macros not yet supported]
+    for k // SPURIOUS: unused variable [macros not yet supported]
 	in ks
 	{
         println!("lets use {}", k);

From 104d448b166d7644cf62b262b9ba3425ad6da57b Mon Sep 17 00:00:00 2001
From: Michael Nebel <michaelnebel@github.com>
Date: Wed, 2 Oct 2024 14:39:27 +0200
Subject: [PATCH 122/347] Shared: Only use heuristic summary flow in case there
 is no content based flow.

---
 .../codeql/mad/modelgenerator/internal/ModelGeneratorImpl.qll   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/shared/mad/codeql/mad/modelgenerator/internal/ModelGeneratorImpl.qll b/shared/mad/codeql/mad/modelgenerator/internal/ModelGeneratorImpl.qll
index f56c1b8dfff0..8d4bb4cae5a0 100644
--- a/shared/mad/codeql/mad/modelgenerator/internal/ModelGeneratorImpl.qll
+++ b/shared/mad/codeql/mad/modelgenerator/internal/ModelGeneratorImpl.qll
@@ -881,7 +881,7 @@ module MakeModelGenerator<
   string captureMixedFlow(DataFlowSummaryTargetApi api, boolean lift) {
     result = ContentSensitive::captureFlow(api, lift)
     or
-    not exists(ContentSensitive::captureFlow(api, lift)) and
+    not exists(ContentSensitive::captureFlow(api, _)) and
     result = captureFlow(api) and
     lift = true
   }

From 51623c3837091d55026f6c48440cb0f1b3a1040b Mon Sep 17 00:00:00 2001
From: Michael Nebel <michaelnebel@github.com>
Date: Wed, 2 Oct 2024 11:05:20 +0200
Subject: [PATCH 123/347] Java: Consider all summarized callable with generated
 verification as generated when counting generated vs manual.

---
 .../src/Metrics/Summaries/GeneratedVsManualCoverageQuery.qll  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/java/ql/src/Metrics/Summaries/GeneratedVsManualCoverageQuery.qll b/java/ql/src/Metrics/Summaries/GeneratedVsManualCoverageQuery.qll
index 9a2a0201e803..8309126c06de 100644
--- a/java/ql/src/Metrics/Summaries/GeneratedVsManualCoverageQuery.qll
+++ b/java/ql/src/Metrics/Summaries/GeneratedVsManualCoverageQuery.qll
@@ -17,12 +17,12 @@ private int getNumMadModeledApis(string package, string provenance, string apiSu
       (
         // "auto-only"
         not sc.hasManualModel() and
-        sc.hasProvenance("df-generated") and
+        sc.hasGeneratedModel() and
         provenance = "generated"
         or
         sc.hasManualModel() and
         (
-          if sc.hasProvenance("df-generated")
+          if sc.hasGeneratedModel()
           then
             // "both"
             provenance = "both"

From 000dedf3e851c4162d5551c8d48c2cec92df17f8 Mon Sep 17 00:00:00 2001
From: Tom Hvitved <hvitved@github.com>
Date: Mon, 30 Sep 2024 09:48:59 +0200
Subject: [PATCH 124/347] Rust: Output CFG for `library-tests/variables`

---
 .../test/library-tests/controlflow/Cfg.qlref  |   1 +
 .../test/library-tests/variables/Cfg.expected | 594 ++++++++++++++++++
 .../ql/test/library-tests/variables/Cfg.qlref |   1 +
 rust/ql/test/utils/Cfg.expected               |   3 +
 .../controlflow => utils}/Cfg.ql              |   0
 5 files changed, 599 insertions(+)
 create mode 100644 rust/ql/test/library-tests/controlflow/Cfg.qlref
 create mode 100644 rust/ql/test/library-tests/variables/Cfg.expected
 create mode 100644 rust/ql/test/library-tests/variables/Cfg.qlref
 create mode 100644 rust/ql/test/utils/Cfg.expected
 rename rust/ql/test/{library-tests/controlflow => utils}/Cfg.ql (100%)

diff --git a/rust/ql/test/library-tests/controlflow/Cfg.qlref b/rust/ql/test/library-tests/controlflow/Cfg.qlref
new file mode 100644
index 000000000000..ba4ee4b414f1
--- /dev/null
+++ b/rust/ql/test/library-tests/controlflow/Cfg.qlref
@@ -0,0 +1 @@
+query: utils/Cfg.ql
\ No newline at end of file
diff --git a/rust/ql/test/library-tests/variables/Cfg.expected b/rust/ql/test/library-tests/variables/Cfg.expected
new file mode 100644
index 000000000000..876e5fb52664
--- /dev/null
+++ b/rust/ql/test/library-tests/variables/Cfg.expected
@@ -0,0 +1,594 @@
+| variables.rs:1:1:3:1 | enter print_str | variables.rs:2:5:2:22 | ExprStmt |  |
+| variables.rs:1:1:3:1 | exit print_str (normal) | variables.rs:1:1:3:1 | exit print_str |  |
+| variables.rs:1:23:3:1 | BlockExpr | variables.rs:1:1:3:1 | exit print_str (normal) |  |
+| variables.rs:2:5:2:21 | MacroExpr | variables.rs:1:23:3:1 | BlockExpr |  |
+| variables.rs:2:5:2:22 | ExprStmt | variables.rs:2:5:2:21 | MacroExpr |  |
+| variables.rs:5:1:7:1 | enter print_i64 | variables.rs:6:5:6:22 | ExprStmt |  |
+| variables.rs:5:1:7:1 | exit print_i64 (normal) | variables.rs:5:1:7:1 | exit print_i64 |  |
+| variables.rs:5:22:7:1 | BlockExpr | variables.rs:5:1:7:1 | exit print_i64 (normal) |  |
+| variables.rs:6:5:6:21 | MacroExpr | variables.rs:5:22:7:1 | BlockExpr |  |
+| variables.rs:6:5:6:22 | ExprStmt | variables.rs:6:5:6:21 | MacroExpr |  |
+| variables.rs:9:1:12:1 | enter immutable_variable | variables.rs:10:5:10:17 | LetStmt |  |
+| variables.rs:9:1:12:1 | exit immutable_variable (normal) | variables.rs:9:1:12:1 | exit immutable_variable |  |
+| variables.rs:9:25:12:1 | BlockExpr | variables.rs:9:1:12:1 | exit immutable_variable (normal) |  |
+| variables.rs:10:5:10:17 | LetStmt | variables.rs:10:14:10:16 | "a" |  |
+| variables.rs:10:9:10:10 | x1 | variables.rs:11:5:11:18 | ExprStmt | match, no-match |
+| variables.rs:10:14:10:16 | "a" | variables.rs:10:9:10:10 | x1 |  |
+| variables.rs:11:5:11:13 | PathExpr | variables.rs:11:15:11:16 | x1 |  |
+| variables.rs:11:5:11:17 | CallExpr | variables.rs:9:25:12:1 | BlockExpr |  |
+| variables.rs:11:5:11:18 | ExprStmt | variables.rs:11:5:11:13 | PathExpr |  |
+| variables.rs:11:15:11:16 | x1 | variables.rs:11:5:11:17 | CallExpr |  |
+| variables.rs:14:1:19:1 | enter mutable_variable | variables.rs:15:5:15:19 | LetStmt |  |
+| variables.rs:14:1:19:1 | exit mutable_variable (normal) | variables.rs:14:1:19:1 | exit mutable_variable |  |
+| variables.rs:14:23:19:1 | BlockExpr | variables.rs:14:1:19:1 | exit mutable_variable (normal) |  |
+| variables.rs:15:5:15:19 | LetStmt | variables.rs:15:18:15:18 | 4 |  |
+| variables.rs:15:9:15:14 | x2 | variables.rs:16:5:16:18 | ExprStmt | match, no-match |
+| variables.rs:15:18:15:18 | 4 | variables.rs:15:9:15:14 | x2 |  |
+| variables.rs:16:5:16:13 | PathExpr | variables.rs:16:15:16:16 | x2 |  |
+| variables.rs:16:5:16:17 | CallExpr | variables.rs:17:5:17:11 | ExprStmt |  |
+| variables.rs:16:5:16:18 | ExprStmt | variables.rs:16:5:16:13 | PathExpr |  |
+| variables.rs:16:15:16:16 | x2 | variables.rs:16:5:16:17 | CallExpr |  |
+| variables.rs:17:5:17:6 | x2 | variables.rs:17:10:17:10 | 5 |  |
+| variables.rs:17:5:17:10 | ... = ... | variables.rs:18:5:18:18 | ExprStmt |  |
+| variables.rs:17:5:17:11 | ExprStmt | variables.rs:17:5:17:6 | x2 |  |
+| variables.rs:17:10:17:10 | 5 | variables.rs:17:5:17:10 | ... = ... |  |
+| variables.rs:18:5:18:13 | PathExpr | variables.rs:18:15:18:16 | x2 |  |
+| variables.rs:18:5:18:17 | CallExpr | variables.rs:14:23:19:1 | BlockExpr |  |
+| variables.rs:18:5:18:18 | ExprStmt | variables.rs:18:5:18:13 | PathExpr |  |
+| variables.rs:18:15:18:16 | x2 | variables.rs:18:5:18:17 | CallExpr |  |
+| variables.rs:21:1:27:1 | enter variable_shadow1 | variables.rs:22:5:22:15 | LetStmt |  |
+| variables.rs:21:1:27:1 | exit variable_shadow1 (normal) | variables.rs:21:1:27:1 | exit variable_shadow1 |  |
+| variables.rs:21:23:27:1 | BlockExpr | variables.rs:21:1:27:1 | exit variable_shadow1 (normal) |  |
+| variables.rs:22:5:22:15 | LetStmt | variables.rs:22:14:22:14 | 1 |  |
+| variables.rs:22:9:22:10 | x3 | variables.rs:23:5:23:18 | ExprStmt | match, no-match |
+| variables.rs:22:14:22:14 | 1 | variables.rs:22:9:22:10 | x3 |  |
+| variables.rs:23:5:23:13 | PathExpr | variables.rs:23:15:23:16 | x3 |  |
+| variables.rs:23:5:23:17 | CallExpr | variables.rs:24:5:25:15 | LetStmt |  |
+| variables.rs:23:5:23:18 | ExprStmt | variables.rs:23:5:23:13 | PathExpr |  |
+| variables.rs:23:15:23:16 | x3 | variables.rs:23:5:23:17 | CallExpr |  |
+| variables.rs:24:5:25:15 | LetStmt | variables.rs:25:9:25:10 | x3 |  |
+| variables.rs:24:9:24:10 | x3 | variables.rs:26:5:26:18 | ExprStmt | match, no-match |
+| variables.rs:25:9:25:10 | x3 | variables.rs:25:14:25:14 | 1 |  |
+| variables.rs:25:9:25:14 | ... + ... | variables.rs:24:9:24:10 | x3 |  |
+| variables.rs:25:14:25:14 | 1 | variables.rs:25:9:25:14 | ... + ... |  |
+| variables.rs:26:5:26:13 | PathExpr | variables.rs:26:15:26:16 | x3 |  |
+| variables.rs:26:5:26:17 | CallExpr | variables.rs:21:23:27:1 | BlockExpr |  |
+| variables.rs:26:5:26:18 | ExprStmt | variables.rs:26:5:26:13 | PathExpr |  |
+| variables.rs:26:15:26:16 | x3 | variables.rs:26:5:26:17 | CallExpr |  |
+| variables.rs:29:1:37:1 | enter variable_shadow2 | variables.rs:30:5:30:17 | LetStmt |  |
+| variables.rs:29:1:37:1 | exit variable_shadow2 (normal) | variables.rs:29:1:37:1 | exit variable_shadow2 |  |
+| variables.rs:29:23:37:1 | BlockExpr | variables.rs:29:1:37:1 | exit variable_shadow2 (normal) |  |
+| variables.rs:30:5:30:17 | LetStmt | variables.rs:30:14:30:16 | "a" |  |
+| variables.rs:30:9:30:10 | x4 | variables.rs:31:5:31:18 | ExprStmt | match, no-match |
+| variables.rs:30:14:30:16 | "a" | variables.rs:30:9:30:10 | x4 |  |
+| variables.rs:31:5:31:13 | PathExpr | variables.rs:31:15:31:16 | x4 |  |
+| variables.rs:31:5:31:17 | CallExpr | variables.rs:32:5:35:5 | ExprStmt |  |
+| variables.rs:31:5:31:18 | ExprStmt | variables.rs:31:5:31:13 | PathExpr |  |
+| variables.rs:31:15:31:16 | x4 | variables.rs:31:5:31:17 | CallExpr |  |
+| variables.rs:32:5:35:5 | BlockExpr | variables.rs:36:5:36:18 | ExprStmt |  |
+| variables.rs:32:5:35:5 | ExprStmt | variables.rs:33:9:33:21 | LetStmt |  |
+| variables.rs:33:9:33:21 | LetStmt | variables.rs:33:18:33:20 | "b" |  |
+| variables.rs:33:13:33:14 | x4 | variables.rs:34:9:34:22 | ExprStmt | match, no-match |
+| variables.rs:33:18:33:20 | "b" | variables.rs:33:13:33:14 | x4 |  |
+| variables.rs:34:9:34:17 | PathExpr | variables.rs:34:19:34:20 | x4 |  |
+| variables.rs:34:9:34:21 | CallExpr | variables.rs:32:5:35:5 | BlockExpr |  |
+| variables.rs:34:9:34:22 | ExprStmt | variables.rs:34:9:34:17 | PathExpr |  |
+| variables.rs:34:19:34:20 | x4 | variables.rs:34:9:34:21 | CallExpr |  |
+| variables.rs:36:5:36:13 | PathExpr | variables.rs:36:15:36:16 | x4 |  |
+| variables.rs:36:5:36:17 | CallExpr | variables.rs:29:23:37:1 | BlockExpr |  |
+| variables.rs:36:5:36:18 | ExprStmt | variables.rs:36:5:36:13 | PathExpr |  |
+| variables.rs:36:15:36:16 | x4 | variables.rs:36:5:36:17 | CallExpr |  |
+| variables.rs:44:1:59:1 | enter let_pattern1 | variables.rs:45:5:54:47 | LetStmt |  |
+| variables.rs:44:1:59:1 | exit let_pattern1 (normal) | variables.rs:44:1:59:1 | exit let_pattern1 |  |
+| variables.rs:44:19:59:1 | BlockExpr | variables.rs:44:1:59:1 | exit let_pattern1 (normal) |  |
+| variables.rs:45:5:54:47 | LetStmt | variables.rs:54:11:54:13 | "a" |  |
+| variables.rs:45:9:54:5 | TuplePat | variables.rs:55:5:55:18 | ExprStmt | match |
+| variables.rs:54:9:54:46 | TupleExpr | variables.rs:45:9:54:5 | TuplePat |  |
+| variables.rs:54:10:54:19 | TupleExpr | variables.rs:54:33:54:35 | "x" |  |
+| variables.rs:54:11:54:13 | "a" | variables.rs:54:16:54:18 | "b" |  |
+| variables.rs:54:16:54:18 | "b" | variables.rs:54:10:54:19 | TupleExpr |  |
+| variables.rs:54:22:54:45 | RecordExpr | variables.rs:54:9:54:46 | TupleExpr |  |
+| variables.rs:54:33:54:35 | "x" | variables.rs:54:41:54:43 | "y" |  |
+| variables.rs:54:41:54:43 | "y" | variables.rs:54:22:54:45 | RecordExpr |  |
+| variables.rs:55:5:55:13 | PathExpr | variables.rs:55:15:55:16 | a1 |  |
+| variables.rs:55:5:55:17 | CallExpr | variables.rs:56:5:56:18 | ExprStmt |  |
+| variables.rs:55:5:55:18 | ExprStmt | variables.rs:55:5:55:13 | PathExpr |  |
+| variables.rs:55:15:55:16 | a1 | variables.rs:55:5:55:17 | CallExpr |  |
+| variables.rs:56:5:56:13 | PathExpr | variables.rs:56:15:56:16 | b1 |  |
+| variables.rs:56:5:56:17 | CallExpr | variables.rs:57:5:57:17 | ExprStmt |  |
+| variables.rs:56:5:56:18 | ExprStmt | variables.rs:56:5:56:13 | PathExpr |  |
+| variables.rs:56:15:56:16 | b1 | variables.rs:56:5:56:17 | CallExpr |  |
+| variables.rs:57:5:57:13 | PathExpr | variables.rs:57:15:57:15 | x |  |
+| variables.rs:57:5:57:16 | CallExpr | variables.rs:58:5:58:17 | ExprStmt |  |
+| variables.rs:57:5:57:17 | ExprStmt | variables.rs:57:5:57:13 | PathExpr |  |
+| variables.rs:57:15:57:15 | x | variables.rs:57:5:57:16 | CallExpr |  |
+| variables.rs:58:5:58:13 | PathExpr | variables.rs:58:15:58:15 | y |  |
+| variables.rs:58:5:58:16 | CallExpr | variables.rs:44:19:59:1 | BlockExpr |  |
+| variables.rs:58:5:58:17 | ExprStmt | variables.rs:58:5:58:13 | PathExpr |  |
+| variables.rs:58:15:58:15 | y | variables.rs:58:5:58:16 | CallExpr |  |
+| variables.rs:61:1:69:1 | enter let_pattern2 | variables.rs:62:5:62:38 | LetStmt |  |
+| variables.rs:61:1:69:1 | exit let_pattern2 (normal) | variables.rs:61:1:69:1 | exit let_pattern2 |  |
+| variables.rs:61:19:69:1 | BlockExpr | variables.rs:61:1:69:1 | exit let_pattern2 (normal) |  |
+| variables.rs:62:5:62:38 | LetStmt | variables.rs:62:25:62:27 | "a" |  |
+| variables.rs:62:9:62:10 | p1 | variables.rs:63:5:66:11 | LetStmt | match, no-match |
+| variables.rs:62:14:62:37 | RecordExpr | variables.rs:62:9:62:10 | p1 |  |
+| variables.rs:62:25:62:27 | "a" | variables.rs:62:33:62:35 | "b" |  |
+| variables.rs:62:33:62:35 | "b" | variables.rs:62:14:62:37 | RecordExpr |  |
+| variables.rs:63:5:66:11 | LetStmt | variables.rs:66:9:66:10 | p1 |  |
+| variables.rs:63:9:66:5 | RecordPat | variables.rs:67:5:67:18 | ExprStmt | match |
+| variables.rs:66:9:66:10 | p1 | variables.rs:63:9:66:5 | RecordPat |  |
+| variables.rs:67:5:67:13 | PathExpr | variables.rs:67:15:67:16 | a2 |  |
+| variables.rs:67:5:67:17 | CallExpr | variables.rs:68:5:68:18 | ExprStmt |  |
+| variables.rs:67:5:67:18 | ExprStmt | variables.rs:67:5:67:13 | PathExpr |  |
+| variables.rs:67:15:67:16 | a2 | variables.rs:67:5:67:17 | CallExpr |  |
+| variables.rs:68:5:68:13 | PathExpr | variables.rs:68:15:68:16 | b2 |  |
+| variables.rs:68:5:68:17 | CallExpr | variables.rs:61:19:69:1 | BlockExpr |  |
+| variables.rs:68:5:68:18 | ExprStmt | variables.rs:68:5:68:13 | PathExpr |  |
+| variables.rs:68:15:68:16 | b2 | variables.rs:68:5:68:17 | CallExpr |  |
+| variables.rs:71:1:78:1 | enter let_pattern3 | variables.rs:72:5:72:42 | LetStmt |  |
+| variables.rs:71:1:78:1 | exit let_pattern3 (normal) | variables.rs:71:1:78:1 | exit let_pattern3 |  |
+| variables.rs:71:19:78:1 | BlockExpr | variables.rs:71:1:78:1 | exit let_pattern3 (normal) |  |
+| variables.rs:72:5:72:42 | LetStmt | variables.rs:72:14:72:17 | PathExpr |  |
+| variables.rs:72:9:72:10 | s1 | variables.rs:74:8:75:12 | LetExpr | match, no-match |
+| variables.rs:72:14:72:17 | PathExpr | variables.rs:72:19:72:30 | PathExpr |  |
+| variables.rs:72:14:72:41 | CallExpr | variables.rs:72:9:72:10 | s1 |  |
+| variables.rs:72:19:72:30 | PathExpr | variables.rs:72:32:72:39 | "Hello!" |  |
+| variables.rs:72:19:72:40 | CallExpr | variables.rs:72:14:72:41 | CallExpr |  |
+| variables.rs:72:32:72:39 | "Hello!" | variables.rs:72:19:72:40 | CallExpr |  |
+| variables.rs:74:5:77:5 | IfExpr | variables.rs:71:19:78:1 | BlockExpr |  |
+| variables.rs:74:8:75:12 | LetExpr | variables.rs:74:12:74:23 | TupleStructPat |  |
+| variables.rs:74:12:74:23 | TupleStructPat | variables.rs:74:5:77:5 | IfExpr | no-match |
+| variables.rs:74:12:74:23 | TupleStructPat | variables.rs:76:9:76:22 | ExprStmt | match |
+| variables.rs:75:14:77:5 | BlockExpr | variables.rs:74:5:77:5 | IfExpr |  |
+| variables.rs:76:9:76:17 | PathExpr | variables.rs:76:19:76:20 | s2 |  |
+| variables.rs:76:9:76:21 | CallExpr | variables.rs:75:14:77:5 | BlockExpr |  |
+| variables.rs:76:9:76:22 | ExprStmt | variables.rs:76:9:76:17 | PathExpr |  |
+| variables.rs:76:19:76:20 | s2 | variables.rs:76:9:76:21 | CallExpr |  |
+| variables.rs:80:1:86:1 | enter let_pattern4 | variables.rs:81:5:84:6 | LetStmt |  |
+| variables.rs:80:1:86:1 | exit let_pattern4 (normal) | variables.rs:80:1:86:1 | exit let_pattern4 |  |
+| variables.rs:80:19:86:1 | BlockExpr | variables.rs:80:1:86:1 | exit let_pattern4 (normal) |  |
+| variables.rs:81:5:84:6 | LetStmt | variables.rs:81:34:81:37 | PathExpr |  |
+| variables.rs:81:9:81:16 | TupleStructPat | variables.rs:83:9:83:15 | MacroExpr | no-match |
+| variables.rs:81:9:81:16 | TupleStructPat | variables.rs:85:5:85:18 | ExprStmt | match |
+| variables.rs:81:34:81:37 | PathExpr | variables.rs:81:39:81:42 | "x5" |  |
+| variables.rs:81:34:81:43 | CallExpr | variables.rs:81:9:81:16 | TupleStructPat |  |
+| variables.rs:81:39:81:42 | "x5" | variables.rs:81:34:81:43 | CallExpr |  |
+| variables.rs:83:9:83:15 | MacroExpr | variables.rs:81:50:84:5 | BlockExpr |  |
+| variables.rs:85:5:85:13 | PathExpr | variables.rs:85:15:85:16 | x5 |  |
+| variables.rs:85:5:85:17 | CallExpr | variables.rs:80:19:86:1 | BlockExpr |  |
+| variables.rs:85:5:85:18 | ExprStmt | variables.rs:85:5:85:13 | PathExpr |  |
+| variables.rs:85:15:85:16 | x5 | variables.rs:85:5:85:17 | CallExpr |  |
+| variables.rs:88:1:103:1 | enter match_pattern1 | variables.rs:89:5:89:21 | LetStmt |  |
+| variables.rs:88:1:103:1 | exit match_pattern1 (normal) | variables.rs:88:1:103:1 | exit match_pattern1 |  |
+| variables.rs:88:21:103:1 | BlockExpr | variables.rs:88:1:103:1 | exit match_pattern1 (normal) |  |
+| variables.rs:89:5:89:21 | LetStmt | variables.rs:89:14:89:17 | PathExpr |  |
+| variables.rs:89:9:89:10 | x6 | variables.rs:90:5:90:16 | LetStmt | match, no-match |
+| variables.rs:89:14:89:17 | PathExpr | variables.rs:89:19:89:19 | 5 |  |
+| variables.rs:89:14:89:20 | CallExpr | variables.rs:89:9:89:10 | x6 |  |
+| variables.rs:89:19:89:19 | 5 | variables.rs:89:14:89:20 | CallExpr |  |
+| variables.rs:90:5:90:16 | LetStmt | variables.rs:90:14:90:15 | 10 |  |
+| variables.rs:90:9:90:10 | y1 | variables.rs:92:5:100:5 | ExprStmt | match, no-match |
+| variables.rs:90:14:90:15 | 10 | variables.rs:90:9:90:10 | y1 |  |
+| variables.rs:92:5:100:5 | ExprStmt | variables.rs:92:11:92:12 | x6 |  |
+| variables.rs:92:5:100:5 | MatchExpr | variables.rs:102:5:102:18 | ExprStmt |  |
+| variables.rs:92:11:92:12 | x6 | variables.rs:93:9:93:16 | TupleStructPat |  |
+| variables.rs:93:9:93:16 | TupleStructPat | variables.rs:93:21:93:29 | PathExpr | match |
+| variables.rs:93:9:93:16 | TupleStructPat | variables.rs:94:9:94:16 | TupleStructPat | no-match |
+| variables.rs:93:21:93:29 | PathExpr | variables.rs:93:31:93:38 | "Got 50" |  |
+| variables.rs:93:21:93:39 | CallExpr | variables.rs:92:5:100:5 | MatchExpr |  |
+| variables.rs:93:31:93:38 | "Got 50" | variables.rs:93:21:93:39 | CallExpr |  |
+| variables.rs:94:9:94:16 | TupleStructPat | variables.rs:97:13:97:21 | PathExpr | match |
+| variables.rs:94:9:94:16 | TupleStructPat | variables.rs:99:9:99:12 | None | no-match |
+| variables.rs:96:9:98:9 | BlockExpr | variables.rs:92:5:100:5 | MatchExpr |  |
+| variables.rs:97:13:97:21 | PathExpr | variables.rs:97:23:97:24 | y1 |  |
+| variables.rs:97:13:97:25 | CallExpr | variables.rs:96:9:98:9 | BlockExpr |  |
+| variables.rs:97:23:97:24 | y1 | variables.rs:97:13:97:25 | CallExpr |  |
+| variables.rs:99:9:99:12 | None | variables.rs:99:17:99:25 | PathExpr | match |
+| variables.rs:99:17:99:25 | PathExpr | variables.rs:99:27:99:32 | "NONE" |  |
+| variables.rs:99:17:99:33 | CallExpr | variables.rs:92:5:100:5 | MatchExpr |  |
+| variables.rs:99:27:99:32 | "NONE" | variables.rs:99:17:99:33 | CallExpr |  |
+| variables.rs:102:5:102:13 | PathExpr | variables.rs:102:15:102:16 | y1 |  |
+| variables.rs:102:5:102:17 | CallExpr | variables.rs:88:21:103:1 | BlockExpr |  |
+| variables.rs:102:5:102:18 | ExprStmt | variables.rs:102:5:102:13 | PathExpr |  |
+| variables.rs:102:15:102:16 | y1 | variables.rs:102:5:102:17 | CallExpr |  |
+| variables.rs:105:1:130:1 | enter match_pattern2 | variables.rs:106:5:106:36 | LetStmt |  |
+| variables.rs:105:1:130:1 | exit match_pattern2 (normal) | variables.rs:105:1:130:1 | exit match_pattern2 |  |
+| variables.rs:105:21:130:1 | BlockExpr | variables.rs:105:1:130:1 | exit match_pattern2 (normal) |  |
+| variables.rs:106:5:106:36 | LetStmt | variables.rs:106:20:106:20 | 2 |  |
+| variables.rs:106:9:106:15 | numbers | variables.rs:108:5:118:5 | ExprStmt | match, no-match |
+| variables.rs:106:19:106:35 | TupleExpr | variables.rs:106:9:106:15 | numbers |  |
+| variables.rs:106:20:106:20 | 2 | variables.rs:106:23:106:23 | 4 |  |
+| variables.rs:106:23:106:23 | 4 | variables.rs:106:26:106:26 | 8 |  |
+| variables.rs:106:26:106:26 | 8 | variables.rs:106:29:106:30 | 16 |  |
+| variables.rs:106:29:106:30 | 16 | variables.rs:106:33:106:34 | 32 |  |
+| variables.rs:106:33:106:34 | 32 | variables.rs:106:19:106:35 | TupleExpr |  |
+| variables.rs:108:5:118:5 | ExprStmt | variables.rs:108:11:108:17 | numbers |  |
+| variables.rs:108:5:118:5 | MatchExpr | variables.rs:120:11:120:17 | numbers |  |
+| variables.rs:108:11:108:17 | numbers | variables.rs:109:9:113:9 | TuplePat |  |
+| variables.rs:109:9:113:9 | TuplePat | variables.rs:114:13:114:29 | ExprStmt | match |
+| variables.rs:113:14:117:9 | BlockExpr | variables.rs:108:5:118:5 | MatchExpr |  |
+| variables.rs:114:13:114:21 | PathExpr | variables.rs:114:23:114:27 | first |  |
+| variables.rs:114:13:114:28 | CallExpr | variables.rs:115:13:115:29 | ExprStmt |  |
+| variables.rs:114:13:114:29 | ExprStmt | variables.rs:114:13:114:21 | PathExpr |  |
+| variables.rs:114:23:114:27 | first | variables.rs:114:13:114:28 | CallExpr |  |
+| variables.rs:115:13:115:21 | PathExpr | variables.rs:115:23:115:27 | third |  |
+| variables.rs:115:13:115:28 | CallExpr | variables.rs:116:13:116:29 | ExprStmt |  |
+| variables.rs:115:13:115:29 | ExprStmt | variables.rs:115:13:115:21 | PathExpr |  |
+| variables.rs:115:23:115:27 | third | variables.rs:115:13:115:28 | CallExpr |  |
+| variables.rs:116:13:116:21 | PathExpr | variables.rs:116:23:116:27 | fifth |  |
+| variables.rs:116:13:116:28 | CallExpr | variables.rs:113:14:117:9 | BlockExpr |  |
+| variables.rs:116:13:116:29 | ExprStmt | variables.rs:116:13:116:21 | PathExpr |  |
+| variables.rs:116:23:116:27 | fifth | variables.rs:116:13:116:28 | CallExpr |  |
+| variables.rs:120:5:129:5 | MatchExpr | variables.rs:105:21:130:1 | BlockExpr |  |
+| variables.rs:120:11:120:17 | numbers | variables.rs:121:9:125:9 | TuplePat |  |
+| variables.rs:121:9:125:9 | TuplePat | variables.rs:126:13:126:29 | ExprStmt | match |
+| variables.rs:125:14:128:9 | BlockExpr | variables.rs:120:5:129:5 | MatchExpr |  |
+| variables.rs:126:13:126:21 | PathExpr | variables.rs:126:23:126:27 | first |  |
+| variables.rs:126:13:126:28 | CallExpr | variables.rs:127:13:127:28 | ExprStmt |  |
+| variables.rs:126:13:126:29 | ExprStmt | variables.rs:126:13:126:21 | PathExpr |  |
+| variables.rs:126:23:126:27 | first | variables.rs:126:13:126:28 | CallExpr |  |
+| variables.rs:127:13:127:21 | PathExpr | variables.rs:127:23:127:26 | last |  |
+| variables.rs:127:13:127:27 | CallExpr | variables.rs:125:14:128:9 | BlockExpr |  |
+| variables.rs:127:13:127:28 | ExprStmt | variables.rs:127:13:127:21 | PathExpr |  |
+| variables.rs:127:23:127:26 | last | variables.rs:127:13:127:27 | CallExpr |  |
+| variables.rs:132:1:140:1 | enter match_pattern3 | variables.rs:133:5:133:38 | LetStmt |  |
+| variables.rs:132:1:140:1 | exit match_pattern3 (normal) | variables.rs:132:1:140:1 | exit match_pattern3 |  |
+| variables.rs:132:21:140:1 | BlockExpr | variables.rs:132:1:140:1 | exit match_pattern3 (normal) |  |
+| variables.rs:133:5:133:38 | LetStmt | variables.rs:133:25:133:27 | "x" |  |
+| variables.rs:133:9:133:10 | p2 | variables.rs:135:11:135:12 | p2 | match, no-match |
+| variables.rs:133:14:133:37 | RecordExpr | variables.rs:133:9:133:10 | p2 |  |
+| variables.rs:133:25:133:27 | "x" | variables.rs:133:33:133:35 | "y" |  |
+| variables.rs:133:33:133:35 | "y" | variables.rs:133:14:133:37 | RecordExpr |  |
+| variables.rs:135:5:139:5 | MatchExpr | variables.rs:132:21:140:1 | BlockExpr |  |
+| variables.rs:135:11:135:12 | p2 | variables.rs:136:9:138:9 | RecordPat |  |
+| variables.rs:136:9:138:9 | RecordPat | variables.rs:138:14:138:22 | PathExpr | match |
+| variables.rs:138:14:138:22 | PathExpr | variables.rs:138:24:138:25 | x7 |  |
+| variables.rs:138:14:138:26 | CallExpr | variables.rs:135:5:139:5 | MatchExpr |  |
+| variables.rs:138:24:138:25 | x7 | variables.rs:138:14:138:26 | CallExpr |  |
+| variables.rs:146:1:159:1 | enter match_pattern4 | variables.rs:147:5:147:39 | LetStmt |  |
+| variables.rs:146:1:159:1 | exit match_pattern4 (normal) | variables.rs:146:1:159:1 | exit match_pattern4 |  |
+| variables.rs:146:21:159:1 | BlockExpr | variables.rs:146:1:159:1 | exit match_pattern4 (normal) |  |
+| variables.rs:147:5:147:39 | LetStmt | variables.rs:147:36:147:36 | 0 |  |
+| variables.rs:147:9:147:11 | msg | variables.rs:149:11:149:13 | msg | match, no-match |
+| variables.rs:147:15:147:38 | RecordExpr | variables.rs:147:9:147:11 | msg |  |
+| variables.rs:147:36:147:36 | 0 | variables.rs:147:15:147:38 | RecordExpr |  |
+| variables.rs:149:5:158:5 | MatchExpr | variables.rs:146:21:159:1 | BlockExpr |  |
+| variables.rs:149:11:149:13 | msg | variables.rs:150:9:152:9 | RecordPat |  |
+| variables.rs:150:9:152:9 | RecordPat | variables.rs:152:14:152:22 | PathExpr | match |
+| variables.rs:150:9:152:9 | RecordPat | variables.rs:153:9:153:38 | RecordPat | no-match |
+| variables.rs:152:14:152:22 | PathExpr | variables.rs:152:24:152:34 | id_variable |  |
+| variables.rs:152:14:152:35 | CallExpr | variables.rs:149:5:158:5 | MatchExpr |  |
+| variables.rs:152:24:152:34 | id_variable | variables.rs:152:14:152:35 | CallExpr |  |
+| variables.rs:153:9:153:38 | RecordPat | variables.rs:154:13:154:52 | MacroExpr | match |
+| variables.rs:153:9:153:38 | RecordPat | variables.rs:156:9:156:29 | RecordPat | no-match |
+| variables.rs:153:43:155:9 | BlockExpr | variables.rs:149:5:158:5 | MatchExpr |  |
+| variables.rs:154:13:154:52 | MacroExpr | variables.rs:153:43:155:9 | BlockExpr |  |
+| variables.rs:156:9:156:29 | RecordPat | variables.rs:157:13:157:21 | PathExpr | match |
+| variables.rs:157:13:157:21 | PathExpr | variables.rs:157:23:157:24 | id |  |
+| variables.rs:157:13:157:25 | CallExpr | variables.rs:149:5:158:5 | MatchExpr |  |
+| variables.rs:157:23:157:24 | id | variables.rs:157:13:157:25 | CallExpr |  |
+| variables.rs:166:1:172:1 | enter match_pattern5 | variables.rs:167:5:167:34 | LetStmt |  |
+| variables.rs:166:1:172:1 | exit match_pattern5 (normal) | variables.rs:166:1:172:1 | exit match_pattern5 |  |
+| variables.rs:166:21:172:1 | BlockExpr | variables.rs:166:1:172:1 | exit match_pattern5 (normal) |  |
+| variables.rs:167:5:167:34 | LetStmt | variables.rs:167:18:167:29 | PathExpr |  |
+| variables.rs:167:9:167:14 | either | variables.rs:168:11:168:16 | either | match, no-match |
+| variables.rs:167:18:167:29 | PathExpr | variables.rs:167:31:167:32 | 32 |  |
+| variables.rs:167:18:167:33 | CallExpr | variables.rs:167:9:167:14 | either |  |
+| variables.rs:167:31:167:32 | 32 | variables.rs:167:18:167:33 | CallExpr |  |
+| variables.rs:168:5:171:5 | MatchExpr | variables.rs:166:21:172:1 | BlockExpr |  |
+| variables.rs:168:11:168:16 | either | variables.rs:169:9:169:44 | OrPat |  |
+| variables.rs:169:9:169:44 | OrPat | variables.rs:170:16:170:24 | PathExpr | match |
+| variables.rs:170:16:170:24 | PathExpr | variables.rs:170:26:170:27 | a3 |  |
+| variables.rs:170:16:170:28 | CallExpr | variables.rs:168:5:171:5 | MatchExpr |  |
+| variables.rs:170:26:170:27 | a3 | variables.rs:170:16:170:28 | CallExpr |  |
+| variables.rs:180:1:194:1 | enter match_pattern6 | variables.rs:181:5:181:37 | LetStmt |  |
+| variables.rs:180:1:194:1 | exit match_pattern6 (normal) | variables.rs:180:1:194:1 | exit match_pattern6 |  |
+| variables.rs:180:21:194:1 | BlockExpr | variables.rs:180:1:194:1 | exit match_pattern6 (normal) |  |
+| variables.rs:181:5:181:37 | LetStmt | variables.rs:181:14:181:32 | PathExpr |  |
+| variables.rs:181:9:181:10 | tv | variables.rs:182:5:185:5 | ExprStmt | match, no-match |
+| variables.rs:181:14:181:32 | PathExpr | variables.rs:181:34:181:35 | 62 |  |
+| variables.rs:181:14:181:36 | CallExpr | variables.rs:181:9:181:10 | tv |  |
+| variables.rs:181:34:181:35 | 62 | variables.rs:181:14:181:36 | CallExpr |  |
+| variables.rs:182:5:185:5 | ExprStmt | variables.rs:182:11:182:12 | tv |  |
+| variables.rs:182:5:185:5 | MatchExpr | variables.rs:186:5:189:5 | ExprStmt |  |
+| variables.rs:182:11:182:12 | tv | variables.rs:183:9:183:81 | OrPat |  |
+| variables.rs:183:9:183:81 | OrPat | variables.rs:184:16:184:24 | PathExpr | match |
+| variables.rs:184:16:184:24 | PathExpr | variables.rs:184:26:184:27 | a4 |  |
+| variables.rs:184:16:184:28 | CallExpr | variables.rs:182:5:185:5 | MatchExpr |  |
+| variables.rs:184:26:184:27 | a4 | variables.rs:184:16:184:28 | CallExpr |  |
+| variables.rs:186:5:189:5 | ExprStmt | variables.rs:186:11:186:12 | tv |  |
+| variables.rs:186:5:189:5 | MatchExpr | variables.rs:190:11:190:12 | tv |  |
+| variables.rs:186:11:186:12 | tv | variables.rs:187:9:187:83 | OrPat |  |
+| variables.rs:187:9:187:83 | OrPat | variables.rs:188:16:188:24 | PathExpr | match |
+| variables.rs:188:16:188:24 | PathExpr | variables.rs:188:26:188:27 | a5 |  |
+| variables.rs:188:16:188:28 | CallExpr | variables.rs:186:5:189:5 | MatchExpr |  |
+| variables.rs:188:26:188:27 | a5 | variables.rs:188:16:188:28 | CallExpr |  |
+| variables.rs:190:5:193:5 | MatchExpr | variables.rs:180:21:194:1 | BlockExpr |  |
+| variables.rs:190:11:190:12 | tv | variables.rs:191:9:191:83 | OrPat |  |
+| variables.rs:191:9:191:83 | OrPat | variables.rs:192:16:192:24 | PathExpr | match |
+| variables.rs:192:16:192:24 | PathExpr | variables.rs:192:26:192:27 | a6 |  |
+| variables.rs:192:16:192:28 | CallExpr | variables.rs:190:5:193:5 | MatchExpr |  |
+| variables.rs:192:26:192:27 | a6 | variables.rs:192:16:192:28 | CallExpr |  |
+| variables.rs:196:1:204:1 | enter match_pattern7 | variables.rs:197:5:197:34 | LetStmt |  |
+| variables.rs:196:1:204:1 | exit match_pattern7 (normal) | variables.rs:196:1:204:1 | exit match_pattern7 |  |
+| variables.rs:196:21:204:1 | BlockExpr | variables.rs:196:1:204:1 | exit match_pattern7 (normal) |  |
+| variables.rs:197:5:197:34 | LetStmt | variables.rs:197:18:197:29 | PathExpr |  |
+| variables.rs:197:9:197:14 | either | variables.rs:198:11:198:16 | either | match, no-match |
+| variables.rs:197:18:197:29 | PathExpr | variables.rs:197:31:197:32 | 32 |  |
+| variables.rs:197:18:197:33 | CallExpr | variables.rs:197:9:197:14 | either |  |
+| variables.rs:197:31:197:32 | 32 | variables.rs:197:18:197:33 | CallExpr |  |
+| variables.rs:198:5:203:5 | MatchExpr | variables.rs:196:21:204:1 | BlockExpr |  |
+| variables.rs:198:11:198:16 | either | variables.rs:199:9:199:44 | OrPat |  |
+| variables.rs:199:9:199:44 | OrPat | variables.rs:200:16:200:17 | a7 | match |
+| variables.rs:199:9:199:44 | OrPat | variables.rs:202:9:202:9 | WildcardPat | no-match |
+| variables.rs:200:16:200:17 | a7 | variables.rs:200:21:200:21 | 0 |  |
+| variables.rs:200:16:200:21 | ... > ... | variables.rs:201:16:201:24 | PathExpr | true |
+| variables.rs:200:16:200:21 | ... > ... | variables.rs:202:9:202:9 | WildcardPat | false |
+| variables.rs:200:21:200:21 | 0 | variables.rs:200:16:200:21 | ... > ... |  |
+| variables.rs:201:16:201:24 | PathExpr | variables.rs:201:26:201:27 | a7 |  |
+| variables.rs:201:16:201:28 | CallExpr | variables.rs:198:5:203:5 | MatchExpr |  |
+| variables.rs:201:26:201:27 | a7 | variables.rs:201:16:201:28 | CallExpr |  |
+| variables.rs:202:9:202:9 | WildcardPat | variables.rs:202:14:202:15 | TupleExpr | match |
+| variables.rs:202:14:202:15 | TupleExpr | variables.rs:198:5:203:5 | MatchExpr |  |
+| variables.rs:206:1:221:1 | enter match_pattern8 | variables.rs:207:5:207:34 | LetStmt |  |
+| variables.rs:206:1:221:1 | exit match_pattern8 (normal) | variables.rs:206:1:221:1 | exit match_pattern8 |  |
+| variables.rs:206:21:221:1 | BlockExpr | variables.rs:206:1:221:1 | exit match_pattern8 (normal) |  |
+| variables.rs:207:5:207:34 | LetStmt | variables.rs:207:18:207:29 | PathExpr |  |
+| variables.rs:207:9:207:14 | either | variables.rs:209:11:209:16 | either | match, no-match |
+| variables.rs:207:18:207:29 | PathExpr | variables.rs:207:31:207:32 | 32 |  |
+| variables.rs:207:18:207:33 | CallExpr | variables.rs:207:9:207:14 | either |  |
+| variables.rs:207:31:207:32 | 32 | variables.rs:207:18:207:33 | CallExpr |  |
+| variables.rs:209:5:220:5 | MatchExpr | variables.rs:206:21:221:1 | BlockExpr |  |
+| variables.rs:209:11:209:16 | either | variables.rs:210:9:211:52 | e |  |
+| variables.rs:210:9:211:52 | e | variables.rs:213:13:213:27 | ExprStmt | match |
+| variables.rs:210:9:211:52 | e | variables.rs:219:9:219:9 | WildcardPat | no-match |
+| variables.rs:212:12:218:9 | BlockExpr | variables.rs:209:5:220:5 | MatchExpr |  |
+| variables.rs:213:13:213:21 | PathExpr | variables.rs:213:23:213:25 | a11 |  |
+| variables.rs:213:13:213:26 | CallExpr | variables.rs:214:16:215:15 | LetExpr |  |
+| variables.rs:213:13:213:27 | ExprStmt | variables.rs:213:13:213:21 | PathExpr |  |
+| variables.rs:213:23:213:25 | a11 | variables.rs:213:13:213:26 | CallExpr |  |
+| variables.rs:214:13:217:13 | IfExpr | variables.rs:212:12:218:9 | BlockExpr |  |
+| variables.rs:214:16:215:15 | LetExpr | variables.rs:214:20:214:36 | TupleStructPat |  |
+| variables.rs:214:20:214:36 | TupleStructPat | variables.rs:214:13:217:13 | IfExpr | no-match |
+| variables.rs:214:20:214:36 | TupleStructPat | variables.rs:216:17:216:32 | ExprStmt | match |
+| variables.rs:215:17:217:13 | BlockExpr | variables.rs:214:13:217:13 | IfExpr |  |
+| variables.rs:216:17:216:25 | PathExpr | variables.rs:216:28:216:30 | a12 |  |
+| variables.rs:216:17:216:31 | CallExpr | variables.rs:215:17:217:13 | BlockExpr |  |
+| variables.rs:216:17:216:32 | ExprStmt | variables.rs:216:17:216:25 | PathExpr |  |
+| variables.rs:216:27:216:30 | * ... | variables.rs:216:17:216:31 | CallExpr |  |
+| variables.rs:216:28:216:30 | a12 | variables.rs:216:27:216:30 | * ... |  |
+| variables.rs:219:9:219:9 | WildcardPat | variables.rs:219:14:219:15 | TupleExpr | match |
+| variables.rs:219:14:219:15 | TupleExpr | variables.rs:209:5:220:5 | MatchExpr |  |
+| variables.rs:230:1:236:1 | enter match_pattern9 | variables.rs:231:5:231:36 | LetStmt |  |
+| variables.rs:230:1:236:1 | exit match_pattern9 (normal) | variables.rs:230:1:236:1 | exit match_pattern9 |  |
+| variables.rs:230:21:236:1 | BlockExpr | variables.rs:230:1:236:1 | exit match_pattern9 (normal) |  |
+| variables.rs:231:5:231:36 | LetStmt | variables.rs:231:14:231:31 | PathExpr |  |
+| variables.rs:231:9:231:10 | fv | variables.rs:232:11:232:12 | fv | match, no-match |
+| variables.rs:231:14:231:31 | PathExpr | variables.rs:231:33:231:34 | 62 |  |
+| variables.rs:231:14:231:35 | CallExpr | variables.rs:231:9:231:10 | fv |  |
+| variables.rs:231:33:231:34 | 62 | variables.rs:231:14:231:35 | CallExpr |  |
+| variables.rs:232:5:235:5 | MatchExpr | variables.rs:230:21:236:1 | BlockExpr |  |
+| variables.rs:232:11:232:12 | fv | variables.rs:233:9:233:109 | OrPat |  |
+| variables.rs:233:9:233:109 | OrPat | variables.rs:234:16:234:24 | PathExpr | match |
+| variables.rs:234:16:234:24 | PathExpr | variables.rs:234:26:234:28 | a13 |  |
+| variables.rs:234:16:234:29 | CallExpr | variables.rs:232:5:235:5 | MatchExpr |  |
+| variables.rs:234:26:234:28 | a13 | variables.rs:234:16:234:29 | CallExpr |  |
+| variables.rs:238:1:247:1 | enter param_pattern1 | variables.rs:244:5:244:18 | ExprStmt |  |
+| variables.rs:238:1:247:1 | exit param_pattern1 (normal) | variables.rs:238:1:247:1 | exit param_pattern1 |  |
+| variables.rs:243:28:247:1 | BlockExpr | variables.rs:238:1:247:1 | exit param_pattern1 (normal) |  |
+| variables.rs:244:5:244:13 | PathExpr | variables.rs:244:15:244:16 | a8 |  |
+| variables.rs:244:5:244:17 | CallExpr | variables.rs:245:5:245:18 | ExprStmt |  |
+| variables.rs:244:5:244:18 | ExprStmt | variables.rs:244:5:244:13 | PathExpr |  |
+| variables.rs:244:15:244:16 | a8 | variables.rs:244:5:244:17 | CallExpr |  |
+| variables.rs:245:5:245:13 | PathExpr | variables.rs:245:15:245:16 | b3 |  |
+| variables.rs:245:5:245:17 | CallExpr | variables.rs:246:5:246:18 | ExprStmt |  |
+| variables.rs:245:5:245:18 | ExprStmt | variables.rs:245:5:245:13 | PathExpr |  |
+| variables.rs:245:15:245:16 | b3 | variables.rs:245:5:245:17 | CallExpr |  |
+| variables.rs:246:5:246:13 | PathExpr | variables.rs:246:15:246:16 | c1 |  |
+| variables.rs:246:5:246:17 | CallExpr | variables.rs:243:28:247:1 | BlockExpr |  |
+| variables.rs:246:5:246:18 | ExprStmt | variables.rs:246:5:246:13 | PathExpr |  |
+| variables.rs:246:15:246:16 | c1 | variables.rs:246:5:246:17 | CallExpr |  |
+| variables.rs:249:1:253:1 | enter param_pattern2 | variables.rs:252:5:252:18 | ExprStmt |  |
+| variables.rs:249:1:253:1 | exit param_pattern2 (normal) | variables.rs:249:1:253:1 | exit param_pattern2 |  |
+| variables.rs:251:9:253:1 | BlockExpr | variables.rs:249:1:253:1 | exit param_pattern2 (normal) |  |
+| variables.rs:252:5:252:13 | PathExpr | variables.rs:252:15:252:16 | a9 |  |
+| variables.rs:252:5:252:17 | CallExpr | variables.rs:251:9:253:1 | BlockExpr |  |
+| variables.rs:252:5:252:18 | ExprStmt | variables.rs:252:5:252:13 | PathExpr |  |
+| variables.rs:252:15:252:16 | a9 | variables.rs:252:5:252:17 | CallExpr |  |
+| variables.rs:255:1:290:1 | enter destruct_assignment | variables.rs:256:5:260:18 | LetStmt |  |
+| variables.rs:255:1:290:1 | exit destruct_assignment (normal) | variables.rs:255:1:290:1 | exit destruct_assignment |  |
+| variables.rs:255:26:290:1 | BlockExpr | variables.rs:255:1:290:1 | exit destruct_assignment (normal) |  |
+| variables.rs:256:5:260:18 | LetStmt | variables.rs:260:10:260:10 | 1 |  |
+| variables.rs:256:9:260:5 | TuplePat | variables.rs:261:5:261:19 | ExprStmt | match |
+| variables.rs:260:9:260:17 | TupleExpr | variables.rs:256:9:260:5 | TuplePat |  |
+| variables.rs:260:10:260:10 | 1 | variables.rs:260:13:260:13 | 2 |  |
+| variables.rs:260:13:260:13 | 2 | variables.rs:260:16:260:16 | 3 |  |
+| variables.rs:260:16:260:16 | 3 | variables.rs:260:9:260:17 | TupleExpr |  |
+| variables.rs:261:5:261:13 | PathExpr | variables.rs:261:15:261:17 | a10 |  |
+| variables.rs:261:5:261:18 | CallExpr | variables.rs:262:5:262:18 | ExprStmt |  |
+| variables.rs:261:5:261:19 | ExprStmt | variables.rs:261:5:261:13 | PathExpr |  |
+| variables.rs:261:15:261:17 | a10 | variables.rs:261:5:261:18 | CallExpr |  |
+| variables.rs:262:5:262:13 | PathExpr | variables.rs:262:15:262:16 | b4 |  |
+| variables.rs:262:5:262:17 | CallExpr | variables.rs:263:5:263:18 | ExprStmt |  |
+| variables.rs:262:5:262:18 | ExprStmt | variables.rs:262:5:262:13 | PathExpr |  |
+| variables.rs:262:15:262:16 | b4 | variables.rs:262:5:262:17 | CallExpr |  |
+| variables.rs:263:5:263:13 | PathExpr | variables.rs:263:15:263:16 | c2 |  |
+| variables.rs:263:5:263:17 | CallExpr | variables.rs:265:5:273:6 | ExprStmt |  |
+| variables.rs:263:5:263:18 | ExprStmt | variables.rs:263:5:263:13 | PathExpr |  |
+| variables.rs:263:15:263:16 | c2 | variables.rs:263:5:263:17 | CallExpr |  |
+| variables.rs:265:5:269:5 | TupleExpr | variables.rs:270:9:270:11 | a10 |  |
+| variables.rs:265:5:273:5 | ... = ... | variables.rs:274:5:274:19 | ExprStmt |  |
+| variables.rs:265:5:273:6 | ExprStmt | variables.rs:266:9:266:10 | c2 |  |
+| variables.rs:266:9:266:10 | c2 | variables.rs:267:9:267:10 | b4 |  |
+| variables.rs:267:9:267:10 | b4 | variables.rs:268:9:268:11 | a10 |  |
+| variables.rs:268:9:268:11 | a10 | variables.rs:265:5:269:5 | TupleExpr |  |
+| variables.rs:269:9:273:5 | TupleExpr | variables.rs:265:5:273:5 | ... = ... |  |
+| variables.rs:270:9:270:11 | a10 | variables.rs:271:9:271:10 | b4 |  |
+| variables.rs:271:9:271:10 | b4 | variables.rs:272:9:272:10 | c2 |  |
+| variables.rs:272:9:272:10 | c2 | variables.rs:269:9:273:5 | TupleExpr |  |
+| variables.rs:274:5:274:13 | PathExpr | variables.rs:274:15:274:17 | a10 |  |
+| variables.rs:274:5:274:18 | CallExpr | variables.rs:275:5:275:18 | ExprStmt |  |
+| variables.rs:274:5:274:19 | ExprStmt | variables.rs:274:5:274:13 | PathExpr |  |
+| variables.rs:274:15:274:17 | a10 | variables.rs:274:5:274:18 | CallExpr |  |
+| variables.rs:275:5:275:13 | PathExpr | variables.rs:275:15:275:16 | b4 |  |
+| variables.rs:275:5:275:17 | CallExpr | variables.rs:276:5:276:18 | ExprStmt |  |
+| variables.rs:275:5:275:18 | ExprStmt | variables.rs:275:5:275:13 | PathExpr |  |
+| variables.rs:275:15:275:16 | b4 | variables.rs:275:5:275:17 | CallExpr |  |
+| variables.rs:276:5:276:13 | PathExpr | variables.rs:276:15:276:16 | c2 |  |
+| variables.rs:276:5:276:17 | CallExpr | variables.rs:278:5:286:5 | ExprStmt |  |
+| variables.rs:276:5:276:18 | ExprStmt | variables.rs:276:5:276:13 | PathExpr |  |
+| variables.rs:276:15:276:16 | c2 | variables.rs:276:5:276:17 | CallExpr |  |
+| variables.rs:278:5:286:5 | ExprStmt | variables.rs:278:12:278:12 | 4 |  |
+| variables.rs:278:5:286:5 | MatchExpr | variables.rs:288:5:288:19 | ExprStmt |  |
+| variables.rs:278:11:278:16 | TupleExpr | variables.rs:279:9:282:9 | TuplePat |  |
+| variables.rs:278:12:278:12 | 4 | variables.rs:278:15:278:15 | 5 |  |
+| variables.rs:278:15:278:15 | 5 | variables.rs:278:11:278:16 | TupleExpr |  |
+| variables.rs:279:9:282:9 | TuplePat | variables.rs:283:13:283:27 | ExprStmt | match |
+| variables.rs:282:14:285:9 | BlockExpr | variables.rs:278:5:286:5 | MatchExpr |  |
+| variables.rs:283:13:283:21 | PathExpr | variables.rs:283:23:283:25 | a10 |  |
+| variables.rs:283:13:283:26 | CallExpr | variables.rs:284:13:284:26 | ExprStmt |  |
+| variables.rs:283:13:283:27 | ExprStmt | variables.rs:283:13:283:21 | PathExpr |  |
+| variables.rs:283:23:283:25 | a10 | variables.rs:283:13:283:26 | CallExpr |  |
+| variables.rs:284:13:284:21 | PathExpr | variables.rs:284:23:284:24 | b4 |  |
+| variables.rs:284:13:284:25 | CallExpr | variables.rs:282:14:285:9 | BlockExpr |  |
+| variables.rs:284:13:284:26 | ExprStmt | variables.rs:284:13:284:21 | PathExpr |  |
+| variables.rs:284:23:284:24 | b4 | variables.rs:284:13:284:25 | CallExpr |  |
+| variables.rs:288:5:288:13 | PathExpr | variables.rs:288:15:288:17 | a10 |  |
+| variables.rs:288:5:288:18 | CallExpr | variables.rs:289:5:289:18 | ExprStmt |  |
+| variables.rs:288:5:288:19 | ExprStmt | variables.rs:288:5:288:13 | PathExpr |  |
+| variables.rs:288:15:288:17 | a10 | variables.rs:288:5:288:18 | CallExpr |  |
+| variables.rs:289:5:289:13 | PathExpr | variables.rs:289:15:289:16 | b4 |  |
+| variables.rs:289:5:289:17 | CallExpr | variables.rs:255:26:290:1 | BlockExpr |  |
+| variables.rs:289:5:289:18 | ExprStmt | variables.rs:289:5:289:13 | PathExpr |  |
+| variables.rs:289:15:289:16 | b4 | variables.rs:289:5:289:17 | CallExpr |  |
+| variables.rs:292:1:307:1 | enter closure_variable | variables.rs:293:5:295:10 | LetStmt |  |
+| variables.rs:292:1:307:1 | exit closure_variable (normal) | variables.rs:292:1:307:1 | exit closure_variable |  |
+| variables.rs:292:23:307:1 | BlockExpr | variables.rs:292:1:307:1 | exit closure_variable (normal) |  |
+| variables.rs:293:5:295:10 | LetStmt | variables.rs:294:9:295:9 | ClosureExpr |  |
+| variables.rs:293:9:293:23 | example_closure | variables.rs:296:5:297:27 | LetStmt | match, no-match |
+| variables.rs:294:9:295:9 | ClosureExpr | variables.rs:293:9:293:23 | example_closure |  |
+| variables.rs:294:9:295:9 | enter ClosureExpr | variables.rs:295:9:295:9 | x |  |
+| variables.rs:294:9:295:9 | exit ClosureExpr (normal) | variables.rs:294:9:295:9 | exit ClosureExpr |  |
+| variables.rs:295:9:295:9 | x | variables.rs:294:9:295:9 | exit ClosureExpr (normal) |  |
+| variables.rs:296:5:297:27 | LetStmt | variables.rs:297:9:297:23 | example_closure |  |
+| variables.rs:296:9:296:10 | n1 | variables.rs:298:5:298:18 | ExprStmt | match, no-match |
+| variables.rs:297:9:297:23 | example_closure | variables.rs:297:25:297:25 | 5 |  |
+| variables.rs:297:9:297:26 | CallExpr | variables.rs:296:9:296:10 | n1 |  |
+| variables.rs:297:25:297:25 | 5 | variables.rs:297:9:297:26 | CallExpr |  |
+| variables.rs:298:5:298:13 | PathExpr | variables.rs:298:15:298:16 | n1 |  |
+| variables.rs:298:5:298:17 | CallExpr | variables.rs:300:5:300:25 | ExprStmt |  |
+| variables.rs:298:5:298:18 | ExprStmt | variables.rs:298:5:298:13 | PathExpr |  |
+| variables.rs:298:15:298:16 | n1 | variables.rs:298:5:298:17 | CallExpr |  |
+| variables.rs:300:5:300:22 | PathExpr | variables.rs:300:5:300:24 | CallExpr |  |
+| variables.rs:300:5:300:24 | CallExpr | variables.rs:301:5:303:10 | LetStmt |  |
+| variables.rs:300:5:300:25 | ExprStmt | variables.rs:300:5:300:22 | PathExpr |  |
+| variables.rs:301:5:303:10 | LetStmt | variables.rs:302:9:303:9 | ClosureExpr |  |
+| variables.rs:301:9:301:26 | immutable_variable | variables.rs:304:5:305:30 | LetStmt | match, no-match |
+| variables.rs:302:9:303:9 | ClosureExpr | variables.rs:301:9:301:26 | immutable_variable |  |
+| variables.rs:302:9:303:9 | enter ClosureExpr | variables.rs:303:9:303:9 | x |  |
+| variables.rs:302:9:303:9 | exit ClosureExpr (normal) | variables.rs:302:9:303:9 | exit ClosureExpr |  |
+| variables.rs:303:9:303:9 | x | variables.rs:302:9:303:9 | exit ClosureExpr (normal) |  |
+| variables.rs:304:5:305:30 | LetStmt | variables.rs:305:9:305:26 | immutable_variable |  |
+| variables.rs:304:9:304:10 | n2 | variables.rs:306:5:306:18 | ExprStmt | match, no-match |
+| variables.rs:305:9:305:26 | immutable_variable | variables.rs:305:28:305:28 | 6 |  |
+| variables.rs:305:9:305:29 | CallExpr | variables.rs:304:9:304:10 | n2 |  |
+| variables.rs:305:28:305:28 | 6 | variables.rs:305:9:305:29 | CallExpr |  |
+| variables.rs:306:5:306:13 | PathExpr | variables.rs:306:15:306:16 | n2 |  |
+| variables.rs:306:5:306:17 | CallExpr | variables.rs:292:23:307:1 | BlockExpr |  |
+| variables.rs:306:5:306:18 | ExprStmt | variables.rs:306:5:306:13 | PathExpr |  |
+| variables.rs:306:15:306:16 | n2 | variables.rs:306:5:306:17 | CallExpr |  |
+| variables.rs:309:1:316:1 | enter for_variable | variables.rs:310:5:310:42 | LetStmt |  |
+| variables.rs:309:1:316:1 | exit for_variable (normal) | variables.rs:309:1:316:1 | exit for_variable |  |
+| variables.rs:309:19:316:1 | BlockExpr | variables.rs:309:1:316:1 | exit for_variable (normal) |  |
+| variables.rs:310:5:310:42 | LetStmt | variables.rs:310:15:310:22 | "apples" |  |
+| variables.rs:310:9:310:9 | v | variables.rs:313:12:313:12 | v | match, no-match |
+| variables.rs:310:13:310:41 | RefExpr | variables.rs:310:9:310:9 | v |  |
+| variables.rs:310:14:310:41 | ArrayExpr | variables.rs:310:13:310:41 | RefExpr |  |
+| variables.rs:310:15:310:22 | "apples" | variables.rs:310:25:310:30 | "cake" |  |
+| variables.rs:310:25:310:30 | "cake" | variables.rs:310:33:310:40 | "coffee" |  |
+| variables.rs:310:33:310:40 | "coffee" | variables.rs:310:14:310:41 | ArrayExpr |  |
+| variables.rs:312:5:315:5 | ForExpr | variables.rs:309:19:316:1 | BlockExpr |  |
+| variables.rs:312:9:312:12 | text | variables.rs:312:5:315:5 | ForExpr | no-match |
+| variables.rs:312:9:312:12 | text | variables.rs:314:9:314:24 | ExprStmt | match |
+| variables.rs:313:12:313:12 | v | variables.rs:312:9:312:12 | text |  |
+| variables.rs:313:14:315:5 | BlockExpr | variables.rs:312:9:312:12 | text |  |
+| variables.rs:314:9:314:17 | PathExpr | variables.rs:314:19:314:22 | text |  |
+| variables.rs:314:9:314:23 | CallExpr | variables.rs:313:14:315:5 | BlockExpr |  |
+| variables.rs:314:9:314:24 | ExprStmt | variables.rs:314:9:314:17 | PathExpr |  |
+| variables.rs:314:19:314:22 | text | variables.rs:314:9:314:23 | CallExpr |  |
+| variables.rs:318:1:341:1 | enter main | variables.rs:319:5:319:25 | ExprStmt |  |
+| variables.rs:318:1:341:1 | exit main (normal) | variables.rs:318:1:341:1 | exit main |  |
+| variables.rs:318:11:341:1 | BlockExpr | variables.rs:318:1:341:1 | exit main (normal) |  |
+| variables.rs:319:5:319:22 | PathExpr | variables.rs:319:5:319:24 | CallExpr |  |
+| variables.rs:319:5:319:24 | CallExpr | variables.rs:320:5:320:23 | ExprStmt |  |
+| variables.rs:319:5:319:25 | ExprStmt | variables.rs:319:5:319:22 | PathExpr |  |
+| variables.rs:320:5:320:20 | PathExpr | variables.rs:320:5:320:22 | CallExpr |  |
+| variables.rs:320:5:320:22 | CallExpr | variables.rs:321:5:321:23 | ExprStmt |  |
+| variables.rs:320:5:320:23 | ExprStmt | variables.rs:320:5:320:20 | PathExpr |  |
+| variables.rs:321:5:321:20 | PathExpr | variables.rs:321:5:321:22 | CallExpr |  |
+| variables.rs:321:5:321:22 | CallExpr | variables.rs:322:5:322:23 | ExprStmt |  |
+| variables.rs:321:5:321:23 | ExprStmt | variables.rs:321:5:321:20 | PathExpr |  |
+| variables.rs:322:5:322:20 | PathExpr | variables.rs:322:5:322:22 | CallExpr |  |
+| variables.rs:322:5:322:22 | CallExpr | variables.rs:323:5:323:19 | ExprStmt |  |
+| variables.rs:322:5:322:23 | ExprStmt | variables.rs:322:5:322:20 | PathExpr |  |
+| variables.rs:323:5:323:16 | PathExpr | variables.rs:323:5:323:18 | CallExpr |  |
+| variables.rs:323:5:323:18 | CallExpr | variables.rs:324:5:324:19 | ExprStmt |  |
+| variables.rs:323:5:323:19 | ExprStmt | variables.rs:323:5:323:16 | PathExpr |  |
+| variables.rs:324:5:324:16 | PathExpr | variables.rs:324:5:324:18 | CallExpr |  |
+| variables.rs:324:5:324:18 | CallExpr | variables.rs:325:5:325:19 | ExprStmt |  |
+| variables.rs:324:5:324:19 | ExprStmt | variables.rs:324:5:324:16 | PathExpr |  |
+| variables.rs:325:5:325:16 | PathExpr | variables.rs:325:5:325:18 | CallExpr |  |
+| variables.rs:325:5:325:18 | CallExpr | variables.rs:326:5:326:19 | ExprStmt |  |
+| variables.rs:325:5:325:19 | ExprStmt | variables.rs:325:5:325:16 | PathExpr |  |
+| variables.rs:326:5:326:16 | PathExpr | variables.rs:326:5:326:18 | CallExpr |  |
+| variables.rs:326:5:326:18 | CallExpr | variables.rs:327:5:327:21 | ExprStmt |  |
+| variables.rs:326:5:326:19 | ExprStmt | variables.rs:326:5:326:16 | PathExpr |  |
+| variables.rs:327:5:327:18 | PathExpr | variables.rs:327:5:327:20 | CallExpr |  |
+| variables.rs:327:5:327:20 | CallExpr | variables.rs:328:5:328:21 | ExprStmt |  |
+| variables.rs:327:5:327:21 | ExprStmt | variables.rs:327:5:327:18 | PathExpr |  |
+| variables.rs:328:5:328:18 | PathExpr | variables.rs:328:5:328:20 | CallExpr |  |
+| variables.rs:328:5:328:20 | CallExpr | variables.rs:329:5:329:21 | ExprStmt |  |
+| variables.rs:328:5:328:21 | ExprStmt | variables.rs:328:5:328:18 | PathExpr |  |
+| variables.rs:329:5:329:18 | PathExpr | variables.rs:329:5:329:20 | CallExpr |  |
+| variables.rs:329:5:329:20 | CallExpr | variables.rs:330:5:330:21 | ExprStmt |  |
+| variables.rs:329:5:329:21 | ExprStmt | variables.rs:329:5:329:18 | PathExpr |  |
+| variables.rs:330:5:330:18 | PathExpr | variables.rs:330:5:330:20 | CallExpr |  |
+| variables.rs:330:5:330:20 | CallExpr | variables.rs:331:5:331:21 | ExprStmt |  |
+| variables.rs:330:5:330:21 | ExprStmt | variables.rs:330:5:330:18 | PathExpr |  |
+| variables.rs:331:5:331:18 | PathExpr | variables.rs:331:5:331:20 | CallExpr |  |
+| variables.rs:331:5:331:20 | CallExpr | variables.rs:332:5:332:21 | ExprStmt |  |
+| variables.rs:331:5:331:21 | ExprStmt | variables.rs:331:5:331:18 | PathExpr |  |
+| variables.rs:332:5:332:18 | PathExpr | variables.rs:332:5:332:20 | CallExpr |  |
+| variables.rs:332:5:332:20 | CallExpr | variables.rs:333:5:333:21 | ExprStmt |  |
+| variables.rs:332:5:332:21 | ExprStmt | variables.rs:332:5:332:18 | PathExpr |  |
+| variables.rs:333:5:333:18 | PathExpr | variables.rs:333:5:333:20 | CallExpr |  |
+| variables.rs:333:5:333:20 | CallExpr | variables.rs:334:5:334:21 | ExprStmt |  |
+| variables.rs:333:5:333:21 | ExprStmt | variables.rs:333:5:333:18 | PathExpr |  |
+| variables.rs:334:5:334:18 | PathExpr | variables.rs:334:5:334:20 | CallExpr |  |
+| variables.rs:334:5:334:20 | CallExpr | variables.rs:335:5:335:21 | ExprStmt |  |
+| variables.rs:334:5:334:21 | ExprStmt | variables.rs:334:5:334:18 | PathExpr |  |
+| variables.rs:335:5:335:18 | PathExpr | variables.rs:335:5:335:20 | CallExpr |  |
+| variables.rs:335:5:335:20 | CallExpr | variables.rs:336:5:336:36 | ExprStmt |  |
+| variables.rs:335:5:335:21 | ExprStmt | variables.rs:335:5:335:18 | PathExpr |  |
+| variables.rs:336:5:336:18 | PathExpr | variables.rs:336:20:336:22 | "a" |  |
+| variables.rs:336:5:336:35 | CallExpr | variables.rs:337:5:337:37 | ExprStmt |  |
+| variables.rs:336:5:336:36 | ExprStmt | variables.rs:336:5:336:18 | PathExpr |  |
+| variables.rs:336:20:336:22 | "a" | variables.rs:336:26:336:28 | "b" |  |
+| variables.rs:336:25:336:34 | TupleExpr | variables.rs:336:5:336:35 | CallExpr |  |
+| variables.rs:336:26:336:28 | "b" | variables.rs:336:31:336:33 | "c" |  |
+| variables.rs:336:31:336:33 | "c" | variables.rs:336:25:336:34 | TupleExpr |  |
+| variables.rs:337:5:337:18 | PathExpr | variables.rs:337:20:337:31 | PathExpr |  |
+| variables.rs:337:5:337:36 | CallExpr | variables.rs:338:5:338:26 | ExprStmt |  |
+| variables.rs:337:5:337:37 | ExprStmt | variables.rs:337:5:337:18 | PathExpr |  |
+| variables.rs:337:20:337:31 | PathExpr | variables.rs:337:33:337:34 | 45 |  |
+| variables.rs:337:20:337:35 | CallExpr | variables.rs:337:5:337:36 | CallExpr |  |
+| variables.rs:337:33:337:34 | 45 | variables.rs:337:20:337:35 | CallExpr |  |
+| variables.rs:338:5:338:23 | PathExpr | variables.rs:338:5:338:25 | CallExpr |  |
+| variables.rs:338:5:338:25 | CallExpr | variables.rs:339:5:339:23 | ExprStmt |  |
+| variables.rs:338:5:338:26 | ExprStmt | variables.rs:338:5:338:23 | PathExpr |  |
+| variables.rs:339:5:339:20 | PathExpr | variables.rs:339:5:339:22 | CallExpr |  |
+| variables.rs:339:5:339:22 | CallExpr | variables.rs:340:5:340:19 | ExprStmt |  |
+| variables.rs:339:5:339:23 | ExprStmt | variables.rs:339:5:339:20 | PathExpr |  |
+| variables.rs:340:5:340:16 | PathExpr | variables.rs:340:5:340:18 | CallExpr |  |
+| variables.rs:340:5:340:18 | CallExpr | variables.rs:318:11:341:1 | BlockExpr |  |
+| variables.rs:340:5:340:19 | ExprStmt | variables.rs:340:5:340:16 | PathExpr |  |
diff --git a/rust/ql/test/library-tests/variables/Cfg.qlref b/rust/ql/test/library-tests/variables/Cfg.qlref
new file mode 100644
index 000000000000..ba4ee4b414f1
--- /dev/null
+++ b/rust/ql/test/library-tests/variables/Cfg.qlref
@@ -0,0 +1 @@
+query: utils/Cfg.ql
\ No newline at end of file
diff --git a/rust/ql/test/utils/Cfg.expected b/rust/ql/test/utils/Cfg.expected
new file mode 100644
index 000000000000..f19a576c93ac
--- /dev/null
+++ b/rust/ql/test/utils/Cfg.expected
@@ -0,0 +1,3 @@
+edges
+breakTarget
+continueTarget
diff --git a/rust/ql/test/library-tests/controlflow/Cfg.ql b/rust/ql/test/utils/Cfg.ql
similarity index 100%
rename from rust/ql/test/library-tests/controlflow/Cfg.ql
rename to rust/ql/test/utils/Cfg.ql

From 1266f9757d3ff448a57cac1bbefd4a64292b6c3e Mon Sep 17 00:00:00 2001
From: Tom Hvitved <hvitved@github.com>
Date: Wed, 2 Oct 2024 14:50:52 +0200
Subject: [PATCH 125/347] Rust: Add `{BreakExpr,ContinueExpr}.getTarget()`

---
 rust/ql/.generated.list                       |   2 -
 rust/ql/.gitattributes                        |   2 -
 .../internal/ControlFlowGraphImpl.qll         | 103 ++++++------------
 .../rust/elements/internal/BreakExprImpl.qll  |  69 +++++++++++-
 .../elements/internal/ContinueExprImpl.qll    |  36 +++++-
 .../library-tests/controlflow/Cfg.expected    |  23 ++++
 .../test/library-tests/variables/Cfg.expected |   3 +
 rust/ql/test/utils/Cfg.ql                     |   4 +
 8 files changed, 166 insertions(+), 76 deletions(-)

diff --git a/rust/ql/.generated.list b/rust/ql/.generated.list
index 18337b8a6d78..e37f6947148d 100644
--- a/rust/ql/.generated.list
+++ b/rust/ql/.generated.list
@@ -183,7 +183,6 @@ lib/codeql/rust/elements/internal/BlockExprImpl.qll 36ac09e4a6eeeec22919b62b1d00
 lib/codeql/rust/elements/internal/BoxPatConstructor.qll 153f110ba25fd6c889092bfd16f73bb610fa60d6e0c8965d5f44d2446fcd48a2 9324cf0d8aa29945551bf8ab64801d598f57aab8cd4e19bcd4e9ef8a4a4e06eb
 lib/codeql/rust/elements/internal/BoxPatImpl.qll d62a3cc1d5bab6bd258f702ec731ec57f0e5ef2672ab9de4b6f3b558078629eb 26b4fabb676adbbdb0d7f81449e493ee49380ea04d131f779714ac2434bb323a
 lib/codeql/rust/elements/internal/BreakExprConstructor.qll 356be043c28e0b34fdf925a119c945632ee883c6f5ebb9a27003c6a8d250afd9 bb77e66b04bb9489340e7506931559b94285c6904b6f9d2f83b214cba4f3cfd5
-lib/codeql/rust/elements/internal/BreakExprImpl.qll 883ac0e2c0856c91f50747cf10cbcb3ecab535f6858913f2fa34236db8d211d6 5b20db08f16ea5ea3554ffbf6a2a69107e1ec8e3f31dd3935f8839b9a498f4bb
 lib/codeql/rust/elements/internal/CallExprConstructor.qll 742b38e862e2cf82fd1ecc4d4fc5b4782a9c7c07f031452b2bae7aa59d5aa13a cad6e0a8be21d91b20ac2ec16cab9c30eae810b452c0f1992ed87d5c7f4144dc
 lib/codeql/rust/elements/internal/CallExprImpl.qll 7e48610680ba6f2876a1a005ab0743496dd2364b9c44aca441bd33e11317e2d7 bb12c3c28156b40796fe3ba112760f87bb5abb323aab3c5b7bb3e0facaef8d35
 lib/codeql/rust/elements/internal/CastExprConstructor.qll f3d6e10c4731f38a384675aeab3fba47d17b9e15648293787092bb3247ed808d d738a7751dbadb70aa1dcffcf8af7fa61d4cf8029798369a7e8620013afff4ed
@@ -202,7 +201,6 @@ lib/codeql/rust/elements/internal/ConstImpl.qll 7aac2b441a41f21b7d788e3eb042554f
 lib/codeql/rust/elements/internal/ConstParamConstructor.qll f6645f952aac87c7e00e5e9661275312a1df47172088b4de6b5a253d5c4ed048 eda737470a7b89cf6a02715c9147d074041d6d00fd50d5b2d70266add6e4b571
 lib/codeql/rust/elements/internal/ConstParamImpl.qll 909d85d857dfb973cd8e148744d3a88506d113d193d35ab0243be745d004ad45 c9e18170c5b4e4d5fca9f175bb139a248055b608ceafdd90c7182d06d67c3cba
 lib/codeql/rust/elements/internal/ContinueExprConstructor.qll cd93f1b35ccdb031d7e8deba92f6a76187f6009c454f3ea07e89ba459de57ca6 6f658e7d580c4c9068b01d6dd6f72888b8800860668a6653f8c3b27dc9996935
-lib/codeql/rust/elements/internal/ContinueExprImpl.qll 976890d17681315d2297b600a58c655ccc7c4db44cf587d7b5c359303f309acf 1ecae04df07ee20dcea4f00a9af33c108a0e15ed2ccf8b936804ad88ed66f883
 lib/codeql/rust/elements/internal/DynTraitTypeConstructor.qll 2bfd81fdf116b76f4a62b47bed5f0a730c04ce79747ecd1d3b683b8de22ff4aa 375c57350c432351396b92f28fded1e95a8002e3a1b31f3b66039f9b3d9bdea9
 lib/codeql/rust/elements/internal/DynTraitTypeImpl.qll 8ccf27db0b898f518874ae094e5c97206384ad2fd3f82f81a5ecaad953278f71 e28ab56b8814a804e23afa790ca0f9a2665195b0b316d6cc52936e76ce5c0011
 lib/codeql/rust/elements/internal/EnumConstructor.qll eca1a13937faacb1db50e4cf69d175f992f2204a5aaed9144bb6f3cb63814ac5 1bafba78b2729fdb052a25a1ba3f4f70871564aa4df632b4a1d467858a437924
diff --git a/rust/ql/.gitattributes b/rust/ql/.gitattributes
index 8e15852654c4..e69d7ea5791b 100644
--- a/rust/ql/.gitattributes
+++ b/rust/ql/.gitattributes
@@ -185,7 +185,6 @@
 /lib/codeql/rust/elements/internal/BoxPatConstructor.qll linguist-generated
 /lib/codeql/rust/elements/internal/BoxPatImpl.qll linguist-generated
 /lib/codeql/rust/elements/internal/BreakExprConstructor.qll linguist-generated
-/lib/codeql/rust/elements/internal/BreakExprImpl.qll linguist-generated
 /lib/codeql/rust/elements/internal/CallExprConstructor.qll linguist-generated
 /lib/codeql/rust/elements/internal/CallExprImpl.qll linguist-generated
 /lib/codeql/rust/elements/internal/CastExprConstructor.qll linguist-generated
@@ -204,7 +203,6 @@
 /lib/codeql/rust/elements/internal/ConstParamConstructor.qll linguist-generated
 /lib/codeql/rust/elements/internal/ConstParamImpl.qll linguist-generated
 /lib/codeql/rust/elements/internal/ContinueExprConstructor.qll linguist-generated
-/lib/codeql/rust/elements/internal/ContinueExprImpl.qll linguist-generated
 /lib/codeql/rust/elements/internal/DynTraitTypeConstructor.qll linguist-generated
 /lib/codeql/rust/elements/internal/DynTraitTypeImpl.qll linguist-generated
 /lib/codeql/rust/elements/internal/EnumConstructor.qll linguist-generated
diff --git a/rust/ql/lib/codeql/rust/controlflow/internal/ControlFlowGraphImpl.qll b/rust/ql/lib/codeql/rust/controlflow/internal/ControlFlowGraphImpl.qll
index 971e4910fabe..ea181764cefd 100644
--- a/rust/ql/lib/codeql/rust/controlflow/internal/ControlFlowGraphImpl.qll
+++ b/rust/ql/lib/codeql/rust/controlflow/internal/ControlFlowGraphImpl.qll
@@ -145,44 +145,26 @@ class BlockExprTree extends StandardPostOrderTree, BlockExpr {
     result = super.getStmtList().getTailExpr()
   }
 
-  override predicate propagatesAbnormal(AstNode child) { none() }
-
-  /** Holds if this block captures the break completion `c`. */
-  private predicate capturesBreakCompletion(LoopJumpCompletion c) {
-    c.isBreak() and
-    c.getLabelName() = this.getLabel().getLifetime().getText()
-  }
-
-  override predicate succ(AstNode pred, AstNode succ, Completion c) {
-    super.succ(pred, succ, c)
-    or
-    // Edge for exiting the block with a break expressions
-    last(this.getChildNode(_), pred, c) and
-    this.capturesBreakCompletion(c) and
-    succ = this
-  }
-
-  override predicate last(AstNode last, Completion c) {
-    super.last(last, c)
-    or
-    // Any abnormal completions that this block does not capture should propagate
-    last(this.getChildNode(_), last, c) and
-    not completionIsNormal(c) and
-    not this.capturesBreakCompletion(c)
-  }
+  override predicate propagatesAbnormal(AstNode child) { child = this.getChildNode(_) }
 }
 
-class BreakExprTree extends PostOrderTree instanceof BreakExpr {
-  override predicate propagatesAbnormal(AstNode child) { child = super.getExpr() }
+class BreakExprTree extends PostOrderTree, BreakExpr {
+  override predicate propagatesAbnormal(AstNode child) { child = this.getExpr() }
 
   override predicate first(AstNode node) {
-    first(super.getExpr(), node)
+    first(this.getExpr(), node)
     or
-    not super.hasExpr() and node = this
+    not this.hasExpr() and node = this
   }
 
+  override predicate last(AstNode last, Completion c) { none() }
+
   override predicate succ(AstNode pred, AstNode succ, Completion c) {
     last(super.getExpr(), pred, c) and succ = this
+    or
+    pred = this and
+    c.isValidFor(pred) and
+    succ = this.getTarget()
   }
 }
 
@@ -200,7 +182,18 @@ class CastExprTree extends StandardPostOrderTree instanceof CastExpr {
 
 class ClosureExprTree extends LeafTree instanceof ClosureExpr { }
 
-class ContinueExprTree extends LeafTree instanceof ContinueExpr { }
+class ContinueExprTree extends LeafTree, ContinueExpr {
+  override predicate last(AstNode last, Completion c) { none() }
+
+  override predicate succ(AstNode pred, AstNode succ, Completion c) {
+    exists(Expr target |
+      pred = this and
+      c.isValidFor(pred) and
+      target = this.getTarget() and
+      first(target.(LoopingExprTree).getLoopContinue(), succ)
+    )
+  }
+}
 
 class ExprStmtTree extends StandardPreOrderTree instanceof ExprStmt {
   override AstNode getChildNode(int i) { i = 0 and result = super.getExpr() }
@@ -310,57 +303,27 @@ class LetStmtTree extends PreOrderTree instanceof LetStmt {
 class LiteralExprTree extends LeafTree instanceof LiteralExpr { }
 
 abstract class LoopingExprTree extends PostOrderTree {
-  override predicate propagatesAbnormal(AstNode child) { none() }
+  override predicate propagatesAbnormal(AstNode child) { child = this.getLoopBody() }
 
   abstract BlockExpr getLoopBody();
 
-  abstract Label getLabel();
-
   /**
    * Gets the node to execute when continuing the loop; either after
    * executing the last node in the body or after an explicit `continue`.
    */
   abstract AstNode getLoopContinue();
 
-  /** Holds if this loop captures the `c` completion. */
-  private predicate capturesLoopJumpCompletion(LoopJumpCompletion c) {
-    not c.hasLabel()
-    or
-    c.getLabelName() = this.getLabel().getLifetime().getText()
-  }
-
   override predicate succ(AstNode pred, AstNode succ, Completion c) {
-    // Edge for exiting the loop with a break expressions
-    last(this.getLoopBody(), pred, c) and
-    c.(LoopJumpCompletion).isBreak() and
-    this.capturesLoopJumpCompletion(c) and
-    succ = this
-    or
     // Edge back to the start for final expression and continue expressions
     last(this.getLoopBody(), pred, c) and
-    (
-      completionIsNormal(c)
-      or
-      c.(LoopJumpCompletion).isContinue() and this.capturesLoopJumpCompletion(c)
-    ) and
+    completionIsNormal(c) and
     first(this.getLoopContinue(), succ)
   }
-
-  override predicate last(AstNode last, Completion c) {
-    super.last(last, c)
-    or
-    // Any abnormal completions that this loop does not capture should propagate
-    last(this.getLoopBody(), last, c) and
-    not completionIsNormal(c) and
-    not this.capturesLoopJumpCompletion(c)
-  }
 }
 
 class LoopExprTree extends LoopingExprTree instanceof LoopExpr {
   override BlockExpr getLoopBody() { result = LoopExpr.super.getLoopBody() }
 
-  override Label getLabel() { result = LoopExpr.super.getLabel() }
-
   override AstNode getLoopContinue() { result = this.getLoopBody() }
 
   override predicate first(AstNode node) { first(this.getLoopBody(), node) }
@@ -369,11 +332,13 @@ class LoopExprTree extends LoopingExprTree instanceof LoopExpr {
 class WhileExprTree extends LoopingExprTree instanceof WhileExpr {
   override BlockExpr getLoopBody() { result = WhileExpr.super.getLoopBody() }
 
-  override Label getLabel() { result = WhileExpr.super.getLabel() }
-
   override AstNode getLoopContinue() { result = super.getCondition() }
 
-  override predicate propagatesAbnormal(AstNode child) { child = super.getCondition() }
+  override predicate propagatesAbnormal(AstNode child) {
+    super.propagatesAbnormal(child)
+    or
+    child = super.getCondition()
+  }
 
   override predicate first(AstNode node) { first(super.getCondition(), node) }
 
@@ -399,11 +364,13 @@ class WhileExprTree extends LoopingExprTree instanceof WhileExpr {
 class ForExprTree extends LoopingExprTree instanceof ForExpr {
   override BlockExpr getLoopBody() { result = ForExpr.super.getLoopBody() }
 
-  override Label getLabel() { result = ForExpr.super.getLabel() }
-
   override AstNode getLoopContinue() { result = super.getPat() }
 
-  override predicate propagatesAbnormal(AstNode child) { child = super.getIterable() }
+  override predicate propagatesAbnormal(AstNode child) {
+    super.propagatesAbnormal(child)
+    or
+    child = super.getIterable()
+  }
 
   override predicate first(AstNode node) { first(super.getIterable(), node) }
 
diff --git a/rust/ql/lib/codeql/rust/elements/internal/BreakExprImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/BreakExprImpl.qll
index 031761d374ed..4b302674a444 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/BreakExprImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/BreakExprImpl.qll
@@ -1,4 +1,3 @@
-// generated by codegen, remove this comment if you wish to edit this file
 /**
  * This module provides a hand-modifiable wrapper around the generated class `BreakExpr`.
  *
@@ -12,6 +11,58 @@ private import codeql.rust.elements.internal.generated.BreakExpr
  * be referenced directly.
  */
 module Impl {
+  private import rust
+  private import codeql.rust.elements.internal.generated.ParentChild
+
+  /** Holds if `e` is a loop labelled `label`. */
+  pragma[nomagic]
+  predicate isLabelledLoop(Expr e, string label) {
+    e =
+      any(LoopExpr le |
+        label = le.getLabel().getLifetime().getText()
+        or
+        label = ""
+      )
+    or
+    e =
+      any(ForExpr fe |
+        label = fe.getLabel().getLifetime().getText()
+        or
+        label = ""
+      )
+    or
+    e =
+      any(WhileExpr we |
+        label = we.getLabel().getLifetime().getText()
+        or
+        label = ""
+      )
+  }
+
+  pragma[nomagic]
+  private predicate isLabelled(Expr e, string label) {
+    isLabelledLoop(e, label)
+    or
+    label = e.(BlockExpr).getLabel().getLifetime().getText()
+  }
+
+  pragma[nomagic]
+  private AstNode getABreakAncestor(BreakExpr be, string label) {
+    (
+      label = be.getLifetime().getText()
+      or
+      not be.hasLifetime() and
+      label = ""
+    ) and
+    exists(AstNode n0 | result = getImmediateParent(n0) |
+      n0 = be
+      or
+      n0 = getABreakAncestor(be, label) and
+      not isLabelled(n0, label)
+    )
+  }
+
+  // the following QLdoc is generated: if you need to edit it, do it in the schema file
   /**
    * A break expression. For example:
    * ```rust
@@ -37,5 +88,19 @@ module Impl {
    * };
    * ```
    */
-  class BreakExpr extends Generated::BreakExpr { }
+  class BreakExpr extends Generated::BreakExpr {
+    /**
+     * Gets the target of this `break` expression.
+     *
+     * The target is either a `LoopExpr`, a `ForExpr`, a `WhileExpr`, or a
+     * `BlockExpr`.
+     */
+    pragma[nomagic]
+    Expr getTarget() {
+      exists(string label |
+        result = getABreakAncestor(this, label) and
+        isLabelled(result, label)
+      )
+    }
+  }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/ContinueExprImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/ContinueExprImpl.qll
index dd2476c79b7f..4328fdfc9f93 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/ContinueExprImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/ContinueExprImpl.qll
@@ -1,4 +1,3 @@
-// generated by codegen, remove this comment if you wish to edit this file
 /**
  * This module provides a hand-modifiable wrapper around the generated class `ContinueExpr`.
  *
@@ -12,6 +11,26 @@ private import codeql.rust.elements.internal.generated.ContinueExpr
  * be referenced directly.
  */
 module Impl {
+  private import codeql.rust.elements.internal.BreakExprImpl::Impl as BreakExprImpl
+  private import codeql.rust.elements.internal.generated.ParentChild
+
+  pragma[nomagic]
+  private AstNode getAContinueAncestor(ContinueExpr ce, string label) {
+    (
+      label = ce.getLifetime().getText()
+      or
+      not ce.hasLifetime() and
+      label = ""
+    ) and
+    exists(AstNode n0 | result = getImmediateParent(n0) |
+      n0 = ce
+      or
+      n0 = getAContinueAncestor(ce, label) and
+      not BreakExprImpl::isLabelledLoop(n0, label)
+    )
+  }
+
+  // the following QLdoc is generated: if you need to edit it, do it in the schema file
   /**
    * A continue expression. For example:
    * ```rust
@@ -29,5 +48,18 @@ module Impl {
    * }
    * ```
    */
-  class ContinueExpr extends Generated::ContinueExpr { }
+  class ContinueExpr extends Generated::ContinueExpr {
+    /**
+     * Gets the target of this `continue` expression.
+     *
+     * The target is either a `LoopExpr`, a `ForExpr`, or a `WhileExpr`.
+     */
+    pragma[nomagic]
+    Expr getTarget() {
+      exists(string label |
+        result = getAContinueAncestor(this, label) and
+        BreakExprImpl::isLabelledLoop(result, label)
+      )
+    }
+  }
 }
diff --git a/rust/ql/test/library-tests/controlflow/Cfg.expected b/rust/ql/test/library-tests/controlflow/Cfg.expected
index 0e7bf44925cc..e2f3464800a0 100644
--- a/rust/ql/test/library-tests/controlflow/Cfg.expected
+++ b/rust/ql/test/library-tests/controlflow/Cfg.expected
@@ -1,3 +1,4 @@
+edges
 | test.rs:1:1:4:1 | enter test_call | test.rs:2:5:2:41 | ExprStmt |  |
 | test.rs:1:1:4:1 | exit test_call (normal) | test.rs:1:1:4:1 | exit test_call |  |
 | test.rs:1:24:4:1 | BlockExpr | test.rs:1:1:4:1 | exit test_call (normal) |  |
@@ -545,3 +546,25 @@
 | test.rs:299:13:299:27 | ExprStmt | test.rs:299:26:299:26 | 1 |  |
 | test.rs:299:26:299:26 | 1 | test.rs:299:13:299:26 | BreakExpr |  |
 | test.rs:301:9:301:9 | x | test.rs:296:18:302:5 | BlockExpr |  |
+breakTarget
+| test.rs:16:17:16:21 | BreakExpr | test.rs:10:9:22:9 | LoopExpr |
+| test.rs:30:21:30:25 | BreakExpr | test.rs:28:13:35:13 | LoopExpr |
+| test.rs:32:21:32:32 | BreakExpr | test.rs:27:9:36:9 | LoopExpr |
+| test.rs:34:17:34:28 | BreakExpr | test.rs:28:13:35:13 | LoopExpr |
+| test.rs:73:17:73:21 | BreakExpr | test.rs:70:9:76:9 | WhileExpr |
+| test.rs:83:17:83:21 | BreakExpr | test.rs:81:9:85:9 | WhileExpr |
+| test.rs:91:17:91:21 | BreakExpr | test.rs:89:9:94:9 | ForExpr |
+| test.rs:170:17:170:28 | BreakExpr | test.rs:168:13:173:9 | LoopExpr |
+| test.rs:183:17:183:35 | BreakExpr | test.rs:181:13:186:9 | LoopExpr |
+| test.rs:195:13:195:30 | BreakExpr | test.rs:194:13:196:9 | BlockExpr |
+| test.rs:284:13:284:26 | BreakExpr | test.rs:281:18:292:5 | BlockExpr |
+| test.rs:288:13:288:26 | BreakExpr | test.rs:281:18:292:5 | BlockExpr |
+| test.rs:299:13:299:26 | BreakExpr | test.rs:296:18:302:5 | BlockExpr |
+continueTarget
+| test.rs:19:17:19:24 | ContinueExpr | test.rs:10:9:22:9 | LoopExpr |
+| test.rs:45:21:45:28 | ContinueExpr | test.rs:43:13:50:13 | LoopExpr |
+| test.rs:47:21:47:35 | ContinueExpr | test.rs:41:9:51:9 | LoopExpr |
+| test.rs:49:17:49:31 | ContinueExpr | test.rs:43:13:50:13 | LoopExpr |
+| test.rs:59:21:59:28 | ContinueExpr | test.rs:57:13:64:13 | LoopExpr |
+| test.rs:61:21:61:34 | ContinueExpr | test.rs:57:13:64:13 | LoopExpr |
+| test.rs:63:17:63:30 | ContinueExpr | test.rs:57:13:64:13 | LoopExpr |
diff --git a/rust/ql/test/library-tests/variables/Cfg.expected b/rust/ql/test/library-tests/variables/Cfg.expected
index 876e5fb52664..0a075ff054e3 100644
--- a/rust/ql/test/library-tests/variables/Cfg.expected
+++ b/rust/ql/test/library-tests/variables/Cfg.expected
@@ -1,3 +1,4 @@
+edges
 | variables.rs:1:1:3:1 | enter print_str | variables.rs:2:5:2:22 | ExprStmt |  |
 | variables.rs:1:1:3:1 | exit print_str (normal) | variables.rs:1:1:3:1 | exit print_str |  |
 | variables.rs:1:23:3:1 | BlockExpr | variables.rs:1:1:3:1 | exit print_str (normal) |  |
@@ -592,3 +593,5 @@
 | variables.rs:340:5:340:16 | PathExpr | variables.rs:340:5:340:18 | CallExpr |  |
 | variables.rs:340:5:340:18 | CallExpr | variables.rs:318:11:341:1 | BlockExpr |  |
 | variables.rs:340:5:340:19 | ExprStmt | variables.rs:340:5:340:16 | PathExpr |  |
+breakTarget
+continueTarget
diff --git a/rust/ql/test/utils/Cfg.ql b/rust/ql/test/utils/Cfg.ql
index 23b047b5b2ec..ee9a967553d1 100644
--- a/rust/ql/test/utils/Cfg.ql
+++ b/rust/ql/test/utils/Cfg.ql
@@ -7,3 +7,7 @@ class MyRelevantNode extends CfgNode {
 }
 
 import codeql.rust.controlflow.internal.ControlFlowGraphImpl::TestOutput<MyRelevantNode>
+
+query predicate breakTarget(BreakExpr be, Expr target) { target = be.getTarget() }
+
+query predicate continueTarget(ContinueExpr ce, Expr target) { target = ce.getTarget() }

From 6da39724335f9ac1e58f57333b4dd65621ba0337 Mon Sep 17 00:00:00 2001
From: Tom Hvitved <hvitved@github.com>
Date: Wed, 2 Oct 2024 15:02:26 +0200
Subject: [PATCH 126/347] Rust: Simplify break/continue CFG labels

---
 .../rust/controlflow/ControlFlowGraph.qll     |  4 +-
 .../rust/controlflow/internal/Completion.qll  | 52 +++++--------------
 .../internal/ControlFlowGraphImpl.qll         |  9 ++--
 .../controlflow/internal/SuccessorType.qll    | 32 ++++--------
 .../library-tests/controlflow/Cfg.expected    | 22 ++++----
 5 files changed, 42 insertions(+), 77 deletions(-)

diff --git a/rust/ql/lib/codeql/rust/controlflow/ControlFlowGraph.qll b/rust/ql/lib/codeql/rust/controlflow/ControlFlowGraph.qll
index 18159ccea748..20f1af4a4afb 100644
--- a/rust/ql/lib/codeql/rust/controlflow/ControlFlowGraph.qll
+++ b/rust/ql/lib/codeql/rust/controlflow/ControlFlowGraph.qll
@@ -19,7 +19,9 @@ final class BooleanSuccessor = BooleanSuccessorImpl;
 
 final class MatchSuccessor = MatchSuccessorImpl;
 
-final class LoopJumpSuccessor = LoopJumpSuccessorImpl;
+final class BreakSuccessor = BreakSuccessorImpl;
+
+final class ContinueSuccessor = ContinueSuccessorImpl;
 
 final class ReturnSuccessor = ReturnSuccessorImpl;
 
diff --git a/rust/ql/lib/codeql/rust/controlflow/internal/Completion.qll b/rust/ql/lib/codeql/rust/controlflow/internal/Completion.qll
index 4034db5fe288..15619f06a2fe 100644
--- a/rust/ql/lib/codeql/rust/controlflow/internal/Completion.qll
+++ b/rust/ql/lib/codeql/rust/controlflow/internal/Completion.qll
@@ -7,13 +7,8 @@ newtype TCompletion =
   TSimpleCompletion() or
   TBooleanCompletion(Boolean b) or
   TMatchCompletion(Boolean isMatch) or
-  TLoopCompletion(TLoopJumpType kind, TLabelType label) {
-    label = TNoLabel()
-    or
-    kind = TBreakJump() and label = TLabel(any(BreakExpr b).getLifetime().getText())
-    or
-    kind = TContinueJump() and label = TLabel(any(ContinueExpr b).getLifetime().getText())
-  } or
+  TBreakCompletion() or
+  TContinueCompletion() or
   TReturnCompletion()
 
 /** A completion of a statement or an expression. */
@@ -148,42 +143,23 @@ class MatchCompletion extends TMatchCompletion, ConditionalCompletion {
 }
 
 /**
- * A completion that represents a break or a continue.
+ * A completion that represents a `break`.
  */
-class LoopJumpCompletion extends TLoopCompletion, Completion {
-  override LoopJumpSuccessor getAMatchingSuccessorType() {
-    result = TLoopSuccessor(this.getKind(), this.getLabelType())
-  }
-
-  final TLoopJumpType getKind() { this = TLoopCompletion(result, _) }
-
-  final TLabelType getLabelType() { this = TLoopCompletion(_, result) }
+class BreakCompletion extends TBreakCompletion, Completion {
+  override BreakSuccessor getAMatchingSuccessorType() { any() }
 
-  final predicate hasLabel() { this.getLabelType() = TLabel(_) }
+  override predicate isValidForSpecific(AstNode e) { e instanceof BreakExpr }
 
-  final string getLabelName() { TLabel(result) = this.getLabelType() }
-
-  final predicate isContinue() { this.getKind() = TContinueJump() }
+  override string toString() { result = this.getAMatchingSuccessorType().toString() }
+}
 
-  final predicate isBreak() { this.getKind() = TBreakJump() }
+/**
+ * A completion that represents a `continue`.
+ */
+class ContinueCompletion extends TContinueCompletion, Completion {
+  override ContinueSuccessor getAMatchingSuccessorType() { any() }
 
-  override predicate isValidForSpecific(AstNode e) {
-    this.isBreak() and
-    e instanceof BreakExpr and
-    (
-      not e.(BreakExpr).hasLifetime() and not this.hasLabel()
-      or
-      e.(BreakExpr).getLifetime().getText() = this.getLabelName()
-    )
-    or
-    this.isContinue() and
-    e instanceof ContinueExpr and
-    (
-      not e.(ContinueExpr).hasLifetime() and not this.hasLabel()
-      or
-      e.(ContinueExpr).getLifetime().getText() = this.getLabelName()
-    )
-  }
+  override predicate isValidForSpecific(AstNode e) { e instanceof ContinueExpr }
 
   override string toString() { result = this.getAMatchingSuccessorType().toString() }
 }
diff --git a/rust/ql/lib/codeql/rust/controlflow/internal/ControlFlowGraphImpl.qll b/rust/ql/lib/codeql/rust/controlflow/internal/ControlFlowGraphImpl.qll
index ea181764cefd..17add12b9404 100644
--- a/rust/ql/lib/codeql/rust/controlflow/internal/ControlFlowGraphImpl.qll
+++ b/rust/ql/lib/codeql/rust/controlflow/internal/ControlFlowGraphImpl.qll
@@ -186,12 +186,9 @@ class ContinueExprTree extends LeafTree, ContinueExpr {
   override predicate last(AstNode last, Completion c) { none() }
 
   override predicate succ(AstNode pred, AstNode succ, Completion c) {
-    exists(Expr target |
-      pred = this and
-      c.isValidFor(pred) and
-      target = this.getTarget() and
-      first(target.(LoopingExprTree).getLoopContinue(), succ)
-    )
+    pred = this and
+    c.isValidFor(pred) and
+    first(this.getTarget().(LoopingExprTree).getLoopContinue(), succ)
   }
 }
 
diff --git a/rust/ql/lib/codeql/rust/controlflow/internal/SuccessorType.qll b/rust/ql/lib/codeql/rust/controlflow/internal/SuccessorType.qll
index 6bdd54c263dd..ba76888bd303 100644
--- a/rust/ql/lib/codeql/rust/controlflow/internal/SuccessorType.qll
+++ b/rust/ql/lib/codeql/rust/controlflow/internal/SuccessorType.qll
@@ -15,7 +15,8 @@ newtype TSuccessorType =
   TSuccessorSuccessor() or
   TBooleanSuccessor(Boolean b) or
   TMatchSuccessor(Boolean b) or
-  TLoopSuccessor(TLoopJumpType kind, TLabelType label) { exists(TLoopCompletion(kind, label)) } or
+  TBreakSuccessor() or
+  TContinueSuccessor() or
   TReturnSuccessor()
 
 /** The type of a control flow successor. */
@@ -59,28 +60,17 @@ class MatchSuccessorImpl extends ConditionalSuccessorImpl, TMatchSuccessor {
 }
 
 /**
- * A control flow successor of a loop control flow expression, `continue` or `break`.
+ * A control flow successor of a `break` expression.
  */
-class LoopJumpSuccessorImpl extends SuccessorTypeImpl, TLoopSuccessor {
-  private TLoopJumpType getKind() { this = TLoopSuccessor(result, _) }
-
-  private TLabelType getLabelType() { this = TLoopSuccessor(_, result) }
-
-  predicate hasLabel() { this.getLabelType() = TLabel(_) }
-
-  string getLabelName() { this = TLoopSuccessor(_, TLabel(result)) }
-
-  predicate isContinue() { this.getKind() = TContinueJump() }
-
-  predicate isBreak() { this.getKind() = TBreakJump() }
+class BreakSuccessorImpl extends SuccessorTypeImpl, TBreakSuccessor {
+  override string toString() { result = "break" }
+}
 
-  override string toString() {
-    exists(string kind, string label |
-      (if this.isContinue() then kind = "continue" else kind = "break") and
-      (if this.hasLabel() then label = "(" + this.getLabelName() + ")" else label = "") and
-      result = kind + label
-    )
-  }
+/**
+ * A control flow successor of a `continue` expression.
+ */
+class ContinueSuccessorImpl extends SuccessorTypeImpl, TContinueSuccessor {
+  override string toString() { result = "continue" }
 }
 
 /**
diff --git a/rust/ql/test/library-tests/controlflow/Cfg.expected b/rust/ql/test/library-tests/controlflow/Cfg.expected
index e2f3464800a0..39fc6b96b621 100644
--- a/rust/ql/test/library-tests/controlflow/Cfg.expected
+++ b/rust/ql/test/library-tests/controlflow/Cfg.expected
@@ -77,9 +77,9 @@ edges
 | test.rs:31:24:33:17 | IfExpr | test.rs:29:17:33:17 | IfExpr |  |
 | test.rs:31:27:31:27 | b | test.rs:31:24:33:17 | IfExpr | false |
 | test.rs:31:27:31:27 | b | test.rs:32:21:32:33 | ExprStmt | true |
-| test.rs:32:21:32:32 | BreakExpr | test.rs:27:9:36:9 | LoopExpr | break('outer) |
+| test.rs:32:21:32:32 | BreakExpr | test.rs:27:9:36:9 | LoopExpr | break |
 | test.rs:32:21:32:33 | ExprStmt | test.rs:32:21:32:32 | BreakExpr |  |
-| test.rs:34:17:34:28 | BreakExpr | test.rs:28:13:35:13 | LoopExpr | break('inner) |
+| test.rs:34:17:34:28 | BreakExpr | test.rs:28:13:35:13 | LoopExpr | break |
 | test.rs:34:17:34:29 | ExprStmt | test.rs:34:17:34:28 | BreakExpr |  |
 | test.rs:37:9:37:12 | true | test.rs:26:48:38:5 | BlockExpr |  |
 | test.rs:40:5:52:5 | enter test_continue_with_labels | test.rs:42:13:42:14 | ExprStmt |  |
@@ -94,9 +94,9 @@ edges
 | test.rs:46:24:48:17 | IfExpr | test.rs:44:17:48:17 | IfExpr |  |
 | test.rs:46:27:46:27 | b | test.rs:46:24:48:17 | IfExpr | false |
 | test.rs:46:27:46:27 | b | test.rs:47:21:47:36 | ExprStmt | true |
-| test.rs:47:21:47:35 | ContinueExpr | test.rs:42:13:42:14 | ExprStmt | continue('outer) |
+| test.rs:47:21:47:35 | ContinueExpr | test.rs:42:13:42:14 | ExprStmt | continue |
 | test.rs:47:21:47:36 | ExprStmt | test.rs:47:21:47:35 | ContinueExpr |  |
-| test.rs:49:17:49:31 | ContinueExpr | test.rs:44:17:48:17 | ExprStmt | continue('inner) |
+| test.rs:49:17:49:31 | ContinueExpr | test.rs:44:17:48:17 | ExprStmt | continue |
 | test.rs:49:17:49:32 | ExprStmt | test.rs:49:17:49:31 | ContinueExpr |  |
 | test.rs:54:5:66:5 | enter test_loop_label_shadowing | test.rs:56:13:56:14 | ExprStmt |  |
 | test.rs:56:13:56:13 | 1 | test.rs:58:17:62:17 | ExprStmt |  |
@@ -110,9 +110,9 @@ edges
 | test.rs:60:24:62:17 | IfExpr | test.rs:58:17:62:17 | IfExpr |  |
 | test.rs:60:27:60:27 | b | test.rs:60:24:62:17 | IfExpr | false |
 | test.rs:60:27:60:27 | b | test.rs:61:21:61:35 | ExprStmt | true |
-| test.rs:61:21:61:34 | ContinueExpr | test.rs:58:17:62:17 | ExprStmt | continue('loop) |
+| test.rs:61:21:61:34 | ContinueExpr | test.rs:58:17:62:17 | ExprStmt | continue |
 | test.rs:61:21:61:35 | ExprStmt | test.rs:61:21:61:34 | ContinueExpr |  |
-| test.rs:63:17:63:30 | ContinueExpr | test.rs:58:17:62:17 | ExprStmt | continue('loop) |
+| test.rs:63:17:63:30 | ContinueExpr | test.rs:58:17:62:17 | ExprStmt | continue |
 | test.rs:63:17:63:31 | ExprStmt | test.rs:63:17:63:30 | ContinueExpr |  |
 | test.rs:68:5:77:5 | enter test_while | test.rs:69:9:69:25 | LetStmt |  |
 | test.rs:68:5:77:5 | exit test_while (normal) | test.rs:68:5:77:5 | exit test_while |  |
@@ -338,7 +338,7 @@ edges
 | test.rs:182:16:182:20 | ... > ... | test.rs:182:13:184:13 | IfExpr | false |
 | test.rs:182:16:182:20 | ... > ... | test.rs:183:17:183:36 | ExprStmt | true |
 | test.rs:182:20:182:20 | 0 | test.rs:182:16:182:20 | ... > ... |  |
-| test.rs:183:17:183:35 | BreakExpr | test.rs:181:13:186:9 | LoopExpr | break('label) |
+| test.rs:183:17:183:35 | BreakExpr | test.rs:181:13:186:9 | LoopExpr | break |
 | test.rs:183:17:183:36 | ExprStmt | test.rs:183:30:183:30 | a |  |
 | test.rs:183:30:183:30 | a | test.rs:183:34:183:35 | 10 |  |
 | test.rs:183:30:183:35 | ... > ... | test.rs:183:17:183:35 | BreakExpr |  |
@@ -357,7 +357,7 @@ edges
 | test.rs:194:9:200:9 | IfExpr | test.rs:193:43:201:5 | BlockExpr |  |
 | test.rs:194:13:196:9 | BlockExpr | test.rs:197:13:197:13 | 1 | true |
 | test.rs:194:13:196:9 | BlockExpr | test.rs:199:13:199:13 | 0 | false |
-| test.rs:195:13:195:30 | BreakExpr | test.rs:194:13:196:9 | BlockExpr | break('block) |
+| test.rs:195:13:195:30 | BreakExpr | test.rs:194:13:196:9 | BlockExpr | break |
 | test.rs:195:13:195:31 | ExprStmt | test.rs:195:26:195:26 | a |  |
 | test.rs:195:26:195:26 | a | test.rs:195:30:195:30 | 0 |  |
 | test.rs:195:26:195:30 | ... > ... | test.rs:195:13:195:30 | BreakExpr |  |
@@ -511,7 +511,7 @@ edges
 | test.rs:283:12:283:28 | PathExpr | test.rs:283:12:283:30 | CallExpr |  |
 | test.rs:283:12:283:30 | CallExpr | test.rs:283:9:285:9 | IfExpr | false |
 | test.rs:283:12:283:30 | CallExpr | test.rs:284:13:284:27 | ExprStmt | true |
-| test.rs:284:13:284:26 | BreakExpr | test.rs:281:18:292:5 | BlockExpr | break('block) |
+| test.rs:284:13:284:26 | BreakExpr | test.rs:281:18:292:5 | BlockExpr | break |
 | test.rs:284:13:284:27 | ExprStmt | test.rs:284:26:284:26 | 1 |  |
 | test.rs:284:26:284:26 | 1 | test.rs:284:13:284:26 | BreakExpr |  |
 | test.rs:286:9:286:21 | PathExpr | test.rs:286:9:286:23 | CallExpr |  |
@@ -522,7 +522,7 @@ edges
 | test.rs:287:12:287:28 | PathExpr | test.rs:287:12:287:30 | CallExpr |  |
 | test.rs:287:12:287:30 | CallExpr | test.rs:287:9:289:9 | IfExpr | false |
 | test.rs:287:12:287:30 | CallExpr | test.rs:288:13:288:27 | ExprStmt | true |
-| test.rs:288:13:288:26 | BreakExpr | test.rs:281:18:292:5 | BlockExpr | break('block) |
+| test.rs:288:13:288:26 | BreakExpr | test.rs:281:18:292:5 | BlockExpr | break |
 | test.rs:288:13:288:27 | ExprStmt | test.rs:288:26:288:26 | 2 |  |
 | test.rs:288:26:288:26 | 2 | test.rs:288:13:288:26 | BreakExpr |  |
 | test.rs:290:9:290:21 | PathExpr | test.rs:290:9:290:23 | CallExpr |  |
@@ -542,7 +542,7 @@ edges
 | test.rs:298:13:298:19 | TupleStructPat | test.rs:299:13:299:27 | ExprStmt | no-match |
 | test.rs:298:13:298:19 | TupleStructPat | test.rs:301:9:301:9 | x | match |
 | test.rs:298:23:298:23 | x | test.rs:298:13:298:19 | TupleStructPat |  |
-| test.rs:299:13:299:26 | BreakExpr | test.rs:296:18:302:5 | BlockExpr | break('block) |
+| test.rs:299:13:299:26 | BreakExpr | test.rs:296:18:302:5 | BlockExpr | break |
 | test.rs:299:13:299:27 | ExprStmt | test.rs:299:26:299:26 | 1 |  |
 | test.rs:299:26:299:26 | 1 | test.rs:299:13:299:26 | BreakExpr |  |
 | test.rs:301:9:301:9 | x | test.rs:296:18:302:5 | BlockExpr |  |

From 05d2e16de37fc6a004e9f86acd02bd87d37d3ac7 Mon Sep 17 00:00:00 2001
From: Chris Smowton <chris@smowton.net>
Date: Wed, 2 Oct 2024 15:25:36 +0100
Subject: [PATCH 127/347] autoformat

---
 go/ql/integration-tests/test-extraction/src/pkg1/def.go | 2 +-
 go/ql/integration-tests/test-extraction/test.expected   | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/go/ql/integration-tests/test-extraction/src/pkg1/def.go b/go/ql/integration-tests/test-extraction/src/pkg1/def.go
index 2492919f76df..e768e81b89d4 100644
--- a/go/ql/integration-tests/test-extraction/src/pkg1/def.go
+++ b/go/ql/integration-tests/test-extraction/src/pkg1/def.go
@@ -4,4 +4,4 @@ type Generic[T any] struct {
 	element T
 }
 
-func TestMe() { }
+func TestMe() {}
diff --git a/go/ql/integration-tests/test-extraction/test.expected b/go/ql/integration-tests/test-extraction/test.expected
index eda27075ad43..77983c448071 100644
--- a/go/ql/integration-tests/test-extraction/test.expected
+++ b/go/ql/integration-tests/test-extraction/test.expected
@@ -7,8 +7,8 @@
 | src/testme_blackbox_test.go:0:0:0:0 | src/testme_blackbox_test.go |
 | src/testme_test.go:0:0:0:0 | src/testme_test.go |
 calls
-| src/pkg1/def_blackbox_test.go:8:2:8:14 | call to TestMe | src/pkg1/def.go:7:1:7:17 | function declaration |
-| src/pkg1/def_test.go:4:2:4:9 | call to TestMe | src/pkg1/def.go:7:1:7:17 | function declaration |
+| src/pkg1/def_blackbox_test.go:8:2:8:14 | call to TestMe | src/pkg1/def.go:7:1:7:16 | function declaration |
+| src/pkg1/def_test.go:4:2:4:9 | call to TestMe | src/pkg1/def.go:7:1:7:16 | function declaration |
 | src/testme_blackbox_test.go:10:18:10:44 | call to PublicFunction | src/testme.go:3:1:3:38 | function declaration |
 | src/testme_test.go:9:18:9:33 | call to PublicFunction | src/testme.go:3:1:3:38 | function declaration |
 | src/testme_test.go:14:19:14:35 | call to privateFunction | src/testme.go:5:1:5:39 | function declaration |

From 8c87b66bea97e8f379062f1be06f576fd0e428a5 Mon Sep 17 00:00:00 2001
From: Geoffrey White <40627776+geoffw0@users.noreply.github.com>
Date: Wed, 2 Oct 2024 16:50:24 +0100
Subject: [PATCH 128/347] Rust: Add more test cases for comments.

---
 .../diagnostics/ExtractedFiles.expected       |  1 +
 .../diagnostics/LinesOfCode.expected          |  2 +-
 .../diagnostics/LinesOfUserCode.expected      |  2 +-
 .../LinesOfUserCodeInFiles.expected           |  5 +-
 .../diagnostics/SummaryStats.expected         |  8 +--
 .../test/query-tests/diagnostics/comments.rs  | 60 +++++++++++++++++++
 rust/ql/test/query-tests/diagnostics/main.rs  |  9 ++-
 7 files changed, 74 insertions(+), 13 deletions(-)
 create mode 100644 rust/ql/test/query-tests/diagnostics/comments.rs

diff --git a/rust/ql/test/query-tests/diagnostics/ExtractedFiles.expected b/rust/ql/test/query-tests/diagnostics/ExtractedFiles.expected
index cc6f775e86d5..c5ebb7072304 100644
--- a/rust/ql/test/query-tests/diagnostics/ExtractedFiles.expected
+++ b/rust/ql/test/query-tests/diagnostics/ExtractedFiles.expected
@@ -1,3 +1,4 @@
+| comments.rs:0:0:0:0 | comments.rs | File successfully extracted. |
 | does_not_compile.rs:0:0:0:0 | does_not_compile.rs | File successfully extracted. |
 | error.rs:0:0:0:0 | error.rs | File successfully extracted. |
 | lib.rs:0:0:0:0 | lib.rs | File successfully extracted. |
diff --git a/rust/ql/test/query-tests/diagnostics/LinesOfCode.expected b/rust/ql/test/query-tests/diagnostics/LinesOfCode.expected
index 3885b955c3f3..f57679361dc0 100644
--- a/rust/ql/test/query-tests/diagnostics/LinesOfCode.expected
+++ b/rust/ql/test/query-tests/diagnostics/LinesOfCode.expected
@@ -1 +1 @@
-| 46 |
+| 68 |
diff --git a/rust/ql/test/query-tests/diagnostics/LinesOfUserCode.expected b/rust/ql/test/query-tests/diagnostics/LinesOfUserCode.expected
index 3885b955c3f3..f57679361dc0 100644
--- a/rust/ql/test/query-tests/diagnostics/LinesOfUserCode.expected
+++ b/rust/ql/test/query-tests/diagnostics/LinesOfUserCode.expected
@@ -1 +1 @@
-| 46 |
+| 68 |
diff --git a/rust/ql/test/query-tests/diagnostics/LinesOfUserCodeInFiles.expected b/rust/ql/test/query-tests/diagnostics/LinesOfUserCodeInFiles.expected
index 52ee2055e8fe..1b0edb495195 100644
--- a/rust/ql/test/query-tests/diagnostics/LinesOfUserCodeInFiles.expected
+++ b/rust/ql/test/query-tests/diagnostics/LinesOfUserCodeInFiles.expected
@@ -1,6 +1,7 @@
+| comments.rs:0:0:0:0 | comments.rs | 20 |
 | my_struct.rs:0:0:0:0 | my_struct.rs | 20 |
-| main.rs:0:0:0:0 | main.rs | 7 |
+| main.rs:0:0:0:0 | main.rs | 8 |
+| lib.rs:0:0:0:0 | lib.rs | 7 |
 | my_macro.rs:0:0:0:0 | my_macro.rs | 7 |
-| lib.rs:0:0:0:0 | lib.rs | 6 |
 | does_not_compile.rs:0:0:0:0 | does_not_compile.rs | 3 |
 | error.rs:0:0:0:0 | error.rs | 3 |
diff --git a/rust/ql/test/query-tests/diagnostics/SummaryStats.expected b/rust/ql/test/query-tests/diagnostics/SummaryStats.expected
index da1e6cd7b60c..a39ccb0b44c5 100644
--- a/rust/ql/test/query-tests/diagnostics/SummaryStats.expected
+++ b/rust/ql/test/query-tests/diagnostics/SummaryStats.expected
@@ -1,5 +1,5 @@
-| Elements extracted | 216 |
+| Elements extracted | 290 |
 | Elements unextracted | 0 |
-| Files extracted | 6 |
-| Lines of code extracted | 46 |
-| Lines of user code extracted | 46 |
+| Files extracted | 7 |
+| Lines of code extracted | 68 |
+| Lines of user code extracted | 68 |
diff --git a/rust/ql/test/query-tests/diagnostics/comments.rs b/rust/ql/test/query-tests/diagnostics/comments.rs
new file mode 100644
index 000000000000..bec721eed25f
--- /dev/null
+++ b/rust/ql/test/query-tests/diagnostics/comments.rs
@@ -0,0 +1,60 @@
+/**
+ * total lines in this file: 61
+ * of which code: 16
+ * of which only comments: 33
+ * of which blank: 12
+ */
+
+// a comment
+
+/**
+ * Comment attached to a struct.
+ */
+struct StructWithComments
+{
+    /**
+     * Another attached comment.
+     */
+    a: i32,
+
+    // And another attached comment.
+    b: i32,
+
+    /*
+     * And yet another attached comment.
+     */
+    c: i32,
+
+    // informal
+    // comment
+    // block.
+    cd: i32,
+
+    // Just a comment.
+}
+
+pub fn my_simple_func()
+{
+}
+
+/**
+ * Comment attached to a function.
+ */
+pub fn my_func_with_comments()
+{
+    // comment
+    let a = 1; // comment
+    // comment
+    let b = 2;
+
+    // comment
+
+    /*
+     * Comment.
+     */
+    my_simple_func();
+}
+
+/**
+ * Comment.
+ */
diff --git a/rust/ql/test/query-tests/diagnostics/main.rs b/rust/ql/test/query-tests/diagnostics/main.rs
index 6e0ddf695a3a..07dd4234a6e7 100644
--- a/rust/ql/test/query-tests/diagnostics/main.rs
+++ b/rust/ql/test/query-tests/diagnostics/main.rs
@@ -1,16 +1,15 @@
 /**
  * total lines in this file: 18
- * of which code: 7
- * of which only comments: 7
+ * of which code: 8
+ * of which only comments: 6
  * of which blank: 4
  */
 
 mod my_struct;
 mod my_macro;
+mod comments;
 
-// another comment
-
-fn main() { // another comment
+fn main() {
     println!("Hello, world!");
 
     my_struct::my_func();

From 01abcf8537f297ab169a5848803408065a041006 Mon Sep 17 00:00:00 2001
From: Geoffrey White <40627776+geoffw0@users.noreply.github.com>
Date: Wed, 2 Oct 2024 16:54:02 +0100
Subject: [PATCH 129/347] Rust: Use just end locations for now, to avoid all
 false positive lines caused by attached comments.

---
 rust/ql/lib/codeql/files/FileSystem.qll                       | 3 +--
 rust/ql/test/query-tests/diagnostics/LinesOfCode.expected     | 2 +-
 rust/ql/test/query-tests/diagnostics/LinesOfUserCode.expected | 2 +-
 .../query-tests/diagnostics/LinesOfUserCodeInFiles.expected   | 2 +-
 rust/ql/test/query-tests/diagnostics/SummaryStats.expected    | 4 ++--
 5 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/rust/ql/lib/codeql/files/FileSystem.qll b/rust/ql/lib/codeql/files/FileSystem.qll
index 03b5cd0b183b..b78a993cb7e7 100644
--- a/rust/ql/lib/codeql/files/FileSystem.qll
+++ b/rust/ql/lib/codeql/files/FileSystem.qll
@@ -47,11 +47,10 @@ class File extends Container, Impl::File {
         exists(AstNode node, Location loc |
           not node instanceof Comment and
           not node instanceof SourceFile and
-          not node instanceof Item and // ignore Items for now as we're getting their locations wrong when a comment is attached
           loc = node.getLocation()
         |
           node.getFile() = this and
-          line = [loc.getStartLine(), loc.getEndLine()] and
+          line = [/*loc.getStartLine(), */loc.getEndLine()] and // ignore start locations for now as we're getting them wrong for things with a comment attached
           not loc instanceof EmptyLocation
         )
       )
diff --git a/rust/ql/test/query-tests/diagnostics/LinesOfCode.expected b/rust/ql/test/query-tests/diagnostics/LinesOfCode.expected
index f57679361dc0..bf709e1ddc4d 100644
--- a/rust/ql/test/query-tests/diagnostics/LinesOfCode.expected
+++ b/rust/ql/test/query-tests/diagnostics/LinesOfCode.expected
@@ -1 +1 @@
-| 68 |
+| 61 |
diff --git a/rust/ql/test/query-tests/diagnostics/LinesOfUserCode.expected b/rust/ql/test/query-tests/diagnostics/LinesOfUserCode.expected
index f57679361dc0..bf709e1ddc4d 100644
--- a/rust/ql/test/query-tests/diagnostics/LinesOfUserCode.expected
+++ b/rust/ql/test/query-tests/diagnostics/LinesOfUserCode.expected
@@ -1 +1 @@
-| 68 |
+| 61 |
diff --git a/rust/ql/test/query-tests/diagnostics/LinesOfUserCodeInFiles.expected b/rust/ql/test/query-tests/diagnostics/LinesOfUserCodeInFiles.expected
index 1b0edb495195..b93473f7e04a 100644
--- a/rust/ql/test/query-tests/diagnostics/LinesOfUserCodeInFiles.expected
+++ b/rust/ql/test/query-tests/diagnostics/LinesOfUserCodeInFiles.expected
@@ -1,5 +1,5 @@
-| comments.rs:0:0:0:0 | comments.rs | 20 |
 | my_struct.rs:0:0:0:0 | my_struct.rs | 20 |
+| comments.rs:0:0:0:0 | comments.rs | 13 |
 | main.rs:0:0:0:0 | main.rs | 8 |
 | lib.rs:0:0:0:0 | lib.rs | 7 |
 | my_macro.rs:0:0:0:0 | my_macro.rs | 7 |
diff --git a/rust/ql/test/query-tests/diagnostics/SummaryStats.expected b/rust/ql/test/query-tests/diagnostics/SummaryStats.expected
index a39ccb0b44c5..d9142bcadfed 100644
--- a/rust/ql/test/query-tests/diagnostics/SummaryStats.expected
+++ b/rust/ql/test/query-tests/diagnostics/SummaryStats.expected
@@ -1,5 +1,5 @@
 | Elements extracted | 290 |
 | Elements unextracted | 0 |
 | Files extracted | 7 |
-| Lines of code extracted | 68 |
-| Lines of user code extracted | 68 |
+| Lines of code extracted | 61 |
+| Lines of user code extracted | 61 |

From d6848f5c5d9ce2cdfb1eb149765ef82081923d70 Mon Sep 17 00:00:00 2001
From: Geoffrey White <40627776+geoffw0@users.noreply.github.com>
Date: Wed, 2 Oct 2024 17:00:28 +0100
Subject: [PATCH 130/347] Rust: Apparently a doc comment here was illegal.

---
 rust/ql/test/query-tests/diagnostics/comments.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rust/ql/test/query-tests/diagnostics/comments.rs b/rust/ql/test/query-tests/diagnostics/comments.rs
index bec721eed25f..fe99fdd4e3e3 100644
--- a/rust/ql/test/query-tests/diagnostics/comments.rs
+++ b/rust/ql/test/query-tests/diagnostics/comments.rs
@@ -55,6 +55,6 @@ pub fn my_func_with_comments()
     my_simple_func();
 }
 
-/**
+/*
  * Comment.
  */

From 0b6ec4624eeaf27f0d4fd715f8beb7ec9252f924 Mon Sep 17 00:00:00 2001
From: Geoffrey White <40627776+geoffw0@users.noreply.github.com>
Date: Wed, 2 Oct 2024 17:05:01 +0100
Subject: [PATCH 131/347] Rust: Autoformat.

---
 rust/ql/lib/codeql/files/FileSystem.qll | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rust/ql/lib/codeql/files/FileSystem.qll b/rust/ql/lib/codeql/files/FileSystem.qll
index b78a993cb7e7..95ca925a8840 100644
--- a/rust/ql/lib/codeql/files/FileSystem.qll
+++ b/rust/ql/lib/codeql/files/FileSystem.qll
@@ -50,7 +50,7 @@ class File extends Container, Impl::File {
           loc = node.getLocation()
         |
           node.getFile() = this and
-          line = [/*loc.getStartLine(), */loc.getEndLine()] and // ignore start locations for now as we're getting them wrong for things with a comment attached
+          line = [/*loc.getStartLine(), */ loc.getEndLine()] and // ignore start locations for now as we're getting them wrong for things with a comment attached
           not loc instanceof EmptyLocation
         )
       )

From ba9c2f1e3a743bb9efdd1010605ff50c90acb7a7 Mon Sep 17 00:00:00 2001
From: Geoffrey White <40627776+geoffw0@users.noreply.github.com>
Date: Wed, 2 Oct 2024 15:31:14 +0100
Subject: [PATCH 132/347] Rust: Add extractor warnings query.

---
 rust/ql/lib/codeql/rust/Diagnostics.qll       |  5 +++++
 .../queries/diagnostics/ExtractionWarnings.ql | 19 +++++++++++++++++++
 2 files changed, 24 insertions(+)
 create mode 100644 rust/ql/src/queries/diagnostics/ExtractionWarnings.ql

diff --git a/rust/ql/lib/codeql/rust/Diagnostics.qll b/rust/ql/lib/codeql/rust/Diagnostics.qll
index 5902bb594141..8c207e708889 100644
--- a/rust/ql/lib/codeql/rust/Diagnostics.qll
+++ b/rust/ql/lib/codeql/rust/Diagnostics.qll
@@ -52,3 +52,8 @@ class Diagnostic extends @diagnostic {
 class ExtractionError extends Diagnostic {
   ExtractionError() { this.getTag() = "parse_error" }
 }
+
+/** A diagnostic that is warning severity. */
+class ExtractionWarning extends Diagnostic {
+  ExtractionWarning() { this.getSeverity() = 30 }
+}
diff --git a/rust/ql/src/queries/diagnostics/ExtractionWarnings.ql b/rust/ql/src/queries/diagnostics/ExtractionWarnings.ql
new file mode 100644
index 000000000000..99773cc6d53a
--- /dev/null
+++ b/rust/ql/src/queries/diagnostics/ExtractionWarnings.ql
@@ -0,0 +1,19 @@
+/**
+ * @name Extraction warnings
+ * @description List all extraction warnings for files in the source code directory.
+ * @kind diagnostic
+ * @id rust/diagnostics/extraction-warnings
+ */
+
+import codeql.rust.Diagnostics
+import codeql.files.FileSystem
+
+/** Gets the SARIF severity to associate with a warning. */
+int getSeverity() { result = 1 }
+
+from ExtractionWarning warning, File f
+where
+  f = warning.getLocation().getFile() and
+  exists(f.getRelativePath())
+select warning, "Extraction warning in " + f + " with message " + warning.getMessage(),
+  getSeverity()

From f30a642c8fcc9b8c34493ea170b41fb38c91e93b Mon Sep 17 00:00:00 2001
From: Geoffrey White <40627776+geoffw0@users.noreply.github.com>
Date: Wed, 2 Oct 2024 15:40:26 +0100
Subject: [PATCH 133/347] Rust: Add a test for the extractor warnings query.

---
 .../query-tests/diagnostics/ExtractionWarnings.expected     | 6 ++++++
 .../test/query-tests/diagnostics/ExtractionWarnings.qlref   | 1 +
 2 files changed, 7 insertions(+)
 create mode 100644 rust/ql/test/query-tests/diagnostics/ExtractionWarnings.expected
 create mode 100644 rust/ql/test/query-tests/diagnostics/ExtractionWarnings.qlref

diff --git a/rust/ql/test/query-tests/diagnostics/ExtractionWarnings.expected b/rust/ql/test/query-tests/diagnostics/ExtractionWarnings.expected
new file mode 100644
index 000000000000..0a68f2bce0ef
--- /dev/null
+++ b/rust/ql/test/query-tests/diagnostics/ExtractionWarnings.expected
@@ -0,0 +1,6 @@
+| does_not_compile.rs:2:6:2:5 | expected SEMICOLON | Extraction warning in does_not_compile.rs with message expected SEMICOLON | 1 |
+| does_not_compile.rs:2:9:2:8 | expected SEMICOLON | Extraction warning in does_not_compile.rs with message expected SEMICOLON | 1 |
+| does_not_compile.rs:2:13:2:12 | expected SEMICOLON | Extraction warning in does_not_compile.rs with message expected SEMICOLON | 1 |
+| does_not_compile.rs:2:21:2:20 | expected SEMICOLON | Extraction warning in does_not_compile.rs with message expected SEMICOLON | 1 |
+| does_not_compile.rs:2:26:2:25 | expected SEMICOLON | Extraction warning in does_not_compile.rs with message expected SEMICOLON | 1 |
+| does_not_compile.rs:2:32:2:31 | expected field name or number | Extraction warning in does_not_compile.rs with message expected field name or number | 1 |
diff --git a/rust/ql/test/query-tests/diagnostics/ExtractionWarnings.qlref b/rust/ql/test/query-tests/diagnostics/ExtractionWarnings.qlref
new file mode 100644
index 000000000000..ff6e566d20a7
--- /dev/null
+++ b/rust/ql/test/query-tests/diagnostics/ExtractionWarnings.qlref
@@ -0,0 +1 @@
+queries/diagnostics/ExtractionWarnings.ql

From ad7c96554fbf05eb7b0519672ad2bcb84f95ad83 Mon Sep 17 00:00:00 2001
From: Geoffrey White <40627776+geoffw0@users.noreply.github.com>
Date: Wed, 2 Oct 2024 18:29:47 +0100
Subject: [PATCH 134/347] Rust: Correct extraction errors query to output only
 errors.

---
 rust/ql/lib/codeql/rust/Diagnostics.qll                     | 4 ++--
 rust/ql/src/queries/diagnostics/ExtractionErrors.ql         | 2 +-
 .../test/query-tests/diagnostics/ExtractionErrors.expected  | 6 ------
 3 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/rust/ql/lib/codeql/rust/Diagnostics.qll b/rust/ql/lib/codeql/rust/Diagnostics.qll
index 8c207e708889..8f77b64c5123 100644
--- a/rust/ql/lib/codeql/rust/Diagnostics.qll
+++ b/rust/ql/lib/codeql/rust/Diagnostics.qll
@@ -48,9 +48,9 @@ class Diagnostic extends @diagnostic {
   string toString() { result = this.getMessage() }
 }
 
-/** A diagnostic relating to a particular error in extracting a file. */
+/** A diagnostic that is error severity. */
 class ExtractionError extends Diagnostic {
-  ExtractionError() { this.getTag() = "parse_error" }
+  ExtractionError() { this.getSeverity() = 40 }
 }
 
 /** A diagnostic that is warning severity. */
diff --git a/rust/ql/src/queries/diagnostics/ExtractionErrors.ql b/rust/ql/src/queries/diagnostics/ExtractionErrors.ql
index a04c4e618c41..68be66f8ca9b 100644
--- a/rust/ql/src/queries/diagnostics/ExtractionErrors.ql
+++ b/rust/ql/src/queries/diagnostics/ExtractionErrors.ql
@@ -8,7 +8,7 @@
 import codeql.rust.Diagnostics
 import codeql.files.FileSystem
 
-/** Gets the SARIF severity to associate an error. */
+/** Gets the SARIF severity to associate with an error. */
 int getSeverity() { result = 2 }
 
 from ExtractionError error, File f
diff --git a/rust/ql/test/query-tests/diagnostics/ExtractionErrors.expected b/rust/ql/test/query-tests/diagnostics/ExtractionErrors.expected
index b6aaf7b6d373..e69de29bb2d1 100644
--- a/rust/ql/test/query-tests/diagnostics/ExtractionErrors.expected
+++ b/rust/ql/test/query-tests/diagnostics/ExtractionErrors.expected
@@ -1,6 +0,0 @@
-| does_not_compile.rs:2:6:2:5 | expected SEMICOLON | Extraction failed in does_not_compile.rs with error expected SEMICOLON | 2 |
-| does_not_compile.rs:2:9:2:8 | expected SEMICOLON | Extraction failed in does_not_compile.rs with error expected SEMICOLON | 2 |
-| does_not_compile.rs:2:13:2:12 | expected SEMICOLON | Extraction failed in does_not_compile.rs with error expected SEMICOLON | 2 |
-| does_not_compile.rs:2:21:2:20 | expected SEMICOLON | Extraction failed in does_not_compile.rs with error expected SEMICOLON | 2 |
-| does_not_compile.rs:2:26:2:25 | expected SEMICOLON | Extraction failed in does_not_compile.rs with error expected SEMICOLON | 2 |
-| does_not_compile.rs:2:32:2:31 | expected field name or number | Extraction failed in does_not_compile.rs with error expected field name or number | 2 |

From 12fbd18f3a9c8a08f548942ab732e565c8f3f7c2 Mon Sep 17 00:00:00 2001
From: Geoffrey White <40627776+geoffw0@users.noreply.github.com>
Date: Wed, 2 Oct 2024 18:32:25 +0100
Subject: [PATCH 135/347] Rust: Have ExtractionConsistency.ql report both.

---
 rust/ql/consistency-queries/ExtractionConsistency.ql | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/rust/ql/consistency-queries/ExtractionConsistency.ql b/rust/ql/consistency-queries/ExtractionConsistency.ql
index b839f2ad783c..20148f0cea2d 100644
--- a/rust/ql/consistency-queries/ExtractionConsistency.ql
+++ b/rust/ql/consistency-queries/ExtractionConsistency.ql
@@ -1,3 +1,5 @@
 import codeql.rust.Diagnostics
 
 query predicate extractionError(ExtractionError ee) { any() }
+
+query predicate extractionWarning(ExtractionWarning ew) { any() }

From a4c06b2bbcb4c1942505e123546225142191aa9f Mon Sep 17 00:00:00 2001
From: Geoffrey White <40627776+geoffw0@users.noreply.github.com>
Date: Wed, 2 Oct 2024 18:23:25 +0100
Subject: [PATCH 136/347] Rust: Define SuccessfullyExtractedFile and use it to
 simplify queries.

---
 rust/ql/lib/codeql/files/FileSystem.qll        | 18 ++++++++++++++++++
 .../NumberOfFilesExtractedWithErrors.ql        |  7 ++++---
 .../NumberOfSuccessfullyExtractedFiles.ql      |  7 ++-----
 3 files changed, 24 insertions(+), 8 deletions(-)

diff --git a/rust/ql/lib/codeql/files/FileSystem.qll b/rust/ql/lib/codeql/files/FileSystem.qll
index ee7a2235476e..fd7ad56c74a0 100644
--- a/rust/ql/lib/codeql/files/FileSystem.qll
+++ b/rust/ql/lib/codeql/files/FileSystem.qll
@@ -5,6 +5,7 @@ private import codeql.util.FileSystem
 private import codeql.rust.elements.SourceFile
 private import codeql.rust.elements.AstNode
 private import codeql.rust.elements.Comment
+private import codeql.rust.Diagnostics
 
 private module Input implements InputSig {
   abstract class ContainerBase extends @container {
@@ -56,3 +57,20 @@ class File extends Container, Impl::File {
       )
   }
 }
+
+/**
+ * A successfully extracted file, that is, a file that was extracted and
+ * contains no extraction errors or warnings.
+ */
+class SuccessfullyExtractedFile extends File {
+  SuccessfullyExtractedFile() {
+    not exists(Diagnostic d |
+      d.getLocation().getFile() = this and
+      (
+        d instanceof ExtractionError
+        or
+        d instanceof ExtractionWarning
+      )
+    )
+  }
+}
diff --git a/rust/ql/src/queries/summary/NumberOfFilesExtractedWithErrors.ql b/rust/ql/src/queries/summary/NumberOfFilesExtractedWithErrors.ql
index 1af3f0f88ec0..23db30f53e96 100644
--- a/rust/ql/src/queries/summary/NumberOfFilesExtractedWithErrors.ql
+++ b/rust/ql/src/queries/summary/NumberOfFilesExtractedWithErrors.ql
@@ -2,14 +2,15 @@
  * @id rust/summary/number-of-files-extracted-with-errors
  * @name Total number of Rust files that were extracted with errors
  * @description The total number of Rust files in the source code directory that
- *  were extracted, but where at least one extraction error occurred in the process.
+ *  were extracted, but where at least one extraction error (or warning) occurred
+ *  in the process.
  * @kind metric
  * @tags summary
  */
 
 import codeql.files.FileSystem
-import codeql.rust.Diagnostics
 
 select count(File f |
-    exists(ExtractionError e | e.getLocation().getFile() = f) and exists(f.getRelativePath())
+    exists(f.getRelativePath()) and
+    not f instanceof SuccessfullyExtractedFile
   )
diff --git a/rust/ql/src/queries/summary/NumberOfSuccessfullyExtractedFiles.ql b/rust/ql/src/queries/summary/NumberOfSuccessfullyExtractedFiles.ql
index eb86577b4b80..c960599ad18f 100644
--- a/rust/ql/src/queries/summary/NumberOfSuccessfullyExtractedFiles.ql
+++ b/rust/ql/src/queries/summary/NumberOfSuccessfullyExtractedFiles.ql
@@ -2,14 +2,11 @@
  * @id rust/summary/number-of-successfully-extracted-files
  * @name Total number of Rust files that were extracted without error
  * @description The total number of Rust files in the source code directory that
- *  were extracted without encountering any extraction errors.
+ *  were extracted without encountering any extraction errors (or warnings).
  * @kind metric
  * @tags summary
  */
 
-import codeql.rust.Diagnostics
 import codeql.files.FileSystem
 
-select count(File f |
-    not exists(ExtractionError e | e.getLocation().getFile() = f) and exists(f.getRelativePath())
-  )
+select count(SuccessfullyExtractedFile f | exists(f.getRelativePath()))

From 88abc8f72f8b96d139909bc97d4fb6137fb22334 Mon Sep 17 00:00:00 2001
From: Geoffrey White <40627776+geoffw0@users.noreply.github.com>
Date: Wed, 2 Oct 2024 17:29:32 +0100
Subject: [PATCH 137/347] Rust: Add to summary stats.

---
 rust/ql/src/queries/summary/SummaryStats.ql     | 17 +++++++++++++++--
 .../diagnostics/SummaryStats.expected           |  6 +++++-
 2 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/rust/ql/src/queries/summary/SummaryStats.ql b/rust/ql/src/queries/summary/SummaryStats.ql
index 447325514cac..a3494ccb769c 100644
--- a/rust/ql/src/queries/summary/SummaryStats.ql
+++ b/rust/ql/src/queries/summary/SummaryStats.ql
@@ -7,16 +7,29 @@
  */
 
 import rust
+import codeql.rust.Diagnostics
 import Stats
 
 from string key, string value
 where
-  key = "Files extracted" and value = count(File f | exists(f.getRelativePath())).toString()
-  or
   key = "Elements extracted" and value = count(Element e | not e instanceof Unextracted).toString()
   or
   key = "Elements unextracted" and value = count(Unextracted e).toString()
   or
+  key = "Extraction errors" and value = count(ExtractionError e).toString()
+  or
+  key = "Extraction warnings" and value = count(ExtractionWarning w).toString()
+  or
+  key = "Files extracted - total" and value = count(File f | exists(f.getRelativePath())).toString()
+  or
+  key = "Files extracted - with errors" and
+  value =
+    count(File f | exists(f.getRelativePath()) and not f instanceof SuccessfullyExtractedFile)
+        .toString()
+  or
+  key = "Files extracted - without errors" and
+  value = count(SuccessfullyExtractedFile f | exists(f.getRelativePath())).toString()
+  or
   key = "Lines of code extracted" and value = getLinesOfCode().toString()
   or
   key = "Lines of user code extracted" and value = getLinesOfUserCode().toString()
diff --git a/rust/ql/test/query-tests/diagnostics/SummaryStats.expected b/rust/ql/test/query-tests/diagnostics/SummaryStats.expected
index ff07c0f589a6..cc467865b00f 100644
--- a/rust/ql/test/query-tests/diagnostics/SummaryStats.expected
+++ b/rust/ql/test/query-tests/diagnostics/SummaryStats.expected
@@ -1,5 +1,9 @@
 | Elements extracted | 210 |
 | Elements unextracted | 0 |
-| Files extracted | 6 |
+| Extraction errors | 6 |
+| Extraction warnings | 0 |
+| Files extracted - total | 6 |
+| Files extracted - with errors | 1 |
+| Files extracted - without errors | 5 |
 | Lines of code extracted | 48 |
 | Lines of user code extracted | 48 |

From 98d587c482264fe107e47e866e25e01ebd7adc00 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]" <github-actions@github.com>
Date: Wed, 2 Oct 2024 22:40:35 +0000
Subject: [PATCH 138/347] Post-release preparation for codeql-cli-2.19.1

---
 cpp/ql/lib/qlpack.yml                         | 2 +-
 cpp/ql/src/qlpack.yml                         | 2 +-
 csharp/ql/campaigns/Solorigate/lib/qlpack.yml | 2 +-
 csharp/ql/campaigns/Solorigate/src/qlpack.yml | 2 +-
 csharp/ql/lib/qlpack.yml                      | 2 +-
 csharp/ql/src/qlpack.yml                      | 2 +-
 go/ql/consistency-queries/qlpack.yml          | 2 +-
 go/ql/lib/qlpack.yml                          | 2 +-
 go/ql/src/qlpack.yml                          | 2 +-
 java/ql/automodel/src/qlpack.yml              | 2 +-
 java/ql/lib/qlpack.yml                        | 2 +-
 java/ql/src/qlpack.yml                        | 2 +-
 javascript/ql/lib/qlpack.yml                  | 2 +-
 javascript/ql/src/qlpack.yml                  | 2 +-
 misc/suite-helpers/qlpack.yml                 | 2 +-
 python/ql/lib/qlpack.yml                      | 2 +-
 python/ql/src/qlpack.yml                      | 2 +-
 ruby/ql/lib/qlpack.yml                        | 2 +-
 ruby/ql/src/qlpack.yml                        | 2 +-
 shared/controlflow/qlpack.yml                 | 2 +-
 shared/dataflow/qlpack.yml                    | 2 +-
 shared/mad/qlpack.yml                         | 2 +-
 shared/rangeanalysis/qlpack.yml               | 2 +-
 shared/regex/qlpack.yml                       | 2 +-
 shared/ssa/qlpack.yml                         | 2 +-
 shared/threat-models/qlpack.yml               | 2 +-
 shared/tutorial/qlpack.yml                    | 2 +-
 shared/typeflow/qlpack.yml                    | 2 +-
 shared/typetracking/qlpack.yml                | 2 +-
 shared/typos/qlpack.yml                       | 2 +-
 shared/util/qlpack.yml                        | 2 +-
 shared/xml/qlpack.yml                         | 2 +-
 shared/yaml/qlpack.yml                        | 2 +-
 swift/ql/lib/qlpack.yml                       | 2 +-
 swift/ql/src/qlpack.yml                       | 2 +-
 35 files changed, 35 insertions(+), 35 deletions(-)

diff --git a/cpp/ql/lib/qlpack.yml b/cpp/ql/lib/qlpack.yml
index f1a2ac3942f2..ba5db8c6e6f9 100644
--- a/cpp/ql/lib/qlpack.yml
+++ b/cpp/ql/lib/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/cpp-all
-version: 2.0.1
+version: 2.0.2-dev
 groups: cpp
 dbscheme: semmlecode.cpp.dbscheme
 extractor: cpp
diff --git a/cpp/ql/src/qlpack.yml b/cpp/ql/src/qlpack.yml
index e541f95cd85f..d01ac2f048c2 100644
--- a/cpp/ql/src/qlpack.yml
+++ b/cpp/ql/src/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/cpp-queries
-version: 1.2.4
+version: 1.2.5-dev
 groups:
   - cpp
   - queries
diff --git a/csharp/ql/campaigns/Solorigate/lib/qlpack.yml b/csharp/ql/campaigns/Solorigate/lib/qlpack.yml
index 871d2ed3619a..3cab08a0f3ec 100644
--- a/csharp/ql/campaigns/Solorigate/lib/qlpack.yml
+++ b/csharp/ql/campaigns/Solorigate/lib/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/csharp-solorigate-all
-version: 1.7.26
+version: 1.7.27-dev
 groups:
   - csharp
   - solorigate
diff --git a/csharp/ql/campaigns/Solorigate/src/qlpack.yml b/csharp/ql/campaigns/Solorigate/src/qlpack.yml
index 00c3209afe98..c46baf0b2518 100644
--- a/csharp/ql/campaigns/Solorigate/src/qlpack.yml
+++ b/csharp/ql/campaigns/Solorigate/src/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/csharp-solorigate-queries
-version: 1.7.26
+version: 1.7.27-dev
 groups:
   - csharp
   - solorigate
diff --git a/csharp/ql/lib/qlpack.yml b/csharp/ql/lib/qlpack.yml
index a8e9c68cfb44..55a99929ac87 100644
--- a/csharp/ql/lib/qlpack.yml
+++ b/csharp/ql/lib/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/csharp-all
-version: 3.0.0
+version: 3.0.1-dev
 groups: csharp
 dbscheme: semmlecode.csharp.dbscheme
 extractor: csharp
diff --git a/csharp/ql/src/qlpack.yml b/csharp/ql/src/qlpack.yml
index 82e9607d7ab7..6209cc5f88d5 100644
--- a/csharp/ql/src/qlpack.yml
+++ b/csharp/ql/src/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/csharp-queries
-version: 1.0.9
+version: 1.0.10-dev
 groups:
   - csharp
   - queries
diff --git a/go/ql/consistency-queries/qlpack.yml b/go/ql/consistency-queries/qlpack.yml
index 9800f5090fac..5a7ca8082a53 100644
--- a/go/ql/consistency-queries/qlpack.yml
+++ b/go/ql/consistency-queries/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql-go-consistency-queries
-version: 1.0.9
+version: 1.0.10-dev
 groups:
   - go
   - queries
diff --git a/go/ql/lib/qlpack.yml b/go/ql/lib/qlpack.yml
index b6987a250d1a..9cb5e3620117 100644
--- a/go/ql/lib/qlpack.yml
+++ b/go/ql/lib/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/go-all
-version: 2.1.0
+version: 2.1.1-dev
 groups: go
 dbscheme: go.dbscheme
 extractor: go
diff --git a/go/ql/src/qlpack.yml b/go/ql/src/qlpack.yml
index e783026f6cfd..0b3f5076bb6d 100644
--- a/go/ql/src/qlpack.yml
+++ b/go/ql/src/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/go-queries
-version: 1.1.0
+version: 1.1.1-dev
 groups:
   - go
   - queries
diff --git a/java/ql/automodel/src/qlpack.yml b/java/ql/automodel/src/qlpack.yml
index 1e1fdbb9f38d..fe961cb4392c 100644
--- a/java/ql/automodel/src/qlpack.yml
+++ b/java/ql/automodel/src/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/java-automodel-queries
-version: 1.0.9
+version: 1.0.10-dev
 groups:
     - java
     - automodel
diff --git a/java/ql/lib/qlpack.yml b/java/ql/lib/qlpack.yml
index 9c69e18a30b8..0d4f67146c1b 100644
--- a/java/ql/lib/qlpack.yml
+++ b/java/ql/lib/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/java-all
-version: 4.1.0
+version: 4.1.1-dev
 groups: java
 dbscheme: config/semmlecode.dbscheme
 extractor: java
diff --git a/java/ql/src/qlpack.yml b/java/ql/src/qlpack.yml
index 635ef97836fe..c8e95f52ca4a 100644
--- a/java/ql/src/qlpack.yml
+++ b/java/ql/src/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/java-queries
-version: 1.1.6
+version: 1.1.7-dev
 groups:
   - java
   - queries
diff --git a/javascript/ql/lib/qlpack.yml b/javascript/ql/lib/qlpack.yml
index a93cb421a869..bea3bbacd5fa 100644
--- a/javascript/ql/lib/qlpack.yml
+++ b/javascript/ql/lib/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/javascript-all
-version: 2.0.1
+version: 2.0.2-dev
 groups: javascript
 dbscheme: semmlecode.javascript.dbscheme
 extractor: javascript
diff --git a/javascript/ql/src/qlpack.yml b/javascript/ql/src/qlpack.yml
index 49489696e79a..407aa03f7802 100644
--- a/javascript/ql/src/qlpack.yml
+++ b/javascript/ql/src/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/javascript-queries
-version: 1.2.1
+version: 1.2.2-dev
 groups:
   - javascript
   - queries
diff --git a/misc/suite-helpers/qlpack.yml b/misc/suite-helpers/qlpack.yml
index a4d970e31297..76c86b26be6b 100644
--- a/misc/suite-helpers/qlpack.yml
+++ b/misc/suite-helpers/qlpack.yml
@@ -1,4 +1,4 @@
 name: codeql/suite-helpers
-version: 1.0.9
+version: 1.0.10-dev
 groups: shared
 warnOnImplicitThis: true
diff --git a/python/ql/lib/qlpack.yml b/python/ql/lib/qlpack.yml
index 316f7a1cc1e6..445940cdd889 100644
--- a/python/ql/lib/qlpack.yml
+++ b/python/ql/lib/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/python-all
-version: 2.1.0
+version: 2.1.1-dev
 groups: python
 dbscheme: semmlecode.python.dbscheme
 extractor: python
diff --git a/python/ql/src/qlpack.yml b/python/ql/src/qlpack.yml
index 02c861d40e1d..3f5ee4e78041 100644
--- a/python/ql/src/qlpack.yml
+++ b/python/ql/src/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/python-queries
-version: 1.3.0
+version: 1.3.1-dev
 groups:
   - python
   - queries
diff --git a/ruby/ql/lib/qlpack.yml b/ruby/ql/lib/qlpack.yml
index da808214ea50..dc0b471a171d 100644
--- a/ruby/ql/lib/qlpack.yml
+++ b/ruby/ql/lib/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/ruby-all
-version: 2.0.1
+version: 2.0.2-dev
 groups: ruby
 extractor: ruby
 dbscheme: ruby.dbscheme
diff --git a/ruby/ql/src/qlpack.yml b/ruby/ql/src/qlpack.yml
index 47651d248c01..b7eee713fbaa 100644
--- a/ruby/ql/src/qlpack.yml
+++ b/ruby/ql/src/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/ruby-queries
-version: 1.1.4
+version: 1.1.5-dev
 groups:
   - ruby
   - queries
diff --git a/shared/controlflow/qlpack.yml b/shared/controlflow/qlpack.yml
index fc8bdde934d4..532b2fa69a09 100644
--- a/shared/controlflow/qlpack.yml
+++ b/shared/controlflow/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/controlflow
-version: 1.0.9
+version: 1.0.10-dev
 groups: shared
 library: true
 dependencies:
diff --git a/shared/dataflow/qlpack.yml b/shared/dataflow/qlpack.yml
index 2ad3f8bc73c0..df5c8c4c38af 100644
--- a/shared/dataflow/qlpack.yml
+++ b/shared/dataflow/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/dataflow
-version: 1.1.3
+version: 1.1.4-dev
 groups: shared
 library: true
 dependencies:
diff --git a/shared/mad/qlpack.yml b/shared/mad/qlpack.yml
index ed0c1f7113c5..ef3755c80bc4 100644
--- a/shared/mad/qlpack.yml
+++ b/shared/mad/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/mad
-version: 1.0.9
+version: 1.0.10-dev
 groups: shared
 library: true
 dependencies:
diff --git a/shared/rangeanalysis/qlpack.yml b/shared/rangeanalysis/qlpack.yml
index aaf1b1903576..b4deed51c9d8 100644
--- a/shared/rangeanalysis/qlpack.yml
+++ b/shared/rangeanalysis/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/rangeanalysis
-version: 1.0.9
+version: 1.0.10-dev
 groups: shared
 library: true
 dependencies:
diff --git a/shared/regex/qlpack.yml b/shared/regex/qlpack.yml
index d8b03f4ad2f5..5593197f674b 100644
--- a/shared/regex/qlpack.yml
+++ b/shared/regex/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/regex
-version: 1.0.9
+version: 1.0.10-dev
 groups: shared
 library: true
 dependencies:
diff --git a/shared/ssa/qlpack.yml b/shared/ssa/qlpack.yml
index 1bd2bea757b3..7bc3773a575f 100644
--- a/shared/ssa/qlpack.yml
+++ b/shared/ssa/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/ssa
-version: 1.0.9
+version: 1.0.10-dev
 groups: shared
 library: true
 dependencies:
diff --git a/shared/threat-models/qlpack.yml b/shared/threat-models/qlpack.yml
index 434466938b1c..dd4331d7e749 100644
--- a/shared/threat-models/qlpack.yml
+++ b/shared/threat-models/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/threat-models
-version: 1.0.9
+version: 1.0.10-dev
 library: true
 groups: shared
 dataExtensions:
diff --git a/shared/tutorial/qlpack.yml b/shared/tutorial/qlpack.yml
index 9a89b262a321..2390ce7ad116 100644
--- a/shared/tutorial/qlpack.yml
+++ b/shared/tutorial/qlpack.yml
@@ -1,7 +1,7 @@
 name: codeql/tutorial
 description: Library for the CodeQL detective tutorials, helping new users learn to
   write CodeQL queries.
-version: 1.0.9
+version: 1.0.10-dev
 groups: shared
 library: true
 warnOnImplicitThis: true
diff --git a/shared/typeflow/qlpack.yml b/shared/typeflow/qlpack.yml
index 21b1ddbc9654..04f843aacb5f 100644
--- a/shared/typeflow/qlpack.yml
+++ b/shared/typeflow/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/typeflow
-version: 1.0.9
+version: 1.0.10-dev
 groups: shared
 library: true
 dependencies:
diff --git a/shared/typetracking/qlpack.yml b/shared/typetracking/qlpack.yml
index 6f7282c54e9e..e48446dc3e0b 100644
--- a/shared/typetracking/qlpack.yml
+++ b/shared/typetracking/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/typetracking
-version: 1.0.9
+version: 1.0.10-dev
 groups: shared
 library: true
 dependencies:
diff --git a/shared/typos/qlpack.yml b/shared/typos/qlpack.yml
index 3e644f92d6d1..5eccd54b2afa 100644
--- a/shared/typos/qlpack.yml
+++ b/shared/typos/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/typos
-version: 1.0.9
+version: 1.0.10-dev
 groups: shared
 library: true
 warnOnImplicitThis: true
diff --git a/shared/util/qlpack.yml b/shared/util/qlpack.yml
index ab191310e567..508143471db4 100644
--- a/shared/util/qlpack.yml
+++ b/shared/util/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/util
-version: 1.0.9
+version: 1.0.10-dev
 groups: shared
 library: true
 dependencies: null
diff --git a/shared/xml/qlpack.yml b/shared/xml/qlpack.yml
index f43260879fb6..a81184e65886 100644
--- a/shared/xml/qlpack.yml
+++ b/shared/xml/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/xml
-version: 1.0.9
+version: 1.0.10-dev
 groups: shared
 library: true
 dependencies:
diff --git a/shared/yaml/qlpack.yml b/shared/yaml/qlpack.yml
index 4a63da564e55..1df4193b862f 100644
--- a/shared/yaml/qlpack.yml
+++ b/shared/yaml/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/yaml
-version: 1.0.9
+version: 1.0.10-dev
 groups: shared
 library: true
 warnOnImplicitThis: true
diff --git a/swift/ql/lib/qlpack.yml b/swift/ql/lib/qlpack.yml
index dd1896b3c291..1904a1b1ca48 100644
--- a/swift/ql/lib/qlpack.yml
+++ b/swift/ql/lib/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/swift-all
-version: 2.0.1
+version: 2.0.2-dev
 groups: swift
 extractor: swift
 dbscheme: swift.dbscheme
diff --git a/swift/ql/src/qlpack.yml b/swift/ql/src/qlpack.yml
index 8f33acf16a69..6fbae9403605 100644
--- a/swift/ql/src/qlpack.yml
+++ b/swift/ql/src/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/swift-queries
-version: 1.0.9
+version: 1.0.10-dev
 groups:
   - swift
   - queries

From 0dc036abd17ad23afa4bf9b64d935d6c86637eeb Mon Sep 17 00:00:00 2001
From: Rasmus Lerchedahl Petersen <yoff@github.com>
Date: Thu, 3 Oct 2024 09:31:02 +0200
Subject: [PATCH 139/347] Python: Allow type tracking through comprehensions -
 the subscript operator is extended to comprehensions - the capture jump-step
 is extended to work for the functions generated inside comprehensions

---
 python/ql/lib/semmle/python/ApiGraphs.qll                  | 7 +++++++
 .../python/dataflow/new/internal/TypeTrackingImpl.qll      | 2 +-
 .../ql/test/library-tests/frameworks/stdlib/http_server.py | 4 ++--
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/python/ql/lib/semmle/python/ApiGraphs.qll b/python/ql/lib/semmle/python/ApiGraphs.qll
index 1ce04852f3ad..4385259ca9b3 100644
--- a/python/ql/lib/semmle/python/ApiGraphs.qll
+++ b/python/ql/lib/semmle/python/ApiGraphs.qll
@@ -843,6 +843,13 @@ module API {
         ref = pred.getSubscript(_) and
         ref.asCfgNode().isLoad()
         or
+        // Subscript via comprehension
+        lbl = Label::subscript() and
+        exists(PY::Comp comp |
+          pred.asExpr() = comp.getIterable() and
+          ref.asExpr() = comp.getNthInnerLoop(0).getTarget()
+        )
+        or
         // Subclassing a node
         lbl = Label::subclass() and
         exists(PY::ClassExpr clsExpr, DataFlow::Node superclass | pred.flowsTo(superclass) |
diff --git a/python/ql/lib/semmle/python/dataflow/new/internal/TypeTrackingImpl.qll b/python/ql/lib/semmle/python/dataflow/new/internal/TypeTrackingImpl.qll
index f3e4ff40800b..415028ad8277 100644
--- a/python/ql/lib/semmle/python/dataflow/new/internal/TypeTrackingImpl.qll
+++ b/python/ql/lib/semmle/python/dataflow/new/internal/TypeTrackingImpl.qll
@@ -304,7 +304,7 @@ module TypeTrackingInput implements Shared::TypeTrackingInput {
       var.hasDefiningNode(def)
     |
       nodeTo.(DataFlowPublic::ScopeEntryDefinitionNode).getDefinition() = e and
-      nodeFrom.asCfgNode() = def.getValue() and
+      nodeFrom.asCfgNode() = def and
       var.getScope().getScope*() = nodeFrom.getScope()
     )
   }
diff --git a/python/ql/test/library-tests/frameworks/stdlib/http_server.py b/python/ql/test/library-tests/frameworks/stdlib/http_server.py
index 27ec2211f4bc..9110aa6a26a9 100644
--- a/python/ql/test/library-tests/frameworks/stdlib/http_server.py
+++ b/python/ql/test/library-tests/frameworks/stdlib/http_server.py
@@ -30,7 +30,7 @@ def test_cgi_FieldStorage_taint():
         form['key'][0].value, # $ tainted
         form['key'][0].file, # $ tainted
         form['key'][0].filename, # $ tainted
-        [field.value for field in form['key']], # $ MISSING: tainted
+        [field.value for field in form['key']], # $ tainted
 
         # `form.getvalue('key')` will be a list, if multiple fields named "key" are provided
         form.getvalue('key'), # $ tainted
@@ -40,7 +40,7 @@ def test_cgi_FieldStorage_taint():
 
         form.getlist('key'), # $ tainted
         form.getlist('key')[0], # $ tainted
-        [field.value for field in form.getlist('key')], # $ MISSING: tainted
+        [field.value for field in form.getlist('key')], # $ tainted
     )
 
 

From 9e808c17aff2aee6f74f4cf14972607c0744ab7d Mon Sep 17 00:00:00 2001
From: Rasmus Lerchedahl Petersen <yoff@github.com>
Date: Thu, 3 Oct 2024 10:09:59 +0200
Subject: [PATCH 140/347] Python: add change note

---
 .../2024-10-03-typetracking-through-comprehensions.md         | 4 ++++
 1 file changed, 4 insertions(+)
 create mode 100644 python/ql/lib/change-notes/released/2024-10-03-typetracking-through-comprehensions.md

diff --git a/python/ql/lib/change-notes/released/2024-10-03-typetracking-through-comprehensions.md b/python/ql/lib/change-notes/released/2024-10-03-typetracking-through-comprehensions.md
new file mode 100644
index 000000000000..72d853460305
--- /dev/null
+++ b/python/ql/lib/change-notes/released/2024-10-03-typetracking-through-comprehensions.md
@@ -0,0 +1,4 @@
+---
+category: minorAnalysis
+---
+* Type tracking, and hence the API graph, is now able to correctly trace trough comprehensions.
\ No newline at end of file

From 6d486f99319ce11fe7411ff9c28becc02c9dd5df Mon Sep 17 00:00:00 2001
From: Rasmus Lerchedahl Petersen <yoff@github.com>
Date: Thu, 3 Oct 2024 10:15:55 +0200
Subject: [PATCH 141/347] Python: move change note to the right place

---
 .../2024-10-03-typetracking-through-comprehensions.md             | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename python/ql/lib/change-notes/{released => }/2024-10-03-typetracking-through-comprehensions.md (100%)

diff --git a/python/ql/lib/change-notes/released/2024-10-03-typetracking-through-comprehensions.md b/python/ql/lib/change-notes/2024-10-03-typetracking-through-comprehensions.md
similarity index 100%
rename from python/ql/lib/change-notes/released/2024-10-03-typetracking-through-comprehensions.md
rename to python/ql/lib/change-notes/2024-10-03-typetracking-through-comprehensions.md

From 56d0affe38fbe469e241c7854232b4f43adde619 Mon Sep 17 00:00:00 2001
From: yoff <lerchedahl@gmail.com>
Date: Thu, 3 Oct 2024 10:18:25 +0200
Subject: [PATCH 142/347] Update
 python/ql/lib/semmle/python/frameworks/Stdlib.model.yml

Co-authored-by: Rasmus Wriedt Larsen <rasmuswriedtlarsen@gmail.com>
---
 python/ql/lib/semmle/python/frameworks/Stdlib.model.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/python/ql/lib/semmle/python/frameworks/Stdlib.model.yml b/python/ql/lib/semmle/python/frameworks/Stdlib.model.yml
index 946c4d5ed4f6..107fffdbfb84 100644
--- a/python/ql/lib/semmle/python/frameworks/Stdlib.model.yml
+++ b/python/ql/lib/semmle/python/frameworks/Stdlib.model.yml
@@ -33,8 +33,8 @@ extensions:
       extensible: summaryModel
     data:
       # See https://docs.python.org/3/library/argparse.html#argparse.ArgumentParser
+      # note: taint flow for attribute lookups on `argparse.ArgumentParser` is handled in QL
       - ["argparse.ArgumentParser", "Member[_parse_known_args,_read_args_from_files]", "Argument[0,arg_strings:]", "ReturnValue", "taint"]
-      # note: taint of attribute lookups is handled in QL
       - ["argparse.ArgumentParser", "Member[parse_args,parse_known_args]", "Argument[0,args:]", "ReturnValue", "taint"]
       # See https://docs.python.org/3/library/cgi.html#higher-level-interface
       - ["cgi.FieldStorage", "Member[getfirst,getlist,getvalue]", "Argument[self]", "ReturnValue", "taint"]

From 5c68bad2f158d3a0f37d931fdf485d990e28097b Mon Sep 17 00:00:00 2001
From: Rasmus Lerchedahl Petersen <yoff@github.com>
Date: Thu, 3 Oct 2024 12:17:59 +0200
Subject: [PATCH 143/347] Python: add comments

---
 python/ql/lib/semmle/python/frameworks/Stdlib.qll | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/python/ql/lib/semmle/python/frameworks/Stdlib.qll b/python/ql/lib/semmle/python/frameworks/Stdlib.qll
index 37cb23a472db..038b3f851932 100644
--- a/python/ql/lib/semmle/python/frameworks/Stdlib.qll
+++ b/python/ql/lib/semmle/python/frameworks/Stdlib.qll
@@ -4207,7 +4207,11 @@ module StdlibPrivate {
   // ---------------------------------------------------------------------------
   // Flow summaries for functions contructing containers
   // ---------------------------------------------------------------------------
-  /** A flow summary for `dict`. */
+  /**
+   * A flow summary for `dict`.
+   *
+   * see https://docs.python.org/3/library/stdtypes.html#dict
+   */
   class DictSummary extends SummarizedCallable {
     DictSummary() { this = "builtins.dict" }
 
@@ -4218,18 +4222,23 @@ module StdlibPrivate {
     }
 
     override predicate propagatesFlow(string input, string output, boolean preservesValue) {
+      // The positional argument contains a mapping.
+      // TODO: Add the list-of-pairs version
+      // TODO: these values can be overwritten by keyword arguments
       exists(DataFlow::DictionaryElementContent dc, string key | key = dc.getKey() |
         input = "Argument[0].DictionaryElement[" + key + "]" and
         output = "ReturnValue.DictionaryElement[" + key + "]" and
         preservesValue = true
       )
       or
+      // The keyword arguments are added to the dictionary.
       exists(DataFlow::DictionaryElementContent dc, string key | key = dc.getKey() |
         input = "Argument[" + key + ":]" and
         output = "ReturnValue.DictionaryElement[" + key + "]" and
         preservesValue = true
       )
       or
+      // Imprecise content in any argument ends up on the container itself.
       input = "Argument[0..]" and
       output = "ReturnValue" and
       preservesValue = false

From 0462809edcf42f6da8ea8b6dfa81505bb8a7e147 Mon Sep 17 00:00:00 2001
From: Rasmus Lerchedahl Petersen <yoff@github.com>
Date: Tue, 24 Sep 2024 20:49:05 +0200
Subject: [PATCH 144/347] Python: add taint test for urllib

---
 .../frameworks/urllib/InlineTaintTest.expected         |  4 ++++
 .../library-tests/frameworks/urllib/InlineTaintTest.ql |  2 ++
 .../test/library-tests/frameworks/urllib/taint_test.py | 10 ++++++++++
 3 files changed, 16 insertions(+)
 create mode 100644 python/ql/test/library-tests/frameworks/urllib/InlineTaintTest.expected
 create mode 100644 python/ql/test/library-tests/frameworks/urllib/InlineTaintTest.ql
 create mode 100644 python/ql/test/library-tests/frameworks/urllib/taint_test.py

diff --git a/python/ql/test/library-tests/frameworks/urllib/InlineTaintTest.expected b/python/ql/test/library-tests/frameworks/urllib/InlineTaintTest.expected
new file mode 100644
index 000000000000..366de37b8677
--- /dev/null
+++ b/python/ql/test/library-tests/frameworks/urllib/InlineTaintTest.expected
@@ -0,0 +1,4 @@
+argumentToEnsureNotTaintedNotMarkedAsSpurious
+untaintedArgumentToEnsureTaintedNotMarkedAsMissing
+testFailures
+failures
diff --git a/python/ql/test/library-tests/frameworks/urllib/InlineTaintTest.ql b/python/ql/test/library-tests/frameworks/urllib/InlineTaintTest.ql
new file mode 100644
index 000000000000..8524da5fe7db
--- /dev/null
+++ b/python/ql/test/library-tests/frameworks/urllib/InlineTaintTest.ql
@@ -0,0 +1,2 @@
+import experimental.meta.InlineTaintTest
+import MakeInlineTaintTest<TestTaintTrackingConfig>
diff --git a/python/ql/test/library-tests/frameworks/urllib/taint_test.py b/python/ql/test/library-tests/frameworks/urllib/taint_test.py
new file mode 100644
index 000000000000..ad64ce37f24c
--- /dev/null
+++ b/python/ql/test/library-tests/frameworks/urllib/taint_test.py
@@ -0,0 +1,10 @@
+import urllib.parse
+
+def test():
+    ts = TAINTED_STRING
+
+    params = urllib.parse.parse_qs(ts)
+
+    ensure_tainted(
+        params, # $ MISSING: tainted
+    )

From 768d866e72da521f942c449c45aa0ec298fbe22e Mon Sep 17 00:00:00 2001
From: Rasmus Lerchedahl Petersen <yoff@github.com>
Date: Tue, 24 Sep 2024 20:52:00 +0200
Subject: [PATCH 145/347] python: model `urllib.parse.parse_qs`

---
 python/ql/lib/semmle/python/frameworks/Stdlib.model.yml      | 2 ++
 python/ql/test/library-tests/frameworks/urllib/taint_test.py | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/python/ql/lib/semmle/python/frameworks/Stdlib.model.yml b/python/ql/lib/semmle/python/frameworks/Stdlib.model.yml
index 107fffdbfb84..683b0aa9b3df 100644
--- a/python/ql/lib/semmle/python/frameworks/Stdlib.model.yml
+++ b/python/ql/lib/semmle/python/frameworks/Stdlib.model.yml
@@ -134,6 +134,8 @@ extensions:
       - ["traceback.StackSummary", "Member[from_list]", "Argument[0,a_list:]", "ReturnValue", "taint"]
       # See https://docs.python.org/3/library/typing.html#typing.cast
       - ["typing", "Member[cast]", "Argument[1,val:]", "ReturnValue", "value"]
+      # See https://docs.python.org/3/library/urllib.parse.html#urllib.parse.parse_qs
+      - ["urllib", "Member[parse].Member[parse_qs]", "Argument[0,qs:]", "ReturnValue", "taint"]
       # See https://docs.python.org/3/library/urllib.parse.html#urllib.parse.quote
       - ["urllib", "Member[parse].Member[quote]", "Argument[0,string:]", "ReturnValue", "taint"]
       # See https://docs.python.org/3/library/urllib.parse.html#urllib.parse.quote_plus
diff --git a/python/ql/test/library-tests/frameworks/urllib/taint_test.py b/python/ql/test/library-tests/frameworks/urllib/taint_test.py
index ad64ce37f24c..b24c31be14c0 100644
--- a/python/ql/test/library-tests/frameworks/urllib/taint_test.py
+++ b/python/ql/test/library-tests/frameworks/urllib/taint_test.py
@@ -6,5 +6,5 @@ def test():
     params = urllib.parse.parse_qs(ts)
 
     ensure_tainted(
-        params, # $ MISSING: tainted
+        params, # $ tainted
     )

From 821398715c5eb6361e42bd9b5e528254fce403a2 Mon Sep 17 00:00:00 2001
From: Geoffrey White <40627776+geoffw0@users.noreply.github.com>
Date: Thu, 3 Oct 2024 11:55:11 +0100
Subject: [PATCH 146/347] Rust: Test spacing.

---
 .../query-tests/unusedentities/UnusedVariable.expected    | 8 ++++----
 rust/ql/test/query-tests/unusedentities/main.rs           | 2 ++
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/rust/ql/test/query-tests/unusedentities/UnusedVariable.expected b/rust/ql/test/query-tests/unusedentities/UnusedVariable.expected
index f3aadfdff0d8..b99d7892f8e8 100644
--- a/rust/ql/test/query-tests/unusedentities/UnusedVariable.expected
+++ b/rust/ql/test/query-tests/unusedentities/UnusedVariable.expected
@@ -1,4 +1,4 @@
-| main.rs:23:9:23:9 | a | Variable is not used. |
-| main.rs:88:13:88:13 | d | Variable is not used. |
-| main.rs:112:9:112:9 | k | Variable is not used. |
-| main.rs:139:5:139:5 | y | Variable is not used. |
+| main.rs:25:9:25:9 | a | Variable is not used. |
+| main.rs:90:13:90:13 | d | Variable is not used. |
+| main.rs:114:9:114:9 | k | Variable is not used. |
+| main.rs:141:5:141:5 | y | Variable is not used. |
diff --git a/rust/ql/test/query-tests/unusedentities/main.rs b/rust/ql/test/query-tests/unusedentities/main.rs
index 7280f6c2502b..3d79206e903e 100644
--- a/rust/ql/test/query-tests/unusedentities/main.rs
+++ b/rust/ql/test/query-tests/unusedentities/main.rs
@@ -8,6 +8,7 @@ fn locals_1() {
     let c = 1;
     let d = String::from("a"); // BAD: unused value [NOT DETECTED]
     let e = String::from("b");
+
     let _ = 1; // (deliberately unused)
 
     println!("use {}", b);
@@ -17,6 +18,7 @@ fn locals_1() {
     }
 
     println!("use {}", e);
+
 }
 
 fn locals_2() {

From 777279dc29cf812a6d3e50e06b692c0c0b3effcb Mon Sep 17 00:00:00 2001
From: Rasmus Lerchedahl Petersen <yoff@github.com>
Date: Thu, 3 Oct 2024 13:29:56 +0200
Subject: [PATCH 147/347] Python: MaD test expectations

---
 .../Security/CWE-409/DecompressionBombs.expected       | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/python/ql/test/experimental/query-tests/Security/CWE-409/DecompressionBombs.expected b/python/ql/test/experimental/query-tests/Security/CWE-409/DecompressionBombs.expected
index 2b16f9ef178f..7763cf2ad151 100644
--- a/python/ql/test/experimental/query-tests/Security/CWE-409/DecompressionBombs.expected
+++ b/python/ql/test/experimental/query-tests/Security/CWE-409/DecompressionBombs.expected
@@ -1,23 +1,23 @@
 edges
 | test.py:10:16:10:24 | ControlFlowNode for file_path | test.py:11:21:11:29 | ControlFlowNode for file_path | provenance |  |
 | test.py:11:5:11:35 | ControlFlowNode for Attribute() | test.py:11:5:11:52 | ControlFlowNode for Attribute() | provenance | Config |
-| test.py:11:21:11:29 | ControlFlowNode for file_path | test.py:11:5:11:35 | ControlFlowNode for Attribute() | provenance | MaD:82 |
+| test.py:11:21:11:29 | ControlFlowNode for file_path | test.py:11:5:11:35 | ControlFlowNode for Attribute() | provenance | MaD:83 |
 | test.py:11:21:11:29 | ControlFlowNode for file_path | test.py:11:5:11:52 | ControlFlowNode for Attribute() | provenance | Config |
 | test.py:11:21:11:29 | ControlFlowNode for file_path | test.py:12:21:12:29 | ControlFlowNode for file_path | provenance |  |
 | test.py:12:5:12:35 | ControlFlowNode for Attribute() | test.py:12:5:12:48 | ControlFlowNode for Attribute() | provenance | Config |
-| test.py:12:21:12:29 | ControlFlowNode for file_path | test.py:12:5:12:35 | ControlFlowNode for Attribute() | provenance | MaD:82 |
+| test.py:12:21:12:29 | ControlFlowNode for file_path | test.py:12:5:12:35 | ControlFlowNode for Attribute() | provenance | MaD:83 |
 | test.py:12:21:12:29 | ControlFlowNode for file_path | test.py:12:5:12:48 | ControlFlowNode for Attribute() | provenance | Config |
 | test.py:12:21:12:29 | ControlFlowNode for file_path | test.py:14:26:14:34 | ControlFlowNode for file_path | provenance |  |
 | test.py:14:10:14:35 | ControlFlowNode for Attribute() | test.py:15:14:15:29 | ControlFlowNode for Attribute() | provenance | Config |
-| test.py:14:26:14:34 | ControlFlowNode for file_path | test.py:14:10:14:35 | ControlFlowNode for Attribute() | provenance | MaD:82 |
+| test.py:14:26:14:34 | ControlFlowNode for file_path | test.py:14:10:14:35 | ControlFlowNode for Attribute() | provenance | MaD:83 |
 | test.py:14:26:14:34 | ControlFlowNode for file_path | test.py:15:14:15:29 | ControlFlowNode for Attribute() | provenance | Config |
 | test.py:14:26:14:34 | ControlFlowNode for file_path | test.py:18:26:18:34 | ControlFlowNode for file_path | provenance |  |
 | test.py:18:10:18:35 | ControlFlowNode for Attribute() | test.py:19:14:19:39 | ControlFlowNode for Attribute() | provenance | Config |
-| test.py:18:26:18:34 | ControlFlowNode for file_path | test.py:18:10:18:35 | ControlFlowNode for Attribute() | provenance | MaD:82 |
+| test.py:18:26:18:34 | ControlFlowNode for file_path | test.py:18:10:18:35 | ControlFlowNode for Attribute() | provenance | MaD:83 |
 | test.py:18:26:18:34 | ControlFlowNode for file_path | test.py:19:14:19:39 | ControlFlowNode for Attribute() | provenance | Config |
 | test.py:18:26:18:34 | ControlFlowNode for file_path | test.py:22:21:22:29 | ControlFlowNode for file_path | provenance |  |
 | test.py:22:5:22:30 | ControlFlowNode for Attribute() | test.py:22:5:22:60 | ControlFlowNode for Attribute() | provenance | Config |
-| test.py:22:21:22:29 | ControlFlowNode for file_path | test.py:22:5:22:30 | ControlFlowNode for Attribute() | provenance | MaD:82 |
+| test.py:22:21:22:29 | ControlFlowNode for file_path | test.py:22:5:22:30 | ControlFlowNode for Attribute() | provenance | MaD:83 |
 | test.py:22:21:22:29 | ControlFlowNode for file_path | test.py:22:5:22:60 | ControlFlowNode for Attribute() | provenance | Config |
 | test.py:22:21:22:29 | ControlFlowNode for file_path | test.py:24:18:24:26 | ControlFlowNode for file_path | provenance |  |
 | test.py:24:18:24:26 | ControlFlowNode for file_path | test.py:24:5:24:52 | ControlFlowNode for Attribute() | provenance | Config |

From 0304aa846caddb81cf318164b08230bcb469114d Mon Sep 17 00:00:00 2001
From: Geoffrey White <40627776+geoffw0@users.noreply.github.com>
Date: Thu, 3 Oct 2024 11:57:56 +0100
Subject: [PATCH 148/347] Rust: Add more tests for uused variables.

---
 .../unusedentities/UnusedVariable.expected    |  10 ++
 .../test/query-tests/unusedentities/main.rs   | 106 +++++++++++++++++-
 2 files changed, 114 insertions(+), 2 deletions(-)

diff --git a/rust/ql/test/query-tests/unusedentities/UnusedVariable.expected b/rust/ql/test/query-tests/unusedentities/UnusedVariable.expected
index b99d7892f8e8..4a35ca8a41d4 100644
--- a/rust/ql/test/query-tests/unusedentities/UnusedVariable.expected
+++ b/rust/ql/test/query-tests/unusedentities/UnusedVariable.expected
@@ -2,3 +2,13 @@
 | main.rs:90:13:90:13 | d | Variable is not used. |
 | main.rs:114:9:114:9 | k | Variable is not used. |
 | main.rs:141:5:141:5 | y | Variable is not used. |
+| main.rs:164:9:164:9 | x | Variable is not used. |
+| main.rs:170:9:170:9 | x | Variable is not used. |
+| main.rs:174:9:174:9 | x | Variable is not used. |
+| main.rs:194:17:194:17 | a | Variable is not used. |
+| main.rs:202:20:202:22 | val | Variable is not used. |
+| main.rs:207:20:207:22 | val | Variable is not used. |
+| main.rs:214:14:214:16 | val | Variable is not used. |
+| main.rs:216:9:216:12 | None | Variable is not used. |
+| main.rs:225:9:225:12 | None | Variable is not used. |
+| main.rs:231:24:231:26 | val | Variable is not used. |
diff --git a/rust/ql/test/query-tests/unusedentities/main.rs b/rust/ql/test/query-tests/unusedentities/main.rs
index 3d79206e903e..46d1458b972e 100644
--- a/rust/ql/test/query-tests/unusedentities/main.rs
+++ b/rust/ql/test/query-tests/unusedentities/main.rs
@@ -8,7 +8,7 @@ fn locals_1() {
     let c = 1;
     let d = String::from("a"); // BAD: unused value [NOT DETECTED]
     let e = String::from("b");
-
+    let f = 1;
     let _ = 1; // (deliberately unused)
 
     println!("use {}", b);
@@ -18,7 +18,7 @@ fn locals_1() {
     }
 
     println!("use {}", e);
-
+    assert!(f == 1);
 }
 
 fn locals_2() {
@@ -144,11 +144,113 @@ fn parameters(
     return x;
 }
 
+// --- loops ---
+
+fn loops() {
+    let mut a: i64 = 10;
+    let b: i64 = 20;
+    let c: i64 = 30;
+    let d: i64 = 40;
+    let mut e: i64 = 50;
+
+    while a < b {
+        a += 1;
+    }
+
+    for x in c..d {
+        e += x;
+    }
+
+    for x in 1..10 { // BAD: unused variable
+    }
+
+    for _ in 1..10 {
+    }
+
+    for x in 1..10 { // SPURIOUS: unused variable [macros not yet supported]
+        println!("x is {}", x);
+    }
+
+    for x in 1..10 { // SPURIOUS: unused variable [macros not yet supported]
+        assert!(x != 11);
+    }
+}
+
+// --- lets ---
+
+enum MyOption<T> {
+    None,
+    Some(T),
+}
+
+enum YesOrNo {
+    Yes,
+    No,
+}
+
+fn if_lets() {
+    let mut total: i64 = 0;
+
+    if let Some(a) = Some(10) { // BAD: unused variable
+    }
+
+    if let Some(b) = Some(20) {
+        total += b;
+    }
+
+    let mut next = Some(30);
+    while let Some(val) = next { // BAD: unused variable
+        next = None;
+    }
+
+    let mut next2 = Some(40);
+    while let Some(val) = next2 { // SPURIOUS: unused variable 'val'
+        total += val;
+        next2 = None;
+    }
+
+    let c = Some(60);
+    match c {
+        Some(val) => { // BAD: unused variable
+        },
+        None => { // SPURIOUS: unused variable 'None'
+        }
+    }
+
+    let d = Some(70);
+    match d {
+        Some(val) => {
+            total += val;
+        },
+        None => { // SPURIOUS: unused variable 'None'
+        }
+    }
+
+    let e = MyOption::Some(80);
+    match e {
+        MyOption::Some(val) => { // BAD: unused variable
+        },
+        MyOption::None => {
+        }
+    }
+
+    let f = YesOrNo::Yes;
+    match f {
+        YesOrNo::Yes => {
+        },
+        YesOrNo::No => {
+        },
+    }
+}
+
 fn main() {
     locals_1();
     locals_2();
     structs();
     arrays();
     statics();
+    loops();
+    if_lets();
+
     println!("lets use result {}", parameters(1, 2, 3));
 }

From 9902874dddfec7476100d57ca0a89760c8e2b0f7 Mon Sep 17 00:00:00 2001
From: Asger F <asgerf@github.com>
Date: Thu, 3 Oct 2024 13:43:39 +0200
Subject: [PATCH 149/347] SSA: Add BarrierGuardWithState

---
 shared/ssa/codeql/ssa/Ssa.qll | 48 ++++++++++++++++++++++++++++++++---
 1 file changed, 44 insertions(+), 4 deletions(-)

diff --git a/shared/ssa/codeql/ssa/Ssa.qll b/shared/ssa/codeql/ssa/Ssa.qll
index fd785540a371..4b6ae906b823 100644
--- a/shared/ssa/codeql/ssa/Ssa.qll
+++ b/shared/ssa/codeql/ssa/Ssa.qll
@@ -4,6 +4,7 @@
  */
 
 private import codeql.util.Location
+private import codeql.util.Unit
 
 /** Provides the input specification of the SSA implementation. */
 signature module InputSig<LocationSig Location> {
@@ -1631,6 +1632,23 @@ module Make<LocationSig Location, InputSig<Location> Input> {
       )
     }
 
+    bindingset[this]
+    signature class StateSig;
+
+    module WithState<StateSig State> {
+      /**
+       * Holds if the guard `g` validates the expression `e` upon evaluating to `branch`, blocking
+       * flow in the given `state`.
+       *
+       * The expression `e` is expected to be a syntactic part of the guard `g`.
+       * For example, the guard `g` might be a call `isSafe(x)` and the expression `e`
+       * the argument `x`.
+       */
+      signature predicate guardChecksSig(
+        DfInput::Guard g, DfInput::Expr e, boolean branch, State state
+      );
+    }
+
     /**
      * Provides a set of barrier nodes for a guard that validates an expression.
      *
@@ -1638,16 +1656,38 @@ module Make<LocationSig Location, InputSig<Location> Input> {
      * in data flow and taint tracking.
      */
     module BarrierGuard<guardChecksSig/3 guardChecks> {
+      private predicate guardChecksWithState(
+        DfInput::Guard g, DfInput::Expr e, boolean branch, Unit state
+      ) {
+        guardChecks(g, e, branch) and exists(state)
+      }
+
+      private module StatefulBarrier = BarrierGuardWithState<Unit, guardChecksWithState/4>;
+
+      /** Gets a node that is safely guarded by the given guard check. */
+      pragma[nomagic]
+      Node getABarrierNode() { result = StatefulBarrier::getABarrierNode(_) }
+    }
+
+    /**
+     * Provides a set of barrier nodes for a guard that validates an expression.
+     *
+     * This is expected to be used in `isBarrier`/`isSanitizer` definitions
+     * in data flow and taint tracking.
+     */
+    module BarrierGuardWithState<StateSig State, WithState<State>::guardChecksSig/4 guardChecks> {
       pragma[nomagic]
-      private predicate guardChecksSsaDef(DfInput::Guard g, Definition def, boolean branch) {
-        guardChecks(g, DfInput::getARead(def), branch)
+      private predicate guardChecksSsaDef(
+        DfInput::Guard g, Definition def, boolean branch, State state
+      ) {
+        guardChecks(g, DfInput::getARead(def), branch, state)
       }
 
       /** Gets a node that is safely guarded by the given guard check. */
       pragma[nomagic]
-      Node getABarrierNode() {
+      Node getABarrierNode(State state) {
         exists(DfInput::Guard g, boolean branch, Definition def, BasicBlock bb |
-          guardChecksSsaDef(g, def, branch)
+          guardChecksSsaDef(g, def, branch, state)
         |
           // guard controls a read
           exists(DfInput::Expr e |

From da84889242e786e7b2bdbd844e7bfdf7cef6fab6 Mon Sep 17 00:00:00 2001
From: Geoffrey White <40627776+geoffw0@users.noreply.github.com>
Date: Thu, 3 Oct 2024 12:50:40 +0100
Subject: [PATCH 150/347] Rust: Use @diagnostic_error, @diagnostic_warning
 rather than constants.

---
 rust/ql/lib/codeql/rust/Diagnostics.qll | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/rust/ql/lib/codeql/rust/Diagnostics.qll b/rust/ql/lib/codeql/rust/Diagnostics.qll
index 8f77b64c5123..58de14b8fcf5 100644
--- a/rust/ql/lib/codeql/rust/Diagnostics.qll
+++ b/rust/ql/lib/codeql/rust/Diagnostics.qll
@@ -49,11 +49,7 @@ class Diagnostic extends @diagnostic {
 }
 
 /** A diagnostic that is error severity. */
-class ExtractionError extends Diagnostic {
-  ExtractionError() { this.getSeverity() = 40 }
-}
+class ExtractionError extends Diagnostic, @diagnostic_error { }
 
 /** A diagnostic that is warning severity. */
-class ExtractionWarning extends Diagnostic {
-  ExtractionWarning() { this.getSeverity() = 30 }
-}
+class ExtractionWarning extends Diagnostic, @diagnostic_warning { }

From 32dbdb39133c80ab29386d78cb62e96b8e68d5db Mon Sep 17 00:00:00 2001
From: Geoffrey White <40627776+geoffw0@users.noreply.github.com>
Date: Thu, 3 Oct 2024 12:50:59 +0100
Subject: [PATCH 151/347] Rust: Update summary stats .expected file.

---
 rust/ql/test/query-tests/diagnostics/SummaryStats.expected | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/rust/ql/test/query-tests/diagnostics/SummaryStats.expected b/rust/ql/test/query-tests/diagnostics/SummaryStats.expected
index cc467865b00f..8fe7ee7fb47c 100644
--- a/rust/ql/test/query-tests/diagnostics/SummaryStats.expected
+++ b/rust/ql/test/query-tests/diagnostics/SummaryStats.expected
@@ -1,7 +1,7 @@
 | Elements extracted | 210 |
 | Elements unextracted | 0 |
-| Extraction errors | 6 |
-| Extraction warnings | 0 |
+| Extraction errors | 0 |
+| Extraction warnings | 6 |
 | Files extracted - total | 6 |
 | Files extracted - with errors | 1 |
 | Files extracted - without errors | 5 |

From cd04500dd9393e613cd06b5747902c8f95ae4150 Mon Sep 17 00:00:00 2001
From: Tom Hvitved <hvitved@github.com>
Date: Thu, 3 Oct 2024 14:05:24 +0200
Subject: [PATCH 152/347] Rust: Account for variables bound in `while let`
 expressions

---
 .../rust/elements/internal/VariableImpl.qll   |   7 +
 .../test/library-tests/variables/Cfg.expected | 885 +++++++++---------
 .../variables/variables.expected              | 369 ++++----
 .../test/library-tests/variables/variables.rs |   9 +
 .../unusedentities/UnusedVariable.expected    |  15 +-
 .../test/query-tests/unusedentities/main.rs   |  27 +-
 6 files changed, 676 insertions(+), 636 deletions(-)

diff --git a/rust/ql/lib/codeql/rust/elements/internal/VariableImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/VariableImpl.qll
index 3f0cabc97b85..7a77c45fe2ae 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/VariableImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/VariableImpl.qll
@@ -218,6 +218,13 @@ module Impl {
         scope = ce.getBody() and
         scope.getLocation().hasLocationInfo(_, line, column, _, _)
       )
+      or
+      exists(WhileExpr we, LetExpr let |
+        let.getPat() = pat and
+        we.getCondition() = let and
+        scope = we.getLoopBody() and
+        scope.getLocation().hasLocationInfo(_, line, column, _, _)
+      )
     )
   }
 
diff --git a/rust/ql/test/library-tests/variables/Cfg.expected b/rust/ql/test/library-tests/variables/Cfg.expected
index 0a075ff054e3..1ae43dac402e 100644
--- a/rust/ql/test/library-tests/variables/Cfg.expected
+++ b/rust/ql/test/library-tests/variables/Cfg.expected
@@ -159,439 +159,458 @@ edges
 | variables.rs:85:5:85:17 | CallExpr | variables.rs:80:19:86:1 | BlockExpr |  |
 | variables.rs:85:5:85:18 | ExprStmt | variables.rs:85:5:85:13 | PathExpr |  |
 | variables.rs:85:15:85:16 | x5 | variables.rs:85:5:85:17 | CallExpr |  |
-| variables.rs:88:1:103:1 | enter match_pattern1 | variables.rs:89:5:89:21 | LetStmt |  |
-| variables.rs:88:1:103:1 | exit match_pattern1 (normal) | variables.rs:88:1:103:1 | exit match_pattern1 |  |
-| variables.rs:88:21:103:1 | BlockExpr | variables.rs:88:1:103:1 | exit match_pattern1 (normal) |  |
-| variables.rs:89:5:89:21 | LetStmt | variables.rs:89:14:89:17 | PathExpr |  |
-| variables.rs:89:9:89:10 | x6 | variables.rs:90:5:90:16 | LetStmt | match, no-match |
-| variables.rs:89:14:89:17 | PathExpr | variables.rs:89:19:89:19 | 5 |  |
-| variables.rs:89:14:89:20 | CallExpr | variables.rs:89:9:89:10 | x6 |  |
-| variables.rs:89:19:89:19 | 5 | variables.rs:89:14:89:20 | CallExpr |  |
-| variables.rs:90:5:90:16 | LetStmt | variables.rs:90:14:90:15 | 10 |  |
-| variables.rs:90:9:90:10 | y1 | variables.rs:92:5:100:5 | ExprStmt | match, no-match |
-| variables.rs:90:14:90:15 | 10 | variables.rs:90:9:90:10 | y1 |  |
-| variables.rs:92:5:100:5 | ExprStmt | variables.rs:92:11:92:12 | x6 |  |
-| variables.rs:92:5:100:5 | MatchExpr | variables.rs:102:5:102:18 | ExprStmt |  |
-| variables.rs:92:11:92:12 | x6 | variables.rs:93:9:93:16 | TupleStructPat |  |
-| variables.rs:93:9:93:16 | TupleStructPat | variables.rs:93:21:93:29 | PathExpr | match |
-| variables.rs:93:9:93:16 | TupleStructPat | variables.rs:94:9:94:16 | TupleStructPat | no-match |
-| variables.rs:93:21:93:29 | PathExpr | variables.rs:93:31:93:38 | "Got 50" |  |
-| variables.rs:93:21:93:39 | CallExpr | variables.rs:92:5:100:5 | MatchExpr |  |
-| variables.rs:93:31:93:38 | "Got 50" | variables.rs:93:21:93:39 | CallExpr |  |
-| variables.rs:94:9:94:16 | TupleStructPat | variables.rs:97:13:97:21 | PathExpr | match |
-| variables.rs:94:9:94:16 | TupleStructPat | variables.rs:99:9:99:12 | None | no-match |
-| variables.rs:96:9:98:9 | BlockExpr | variables.rs:92:5:100:5 | MatchExpr |  |
-| variables.rs:97:13:97:21 | PathExpr | variables.rs:97:23:97:24 | y1 |  |
-| variables.rs:97:13:97:25 | CallExpr | variables.rs:96:9:98:9 | BlockExpr |  |
-| variables.rs:97:23:97:24 | y1 | variables.rs:97:13:97:25 | CallExpr |  |
-| variables.rs:99:9:99:12 | None | variables.rs:99:17:99:25 | PathExpr | match |
-| variables.rs:99:17:99:25 | PathExpr | variables.rs:99:27:99:32 | "NONE" |  |
-| variables.rs:99:17:99:33 | CallExpr | variables.rs:92:5:100:5 | MatchExpr |  |
-| variables.rs:99:27:99:32 | "NONE" | variables.rs:99:17:99:33 | CallExpr |  |
-| variables.rs:102:5:102:13 | PathExpr | variables.rs:102:15:102:16 | y1 |  |
-| variables.rs:102:5:102:17 | CallExpr | variables.rs:88:21:103:1 | BlockExpr |  |
-| variables.rs:102:5:102:18 | ExprStmt | variables.rs:102:5:102:13 | PathExpr |  |
-| variables.rs:102:15:102:16 | y1 | variables.rs:102:5:102:17 | CallExpr |  |
-| variables.rs:105:1:130:1 | enter match_pattern2 | variables.rs:106:5:106:36 | LetStmt |  |
-| variables.rs:105:1:130:1 | exit match_pattern2 (normal) | variables.rs:105:1:130:1 | exit match_pattern2 |  |
-| variables.rs:105:21:130:1 | BlockExpr | variables.rs:105:1:130:1 | exit match_pattern2 (normal) |  |
-| variables.rs:106:5:106:36 | LetStmt | variables.rs:106:20:106:20 | 2 |  |
-| variables.rs:106:9:106:15 | numbers | variables.rs:108:5:118:5 | ExprStmt | match, no-match |
-| variables.rs:106:19:106:35 | TupleExpr | variables.rs:106:9:106:15 | numbers |  |
-| variables.rs:106:20:106:20 | 2 | variables.rs:106:23:106:23 | 4 |  |
-| variables.rs:106:23:106:23 | 4 | variables.rs:106:26:106:26 | 8 |  |
-| variables.rs:106:26:106:26 | 8 | variables.rs:106:29:106:30 | 16 |  |
-| variables.rs:106:29:106:30 | 16 | variables.rs:106:33:106:34 | 32 |  |
-| variables.rs:106:33:106:34 | 32 | variables.rs:106:19:106:35 | TupleExpr |  |
-| variables.rs:108:5:118:5 | ExprStmt | variables.rs:108:11:108:17 | numbers |  |
-| variables.rs:108:5:118:5 | MatchExpr | variables.rs:120:11:120:17 | numbers |  |
-| variables.rs:108:11:108:17 | numbers | variables.rs:109:9:113:9 | TuplePat |  |
-| variables.rs:109:9:113:9 | TuplePat | variables.rs:114:13:114:29 | ExprStmt | match |
-| variables.rs:113:14:117:9 | BlockExpr | variables.rs:108:5:118:5 | MatchExpr |  |
-| variables.rs:114:13:114:21 | PathExpr | variables.rs:114:23:114:27 | first |  |
-| variables.rs:114:13:114:28 | CallExpr | variables.rs:115:13:115:29 | ExprStmt |  |
-| variables.rs:114:13:114:29 | ExprStmt | variables.rs:114:13:114:21 | PathExpr |  |
-| variables.rs:114:23:114:27 | first | variables.rs:114:13:114:28 | CallExpr |  |
-| variables.rs:115:13:115:21 | PathExpr | variables.rs:115:23:115:27 | third |  |
-| variables.rs:115:13:115:28 | CallExpr | variables.rs:116:13:116:29 | ExprStmt |  |
-| variables.rs:115:13:115:29 | ExprStmt | variables.rs:115:13:115:21 | PathExpr |  |
-| variables.rs:115:23:115:27 | third | variables.rs:115:13:115:28 | CallExpr |  |
-| variables.rs:116:13:116:21 | PathExpr | variables.rs:116:23:116:27 | fifth |  |
-| variables.rs:116:13:116:28 | CallExpr | variables.rs:113:14:117:9 | BlockExpr |  |
-| variables.rs:116:13:116:29 | ExprStmt | variables.rs:116:13:116:21 | PathExpr |  |
-| variables.rs:116:23:116:27 | fifth | variables.rs:116:13:116:28 | CallExpr |  |
-| variables.rs:120:5:129:5 | MatchExpr | variables.rs:105:21:130:1 | BlockExpr |  |
-| variables.rs:120:11:120:17 | numbers | variables.rs:121:9:125:9 | TuplePat |  |
-| variables.rs:121:9:125:9 | TuplePat | variables.rs:126:13:126:29 | ExprStmt | match |
-| variables.rs:125:14:128:9 | BlockExpr | variables.rs:120:5:129:5 | MatchExpr |  |
-| variables.rs:126:13:126:21 | PathExpr | variables.rs:126:23:126:27 | first |  |
-| variables.rs:126:13:126:28 | CallExpr | variables.rs:127:13:127:28 | ExprStmt |  |
-| variables.rs:126:13:126:29 | ExprStmt | variables.rs:126:13:126:21 | PathExpr |  |
-| variables.rs:126:23:126:27 | first | variables.rs:126:13:126:28 | CallExpr |  |
-| variables.rs:127:13:127:21 | PathExpr | variables.rs:127:23:127:26 | last |  |
-| variables.rs:127:13:127:27 | CallExpr | variables.rs:125:14:128:9 | BlockExpr |  |
-| variables.rs:127:13:127:28 | ExprStmt | variables.rs:127:13:127:21 | PathExpr |  |
-| variables.rs:127:23:127:26 | last | variables.rs:127:13:127:27 | CallExpr |  |
-| variables.rs:132:1:140:1 | enter match_pattern3 | variables.rs:133:5:133:38 | LetStmt |  |
-| variables.rs:132:1:140:1 | exit match_pattern3 (normal) | variables.rs:132:1:140:1 | exit match_pattern3 |  |
-| variables.rs:132:21:140:1 | BlockExpr | variables.rs:132:1:140:1 | exit match_pattern3 (normal) |  |
-| variables.rs:133:5:133:38 | LetStmt | variables.rs:133:25:133:27 | "x" |  |
-| variables.rs:133:9:133:10 | p2 | variables.rs:135:11:135:12 | p2 | match, no-match |
-| variables.rs:133:14:133:37 | RecordExpr | variables.rs:133:9:133:10 | p2 |  |
-| variables.rs:133:25:133:27 | "x" | variables.rs:133:33:133:35 | "y" |  |
-| variables.rs:133:33:133:35 | "y" | variables.rs:133:14:133:37 | RecordExpr |  |
-| variables.rs:135:5:139:5 | MatchExpr | variables.rs:132:21:140:1 | BlockExpr |  |
-| variables.rs:135:11:135:12 | p2 | variables.rs:136:9:138:9 | RecordPat |  |
-| variables.rs:136:9:138:9 | RecordPat | variables.rs:138:14:138:22 | PathExpr | match |
-| variables.rs:138:14:138:22 | PathExpr | variables.rs:138:24:138:25 | x7 |  |
-| variables.rs:138:14:138:26 | CallExpr | variables.rs:135:5:139:5 | MatchExpr |  |
-| variables.rs:138:24:138:25 | x7 | variables.rs:138:14:138:26 | CallExpr |  |
-| variables.rs:146:1:159:1 | enter match_pattern4 | variables.rs:147:5:147:39 | LetStmt |  |
-| variables.rs:146:1:159:1 | exit match_pattern4 (normal) | variables.rs:146:1:159:1 | exit match_pattern4 |  |
-| variables.rs:146:21:159:1 | BlockExpr | variables.rs:146:1:159:1 | exit match_pattern4 (normal) |  |
-| variables.rs:147:5:147:39 | LetStmt | variables.rs:147:36:147:36 | 0 |  |
-| variables.rs:147:9:147:11 | msg | variables.rs:149:11:149:13 | msg | match, no-match |
-| variables.rs:147:15:147:38 | RecordExpr | variables.rs:147:9:147:11 | msg |  |
-| variables.rs:147:36:147:36 | 0 | variables.rs:147:15:147:38 | RecordExpr |  |
-| variables.rs:149:5:158:5 | MatchExpr | variables.rs:146:21:159:1 | BlockExpr |  |
-| variables.rs:149:11:149:13 | msg | variables.rs:150:9:152:9 | RecordPat |  |
-| variables.rs:150:9:152:9 | RecordPat | variables.rs:152:14:152:22 | PathExpr | match |
-| variables.rs:150:9:152:9 | RecordPat | variables.rs:153:9:153:38 | RecordPat | no-match |
-| variables.rs:152:14:152:22 | PathExpr | variables.rs:152:24:152:34 | id_variable |  |
-| variables.rs:152:14:152:35 | CallExpr | variables.rs:149:5:158:5 | MatchExpr |  |
-| variables.rs:152:24:152:34 | id_variable | variables.rs:152:14:152:35 | CallExpr |  |
-| variables.rs:153:9:153:38 | RecordPat | variables.rs:154:13:154:52 | MacroExpr | match |
-| variables.rs:153:9:153:38 | RecordPat | variables.rs:156:9:156:29 | RecordPat | no-match |
-| variables.rs:153:43:155:9 | BlockExpr | variables.rs:149:5:158:5 | MatchExpr |  |
-| variables.rs:154:13:154:52 | MacroExpr | variables.rs:153:43:155:9 | BlockExpr |  |
-| variables.rs:156:9:156:29 | RecordPat | variables.rs:157:13:157:21 | PathExpr | match |
-| variables.rs:157:13:157:21 | PathExpr | variables.rs:157:23:157:24 | id |  |
-| variables.rs:157:13:157:25 | CallExpr | variables.rs:149:5:158:5 | MatchExpr |  |
-| variables.rs:157:23:157:24 | id | variables.rs:157:13:157:25 | CallExpr |  |
-| variables.rs:166:1:172:1 | enter match_pattern5 | variables.rs:167:5:167:34 | LetStmt |  |
-| variables.rs:166:1:172:1 | exit match_pattern5 (normal) | variables.rs:166:1:172:1 | exit match_pattern5 |  |
-| variables.rs:166:21:172:1 | BlockExpr | variables.rs:166:1:172:1 | exit match_pattern5 (normal) |  |
-| variables.rs:167:5:167:34 | LetStmt | variables.rs:167:18:167:29 | PathExpr |  |
-| variables.rs:167:9:167:14 | either | variables.rs:168:11:168:16 | either | match, no-match |
-| variables.rs:167:18:167:29 | PathExpr | variables.rs:167:31:167:32 | 32 |  |
-| variables.rs:167:18:167:33 | CallExpr | variables.rs:167:9:167:14 | either |  |
-| variables.rs:167:31:167:32 | 32 | variables.rs:167:18:167:33 | CallExpr |  |
-| variables.rs:168:5:171:5 | MatchExpr | variables.rs:166:21:172:1 | BlockExpr |  |
-| variables.rs:168:11:168:16 | either | variables.rs:169:9:169:44 | OrPat |  |
-| variables.rs:169:9:169:44 | OrPat | variables.rs:170:16:170:24 | PathExpr | match |
-| variables.rs:170:16:170:24 | PathExpr | variables.rs:170:26:170:27 | a3 |  |
-| variables.rs:170:16:170:28 | CallExpr | variables.rs:168:5:171:5 | MatchExpr |  |
-| variables.rs:170:26:170:27 | a3 | variables.rs:170:16:170:28 | CallExpr |  |
-| variables.rs:180:1:194:1 | enter match_pattern6 | variables.rs:181:5:181:37 | LetStmt |  |
-| variables.rs:180:1:194:1 | exit match_pattern6 (normal) | variables.rs:180:1:194:1 | exit match_pattern6 |  |
-| variables.rs:180:21:194:1 | BlockExpr | variables.rs:180:1:194:1 | exit match_pattern6 (normal) |  |
-| variables.rs:181:5:181:37 | LetStmt | variables.rs:181:14:181:32 | PathExpr |  |
-| variables.rs:181:9:181:10 | tv | variables.rs:182:5:185:5 | ExprStmt | match, no-match |
-| variables.rs:181:14:181:32 | PathExpr | variables.rs:181:34:181:35 | 62 |  |
-| variables.rs:181:14:181:36 | CallExpr | variables.rs:181:9:181:10 | tv |  |
-| variables.rs:181:34:181:35 | 62 | variables.rs:181:14:181:36 | CallExpr |  |
-| variables.rs:182:5:185:5 | ExprStmt | variables.rs:182:11:182:12 | tv |  |
-| variables.rs:182:5:185:5 | MatchExpr | variables.rs:186:5:189:5 | ExprStmt |  |
-| variables.rs:182:11:182:12 | tv | variables.rs:183:9:183:81 | OrPat |  |
-| variables.rs:183:9:183:81 | OrPat | variables.rs:184:16:184:24 | PathExpr | match |
-| variables.rs:184:16:184:24 | PathExpr | variables.rs:184:26:184:27 | a4 |  |
-| variables.rs:184:16:184:28 | CallExpr | variables.rs:182:5:185:5 | MatchExpr |  |
-| variables.rs:184:26:184:27 | a4 | variables.rs:184:16:184:28 | CallExpr |  |
-| variables.rs:186:5:189:5 | ExprStmt | variables.rs:186:11:186:12 | tv |  |
-| variables.rs:186:5:189:5 | MatchExpr | variables.rs:190:11:190:12 | tv |  |
-| variables.rs:186:11:186:12 | tv | variables.rs:187:9:187:83 | OrPat |  |
-| variables.rs:187:9:187:83 | OrPat | variables.rs:188:16:188:24 | PathExpr | match |
-| variables.rs:188:16:188:24 | PathExpr | variables.rs:188:26:188:27 | a5 |  |
-| variables.rs:188:16:188:28 | CallExpr | variables.rs:186:5:189:5 | MatchExpr |  |
-| variables.rs:188:26:188:27 | a5 | variables.rs:188:16:188:28 | CallExpr |  |
-| variables.rs:190:5:193:5 | MatchExpr | variables.rs:180:21:194:1 | BlockExpr |  |
-| variables.rs:190:11:190:12 | tv | variables.rs:191:9:191:83 | OrPat |  |
-| variables.rs:191:9:191:83 | OrPat | variables.rs:192:16:192:24 | PathExpr | match |
-| variables.rs:192:16:192:24 | PathExpr | variables.rs:192:26:192:27 | a6 |  |
-| variables.rs:192:16:192:28 | CallExpr | variables.rs:190:5:193:5 | MatchExpr |  |
-| variables.rs:192:26:192:27 | a6 | variables.rs:192:16:192:28 | CallExpr |  |
-| variables.rs:196:1:204:1 | enter match_pattern7 | variables.rs:197:5:197:34 | LetStmt |  |
-| variables.rs:196:1:204:1 | exit match_pattern7 (normal) | variables.rs:196:1:204:1 | exit match_pattern7 |  |
-| variables.rs:196:21:204:1 | BlockExpr | variables.rs:196:1:204:1 | exit match_pattern7 (normal) |  |
-| variables.rs:197:5:197:34 | LetStmt | variables.rs:197:18:197:29 | PathExpr |  |
-| variables.rs:197:9:197:14 | either | variables.rs:198:11:198:16 | either | match, no-match |
-| variables.rs:197:18:197:29 | PathExpr | variables.rs:197:31:197:32 | 32 |  |
-| variables.rs:197:18:197:33 | CallExpr | variables.rs:197:9:197:14 | either |  |
-| variables.rs:197:31:197:32 | 32 | variables.rs:197:18:197:33 | CallExpr |  |
-| variables.rs:198:5:203:5 | MatchExpr | variables.rs:196:21:204:1 | BlockExpr |  |
-| variables.rs:198:11:198:16 | either | variables.rs:199:9:199:44 | OrPat |  |
-| variables.rs:199:9:199:44 | OrPat | variables.rs:200:16:200:17 | a7 | match |
-| variables.rs:199:9:199:44 | OrPat | variables.rs:202:9:202:9 | WildcardPat | no-match |
-| variables.rs:200:16:200:17 | a7 | variables.rs:200:21:200:21 | 0 |  |
-| variables.rs:200:16:200:21 | ... > ... | variables.rs:201:16:201:24 | PathExpr | true |
-| variables.rs:200:16:200:21 | ... > ... | variables.rs:202:9:202:9 | WildcardPat | false |
-| variables.rs:200:21:200:21 | 0 | variables.rs:200:16:200:21 | ... > ... |  |
-| variables.rs:201:16:201:24 | PathExpr | variables.rs:201:26:201:27 | a7 |  |
-| variables.rs:201:16:201:28 | CallExpr | variables.rs:198:5:203:5 | MatchExpr |  |
-| variables.rs:201:26:201:27 | a7 | variables.rs:201:16:201:28 | CallExpr |  |
-| variables.rs:202:9:202:9 | WildcardPat | variables.rs:202:14:202:15 | TupleExpr | match |
-| variables.rs:202:14:202:15 | TupleExpr | variables.rs:198:5:203:5 | MatchExpr |  |
-| variables.rs:206:1:221:1 | enter match_pattern8 | variables.rs:207:5:207:34 | LetStmt |  |
-| variables.rs:206:1:221:1 | exit match_pattern8 (normal) | variables.rs:206:1:221:1 | exit match_pattern8 |  |
-| variables.rs:206:21:221:1 | BlockExpr | variables.rs:206:1:221:1 | exit match_pattern8 (normal) |  |
-| variables.rs:207:5:207:34 | LetStmt | variables.rs:207:18:207:29 | PathExpr |  |
-| variables.rs:207:9:207:14 | either | variables.rs:209:11:209:16 | either | match, no-match |
-| variables.rs:207:18:207:29 | PathExpr | variables.rs:207:31:207:32 | 32 |  |
-| variables.rs:207:18:207:33 | CallExpr | variables.rs:207:9:207:14 | either |  |
-| variables.rs:207:31:207:32 | 32 | variables.rs:207:18:207:33 | CallExpr |  |
-| variables.rs:209:5:220:5 | MatchExpr | variables.rs:206:21:221:1 | BlockExpr |  |
-| variables.rs:209:11:209:16 | either | variables.rs:210:9:211:52 | e |  |
-| variables.rs:210:9:211:52 | e | variables.rs:213:13:213:27 | ExprStmt | match |
-| variables.rs:210:9:211:52 | e | variables.rs:219:9:219:9 | WildcardPat | no-match |
-| variables.rs:212:12:218:9 | BlockExpr | variables.rs:209:5:220:5 | MatchExpr |  |
-| variables.rs:213:13:213:21 | PathExpr | variables.rs:213:23:213:25 | a11 |  |
-| variables.rs:213:13:213:26 | CallExpr | variables.rs:214:16:215:15 | LetExpr |  |
-| variables.rs:213:13:213:27 | ExprStmt | variables.rs:213:13:213:21 | PathExpr |  |
-| variables.rs:213:23:213:25 | a11 | variables.rs:213:13:213:26 | CallExpr |  |
-| variables.rs:214:13:217:13 | IfExpr | variables.rs:212:12:218:9 | BlockExpr |  |
-| variables.rs:214:16:215:15 | LetExpr | variables.rs:214:20:214:36 | TupleStructPat |  |
-| variables.rs:214:20:214:36 | TupleStructPat | variables.rs:214:13:217:13 | IfExpr | no-match |
-| variables.rs:214:20:214:36 | TupleStructPat | variables.rs:216:17:216:32 | ExprStmt | match |
-| variables.rs:215:17:217:13 | BlockExpr | variables.rs:214:13:217:13 | IfExpr |  |
-| variables.rs:216:17:216:25 | PathExpr | variables.rs:216:28:216:30 | a12 |  |
-| variables.rs:216:17:216:31 | CallExpr | variables.rs:215:17:217:13 | BlockExpr |  |
-| variables.rs:216:17:216:32 | ExprStmt | variables.rs:216:17:216:25 | PathExpr |  |
-| variables.rs:216:27:216:30 | * ... | variables.rs:216:17:216:31 | CallExpr |  |
-| variables.rs:216:28:216:30 | a12 | variables.rs:216:27:216:30 | * ... |  |
-| variables.rs:219:9:219:9 | WildcardPat | variables.rs:219:14:219:15 | TupleExpr | match |
-| variables.rs:219:14:219:15 | TupleExpr | variables.rs:209:5:220:5 | MatchExpr |  |
-| variables.rs:230:1:236:1 | enter match_pattern9 | variables.rs:231:5:231:36 | LetStmt |  |
-| variables.rs:230:1:236:1 | exit match_pattern9 (normal) | variables.rs:230:1:236:1 | exit match_pattern9 |  |
-| variables.rs:230:21:236:1 | BlockExpr | variables.rs:230:1:236:1 | exit match_pattern9 (normal) |  |
-| variables.rs:231:5:231:36 | LetStmt | variables.rs:231:14:231:31 | PathExpr |  |
-| variables.rs:231:9:231:10 | fv | variables.rs:232:11:232:12 | fv | match, no-match |
-| variables.rs:231:14:231:31 | PathExpr | variables.rs:231:33:231:34 | 62 |  |
-| variables.rs:231:14:231:35 | CallExpr | variables.rs:231:9:231:10 | fv |  |
-| variables.rs:231:33:231:34 | 62 | variables.rs:231:14:231:35 | CallExpr |  |
-| variables.rs:232:5:235:5 | MatchExpr | variables.rs:230:21:236:1 | BlockExpr |  |
-| variables.rs:232:11:232:12 | fv | variables.rs:233:9:233:109 | OrPat |  |
-| variables.rs:233:9:233:109 | OrPat | variables.rs:234:16:234:24 | PathExpr | match |
-| variables.rs:234:16:234:24 | PathExpr | variables.rs:234:26:234:28 | a13 |  |
-| variables.rs:234:16:234:29 | CallExpr | variables.rs:232:5:235:5 | MatchExpr |  |
-| variables.rs:234:26:234:28 | a13 | variables.rs:234:16:234:29 | CallExpr |  |
-| variables.rs:238:1:247:1 | enter param_pattern1 | variables.rs:244:5:244:18 | ExprStmt |  |
-| variables.rs:238:1:247:1 | exit param_pattern1 (normal) | variables.rs:238:1:247:1 | exit param_pattern1 |  |
-| variables.rs:243:28:247:1 | BlockExpr | variables.rs:238:1:247:1 | exit param_pattern1 (normal) |  |
-| variables.rs:244:5:244:13 | PathExpr | variables.rs:244:15:244:16 | a8 |  |
-| variables.rs:244:5:244:17 | CallExpr | variables.rs:245:5:245:18 | ExprStmt |  |
-| variables.rs:244:5:244:18 | ExprStmt | variables.rs:244:5:244:13 | PathExpr |  |
-| variables.rs:244:15:244:16 | a8 | variables.rs:244:5:244:17 | CallExpr |  |
-| variables.rs:245:5:245:13 | PathExpr | variables.rs:245:15:245:16 | b3 |  |
-| variables.rs:245:5:245:17 | CallExpr | variables.rs:246:5:246:18 | ExprStmt |  |
-| variables.rs:245:5:245:18 | ExprStmt | variables.rs:245:5:245:13 | PathExpr |  |
-| variables.rs:245:15:245:16 | b3 | variables.rs:245:5:245:17 | CallExpr |  |
-| variables.rs:246:5:246:13 | PathExpr | variables.rs:246:15:246:16 | c1 |  |
-| variables.rs:246:5:246:17 | CallExpr | variables.rs:243:28:247:1 | BlockExpr |  |
-| variables.rs:246:5:246:18 | ExprStmt | variables.rs:246:5:246:13 | PathExpr |  |
-| variables.rs:246:15:246:16 | c1 | variables.rs:246:5:246:17 | CallExpr |  |
-| variables.rs:249:1:253:1 | enter param_pattern2 | variables.rs:252:5:252:18 | ExprStmt |  |
-| variables.rs:249:1:253:1 | exit param_pattern2 (normal) | variables.rs:249:1:253:1 | exit param_pattern2 |  |
-| variables.rs:251:9:253:1 | BlockExpr | variables.rs:249:1:253:1 | exit param_pattern2 (normal) |  |
-| variables.rs:252:5:252:13 | PathExpr | variables.rs:252:15:252:16 | a9 |  |
-| variables.rs:252:5:252:17 | CallExpr | variables.rs:251:9:253:1 | BlockExpr |  |
-| variables.rs:252:5:252:18 | ExprStmt | variables.rs:252:5:252:13 | PathExpr |  |
-| variables.rs:252:15:252:16 | a9 | variables.rs:252:5:252:17 | CallExpr |  |
-| variables.rs:255:1:290:1 | enter destruct_assignment | variables.rs:256:5:260:18 | LetStmt |  |
-| variables.rs:255:1:290:1 | exit destruct_assignment (normal) | variables.rs:255:1:290:1 | exit destruct_assignment |  |
-| variables.rs:255:26:290:1 | BlockExpr | variables.rs:255:1:290:1 | exit destruct_assignment (normal) |  |
-| variables.rs:256:5:260:18 | LetStmt | variables.rs:260:10:260:10 | 1 |  |
-| variables.rs:256:9:260:5 | TuplePat | variables.rs:261:5:261:19 | ExprStmt | match |
-| variables.rs:260:9:260:17 | TupleExpr | variables.rs:256:9:260:5 | TuplePat |  |
-| variables.rs:260:10:260:10 | 1 | variables.rs:260:13:260:13 | 2 |  |
-| variables.rs:260:13:260:13 | 2 | variables.rs:260:16:260:16 | 3 |  |
-| variables.rs:260:16:260:16 | 3 | variables.rs:260:9:260:17 | TupleExpr |  |
-| variables.rs:261:5:261:13 | PathExpr | variables.rs:261:15:261:17 | a10 |  |
-| variables.rs:261:5:261:18 | CallExpr | variables.rs:262:5:262:18 | ExprStmt |  |
-| variables.rs:261:5:261:19 | ExprStmt | variables.rs:261:5:261:13 | PathExpr |  |
-| variables.rs:261:15:261:17 | a10 | variables.rs:261:5:261:18 | CallExpr |  |
-| variables.rs:262:5:262:13 | PathExpr | variables.rs:262:15:262:16 | b4 |  |
-| variables.rs:262:5:262:17 | CallExpr | variables.rs:263:5:263:18 | ExprStmt |  |
-| variables.rs:262:5:262:18 | ExprStmt | variables.rs:262:5:262:13 | PathExpr |  |
-| variables.rs:262:15:262:16 | b4 | variables.rs:262:5:262:17 | CallExpr |  |
-| variables.rs:263:5:263:13 | PathExpr | variables.rs:263:15:263:16 | c2 |  |
-| variables.rs:263:5:263:17 | CallExpr | variables.rs:265:5:273:6 | ExprStmt |  |
-| variables.rs:263:5:263:18 | ExprStmt | variables.rs:263:5:263:13 | PathExpr |  |
-| variables.rs:263:15:263:16 | c2 | variables.rs:263:5:263:17 | CallExpr |  |
-| variables.rs:265:5:269:5 | TupleExpr | variables.rs:270:9:270:11 | a10 |  |
-| variables.rs:265:5:273:5 | ... = ... | variables.rs:274:5:274:19 | ExprStmt |  |
-| variables.rs:265:5:273:6 | ExprStmt | variables.rs:266:9:266:10 | c2 |  |
-| variables.rs:266:9:266:10 | c2 | variables.rs:267:9:267:10 | b4 |  |
-| variables.rs:267:9:267:10 | b4 | variables.rs:268:9:268:11 | a10 |  |
-| variables.rs:268:9:268:11 | a10 | variables.rs:265:5:269:5 | TupleExpr |  |
-| variables.rs:269:9:273:5 | TupleExpr | variables.rs:265:5:273:5 | ... = ... |  |
-| variables.rs:270:9:270:11 | a10 | variables.rs:271:9:271:10 | b4 |  |
-| variables.rs:271:9:271:10 | b4 | variables.rs:272:9:272:10 | c2 |  |
-| variables.rs:272:9:272:10 | c2 | variables.rs:269:9:273:5 | TupleExpr |  |
-| variables.rs:274:5:274:13 | PathExpr | variables.rs:274:15:274:17 | a10 |  |
-| variables.rs:274:5:274:18 | CallExpr | variables.rs:275:5:275:18 | ExprStmt |  |
-| variables.rs:274:5:274:19 | ExprStmt | variables.rs:274:5:274:13 | PathExpr |  |
-| variables.rs:274:15:274:17 | a10 | variables.rs:274:5:274:18 | CallExpr |  |
-| variables.rs:275:5:275:13 | PathExpr | variables.rs:275:15:275:16 | b4 |  |
-| variables.rs:275:5:275:17 | CallExpr | variables.rs:276:5:276:18 | ExprStmt |  |
-| variables.rs:275:5:275:18 | ExprStmt | variables.rs:275:5:275:13 | PathExpr |  |
-| variables.rs:275:15:275:16 | b4 | variables.rs:275:5:275:17 | CallExpr |  |
-| variables.rs:276:5:276:13 | PathExpr | variables.rs:276:15:276:16 | c2 |  |
-| variables.rs:276:5:276:17 | CallExpr | variables.rs:278:5:286:5 | ExprStmt |  |
-| variables.rs:276:5:276:18 | ExprStmt | variables.rs:276:5:276:13 | PathExpr |  |
-| variables.rs:276:15:276:16 | c2 | variables.rs:276:5:276:17 | CallExpr |  |
-| variables.rs:278:5:286:5 | ExprStmt | variables.rs:278:12:278:12 | 4 |  |
-| variables.rs:278:5:286:5 | MatchExpr | variables.rs:288:5:288:19 | ExprStmt |  |
-| variables.rs:278:11:278:16 | TupleExpr | variables.rs:279:9:282:9 | TuplePat |  |
-| variables.rs:278:12:278:12 | 4 | variables.rs:278:15:278:15 | 5 |  |
-| variables.rs:278:15:278:15 | 5 | variables.rs:278:11:278:16 | TupleExpr |  |
-| variables.rs:279:9:282:9 | TuplePat | variables.rs:283:13:283:27 | ExprStmt | match |
-| variables.rs:282:14:285:9 | BlockExpr | variables.rs:278:5:286:5 | MatchExpr |  |
-| variables.rs:283:13:283:21 | PathExpr | variables.rs:283:23:283:25 | a10 |  |
-| variables.rs:283:13:283:26 | CallExpr | variables.rs:284:13:284:26 | ExprStmt |  |
-| variables.rs:283:13:283:27 | ExprStmt | variables.rs:283:13:283:21 | PathExpr |  |
-| variables.rs:283:23:283:25 | a10 | variables.rs:283:13:283:26 | CallExpr |  |
-| variables.rs:284:13:284:21 | PathExpr | variables.rs:284:23:284:24 | b4 |  |
-| variables.rs:284:13:284:25 | CallExpr | variables.rs:282:14:285:9 | BlockExpr |  |
-| variables.rs:284:13:284:26 | ExprStmt | variables.rs:284:13:284:21 | PathExpr |  |
-| variables.rs:284:23:284:24 | b4 | variables.rs:284:13:284:25 | CallExpr |  |
-| variables.rs:288:5:288:13 | PathExpr | variables.rs:288:15:288:17 | a10 |  |
-| variables.rs:288:5:288:18 | CallExpr | variables.rs:289:5:289:18 | ExprStmt |  |
-| variables.rs:288:5:288:19 | ExprStmt | variables.rs:288:5:288:13 | PathExpr |  |
-| variables.rs:288:15:288:17 | a10 | variables.rs:288:5:288:18 | CallExpr |  |
-| variables.rs:289:5:289:13 | PathExpr | variables.rs:289:15:289:16 | b4 |  |
-| variables.rs:289:5:289:17 | CallExpr | variables.rs:255:26:290:1 | BlockExpr |  |
-| variables.rs:289:5:289:18 | ExprStmt | variables.rs:289:5:289:13 | PathExpr |  |
-| variables.rs:289:15:289:16 | b4 | variables.rs:289:5:289:17 | CallExpr |  |
-| variables.rs:292:1:307:1 | enter closure_variable | variables.rs:293:5:295:10 | LetStmt |  |
-| variables.rs:292:1:307:1 | exit closure_variable (normal) | variables.rs:292:1:307:1 | exit closure_variable |  |
-| variables.rs:292:23:307:1 | BlockExpr | variables.rs:292:1:307:1 | exit closure_variable (normal) |  |
-| variables.rs:293:5:295:10 | LetStmt | variables.rs:294:9:295:9 | ClosureExpr |  |
-| variables.rs:293:9:293:23 | example_closure | variables.rs:296:5:297:27 | LetStmt | match, no-match |
-| variables.rs:294:9:295:9 | ClosureExpr | variables.rs:293:9:293:23 | example_closure |  |
-| variables.rs:294:9:295:9 | enter ClosureExpr | variables.rs:295:9:295:9 | x |  |
-| variables.rs:294:9:295:9 | exit ClosureExpr (normal) | variables.rs:294:9:295:9 | exit ClosureExpr |  |
-| variables.rs:295:9:295:9 | x | variables.rs:294:9:295:9 | exit ClosureExpr (normal) |  |
-| variables.rs:296:5:297:27 | LetStmt | variables.rs:297:9:297:23 | example_closure |  |
-| variables.rs:296:9:296:10 | n1 | variables.rs:298:5:298:18 | ExprStmt | match, no-match |
-| variables.rs:297:9:297:23 | example_closure | variables.rs:297:25:297:25 | 5 |  |
-| variables.rs:297:9:297:26 | CallExpr | variables.rs:296:9:296:10 | n1 |  |
-| variables.rs:297:25:297:25 | 5 | variables.rs:297:9:297:26 | CallExpr |  |
-| variables.rs:298:5:298:13 | PathExpr | variables.rs:298:15:298:16 | n1 |  |
-| variables.rs:298:5:298:17 | CallExpr | variables.rs:300:5:300:25 | ExprStmt |  |
+| variables.rs:88:1:95:1 | enter let_pattern5 | variables.rs:89:5:89:42 | LetStmt |  |
+| variables.rs:88:1:95:1 | exit let_pattern5 (normal) | variables.rs:88:1:95:1 | exit let_pattern5 |  |
+| variables.rs:88:19:95:1 | BlockExpr | variables.rs:88:1:95:1 | exit let_pattern5 (normal) |  |
+| variables.rs:89:5:89:42 | LetStmt | variables.rs:89:14:89:17 | PathExpr |  |
+| variables.rs:89:9:89:10 | s1 | variables.rs:91:11:92:12 | LetExpr | match, no-match |
+| variables.rs:89:14:89:17 | PathExpr | variables.rs:89:19:89:30 | PathExpr |  |
+| variables.rs:89:14:89:41 | CallExpr | variables.rs:89:9:89:10 | s1 |  |
+| variables.rs:89:19:89:30 | PathExpr | variables.rs:89:32:89:39 | "Hello!" |  |
+| variables.rs:89:19:89:40 | CallExpr | variables.rs:89:14:89:41 | CallExpr |  |
+| variables.rs:89:32:89:39 | "Hello!" | variables.rs:89:19:89:40 | CallExpr |  |
+| variables.rs:91:5:94:5 | WhileExpr | variables.rs:88:19:95:1 | BlockExpr |  |
+| variables.rs:91:11:92:12 | LetExpr | variables.rs:91:15:91:26 | TupleStructPat |  |
+| variables.rs:91:15:91:26 | TupleStructPat | variables.rs:91:5:94:5 | WhileExpr | no-match |
+| variables.rs:91:15:91:26 | TupleStructPat | variables.rs:93:9:93:22 | ExprStmt | match |
+| variables.rs:92:14:94:5 | BlockExpr | variables.rs:91:11:92:12 | LetExpr |  |
+| variables.rs:93:9:93:17 | PathExpr | variables.rs:93:19:93:20 | s2 |  |
+| variables.rs:93:9:93:21 | CallExpr | variables.rs:92:14:94:5 | BlockExpr |  |
+| variables.rs:93:9:93:22 | ExprStmt | variables.rs:93:9:93:17 | PathExpr |  |
+| variables.rs:93:19:93:20 | s2 | variables.rs:93:9:93:21 | CallExpr |  |
+| variables.rs:97:1:112:1 | enter match_pattern1 | variables.rs:98:5:98:21 | LetStmt |  |
+| variables.rs:97:1:112:1 | exit match_pattern1 (normal) | variables.rs:97:1:112:1 | exit match_pattern1 |  |
+| variables.rs:97:21:112:1 | BlockExpr | variables.rs:97:1:112:1 | exit match_pattern1 (normal) |  |
+| variables.rs:98:5:98:21 | LetStmt | variables.rs:98:14:98:17 | PathExpr |  |
+| variables.rs:98:9:98:10 | x6 | variables.rs:99:5:99:16 | LetStmt | match, no-match |
+| variables.rs:98:14:98:17 | PathExpr | variables.rs:98:19:98:19 | 5 |  |
+| variables.rs:98:14:98:20 | CallExpr | variables.rs:98:9:98:10 | x6 |  |
+| variables.rs:98:19:98:19 | 5 | variables.rs:98:14:98:20 | CallExpr |  |
+| variables.rs:99:5:99:16 | LetStmt | variables.rs:99:14:99:15 | 10 |  |
+| variables.rs:99:9:99:10 | y1 | variables.rs:101:5:109:5 | ExprStmt | match, no-match |
+| variables.rs:99:14:99:15 | 10 | variables.rs:99:9:99:10 | y1 |  |
+| variables.rs:101:5:109:5 | ExprStmt | variables.rs:101:11:101:12 | x6 |  |
+| variables.rs:101:5:109:5 | MatchExpr | variables.rs:111:5:111:18 | ExprStmt |  |
+| variables.rs:101:11:101:12 | x6 | variables.rs:102:9:102:16 | TupleStructPat |  |
+| variables.rs:102:9:102:16 | TupleStructPat | variables.rs:102:21:102:29 | PathExpr | match |
+| variables.rs:102:9:102:16 | TupleStructPat | variables.rs:103:9:103:16 | TupleStructPat | no-match |
+| variables.rs:102:21:102:29 | PathExpr | variables.rs:102:31:102:38 | "Got 50" |  |
+| variables.rs:102:21:102:39 | CallExpr | variables.rs:101:5:109:5 | MatchExpr |  |
+| variables.rs:102:31:102:38 | "Got 50" | variables.rs:102:21:102:39 | CallExpr |  |
+| variables.rs:103:9:103:16 | TupleStructPat | variables.rs:106:13:106:21 | PathExpr | match |
+| variables.rs:103:9:103:16 | TupleStructPat | variables.rs:108:9:108:12 | None | no-match |
+| variables.rs:105:9:107:9 | BlockExpr | variables.rs:101:5:109:5 | MatchExpr |  |
+| variables.rs:106:13:106:21 | PathExpr | variables.rs:106:23:106:24 | y1 |  |
+| variables.rs:106:13:106:25 | CallExpr | variables.rs:105:9:107:9 | BlockExpr |  |
+| variables.rs:106:23:106:24 | y1 | variables.rs:106:13:106:25 | CallExpr |  |
+| variables.rs:108:9:108:12 | None | variables.rs:108:17:108:25 | PathExpr | match |
+| variables.rs:108:17:108:25 | PathExpr | variables.rs:108:27:108:32 | "NONE" |  |
+| variables.rs:108:17:108:33 | CallExpr | variables.rs:101:5:109:5 | MatchExpr |  |
+| variables.rs:108:27:108:32 | "NONE" | variables.rs:108:17:108:33 | CallExpr |  |
+| variables.rs:111:5:111:13 | PathExpr | variables.rs:111:15:111:16 | y1 |  |
+| variables.rs:111:5:111:17 | CallExpr | variables.rs:97:21:112:1 | BlockExpr |  |
+| variables.rs:111:5:111:18 | ExprStmt | variables.rs:111:5:111:13 | PathExpr |  |
+| variables.rs:111:15:111:16 | y1 | variables.rs:111:5:111:17 | CallExpr |  |
+| variables.rs:114:1:139:1 | enter match_pattern2 | variables.rs:115:5:115:36 | LetStmt |  |
+| variables.rs:114:1:139:1 | exit match_pattern2 (normal) | variables.rs:114:1:139:1 | exit match_pattern2 |  |
+| variables.rs:114:21:139:1 | BlockExpr | variables.rs:114:1:139:1 | exit match_pattern2 (normal) |  |
+| variables.rs:115:5:115:36 | LetStmt | variables.rs:115:20:115:20 | 2 |  |
+| variables.rs:115:9:115:15 | numbers | variables.rs:117:5:127:5 | ExprStmt | match, no-match |
+| variables.rs:115:19:115:35 | TupleExpr | variables.rs:115:9:115:15 | numbers |  |
+| variables.rs:115:20:115:20 | 2 | variables.rs:115:23:115:23 | 4 |  |
+| variables.rs:115:23:115:23 | 4 | variables.rs:115:26:115:26 | 8 |  |
+| variables.rs:115:26:115:26 | 8 | variables.rs:115:29:115:30 | 16 |  |
+| variables.rs:115:29:115:30 | 16 | variables.rs:115:33:115:34 | 32 |  |
+| variables.rs:115:33:115:34 | 32 | variables.rs:115:19:115:35 | TupleExpr |  |
+| variables.rs:117:5:127:5 | ExprStmt | variables.rs:117:11:117:17 | numbers |  |
+| variables.rs:117:5:127:5 | MatchExpr | variables.rs:129:11:129:17 | numbers |  |
+| variables.rs:117:11:117:17 | numbers | variables.rs:118:9:122:9 | TuplePat |  |
+| variables.rs:118:9:122:9 | TuplePat | variables.rs:123:13:123:29 | ExprStmt | match |
+| variables.rs:122:14:126:9 | BlockExpr | variables.rs:117:5:127:5 | MatchExpr |  |
+| variables.rs:123:13:123:21 | PathExpr | variables.rs:123:23:123:27 | first |  |
+| variables.rs:123:13:123:28 | CallExpr | variables.rs:124:13:124:29 | ExprStmt |  |
+| variables.rs:123:13:123:29 | ExprStmt | variables.rs:123:13:123:21 | PathExpr |  |
+| variables.rs:123:23:123:27 | first | variables.rs:123:13:123:28 | CallExpr |  |
+| variables.rs:124:13:124:21 | PathExpr | variables.rs:124:23:124:27 | third |  |
+| variables.rs:124:13:124:28 | CallExpr | variables.rs:125:13:125:29 | ExprStmt |  |
+| variables.rs:124:13:124:29 | ExprStmt | variables.rs:124:13:124:21 | PathExpr |  |
+| variables.rs:124:23:124:27 | third | variables.rs:124:13:124:28 | CallExpr |  |
+| variables.rs:125:13:125:21 | PathExpr | variables.rs:125:23:125:27 | fifth |  |
+| variables.rs:125:13:125:28 | CallExpr | variables.rs:122:14:126:9 | BlockExpr |  |
+| variables.rs:125:13:125:29 | ExprStmt | variables.rs:125:13:125:21 | PathExpr |  |
+| variables.rs:125:23:125:27 | fifth | variables.rs:125:13:125:28 | CallExpr |  |
+| variables.rs:129:5:138:5 | MatchExpr | variables.rs:114:21:139:1 | BlockExpr |  |
+| variables.rs:129:11:129:17 | numbers | variables.rs:130:9:134:9 | TuplePat |  |
+| variables.rs:130:9:134:9 | TuplePat | variables.rs:135:13:135:29 | ExprStmt | match |
+| variables.rs:134:14:137:9 | BlockExpr | variables.rs:129:5:138:5 | MatchExpr |  |
+| variables.rs:135:13:135:21 | PathExpr | variables.rs:135:23:135:27 | first |  |
+| variables.rs:135:13:135:28 | CallExpr | variables.rs:136:13:136:28 | ExprStmt |  |
+| variables.rs:135:13:135:29 | ExprStmt | variables.rs:135:13:135:21 | PathExpr |  |
+| variables.rs:135:23:135:27 | first | variables.rs:135:13:135:28 | CallExpr |  |
+| variables.rs:136:13:136:21 | PathExpr | variables.rs:136:23:136:26 | last |  |
+| variables.rs:136:13:136:27 | CallExpr | variables.rs:134:14:137:9 | BlockExpr |  |
+| variables.rs:136:13:136:28 | ExprStmt | variables.rs:136:13:136:21 | PathExpr |  |
+| variables.rs:136:23:136:26 | last | variables.rs:136:13:136:27 | CallExpr |  |
+| variables.rs:141:1:149:1 | enter match_pattern3 | variables.rs:142:5:142:38 | LetStmt |  |
+| variables.rs:141:1:149:1 | exit match_pattern3 (normal) | variables.rs:141:1:149:1 | exit match_pattern3 |  |
+| variables.rs:141:21:149:1 | BlockExpr | variables.rs:141:1:149:1 | exit match_pattern3 (normal) |  |
+| variables.rs:142:5:142:38 | LetStmt | variables.rs:142:25:142:27 | "x" |  |
+| variables.rs:142:9:142:10 | p2 | variables.rs:144:11:144:12 | p2 | match, no-match |
+| variables.rs:142:14:142:37 | RecordExpr | variables.rs:142:9:142:10 | p2 |  |
+| variables.rs:142:25:142:27 | "x" | variables.rs:142:33:142:35 | "y" |  |
+| variables.rs:142:33:142:35 | "y" | variables.rs:142:14:142:37 | RecordExpr |  |
+| variables.rs:144:5:148:5 | MatchExpr | variables.rs:141:21:149:1 | BlockExpr |  |
+| variables.rs:144:11:144:12 | p2 | variables.rs:145:9:147:9 | RecordPat |  |
+| variables.rs:145:9:147:9 | RecordPat | variables.rs:147:14:147:22 | PathExpr | match |
+| variables.rs:147:14:147:22 | PathExpr | variables.rs:147:24:147:25 | x7 |  |
+| variables.rs:147:14:147:26 | CallExpr | variables.rs:144:5:148:5 | MatchExpr |  |
+| variables.rs:147:24:147:25 | x7 | variables.rs:147:14:147:26 | CallExpr |  |
+| variables.rs:155:1:168:1 | enter match_pattern4 | variables.rs:156:5:156:39 | LetStmt |  |
+| variables.rs:155:1:168:1 | exit match_pattern4 (normal) | variables.rs:155:1:168:1 | exit match_pattern4 |  |
+| variables.rs:155:21:168:1 | BlockExpr | variables.rs:155:1:168:1 | exit match_pattern4 (normal) |  |
+| variables.rs:156:5:156:39 | LetStmt | variables.rs:156:36:156:36 | 0 |  |
+| variables.rs:156:9:156:11 | msg | variables.rs:158:11:158:13 | msg | match, no-match |
+| variables.rs:156:15:156:38 | RecordExpr | variables.rs:156:9:156:11 | msg |  |
+| variables.rs:156:36:156:36 | 0 | variables.rs:156:15:156:38 | RecordExpr |  |
+| variables.rs:158:5:167:5 | MatchExpr | variables.rs:155:21:168:1 | BlockExpr |  |
+| variables.rs:158:11:158:13 | msg | variables.rs:159:9:161:9 | RecordPat |  |
+| variables.rs:159:9:161:9 | RecordPat | variables.rs:161:14:161:22 | PathExpr | match |
+| variables.rs:159:9:161:9 | RecordPat | variables.rs:162:9:162:38 | RecordPat | no-match |
+| variables.rs:161:14:161:22 | PathExpr | variables.rs:161:24:161:34 | id_variable |  |
+| variables.rs:161:14:161:35 | CallExpr | variables.rs:158:5:167:5 | MatchExpr |  |
+| variables.rs:161:24:161:34 | id_variable | variables.rs:161:14:161:35 | CallExpr |  |
+| variables.rs:162:9:162:38 | RecordPat | variables.rs:163:13:163:52 | MacroExpr | match |
+| variables.rs:162:9:162:38 | RecordPat | variables.rs:165:9:165:29 | RecordPat | no-match |
+| variables.rs:162:43:164:9 | BlockExpr | variables.rs:158:5:167:5 | MatchExpr |  |
+| variables.rs:163:13:163:52 | MacroExpr | variables.rs:162:43:164:9 | BlockExpr |  |
+| variables.rs:165:9:165:29 | RecordPat | variables.rs:166:13:166:21 | PathExpr | match |
+| variables.rs:166:13:166:21 | PathExpr | variables.rs:166:23:166:24 | id |  |
+| variables.rs:166:13:166:25 | CallExpr | variables.rs:158:5:167:5 | MatchExpr |  |
+| variables.rs:166:23:166:24 | id | variables.rs:166:13:166:25 | CallExpr |  |
+| variables.rs:175:1:181:1 | enter match_pattern5 | variables.rs:176:5:176:34 | LetStmt |  |
+| variables.rs:175:1:181:1 | exit match_pattern5 (normal) | variables.rs:175:1:181:1 | exit match_pattern5 |  |
+| variables.rs:175:21:181:1 | BlockExpr | variables.rs:175:1:181:1 | exit match_pattern5 (normal) |  |
+| variables.rs:176:5:176:34 | LetStmt | variables.rs:176:18:176:29 | PathExpr |  |
+| variables.rs:176:9:176:14 | either | variables.rs:177:11:177:16 | either | match, no-match |
+| variables.rs:176:18:176:29 | PathExpr | variables.rs:176:31:176:32 | 32 |  |
+| variables.rs:176:18:176:33 | CallExpr | variables.rs:176:9:176:14 | either |  |
+| variables.rs:176:31:176:32 | 32 | variables.rs:176:18:176:33 | CallExpr |  |
+| variables.rs:177:5:180:5 | MatchExpr | variables.rs:175:21:181:1 | BlockExpr |  |
+| variables.rs:177:11:177:16 | either | variables.rs:178:9:178:44 | OrPat |  |
+| variables.rs:178:9:178:44 | OrPat | variables.rs:179:16:179:24 | PathExpr | match |
+| variables.rs:179:16:179:24 | PathExpr | variables.rs:179:26:179:27 | a3 |  |
+| variables.rs:179:16:179:28 | CallExpr | variables.rs:177:5:180:5 | MatchExpr |  |
+| variables.rs:179:26:179:27 | a3 | variables.rs:179:16:179:28 | CallExpr |  |
+| variables.rs:189:1:203:1 | enter match_pattern6 | variables.rs:190:5:190:37 | LetStmt |  |
+| variables.rs:189:1:203:1 | exit match_pattern6 (normal) | variables.rs:189:1:203:1 | exit match_pattern6 |  |
+| variables.rs:189:21:203:1 | BlockExpr | variables.rs:189:1:203:1 | exit match_pattern6 (normal) |  |
+| variables.rs:190:5:190:37 | LetStmt | variables.rs:190:14:190:32 | PathExpr |  |
+| variables.rs:190:9:190:10 | tv | variables.rs:191:5:194:5 | ExprStmt | match, no-match |
+| variables.rs:190:14:190:32 | PathExpr | variables.rs:190:34:190:35 | 62 |  |
+| variables.rs:190:14:190:36 | CallExpr | variables.rs:190:9:190:10 | tv |  |
+| variables.rs:190:34:190:35 | 62 | variables.rs:190:14:190:36 | CallExpr |  |
+| variables.rs:191:5:194:5 | ExprStmt | variables.rs:191:11:191:12 | tv |  |
+| variables.rs:191:5:194:5 | MatchExpr | variables.rs:195:5:198:5 | ExprStmt |  |
+| variables.rs:191:11:191:12 | tv | variables.rs:192:9:192:81 | OrPat |  |
+| variables.rs:192:9:192:81 | OrPat | variables.rs:193:16:193:24 | PathExpr | match |
+| variables.rs:193:16:193:24 | PathExpr | variables.rs:193:26:193:27 | a4 |  |
+| variables.rs:193:16:193:28 | CallExpr | variables.rs:191:5:194:5 | MatchExpr |  |
+| variables.rs:193:26:193:27 | a4 | variables.rs:193:16:193:28 | CallExpr |  |
+| variables.rs:195:5:198:5 | ExprStmt | variables.rs:195:11:195:12 | tv |  |
+| variables.rs:195:5:198:5 | MatchExpr | variables.rs:199:11:199:12 | tv |  |
+| variables.rs:195:11:195:12 | tv | variables.rs:196:9:196:83 | OrPat |  |
+| variables.rs:196:9:196:83 | OrPat | variables.rs:197:16:197:24 | PathExpr | match |
+| variables.rs:197:16:197:24 | PathExpr | variables.rs:197:26:197:27 | a5 |  |
+| variables.rs:197:16:197:28 | CallExpr | variables.rs:195:5:198:5 | MatchExpr |  |
+| variables.rs:197:26:197:27 | a5 | variables.rs:197:16:197:28 | CallExpr |  |
+| variables.rs:199:5:202:5 | MatchExpr | variables.rs:189:21:203:1 | BlockExpr |  |
+| variables.rs:199:11:199:12 | tv | variables.rs:200:9:200:83 | OrPat |  |
+| variables.rs:200:9:200:83 | OrPat | variables.rs:201:16:201:24 | PathExpr | match |
+| variables.rs:201:16:201:24 | PathExpr | variables.rs:201:26:201:27 | a6 |  |
+| variables.rs:201:16:201:28 | CallExpr | variables.rs:199:5:202:5 | MatchExpr |  |
+| variables.rs:201:26:201:27 | a6 | variables.rs:201:16:201:28 | CallExpr |  |
+| variables.rs:205:1:213:1 | enter match_pattern7 | variables.rs:206:5:206:34 | LetStmt |  |
+| variables.rs:205:1:213:1 | exit match_pattern7 (normal) | variables.rs:205:1:213:1 | exit match_pattern7 |  |
+| variables.rs:205:21:213:1 | BlockExpr | variables.rs:205:1:213:1 | exit match_pattern7 (normal) |  |
+| variables.rs:206:5:206:34 | LetStmt | variables.rs:206:18:206:29 | PathExpr |  |
+| variables.rs:206:9:206:14 | either | variables.rs:207:11:207:16 | either | match, no-match |
+| variables.rs:206:18:206:29 | PathExpr | variables.rs:206:31:206:32 | 32 |  |
+| variables.rs:206:18:206:33 | CallExpr | variables.rs:206:9:206:14 | either |  |
+| variables.rs:206:31:206:32 | 32 | variables.rs:206:18:206:33 | CallExpr |  |
+| variables.rs:207:5:212:5 | MatchExpr | variables.rs:205:21:213:1 | BlockExpr |  |
+| variables.rs:207:11:207:16 | either | variables.rs:208:9:208:44 | OrPat |  |
+| variables.rs:208:9:208:44 | OrPat | variables.rs:209:16:209:17 | a7 | match |
+| variables.rs:208:9:208:44 | OrPat | variables.rs:211:9:211:9 | WildcardPat | no-match |
+| variables.rs:209:16:209:17 | a7 | variables.rs:209:21:209:21 | 0 |  |
+| variables.rs:209:16:209:21 | ... > ... | variables.rs:210:16:210:24 | PathExpr | true |
+| variables.rs:209:16:209:21 | ... > ... | variables.rs:211:9:211:9 | WildcardPat | false |
+| variables.rs:209:21:209:21 | 0 | variables.rs:209:16:209:21 | ... > ... |  |
+| variables.rs:210:16:210:24 | PathExpr | variables.rs:210:26:210:27 | a7 |  |
+| variables.rs:210:16:210:28 | CallExpr | variables.rs:207:5:212:5 | MatchExpr |  |
+| variables.rs:210:26:210:27 | a7 | variables.rs:210:16:210:28 | CallExpr |  |
+| variables.rs:211:9:211:9 | WildcardPat | variables.rs:211:14:211:15 | TupleExpr | match |
+| variables.rs:211:14:211:15 | TupleExpr | variables.rs:207:5:212:5 | MatchExpr |  |
+| variables.rs:215:1:230:1 | enter match_pattern8 | variables.rs:216:5:216:34 | LetStmt |  |
+| variables.rs:215:1:230:1 | exit match_pattern8 (normal) | variables.rs:215:1:230:1 | exit match_pattern8 |  |
+| variables.rs:215:21:230:1 | BlockExpr | variables.rs:215:1:230:1 | exit match_pattern8 (normal) |  |
+| variables.rs:216:5:216:34 | LetStmt | variables.rs:216:18:216:29 | PathExpr |  |
+| variables.rs:216:9:216:14 | either | variables.rs:218:11:218:16 | either | match, no-match |
+| variables.rs:216:18:216:29 | PathExpr | variables.rs:216:31:216:32 | 32 |  |
+| variables.rs:216:18:216:33 | CallExpr | variables.rs:216:9:216:14 | either |  |
+| variables.rs:216:31:216:32 | 32 | variables.rs:216:18:216:33 | CallExpr |  |
+| variables.rs:218:5:229:5 | MatchExpr | variables.rs:215:21:230:1 | BlockExpr |  |
+| variables.rs:218:11:218:16 | either | variables.rs:219:9:220:52 | e |  |
+| variables.rs:219:9:220:52 | e | variables.rs:222:13:222:27 | ExprStmt | match |
+| variables.rs:219:9:220:52 | e | variables.rs:228:9:228:9 | WildcardPat | no-match |
+| variables.rs:221:12:227:9 | BlockExpr | variables.rs:218:5:229:5 | MatchExpr |  |
+| variables.rs:222:13:222:21 | PathExpr | variables.rs:222:23:222:25 | a11 |  |
+| variables.rs:222:13:222:26 | CallExpr | variables.rs:223:16:224:15 | LetExpr |  |
+| variables.rs:222:13:222:27 | ExprStmt | variables.rs:222:13:222:21 | PathExpr |  |
+| variables.rs:222:23:222:25 | a11 | variables.rs:222:13:222:26 | CallExpr |  |
+| variables.rs:223:13:226:13 | IfExpr | variables.rs:221:12:227:9 | BlockExpr |  |
+| variables.rs:223:16:224:15 | LetExpr | variables.rs:223:20:223:36 | TupleStructPat |  |
+| variables.rs:223:20:223:36 | TupleStructPat | variables.rs:223:13:226:13 | IfExpr | no-match |
+| variables.rs:223:20:223:36 | TupleStructPat | variables.rs:225:17:225:32 | ExprStmt | match |
+| variables.rs:224:17:226:13 | BlockExpr | variables.rs:223:13:226:13 | IfExpr |  |
+| variables.rs:225:17:225:25 | PathExpr | variables.rs:225:28:225:30 | a12 |  |
+| variables.rs:225:17:225:31 | CallExpr | variables.rs:224:17:226:13 | BlockExpr |  |
+| variables.rs:225:17:225:32 | ExprStmt | variables.rs:225:17:225:25 | PathExpr |  |
+| variables.rs:225:27:225:30 | * ... | variables.rs:225:17:225:31 | CallExpr |  |
+| variables.rs:225:28:225:30 | a12 | variables.rs:225:27:225:30 | * ... |  |
+| variables.rs:228:9:228:9 | WildcardPat | variables.rs:228:14:228:15 | TupleExpr | match |
+| variables.rs:228:14:228:15 | TupleExpr | variables.rs:218:5:229:5 | MatchExpr |  |
+| variables.rs:239:1:245:1 | enter match_pattern9 | variables.rs:240:5:240:36 | LetStmt |  |
+| variables.rs:239:1:245:1 | exit match_pattern9 (normal) | variables.rs:239:1:245:1 | exit match_pattern9 |  |
+| variables.rs:239:21:245:1 | BlockExpr | variables.rs:239:1:245:1 | exit match_pattern9 (normal) |  |
+| variables.rs:240:5:240:36 | LetStmt | variables.rs:240:14:240:31 | PathExpr |  |
+| variables.rs:240:9:240:10 | fv | variables.rs:241:11:241:12 | fv | match, no-match |
+| variables.rs:240:14:240:31 | PathExpr | variables.rs:240:33:240:34 | 62 |  |
+| variables.rs:240:14:240:35 | CallExpr | variables.rs:240:9:240:10 | fv |  |
+| variables.rs:240:33:240:34 | 62 | variables.rs:240:14:240:35 | CallExpr |  |
+| variables.rs:241:5:244:5 | MatchExpr | variables.rs:239:21:245:1 | BlockExpr |  |
+| variables.rs:241:11:241:12 | fv | variables.rs:242:9:242:109 | OrPat |  |
+| variables.rs:242:9:242:109 | OrPat | variables.rs:243:16:243:24 | PathExpr | match |
+| variables.rs:243:16:243:24 | PathExpr | variables.rs:243:26:243:28 | a13 |  |
+| variables.rs:243:16:243:29 | CallExpr | variables.rs:241:5:244:5 | MatchExpr |  |
+| variables.rs:243:26:243:28 | a13 | variables.rs:243:16:243:29 | CallExpr |  |
+| variables.rs:247:1:256:1 | enter param_pattern1 | variables.rs:253:5:253:18 | ExprStmt |  |
+| variables.rs:247:1:256:1 | exit param_pattern1 (normal) | variables.rs:247:1:256:1 | exit param_pattern1 |  |
+| variables.rs:252:28:256:1 | BlockExpr | variables.rs:247:1:256:1 | exit param_pattern1 (normal) |  |
+| variables.rs:253:5:253:13 | PathExpr | variables.rs:253:15:253:16 | a8 |  |
+| variables.rs:253:5:253:17 | CallExpr | variables.rs:254:5:254:18 | ExprStmt |  |
+| variables.rs:253:5:253:18 | ExprStmt | variables.rs:253:5:253:13 | PathExpr |  |
+| variables.rs:253:15:253:16 | a8 | variables.rs:253:5:253:17 | CallExpr |  |
+| variables.rs:254:5:254:13 | PathExpr | variables.rs:254:15:254:16 | b3 |  |
+| variables.rs:254:5:254:17 | CallExpr | variables.rs:255:5:255:18 | ExprStmt |  |
+| variables.rs:254:5:254:18 | ExprStmt | variables.rs:254:5:254:13 | PathExpr |  |
+| variables.rs:254:15:254:16 | b3 | variables.rs:254:5:254:17 | CallExpr |  |
+| variables.rs:255:5:255:13 | PathExpr | variables.rs:255:15:255:16 | c1 |  |
+| variables.rs:255:5:255:17 | CallExpr | variables.rs:252:28:256:1 | BlockExpr |  |
+| variables.rs:255:5:255:18 | ExprStmt | variables.rs:255:5:255:13 | PathExpr |  |
+| variables.rs:255:15:255:16 | c1 | variables.rs:255:5:255:17 | CallExpr |  |
+| variables.rs:258:1:262:1 | enter param_pattern2 | variables.rs:261:5:261:18 | ExprStmt |  |
+| variables.rs:258:1:262:1 | exit param_pattern2 (normal) | variables.rs:258:1:262:1 | exit param_pattern2 |  |
+| variables.rs:260:9:262:1 | BlockExpr | variables.rs:258:1:262:1 | exit param_pattern2 (normal) |  |
+| variables.rs:261:5:261:13 | PathExpr | variables.rs:261:15:261:16 | a9 |  |
+| variables.rs:261:5:261:17 | CallExpr | variables.rs:260:9:262:1 | BlockExpr |  |
+| variables.rs:261:5:261:18 | ExprStmt | variables.rs:261:5:261:13 | PathExpr |  |
+| variables.rs:261:15:261:16 | a9 | variables.rs:261:5:261:17 | CallExpr |  |
+| variables.rs:264:1:299:1 | enter destruct_assignment | variables.rs:265:5:269:18 | LetStmt |  |
+| variables.rs:264:1:299:1 | exit destruct_assignment (normal) | variables.rs:264:1:299:1 | exit destruct_assignment |  |
+| variables.rs:264:26:299:1 | BlockExpr | variables.rs:264:1:299:1 | exit destruct_assignment (normal) |  |
+| variables.rs:265:5:269:18 | LetStmt | variables.rs:269:10:269:10 | 1 |  |
+| variables.rs:265:9:269:5 | TuplePat | variables.rs:270:5:270:19 | ExprStmt | match |
+| variables.rs:269:9:269:17 | TupleExpr | variables.rs:265:9:269:5 | TuplePat |  |
+| variables.rs:269:10:269:10 | 1 | variables.rs:269:13:269:13 | 2 |  |
+| variables.rs:269:13:269:13 | 2 | variables.rs:269:16:269:16 | 3 |  |
+| variables.rs:269:16:269:16 | 3 | variables.rs:269:9:269:17 | TupleExpr |  |
+| variables.rs:270:5:270:13 | PathExpr | variables.rs:270:15:270:17 | a10 |  |
+| variables.rs:270:5:270:18 | CallExpr | variables.rs:271:5:271:18 | ExprStmt |  |
+| variables.rs:270:5:270:19 | ExprStmt | variables.rs:270:5:270:13 | PathExpr |  |
+| variables.rs:270:15:270:17 | a10 | variables.rs:270:5:270:18 | CallExpr |  |
+| variables.rs:271:5:271:13 | PathExpr | variables.rs:271:15:271:16 | b4 |  |
+| variables.rs:271:5:271:17 | CallExpr | variables.rs:272:5:272:18 | ExprStmt |  |
+| variables.rs:271:5:271:18 | ExprStmt | variables.rs:271:5:271:13 | PathExpr |  |
+| variables.rs:271:15:271:16 | b4 | variables.rs:271:5:271:17 | CallExpr |  |
+| variables.rs:272:5:272:13 | PathExpr | variables.rs:272:15:272:16 | c2 |  |
+| variables.rs:272:5:272:17 | CallExpr | variables.rs:274:5:282:6 | ExprStmt |  |
+| variables.rs:272:5:272:18 | ExprStmt | variables.rs:272:5:272:13 | PathExpr |  |
+| variables.rs:272:15:272:16 | c2 | variables.rs:272:5:272:17 | CallExpr |  |
+| variables.rs:274:5:278:5 | TupleExpr | variables.rs:279:9:279:11 | a10 |  |
+| variables.rs:274:5:282:5 | ... = ... | variables.rs:283:5:283:19 | ExprStmt |  |
+| variables.rs:274:5:282:6 | ExprStmt | variables.rs:275:9:275:10 | c2 |  |
+| variables.rs:275:9:275:10 | c2 | variables.rs:276:9:276:10 | b4 |  |
+| variables.rs:276:9:276:10 | b4 | variables.rs:277:9:277:11 | a10 |  |
+| variables.rs:277:9:277:11 | a10 | variables.rs:274:5:278:5 | TupleExpr |  |
+| variables.rs:278:9:282:5 | TupleExpr | variables.rs:274:5:282:5 | ... = ... |  |
+| variables.rs:279:9:279:11 | a10 | variables.rs:280:9:280:10 | b4 |  |
+| variables.rs:280:9:280:10 | b4 | variables.rs:281:9:281:10 | c2 |  |
+| variables.rs:281:9:281:10 | c2 | variables.rs:278:9:282:5 | TupleExpr |  |
+| variables.rs:283:5:283:13 | PathExpr | variables.rs:283:15:283:17 | a10 |  |
+| variables.rs:283:5:283:18 | CallExpr | variables.rs:284:5:284:18 | ExprStmt |  |
+| variables.rs:283:5:283:19 | ExprStmt | variables.rs:283:5:283:13 | PathExpr |  |
+| variables.rs:283:15:283:17 | a10 | variables.rs:283:5:283:18 | CallExpr |  |
+| variables.rs:284:5:284:13 | PathExpr | variables.rs:284:15:284:16 | b4 |  |
+| variables.rs:284:5:284:17 | CallExpr | variables.rs:285:5:285:18 | ExprStmt |  |
+| variables.rs:284:5:284:18 | ExprStmt | variables.rs:284:5:284:13 | PathExpr |  |
+| variables.rs:284:15:284:16 | b4 | variables.rs:284:5:284:17 | CallExpr |  |
+| variables.rs:285:5:285:13 | PathExpr | variables.rs:285:15:285:16 | c2 |  |
+| variables.rs:285:5:285:17 | CallExpr | variables.rs:287:5:295:5 | ExprStmt |  |
+| variables.rs:285:5:285:18 | ExprStmt | variables.rs:285:5:285:13 | PathExpr |  |
+| variables.rs:285:15:285:16 | c2 | variables.rs:285:5:285:17 | CallExpr |  |
+| variables.rs:287:5:295:5 | ExprStmt | variables.rs:287:12:287:12 | 4 |  |
+| variables.rs:287:5:295:5 | MatchExpr | variables.rs:297:5:297:19 | ExprStmt |  |
+| variables.rs:287:11:287:16 | TupleExpr | variables.rs:288:9:291:9 | TuplePat |  |
+| variables.rs:287:12:287:12 | 4 | variables.rs:287:15:287:15 | 5 |  |
+| variables.rs:287:15:287:15 | 5 | variables.rs:287:11:287:16 | TupleExpr |  |
+| variables.rs:288:9:291:9 | TuplePat | variables.rs:292:13:292:27 | ExprStmt | match |
+| variables.rs:291:14:294:9 | BlockExpr | variables.rs:287:5:295:5 | MatchExpr |  |
+| variables.rs:292:13:292:21 | PathExpr | variables.rs:292:23:292:25 | a10 |  |
+| variables.rs:292:13:292:26 | CallExpr | variables.rs:293:13:293:26 | ExprStmt |  |
+| variables.rs:292:13:292:27 | ExprStmt | variables.rs:292:13:292:21 | PathExpr |  |
+| variables.rs:292:23:292:25 | a10 | variables.rs:292:13:292:26 | CallExpr |  |
+| variables.rs:293:13:293:21 | PathExpr | variables.rs:293:23:293:24 | b4 |  |
+| variables.rs:293:13:293:25 | CallExpr | variables.rs:291:14:294:9 | BlockExpr |  |
+| variables.rs:293:13:293:26 | ExprStmt | variables.rs:293:13:293:21 | PathExpr |  |
+| variables.rs:293:23:293:24 | b4 | variables.rs:293:13:293:25 | CallExpr |  |
+| variables.rs:297:5:297:13 | PathExpr | variables.rs:297:15:297:17 | a10 |  |
+| variables.rs:297:5:297:18 | CallExpr | variables.rs:298:5:298:18 | ExprStmt |  |
+| variables.rs:297:5:297:19 | ExprStmt | variables.rs:297:5:297:13 | PathExpr |  |
+| variables.rs:297:15:297:17 | a10 | variables.rs:297:5:297:18 | CallExpr |  |
+| variables.rs:298:5:298:13 | PathExpr | variables.rs:298:15:298:16 | b4 |  |
+| variables.rs:298:5:298:17 | CallExpr | variables.rs:264:26:299:1 | BlockExpr |  |
 | variables.rs:298:5:298:18 | ExprStmt | variables.rs:298:5:298:13 | PathExpr |  |
-| variables.rs:298:15:298:16 | n1 | variables.rs:298:5:298:17 | CallExpr |  |
-| variables.rs:300:5:300:22 | PathExpr | variables.rs:300:5:300:24 | CallExpr |  |
-| variables.rs:300:5:300:24 | CallExpr | variables.rs:301:5:303:10 | LetStmt |  |
-| variables.rs:300:5:300:25 | ExprStmt | variables.rs:300:5:300:22 | PathExpr |  |
-| variables.rs:301:5:303:10 | LetStmt | variables.rs:302:9:303:9 | ClosureExpr |  |
-| variables.rs:301:9:301:26 | immutable_variable | variables.rs:304:5:305:30 | LetStmt | match, no-match |
-| variables.rs:302:9:303:9 | ClosureExpr | variables.rs:301:9:301:26 | immutable_variable |  |
-| variables.rs:302:9:303:9 | enter ClosureExpr | variables.rs:303:9:303:9 | x |  |
-| variables.rs:302:9:303:9 | exit ClosureExpr (normal) | variables.rs:302:9:303:9 | exit ClosureExpr |  |
-| variables.rs:303:9:303:9 | x | variables.rs:302:9:303:9 | exit ClosureExpr (normal) |  |
-| variables.rs:304:5:305:30 | LetStmt | variables.rs:305:9:305:26 | immutable_variable |  |
-| variables.rs:304:9:304:10 | n2 | variables.rs:306:5:306:18 | ExprStmt | match, no-match |
-| variables.rs:305:9:305:26 | immutable_variable | variables.rs:305:28:305:28 | 6 |  |
-| variables.rs:305:9:305:29 | CallExpr | variables.rs:304:9:304:10 | n2 |  |
-| variables.rs:305:28:305:28 | 6 | variables.rs:305:9:305:29 | CallExpr |  |
-| variables.rs:306:5:306:13 | PathExpr | variables.rs:306:15:306:16 | n2 |  |
-| variables.rs:306:5:306:17 | CallExpr | variables.rs:292:23:307:1 | BlockExpr |  |
-| variables.rs:306:5:306:18 | ExprStmt | variables.rs:306:5:306:13 | PathExpr |  |
-| variables.rs:306:15:306:16 | n2 | variables.rs:306:5:306:17 | CallExpr |  |
-| variables.rs:309:1:316:1 | enter for_variable | variables.rs:310:5:310:42 | LetStmt |  |
-| variables.rs:309:1:316:1 | exit for_variable (normal) | variables.rs:309:1:316:1 | exit for_variable |  |
-| variables.rs:309:19:316:1 | BlockExpr | variables.rs:309:1:316:1 | exit for_variable (normal) |  |
-| variables.rs:310:5:310:42 | LetStmt | variables.rs:310:15:310:22 | "apples" |  |
-| variables.rs:310:9:310:9 | v | variables.rs:313:12:313:12 | v | match, no-match |
-| variables.rs:310:13:310:41 | RefExpr | variables.rs:310:9:310:9 | v |  |
-| variables.rs:310:14:310:41 | ArrayExpr | variables.rs:310:13:310:41 | RefExpr |  |
-| variables.rs:310:15:310:22 | "apples" | variables.rs:310:25:310:30 | "cake" |  |
-| variables.rs:310:25:310:30 | "cake" | variables.rs:310:33:310:40 | "coffee" |  |
-| variables.rs:310:33:310:40 | "coffee" | variables.rs:310:14:310:41 | ArrayExpr |  |
-| variables.rs:312:5:315:5 | ForExpr | variables.rs:309:19:316:1 | BlockExpr |  |
-| variables.rs:312:9:312:12 | text | variables.rs:312:5:315:5 | ForExpr | no-match |
-| variables.rs:312:9:312:12 | text | variables.rs:314:9:314:24 | ExprStmt | match |
-| variables.rs:313:12:313:12 | v | variables.rs:312:9:312:12 | text |  |
-| variables.rs:313:14:315:5 | BlockExpr | variables.rs:312:9:312:12 | text |  |
-| variables.rs:314:9:314:17 | PathExpr | variables.rs:314:19:314:22 | text |  |
-| variables.rs:314:9:314:23 | CallExpr | variables.rs:313:14:315:5 | BlockExpr |  |
-| variables.rs:314:9:314:24 | ExprStmt | variables.rs:314:9:314:17 | PathExpr |  |
-| variables.rs:314:19:314:22 | text | variables.rs:314:9:314:23 | CallExpr |  |
-| variables.rs:318:1:341:1 | enter main | variables.rs:319:5:319:25 | ExprStmt |  |
-| variables.rs:318:1:341:1 | exit main (normal) | variables.rs:318:1:341:1 | exit main |  |
-| variables.rs:318:11:341:1 | BlockExpr | variables.rs:318:1:341:1 | exit main (normal) |  |
-| variables.rs:319:5:319:22 | PathExpr | variables.rs:319:5:319:24 | CallExpr |  |
-| variables.rs:319:5:319:24 | CallExpr | variables.rs:320:5:320:23 | ExprStmt |  |
-| variables.rs:319:5:319:25 | ExprStmt | variables.rs:319:5:319:22 | PathExpr |  |
-| variables.rs:320:5:320:20 | PathExpr | variables.rs:320:5:320:22 | CallExpr |  |
-| variables.rs:320:5:320:22 | CallExpr | variables.rs:321:5:321:23 | ExprStmt |  |
-| variables.rs:320:5:320:23 | ExprStmt | variables.rs:320:5:320:20 | PathExpr |  |
-| variables.rs:321:5:321:20 | PathExpr | variables.rs:321:5:321:22 | CallExpr |  |
-| variables.rs:321:5:321:22 | CallExpr | variables.rs:322:5:322:23 | ExprStmt |  |
-| variables.rs:321:5:321:23 | ExprStmt | variables.rs:321:5:321:20 | PathExpr |  |
-| variables.rs:322:5:322:20 | PathExpr | variables.rs:322:5:322:22 | CallExpr |  |
-| variables.rs:322:5:322:22 | CallExpr | variables.rs:323:5:323:19 | ExprStmt |  |
-| variables.rs:322:5:322:23 | ExprStmt | variables.rs:322:5:322:20 | PathExpr |  |
-| variables.rs:323:5:323:16 | PathExpr | variables.rs:323:5:323:18 | CallExpr |  |
-| variables.rs:323:5:323:18 | CallExpr | variables.rs:324:5:324:19 | ExprStmt |  |
-| variables.rs:323:5:323:19 | ExprStmt | variables.rs:323:5:323:16 | PathExpr |  |
-| variables.rs:324:5:324:16 | PathExpr | variables.rs:324:5:324:18 | CallExpr |  |
-| variables.rs:324:5:324:18 | CallExpr | variables.rs:325:5:325:19 | ExprStmt |  |
-| variables.rs:324:5:324:19 | ExprStmt | variables.rs:324:5:324:16 | PathExpr |  |
-| variables.rs:325:5:325:16 | PathExpr | variables.rs:325:5:325:18 | CallExpr |  |
-| variables.rs:325:5:325:18 | CallExpr | variables.rs:326:5:326:19 | ExprStmt |  |
-| variables.rs:325:5:325:19 | ExprStmt | variables.rs:325:5:325:16 | PathExpr |  |
-| variables.rs:326:5:326:16 | PathExpr | variables.rs:326:5:326:18 | CallExpr |  |
-| variables.rs:326:5:326:18 | CallExpr | variables.rs:327:5:327:21 | ExprStmt |  |
-| variables.rs:326:5:326:19 | ExprStmt | variables.rs:326:5:326:16 | PathExpr |  |
-| variables.rs:327:5:327:18 | PathExpr | variables.rs:327:5:327:20 | CallExpr |  |
-| variables.rs:327:5:327:20 | CallExpr | variables.rs:328:5:328:21 | ExprStmt |  |
-| variables.rs:327:5:327:21 | ExprStmt | variables.rs:327:5:327:18 | PathExpr |  |
-| variables.rs:328:5:328:18 | PathExpr | variables.rs:328:5:328:20 | CallExpr |  |
-| variables.rs:328:5:328:20 | CallExpr | variables.rs:329:5:329:21 | ExprStmt |  |
-| variables.rs:328:5:328:21 | ExprStmt | variables.rs:328:5:328:18 | PathExpr |  |
-| variables.rs:329:5:329:18 | PathExpr | variables.rs:329:5:329:20 | CallExpr |  |
-| variables.rs:329:5:329:20 | CallExpr | variables.rs:330:5:330:21 | ExprStmt |  |
-| variables.rs:329:5:329:21 | ExprStmt | variables.rs:329:5:329:18 | PathExpr |  |
-| variables.rs:330:5:330:18 | PathExpr | variables.rs:330:5:330:20 | CallExpr |  |
-| variables.rs:330:5:330:20 | CallExpr | variables.rs:331:5:331:21 | ExprStmt |  |
-| variables.rs:330:5:330:21 | ExprStmt | variables.rs:330:5:330:18 | PathExpr |  |
-| variables.rs:331:5:331:18 | PathExpr | variables.rs:331:5:331:20 | CallExpr |  |
-| variables.rs:331:5:331:20 | CallExpr | variables.rs:332:5:332:21 | ExprStmt |  |
-| variables.rs:331:5:331:21 | ExprStmt | variables.rs:331:5:331:18 | PathExpr |  |
-| variables.rs:332:5:332:18 | PathExpr | variables.rs:332:5:332:20 | CallExpr |  |
-| variables.rs:332:5:332:20 | CallExpr | variables.rs:333:5:333:21 | ExprStmt |  |
-| variables.rs:332:5:332:21 | ExprStmt | variables.rs:332:5:332:18 | PathExpr |  |
-| variables.rs:333:5:333:18 | PathExpr | variables.rs:333:5:333:20 | CallExpr |  |
-| variables.rs:333:5:333:20 | CallExpr | variables.rs:334:5:334:21 | ExprStmt |  |
-| variables.rs:333:5:333:21 | ExprStmt | variables.rs:333:5:333:18 | PathExpr |  |
-| variables.rs:334:5:334:18 | PathExpr | variables.rs:334:5:334:20 | CallExpr |  |
-| variables.rs:334:5:334:20 | CallExpr | variables.rs:335:5:335:21 | ExprStmt |  |
-| variables.rs:334:5:334:21 | ExprStmt | variables.rs:334:5:334:18 | PathExpr |  |
-| variables.rs:335:5:335:18 | PathExpr | variables.rs:335:5:335:20 | CallExpr |  |
-| variables.rs:335:5:335:20 | CallExpr | variables.rs:336:5:336:36 | ExprStmt |  |
-| variables.rs:335:5:335:21 | ExprStmt | variables.rs:335:5:335:18 | PathExpr |  |
-| variables.rs:336:5:336:18 | PathExpr | variables.rs:336:20:336:22 | "a" |  |
-| variables.rs:336:5:336:35 | CallExpr | variables.rs:337:5:337:37 | ExprStmt |  |
-| variables.rs:336:5:336:36 | ExprStmt | variables.rs:336:5:336:18 | PathExpr |  |
-| variables.rs:336:20:336:22 | "a" | variables.rs:336:26:336:28 | "b" |  |
-| variables.rs:336:25:336:34 | TupleExpr | variables.rs:336:5:336:35 | CallExpr |  |
-| variables.rs:336:26:336:28 | "b" | variables.rs:336:31:336:33 | "c" |  |
-| variables.rs:336:31:336:33 | "c" | variables.rs:336:25:336:34 | TupleExpr |  |
-| variables.rs:337:5:337:18 | PathExpr | variables.rs:337:20:337:31 | PathExpr |  |
-| variables.rs:337:5:337:36 | CallExpr | variables.rs:338:5:338:26 | ExprStmt |  |
-| variables.rs:337:5:337:37 | ExprStmt | variables.rs:337:5:337:18 | PathExpr |  |
-| variables.rs:337:20:337:31 | PathExpr | variables.rs:337:33:337:34 | 45 |  |
-| variables.rs:337:20:337:35 | CallExpr | variables.rs:337:5:337:36 | CallExpr |  |
-| variables.rs:337:33:337:34 | 45 | variables.rs:337:20:337:35 | CallExpr |  |
-| variables.rs:338:5:338:23 | PathExpr | variables.rs:338:5:338:25 | CallExpr |  |
-| variables.rs:338:5:338:25 | CallExpr | variables.rs:339:5:339:23 | ExprStmt |  |
-| variables.rs:338:5:338:26 | ExprStmt | variables.rs:338:5:338:23 | PathExpr |  |
-| variables.rs:339:5:339:20 | PathExpr | variables.rs:339:5:339:22 | CallExpr |  |
-| variables.rs:339:5:339:22 | CallExpr | variables.rs:340:5:340:19 | ExprStmt |  |
-| variables.rs:339:5:339:23 | ExprStmt | variables.rs:339:5:339:20 | PathExpr |  |
-| variables.rs:340:5:340:16 | PathExpr | variables.rs:340:5:340:18 | CallExpr |  |
-| variables.rs:340:5:340:18 | CallExpr | variables.rs:318:11:341:1 | BlockExpr |  |
-| variables.rs:340:5:340:19 | ExprStmt | variables.rs:340:5:340:16 | PathExpr |  |
+| variables.rs:298:15:298:16 | b4 | variables.rs:298:5:298:17 | CallExpr |  |
+| variables.rs:301:1:316:1 | enter closure_variable | variables.rs:302:5:304:10 | LetStmt |  |
+| variables.rs:301:1:316:1 | exit closure_variable (normal) | variables.rs:301:1:316:1 | exit closure_variable |  |
+| variables.rs:301:23:316:1 | BlockExpr | variables.rs:301:1:316:1 | exit closure_variable (normal) |  |
+| variables.rs:302:5:304:10 | LetStmt | variables.rs:303:9:304:9 | ClosureExpr |  |
+| variables.rs:302:9:302:23 | example_closure | variables.rs:305:5:306:27 | LetStmt | match, no-match |
+| variables.rs:303:9:304:9 | ClosureExpr | variables.rs:302:9:302:23 | example_closure |  |
+| variables.rs:303:9:304:9 | enter ClosureExpr | variables.rs:304:9:304:9 | x |  |
+| variables.rs:303:9:304:9 | exit ClosureExpr (normal) | variables.rs:303:9:304:9 | exit ClosureExpr |  |
+| variables.rs:304:9:304:9 | x | variables.rs:303:9:304:9 | exit ClosureExpr (normal) |  |
+| variables.rs:305:5:306:27 | LetStmt | variables.rs:306:9:306:23 | example_closure |  |
+| variables.rs:305:9:305:10 | n1 | variables.rs:307:5:307:18 | ExprStmt | match, no-match |
+| variables.rs:306:9:306:23 | example_closure | variables.rs:306:25:306:25 | 5 |  |
+| variables.rs:306:9:306:26 | CallExpr | variables.rs:305:9:305:10 | n1 |  |
+| variables.rs:306:25:306:25 | 5 | variables.rs:306:9:306:26 | CallExpr |  |
+| variables.rs:307:5:307:13 | PathExpr | variables.rs:307:15:307:16 | n1 |  |
+| variables.rs:307:5:307:17 | CallExpr | variables.rs:309:5:309:25 | ExprStmt |  |
+| variables.rs:307:5:307:18 | ExprStmt | variables.rs:307:5:307:13 | PathExpr |  |
+| variables.rs:307:15:307:16 | n1 | variables.rs:307:5:307:17 | CallExpr |  |
+| variables.rs:309:5:309:22 | PathExpr | variables.rs:309:5:309:24 | CallExpr |  |
+| variables.rs:309:5:309:24 | CallExpr | variables.rs:310:5:312:10 | LetStmt |  |
+| variables.rs:309:5:309:25 | ExprStmt | variables.rs:309:5:309:22 | PathExpr |  |
+| variables.rs:310:5:312:10 | LetStmt | variables.rs:311:9:312:9 | ClosureExpr |  |
+| variables.rs:310:9:310:26 | immutable_variable | variables.rs:313:5:314:30 | LetStmt | match, no-match |
+| variables.rs:311:9:312:9 | ClosureExpr | variables.rs:310:9:310:26 | immutable_variable |  |
+| variables.rs:311:9:312:9 | enter ClosureExpr | variables.rs:312:9:312:9 | x |  |
+| variables.rs:311:9:312:9 | exit ClosureExpr (normal) | variables.rs:311:9:312:9 | exit ClosureExpr |  |
+| variables.rs:312:9:312:9 | x | variables.rs:311:9:312:9 | exit ClosureExpr (normal) |  |
+| variables.rs:313:5:314:30 | LetStmt | variables.rs:314:9:314:26 | immutable_variable |  |
+| variables.rs:313:9:313:10 | n2 | variables.rs:315:5:315:18 | ExprStmt | match, no-match |
+| variables.rs:314:9:314:26 | immutable_variable | variables.rs:314:28:314:28 | 6 |  |
+| variables.rs:314:9:314:29 | CallExpr | variables.rs:313:9:313:10 | n2 |  |
+| variables.rs:314:28:314:28 | 6 | variables.rs:314:9:314:29 | CallExpr |  |
+| variables.rs:315:5:315:13 | PathExpr | variables.rs:315:15:315:16 | n2 |  |
+| variables.rs:315:5:315:17 | CallExpr | variables.rs:301:23:316:1 | BlockExpr |  |
+| variables.rs:315:5:315:18 | ExprStmt | variables.rs:315:5:315:13 | PathExpr |  |
+| variables.rs:315:15:315:16 | n2 | variables.rs:315:5:315:17 | CallExpr |  |
+| variables.rs:318:1:325:1 | enter for_variable | variables.rs:319:5:319:42 | LetStmt |  |
+| variables.rs:318:1:325:1 | exit for_variable (normal) | variables.rs:318:1:325:1 | exit for_variable |  |
+| variables.rs:318:19:325:1 | BlockExpr | variables.rs:318:1:325:1 | exit for_variable (normal) |  |
+| variables.rs:319:5:319:42 | LetStmt | variables.rs:319:15:319:22 | "apples" |  |
+| variables.rs:319:9:319:9 | v | variables.rs:322:12:322:12 | v | match, no-match |
+| variables.rs:319:13:319:41 | RefExpr | variables.rs:319:9:319:9 | v |  |
+| variables.rs:319:14:319:41 | ArrayExpr | variables.rs:319:13:319:41 | RefExpr |  |
+| variables.rs:319:15:319:22 | "apples" | variables.rs:319:25:319:30 | "cake" |  |
+| variables.rs:319:25:319:30 | "cake" | variables.rs:319:33:319:40 | "coffee" |  |
+| variables.rs:319:33:319:40 | "coffee" | variables.rs:319:14:319:41 | ArrayExpr |  |
+| variables.rs:321:5:324:5 | ForExpr | variables.rs:318:19:325:1 | BlockExpr |  |
+| variables.rs:321:9:321:12 | text | variables.rs:321:5:324:5 | ForExpr | no-match |
+| variables.rs:321:9:321:12 | text | variables.rs:323:9:323:24 | ExprStmt | match |
+| variables.rs:322:12:322:12 | v | variables.rs:321:9:321:12 | text |  |
+| variables.rs:322:14:324:5 | BlockExpr | variables.rs:321:9:321:12 | text |  |
+| variables.rs:323:9:323:17 | PathExpr | variables.rs:323:19:323:22 | text |  |
+| variables.rs:323:9:323:23 | CallExpr | variables.rs:322:14:324:5 | BlockExpr |  |
+| variables.rs:323:9:323:24 | ExprStmt | variables.rs:323:9:323:17 | PathExpr |  |
+| variables.rs:323:19:323:22 | text | variables.rs:323:9:323:23 | CallExpr |  |
+| variables.rs:327:1:350:1 | enter main | variables.rs:328:5:328:25 | ExprStmt |  |
+| variables.rs:327:1:350:1 | exit main (normal) | variables.rs:327:1:350:1 | exit main |  |
+| variables.rs:327:11:350:1 | BlockExpr | variables.rs:327:1:350:1 | exit main (normal) |  |
+| variables.rs:328:5:328:22 | PathExpr | variables.rs:328:5:328:24 | CallExpr |  |
+| variables.rs:328:5:328:24 | CallExpr | variables.rs:329:5:329:23 | ExprStmt |  |
+| variables.rs:328:5:328:25 | ExprStmt | variables.rs:328:5:328:22 | PathExpr |  |
+| variables.rs:329:5:329:20 | PathExpr | variables.rs:329:5:329:22 | CallExpr |  |
+| variables.rs:329:5:329:22 | CallExpr | variables.rs:330:5:330:23 | ExprStmt |  |
+| variables.rs:329:5:329:23 | ExprStmt | variables.rs:329:5:329:20 | PathExpr |  |
+| variables.rs:330:5:330:20 | PathExpr | variables.rs:330:5:330:22 | CallExpr |  |
+| variables.rs:330:5:330:22 | CallExpr | variables.rs:331:5:331:23 | ExprStmt |  |
+| variables.rs:330:5:330:23 | ExprStmt | variables.rs:330:5:330:20 | PathExpr |  |
+| variables.rs:331:5:331:20 | PathExpr | variables.rs:331:5:331:22 | CallExpr |  |
+| variables.rs:331:5:331:22 | CallExpr | variables.rs:332:5:332:19 | ExprStmt |  |
+| variables.rs:331:5:331:23 | ExprStmt | variables.rs:331:5:331:20 | PathExpr |  |
+| variables.rs:332:5:332:16 | PathExpr | variables.rs:332:5:332:18 | CallExpr |  |
+| variables.rs:332:5:332:18 | CallExpr | variables.rs:333:5:333:19 | ExprStmt |  |
+| variables.rs:332:5:332:19 | ExprStmt | variables.rs:332:5:332:16 | PathExpr |  |
+| variables.rs:333:5:333:16 | PathExpr | variables.rs:333:5:333:18 | CallExpr |  |
+| variables.rs:333:5:333:18 | CallExpr | variables.rs:334:5:334:19 | ExprStmt |  |
+| variables.rs:333:5:333:19 | ExprStmt | variables.rs:333:5:333:16 | PathExpr |  |
+| variables.rs:334:5:334:16 | PathExpr | variables.rs:334:5:334:18 | CallExpr |  |
+| variables.rs:334:5:334:18 | CallExpr | variables.rs:335:5:335:19 | ExprStmt |  |
+| variables.rs:334:5:334:19 | ExprStmt | variables.rs:334:5:334:16 | PathExpr |  |
+| variables.rs:335:5:335:16 | PathExpr | variables.rs:335:5:335:18 | CallExpr |  |
+| variables.rs:335:5:335:18 | CallExpr | variables.rs:336:5:336:21 | ExprStmt |  |
+| variables.rs:335:5:335:19 | ExprStmt | variables.rs:335:5:335:16 | PathExpr |  |
+| variables.rs:336:5:336:18 | PathExpr | variables.rs:336:5:336:20 | CallExpr |  |
+| variables.rs:336:5:336:20 | CallExpr | variables.rs:337:5:337:21 | ExprStmt |  |
+| variables.rs:336:5:336:21 | ExprStmt | variables.rs:336:5:336:18 | PathExpr |  |
+| variables.rs:337:5:337:18 | PathExpr | variables.rs:337:5:337:20 | CallExpr |  |
+| variables.rs:337:5:337:20 | CallExpr | variables.rs:338:5:338:21 | ExprStmt |  |
+| variables.rs:337:5:337:21 | ExprStmt | variables.rs:337:5:337:18 | PathExpr |  |
+| variables.rs:338:5:338:18 | PathExpr | variables.rs:338:5:338:20 | CallExpr |  |
+| variables.rs:338:5:338:20 | CallExpr | variables.rs:339:5:339:21 | ExprStmt |  |
+| variables.rs:338:5:338:21 | ExprStmt | variables.rs:338:5:338:18 | PathExpr |  |
+| variables.rs:339:5:339:18 | PathExpr | variables.rs:339:5:339:20 | CallExpr |  |
+| variables.rs:339:5:339:20 | CallExpr | variables.rs:340:5:340:21 | ExprStmt |  |
+| variables.rs:339:5:339:21 | ExprStmt | variables.rs:339:5:339:18 | PathExpr |  |
+| variables.rs:340:5:340:18 | PathExpr | variables.rs:340:5:340:20 | CallExpr |  |
+| variables.rs:340:5:340:20 | CallExpr | variables.rs:341:5:341:21 | ExprStmt |  |
+| variables.rs:340:5:340:21 | ExprStmt | variables.rs:340:5:340:18 | PathExpr |  |
+| variables.rs:341:5:341:18 | PathExpr | variables.rs:341:5:341:20 | CallExpr |  |
+| variables.rs:341:5:341:20 | CallExpr | variables.rs:342:5:342:21 | ExprStmt |  |
+| variables.rs:341:5:341:21 | ExprStmt | variables.rs:341:5:341:18 | PathExpr |  |
+| variables.rs:342:5:342:18 | PathExpr | variables.rs:342:5:342:20 | CallExpr |  |
+| variables.rs:342:5:342:20 | CallExpr | variables.rs:343:5:343:21 | ExprStmt |  |
+| variables.rs:342:5:342:21 | ExprStmt | variables.rs:342:5:342:18 | PathExpr |  |
+| variables.rs:343:5:343:18 | PathExpr | variables.rs:343:5:343:20 | CallExpr |  |
+| variables.rs:343:5:343:20 | CallExpr | variables.rs:344:5:344:21 | ExprStmt |  |
+| variables.rs:343:5:343:21 | ExprStmt | variables.rs:343:5:343:18 | PathExpr |  |
+| variables.rs:344:5:344:18 | PathExpr | variables.rs:344:5:344:20 | CallExpr |  |
+| variables.rs:344:5:344:20 | CallExpr | variables.rs:345:5:345:36 | ExprStmt |  |
+| variables.rs:344:5:344:21 | ExprStmt | variables.rs:344:5:344:18 | PathExpr |  |
+| variables.rs:345:5:345:18 | PathExpr | variables.rs:345:20:345:22 | "a" |  |
+| variables.rs:345:5:345:35 | CallExpr | variables.rs:346:5:346:37 | ExprStmt |  |
+| variables.rs:345:5:345:36 | ExprStmt | variables.rs:345:5:345:18 | PathExpr |  |
+| variables.rs:345:20:345:22 | "a" | variables.rs:345:26:345:28 | "b" |  |
+| variables.rs:345:25:345:34 | TupleExpr | variables.rs:345:5:345:35 | CallExpr |  |
+| variables.rs:345:26:345:28 | "b" | variables.rs:345:31:345:33 | "c" |  |
+| variables.rs:345:31:345:33 | "c" | variables.rs:345:25:345:34 | TupleExpr |  |
+| variables.rs:346:5:346:18 | PathExpr | variables.rs:346:20:346:31 | PathExpr |  |
+| variables.rs:346:5:346:36 | CallExpr | variables.rs:347:5:347:26 | ExprStmt |  |
+| variables.rs:346:5:346:37 | ExprStmt | variables.rs:346:5:346:18 | PathExpr |  |
+| variables.rs:346:20:346:31 | PathExpr | variables.rs:346:33:346:34 | 45 |  |
+| variables.rs:346:20:346:35 | CallExpr | variables.rs:346:5:346:36 | CallExpr |  |
+| variables.rs:346:33:346:34 | 45 | variables.rs:346:20:346:35 | CallExpr |  |
+| variables.rs:347:5:347:23 | PathExpr | variables.rs:347:5:347:25 | CallExpr |  |
+| variables.rs:347:5:347:25 | CallExpr | variables.rs:348:5:348:23 | ExprStmt |  |
+| variables.rs:347:5:347:26 | ExprStmt | variables.rs:347:5:347:23 | PathExpr |  |
+| variables.rs:348:5:348:20 | PathExpr | variables.rs:348:5:348:22 | CallExpr |  |
+| variables.rs:348:5:348:22 | CallExpr | variables.rs:349:5:349:19 | ExprStmt |  |
+| variables.rs:348:5:348:23 | ExprStmt | variables.rs:348:5:348:20 | PathExpr |  |
+| variables.rs:349:5:349:16 | PathExpr | variables.rs:349:5:349:18 | CallExpr |  |
+| variables.rs:349:5:349:18 | CallExpr | variables.rs:327:11:350:1 | BlockExpr |  |
+| variables.rs:349:5:349:19 | ExprStmt | variables.rs:349:5:349:16 | PathExpr |  |
 breakTarget
 continueTarget
diff --git a/rust/ql/test/library-tests/variables/variables.expected b/rust/ql/test/library-tests/variables/variables.expected
index c86e30d4bb57..ad85ccfbfcc8 100644
--- a/rust/ql/test/library-tests/variables/variables.expected
+++ b/rust/ql/test/library-tests/variables/variables.expected
@@ -19,52 +19,54 @@ variable
 | variables.rs:72:9:72:10 | s1 |
 | variables.rs:74:21:74:22 | s2 |
 | variables.rs:81:14:81:15 | x5 |
-| variables.rs:89:9:89:10 | x6 |
-| variables.rs:90:9:90:10 | y1 |
-| variables.rs:94:14:94:15 | y1 |
-| variables.rs:99:9:99:12 | None |
-| variables.rs:106:9:106:15 | numbers |
-| variables.rs:110:13:110:17 | first |
-| variables.rs:111:13:111:17 | third |
-| variables.rs:112:13:112:17 | fifth |
-| variables.rs:122:13:122:17 | first |
-| variables.rs:124:13:124:16 | last |
-| variables.rs:133:9:133:10 | p2 |
-| variables.rs:137:16:137:17 | x7 |
-| variables.rs:147:9:147:11 | msg |
-| variables.rs:151:17:151:27 | id_variable |
-| variables.rs:156:26:156:27 | id |
-| variables.rs:167:9:167:14 | either |
-| variables.rs:169:9:169:44 | a3 |
-| variables.rs:181:9:181:10 | tv |
-| variables.rs:183:9:183:81 | a4 |
-| variables.rs:187:9:187:83 | a5 |
-| variables.rs:191:9:191:83 | a6 |
-| variables.rs:197:9:197:14 | either |
-| variables.rs:199:9:199:44 | a7 |
-| variables.rs:207:9:207:14 | either |
-| variables.rs:210:13:210:13 | e |
-| variables.rs:211:14:211:51 | a11 |
-| variables.rs:214:33:214:35 | a12 |
-| variables.rs:231:9:231:10 | fv |
-| variables.rs:233:9:233:109 | a13 |
-| variables.rs:239:5:239:6 | a8 |
-| variables.rs:241:9:241:10 | b3 |
-| variables.rs:242:9:242:10 | c1 |
-| variables.rs:250:6:250:41 | a9 |
-| variables.rs:257:13:257:15 | a10 |
-| variables.rs:258:13:258:14 | b4 |
-| variables.rs:259:13:259:14 | c2 |
-| variables.rs:280:13:280:15 | a10 |
-| variables.rs:281:13:281:14 | b4 |
-| variables.rs:293:9:293:23 | example_closure |
-| variables.rs:294:10:294:10 | x |
-| variables.rs:296:9:296:10 | n1 |
-| variables.rs:301:9:301:26 | immutable_variable |
-| variables.rs:302:10:302:10 | x |
-| variables.rs:304:9:304:10 | n2 |
-| variables.rs:310:9:310:9 | v |
-| variables.rs:312:9:312:12 | text |
+| variables.rs:89:9:89:10 | s1 |
+| variables.rs:91:24:91:25 | s2 |
+| variables.rs:98:9:98:10 | x6 |
+| variables.rs:99:9:99:10 | y1 |
+| variables.rs:103:14:103:15 | y1 |
+| variables.rs:108:9:108:12 | None |
+| variables.rs:115:9:115:15 | numbers |
+| variables.rs:119:13:119:17 | first |
+| variables.rs:120:13:120:17 | third |
+| variables.rs:121:13:121:17 | fifth |
+| variables.rs:131:13:131:17 | first |
+| variables.rs:133:13:133:16 | last |
+| variables.rs:142:9:142:10 | p2 |
+| variables.rs:146:16:146:17 | x7 |
+| variables.rs:156:9:156:11 | msg |
+| variables.rs:160:17:160:27 | id_variable |
+| variables.rs:165:26:165:27 | id |
+| variables.rs:176:9:176:14 | either |
+| variables.rs:178:9:178:44 | a3 |
+| variables.rs:190:9:190:10 | tv |
+| variables.rs:192:9:192:81 | a4 |
+| variables.rs:196:9:196:83 | a5 |
+| variables.rs:200:9:200:83 | a6 |
+| variables.rs:206:9:206:14 | either |
+| variables.rs:208:9:208:44 | a7 |
+| variables.rs:216:9:216:14 | either |
+| variables.rs:219:13:219:13 | e |
+| variables.rs:220:14:220:51 | a11 |
+| variables.rs:223:33:223:35 | a12 |
+| variables.rs:240:9:240:10 | fv |
+| variables.rs:242:9:242:109 | a13 |
+| variables.rs:248:5:248:6 | a8 |
+| variables.rs:250:9:250:10 | b3 |
+| variables.rs:251:9:251:10 | c1 |
+| variables.rs:259:6:259:41 | a9 |
+| variables.rs:266:13:266:15 | a10 |
+| variables.rs:267:13:267:14 | b4 |
+| variables.rs:268:13:268:14 | c2 |
+| variables.rs:289:13:289:15 | a10 |
+| variables.rs:290:13:290:14 | b4 |
+| variables.rs:302:9:302:23 | example_closure |
+| variables.rs:303:10:303:10 | x |
+| variables.rs:305:9:305:10 | n1 |
+| variables.rs:310:9:310:26 | immutable_variable |
+| variables.rs:311:10:311:10 | x |
+| variables.rs:313:9:313:10 | n2 |
+| variables.rs:319:9:319:9 | v |
+| variables.rs:321:9:321:12 | text |
 variableAccess
 | variables.rs:11:15:11:16 | x1 | variables.rs:10:9:10:10 | x1 |
 | variables.rs:16:15:16:16 | x2 | variables.rs:15:13:15:14 | x2 |
@@ -86,71 +88,73 @@ variableAccess
 | variables.rs:75:11:75:12 | s1 | variables.rs:72:9:72:10 | s1 |
 | variables.rs:76:19:76:20 | s2 | variables.rs:74:21:74:22 | s2 |
 | variables.rs:85:15:85:16 | x5 | variables.rs:81:14:81:15 | x5 |
-| variables.rs:92:11:92:12 | x6 | variables.rs:89:9:89:10 | x6 |
-| variables.rs:97:23:97:24 | y1 | variables.rs:94:14:94:15 | y1 |
-| variables.rs:102:15:102:16 | y1 | variables.rs:90:9:90:10 | y1 |
-| variables.rs:108:11:108:17 | numbers | variables.rs:106:9:106:15 | numbers |
-| variables.rs:114:23:114:27 | first | variables.rs:110:13:110:17 | first |
-| variables.rs:115:23:115:27 | third | variables.rs:111:13:111:17 | third |
-| variables.rs:116:23:116:27 | fifth | variables.rs:112:13:112:17 | fifth |
-| variables.rs:120:11:120:17 | numbers | variables.rs:106:9:106:15 | numbers |
-| variables.rs:126:23:126:27 | first | variables.rs:122:13:122:17 | first |
-| variables.rs:127:23:127:26 | last | variables.rs:124:13:124:16 | last |
-| variables.rs:135:11:135:12 | p2 | variables.rs:133:9:133:10 | p2 |
-| variables.rs:138:24:138:25 | x7 | variables.rs:137:16:137:17 | x7 |
-| variables.rs:149:11:149:13 | msg | variables.rs:147:9:147:11 | msg |
-| variables.rs:152:24:152:34 | id_variable | variables.rs:151:17:151:27 | id_variable |
-| variables.rs:157:23:157:24 | id | variables.rs:156:26:156:27 | id |
-| variables.rs:168:11:168:16 | either | variables.rs:167:9:167:14 | either |
-| variables.rs:170:26:170:27 | a3 | variables.rs:169:9:169:44 | a3 |
-| variables.rs:182:11:182:12 | tv | variables.rs:181:9:181:10 | tv |
-| variables.rs:184:26:184:27 | a4 | variables.rs:183:9:183:81 | a4 |
-| variables.rs:186:11:186:12 | tv | variables.rs:181:9:181:10 | tv |
-| variables.rs:188:26:188:27 | a5 | variables.rs:187:9:187:83 | a5 |
-| variables.rs:190:11:190:12 | tv | variables.rs:181:9:181:10 | tv |
-| variables.rs:192:26:192:27 | a6 | variables.rs:191:9:191:83 | a6 |
-| variables.rs:198:11:198:16 | either | variables.rs:197:9:197:14 | either |
-| variables.rs:200:16:200:17 | a7 | variables.rs:199:9:199:44 | a7 |
-| variables.rs:201:26:201:27 | a7 | variables.rs:199:9:199:44 | a7 |
-| variables.rs:209:11:209:16 | either | variables.rs:207:9:207:14 | either |
-| variables.rs:213:23:213:25 | a11 | variables.rs:211:14:211:51 | a11 |
-| variables.rs:215:15:215:15 | e | variables.rs:210:13:210:13 | e |
-| variables.rs:216:28:216:30 | a12 | variables.rs:214:33:214:35 | a12 |
-| variables.rs:232:11:232:12 | fv | variables.rs:231:9:231:10 | fv |
-| variables.rs:234:26:234:28 | a13 | variables.rs:233:9:233:109 | a13 |
-| variables.rs:244:15:244:16 | a8 | variables.rs:239:5:239:6 | a8 |
-| variables.rs:245:15:245:16 | b3 | variables.rs:241:9:241:10 | b3 |
-| variables.rs:246:15:246:16 | c1 | variables.rs:242:9:242:10 | c1 |
-| variables.rs:252:15:252:16 | a9 | variables.rs:250:6:250:41 | a9 |
-| variables.rs:261:15:261:17 | a10 | variables.rs:257:13:257:15 | a10 |
-| variables.rs:262:15:262:16 | b4 | variables.rs:258:13:258:14 | b4 |
-| variables.rs:263:15:263:16 | c2 | variables.rs:259:13:259:14 | c2 |
-| variables.rs:266:9:266:10 | c2 | variables.rs:259:13:259:14 | c2 |
-| variables.rs:267:9:267:10 | b4 | variables.rs:258:13:258:14 | b4 |
-| variables.rs:268:9:268:11 | a10 | variables.rs:257:13:257:15 | a10 |
-| variables.rs:270:9:270:11 | a10 | variables.rs:257:13:257:15 | a10 |
-| variables.rs:271:9:271:10 | b4 | variables.rs:258:13:258:14 | b4 |
-| variables.rs:272:9:272:10 | c2 | variables.rs:259:13:259:14 | c2 |
-| variables.rs:274:15:274:17 | a10 | variables.rs:257:13:257:15 | a10 |
-| variables.rs:275:15:275:16 | b4 | variables.rs:258:13:258:14 | b4 |
-| variables.rs:276:15:276:16 | c2 | variables.rs:259:13:259:14 | c2 |
-| variables.rs:283:23:283:25 | a10 | variables.rs:280:13:280:15 | a10 |
-| variables.rs:284:23:284:24 | b4 | variables.rs:281:13:281:14 | b4 |
-| variables.rs:288:15:288:17 | a10 | variables.rs:257:13:257:15 | a10 |
-| variables.rs:289:15:289:16 | b4 | variables.rs:258:13:258:14 | b4 |
-| variables.rs:295:9:295:9 | x | variables.rs:294:10:294:10 | x |
-| variables.rs:297:9:297:23 | example_closure | variables.rs:293:9:293:23 | example_closure |
-| variables.rs:298:15:298:16 | n1 | variables.rs:296:9:296:10 | n1 |
-| variables.rs:303:9:303:9 | x | variables.rs:302:10:302:10 | x |
-| variables.rs:305:9:305:26 | immutable_variable | variables.rs:301:9:301:26 | immutable_variable |
-| variables.rs:306:15:306:16 | n2 | variables.rs:304:9:304:10 | n2 |
-| variables.rs:313:12:313:12 | v | variables.rs:310:9:310:9 | v |
-| variables.rs:314:19:314:22 | text | variables.rs:312:9:312:12 | text |
+| variables.rs:92:11:92:12 | s1 | variables.rs:89:9:89:10 | s1 |
+| variables.rs:93:19:93:20 | s2 | variables.rs:91:24:91:25 | s2 |
+| variables.rs:101:11:101:12 | x6 | variables.rs:98:9:98:10 | x6 |
+| variables.rs:106:23:106:24 | y1 | variables.rs:103:14:103:15 | y1 |
+| variables.rs:111:15:111:16 | y1 | variables.rs:99:9:99:10 | y1 |
+| variables.rs:117:11:117:17 | numbers | variables.rs:115:9:115:15 | numbers |
+| variables.rs:123:23:123:27 | first | variables.rs:119:13:119:17 | first |
+| variables.rs:124:23:124:27 | third | variables.rs:120:13:120:17 | third |
+| variables.rs:125:23:125:27 | fifth | variables.rs:121:13:121:17 | fifth |
+| variables.rs:129:11:129:17 | numbers | variables.rs:115:9:115:15 | numbers |
+| variables.rs:135:23:135:27 | first | variables.rs:131:13:131:17 | first |
+| variables.rs:136:23:136:26 | last | variables.rs:133:13:133:16 | last |
+| variables.rs:144:11:144:12 | p2 | variables.rs:142:9:142:10 | p2 |
+| variables.rs:147:24:147:25 | x7 | variables.rs:146:16:146:17 | x7 |
+| variables.rs:158:11:158:13 | msg | variables.rs:156:9:156:11 | msg |
+| variables.rs:161:24:161:34 | id_variable | variables.rs:160:17:160:27 | id_variable |
+| variables.rs:166:23:166:24 | id | variables.rs:165:26:165:27 | id |
+| variables.rs:177:11:177:16 | either | variables.rs:176:9:176:14 | either |
+| variables.rs:179:26:179:27 | a3 | variables.rs:178:9:178:44 | a3 |
+| variables.rs:191:11:191:12 | tv | variables.rs:190:9:190:10 | tv |
+| variables.rs:193:26:193:27 | a4 | variables.rs:192:9:192:81 | a4 |
+| variables.rs:195:11:195:12 | tv | variables.rs:190:9:190:10 | tv |
+| variables.rs:197:26:197:27 | a5 | variables.rs:196:9:196:83 | a5 |
+| variables.rs:199:11:199:12 | tv | variables.rs:190:9:190:10 | tv |
+| variables.rs:201:26:201:27 | a6 | variables.rs:200:9:200:83 | a6 |
+| variables.rs:207:11:207:16 | either | variables.rs:206:9:206:14 | either |
+| variables.rs:209:16:209:17 | a7 | variables.rs:208:9:208:44 | a7 |
+| variables.rs:210:26:210:27 | a7 | variables.rs:208:9:208:44 | a7 |
+| variables.rs:218:11:218:16 | either | variables.rs:216:9:216:14 | either |
+| variables.rs:222:23:222:25 | a11 | variables.rs:220:14:220:51 | a11 |
+| variables.rs:224:15:224:15 | e | variables.rs:219:13:219:13 | e |
+| variables.rs:225:28:225:30 | a12 | variables.rs:223:33:223:35 | a12 |
+| variables.rs:241:11:241:12 | fv | variables.rs:240:9:240:10 | fv |
+| variables.rs:243:26:243:28 | a13 | variables.rs:242:9:242:109 | a13 |
+| variables.rs:253:15:253:16 | a8 | variables.rs:248:5:248:6 | a8 |
+| variables.rs:254:15:254:16 | b3 | variables.rs:250:9:250:10 | b3 |
+| variables.rs:255:15:255:16 | c1 | variables.rs:251:9:251:10 | c1 |
+| variables.rs:261:15:261:16 | a9 | variables.rs:259:6:259:41 | a9 |
+| variables.rs:270:15:270:17 | a10 | variables.rs:266:13:266:15 | a10 |
+| variables.rs:271:15:271:16 | b4 | variables.rs:267:13:267:14 | b4 |
+| variables.rs:272:15:272:16 | c2 | variables.rs:268:13:268:14 | c2 |
+| variables.rs:275:9:275:10 | c2 | variables.rs:268:13:268:14 | c2 |
+| variables.rs:276:9:276:10 | b4 | variables.rs:267:13:267:14 | b4 |
+| variables.rs:277:9:277:11 | a10 | variables.rs:266:13:266:15 | a10 |
+| variables.rs:279:9:279:11 | a10 | variables.rs:266:13:266:15 | a10 |
+| variables.rs:280:9:280:10 | b4 | variables.rs:267:13:267:14 | b4 |
+| variables.rs:281:9:281:10 | c2 | variables.rs:268:13:268:14 | c2 |
+| variables.rs:283:15:283:17 | a10 | variables.rs:266:13:266:15 | a10 |
+| variables.rs:284:15:284:16 | b4 | variables.rs:267:13:267:14 | b4 |
+| variables.rs:285:15:285:16 | c2 | variables.rs:268:13:268:14 | c2 |
+| variables.rs:292:23:292:25 | a10 | variables.rs:289:13:289:15 | a10 |
+| variables.rs:293:23:293:24 | b4 | variables.rs:290:13:290:14 | b4 |
+| variables.rs:297:15:297:17 | a10 | variables.rs:266:13:266:15 | a10 |
+| variables.rs:298:15:298:16 | b4 | variables.rs:267:13:267:14 | b4 |
+| variables.rs:304:9:304:9 | x | variables.rs:303:10:303:10 | x |
+| variables.rs:306:9:306:23 | example_closure | variables.rs:302:9:302:23 | example_closure |
+| variables.rs:307:15:307:16 | n1 | variables.rs:305:9:305:10 | n1 |
+| variables.rs:312:9:312:9 | x | variables.rs:311:10:311:10 | x |
+| variables.rs:314:9:314:26 | immutable_variable | variables.rs:310:9:310:26 | immutable_variable |
+| variables.rs:315:15:315:16 | n2 | variables.rs:313:9:313:10 | n2 |
+| variables.rs:322:12:322:12 | v | variables.rs:319:9:319:9 | v |
+| variables.rs:323:19:323:22 | text | variables.rs:321:9:321:12 | text |
 variableWriteAccess
 | variables.rs:17:5:17:6 | x2 | variables.rs:15:13:15:14 | x2 |
-| variables.rs:266:9:266:10 | c2 | variables.rs:259:13:259:14 | c2 |
-| variables.rs:267:9:267:10 | b4 | variables.rs:258:13:258:14 | b4 |
-| variables.rs:268:9:268:11 | a10 | variables.rs:257:13:257:15 | a10 |
+| variables.rs:275:9:275:10 | c2 | variables.rs:268:13:268:14 | c2 |
+| variables.rs:276:9:276:10 | b4 | variables.rs:267:13:267:14 | b4 |
+| variables.rs:277:9:277:11 | a10 | variables.rs:266:13:266:15 | a10 |
 variableReadAccess
 | variables.rs:11:15:11:16 | x1 | variables.rs:10:9:10:10 | x1 |
 | variables.rs:16:15:16:16 | x2 | variables.rs:15:13:15:14 | x2 |
@@ -171,63 +175,65 @@ variableReadAccess
 | variables.rs:75:11:75:12 | s1 | variables.rs:72:9:72:10 | s1 |
 | variables.rs:76:19:76:20 | s2 | variables.rs:74:21:74:22 | s2 |
 | variables.rs:85:15:85:16 | x5 | variables.rs:81:14:81:15 | x5 |
-| variables.rs:92:11:92:12 | x6 | variables.rs:89:9:89:10 | x6 |
-| variables.rs:97:23:97:24 | y1 | variables.rs:94:14:94:15 | y1 |
-| variables.rs:102:15:102:16 | y1 | variables.rs:90:9:90:10 | y1 |
-| variables.rs:108:11:108:17 | numbers | variables.rs:106:9:106:15 | numbers |
-| variables.rs:114:23:114:27 | first | variables.rs:110:13:110:17 | first |
-| variables.rs:115:23:115:27 | third | variables.rs:111:13:111:17 | third |
-| variables.rs:116:23:116:27 | fifth | variables.rs:112:13:112:17 | fifth |
-| variables.rs:120:11:120:17 | numbers | variables.rs:106:9:106:15 | numbers |
-| variables.rs:126:23:126:27 | first | variables.rs:122:13:122:17 | first |
-| variables.rs:127:23:127:26 | last | variables.rs:124:13:124:16 | last |
-| variables.rs:135:11:135:12 | p2 | variables.rs:133:9:133:10 | p2 |
-| variables.rs:138:24:138:25 | x7 | variables.rs:137:16:137:17 | x7 |
-| variables.rs:149:11:149:13 | msg | variables.rs:147:9:147:11 | msg |
-| variables.rs:152:24:152:34 | id_variable | variables.rs:151:17:151:27 | id_variable |
-| variables.rs:157:23:157:24 | id | variables.rs:156:26:156:27 | id |
-| variables.rs:168:11:168:16 | either | variables.rs:167:9:167:14 | either |
-| variables.rs:170:26:170:27 | a3 | variables.rs:169:9:169:44 | a3 |
-| variables.rs:182:11:182:12 | tv | variables.rs:181:9:181:10 | tv |
-| variables.rs:184:26:184:27 | a4 | variables.rs:183:9:183:81 | a4 |
-| variables.rs:186:11:186:12 | tv | variables.rs:181:9:181:10 | tv |
-| variables.rs:188:26:188:27 | a5 | variables.rs:187:9:187:83 | a5 |
-| variables.rs:190:11:190:12 | tv | variables.rs:181:9:181:10 | tv |
-| variables.rs:192:26:192:27 | a6 | variables.rs:191:9:191:83 | a6 |
-| variables.rs:198:11:198:16 | either | variables.rs:197:9:197:14 | either |
-| variables.rs:200:16:200:17 | a7 | variables.rs:199:9:199:44 | a7 |
-| variables.rs:201:26:201:27 | a7 | variables.rs:199:9:199:44 | a7 |
-| variables.rs:209:11:209:16 | either | variables.rs:207:9:207:14 | either |
-| variables.rs:213:23:213:25 | a11 | variables.rs:211:14:211:51 | a11 |
-| variables.rs:215:15:215:15 | e | variables.rs:210:13:210:13 | e |
-| variables.rs:216:28:216:30 | a12 | variables.rs:214:33:214:35 | a12 |
-| variables.rs:232:11:232:12 | fv | variables.rs:231:9:231:10 | fv |
-| variables.rs:234:26:234:28 | a13 | variables.rs:233:9:233:109 | a13 |
-| variables.rs:244:15:244:16 | a8 | variables.rs:239:5:239:6 | a8 |
-| variables.rs:245:15:245:16 | b3 | variables.rs:241:9:241:10 | b3 |
-| variables.rs:246:15:246:16 | c1 | variables.rs:242:9:242:10 | c1 |
-| variables.rs:252:15:252:16 | a9 | variables.rs:250:6:250:41 | a9 |
-| variables.rs:261:15:261:17 | a10 | variables.rs:257:13:257:15 | a10 |
-| variables.rs:262:15:262:16 | b4 | variables.rs:258:13:258:14 | b4 |
-| variables.rs:263:15:263:16 | c2 | variables.rs:259:13:259:14 | c2 |
-| variables.rs:270:9:270:11 | a10 | variables.rs:257:13:257:15 | a10 |
-| variables.rs:271:9:271:10 | b4 | variables.rs:258:13:258:14 | b4 |
-| variables.rs:272:9:272:10 | c2 | variables.rs:259:13:259:14 | c2 |
-| variables.rs:274:15:274:17 | a10 | variables.rs:257:13:257:15 | a10 |
-| variables.rs:275:15:275:16 | b4 | variables.rs:258:13:258:14 | b4 |
-| variables.rs:276:15:276:16 | c2 | variables.rs:259:13:259:14 | c2 |
-| variables.rs:283:23:283:25 | a10 | variables.rs:280:13:280:15 | a10 |
-| variables.rs:284:23:284:24 | b4 | variables.rs:281:13:281:14 | b4 |
-| variables.rs:288:15:288:17 | a10 | variables.rs:257:13:257:15 | a10 |
-| variables.rs:289:15:289:16 | b4 | variables.rs:258:13:258:14 | b4 |
-| variables.rs:295:9:295:9 | x | variables.rs:294:10:294:10 | x |
-| variables.rs:297:9:297:23 | example_closure | variables.rs:293:9:293:23 | example_closure |
-| variables.rs:298:15:298:16 | n1 | variables.rs:296:9:296:10 | n1 |
-| variables.rs:303:9:303:9 | x | variables.rs:302:10:302:10 | x |
-| variables.rs:305:9:305:26 | immutable_variable | variables.rs:301:9:301:26 | immutable_variable |
-| variables.rs:306:15:306:16 | n2 | variables.rs:304:9:304:10 | n2 |
-| variables.rs:313:12:313:12 | v | variables.rs:310:9:310:9 | v |
-| variables.rs:314:19:314:22 | text | variables.rs:312:9:312:12 | text |
+| variables.rs:92:11:92:12 | s1 | variables.rs:89:9:89:10 | s1 |
+| variables.rs:93:19:93:20 | s2 | variables.rs:91:24:91:25 | s2 |
+| variables.rs:101:11:101:12 | x6 | variables.rs:98:9:98:10 | x6 |
+| variables.rs:106:23:106:24 | y1 | variables.rs:103:14:103:15 | y1 |
+| variables.rs:111:15:111:16 | y1 | variables.rs:99:9:99:10 | y1 |
+| variables.rs:117:11:117:17 | numbers | variables.rs:115:9:115:15 | numbers |
+| variables.rs:123:23:123:27 | first | variables.rs:119:13:119:17 | first |
+| variables.rs:124:23:124:27 | third | variables.rs:120:13:120:17 | third |
+| variables.rs:125:23:125:27 | fifth | variables.rs:121:13:121:17 | fifth |
+| variables.rs:129:11:129:17 | numbers | variables.rs:115:9:115:15 | numbers |
+| variables.rs:135:23:135:27 | first | variables.rs:131:13:131:17 | first |
+| variables.rs:136:23:136:26 | last | variables.rs:133:13:133:16 | last |
+| variables.rs:144:11:144:12 | p2 | variables.rs:142:9:142:10 | p2 |
+| variables.rs:147:24:147:25 | x7 | variables.rs:146:16:146:17 | x7 |
+| variables.rs:158:11:158:13 | msg | variables.rs:156:9:156:11 | msg |
+| variables.rs:161:24:161:34 | id_variable | variables.rs:160:17:160:27 | id_variable |
+| variables.rs:166:23:166:24 | id | variables.rs:165:26:165:27 | id |
+| variables.rs:177:11:177:16 | either | variables.rs:176:9:176:14 | either |
+| variables.rs:179:26:179:27 | a3 | variables.rs:178:9:178:44 | a3 |
+| variables.rs:191:11:191:12 | tv | variables.rs:190:9:190:10 | tv |
+| variables.rs:193:26:193:27 | a4 | variables.rs:192:9:192:81 | a4 |
+| variables.rs:195:11:195:12 | tv | variables.rs:190:9:190:10 | tv |
+| variables.rs:197:26:197:27 | a5 | variables.rs:196:9:196:83 | a5 |
+| variables.rs:199:11:199:12 | tv | variables.rs:190:9:190:10 | tv |
+| variables.rs:201:26:201:27 | a6 | variables.rs:200:9:200:83 | a6 |
+| variables.rs:207:11:207:16 | either | variables.rs:206:9:206:14 | either |
+| variables.rs:209:16:209:17 | a7 | variables.rs:208:9:208:44 | a7 |
+| variables.rs:210:26:210:27 | a7 | variables.rs:208:9:208:44 | a7 |
+| variables.rs:218:11:218:16 | either | variables.rs:216:9:216:14 | either |
+| variables.rs:222:23:222:25 | a11 | variables.rs:220:14:220:51 | a11 |
+| variables.rs:224:15:224:15 | e | variables.rs:219:13:219:13 | e |
+| variables.rs:225:28:225:30 | a12 | variables.rs:223:33:223:35 | a12 |
+| variables.rs:241:11:241:12 | fv | variables.rs:240:9:240:10 | fv |
+| variables.rs:243:26:243:28 | a13 | variables.rs:242:9:242:109 | a13 |
+| variables.rs:253:15:253:16 | a8 | variables.rs:248:5:248:6 | a8 |
+| variables.rs:254:15:254:16 | b3 | variables.rs:250:9:250:10 | b3 |
+| variables.rs:255:15:255:16 | c1 | variables.rs:251:9:251:10 | c1 |
+| variables.rs:261:15:261:16 | a9 | variables.rs:259:6:259:41 | a9 |
+| variables.rs:270:15:270:17 | a10 | variables.rs:266:13:266:15 | a10 |
+| variables.rs:271:15:271:16 | b4 | variables.rs:267:13:267:14 | b4 |
+| variables.rs:272:15:272:16 | c2 | variables.rs:268:13:268:14 | c2 |
+| variables.rs:279:9:279:11 | a10 | variables.rs:266:13:266:15 | a10 |
+| variables.rs:280:9:280:10 | b4 | variables.rs:267:13:267:14 | b4 |
+| variables.rs:281:9:281:10 | c2 | variables.rs:268:13:268:14 | c2 |
+| variables.rs:283:15:283:17 | a10 | variables.rs:266:13:266:15 | a10 |
+| variables.rs:284:15:284:16 | b4 | variables.rs:267:13:267:14 | b4 |
+| variables.rs:285:15:285:16 | c2 | variables.rs:268:13:268:14 | c2 |
+| variables.rs:292:23:292:25 | a10 | variables.rs:289:13:289:15 | a10 |
+| variables.rs:293:23:293:24 | b4 | variables.rs:290:13:290:14 | b4 |
+| variables.rs:297:15:297:17 | a10 | variables.rs:266:13:266:15 | a10 |
+| variables.rs:298:15:298:16 | b4 | variables.rs:267:13:267:14 | b4 |
+| variables.rs:304:9:304:9 | x | variables.rs:303:10:303:10 | x |
+| variables.rs:306:9:306:23 | example_closure | variables.rs:302:9:302:23 | example_closure |
+| variables.rs:307:15:307:16 | n1 | variables.rs:305:9:305:10 | n1 |
+| variables.rs:312:9:312:9 | x | variables.rs:311:10:311:10 | x |
+| variables.rs:314:9:314:26 | immutable_variable | variables.rs:310:9:310:26 | immutable_variable |
+| variables.rs:315:15:315:16 | n2 | variables.rs:313:9:313:10 | n2 |
+| variables.rs:322:12:322:12 | v | variables.rs:319:9:319:9 | v |
+| variables.rs:323:19:323:22 | text | variables.rs:321:9:321:12 | text |
 variableInitializer
 | variables.rs:10:9:10:10 | x1 | variables.rs:10:14:10:16 | "a" |
 | variables.rs:15:13:15:14 | x2 | variables.rs:15:18:15:18 | 4 |
@@ -237,18 +243,19 @@ variableInitializer
 | variables.rs:33:13:33:14 | x4 | variables.rs:33:18:33:20 | "b" |
 | variables.rs:62:9:62:10 | p1 | variables.rs:62:14:62:37 | RecordExpr |
 | variables.rs:72:9:72:10 | s1 | variables.rs:72:14:72:41 | CallExpr |
-| variables.rs:89:9:89:10 | x6 | variables.rs:89:14:89:20 | CallExpr |
-| variables.rs:90:9:90:10 | y1 | variables.rs:90:14:90:15 | 10 |
-| variables.rs:106:9:106:15 | numbers | variables.rs:106:19:106:35 | TupleExpr |
-| variables.rs:133:9:133:10 | p2 | variables.rs:133:14:133:37 | RecordExpr |
-| variables.rs:147:9:147:11 | msg | variables.rs:147:15:147:38 | RecordExpr |
-| variables.rs:167:9:167:14 | either | variables.rs:167:18:167:33 | CallExpr |
-| variables.rs:181:9:181:10 | tv | variables.rs:181:14:181:36 | CallExpr |
-| variables.rs:197:9:197:14 | either | variables.rs:197:18:197:33 | CallExpr |
-| variables.rs:207:9:207:14 | either | variables.rs:207:18:207:33 | CallExpr |
-| variables.rs:231:9:231:10 | fv | variables.rs:231:14:231:35 | CallExpr |
-| variables.rs:293:9:293:23 | example_closure | variables.rs:294:9:295:9 | ClosureExpr |
-| variables.rs:296:9:296:10 | n1 | variables.rs:297:9:297:26 | CallExpr |
-| variables.rs:301:9:301:26 | immutable_variable | variables.rs:302:9:303:9 | ClosureExpr |
-| variables.rs:304:9:304:10 | n2 | variables.rs:305:9:305:29 | CallExpr |
-| variables.rs:310:9:310:9 | v | variables.rs:310:13:310:41 | RefExpr |
+| variables.rs:89:9:89:10 | s1 | variables.rs:89:14:89:41 | CallExpr |
+| variables.rs:98:9:98:10 | x6 | variables.rs:98:14:98:20 | CallExpr |
+| variables.rs:99:9:99:10 | y1 | variables.rs:99:14:99:15 | 10 |
+| variables.rs:115:9:115:15 | numbers | variables.rs:115:19:115:35 | TupleExpr |
+| variables.rs:142:9:142:10 | p2 | variables.rs:142:14:142:37 | RecordExpr |
+| variables.rs:156:9:156:11 | msg | variables.rs:156:15:156:38 | RecordExpr |
+| variables.rs:176:9:176:14 | either | variables.rs:176:18:176:33 | CallExpr |
+| variables.rs:190:9:190:10 | tv | variables.rs:190:14:190:36 | CallExpr |
+| variables.rs:206:9:206:14 | either | variables.rs:206:18:206:33 | CallExpr |
+| variables.rs:216:9:216:14 | either | variables.rs:216:18:216:33 | CallExpr |
+| variables.rs:240:9:240:10 | fv | variables.rs:240:14:240:35 | CallExpr |
+| variables.rs:302:9:302:23 | example_closure | variables.rs:303:9:304:9 | ClosureExpr |
+| variables.rs:305:9:305:10 | n1 | variables.rs:306:9:306:26 | CallExpr |
+| variables.rs:310:9:310:26 | immutable_variable | variables.rs:311:9:312:9 | ClosureExpr |
+| variables.rs:313:9:313:10 | n2 | variables.rs:314:9:314:29 | CallExpr |
+| variables.rs:319:9:319:9 | v | variables.rs:319:13:319:41 | RefExpr |
diff --git a/rust/ql/test/library-tests/variables/variables.rs b/rust/ql/test/library-tests/variables/variables.rs
index 8a0e83c9eff7..85fa052a7aa2 100644
--- a/rust/ql/test/library-tests/variables/variables.rs
+++ b/rust/ql/test/library-tests/variables/variables.rs
@@ -85,6 +85,15 @@ fn let_pattern4() {
     print_str(x5); // $ access=x5
 }
 
+fn let_pattern5() {
+    let s1 = Some(String::from("Hello!")); // s1
+
+    while let Some(ref s2) // s2
+        = s1 { // $ access=s1
+        print_str(s2); // $ access=s2
+    }
+}
+
 fn match_pattern1() {
     let x6 = Some(5); // x6
     let y1 = 10; // y1_1
diff --git a/rust/ql/test/query-tests/unusedentities/UnusedVariable.expected b/rust/ql/test/query-tests/unusedentities/UnusedVariable.expected
index 4a35ca8a41d4..fd4b8d3d2b46 100644
--- a/rust/ql/test/query-tests/unusedentities/UnusedVariable.expected
+++ b/rust/ql/test/query-tests/unusedentities/UnusedVariable.expected
@@ -3,12 +3,11 @@
 | main.rs:114:9:114:9 | k | Variable is not used. |
 | main.rs:141:5:141:5 | y | Variable is not used. |
 | main.rs:164:9:164:9 | x | Variable is not used. |
-| main.rs:170:9:170:9 | x | Variable is not used. |
+| main.rs:169:9:169:9 | x | Variable is not used. |
 | main.rs:174:9:174:9 | x | Variable is not used. |
-| main.rs:194:17:194:17 | a | Variable is not used. |
-| main.rs:202:20:202:22 | val | Variable is not used. |
-| main.rs:207:20:207:22 | val | Variable is not used. |
-| main.rs:214:14:214:16 | val | Variable is not used. |
-| main.rs:216:9:216:12 | None | Variable is not used. |
-| main.rs:225:9:225:12 | None | Variable is not used. |
-| main.rs:231:24:231:26 | val | Variable is not used. |
+| main.rs:195:17:195:17 | a | Variable is not used. |
+| main.rs:203:20:203:22 | val | Variable is not used. |
+| main.rs:216:14:216:16 | val | Variable is not used. |
+| main.rs:218:9:218:12 | None | Variable is not used. |
+| main.rs:227:9:227:12 | None | Variable is not used. |
+| main.rs:233:24:233:26 | val | Variable is not used. |
diff --git a/rust/ql/test/query-tests/unusedentities/main.rs b/rust/ql/test/query-tests/unusedentities/main.rs
index 46d1458b972e..a34219f8a7ab 100644
--- a/rust/ql/test/query-tests/unusedentities/main.rs
+++ b/rust/ql/test/query-tests/unusedentities/main.rs
@@ -164,14 +164,15 @@ fn loops() {
     for x in 1..10 { // BAD: unused variable
     }
 
-    for _ in 1..10 {
-    }
+    for _ in 1..10 {}
 
-    for x in 1..10 { // SPURIOUS: unused variable [macros not yet supported]
+    for x // SPURIOUS: unused variable [macros not yet supported]
+    in 1..10 {    
         println!("x is {}", x);
     }
 
-    for x in 1..10 { // SPURIOUS: unused variable [macros not yet supported]
+    for x // SPURIOUS: unused variable [macros not yet supported]
+    in 1..10 {   
         assert!(x != 11);
     }
 }
@@ -199,12 +200,13 @@ fn if_lets() {
     }
 
     let mut next = Some(30);
-    while let Some(val) = next { // BAD: unused variable
+    while let Some(val) = next // BAD: unused variable
+    {
         next = None;
     }
 
     let mut next2 = Some(40);
-    while let Some(val) = next2 { // SPURIOUS: unused variable 'val'
+    while let Some(val) = next2 {
         total += val;
         next2 = None;
     }
@@ -212,7 +214,7 @@ fn if_lets() {
     let c = Some(60);
     match c {
         Some(val) => { // BAD: unused variable
-        },
+        }
         None => { // SPURIOUS: unused variable 'None'
         }
     }
@@ -221,7 +223,7 @@ fn if_lets() {
     match d {
         Some(val) => {
             total += val;
-        },
+        }
         None => { // SPURIOUS: unused variable 'None'
         }
     }
@@ -229,17 +231,14 @@ fn if_lets() {
     let e = MyOption::Some(80);
     match e {
         MyOption::Some(val) => { // BAD: unused variable
-        },
-        MyOption::None => {
         }
+        MyOption::None => {}
     }
 
     let f = YesOrNo::Yes;
     match f {
-        YesOrNo::Yes => {
-        },
-        YesOrNo::No => {
-        },
+        YesOrNo::Yes => {}
+        YesOrNo::No => {}
     }
 }
 

From ccaf2dd9ea1e381d75b38f478ac9d183e8b871cb Mon Sep 17 00:00:00 2001
From: Geoffrey White <40627776+geoffw0@users.noreply.github.com>
Date: Thu, 3 Oct 2024 13:37:15 +0100
Subject: [PATCH 153/347] Rust: Temporarily limit results (hopefully enough for
 the DCA job to cope).

---
 rust/ql/src/queries/unusedentities/UnusedVariable.ql | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/rust/ql/src/queries/unusedentities/UnusedVariable.ql b/rust/ql/src/queries/unusedentities/UnusedVariable.ql
index 5fb0cdfecdc1..f6be18b76e15 100644
--- a/rust/ql/src/queries/unusedentities/UnusedVariable.ql
+++ b/rust/ql/src/queries/unusedentities/UnusedVariable.ql
@@ -14,5 +14,6 @@ from Variable v
 where
   not exists(v.getAnAccess()) and
   not exists(v.getInitializer()) and
-  not v.getName().charAt(0) = "_"
+  not v.getName().charAt(0) = "_" and
+  exists(File f | f.getBaseName() = "main.rs" | v.getLocation().getFile() = f) // temporarily severely limit results
 select v, "Variable is not used."

From 2e772a80c4bed04c04083e6f8eb2c20e4dc8effb Mon Sep 17 00:00:00 2001
From: Geoffrey White <40627776+geoffw0@users.noreply.github.com>
Date: Thu, 3 Oct 2024 15:15:32 +0100
Subject: [PATCH 154/347] Rust: Accept minor consistency .expected changes.

---
 .../utf8/CONSISTENCY/ExtractionConsistency.expected              | 1 +
 .../diagnostics/CONSISTENCY/ExtractionConsistency.expected       | 1 +
 2 files changed, 2 insertions(+)

diff --git a/rust/ql/test/extractor-tests/utf8/CONSISTENCY/ExtractionConsistency.expected b/rust/ql/test/extractor-tests/utf8/CONSISTENCY/ExtractionConsistency.expected
index 23b423a489a1..45026be3af2b 100644
--- a/rust/ql/test/extractor-tests/utf8/CONSISTENCY/ExtractionConsistency.expected
+++ b/rust/ql/test/extractor-tests/utf8/CONSISTENCY/ExtractionConsistency.expected
@@ -1,3 +1,4 @@
+extractionWarning
 | lib.rs:3:9:3:8 | expected `;` or `{` |
 | lib.rs:3:9:3:8 | expected an item |
 | lib.rs:3:21:3:20 | expected BANG |
diff --git a/rust/ql/test/query-tests/diagnostics/CONSISTENCY/ExtractionConsistency.expected b/rust/ql/test/query-tests/diagnostics/CONSISTENCY/ExtractionConsistency.expected
index 157aafc87852..0d5ffb095614 100644
--- a/rust/ql/test/query-tests/diagnostics/CONSISTENCY/ExtractionConsistency.expected
+++ b/rust/ql/test/query-tests/diagnostics/CONSISTENCY/ExtractionConsistency.expected
@@ -1,3 +1,4 @@
+extractionWarning
 | does_not_compile.rs:2:6:2:5 | expected SEMICOLON |
 | does_not_compile.rs:2:9:2:8 | expected SEMICOLON |
 | does_not_compile.rs:2:13:2:12 | expected SEMICOLON |

From 4c7ec59306a432242f510618611f4fddf3099cc3 Mon Sep 17 00:00:00 2001
From: Geoffrey White <40627776+geoffw0@users.noreply.github.com>
Date: Thu, 3 Oct 2024 14:16:12 +0100
Subject: [PATCH 155/347] Ruby: Sync identical files.

---
 ruby/ql/lib/codeql/ruby/Diagnostics.qll | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/ruby/ql/lib/codeql/ruby/Diagnostics.qll b/ruby/ql/lib/codeql/ruby/Diagnostics.qll
index 5902bb594141..58de14b8fcf5 100644
--- a/ruby/ql/lib/codeql/ruby/Diagnostics.qll
+++ b/ruby/ql/lib/codeql/ruby/Diagnostics.qll
@@ -48,7 +48,8 @@ class Diagnostic extends @diagnostic {
   string toString() { result = this.getMessage() }
 }
 
-/** A diagnostic relating to a particular error in extracting a file. */
-class ExtractionError extends Diagnostic {
-  ExtractionError() { this.getTag() = "parse_error" }
-}
+/** A diagnostic that is error severity. */
+class ExtractionError extends Diagnostic, @diagnostic_error { }
+
+/** A diagnostic that is warning severity. */
+class ExtractionWarning extends Diagnostic, @diagnostic_warning { }

From 1ea94faccf7113ae339190c1151926184fbbfe7d Mon Sep 17 00:00:00 2001
From: Geoffrey White <40627776+geoffw0@users.noreply.github.com>
Date: Thu, 3 Oct 2024 17:27:52 +0100
Subject: [PATCH 156/347] Ruby: Make similar changes to differentiate
 extraction errors and warnings, and mostly restore original behaviour.

---
 ruby/ql/consistency-queries/AstConsistency.ql  |  2 ++
 ruby/ql/lib/codeql/files/FileSystem.qll        | 18 ++++++++++++++++++
 .../NumberOfFilesExtractedWithErrors.ql        |  7 ++++---
 .../NumberOfSuccessfullyExtractedFiles.ql      |  8 +++-----
 .../CONSISTENCY/AstConsistency.expected        |  2 +-
 .../diagnostics/ExtractionErrors.expected      |  1 -
 6 files changed, 28 insertions(+), 10 deletions(-)

diff --git a/ruby/ql/consistency-queries/AstConsistency.ql b/ruby/ql/consistency-queries/AstConsistency.ql
index 2a9fea8fea90..d7792a8ae4d0 100644
--- a/ruby/ql/consistency-queries/AstConsistency.ql
+++ b/ruby/ql/consistency-queries/AstConsistency.ql
@@ -31,3 +31,5 @@ query predicate multipleToString(AstNode n, string s) {
 }
 
 query predicate extractionError(ExtractionError error) { any() }
+
+query predicate extractionWarning(ExtractionWarning error) { any() }
diff --git a/ruby/ql/lib/codeql/files/FileSystem.qll b/ruby/ql/lib/codeql/files/FileSystem.qll
index 528dde52fd91..8985cc333447 100644
--- a/ruby/ql/lib/codeql/files/FileSystem.qll
+++ b/ruby/ql/lib/codeql/files/FileSystem.qll
@@ -2,6 +2,7 @@
 
 private import codeql.Locations
 private import codeql.util.FileSystem
+private import codeql.ruby.Diagnostics
 
 private module Input implements InputSig {
   abstract class ContainerBase extends @container {
@@ -34,3 +35,20 @@ class File extends Container, Impl::File {
   /** Holds if this file was extracted from ordinary source code. */
   predicate fromSource() { any() }
 }
+
+/**
+ * A successfully extracted file, that is, a file that was extracted and
+ * contains no extraction errors or warnings.
+ */
+class SuccessfullyExtractedFile extends File {
+  SuccessfullyExtractedFile() {
+    not exists(Diagnostic d |
+      d.getLocation().getFile() = this and
+      (
+        d instanceof ExtractionError
+        or
+        d instanceof ExtractionWarning
+      )
+    )
+  }
+}
diff --git a/ruby/ql/src/queries/summary/NumberOfFilesExtractedWithErrors.ql b/ruby/ql/src/queries/summary/NumberOfFilesExtractedWithErrors.ql
index 8623ed911d5a..1cbc28b6cc6b 100644
--- a/ruby/ql/src/queries/summary/NumberOfFilesExtractedWithErrors.ql
+++ b/ruby/ql/src/queries/summary/NumberOfFilesExtractedWithErrors.ql
@@ -2,14 +2,15 @@
  * @id rb/summary/number-of-files-extracted-with-errors
  * @name Total number of Ruby files that were extracted with errors
  * @description The total number of Ruby code files that we extracted, but where
- *  at least one extraction error occurred in the process.
+ *  at least one extraction error (or warning) occurred in the process.
  * @kind metric
  * @tags summary
  */
 
 import codeql.ruby.AST
-import codeql.ruby.Diagnostics
+import codeql.files.FileSystem
 
 select count(File f |
-    exists(ExtractionError e | e.getLocation().getFile() = f) and exists(f.getRelativePath())
+    exists(f.getRelativePath()) and
+    not f instanceof SuccessfullyExtractedFile
   )
diff --git a/ruby/ql/src/queries/summary/NumberOfSuccessfullyExtractedFiles.ql b/ruby/ql/src/queries/summary/NumberOfSuccessfullyExtractedFiles.ql
index 236374ff2261..afd667cf58c5 100644
--- a/ruby/ql/src/queries/summary/NumberOfSuccessfullyExtractedFiles.ql
+++ b/ruby/ql/src/queries/summary/NumberOfSuccessfullyExtractedFiles.ql
@@ -2,14 +2,12 @@
  * @id rb/summary/number-of-successfully-extracted-files
  * @name Total number of Ruby files that were extracted without error
  * @description The total number of Ruby code files that we extracted without
- *   encountering any extraction errors
+ *   encountering any extraction errors (or warnings).
  * @kind metric
  * @tags summary
  */
 
 import codeql.ruby.AST
-import codeql.ruby.Diagnostics
+import codeql.files.FileSystem
 
-select count(File f |
-    not exists(ExtractionError e | e.getLocation().getFile() = f) and exists(f.getRelativePath())
-  )
+select count(SuccessfullyExtractedFile f | exists(f.getRelativePath()))
diff --git a/ruby/ql/test/query-tests/diagnostics/CONSISTENCY/AstConsistency.expected b/ruby/ql/test/query-tests/diagnostics/CONSISTENCY/AstConsistency.expected
index 5dc14116b917..93df75151a77 100644
--- a/ruby/ql/test/query-tests/diagnostics/CONSISTENCY/AstConsistency.expected
+++ b/ruby/ql/test/query-tests/diagnostics/CONSISTENCY/AstConsistency.expected
@@ -1,2 +1,2 @@
-extractionError
+extractionWarning
 | src/not_ruby.rb:5:25:5:26 | A parse error occurred. Check the syntax of the file. If the file is invalid, correct the error or exclude the file from analysis. |
diff --git a/ruby/ql/test/query-tests/diagnostics/ExtractionErrors.expected b/ruby/ql/test/query-tests/diagnostics/ExtractionErrors.expected
index dc37ca3642b3..e69de29bb2d1 100644
--- a/ruby/ql/test/query-tests/diagnostics/ExtractionErrors.expected
+++ b/ruby/ql/test/query-tests/diagnostics/ExtractionErrors.expected
@@ -1 +0,0 @@
-| src/not_ruby.rb:5:25:5:26 | A parse error occurred. Check the syntax of the file. If the file is invalid, correct the error or exclude the file from analysis. | Extraction failed in src/not_ruby.rb with error A parse error occurred. Check the syntax of the file. If the file is invalid, correct the error or exclude the file from analysis. | 2 |

From 86cc2dc5a1e117b8a9f3e58c639c41d1509593d3 Mon Sep 17 00:00:00 2001
From: Geoffrey White <40627776+geoffw0@users.noreply.github.com>
Date: Thu, 3 Oct 2024 17:29:25 +0100
Subject: [PATCH 157/347] Ruby: Add rb/diagnostics/extraction-warnings so that
 we don't miss anything we had before.

---
 .../queries/diagnostics/ExtractionWarnings.ql | 19 +++++++++++++++++++
 .../diagnostics/ExtractionWarnings.expected   |  1 +
 .../diagnostics/ExtractionWarnings.qlref      |  1 +
 3 files changed, 21 insertions(+)
 create mode 100644 ruby/ql/src/queries/diagnostics/ExtractionWarnings.ql
 create mode 100644 ruby/ql/test/query-tests/diagnostics/ExtractionWarnings.expected
 create mode 100644 ruby/ql/test/query-tests/diagnostics/ExtractionWarnings.qlref

diff --git a/ruby/ql/src/queries/diagnostics/ExtractionWarnings.ql b/ruby/ql/src/queries/diagnostics/ExtractionWarnings.ql
new file mode 100644
index 000000000000..74f007390567
--- /dev/null
+++ b/ruby/ql/src/queries/diagnostics/ExtractionWarnings.ql
@@ -0,0 +1,19 @@
+/**
+ * @name Extraction warnings
+ * @description List all extraction warnings for files in the source code directory.
+ * @kind diagnostic
+ * @id rb/diagnostics/extraction-warnings
+ */
+
+import codeql.ruby.AST
+import codeql.ruby.Diagnostics
+
+/** Gets the SARIF severity to associate with a warning. */
+int getSeverity() { result = 1 }
+
+from ExtractionWarning warning, File f
+where
+  f = warning.getLocation().getFile() and
+  exists(f.getRelativePath())
+select warning, "Extraction warning in " + f + " with message " + warning.getMessage(),
+  getSeverity()
diff --git a/ruby/ql/test/query-tests/diagnostics/ExtractionWarnings.expected b/ruby/ql/test/query-tests/diagnostics/ExtractionWarnings.expected
new file mode 100644
index 000000000000..c47ec9c5d365
--- /dev/null
+++ b/ruby/ql/test/query-tests/diagnostics/ExtractionWarnings.expected
@@ -0,0 +1 @@
+| src/not_ruby.rb:5:25:5:26 | A parse error occurred. Check the syntax of the file. If the file is invalid, correct the error or exclude the file from analysis. | Extraction warning in src/not_ruby.rb with message A parse error occurred. Check the syntax of the file. If the file is invalid, correct the error or exclude the file from analysis. | 1 |
diff --git a/ruby/ql/test/query-tests/diagnostics/ExtractionWarnings.qlref b/ruby/ql/test/query-tests/diagnostics/ExtractionWarnings.qlref
new file mode 100644
index 000000000000..ff6e566d20a7
--- /dev/null
+++ b/ruby/ql/test/query-tests/diagnostics/ExtractionWarnings.qlref
@@ -0,0 +1 @@
+queries/diagnostics/ExtractionWarnings.ql

From d4414dabff35e74aace2743596d31108ad4cdb5e Mon Sep 17 00:00:00 2001
From: Geoffrey White <40627776+geoffw0@users.noreply.github.com>
Date: Thu, 3 Oct 2024 17:38:28 +0100
Subject: [PATCH 158/347] Ruby: Add change notes.

---
 ruby/ql/lib/change-notes/2024-10-03-extraction-warnings.md | 4 ++++
 ruby/ql/src/change-notes/2024-10-03-extraction-warnings.md | 4 ++++
 2 files changed, 8 insertions(+)
 create mode 100644 ruby/ql/lib/change-notes/2024-10-03-extraction-warnings.md
 create mode 100644 ruby/ql/src/change-notes/2024-10-03-extraction-warnings.md

diff --git a/ruby/ql/lib/change-notes/2024-10-03-extraction-warnings.md b/ruby/ql/lib/change-notes/2024-10-03-extraction-warnings.md
new file mode 100644
index 000000000000..5d6128354c3b
--- /dev/null
+++ b/ruby/ql/lib/change-notes/2024-10-03-extraction-warnings.md
@@ -0,0 +1,4 @@
+---
+category: minorAnalysis
+---
+* The `ExtractionError` class has been split into `ExtractionError` and `ExtractionWarning`, reporting extraction errors and warnings respectively.
diff --git a/ruby/ql/src/change-notes/2024-10-03-extraction-warnings.md b/ruby/ql/src/change-notes/2024-10-03-extraction-warnings.md
new file mode 100644
index 000000000000..ac97cd1e7ba2
--- /dev/null
+++ b/ruby/ql/src/change-notes/2024-10-03-extraction-warnings.md
@@ -0,0 +1,4 @@
+---
+category: minorAnalysis
+---
+* The `rb/diagnostics/extraction-errors` diagnostic query has been split into `rb/diagnostics/extraction-errors` and `rb/diagnostics/extraction-warnings`, counting extraction errors and warnings respectively.

From 05f85497ed8fd150e639a66bc47e6af65252e006 Mon Sep 17 00:00:00 2001
From: Tom Hvitved <hvitved@github.com>
Date: Thu, 3 Oct 2024 13:33:13 +0200
Subject: [PATCH 159/347] Rust: Add `&mut` variable tests

---
 .../test/library-tests/variables/Cfg.expected | 1291 +++++++++--------
 .../variables/variables.expected              |  553 +++----
 .../test/library-tests/variables/variables.ql |   11 +-
 .../test/library-tests/variables/variables.rs |  205 +--
 4 files changed, 1111 insertions(+), 949 deletions(-)

diff --git a/rust/ql/test/library-tests/variables/Cfg.expected b/rust/ql/test/library-tests/variables/Cfg.expected
index 1ae43dac402e..55b09cf6ace7 100644
--- a/rust/ql/test/library-tests/variables/Cfg.expected
+++ b/rust/ql/test/library-tests/variables/Cfg.expected
@@ -1,616 +1,691 @@
 edges
-| variables.rs:1:1:3:1 | enter print_str | variables.rs:2:5:2:22 | ExprStmt |  |
-| variables.rs:1:1:3:1 | exit print_str (normal) | variables.rs:1:1:3:1 | exit print_str |  |
-| variables.rs:1:23:3:1 | BlockExpr | variables.rs:1:1:3:1 | exit print_str (normal) |  |
-| variables.rs:2:5:2:21 | MacroExpr | variables.rs:1:23:3:1 | BlockExpr |  |
-| variables.rs:2:5:2:22 | ExprStmt | variables.rs:2:5:2:21 | MacroExpr |  |
-| variables.rs:5:1:7:1 | enter print_i64 | variables.rs:6:5:6:22 | ExprStmt |  |
-| variables.rs:5:1:7:1 | exit print_i64 (normal) | variables.rs:5:1:7:1 | exit print_i64 |  |
-| variables.rs:5:22:7:1 | BlockExpr | variables.rs:5:1:7:1 | exit print_i64 (normal) |  |
-| variables.rs:6:5:6:21 | MacroExpr | variables.rs:5:22:7:1 | BlockExpr |  |
-| variables.rs:6:5:6:22 | ExprStmt | variables.rs:6:5:6:21 | MacroExpr |  |
-| variables.rs:9:1:12:1 | enter immutable_variable | variables.rs:10:5:10:17 | LetStmt |  |
-| variables.rs:9:1:12:1 | exit immutable_variable (normal) | variables.rs:9:1:12:1 | exit immutable_variable |  |
-| variables.rs:9:25:12:1 | BlockExpr | variables.rs:9:1:12:1 | exit immutable_variable (normal) |  |
-| variables.rs:10:5:10:17 | LetStmt | variables.rs:10:14:10:16 | "a" |  |
-| variables.rs:10:9:10:10 | x1 | variables.rs:11:5:11:18 | ExprStmt | match, no-match |
-| variables.rs:10:14:10:16 | "a" | variables.rs:10:9:10:10 | x1 |  |
-| variables.rs:11:5:11:13 | PathExpr | variables.rs:11:15:11:16 | x1 |  |
-| variables.rs:11:5:11:17 | CallExpr | variables.rs:9:25:12:1 | BlockExpr |  |
-| variables.rs:11:5:11:18 | ExprStmt | variables.rs:11:5:11:13 | PathExpr |  |
-| variables.rs:11:15:11:16 | x1 | variables.rs:11:5:11:17 | CallExpr |  |
-| variables.rs:14:1:19:1 | enter mutable_variable | variables.rs:15:5:15:19 | LetStmt |  |
-| variables.rs:14:1:19:1 | exit mutable_variable (normal) | variables.rs:14:1:19:1 | exit mutable_variable |  |
-| variables.rs:14:23:19:1 | BlockExpr | variables.rs:14:1:19:1 | exit mutable_variable (normal) |  |
-| variables.rs:15:5:15:19 | LetStmt | variables.rs:15:18:15:18 | 4 |  |
-| variables.rs:15:9:15:14 | x2 | variables.rs:16:5:16:18 | ExprStmt | match, no-match |
-| variables.rs:15:18:15:18 | 4 | variables.rs:15:9:15:14 | x2 |  |
-| variables.rs:16:5:16:13 | PathExpr | variables.rs:16:15:16:16 | x2 |  |
-| variables.rs:16:5:16:17 | CallExpr | variables.rs:17:5:17:11 | ExprStmt |  |
-| variables.rs:16:5:16:18 | ExprStmt | variables.rs:16:5:16:13 | PathExpr |  |
-| variables.rs:16:15:16:16 | x2 | variables.rs:16:5:16:17 | CallExpr |  |
-| variables.rs:17:5:17:6 | x2 | variables.rs:17:10:17:10 | 5 |  |
-| variables.rs:17:5:17:10 | ... = ... | variables.rs:18:5:18:18 | ExprStmt |  |
-| variables.rs:17:5:17:11 | ExprStmt | variables.rs:17:5:17:6 | x2 |  |
-| variables.rs:17:10:17:10 | 5 | variables.rs:17:5:17:10 | ... = ... |  |
+| variables.rs:3:1:5:1 | enter print_str | variables.rs:4:5:4:22 | ExprStmt |  |
+| variables.rs:3:1:5:1 | exit print_str (normal) | variables.rs:3:1:5:1 | exit print_str |  |
+| variables.rs:3:23:5:1 | BlockExpr | variables.rs:3:1:5:1 | exit print_str (normal) |  |
+| variables.rs:4:5:4:21 | MacroExpr | variables.rs:3:23:5:1 | BlockExpr |  |
+| variables.rs:4:5:4:22 | ExprStmt | variables.rs:4:5:4:21 | MacroExpr |  |
+| variables.rs:7:1:9:1 | enter print_i64 | variables.rs:8:5:8:22 | ExprStmt |  |
+| variables.rs:7:1:9:1 | exit print_i64 (normal) | variables.rs:7:1:9:1 | exit print_i64 |  |
+| variables.rs:7:22:9:1 | BlockExpr | variables.rs:7:1:9:1 | exit print_i64 (normal) |  |
+| variables.rs:8:5:8:21 | MacroExpr | variables.rs:7:22:9:1 | BlockExpr |  |
+| variables.rs:8:5:8:22 | ExprStmt | variables.rs:8:5:8:21 | MacroExpr |  |
+| variables.rs:11:1:14:1 | enter immutable_variable | variables.rs:12:5:12:17 | LetStmt |  |
+| variables.rs:11:1:14:1 | exit immutable_variable (normal) | variables.rs:11:1:14:1 | exit immutable_variable |  |
+| variables.rs:11:25:14:1 | BlockExpr | variables.rs:11:1:14:1 | exit immutable_variable (normal) |  |
+| variables.rs:12:5:12:17 | LetStmt | variables.rs:12:14:12:16 | "a" |  |
+| variables.rs:12:9:12:10 | x1 | variables.rs:13:5:13:18 | ExprStmt | match, no-match |
+| variables.rs:12:14:12:16 | "a" | variables.rs:12:9:12:10 | x1 |  |
+| variables.rs:13:5:13:13 | PathExpr | variables.rs:13:15:13:16 | x1 |  |
+| variables.rs:13:5:13:17 | CallExpr | variables.rs:11:25:14:1 | BlockExpr |  |
+| variables.rs:13:5:13:18 | ExprStmt | variables.rs:13:5:13:13 | PathExpr |  |
+| variables.rs:13:15:13:16 | x1 | variables.rs:13:5:13:17 | CallExpr |  |
+| variables.rs:16:1:21:1 | enter mutable_variable | variables.rs:17:5:17:19 | LetStmt |  |
+| variables.rs:16:1:21:1 | exit mutable_variable (normal) | variables.rs:16:1:21:1 | exit mutable_variable |  |
+| variables.rs:16:23:21:1 | BlockExpr | variables.rs:16:1:21:1 | exit mutable_variable (normal) |  |
+| variables.rs:17:5:17:19 | LetStmt | variables.rs:17:18:17:18 | 4 |  |
+| variables.rs:17:9:17:14 | x2 | variables.rs:18:5:18:18 | ExprStmt | match, no-match |
+| variables.rs:17:18:17:18 | 4 | variables.rs:17:9:17:14 | x2 |  |
 | variables.rs:18:5:18:13 | PathExpr | variables.rs:18:15:18:16 | x2 |  |
-| variables.rs:18:5:18:17 | CallExpr | variables.rs:14:23:19:1 | BlockExpr |  |
+| variables.rs:18:5:18:17 | CallExpr | variables.rs:19:5:19:11 | ExprStmt |  |
 | variables.rs:18:5:18:18 | ExprStmt | variables.rs:18:5:18:13 | PathExpr |  |
 | variables.rs:18:15:18:16 | x2 | variables.rs:18:5:18:17 | CallExpr |  |
-| variables.rs:21:1:27:1 | enter variable_shadow1 | variables.rs:22:5:22:15 | LetStmt |  |
-| variables.rs:21:1:27:1 | exit variable_shadow1 (normal) | variables.rs:21:1:27:1 | exit variable_shadow1 |  |
-| variables.rs:21:23:27:1 | BlockExpr | variables.rs:21:1:27:1 | exit variable_shadow1 (normal) |  |
-| variables.rs:22:5:22:15 | LetStmt | variables.rs:22:14:22:14 | 1 |  |
-| variables.rs:22:9:22:10 | x3 | variables.rs:23:5:23:18 | ExprStmt | match, no-match |
-| variables.rs:22:14:22:14 | 1 | variables.rs:22:9:22:10 | x3 |  |
-| variables.rs:23:5:23:13 | PathExpr | variables.rs:23:15:23:16 | x3 |  |
-| variables.rs:23:5:23:17 | CallExpr | variables.rs:24:5:25:15 | LetStmt |  |
-| variables.rs:23:5:23:18 | ExprStmt | variables.rs:23:5:23:13 | PathExpr |  |
-| variables.rs:23:15:23:16 | x3 | variables.rs:23:5:23:17 | CallExpr |  |
-| variables.rs:24:5:25:15 | LetStmt | variables.rs:25:9:25:10 | x3 |  |
-| variables.rs:24:9:24:10 | x3 | variables.rs:26:5:26:18 | ExprStmt | match, no-match |
-| variables.rs:25:9:25:10 | x3 | variables.rs:25:14:25:14 | 1 |  |
-| variables.rs:25:9:25:14 | ... + ... | variables.rs:24:9:24:10 | x3 |  |
-| variables.rs:25:14:25:14 | 1 | variables.rs:25:9:25:14 | ... + ... |  |
-| variables.rs:26:5:26:13 | PathExpr | variables.rs:26:15:26:16 | x3 |  |
-| variables.rs:26:5:26:17 | CallExpr | variables.rs:21:23:27:1 | BlockExpr |  |
-| variables.rs:26:5:26:18 | ExprStmt | variables.rs:26:5:26:13 | PathExpr |  |
-| variables.rs:26:15:26:16 | x3 | variables.rs:26:5:26:17 | CallExpr |  |
-| variables.rs:29:1:37:1 | enter variable_shadow2 | variables.rs:30:5:30:17 | LetStmt |  |
-| variables.rs:29:1:37:1 | exit variable_shadow2 (normal) | variables.rs:29:1:37:1 | exit variable_shadow2 |  |
-| variables.rs:29:23:37:1 | BlockExpr | variables.rs:29:1:37:1 | exit variable_shadow2 (normal) |  |
-| variables.rs:30:5:30:17 | LetStmt | variables.rs:30:14:30:16 | "a" |  |
-| variables.rs:30:9:30:10 | x4 | variables.rs:31:5:31:18 | ExprStmt | match, no-match |
-| variables.rs:30:14:30:16 | "a" | variables.rs:30:9:30:10 | x4 |  |
-| variables.rs:31:5:31:13 | PathExpr | variables.rs:31:15:31:16 | x4 |  |
-| variables.rs:31:5:31:17 | CallExpr | variables.rs:32:5:35:5 | ExprStmt |  |
-| variables.rs:31:5:31:18 | ExprStmt | variables.rs:31:5:31:13 | PathExpr |  |
-| variables.rs:31:15:31:16 | x4 | variables.rs:31:5:31:17 | CallExpr |  |
-| variables.rs:32:5:35:5 | BlockExpr | variables.rs:36:5:36:18 | ExprStmt |  |
-| variables.rs:32:5:35:5 | ExprStmt | variables.rs:33:9:33:21 | LetStmt |  |
-| variables.rs:33:9:33:21 | LetStmt | variables.rs:33:18:33:20 | "b" |  |
-| variables.rs:33:13:33:14 | x4 | variables.rs:34:9:34:22 | ExprStmt | match, no-match |
-| variables.rs:33:18:33:20 | "b" | variables.rs:33:13:33:14 | x4 |  |
-| variables.rs:34:9:34:17 | PathExpr | variables.rs:34:19:34:20 | x4 |  |
-| variables.rs:34:9:34:21 | CallExpr | variables.rs:32:5:35:5 | BlockExpr |  |
-| variables.rs:34:9:34:22 | ExprStmt | variables.rs:34:9:34:17 | PathExpr |  |
-| variables.rs:34:19:34:20 | x4 | variables.rs:34:9:34:21 | CallExpr |  |
-| variables.rs:36:5:36:13 | PathExpr | variables.rs:36:15:36:16 | x4 |  |
-| variables.rs:36:5:36:17 | CallExpr | variables.rs:29:23:37:1 | BlockExpr |  |
-| variables.rs:36:5:36:18 | ExprStmt | variables.rs:36:5:36:13 | PathExpr |  |
-| variables.rs:36:15:36:16 | x4 | variables.rs:36:5:36:17 | CallExpr |  |
-| variables.rs:44:1:59:1 | enter let_pattern1 | variables.rs:45:5:54:47 | LetStmt |  |
-| variables.rs:44:1:59:1 | exit let_pattern1 (normal) | variables.rs:44:1:59:1 | exit let_pattern1 |  |
-| variables.rs:44:19:59:1 | BlockExpr | variables.rs:44:1:59:1 | exit let_pattern1 (normal) |  |
-| variables.rs:45:5:54:47 | LetStmt | variables.rs:54:11:54:13 | "a" |  |
-| variables.rs:45:9:54:5 | TuplePat | variables.rs:55:5:55:18 | ExprStmt | match |
-| variables.rs:54:9:54:46 | TupleExpr | variables.rs:45:9:54:5 | TuplePat |  |
-| variables.rs:54:10:54:19 | TupleExpr | variables.rs:54:33:54:35 | "x" |  |
-| variables.rs:54:11:54:13 | "a" | variables.rs:54:16:54:18 | "b" |  |
-| variables.rs:54:16:54:18 | "b" | variables.rs:54:10:54:19 | TupleExpr |  |
-| variables.rs:54:22:54:45 | RecordExpr | variables.rs:54:9:54:46 | TupleExpr |  |
-| variables.rs:54:33:54:35 | "x" | variables.rs:54:41:54:43 | "y" |  |
-| variables.rs:54:41:54:43 | "y" | variables.rs:54:22:54:45 | RecordExpr |  |
-| variables.rs:55:5:55:13 | PathExpr | variables.rs:55:15:55:16 | a1 |  |
-| variables.rs:55:5:55:17 | CallExpr | variables.rs:56:5:56:18 | ExprStmt |  |
-| variables.rs:55:5:55:18 | ExprStmt | variables.rs:55:5:55:13 | PathExpr |  |
-| variables.rs:55:15:55:16 | a1 | variables.rs:55:5:55:17 | CallExpr |  |
-| variables.rs:56:5:56:13 | PathExpr | variables.rs:56:15:56:16 | b1 |  |
-| variables.rs:56:5:56:17 | CallExpr | variables.rs:57:5:57:17 | ExprStmt |  |
-| variables.rs:56:5:56:18 | ExprStmt | variables.rs:56:5:56:13 | PathExpr |  |
-| variables.rs:56:15:56:16 | b1 | variables.rs:56:5:56:17 | CallExpr |  |
-| variables.rs:57:5:57:13 | PathExpr | variables.rs:57:15:57:15 | x |  |
-| variables.rs:57:5:57:16 | CallExpr | variables.rs:58:5:58:17 | ExprStmt |  |
-| variables.rs:57:5:57:17 | ExprStmt | variables.rs:57:5:57:13 | PathExpr |  |
-| variables.rs:57:15:57:15 | x | variables.rs:57:5:57:16 | CallExpr |  |
-| variables.rs:58:5:58:13 | PathExpr | variables.rs:58:15:58:15 | y |  |
-| variables.rs:58:5:58:16 | CallExpr | variables.rs:44:19:59:1 | BlockExpr |  |
-| variables.rs:58:5:58:17 | ExprStmt | variables.rs:58:5:58:13 | PathExpr |  |
-| variables.rs:58:15:58:15 | y | variables.rs:58:5:58:16 | CallExpr |  |
-| variables.rs:61:1:69:1 | enter let_pattern2 | variables.rs:62:5:62:38 | LetStmt |  |
-| variables.rs:61:1:69:1 | exit let_pattern2 (normal) | variables.rs:61:1:69:1 | exit let_pattern2 |  |
-| variables.rs:61:19:69:1 | BlockExpr | variables.rs:61:1:69:1 | exit let_pattern2 (normal) |  |
-| variables.rs:62:5:62:38 | LetStmt | variables.rs:62:25:62:27 | "a" |  |
-| variables.rs:62:9:62:10 | p1 | variables.rs:63:5:66:11 | LetStmt | match, no-match |
-| variables.rs:62:14:62:37 | RecordExpr | variables.rs:62:9:62:10 | p1 |  |
-| variables.rs:62:25:62:27 | "a" | variables.rs:62:33:62:35 | "b" |  |
-| variables.rs:62:33:62:35 | "b" | variables.rs:62:14:62:37 | RecordExpr |  |
-| variables.rs:63:5:66:11 | LetStmt | variables.rs:66:9:66:10 | p1 |  |
-| variables.rs:63:9:66:5 | RecordPat | variables.rs:67:5:67:18 | ExprStmt | match |
-| variables.rs:66:9:66:10 | p1 | variables.rs:63:9:66:5 | RecordPat |  |
-| variables.rs:67:5:67:13 | PathExpr | variables.rs:67:15:67:16 | a2 |  |
-| variables.rs:67:5:67:17 | CallExpr | variables.rs:68:5:68:18 | ExprStmt |  |
-| variables.rs:67:5:67:18 | ExprStmt | variables.rs:67:5:67:13 | PathExpr |  |
-| variables.rs:67:15:67:16 | a2 | variables.rs:67:5:67:17 | CallExpr |  |
-| variables.rs:68:5:68:13 | PathExpr | variables.rs:68:15:68:16 | b2 |  |
-| variables.rs:68:5:68:17 | CallExpr | variables.rs:61:19:69:1 | BlockExpr |  |
-| variables.rs:68:5:68:18 | ExprStmt | variables.rs:68:5:68:13 | PathExpr |  |
-| variables.rs:68:15:68:16 | b2 | variables.rs:68:5:68:17 | CallExpr |  |
-| variables.rs:71:1:78:1 | enter let_pattern3 | variables.rs:72:5:72:42 | LetStmt |  |
-| variables.rs:71:1:78:1 | exit let_pattern3 (normal) | variables.rs:71:1:78:1 | exit let_pattern3 |  |
-| variables.rs:71:19:78:1 | BlockExpr | variables.rs:71:1:78:1 | exit let_pattern3 (normal) |  |
-| variables.rs:72:5:72:42 | LetStmt | variables.rs:72:14:72:17 | PathExpr |  |
-| variables.rs:72:9:72:10 | s1 | variables.rs:74:8:75:12 | LetExpr | match, no-match |
-| variables.rs:72:14:72:17 | PathExpr | variables.rs:72:19:72:30 | PathExpr |  |
-| variables.rs:72:14:72:41 | CallExpr | variables.rs:72:9:72:10 | s1 |  |
-| variables.rs:72:19:72:30 | PathExpr | variables.rs:72:32:72:39 | "Hello!" |  |
-| variables.rs:72:19:72:40 | CallExpr | variables.rs:72:14:72:41 | CallExpr |  |
-| variables.rs:72:32:72:39 | "Hello!" | variables.rs:72:19:72:40 | CallExpr |  |
-| variables.rs:74:5:77:5 | IfExpr | variables.rs:71:19:78:1 | BlockExpr |  |
-| variables.rs:74:8:75:12 | LetExpr | variables.rs:74:12:74:23 | TupleStructPat |  |
-| variables.rs:74:12:74:23 | TupleStructPat | variables.rs:74:5:77:5 | IfExpr | no-match |
-| variables.rs:74:12:74:23 | TupleStructPat | variables.rs:76:9:76:22 | ExprStmt | match |
-| variables.rs:75:14:77:5 | BlockExpr | variables.rs:74:5:77:5 | IfExpr |  |
-| variables.rs:76:9:76:17 | PathExpr | variables.rs:76:19:76:20 | s2 |  |
-| variables.rs:76:9:76:21 | CallExpr | variables.rs:75:14:77:5 | BlockExpr |  |
-| variables.rs:76:9:76:22 | ExprStmt | variables.rs:76:9:76:17 | PathExpr |  |
-| variables.rs:76:19:76:20 | s2 | variables.rs:76:9:76:21 | CallExpr |  |
-| variables.rs:80:1:86:1 | enter let_pattern4 | variables.rs:81:5:84:6 | LetStmt |  |
-| variables.rs:80:1:86:1 | exit let_pattern4 (normal) | variables.rs:80:1:86:1 | exit let_pattern4 |  |
-| variables.rs:80:19:86:1 | BlockExpr | variables.rs:80:1:86:1 | exit let_pattern4 (normal) |  |
-| variables.rs:81:5:84:6 | LetStmt | variables.rs:81:34:81:37 | PathExpr |  |
-| variables.rs:81:9:81:16 | TupleStructPat | variables.rs:83:9:83:15 | MacroExpr | no-match |
-| variables.rs:81:9:81:16 | TupleStructPat | variables.rs:85:5:85:18 | ExprStmt | match |
-| variables.rs:81:34:81:37 | PathExpr | variables.rs:81:39:81:42 | "x5" |  |
-| variables.rs:81:34:81:43 | CallExpr | variables.rs:81:9:81:16 | TupleStructPat |  |
-| variables.rs:81:39:81:42 | "x5" | variables.rs:81:34:81:43 | CallExpr |  |
-| variables.rs:83:9:83:15 | MacroExpr | variables.rs:81:50:84:5 | BlockExpr |  |
-| variables.rs:85:5:85:13 | PathExpr | variables.rs:85:15:85:16 | x5 |  |
-| variables.rs:85:5:85:17 | CallExpr | variables.rs:80:19:86:1 | BlockExpr |  |
-| variables.rs:85:5:85:18 | ExprStmt | variables.rs:85:5:85:13 | PathExpr |  |
-| variables.rs:85:15:85:16 | x5 | variables.rs:85:5:85:17 | CallExpr |  |
-| variables.rs:88:1:95:1 | enter let_pattern5 | variables.rs:89:5:89:42 | LetStmt |  |
-| variables.rs:88:1:95:1 | exit let_pattern5 (normal) | variables.rs:88:1:95:1 | exit let_pattern5 |  |
-| variables.rs:88:19:95:1 | BlockExpr | variables.rs:88:1:95:1 | exit let_pattern5 (normal) |  |
-| variables.rs:89:5:89:42 | LetStmt | variables.rs:89:14:89:17 | PathExpr |  |
-| variables.rs:89:9:89:10 | s1 | variables.rs:91:11:92:12 | LetExpr | match, no-match |
-| variables.rs:89:14:89:17 | PathExpr | variables.rs:89:19:89:30 | PathExpr |  |
-| variables.rs:89:14:89:41 | CallExpr | variables.rs:89:9:89:10 | s1 |  |
-| variables.rs:89:19:89:30 | PathExpr | variables.rs:89:32:89:39 | "Hello!" |  |
-| variables.rs:89:19:89:40 | CallExpr | variables.rs:89:14:89:41 | CallExpr |  |
-| variables.rs:89:32:89:39 | "Hello!" | variables.rs:89:19:89:40 | CallExpr |  |
-| variables.rs:91:5:94:5 | WhileExpr | variables.rs:88:19:95:1 | BlockExpr |  |
-| variables.rs:91:11:92:12 | LetExpr | variables.rs:91:15:91:26 | TupleStructPat |  |
-| variables.rs:91:15:91:26 | TupleStructPat | variables.rs:91:5:94:5 | WhileExpr | no-match |
-| variables.rs:91:15:91:26 | TupleStructPat | variables.rs:93:9:93:22 | ExprStmt | match |
-| variables.rs:92:14:94:5 | BlockExpr | variables.rs:91:11:92:12 | LetExpr |  |
-| variables.rs:93:9:93:17 | PathExpr | variables.rs:93:19:93:20 | s2 |  |
-| variables.rs:93:9:93:21 | CallExpr | variables.rs:92:14:94:5 | BlockExpr |  |
-| variables.rs:93:9:93:22 | ExprStmt | variables.rs:93:9:93:17 | PathExpr |  |
-| variables.rs:93:19:93:20 | s2 | variables.rs:93:9:93:21 | CallExpr |  |
-| variables.rs:97:1:112:1 | enter match_pattern1 | variables.rs:98:5:98:21 | LetStmt |  |
-| variables.rs:97:1:112:1 | exit match_pattern1 (normal) | variables.rs:97:1:112:1 | exit match_pattern1 |  |
-| variables.rs:97:21:112:1 | BlockExpr | variables.rs:97:1:112:1 | exit match_pattern1 (normal) |  |
-| variables.rs:98:5:98:21 | LetStmt | variables.rs:98:14:98:17 | PathExpr |  |
-| variables.rs:98:9:98:10 | x6 | variables.rs:99:5:99:16 | LetStmt | match, no-match |
-| variables.rs:98:14:98:17 | PathExpr | variables.rs:98:19:98:19 | 5 |  |
-| variables.rs:98:14:98:20 | CallExpr | variables.rs:98:9:98:10 | x6 |  |
-| variables.rs:98:19:98:19 | 5 | variables.rs:98:14:98:20 | CallExpr |  |
-| variables.rs:99:5:99:16 | LetStmt | variables.rs:99:14:99:15 | 10 |  |
-| variables.rs:99:9:99:10 | y1 | variables.rs:101:5:109:5 | ExprStmt | match, no-match |
-| variables.rs:99:14:99:15 | 10 | variables.rs:99:9:99:10 | y1 |  |
-| variables.rs:101:5:109:5 | ExprStmt | variables.rs:101:11:101:12 | x6 |  |
-| variables.rs:101:5:109:5 | MatchExpr | variables.rs:111:5:111:18 | ExprStmt |  |
-| variables.rs:101:11:101:12 | x6 | variables.rs:102:9:102:16 | TupleStructPat |  |
-| variables.rs:102:9:102:16 | TupleStructPat | variables.rs:102:21:102:29 | PathExpr | match |
-| variables.rs:102:9:102:16 | TupleStructPat | variables.rs:103:9:103:16 | TupleStructPat | no-match |
-| variables.rs:102:21:102:29 | PathExpr | variables.rs:102:31:102:38 | "Got 50" |  |
-| variables.rs:102:21:102:39 | CallExpr | variables.rs:101:5:109:5 | MatchExpr |  |
-| variables.rs:102:31:102:38 | "Got 50" | variables.rs:102:21:102:39 | CallExpr |  |
-| variables.rs:103:9:103:16 | TupleStructPat | variables.rs:106:13:106:21 | PathExpr | match |
-| variables.rs:103:9:103:16 | TupleStructPat | variables.rs:108:9:108:12 | None | no-match |
-| variables.rs:105:9:107:9 | BlockExpr | variables.rs:101:5:109:5 | MatchExpr |  |
-| variables.rs:106:13:106:21 | PathExpr | variables.rs:106:23:106:24 | y1 |  |
-| variables.rs:106:13:106:25 | CallExpr | variables.rs:105:9:107:9 | BlockExpr |  |
-| variables.rs:106:23:106:24 | y1 | variables.rs:106:13:106:25 | CallExpr |  |
-| variables.rs:108:9:108:12 | None | variables.rs:108:17:108:25 | PathExpr | match |
-| variables.rs:108:17:108:25 | PathExpr | variables.rs:108:27:108:32 | "NONE" |  |
-| variables.rs:108:17:108:33 | CallExpr | variables.rs:101:5:109:5 | MatchExpr |  |
-| variables.rs:108:27:108:32 | "NONE" | variables.rs:108:17:108:33 | CallExpr |  |
-| variables.rs:111:5:111:13 | PathExpr | variables.rs:111:15:111:16 | y1 |  |
-| variables.rs:111:5:111:17 | CallExpr | variables.rs:97:21:112:1 | BlockExpr |  |
-| variables.rs:111:5:111:18 | ExprStmt | variables.rs:111:5:111:13 | PathExpr |  |
-| variables.rs:111:15:111:16 | y1 | variables.rs:111:5:111:17 | CallExpr |  |
-| variables.rs:114:1:139:1 | enter match_pattern2 | variables.rs:115:5:115:36 | LetStmt |  |
-| variables.rs:114:1:139:1 | exit match_pattern2 (normal) | variables.rs:114:1:139:1 | exit match_pattern2 |  |
-| variables.rs:114:21:139:1 | BlockExpr | variables.rs:114:1:139:1 | exit match_pattern2 (normal) |  |
-| variables.rs:115:5:115:36 | LetStmt | variables.rs:115:20:115:20 | 2 |  |
-| variables.rs:115:9:115:15 | numbers | variables.rs:117:5:127:5 | ExprStmt | match, no-match |
-| variables.rs:115:19:115:35 | TupleExpr | variables.rs:115:9:115:15 | numbers |  |
-| variables.rs:115:20:115:20 | 2 | variables.rs:115:23:115:23 | 4 |  |
-| variables.rs:115:23:115:23 | 4 | variables.rs:115:26:115:26 | 8 |  |
-| variables.rs:115:26:115:26 | 8 | variables.rs:115:29:115:30 | 16 |  |
-| variables.rs:115:29:115:30 | 16 | variables.rs:115:33:115:34 | 32 |  |
-| variables.rs:115:33:115:34 | 32 | variables.rs:115:19:115:35 | TupleExpr |  |
-| variables.rs:117:5:127:5 | ExprStmt | variables.rs:117:11:117:17 | numbers |  |
-| variables.rs:117:5:127:5 | MatchExpr | variables.rs:129:11:129:17 | numbers |  |
-| variables.rs:117:11:117:17 | numbers | variables.rs:118:9:122:9 | TuplePat |  |
-| variables.rs:118:9:122:9 | TuplePat | variables.rs:123:13:123:29 | ExprStmt | match |
-| variables.rs:122:14:126:9 | BlockExpr | variables.rs:117:5:127:5 | MatchExpr |  |
-| variables.rs:123:13:123:21 | PathExpr | variables.rs:123:23:123:27 | first |  |
-| variables.rs:123:13:123:28 | CallExpr | variables.rs:124:13:124:29 | ExprStmt |  |
-| variables.rs:123:13:123:29 | ExprStmt | variables.rs:123:13:123:21 | PathExpr |  |
-| variables.rs:123:23:123:27 | first | variables.rs:123:13:123:28 | CallExpr |  |
-| variables.rs:124:13:124:21 | PathExpr | variables.rs:124:23:124:27 | third |  |
-| variables.rs:124:13:124:28 | CallExpr | variables.rs:125:13:125:29 | ExprStmt |  |
-| variables.rs:124:13:124:29 | ExprStmt | variables.rs:124:13:124:21 | PathExpr |  |
-| variables.rs:124:23:124:27 | third | variables.rs:124:13:124:28 | CallExpr |  |
-| variables.rs:125:13:125:21 | PathExpr | variables.rs:125:23:125:27 | fifth |  |
-| variables.rs:125:13:125:28 | CallExpr | variables.rs:122:14:126:9 | BlockExpr |  |
+| variables.rs:19:5:19:6 | x2 | variables.rs:19:10:19:10 | 5 |  |
+| variables.rs:19:5:19:10 | ... = ... | variables.rs:20:5:20:18 | ExprStmt |  |
+| variables.rs:19:5:19:11 | ExprStmt | variables.rs:19:5:19:6 | x2 |  |
+| variables.rs:19:10:19:10 | 5 | variables.rs:19:5:19:10 | ... = ... |  |
+| variables.rs:20:5:20:13 | PathExpr | variables.rs:20:15:20:16 | x2 |  |
+| variables.rs:20:5:20:17 | CallExpr | variables.rs:16:23:21:1 | BlockExpr |  |
+| variables.rs:20:5:20:18 | ExprStmt | variables.rs:20:5:20:13 | PathExpr |  |
+| variables.rs:20:15:20:16 | x2 | variables.rs:20:5:20:17 | CallExpr |  |
+| variables.rs:23:1:29:1 | enter variable_shadow1 | variables.rs:24:5:24:15 | LetStmt |  |
+| variables.rs:23:1:29:1 | exit variable_shadow1 (normal) | variables.rs:23:1:29:1 | exit variable_shadow1 |  |
+| variables.rs:23:23:29:1 | BlockExpr | variables.rs:23:1:29:1 | exit variable_shadow1 (normal) |  |
+| variables.rs:24:5:24:15 | LetStmt | variables.rs:24:14:24:14 | 1 |  |
+| variables.rs:24:9:24:10 | x3 | variables.rs:25:5:25:18 | ExprStmt | match, no-match |
+| variables.rs:24:14:24:14 | 1 | variables.rs:24:9:24:10 | x3 |  |
+| variables.rs:25:5:25:13 | PathExpr | variables.rs:25:15:25:16 | x3 |  |
+| variables.rs:25:5:25:17 | CallExpr | variables.rs:26:5:27:15 | LetStmt |  |
+| variables.rs:25:5:25:18 | ExprStmt | variables.rs:25:5:25:13 | PathExpr |  |
+| variables.rs:25:15:25:16 | x3 | variables.rs:25:5:25:17 | CallExpr |  |
+| variables.rs:26:5:27:15 | LetStmt | variables.rs:27:9:27:10 | x3 |  |
+| variables.rs:26:9:26:10 | x3 | variables.rs:28:5:28:18 | ExprStmt | match, no-match |
+| variables.rs:27:9:27:10 | x3 | variables.rs:27:14:27:14 | 1 |  |
+| variables.rs:27:9:27:14 | ... + ... | variables.rs:26:9:26:10 | x3 |  |
+| variables.rs:27:14:27:14 | 1 | variables.rs:27:9:27:14 | ... + ... |  |
+| variables.rs:28:5:28:13 | PathExpr | variables.rs:28:15:28:16 | x3 |  |
+| variables.rs:28:5:28:17 | CallExpr | variables.rs:23:23:29:1 | BlockExpr |  |
+| variables.rs:28:5:28:18 | ExprStmt | variables.rs:28:5:28:13 | PathExpr |  |
+| variables.rs:28:15:28:16 | x3 | variables.rs:28:5:28:17 | CallExpr |  |
+| variables.rs:31:1:39:1 | enter variable_shadow2 | variables.rs:32:5:32:17 | LetStmt |  |
+| variables.rs:31:1:39:1 | exit variable_shadow2 (normal) | variables.rs:31:1:39:1 | exit variable_shadow2 |  |
+| variables.rs:31:23:39:1 | BlockExpr | variables.rs:31:1:39:1 | exit variable_shadow2 (normal) |  |
+| variables.rs:32:5:32:17 | LetStmt | variables.rs:32:14:32:16 | "a" |  |
+| variables.rs:32:9:32:10 | x4 | variables.rs:33:5:33:18 | ExprStmt | match, no-match |
+| variables.rs:32:14:32:16 | "a" | variables.rs:32:9:32:10 | x4 |  |
+| variables.rs:33:5:33:13 | PathExpr | variables.rs:33:15:33:16 | x4 |  |
+| variables.rs:33:5:33:17 | CallExpr | variables.rs:34:5:37:5 | ExprStmt |  |
+| variables.rs:33:5:33:18 | ExprStmt | variables.rs:33:5:33:13 | PathExpr |  |
+| variables.rs:33:15:33:16 | x4 | variables.rs:33:5:33:17 | CallExpr |  |
+| variables.rs:34:5:37:5 | BlockExpr | variables.rs:38:5:38:18 | ExprStmt |  |
+| variables.rs:34:5:37:5 | ExprStmt | variables.rs:35:9:35:21 | LetStmt |  |
+| variables.rs:35:9:35:21 | LetStmt | variables.rs:35:18:35:20 | "b" |  |
+| variables.rs:35:13:35:14 | x4 | variables.rs:36:9:36:22 | ExprStmt | match, no-match |
+| variables.rs:35:18:35:20 | "b" | variables.rs:35:13:35:14 | x4 |  |
+| variables.rs:36:9:36:17 | PathExpr | variables.rs:36:19:36:20 | x4 |  |
+| variables.rs:36:9:36:21 | CallExpr | variables.rs:34:5:37:5 | BlockExpr |  |
+| variables.rs:36:9:36:22 | ExprStmt | variables.rs:36:9:36:17 | PathExpr |  |
+| variables.rs:36:19:36:20 | x4 | variables.rs:36:9:36:21 | CallExpr |  |
+| variables.rs:38:5:38:13 | PathExpr | variables.rs:38:15:38:16 | x4 |  |
+| variables.rs:38:5:38:17 | CallExpr | variables.rs:31:23:39:1 | BlockExpr |  |
+| variables.rs:38:5:38:18 | ExprStmt | variables.rs:38:5:38:13 | PathExpr |  |
+| variables.rs:38:15:38:16 | x4 | variables.rs:38:5:38:17 | CallExpr |  |
+| variables.rs:46:1:61:1 | enter let_pattern1 | variables.rs:47:5:56:47 | LetStmt |  |
+| variables.rs:46:1:61:1 | exit let_pattern1 (normal) | variables.rs:46:1:61:1 | exit let_pattern1 |  |
+| variables.rs:46:19:61:1 | BlockExpr | variables.rs:46:1:61:1 | exit let_pattern1 (normal) |  |
+| variables.rs:47:5:56:47 | LetStmt | variables.rs:56:11:56:13 | "a" |  |
+| variables.rs:47:9:56:5 | TuplePat | variables.rs:57:5:57:18 | ExprStmt | match |
+| variables.rs:56:9:56:46 | TupleExpr | variables.rs:47:9:56:5 | TuplePat |  |
+| variables.rs:56:10:56:19 | TupleExpr | variables.rs:56:33:56:35 | "x" |  |
+| variables.rs:56:11:56:13 | "a" | variables.rs:56:16:56:18 | "b" |  |
+| variables.rs:56:16:56:18 | "b" | variables.rs:56:10:56:19 | TupleExpr |  |
+| variables.rs:56:22:56:45 | RecordExpr | variables.rs:56:9:56:46 | TupleExpr |  |
+| variables.rs:56:33:56:35 | "x" | variables.rs:56:41:56:43 | "y" |  |
+| variables.rs:56:41:56:43 | "y" | variables.rs:56:22:56:45 | RecordExpr |  |
+| variables.rs:57:5:57:13 | PathExpr | variables.rs:57:15:57:16 | a1 |  |
+| variables.rs:57:5:57:17 | CallExpr | variables.rs:58:5:58:18 | ExprStmt |  |
+| variables.rs:57:5:57:18 | ExprStmt | variables.rs:57:5:57:13 | PathExpr |  |
+| variables.rs:57:15:57:16 | a1 | variables.rs:57:5:57:17 | CallExpr |  |
+| variables.rs:58:5:58:13 | PathExpr | variables.rs:58:15:58:16 | b1 |  |
+| variables.rs:58:5:58:17 | CallExpr | variables.rs:59:5:59:17 | ExprStmt |  |
+| variables.rs:58:5:58:18 | ExprStmt | variables.rs:58:5:58:13 | PathExpr |  |
+| variables.rs:58:15:58:16 | b1 | variables.rs:58:5:58:17 | CallExpr |  |
+| variables.rs:59:5:59:13 | PathExpr | variables.rs:59:15:59:15 | x |  |
+| variables.rs:59:5:59:16 | CallExpr | variables.rs:60:5:60:17 | ExprStmt |  |
+| variables.rs:59:5:59:17 | ExprStmt | variables.rs:59:5:59:13 | PathExpr |  |
+| variables.rs:59:15:59:15 | x | variables.rs:59:5:59:16 | CallExpr |  |
+| variables.rs:60:5:60:13 | PathExpr | variables.rs:60:15:60:15 | y |  |
+| variables.rs:60:5:60:16 | CallExpr | variables.rs:46:19:61:1 | BlockExpr |  |
+| variables.rs:60:5:60:17 | ExprStmt | variables.rs:60:5:60:13 | PathExpr |  |
+| variables.rs:60:15:60:15 | y | variables.rs:60:5:60:16 | CallExpr |  |
+| variables.rs:63:1:71:1 | enter let_pattern2 | variables.rs:64:5:64:38 | LetStmt |  |
+| variables.rs:63:1:71:1 | exit let_pattern2 (normal) | variables.rs:63:1:71:1 | exit let_pattern2 |  |
+| variables.rs:63:19:71:1 | BlockExpr | variables.rs:63:1:71:1 | exit let_pattern2 (normal) |  |
+| variables.rs:64:5:64:38 | LetStmt | variables.rs:64:25:64:27 | "a" |  |
+| variables.rs:64:9:64:10 | p1 | variables.rs:65:5:68:11 | LetStmt | match, no-match |
+| variables.rs:64:14:64:37 | RecordExpr | variables.rs:64:9:64:10 | p1 |  |
+| variables.rs:64:25:64:27 | "a" | variables.rs:64:33:64:35 | "b" |  |
+| variables.rs:64:33:64:35 | "b" | variables.rs:64:14:64:37 | RecordExpr |  |
+| variables.rs:65:5:68:11 | LetStmt | variables.rs:68:9:68:10 | p1 |  |
+| variables.rs:65:9:68:5 | RecordPat | variables.rs:69:5:69:18 | ExprStmt | match |
+| variables.rs:68:9:68:10 | p1 | variables.rs:65:9:68:5 | RecordPat |  |
+| variables.rs:69:5:69:13 | PathExpr | variables.rs:69:15:69:16 | a2 |  |
+| variables.rs:69:5:69:17 | CallExpr | variables.rs:70:5:70:18 | ExprStmt |  |
+| variables.rs:69:5:69:18 | ExprStmt | variables.rs:69:5:69:13 | PathExpr |  |
+| variables.rs:69:15:69:16 | a2 | variables.rs:69:5:69:17 | CallExpr |  |
+| variables.rs:70:5:70:13 | PathExpr | variables.rs:70:15:70:16 | b2 |  |
+| variables.rs:70:5:70:17 | CallExpr | variables.rs:63:19:71:1 | BlockExpr |  |
+| variables.rs:70:5:70:18 | ExprStmt | variables.rs:70:5:70:13 | PathExpr |  |
+| variables.rs:70:15:70:16 | b2 | variables.rs:70:5:70:17 | CallExpr |  |
+| variables.rs:73:1:80:1 | enter let_pattern3 | variables.rs:74:5:74:42 | LetStmt |  |
+| variables.rs:73:1:80:1 | exit let_pattern3 (normal) | variables.rs:73:1:80:1 | exit let_pattern3 |  |
+| variables.rs:73:19:80:1 | BlockExpr | variables.rs:73:1:80:1 | exit let_pattern3 (normal) |  |
+| variables.rs:74:5:74:42 | LetStmt | variables.rs:74:14:74:17 | PathExpr |  |
+| variables.rs:74:9:74:10 | s1 | variables.rs:76:8:77:12 | LetExpr | match, no-match |
+| variables.rs:74:14:74:17 | PathExpr | variables.rs:74:19:74:30 | PathExpr |  |
+| variables.rs:74:14:74:41 | CallExpr | variables.rs:74:9:74:10 | s1 |  |
+| variables.rs:74:19:74:30 | PathExpr | variables.rs:74:32:74:39 | "Hello!" |  |
+| variables.rs:74:19:74:40 | CallExpr | variables.rs:74:14:74:41 | CallExpr |  |
+| variables.rs:74:32:74:39 | "Hello!" | variables.rs:74:19:74:40 | CallExpr |  |
+| variables.rs:76:5:79:5 | IfExpr | variables.rs:73:19:80:1 | BlockExpr |  |
+| variables.rs:76:8:77:12 | LetExpr | variables.rs:76:12:76:23 | TupleStructPat |  |
+| variables.rs:76:12:76:23 | TupleStructPat | variables.rs:76:5:79:5 | IfExpr | no-match |
+| variables.rs:76:12:76:23 | TupleStructPat | variables.rs:78:9:78:22 | ExprStmt | match |
+| variables.rs:77:14:79:5 | BlockExpr | variables.rs:76:5:79:5 | IfExpr |  |
+| variables.rs:78:9:78:17 | PathExpr | variables.rs:78:19:78:20 | s2 |  |
+| variables.rs:78:9:78:21 | CallExpr | variables.rs:77:14:79:5 | BlockExpr |  |
+| variables.rs:78:9:78:22 | ExprStmt | variables.rs:78:9:78:17 | PathExpr |  |
+| variables.rs:78:19:78:20 | s2 | variables.rs:78:9:78:21 | CallExpr |  |
+| variables.rs:82:1:88:1 | enter let_pattern4 | variables.rs:83:5:86:10 | LetStmt |  |
+| variables.rs:82:1:88:1 | exit let_pattern4 (normal) | variables.rs:82:1:88:1 | exit let_pattern4 |  |
+| variables.rs:82:19:88:1 | BlockExpr | variables.rs:82:1:88:1 | exit let_pattern4 (normal) |  |
+| variables.rs:83:5:86:10 | LetStmt | variables.rs:83:34:83:37 | PathExpr |  |
+| variables.rs:83:9:83:16 | TupleStructPat | variables.rs:85:13:85:19 | MacroExpr | no-match |
+| variables.rs:83:9:83:16 | TupleStructPat | variables.rs:87:5:87:18 | ExprStmt | match |
+| variables.rs:83:34:83:37 | PathExpr | variables.rs:83:39:83:42 | "x5" |  |
+| variables.rs:83:34:83:43 | CallExpr | variables.rs:83:9:83:16 | TupleStructPat |  |
+| variables.rs:83:39:83:42 | "x5" | variables.rs:83:34:83:43 | CallExpr |  |
+| variables.rs:85:13:85:19 | MacroExpr | variables.rs:84:14:86:9 | BlockExpr |  |
+| variables.rs:87:5:87:13 | PathExpr | variables.rs:87:15:87:16 | x5 |  |
+| variables.rs:87:5:87:17 | CallExpr | variables.rs:82:19:88:1 | BlockExpr |  |
+| variables.rs:87:5:87:18 | ExprStmt | variables.rs:87:5:87:13 | PathExpr |  |
+| variables.rs:87:15:87:16 | x5 | variables.rs:87:5:87:17 | CallExpr |  |
+| variables.rs:90:1:97:1 | enter let_pattern5 | variables.rs:91:5:91:42 | LetStmt |  |
+| variables.rs:90:1:97:1 | exit let_pattern5 (normal) | variables.rs:90:1:97:1 | exit let_pattern5 |  |
+| variables.rs:90:19:97:1 | BlockExpr | variables.rs:90:1:97:1 | exit let_pattern5 (normal) |  |
+| variables.rs:91:5:91:42 | LetStmt | variables.rs:91:14:91:17 | PathExpr |  |
+| variables.rs:91:9:91:10 | s1 | variables.rs:93:11:94:12 | LetExpr | match, no-match |
+| variables.rs:91:14:91:17 | PathExpr | variables.rs:91:19:91:30 | PathExpr |  |
+| variables.rs:91:14:91:41 | CallExpr | variables.rs:91:9:91:10 | s1 |  |
+| variables.rs:91:19:91:30 | PathExpr | variables.rs:91:32:91:39 | "Hello!" |  |
+| variables.rs:91:19:91:40 | CallExpr | variables.rs:91:14:91:41 | CallExpr |  |
+| variables.rs:91:32:91:39 | "Hello!" | variables.rs:91:19:91:40 | CallExpr |  |
+| variables.rs:93:5:96:5 | WhileExpr | variables.rs:90:19:97:1 | BlockExpr |  |
+| variables.rs:93:11:94:12 | LetExpr | variables.rs:93:15:93:26 | TupleStructPat |  |
+| variables.rs:93:15:93:26 | TupleStructPat | variables.rs:93:5:96:5 | WhileExpr | no-match |
+| variables.rs:93:15:93:26 | TupleStructPat | variables.rs:95:9:95:22 | ExprStmt | match |
+| variables.rs:94:14:96:5 | BlockExpr | variables.rs:93:11:94:12 | LetExpr |  |
+| variables.rs:95:9:95:17 | PathExpr | variables.rs:95:19:95:20 | s2 |  |
+| variables.rs:95:9:95:21 | CallExpr | variables.rs:94:14:96:5 | BlockExpr |  |
+| variables.rs:95:9:95:22 | ExprStmt | variables.rs:95:9:95:17 | PathExpr |  |
+| variables.rs:95:19:95:20 | s2 | variables.rs:95:9:95:21 | CallExpr |  |
+| variables.rs:99:1:114:1 | enter match_pattern1 | variables.rs:100:5:100:21 | LetStmt |  |
+| variables.rs:99:1:114:1 | exit match_pattern1 (normal) | variables.rs:99:1:114:1 | exit match_pattern1 |  |
+| variables.rs:99:21:114:1 | BlockExpr | variables.rs:99:1:114:1 | exit match_pattern1 (normal) |  |
+| variables.rs:100:5:100:21 | LetStmt | variables.rs:100:14:100:17 | PathExpr |  |
+| variables.rs:100:9:100:10 | x6 | variables.rs:101:5:101:16 | LetStmt | match, no-match |
+| variables.rs:100:14:100:17 | PathExpr | variables.rs:100:19:100:19 | 5 |  |
+| variables.rs:100:14:100:20 | CallExpr | variables.rs:100:9:100:10 | x6 |  |
+| variables.rs:100:19:100:19 | 5 | variables.rs:100:14:100:20 | CallExpr |  |
+| variables.rs:101:5:101:16 | LetStmt | variables.rs:101:14:101:15 | 10 |  |
+| variables.rs:101:9:101:10 | y1 | variables.rs:103:5:111:5 | ExprStmt | match, no-match |
+| variables.rs:101:14:101:15 | 10 | variables.rs:101:9:101:10 | y1 |  |
+| variables.rs:103:5:111:5 | ExprStmt | variables.rs:103:11:103:12 | x6 |  |
+| variables.rs:103:5:111:5 | MatchExpr | variables.rs:113:5:113:18 | ExprStmt |  |
+| variables.rs:103:11:103:12 | x6 | variables.rs:104:9:104:16 | TupleStructPat |  |
+| variables.rs:104:9:104:16 | TupleStructPat | variables.rs:104:21:104:29 | PathExpr | match |
+| variables.rs:104:9:104:16 | TupleStructPat | variables.rs:105:9:105:16 | TupleStructPat | no-match |
+| variables.rs:104:21:104:29 | PathExpr | variables.rs:104:31:104:38 | "Got 50" |  |
+| variables.rs:104:21:104:39 | CallExpr | variables.rs:103:5:111:5 | MatchExpr |  |
+| variables.rs:104:31:104:38 | "Got 50" | variables.rs:104:21:104:39 | CallExpr |  |
+| variables.rs:105:9:105:16 | TupleStructPat | variables.rs:108:13:108:21 | PathExpr | match |
+| variables.rs:105:9:105:16 | TupleStructPat | variables.rs:110:9:110:12 | None | no-match |
+| variables.rs:107:9:109:9 | BlockExpr | variables.rs:103:5:111:5 | MatchExpr |  |
+| variables.rs:108:13:108:21 | PathExpr | variables.rs:108:23:108:24 | y1 |  |
+| variables.rs:108:13:108:25 | CallExpr | variables.rs:107:9:109:9 | BlockExpr |  |
+| variables.rs:108:23:108:24 | y1 | variables.rs:108:13:108:25 | CallExpr |  |
+| variables.rs:110:9:110:12 | None | variables.rs:110:17:110:25 | PathExpr | match |
+| variables.rs:110:17:110:25 | PathExpr | variables.rs:110:27:110:32 | "NONE" |  |
+| variables.rs:110:17:110:33 | CallExpr | variables.rs:103:5:111:5 | MatchExpr |  |
+| variables.rs:110:27:110:32 | "NONE" | variables.rs:110:17:110:33 | CallExpr |  |
+| variables.rs:113:5:113:13 | PathExpr | variables.rs:113:15:113:16 | y1 |  |
+| variables.rs:113:5:113:17 | CallExpr | variables.rs:99:21:114:1 | BlockExpr |  |
+| variables.rs:113:5:113:18 | ExprStmt | variables.rs:113:5:113:13 | PathExpr |  |
+| variables.rs:113:15:113:16 | y1 | variables.rs:113:5:113:17 | CallExpr |  |
+| variables.rs:116:1:141:1 | enter match_pattern2 | variables.rs:117:5:117:36 | LetStmt |  |
+| variables.rs:116:1:141:1 | exit match_pattern2 (normal) | variables.rs:116:1:141:1 | exit match_pattern2 |  |
+| variables.rs:116:21:141:1 | BlockExpr | variables.rs:116:1:141:1 | exit match_pattern2 (normal) |  |
+| variables.rs:117:5:117:36 | LetStmt | variables.rs:117:20:117:20 | 2 |  |
+| variables.rs:117:9:117:15 | numbers | variables.rs:119:5:129:5 | ExprStmt | match, no-match |
+| variables.rs:117:19:117:35 | TupleExpr | variables.rs:117:9:117:15 | numbers |  |
+| variables.rs:117:20:117:20 | 2 | variables.rs:117:23:117:23 | 4 |  |
+| variables.rs:117:23:117:23 | 4 | variables.rs:117:26:117:26 | 8 |  |
+| variables.rs:117:26:117:26 | 8 | variables.rs:117:29:117:30 | 16 |  |
+| variables.rs:117:29:117:30 | 16 | variables.rs:117:33:117:34 | 32 |  |
+| variables.rs:117:33:117:34 | 32 | variables.rs:117:19:117:35 | TupleExpr |  |
+| variables.rs:119:5:129:5 | ExprStmt | variables.rs:119:11:119:17 | numbers |  |
+| variables.rs:119:5:129:5 | MatchExpr | variables.rs:131:11:131:17 | numbers |  |
+| variables.rs:119:11:119:17 | numbers | variables.rs:120:9:124:9 | TuplePat |  |
+| variables.rs:120:9:124:9 | TuplePat | variables.rs:125:13:125:29 | ExprStmt | match |
+| variables.rs:124:14:128:9 | BlockExpr | variables.rs:119:5:129:5 | MatchExpr |  |
+| variables.rs:125:13:125:21 | PathExpr | variables.rs:125:23:125:27 | first |  |
+| variables.rs:125:13:125:28 | CallExpr | variables.rs:126:13:126:29 | ExprStmt |  |
 | variables.rs:125:13:125:29 | ExprStmt | variables.rs:125:13:125:21 | PathExpr |  |
-| variables.rs:125:23:125:27 | fifth | variables.rs:125:13:125:28 | CallExpr |  |
-| variables.rs:129:5:138:5 | MatchExpr | variables.rs:114:21:139:1 | BlockExpr |  |
-| variables.rs:129:11:129:17 | numbers | variables.rs:130:9:134:9 | TuplePat |  |
-| variables.rs:130:9:134:9 | TuplePat | variables.rs:135:13:135:29 | ExprStmt | match |
-| variables.rs:134:14:137:9 | BlockExpr | variables.rs:129:5:138:5 | MatchExpr |  |
-| variables.rs:135:13:135:21 | PathExpr | variables.rs:135:23:135:27 | first |  |
-| variables.rs:135:13:135:28 | CallExpr | variables.rs:136:13:136:28 | ExprStmt |  |
-| variables.rs:135:13:135:29 | ExprStmt | variables.rs:135:13:135:21 | PathExpr |  |
-| variables.rs:135:23:135:27 | first | variables.rs:135:13:135:28 | CallExpr |  |
-| variables.rs:136:13:136:21 | PathExpr | variables.rs:136:23:136:26 | last |  |
-| variables.rs:136:13:136:27 | CallExpr | variables.rs:134:14:137:9 | BlockExpr |  |
-| variables.rs:136:13:136:28 | ExprStmt | variables.rs:136:13:136:21 | PathExpr |  |
-| variables.rs:136:23:136:26 | last | variables.rs:136:13:136:27 | CallExpr |  |
-| variables.rs:141:1:149:1 | enter match_pattern3 | variables.rs:142:5:142:38 | LetStmt |  |
-| variables.rs:141:1:149:1 | exit match_pattern3 (normal) | variables.rs:141:1:149:1 | exit match_pattern3 |  |
-| variables.rs:141:21:149:1 | BlockExpr | variables.rs:141:1:149:1 | exit match_pattern3 (normal) |  |
-| variables.rs:142:5:142:38 | LetStmt | variables.rs:142:25:142:27 | "x" |  |
-| variables.rs:142:9:142:10 | p2 | variables.rs:144:11:144:12 | p2 | match, no-match |
-| variables.rs:142:14:142:37 | RecordExpr | variables.rs:142:9:142:10 | p2 |  |
-| variables.rs:142:25:142:27 | "x" | variables.rs:142:33:142:35 | "y" |  |
-| variables.rs:142:33:142:35 | "y" | variables.rs:142:14:142:37 | RecordExpr |  |
-| variables.rs:144:5:148:5 | MatchExpr | variables.rs:141:21:149:1 | BlockExpr |  |
-| variables.rs:144:11:144:12 | p2 | variables.rs:145:9:147:9 | RecordPat |  |
-| variables.rs:145:9:147:9 | RecordPat | variables.rs:147:14:147:22 | PathExpr | match |
-| variables.rs:147:14:147:22 | PathExpr | variables.rs:147:24:147:25 | x7 |  |
-| variables.rs:147:14:147:26 | CallExpr | variables.rs:144:5:148:5 | MatchExpr |  |
-| variables.rs:147:24:147:25 | x7 | variables.rs:147:14:147:26 | CallExpr |  |
-| variables.rs:155:1:168:1 | enter match_pattern4 | variables.rs:156:5:156:39 | LetStmt |  |
-| variables.rs:155:1:168:1 | exit match_pattern4 (normal) | variables.rs:155:1:168:1 | exit match_pattern4 |  |
-| variables.rs:155:21:168:1 | BlockExpr | variables.rs:155:1:168:1 | exit match_pattern4 (normal) |  |
-| variables.rs:156:5:156:39 | LetStmt | variables.rs:156:36:156:36 | 0 |  |
-| variables.rs:156:9:156:11 | msg | variables.rs:158:11:158:13 | msg | match, no-match |
-| variables.rs:156:15:156:38 | RecordExpr | variables.rs:156:9:156:11 | msg |  |
-| variables.rs:156:36:156:36 | 0 | variables.rs:156:15:156:38 | RecordExpr |  |
-| variables.rs:158:5:167:5 | MatchExpr | variables.rs:155:21:168:1 | BlockExpr |  |
-| variables.rs:158:11:158:13 | msg | variables.rs:159:9:161:9 | RecordPat |  |
-| variables.rs:159:9:161:9 | RecordPat | variables.rs:161:14:161:22 | PathExpr | match |
-| variables.rs:159:9:161:9 | RecordPat | variables.rs:162:9:162:38 | RecordPat | no-match |
-| variables.rs:161:14:161:22 | PathExpr | variables.rs:161:24:161:34 | id_variable |  |
-| variables.rs:161:14:161:35 | CallExpr | variables.rs:158:5:167:5 | MatchExpr |  |
-| variables.rs:161:24:161:34 | id_variable | variables.rs:161:14:161:35 | CallExpr |  |
-| variables.rs:162:9:162:38 | RecordPat | variables.rs:163:13:163:52 | MacroExpr | match |
-| variables.rs:162:9:162:38 | RecordPat | variables.rs:165:9:165:29 | RecordPat | no-match |
-| variables.rs:162:43:164:9 | BlockExpr | variables.rs:158:5:167:5 | MatchExpr |  |
-| variables.rs:163:13:163:52 | MacroExpr | variables.rs:162:43:164:9 | BlockExpr |  |
-| variables.rs:165:9:165:29 | RecordPat | variables.rs:166:13:166:21 | PathExpr | match |
-| variables.rs:166:13:166:21 | PathExpr | variables.rs:166:23:166:24 | id |  |
-| variables.rs:166:13:166:25 | CallExpr | variables.rs:158:5:167:5 | MatchExpr |  |
-| variables.rs:166:23:166:24 | id | variables.rs:166:13:166:25 | CallExpr |  |
-| variables.rs:175:1:181:1 | enter match_pattern5 | variables.rs:176:5:176:34 | LetStmt |  |
-| variables.rs:175:1:181:1 | exit match_pattern5 (normal) | variables.rs:175:1:181:1 | exit match_pattern5 |  |
-| variables.rs:175:21:181:1 | BlockExpr | variables.rs:175:1:181:1 | exit match_pattern5 (normal) |  |
-| variables.rs:176:5:176:34 | LetStmt | variables.rs:176:18:176:29 | PathExpr |  |
-| variables.rs:176:9:176:14 | either | variables.rs:177:11:177:16 | either | match, no-match |
-| variables.rs:176:18:176:29 | PathExpr | variables.rs:176:31:176:32 | 32 |  |
-| variables.rs:176:18:176:33 | CallExpr | variables.rs:176:9:176:14 | either |  |
-| variables.rs:176:31:176:32 | 32 | variables.rs:176:18:176:33 | CallExpr |  |
-| variables.rs:177:5:180:5 | MatchExpr | variables.rs:175:21:181:1 | BlockExpr |  |
-| variables.rs:177:11:177:16 | either | variables.rs:178:9:178:44 | OrPat |  |
-| variables.rs:178:9:178:44 | OrPat | variables.rs:179:16:179:24 | PathExpr | match |
-| variables.rs:179:16:179:24 | PathExpr | variables.rs:179:26:179:27 | a3 |  |
-| variables.rs:179:16:179:28 | CallExpr | variables.rs:177:5:180:5 | MatchExpr |  |
-| variables.rs:179:26:179:27 | a3 | variables.rs:179:16:179:28 | CallExpr |  |
-| variables.rs:189:1:203:1 | enter match_pattern6 | variables.rs:190:5:190:37 | LetStmt |  |
-| variables.rs:189:1:203:1 | exit match_pattern6 (normal) | variables.rs:189:1:203:1 | exit match_pattern6 |  |
-| variables.rs:189:21:203:1 | BlockExpr | variables.rs:189:1:203:1 | exit match_pattern6 (normal) |  |
-| variables.rs:190:5:190:37 | LetStmt | variables.rs:190:14:190:32 | PathExpr |  |
-| variables.rs:190:9:190:10 | tv | variables.rs:191:5:194:5 | ExprStmt | match, no-match |
-| variables.rs:190:14:190:32 | PathExpr | variables.rs:190:34:190:35 | 62 |  |
-| variables.rs:190:14:190:36 | CallExpr | variables.rs:190:9:190:10 | tv |  |
-| variables.rs:190:34:190:35 | 62 | variables.rs:190:14:190:36 | CallExpr |  |
-| variables.rs:191:5:194:5 | ExprStmt | variables.rs:191:11:191:12 | tv |  |
-| variables.rs:191:5:194:5 | MatchExpr | variables.rs:195:5:198:5 | ExprStmt |  |
-| variables.rs:191:11:191:12 | tv | variables.rs:192:9:192:81 | OrPat |  |
-| variables.rs:192:9:192:81 | OrPat | variables.rs:193:16:193:24 | PathExpr | match |
-| variables.rs:193:16:193:24 | PathExpr | variables.rs:193:26:193:27 | a4 |  |
-| variables.rs:193:16:193:28 | CallExpr | variables.rs:191:5:194:5 | MatchExpr |  |
-| variables.rs:193:26:193:27 | a4 | variables.rs:193:16:193:28 | CallExpr |  |
-| variables.rs:195:5:198:5 | ExprStmt | variables.rs:195:11:195:12 | tv |  |
-| variables.rs:195:5:198:5 | MatchExpr | variables.rs:199:11:199:12 | tv |  |
-| variables.rs:195:11:195:12 | tv | variables.rs:196:9:196:83 | OrPat |  |
-| variables.rs:196:9:196:83 | OrPat | variables.rs:197:16:197:24 | PathExpr | match |
-| variables.rs:197:16:197:24 | PathExpr | variables.rs:197:26:197:27 | a5 |  |
-| variables.rs:197:16:197:28 | CallExpr | variables.rs:195:5:198:5 | MatchExpr |  |
-| variables.rs:197:26:197:27 | a5 | variables.rs:197:16:197:28 | CallExpr |  |
-| variables.rs:199:5:202:5 | MatchExpr | variables.rs:189:21:203:1 | BlockExpr |  |
-| variables.rs:199:11:199:12 | tv | variables.rs:200:9:200:83 | OrPat |  |
-| variables.rs:200:9:200:83 | OrPat | variables.rs:201:16:201:24 | PathExpr | match |
-| variables.rs:201:16:201:24 | PathExpr | variables.rs:201:26:201:27 | a6 |  |
-| variables.rs:201:16:201:28 | CallExpr | variables.rs:199:5:202:5 | MatchExpr |  |
-| variables.rs:201:26:201:27 | a6 | variables.rs:201:16:201:28 | CallExpr |  |
-| variables.rs:205:1:213:1 | enter match_pattern7 | variables.rs:206:5:206:34 | LetStmt |  |
-| variables.rs:205:1:213:1 | exit match_pattern7 (normal) | variables.rs:205:1:213:1 | exit match_pattern7 |  |
-| variables.rs:205:21:213:1 | BlockExpr | variables.rs:205:1:213:1 | exit match_pattern7 (normal) |  |
-| variables.rs:206:5:206:34 | LetStmt | variables.rs:206:18:206:29 | PathExpr |  |
-| variables.rs:206:9:206:14 | either | variables.rs:207:11:207:16 | either | match, no-match |
-| variables.rs:206:18:206:29 | PathExpr | variables.rs:206:31:206:32 | 32 |  |
-| variables.rs:206:18:206:33 | CallExpr | variables.rs:206:9:206:14 | either |  |
-| variables.rs:206:31:206:32 | 32 | variables.rs:206:18:206:33 | CallExpr |  |
-| variables.rs:207:5:212:5 | MatchExpr | variables.rs:205:21:213:1 | BlockExpr |  |
-| variables.rs:207:11:207:16 | either | variables.rs:208:9:208:44 | OrPat |  |
-| variables.rs:208:9:208:44 | OrPat | variables.rs:209:16:209:17 | a7 | match |
-| variables.rs:208:9:208:44 | OrPat | variables.rs:211:9:211:9 | WildcardPat | no-match |
-| variables.rs:209:16:209:17 | a7 | variables.rs:209:21:209:21 | 0 |  |
-| variables.rs:209:16:209:21 | ... > ... | variables.rs:210:16:210:24 | PathExpr | true |
-| variables.rs:209:16:209:21 | ... > ... | variables.rs:211:9:211:9 | WildcardPat | false |
-| variables.rs:209:21:209:21 | 0 | variables.rs:209:16:209:21 | ... > ... |  |
-| variables.rs:210:16:210:24 | PathExpr | variables.rs:210:26:210:27 | a7 |  |
-| variables.rs:210:16:210:28 | CallExpr | variables.rs:207:5:212:5 | MatchExpr |  |
-| variables.rs:210:26:210:27 | a7 | variables.rs:210:16:210:28 | CallExpr |  |
-| variables.rs:211:9:211:9 | WildcardPat | variables.rs:211:14:211:15 | TupleExpr | match |
-| variables.rs:211:14:211:15 | TupleExpr | variables.rs:207:5:212:5 | MatchExpr |  |
-| variables.rs:215:1:230:1 | enter match_pattern8 | variables.rs:216:5:216:34 | LetStmt |  |
-| variables.rs:215:1:230:1 | exit match_pattern8 (normal) | variables.rs:215:1:230:1 | exit match_pattern8 |  |
-| variables.rs:215:21:230:1 | BlockExpr | variables.rs:215:1:230:1 | exit match_pattern8 (normal) |  |
-| variables.rs:216:5:216:34 | LetStmt | variables.rs:216:18:216:29 | PathExpr |  |
-| variables.rs:216:9:216:14 | either | variables.rs:218:11:218:16 | either | match, no-match |
-| variables.rs:216:18:216:29 | PathExpr | variables.rs:216:31:216:32 | 32 |  |
-| variables.rs:216:18:216:33 | CallExpr | variables.rs:216:9:216:14 | either |  |
-| variables.rs:216:31:216:32 | 32 | variables.rs:216:18:216:33 | CallExpr |  |
-| variables.rs:218:5:229:5 | MatchExpr | variables.rs:215:21:230:1 | BlockExpr |  |
-| variables.rs:218:11:218:16 | either | variables.rs:219:9:220:52 | e |  |
-| variables.rs:219:9:220:52 | e | variables.rs:222:13:222:27 | ExprStmt | match |
-| variables.rs:219:9:220:52 | e | variables.rs:228:9:228:9 | WildcardPat | no-match |
-| variables.rs:221:12:227:9 | BlockExpr | variables.rs:218:5:229:5 | MatchExpr |  |
-| variables.rs:222:13:222:21 | PathExpr | variables.rs:222:23:222:25 | a11 |  |
-| variables.rs:222:13:222:26 | CallExpr | variables.rs:223:16:224:15 | LetExpr |  |
-| variables.rs:222:13:222:27 | ExprStmt | variables.rs:222:13:222:21 | PathExpr |  |
-| variables.rs:222:23:222:25 | a11 | variables.rs:222:13:222:26 | CallExpr |  |
-| variables.rs:223:13:226:13 | IfExpr | variables.rs:221:12:227:9 | BlockExpr |  |
-| variables.rs:223:16:224:15 | LetExpr | variables.rs:223:20:223:36 | TupleStructPat |  |
-| variables.rs:223:20:223:36 | TupleStructPat | variables.rs:223:13:226:13 | IfExpr | no-match |
-| variables.rs:223:20:223:36 | TupleStructPat | variables.rs:225:17:225:32 | ExprStmt | match |
-| variables.rs:224:17:226:13 | BlockExpr | variables.rs:223:13:226:13 | IfExpr |  |
-| variables.rs:225:17:225:25 | PathExpr | variables.rs:225:28:225:30 | a12 |  |
-| variables.rs:225:17:225:31 | CallExpr | variables.rs:224:17:226:13 | BlockExpr |  |
-| variables.rs:225:17:225:32 | ExprStmt | variables.rs:225:17:225:25 | PathExpr |  |
-| variables.rs:225:27:225:30 | * ... | variables.rs:225:17:225:31 | CallExpr |  |
-| variables.rs:225:28:225:30 | a12 | variables.rs:225:27:225:30 | * ... |  |
-| variables.rs:228:9:228:9 | WildcardPat | variables.rs:228:14:228:15 | TupleExpr | match |
-| variables.rs:228:14:228:15 | TupleExpr | variables.rs:218:5:229:5 | MatchExpr |  |
-| variables.rs:239:1:245:1 | enter match_pattern9 | variables.rs:240:5:240:36 | LetStmt |  |
-| variables.rs:239:1:245:1 | exit match_pattern9 (normal) | variables.rs:239:1:245:1 | exit match_pattern9 |  |
-| variables.rs:239:21:245:1 | BlockExpr | variables.rs:239:1:245:1 | exit match_pattern9 (normal) |  |
-| variables.rs:240:5:240:36 | LetStmt | variables.rs:240:14:240:31 | PathExpr |  |
-| variables.rs:240:9:240:10 | fv | variables.rs:241:11:241:12 | fv | match, no-match |
-| variables.rs:240:14:240:31 | PathExpr | variables.rs:240:33:240:34 | 62 |  |
-| variables.rs:240:14:240:35 | CallExpr | variables.rs:240:9:240:10 | fv |  |
-| variables.rs:240:33:240:34 | 62 | variables.rs:240:14:240:35 | CallExpr |  |
-| variables.rs:241:5:244:5 | MatchExpr | variables.rs:239:21:245:1 | BlockExpr |  |
-| variables.rs:241:11:241:12 | fv | variables.rs:242:9:242:109 | OrPat |  |
-| variables.rs:242:9:242:109 | OrPat | variables.rs:243:16:243:24 | PathExpr | match |
-| variables.rs:243:16:243:24 | PathExpr | variables.rs:243:26:243:28 | a13 |  |
-| variables.rs:243:16:243:29 | CallExpr | variables.rs:241:5:244:5 | MatchExpr |  |
-| variables.rs:243:26:243:28 | a13 | variables.rs:243:16:243:29 | CallExpr |  |
-| variables.rs:247:1:256:1 | enter param_pattern1 | variables.rs:253:5:253:18 | ExprStmt |  |
-| variables.rs:247:1:256:1 | exit param_pattern1 (normal) | variables.rs:247:1:256:1 | exit param_pattern1 |  |
-| variables.rs:252:28:256:1 | BlockExpr | variables.rs:247:1:256:1 | exit param_pattern1 (normal) |  |
-| variables.rs:253:5:253:13 | PathExpr | variables.rs:253:15:253:16 | a8 |  |
-| variables.rs:253:5:253:17 | CallExpr | variables.rs:254:5:254:18 | ExprStmt |  |
-| variables.rs:253:5:253:18 | ExprStmt | variables.rs:253:5:253:13 | PathExpr |  |
-| variables.rs:253:15:253:16 | a8 | variables.rs:253:5:253:17 | CallExpr |  |
-| variables.rs:254:5:254:13 | PathExpr | variables.rs:254:15:254:16 | b3 |  |
-| variables.rs:254:5:254:17 | CallExpr | variables.rs:255:5:255:18 | ExprStmt |  |
-| variables.rs:254:5:254:18 | ExprStmt | variables.rs:254:5:254:13 | PathExpr |  |
-| variables.rs:254:15:254:16 | b3 | variables.rs:254:5:254:17 | CallExpr |  |
-| variables.rs:255:5:255:13 | PathExpr | variables.rs:255:15:255:16 | c1 |  |
-| variables.rs:255:5:255:17 | CallExpr | variables.rs:252:28:256:1 | BlockExpr |  |
+| variables.rs:125:23:125:27 | first | variables.rs:125:13:125:28 | CallExpr |  |
+| variables.rs:126:13:126:21 | PathExpr | variables.rs:126:23:126:27 | third |  |
+| variables.rs:126:13:126:28 | CallExpr | variables.rs:127:13:127:29 | ExprStmt |  |
+| variables.rs:126:13:126:29 | ExprStmt | variables.rs:126:13:126:21 | PathExpr |  |
+| variables.rs:126:23:126:27 | third | variables.rs:126:13:126:28 | CallExpr |  |
+| variables.rs:127:13:127:21 | PathExpr | variables.rs:127:23:127:27 | fifth |  |
+| variables.rs:127:13:127:28 | CallExpr | variables.rs:124:14:128:9 | BlockExpr |  |
+| variables.rs:127:13:127:29 | ExprStmt | variables.rs:127:13:127:21 | PathExpr |  |
+| variables.rs:127:23:127:27 | fifth | variables.rs:127:13:127:28 | CallExpr |  |
+| variables.rs:131:5:140:5 | MatchExpr | variables.rs:116:21:141:1 | BlockExpr |  |
+| variables.rs:131:11:131:17 | numbers | variables.rs:132:9:136:9 | TuplePat |  |
+| variables.rs:132:9:136:9 | TuplePat | variables.rs:137:13:137:29 | ExprStmt | match |
+| variables.rs:136:14:139:9 | BlockExpr | variables.rs:131:5:140:5 | MatchExpr |  |
+| variables.rs:137:13:137:21 | PathExpr | variables.rs:137:23:137:27 | first |  |
+| variables.rs:137:13:137:28 | CallExpr | variables.rs:138:13:138:28 | ExprStmt |  |
+| variables.rs:137:13:137:29 | ExprStmt | variables.rs:137:13:137:21 | PathExpr |  |
+| variables.rs:137:23:137:27 | first | variables.rs:137:13:137:28 | CallExpr |  |
+| variables.rs:138:13:138:21 | PathExpr | variables.rs:138:23:138:26 | last |  |
+| variables.rs:138:13:138:27 | CallExpr | variables.rs:136:14:139:9 | BlockExpr |  |
+| variables.rs:138:13:138:28 | ExprStmt | variables.rs:138:13:138:21 | PathExpr |  |
+| variables.rs:138:23:138:26 | last | variables.rs:138:13:138:27 | CallExpr |  |
+| variables.rs:143:1:151:1 | enter match_pattern3 | variables.rs:144:5:144:38 | LetStmt |  |
+| variables.rs:143:1:151:1 | exit match_pattern3 (normal) | variables.rs:143:1:151:1 | exit match_pattern3 |  |
+| variables.rs:143:21:151:1 | BlockExpr | variables.rs:143:1:151:1 | exit match_pattern3 (normal) |  |
+| variables.rs:144:5:144:38 | LetStmt | variables.rs:144:25:144:27 | "x" |  |
+| variables.rs:144:9:144:10 | p2 | variables.rs:146:11:146:12 | p2 | match, no-match |
+| variables.rs:144:14:144:37 | RecordExpr | variables.rs:144:9:144:10 | p2 |  |
+| variables.rs:144:25:144:27 | "x" | variables.rs:144:33:144:35 | "y" |  |
+| variables.rs:144:33:144:35 | "y" | variables.rs:144:14:144:37 | RecordExpr |  |
+| variables.rs:146:5:150:5 | MatchExpr | variables.rs:143:21:151:1 | BlockExpr |  |
+| variables.rs:146:11:146:12 | p2 | variables.rs:147:9:149:9 | RecordPat |  |
+| variables.rs:147:9:149:9 | RecordPat | variables.rs:149:14:149:22 | PathExpr | match |
+| variables.rs:149:14:149:22 | PathExpr | variables.rs:149:24:149:25 | x7 |  |
+| variables.rs:149:14:149:26 | CallExpr | variables.rs:146:5:150:5 | MatchExpr |  |
+| variables.rs:149:24:149:25 | x7 | variables.rs:149:14:149:26 | CallExpr |  |
+| variables.rs:157:1:170:1 | enter match_pattern4 | variables.rs:158:5:158:39 | LetStmt |  |
+| variables.rs:157:1:170:1 | exit match_pattern4 (normal) | variables.rs:157:1:170:1 | exit match_pattern4 |  |
+| variables.rs:157:21:170:1 | BlockExpr | variables.rs:157:1:170:1 | exit match_pattern4 (normal) |  |
+| variables.rs:158:5:158:39 | LetStmt | variables.rs:158:36:158:36 | 0 |  |
+| variables.rs:158:9:158:11 | msg | variables.rs:160:11:160:13 | msg | match, no-match |
+| variables.rs:158:15:158:38 | RecordExpr | variables.rs:158:9:158:11 | msg |  |
+| variables.rs:158:36:158:36 | 0 | variables.rs:158:15:158:38 | RecordExpr |  |
+| variables.rs:160:5:169:5 | MatchExpr | variables.rs:157:21:170:1 | BlockExpr |  |
+| variables.rs:160:11:160:13 | msg | variables.rs:161:9:163:9 | RecordPat |  |
+| variables.rs:161:9:163:9 | RecordPat | variables.rs:163:14:163:22 | PathExpr | match |
+| variables.rs:161:9:163:9 | RecordPat | variables.rs:164:9:164:38 | RecordPat | no-match |
+| variables.rs:163:14:163:22 | PathExpr | variables.rs:163:24:163:34 | id_variable |  |
+| variables.rs:163:14:163:35 | CallExpr | variables.rs:160:5:169:5 | MatchExpr |  |
+| variables.rs:163:24:163:34 | id_variable | variables.rs:163:14:163:35 | CallExpr |  |
+| variables.rs:164:9:164:38 | RecordPat | variables.rs:165:13:165:52 | MacroExpr | match |
+| variables.rs:164:9:164:38 | RecordPat | variables.rs:167:9:167:29 | RecordPat | no-match |
+| variables.rs:164:43:166:9 | BlockExpr | variables.rs:160:5:169:5 | MatchExpr |  |
+| variables.rs:165:13:165:52 | MacroExpr | variables.rs:164:43:166:9 | BlockExpr |  |
+| variables.rs:167:9:167:29 | RecordPat | variables.rs:168:13:168:21 | PathExpr | match |
+| variables.rs:168:13:168:21 | PathExpr | variables.rs:168:23:168:24 | id |  |
+| variables.rs:168:13:168:25 | CallExpr | variables.rs:160:5:169:5 | MatchExpr |  |
+| variables.rs:168:23:168:24 | id | variables.rs:168:13:168:25 | CallExpr |  |
+| variables.rs:177:1:183:1 | enter match_pattern5 | variables.rs:178:5:178:34 | LetStmt |  |
+| variables.rs:177:1:183:1 | exit match_pattern5 (normal) | variables.rs:177:1:183:1 | exit match_pattern5 |  |
+| variables.rs:177:21:183:1 | BlockExpr | variables.rs:177:1:183:1 | exit match_pattern5 (normal) |  |
+| variables.rs:178:5:178:34 | LetStmt | variables.rs:178:18:178:29 | PathExpr |  |
+| variables.rs:178:9:178:14 | either | variables.rs:179:11:179:16 | either | match, no-match |
+| variables.rs:178:18:178:29 | PathExpr | variables.rs:178:31:178:32 | 32 |  |
+| variables.rs:178:18:178:33 | CallExpr | variables.rs:178:9:178:14 | either |  |
+| variables.rs:178:31:178:32 | 32 | variables.rs:178:18:178:33 | CallExpr |  |
+| variables.rs:179:5:182:5 | MatchExpr | variables.rs:177:21:183:1 | BlockExpr |  |
+| variables.rs:179:11:179:16 | either | variables.rs:180:9:180:44 | OrPat |  |
+| variables.rs:180:9:180:44 | OrPat | variables.rs:181:16:181:24 | PathExpr | match |
+| variables.rs:181:16:181:24 | PathExpr | variables.rs:181:26:181:27 | a3 |  |
+| variables.rs:181:16:181:28 | CallExpr | variables.rs:179:5:182:5 | MatchExpr |  |
+| variables.rs:181:26:181:27 | a3 | variables.rs:181:16:181:28 | CallExpr |  |
+| variables.rs:191:1:205:1 | enter match_pattern6 | variables.rs:192:5:192:37 | LetStmt |  |
+| variables.rs:191:1:205:1 | exit match_pattern6 (normal) | variables.rs:191:1:205:1 | exit match_pattern6 |  |
+| variables.rs:191:21:205:1 | BlockExpr | variables.rs:191:1:205:1 | exit match_pattern6 (normal) |  |
+| variables.rs:192:5:192:37 | LetStmt | variables.rs:192:14:192:32 | PathExpr |  |
+| variables.rs:192:9:192:10 | tv | variables.rs:193:5:196:5 | ExprStmt | match, no-match |
+| variables.rs:192:14:192:32 | PathExpr | variables.rs:192:34:192:35 | 62 |  |
+| variables.rs:192:14:192:36 | CallExpr | variables.rs:192:9:192:10 | tv |  |
+| variables.rs:192:34:192:35 | 62 | variables.rs:192:14:192:36 | CallExpr |  |
+| variables.rs:193:5:196:5 | ExprStmt | variables.rs:193:11:193:12 | tv |  |
+| variables.rs:193:5:196:5 | MatchExpr | variables.rs:197:5:200:5 | ExprStmt |  |
+| variables.rs:193:11:193:12 | tv | variables.rs:194:9:194:81 | OrPat |  |
+| variables.rs:194:9:194:81 | OrPat | variables.rs:195:16:195:24 | PathExpr | match |
+| variables.rs:195:16:195:24 | PathExpr | variables.rs:195:26:195:27 | a4 |  |
+| variables.rs:195:16:195:28 | CallExpr | variables.rs:193:5:196:5 | MatchExpr |  |
+| variables.rs:195:26:195:27 | a4 | variables.rs:195:16:195:28 | CallExpr |  |
+| variables.rs:197:5:200:5 | ExprStmt | variables.rs:197:11:197:12 | tv |  |
+| variables.rs:197:5:200:5 | MatchExpr | variables.rs:201:11:201:12 | tv |  |
+| variables.rs:197:11:197:12 | tv | variables.rs:198:9:198:83 | OrPat |  |
+| variables.rs:198:9:198:83 | OrPat | variables.rs:199:16:199:24 | PathExpr | match |
+| variables.rs:199:16:199:24 | PathExpr | variables.rs:199:26:199:27 | a5 |  |
+| variables.rs:199:16:199:28 | CallExpr | variables.rs:197:5:200:5 | MatchExpr |  |
+| variables.rs:199:26:199:27 | a5 | variables.rs:199:16:199:28 | CallExpr |  |
+| variables.rs:201:5:204:5 | MatchExpr | variables.rs:191:21:205:1 | BlockExpr |  |
+| variables.rs:201:11:201:12 | tv | variables.rs:202:9:202:83 | OrPat |  |
+| variables.rs:202:9:202:83 | OrPat | variables.rs:203:16:203:24 | PathExpr | match |
+| variables.rs:203:16:203:24 | PathExpr | variables.rs:203:26:203:27 | a6 |  |
+| variables.rs:203:16:203:28 | CallExpr | variables.rs:201:5:204:5 | MatchExpr |  |
+| variables.rs:203:26:203:27 | a6 | variables.rs:203:16:203:28 | CallExpr |  |
+| variables.rs:207:1:215:1 | enter match_pattern7 | variables.rs:208:5:208:34 | LetStmt |  |
+| variables.rs:207:1:215:1 | exit match_pattern7 (normal) | variables.rs:207:1:215:1 | exit match_pattern7 |  |
+| variables.rs:207:21:215:1 | BlockExpr | variables.rs:207:1:215:1 | exit match_pattern7 (normal) |  |
+| variables.rs:208:5:208:34 | LetStmt | variables.rs:208:18:208:29 | PathExpr |  |
+| variables.rs:208:9:208:14 | either | variables.rs:209:11:209:16 | either | match, no-match |
+| variables.rs:208:18:208:29 | PathExpr | variables.rs:208:31:208:32 | 32 |  |
+| variables.rs:208:18:208:33 | CallExpr | variables.rs:208:9:208:14 | either |  |
+| variables.rs:208:31:208:32 | 32 | variables.rs:208:18:208:33 | CallExpr |  |
+| variables.rs:209:5:214:5 | MatchExpr | variables.rs:207:21:215:1 | BlockExpr |  |
+| variables.rs:209:11:209:16 | either | variables.rs:210:9:210:44 | OrPat |  |
+| variables.rs:210:9:210:44 | OrPat | variables.rs:211:16:211:17 | a7 | match |
+| variables.rs:210:9:210:44 | OrPat | variables.rs:213:9:213:9 | WildcardPat | no-match |
+| variables.rs:211:16:211:17 | a7 | variables.rs:211:21:211:21 | 0 |  |
+| variables.rs:211:16:211:21 | ... > ... | variables.rs:212:16:212:24 | PathExpr | true |
+| variables.rs:211:16:211:21 | ... > ... | variables.rs:213:9:213:9 | WildcardPat | false |
+| variables.rs:211:21:211:21 | 0 | variables.rs:211:16:211:21 | ... > ... |  |
+| variables.rs:212:16:212:24 | PathExpr | variables.rs:212:26:212:27 | a7 |  |
+| variables.rs:212:16:212:28 | CallExpr | variables.rs:209:5:214:5 | MatchExpr |  |
+| variables.rs:212:26:212:27 | a7 | variables.rs:212:16:212:28 | CallExpr |  |
+| variables.rs:213:9:213:9 | WildcardPat | variables.rs:213:14:213:15 | TupleExpr | match |
+| variables.rs:213:14:213:15 | TupleExpr | variables.rs:209:5:214:5 | MatchExpr |  |
+| variables.rs:217:1:232:1 | enter match_pattern8 | variables.rs:218:5:218:34 | LetStmt |  |
+| variables.rs:217:1:232:1 | exit match_pattern8 (normal) | variables.rs:217:1:232:1 | exit match_pattern8 |  |
+| variables.rs:217:21:232:1 | BlockExpr | variables.rs:217:1:232:1 | exit match_pattern8 (normal) |  |
+| variables.rs:218:5:218:34 | LetStmt | variables.rs:218:18:218:29 | PathExpr |  |
+| variables.rs:218:9:218:14 | either | variables.rs:220:11:220:16 | either | match, no-match |
+| variables.rs:218:18:218:29 | PathExpr | variables.rs:218:31:218:32 | 32 |  |
+| variables.rs:218:18:218:33 | CallExpr | variables.rs:218:9:218:14 | either |  |
+| variables.rs:218:31:218:32 | 32 | variables.rs:218:18:218:33 | CallExpr |  |
+| variables.rs:220:5:231:5 | MatchExpr | variables.rs:217:21:232:1 | BlockExpr |  |
+| variables.rs:220:11:220:16 | either | variables.rs:221:9:222:52 | e |  |
+| variables.rs:221:9:222:52 | e | variables.rs:224:13:224:27 | ExprStmt | match |
+| variables.rs:221:9:222:52 | e | variables.rs:230:9:230:9 | WildcardPat | no-match |
+| variables.rs:223:12:229:9 | BlockExpr | variables.rs:220:5:231:5 | MatchExpr |  |
+| variables.rs:224:13:224:21 | PathExpr | variables.rs:224:23:224:25 | a11 |  |
+| variables.rs:224:13:224:26 | CallExpr | variables.rs:225:16:226:15 | LetExpr |  |
+| variables.rs:224:13:224:27 | ExprStmt | variables.rs:224:13:224:21 | PathExpr |  |
+| variables.rs:224:23:224:25 | a11 | variables.rs:224:13:224:26 | CallExpr |  |
+| variables.rs:225:13:228:13 | IfExpr | variables.rs:223:12:229:9 | BlockExpr |  |
+| variables.rs:225:16:226:15 | LetExpr | variables.rs:225:20:225:36 | TupleStructPat |  |
+| variables.rs:225:20:225:36 | TupleStructPat | variables.rs:225:13:228:13 | IfExpr | no-match |
+| variables.rs:225:20:225:36 | TupleStructPat | variables.rs:227:17:227:32 | ExprStmt | match |
+| variables.rs:226:17:228:13 | BlockExpr | variables.rs:225:13:228:13 | IfExpr |  |
+| variables.rs:227:17:227:25 | PathExpr | variables.rs:227:28:227:30 | a12 |  |
+| variables.rs:227:17:227:31 | CallExpr | variables.rs:226:17:228:13 | BlockExpr |  |
+| variables.rs:227:17:227:32 | ExprStmt | variables.rs:227:17:227:25 | PathExpr |  |
+| variables.rs:227:27:227:30 | * ... | variables.rs:227:17:227:31 | CallExpr |  |
+| variables.rs:227:28:227:30 | a12 | variables.rs:227:27:227:30 | * ... |  |
+| variables.rs:230:9:230:9 | WildcardPat | variables.rs:230:14:230:15 | TupleExpr | match |
+| variables.rs:230:14:230:15 | TupleExpr | variables.rs:220:5:231:5 | MatchExpr |  |
+| variables.rs:241:1:247:1 | enter match_pattern9 | variables.rs:242:5:242:36 | LetStmt |  |
+| variables.rs:241:1:247:1 | exit match_pattern9 (normal) | variables.rs:241:1:247:1 | exit match_pattern9 |  |
+| variables.rs:241:21:247:1 | BlockExpr | variables.rs:241:1:247:1 | exit match_pattern9 (normal) |  |
+| variables.rs:242:5:242:36 | LetStmt | variables.rs:242:14:242:31 | PathExpr |  |
+| variables.rs:242:9:242:10 | fv | variables.rs:243:11:243:12 | fv | match, no-match |
+| variables.rs:242:14:242:31 | PathExpr | variables.rs:242:33:242:34 | 62 |  |
+| variables.rs:242:14:242:35 | CallExpr | variables.rs:242:9:242:10 | fv |  |
+| variables.rs:242:33:242:34 | 62 | variables.rs:242:14:242:35 | CallExpr |  |
+| variables.rs:243:5:246:5 | MatchExpr | variables.rs:241:21:247:1 | BlockExpr |  |
+| variables.rs:243:11:243:12 | fv | variables.rs:244:9:244:109 | OrPat |  |
+| variables.rs:244:9:244:109 | OrPat | variables.rs:245:16:245:24 | PathExpr | match |
+| variables.rs:245:16:245:24 | PathExpr | variables.rs:245:26:245:28 | a13 |  |
+| variables.rs:245:16:245:29 | CallExpr | variables.rs:243:5:246:5 | MatchExpr |  |
+| variables.rs:245:26:245:28 | a13 | variables.rs:245:16:245:29 | CallExpr |  |
+| variables.rs:249:1:258:1 | enter param_pattern1 | variables.rs:255:5:255:18 | ExprStmt |  |
+| variables.rs:249:1:258:1 | exit param_pattern1 (normal) | variables.rs:249:1:258:1 | exit param_pattern1 |  |
+| variables.rs:254:28:258:1 | BlockExpr | variables.rs:249:1:258:1 | exit param_pattern1 (normal) |  |
+| variables.rs:255:5:255:13 | PathExpr | variables.rs:255:15:255:16 | a8 |  |
+| variables.rs:255:5:255:17 | CallExpr | variables.rs:256:5:256:18 | ExprStmt |  |
 | variables.rs:255:5:255:18 | ExprStmt | variables.rs:255:5:255:13 | PathExpr |  |
-| variables.rs:255:15:255:16 | c1 | variables.rs:255:5:255:17 | CallExpr |  |
-| variables.rs:258:1:262:1 | enter param_pattern2 | variables.rs:261:5:261:18 | ExprStmt |  |
-| variables.rs:258:1:262:1 | exit param_pattern2 (normal) | variables.rs:258:1:262:1 | exit param_pattern2 |  |
-| variables.rs:260:9:262:1 | BlockExpr | variables.rs:258:1:262:1 | exit param_pattern2 (normal) |  |
-| variables.rs:261:5:261:13 | PathExpr | variables.rs:261:15:261:16 | a9 |  |
-| variables.rs:261:5:261:17 | CallExpr | variables.rs:260:9:262:1 | BlockExpr |  |
-| variables.rs:261:5:261:18 | ExprStmt | variables.rs:261:5:261:13 | PathExpr |  |
-| variables.rs:261:15:261:16 | a9 | variables.rs:261:5:261:17 | CallExpr |  |
-| variables.rs:264:1:299:1 | enter destruct_assignment | variables.rs:265:5:269:18 | LetStmt |  |
-| variables.rs:264:1:299:1 | exit destruct_assignment (normal) | variables.rs:264:1:299:1 | exit destruct_assignment |  |
-| variables.rs:264:26:299:1 | BlockExpr | variables.rs:264:1:299:1 | exit destruct_assignment (normal) |  |
-| variables.rs:265:5:269:18 | LetStmt | variables.rs:269:10:269:10 | 1 |  |
-| variables.rs:265:9:269:5 | TuplePat | variables.rs:270:5:270:19 | ExprStmt | match |
-| variables.rs:269:9:269:17 | TupleExpr | variables.rs:265:9:269:5 | TuplePat |  |
-| variables.rs:269:10:269:10 | 1 | variables.rs:269:13:269:13 | 2 |  |
-| variables.rs:269:13:269:13 | 2 | variables.rs:269:16:269:16 | 3 |  |
-| variables.rs:269:16:269:16 | 3 | variables.rs:269:9:269:17 | TupleExpr |  |
-| variables.rs:270:5:270:13 | PathExpr | variables.rs:270:15:270:17 | a10 |  |
-| variables.rs:270:5:270:18 | CallExpr | variables.rs:271:5:271:18 | ExprStmt |  |
-| variables.rs:270:5:270:19 | ExprStmt | variables.rs:270:5:270:13 | PathExpr |  |
-| variables.rs:270:15:270:17 | a10 | variables.rs:270:5:270:18 | CallExpr |  |
-| variables.rs:271:5:271:13 | PathExpr | variables.rs:271:15:271:16 | b4 |  |
-| variables.rs:271:5:271:17 | CallExpr | variables.rs:272:5:272:18 | ExprStmt |  |
-| variables.rs:271:5:271:18 | ExprStmt | variables.rs:271:5:271:13 | PathExpr |  |
-| variables.rs:271:15:271:16 | b4 | variables.rs:271:5:271:17 | CallExpr |  |
-| variables.rs:272:5:272:13 | PathExpr | variables.rs:272:15:272:16 | c2 |  |
-| variables.rs:272:5:272:17 | CallExpr | variables.rs:274:5:282:6 | ExprStmt |  |
-| variables.rs:272:5:272:18 | ExprStmt | variables.rs:272:5:272:13 | PathExpr |  |
-| variables.rs:272:15:272:16 | c2 | variables.rs:272:5:272:17 | CallExpr |  |
-| variables.rs:274:5:278:5 | TupleExpr | variables.rs:279:9:279:11 | a10 |  |
-| variables.rs:274:5:282:5 | ... = ... | variables.rs:283:5:283:19 | ExprStmt |  |
-| variables.rs:274:5:282:6 | ExprStmt | variables.rs:275:9:275:10 | c2 |  |
-| variables.rs:275:9:275:10 | c2 | variables.rs:276:9:276:10 | b4 |  |
-| variables.rs:276:9:276:10 | b4 | variables.rs:277:9:277:11 | a10 |  |
-| variables.rs:277:9:277:11 | a10 | variables.rs:274:5:278:5 | TupleExpr |  |
-| variables.rs:278:9:282:5 | TupleExpr | variables.rs:274:5:282:5 | ... = ... |  |
-| variables.rs:279:9:279:11 | a10 | variables.rs:280:9:280:10 | b4 |  |
-| variables.rs:280:9:280:10 | b4 | variables.rs:281:9:281:10 | c2 |  |
-| variables.rs:281:9:281:10 | c2 | variables.rs:278:9:282:5 | TupleExpr |  |
-| variables.rs:283:5:283:13 | PathExpr | variables.rs:283:15:283:17 | a10 |  |
-| variables.rs:283:5:283:18 | CallExpr | variables.rs:284:5:284:18 | ExprStmt |  |
-| variables.rs:283:5:283:19 | ExprStmt | variables.rs:283:5:283:13 | PathExpr |  |
-| variables.rs:283:15:283:17 | a10 | variables.rs:283:5:283:18 | CallExpr |  |
-| variables.rs:284:5:284:13 | PathExpr | variables.rs:284:15:284:16 | b4 |  |
-| variables.rs:284:5:284:17 | CallExpr | variables.rs:285:5:285:18 | ExprStmt |  |
-| variables.rs:284:5:284:18 | ExprStmt | variables.rs:284:5:284:13 | PathExpr |  |
-| variables.rs:284:15:284:16 | b4 | variables.rs:284:5:284:17 | CallExpr |  |
-| variables.rs:285:5:285:13 | PathExpr | variables.rs:285:15:285:16 | c2 |  |
-| variables.rs:285:5:285:17 | CallExpr | variables.rs:287:5:295:5 | ExprStmt |  |
-| variables.rs:285:5:285:18 | ExprStmt | variables.rs:285:5:285:13 | PathExpr |  |
-| variables.rs:285:15:285:16 | c2 | variables.rs:285:5:285:17 | CallExpr |  |
-| variables.rs:287:5:295:5 | ExprStmt | variables.rs:287:12:287:12 | 4 |  |
-| variables.rs:287:5:295:5 | MatchExpr | variables.rs:297:5:297:19 | ExprStmt |  |
-| variables.rs:287:11:287:16 | TupleExpr | variables.rs:288:9:291:9 | TuplePat |  |
-| variables.rs:287:12:287:12 | 4 | variables.rs:287:15:287:15 | 5 |  |
-| variables.rs:287:15:287:15 | 5 | variables.rs:287:11:287:16 | TupleExpr |  |
-| variables.rs:288:9:291:9 | TuplePat | variables.rs:292:13:292:27 | ExprStmt | match |
-| variables.rs:291:14:294:9 | BlockExpr | variables.rs:287:5:295:5 | MatchExpr |  |
-| variables.rs:292:13:292:21 | PathExpr | variables.rs:292:23:292:25 | a10 |  |
-| variables.rs:292:13:292:26 | CallExpr | variables.rs:293:13:293:26 | ExprStmt |  |
-| variables.rs:292:13:292:27 | ExprStmt | variables.rs:292:13:292:21 | PathExpr |  |
-| variables.rs:292:23:292:25 | a10 | variables.rs:292:13:292:26 | CallExpr |  |
-| variables.rs:293:13:293:21 | PathExpr | variables.rs:293:23:293:24 | b4 |  |
-| variables.rs:293:13:293:25 | CallExpr | variables.rs:291:14:294:9 | BlockExpr |  |
-| variables.rs:293:13:293:26 | ExprStmt | variables.rs:293:13:293:21 | PathExpr |  |
-| variables.rs:293:23:293:24 | b4 | variables.rs:293:13:293:25 | CallExpr |  |
-| variables.rs:297:5:297:13 | PathExpr | variables.rs:297:15:297:17 | a10 |  |
-| variables.rs:297:5:297:18 | CallExpr | variables.rs:298:5:298:18 | ExprStmt |  |
-| variables.rs:297:5:297:19 | ExprStmt | variables.rs:297:5:297:13 | PathExpr |  |
-| variables.rs:297:15:297:17 | a10 | variables.rs:297:5:297:18 | CallExpr |  |
-| variables.rs:298:5:298:13 | PathExpr | variables.rs:298:15:298:16 | b4 |  |
-| variables.rs:298:5:298:17 | CallExpr | variables.rs:264:26:299:1 | BlockExpr |  |
-| variables.rs:298:5:298:18 | ExprStmt | variables.rs:298:5:298:13 | PathExpr |  |
-| variables.rs:298:15:298:16 | b4 | variables.rs:298:5:298:17 | CallExpr |  |
-| variables.rs:301:1:316:1 | enter closure_variable | variables.rs:302:5:304:10 | LetStmt |  |
-| variables.rs:301:1:316:1 | exit closure_variable (normal) | variables.rs:301:1:316:1 | exit closure_variable |  |
-| variables.rs:301:23:316:1 | BlockExpr | variables.rs:301:1:316:1 | exit closure_variable (normal) |  |
-| variables.rs:302:5:304:10 | LetStmt | variables.rs:303:9:304:9 | ClosureExpr |  |
-| variables.rs:302:9:302:23 | example_closure | variables.rs:305:5:306:27 | LetStmt | match, no-match |
-| variables.rs:303:9:304:9 | ClosureExpr | variables.rs:302:9:302:23 | example_closure |  |
-| variables.rs:303:9:304:9 | enter ClosureExpr | variables.rs:304:9:304:9 | x |  |
-| variables.rs:303:9:304:9 | exit ClosureExpr (normal) | variables.rs:303:9:304:9 | exit ClosureExpr |  |
-| variables.rs:304:9:304:9 | x | variables.rs:303:9:304:9 | exit ClosureExpr (normal) |  |
-| variables.rs:305:5:306:27 | LetStmt | variables.rs:306:9:306:23 | example_closure |  |
-| variables.rs:305:9:305:10 | n1 | variables.rs:307:5:307:18 | ExprStmt | match, no-match |
-| variables.rs:306:9:306:23 | example_closure | variables.rs:306:25:306:25 | 5 |  |
-| variables.rs:306:9:306:26 | CallExpr | variables.rs:305:9:305:10 | n1 |  |
-| variables.rs:306:25:306:25 | 5 | variables.rs:306:9:306:26 | CallExpr |  |
-| variables.rs:307:5:307:13 | PathExpr | variables.rs:307:15:307:16 | n1 |  |
-| variables.rs:307:5:307:17 | CallExpr | variables.rs:309:5:309:25 | ExprStmt |  |
-| variables.rs:307:5:307:18 | ExprStmt | variables.rs:307:5:307:13 | PathExpr |  |
-| variables.rs:307:15:307:16 | n1 | variables.rs:307:5:307:17 | CallExpr |  |
-| variables.rs:309:5:309:22 | PathExpr | variables.rs:309:5:309:24 | CallExpr |  |
-| variables.rs:309:5:309:24 | CallExpr | variables.rs:310:5:312:10 | LetStmt |  |
-| variables.rs:309:5:309:25 | ExprStmt | variables.rs:309:5:309:22 | PathExpr |  |
-| variables.rs:310:5:312:10 | LetStmt | variables.rs:311:9:312:9 | ClosureExpr |  |
-| variables.rs:310:9:310:26 | immutable_variable | variables.rs:313:5:314:30 | LetStmt | match, no-match |
-| variables.rs:311:9:312:9 | ClosureExpr | variables.rs:310:9:310:26 | immutable_variable |  |
-| variables.rs:311:9:312:9 | enter ClosureExpr | variables.rs:312:9:312:9 | x |  |
-| variables.rs:311:9:312:9 | exit ClosureExpr (normal) | variables.rs:311:9:312:9 | exit ClosureExpr |  |
-| variables.rs:312:9:312:9 | x | variables.rs:311:9:312:9 | exit ClosureExpr (normal) |  |
-| variables.rs:313:5:314:30 | LetStmt | variables.rs:314:9:314:26 | immutable_variable |  |
-| variables.rs:313:9:313:10 | n2 | variables.rs:315:5:315:18 | ExprStmt | match, no-match |
-| variables.rs:314:9:314:26 | immutable_variable | variables.rs:314:28:314:28 | 6 |  |
-| variables.rs:314:9:314:29 | CallExpr | variables.rs:313:9:313:10 | n2 |  |
-| variables.rs:314:28:314:28 | 6 | variables.rs:314:9:314:29 | CallExpr |  |
-| variables.rs:315:5:315:13 | PathExpr | variables.rs:315:15:315:16 | n2 |  |
-| variables.rs:315:5:315:17 | CallExpr | variables.rs:301:23:316:1 | BlockExpr |  |
-| variables.rs:315:5:315:18 | ExprStmt | variables.rs:315:5:315:13 | PathExpr |  |
-| variables.rs:315:15:315:16 | n2 | variables.rs:315:5:315:17 | CallExpr |  |
-| variables.rs:318:1:325:1 | enter for_variable | variables.rs:319:5:319:42 | LetStmt |  |
-| variables.rs:318:1:325:1 | exit for_variable (normal) | variables.rs:318:1:325:1 | exit for_variable |  |
-| variables.rs:318:19:325:1 | BlockExpr | variables.rs:318:1:325:1 | exit for_variable (normal) |  |
-| variables.rs:319:5:319:42 | LetStmt | variables.rs:319:15:319:22 | "apples" |  |
-| variables.rs:319:9:319:9 | v | variables.rs:322:12:322:12 | v | match, no-match |
-| variables.rs:319:13:319:41 | RefExpr | variables.rs:319:9:319:9 | v |  |
-| variables.rs:319:14:319:41 | ArrayExpr | variables.rs:319:13:319:41 | RefExpr |  |
-| variables.rs:319:15:319:22 | "apples" | variables.rs:319:25:319:30 | "cake" |  |
-| variables.rs:319:25:319:30 | "cake" | variables.rs:319:33:319:40 | "coffee" |  |
-| variables.rs:319:33:319:40 | "coffee" | variables.rs:319:14:319:41 | ArrayExpr |  |
-| variables.rs:321:5:324:5 | ForExpr | variables.rs:318:19:325:1 | BlockExpr |  |
-| variables.rs:321:9:321:12 | text | variables.rs:321:5:324:5 | ForExpr | no-match |
-| variables.rs:321:9:321:12 | text | variables.rs:323:9:323:24 | ExprStmt | match |
-| variables.rs:322:12:322:12 | v | variables.rs:321:9:321:12 | text |  |
-| variables.rs:322:14:324:5 | BlockExpr | variables.rs:321:9:321:12 | text |  |
-| variables.rs:323:9:323:17 | PathExpr | variables.rs:323:19:323:22 | text |  |
-| variables.rs:323:9:323:23 | CallExpr | variables.rs:322:14:324:5 | BlockExpr |  |
-| variables.rs:323:9:323:24 | ExprStmt | variables.rs:323:9:323:17 | PathExpr |  |
-| variables.rs:323:19:323:22 | text | variables.rs:323:9:323:23 | CallExpr |  |
-| variables.rs:327:1:350:1 | enter main | variables.rs:328:5:328:25 | ExprStmt |  |
-| variables.rs:327:1:350:1 | exit main (normal) | variables.rs:327:1:350:1 | exit main |  |
-| variables.rs:327:11:350:1 | BlockExpr | variables.rs:327:1:350:1 | exit main (normal) |  |
-| variables.rs:328:5:328:22 | PathExpr | variables.rs:328:5:328:24 | CallExpr |  |
-| variables.rs:328:5:328:24 | CallExpr | variables.rs:329:5:329:23 | ExprStmt |  |
-| variables.rs:328:5:328:25 | ExprStmt | variables.rs:328:5:328:22 | PathExpr |  |
-| variables.rs:329:5:329:20 | PathExpr | variables.rs:329:5:329:22 | CallExpr |  |
-| variables.rs:329:5:329:22 | CallExpr | variables.rs:330:5:330:23 | ExprStmt |  |
-| variables.rs:329:5:329:23 | ExprStmt | variables.rs:329:5:329:20 | PathExpr |  |
-| variables.rs:330:5:330:20 | PathExpr | variables.rs:330:5:330:22 | CallExpr |  |
-| variables.rs:330:5:330:22 | CallExpr | variables.rs:331:5:331:23 | ExprStmt |  |
-| variables.rs:330:5:330:23 | ExprStmt | variables.rs:330:5:330:20 | PathExpr |  |
-| variables.rs:331:5:331:20 | PathExpr | variables.rs:331:5:331:22 | CallExpr |  |
-| variables.rs:331:5:331:22 | CallExpr | variables.rs:332:5:332:19 | ExprStmt |  |
-| variables.rs:331:5:331:23 | ExprStmt | variables.rs:331:5:331:20 | PathExpr |  |
-| variables.rs:332:5:332:16 | PathExpr | variables.rs:332:5:332:18 | CallExpr |  |
-| variables.rs:332:5:332:18 | CallExpr | variables.rs:333:5:333:19 | ExprStmt |  |
-| variables.rs:332:5:332:19 | ExprStmt | variables.rs:332:5:332:16 | PathExpr |  |
-| variables.rs:333:5:333:16 | PathExpr | variables.rs:333:5:333:18 | CallExpr |  |
-| variables.rs:333:5:333:18 | CallExpr | variables.rs:334:5:334:19 | ExprStmt |  |
-| variables.rs:333:5:333:19 | ExprStmt | variables.rs:333:5:333:16 | PathExpr |  |
-| variables.rs:334:5:334:16 | PathExpr | variables.rs:334:5:334:18 | CallExpr |  |
-| variables.rs:334:5:334:18 | CallExpr | variables.rs:335:5:335:19 | ExprStmt |  |
-| variables.rs:334:5:334:19 | ExprStmt | variables.rs:334:5:334:16 | PathExpr |  |
-| variables.rs:335:5:335:16 | PathExpr | variables.rs:335:5:335:18 | CallExpr |  |
-| variables.rs:335:5:335:18 | CallExpr | variables.rs:336:5:336:21 | ExprStmt |  |
-| variables.rs:335:5:335:19 | ExprStmt | variables.rs:335:5:335:16 | PathExpr |  |
-| variables.rs:336:5:336:18 | PathExpr | variables.rs:336:5:336:20 | CallExpr |  |
-| variables.rs:336:5:336:20 | CallExpr | variables.rs:337:5:337:21 | ExprStmt |  |
-| variables.rs:336:5:336:21 | ExprStmt | variables.rs:336:5:336:18 | PathExpr |  |
-| variables.rs:337:5:337:18 | PathExpr | variables.rs:337:5:337:20 | CallExpr |  |
-| variables.rs:337:5:337:20 | CallExpr | variables.rs:338:5:338:21 | ExprStmt |  |
-| variables.rs:337:5:337:21 | ExprStmt | variables.rs:337:5:337:18 | PathExpr |  |
-| variables.rs:338:5:338:18 | PathExpr | variables.rs:338:5:338:20 | CallExpr |  |
-| variables.rs:338:5:338:20 | CallExpr | variables.rs:339:5:339:21 | ExprStmt |  |
-| variables.rs:338:5:338:21 | ExprStmt | variables.rs:338:5:338:18 | PathExpr |  |
-| variables.rs:339:5:339:18 | PathExpr | variables.rs:339:5:339:20 | CallExpr |  |
-| variables.rs:339:5:339:20 | CallExpr | variables.rs:340:5:340:21 | ExprStmt |  |
-| variables.rs:339:5:339:21 | ExprStmt | variables.rs:339:5:339:18 | PathExpr |  |
-| variables.rs:340:5:340:18 | PathExpr | variables.rs:340:5:340:20 | CallExpr |  |
-| variables.rs:340:5:340:20 | CallExpr | variables.rs:341:5:341:21 | ExprStmt |  |
-| variables.rs:340:5:340:21 | ExprStmt | variables.rs:340:5:340:18 | PathExpr |  |
-| variables.rs:341:5:341:18 | PathExpr | variables.rs:341:5:341:20 | CallExpr |  |
-| variables.rs:341:5:341:20 | CallExpr | variables.rs:342:5:342:21 | ExprStmt |  |
-| variables.rs:341:5:341:21 | ExprStmt | variables.rs:341:5:341:18 | PathExpr |  |
-| variables.rs:342:5:342:18 | PathExpr | variables.rs:342:5:342:20 | CallExpr |  |
-| variables.rs:342:5:342:20 | CallExpr | variables.rs:343:5:343:21 | ExprStmt |  |
-| variables.rs:342:5:342:21 | ExprStmt | variables.rs:342:5:342:18 | PathExpr |  |
-| variables.rs:343:5:343:18 | PathExpr | variables.rs:343:5:343:20 | CallExpr |  |
-| variables.rs:343:5:343:20 | CallExpr | variables.rs:344:5:344:21 | ExprStmt |  |
-| variables.rs:343:5:343:21 | ExprStmt | variables.rs:343:5:343:18 | PathExpr |  |
-| variables.rs:344:5:344:18 | PathExpr | variables.rs:344:5:344:20 | CallExpr |  |
-| variables.rs:344:5:344:20 | CallExpr | variables.rs:345:5:345:36 | ExprStmt |  |
-| variables.rs:344:5:344:21 | ExprStmt | variables.rs:344:5:344:18 | PathExpr |  |
-| variables.rs:345:5:345:18 | PathExpr | variables.rs:345:20:345:22 | "a" |  |
-| variables.rs:345:5:345:35 | CallExpr | variables.rs:346:5:346:37 | ExprStmt |  |
-| variables.rs:345:5:345:36 | ExprStmt | variables.rs:345:5:345:18 | PathExpr |  |
-| variables.rs:345:20:345:22 | "a" | variables.rs:345:26:345:28 | "b" |  |
-| variables.rs:345:25:345:34 | TupleExpr | variables.rs:345:5:345:35 | CallExpr |  |
-| variables.rs:345:26:345:28 | "b" | variables.rs:345:31:345:33 | "c" |  |
-| variables.rs:345:31:345:33 | "c" | variables.rs:345:25:345:34 | TupleExpr |  |
-| variables.rs:346:5:346:18 | PathExpr | variables.rs:346:20:346:31 | PathExpr |  |
-| variables.rs:346:5:346:36 | CallExpr | variables.rs:347:5:347:26 | ExprStmt |  |
-| variables.rs:346:5:346:37 | ExprStmt | variables.rs:346:5:346:18 | PathExpr |  |
-| variables.rs:346:20:346:31 | PathExpr | variables.rs:346:33:346:34 | 45 |  |
-| variables.rs:346:20:346:35 | CallExpr | variables.rs:346:5:346:36 | CallExpr |  |
-| variables.rs:346:33:346:34 | 45 | variables.rs:346:20:346:35 | CallExpr |  |
-| variables.rs:347:5:347:23 | PathExpr | variables.rs:347:5:347:25 | CallExpr |  |
-| variables.rs:347:5:347:25 | CallExpr | variables.rs:348:5:348:23 | ExprStmt |  |
-| variables.rs:347:5:347:26 | ExprStmt | variables.rs:347:5:347:23 | PathExpr |  |
-| variables.rs:348:5:348:20 | PathExpr | variables.rs:348:5:348:22 | CallExpr |  |
-| variables.rs:348:5:348:22 | CallExpr | variables.rs:349:5:349:19 | ExprStmt |  |
-| variables.rs:348:5:348:23 | ExprStmt | variables.rs:348:5:348:20 | PathExpr |  |
-| variables.rs:349:5:349:16 | PathExpr | variables.rs:349:5:349:18 | CallExpr |  |
-| variables.rs:349:5:349:18 | CallExpr | variables.rs:327:11:350:1 | BlockExpr |  |
-| variables.rs:349:5:349:19 | ExprStmt | variables.rs:349:5:349:16 | PathExpr |  |
+| variables.rs:255:15:255:16 | a8 | variables.rs:255:5:255:17 | CallExpr |  |
+| variables.rs:256:5:256:13 | PathExpr | variables.rs:256:15:256:16 | b3 |  |
+| variables.rs:256:5:256:17 | CallExpr | variables.rs:257:5:257:18 | ExprStmt |  |
+| variables.rs:256:5:256:18 | ExprStmt | variables.rs:256:5:256:13 | PathExpr |  |
+| variables.rs:256:15:256:16 | b3 | variables.rs:256:5:256:17 | CallExpr |  |
+| variables.rs:257:5:257:13 | PathExpr | variables.rs:257:15:257:16 | c1 |  |
+| variables.rs:257:5:257:17 | CallExpr | variables.rs:254:28:258:1 | BlockExpr |  |
+| variables.rs:257:5:257:18 | ExprStmt | variables.rs:257:5:257:13 | PathExpr |  |
+| variables.rs:257:15:257:16 | c1 | variables.rs:257:5:257:17 | CallExpr |  |
+| variables.rs:260:1:264:1 | enter param_pattern2 | variables.rs:263:5:263:18 | ExprStmt |  |
+| variables.rs:260:1:264:1 | exit param_pattern2 (normal) | variables.rs:260:1:264:1 | exit param_pattern2 |  |
+| variables.rs:262:9:264:1 | BlockExpr | variables.rs:260:1:264:1 | exit param_pattern2 (normal) |  |
+| variables.rs:263:5:263:13 | PathExpr | variables.rs:263:15:263:16 | a9 |  |
+| variables.rs:263:5:263:17 | CallExpr | variables.rs:262:9:264:1 | BlockExpr |  |
+| variables.rs:263:5:263:18 | ExprStmt | variables.rs:263:5:263:13 | PathExpr |  |
+| variables.rs:263:15:263:16 | a9 | variables.rs:263:5:263:17 | CallExpr |  |
+| variables.rs:266:1:301:1 | enter destruct_assignment | variables.rs:267:5:271:18 | LetStmt |  |
+| variables.rs:266:1:301:1 | exit destruct_assignment (normal) | variables.rs:266:1:301:1 | exit destruct_assignment |  |
+| variables.rs:266:26:301:1 | BlockExpr | variables.rs:266:1:301:1 | exit destruct_assignment (normal) |  |
+| variables.rs:267:5:271:18 | LetStmt | variables.rs:271:10:271:10 | 1 |  |
+| variables.rs:267:9:271:5 | TuplePat | variables.rs:272:5:272:19 | ExprStmt | match |
+| variables.rs:271:9:271:17 | TupleExpr | variables.rs:267:9:271:5 | TuplePat |  |
+| variables.rs:271:10:271:10 | 1 | variables.rs:271:13:271:13 | 2 |  |
+| variables.rs:271:13:271:13 | 2 | variables.rs:271:16:271:16 | 3 |  |
+| variables.rs:271:16:271:16 | 3 | variables.rs:271:9:271:17 | TupleExpr |  |
+| variables.rs:272:5:272:13 | PathExpr | variables.rs:272:15:272:17 | a10 |  |
+| variables.rs:272:5:272:18 | CallExpr | variables.rs:273:5:273:18 | ExprStmt |  |
+| variables.rs:272:5:272:19 | ExprStmt | variables.rs:272:5:272:13 | PathExpr |  |
+| variables.rs:272:15:272:17 | a10 | variables.rs:272:5:272:18 | CallExpr |  |
+| variables.rs:273:5:273:13 | PathExpr | variables.rs:273:15:273:16 | b4 |  |
+| variables.rs:273:5:273:17 | CallExpr | variables.rs:274:5:274:18 | ExprStmt |  |
+| variables.rs:273:5:273:18 | ExprStmt | variables.rs:273:5:273:13 | PathExpr |  |
+| variables.rs:273:15:273:16 | b4 | variables.rs:273:5:273:17 | CallExpr |  |
+| variables.rs:274:5:274:13 | PathExpr | variables.rs:274:15:274:16 | c2 |  |
+| variables.rs:274:5:274:17 | CallExpr | variables.rs:276:5:284:6 | ExprStmt |  |
+| variables.rs:274:5:274:18 | ExprStmt | variables.rs:274:5:274:13 | PathExpr |  |
+| variables.rs:274:15:274:16 | c2 | variables.rs:274:5:274:17 | CallExpr |  |
+| variables.rs:276:5:280:5 | TupleExpr | variables.rs:281:9:281:11 | a10 |  |
+| variables.rs:276:5:284:5 | ... = ... | variables.rs:285:5:285:19 | ExprStmt |  |
+| variables.rs:276:5:284:6 | ExprStmt | variables.rs:277:9:277:10 | c2 |  |
+| variables.rs:277:9:277:10 | c2 | variables.rs:278:9:278:10 | b4 |  |
+| variables.rs:278:9:278:10 | b4 | variables.rs:279:9:279:11 | a10 |  |
+| variables.rs:279:9:279:11 | a10 | variables.rs:276:5:280:5 | TupleExpr |  |
+| variables.rs:280:9:284:5 | TupleExpr | variables.rs:276:5:284:5 | ... = ... |  |
+| variables.rs:281:9:281:11 | a10 | variables.rs:282:9:282:10 | b4 |  |
+| variables.rs:282:9:282:10 | b4 | variables.rs:283:9:283:10 | c2 |  |
+| variables.rs:283:9:283:10 | c2 | variables.rs:280:9:284:5 | TupleExpr |  |
+| variables.rs:285:5:285:13 | PathExpr | variables.rs:285:15:285:17 | a10 |  |
+| variables.rs:285:5:285:18 | CallExpr | variables.rs:286:5:286:18 | ExprStmt |  |
+| variables.rs:285:5:285:19 | ExprStmt | variables.rs:285:5:285:13 | PathExpr |  |
+| variables.rs:285:15:285:17 | a10 | variables.rs:285:5:285:18 | CallExpr |  |
+| variables.rs:286:5:286:13 | PathExpr | variables.rs:286:15:286:16 | b4 |  |
+| variables.rs:286:5:286:17 | CallExpr | variables.rs:287:5:287:18 | ExprStmt |  |
+| variables.rs:286:5:286:18 | ExprStmt | variables.rs:286:5:286:13 | PathExpr |  |
+| variables.rs:286:15:286:16 | b4 | variables.rs:286:5:286:17 | CallExpr |  |
+| variables.rs:287:5:287:13 | PathExpr | variables.rs:287:15:287:16 | c2 |  |
+| variables.rs:287:5:287:17 | CallExpr | variables.rs:289:5:297:5 | ExprStmt |  |
+| variables.rs:287:5:287:18 | ExprStmt | variables.rs:287:5:287:13 | PathExpr |  |
+| variables.rs:287:15:287:16 | c2 | variables.rs:287:5:287:17 | CallExpr |  |
+| variables.rs:289:5:297:5 | ExprStmt | variables.rs:289:12:289:12 | 4 |  |
+| variables.rs:289:5:297:5 | MatchExpr | variables.rs:299:5:299:19 | ExprStmt |  |
+| variables.rs:289:11:289:16 | TupleExpr | variables.rs:290:9:293:9 | TuplePat |  |
+| variables.rs:289:12:289:12 | 4 | variables.rs:289:15:289:15 | 5 |  |
+| variables.rs:289:15:289:15 | 5 | variables.rs:289:11:289:16 | TupleExpr |  |
+| variables.rs:290:9:293:9 | TuplePat | variables.rs:294:13:294:27 | ExprStmt | match |
+| variables.rs:293:14:296:9 | BlockExpr | variables.rs:289:5:297:5 | MatchExpr |  |
+| variables.rs:294:13:294:21 | PathExpr | variables.rs:294:23:294:25 | a10 |  |
+| variables.rs:294:13:294:26 | CallExpr | variables.rs:295:13:295:26 | ExprStmt |  |
+| variables.rs:294:13:294:27 | ExprStmt | variables.rs:294:13:294:21 | PathExpr |  |
+| variables.rs:294:23:294:25 | a10 | variables.rs:294:13:294:26 | CallExpr |  |
+| variables.rs:295:13:295:21 | PathExpr | variables.rs:295:23:295:24 | b4 |  |
+| variables.rs:295:13:295:25 | CallExpr | variables.rs:293:14:296:9 | BlockExpr |  |
+| variables.rs:295:13:295:26 | ExprStmt | variables.rs:295:13:295:21 | PathExpr |  |
+| variables.rs:295:23:295:24 | b4 | variables.rs:295:13:295:25 | CallExpr |  |
+| variables.rs:299:5:299:13 | PathExpr | variables.rs:299:15:299:17 | a10 |  |
+| variables.rs:299:5:299:18 | CallExpr | variables.rs:300:5:300:18 | ExprStmt |  |
+| variables.rs:299:5:299:19 | ExprStmt | variables.rs:299:5:299:13 | PathExpr |  |
+| variables.rs:299:15:299:17 | a10 | variables.rs:299:5:299:18 | CallExpr |  |
+| variables.rs:300:5:300:13 | PathExpr | variables.rs:300:15:300:16 | b4 |  |
+| variables.rs:300:5:300:17 | CallExpr | variables.rs:266:26:301:1 | BlockExpr |  |
+| variables.rs:300:5:300:18 | ExprStmt | variables.rs:300:5:300:13 | PathExpr |  |
+| variables.rs:300:15:300:16 | b4 | variables.rs:300:5:300:17 | CallExpr |  |
+| variables.rs:303:1:318:1 | enter closure_variable | variables.rs:304:5:306:10 | LetStmt |  |
+| variables.rs:303:1:318:1 | exit closure_variable (normal) | variables.rs:303:1:318:1 | exit closure_variable |  |
+| variables.rs:303:23:318:1 | BlockExpr | variables.rs:303:1:318:1 | exit closure_variable (normal) |  |
+| variables.rs:304:5:306:10 | LetStmt | variables.rs:305:9:306:9 | ClosureExpr |  |
+| variables.rs:304:9:304:23 | example_closure | variables.rs:307:5:308:27 | LetStmt | match, no-match |
+| variables.rs:305:9:306:9 | ClosureExpr | variables.rs:304:9:304:23 | example_closure |  |
+| variables.rs:305:9:306:9 | enter ClosureExpr | variables.rs:306:9:306:9 | x |  |
+| variables.rs:305:9:306:9 | exit ClosureExpr (normal) | variables.rs:305:9:306:9 | exit ClosureExpr |  |
+| variables.rs:306:9:306:9 | x | variables.rs:305:9:306:9 | exit ClosureExpr (normal) |  |
+| variables.rs:307:5:308:27 | LetStmt | variables.rs:308:9:308:23 | example_closure |  |
+| variables.rs:307:9:307:10 | n1 | variables.rs:309:5:309:18 | ExprStmt | match, no-match |
+| variables.rs:308:9:308:23 | example_closure | variables.rs:308:25:308:25 | 5 |  |
+| variables.rs:308:9:308:26 | CallExpr | variables.rs:307:9:307:10 | n1 |  |
+| variables.rs:308:25:308:25 | 5 | variables.rs:308:9:308:26 | CallExpr |  |
+| variables.rs:309:5:309:13 | PathExpr | variables.rs:309:15:309:16 | n1 |  |
+| variables.rs:309:5:309:17 | CallExpr | variables.rs:311:5:311:25 | ExprStmt |  |
+| variables.rs:309:5:309:18 | ExprStmt | variables.rs:309:5:309:13 | PathExpr |  |
+| variables.rs:309:15:309:16 | n1 | variables.rs:309:5:309:17 | CallExpr |  |
+| variables.rs:311:5:311:22 | PathExpr | variables.rs:311:5:311:24 | CallExpr |  |
+| variables.rs:311:5:311:24 | CallExpr | variables.rs:312:5:314:10 | LetStmt |  |
+| variables.rs:311:5:311:25 | ExprStmt | variables.rs:311:5:311:22 | PathExpr |  |
+| variables.rs:312:5:314:10 | LetStmt | variables.rs:313:9:314:9 | ClosureExpr |  |
+| variables.rs:312:9:312:26 | immutable_variable | variables.rs:315:5:316:30 | LetStmt | match, no-match |
+| variables.rs:313:9:314:9 | ClosureExpr | variables.rs:312:9:312:26 | immutable_variable |  |
+| variables.rs:313:9:314:9 | enter ClosureExpr | variables.rs:314:9:314:9 | x |  |
+| variables.rs:313:9:314:9 | exit ClosureExpr (normal) | variables.rs:313:9:314:9 | exit ClosureExpr |  |
+| variables.rs:314:9:314:9 | x | variables.rs:313:9:314:9 | exit ClosureExpr (normal) |  |
+| variables.rs:315:5:316:30 | LetStmt | variables.rs:316:9:316:26 | immutable_variable |  |
+| variables.rs:315:9:315:10 | n2 | variables.rs:317:5:317:18 | ExprStmt | match, no-match |
+| variables.rs:316:9:316:26 | immutable_variable | variables.rs:316:28:316:28 | 6 |  |
+| variables.rs:316:9:316:29 | CallExpr | variables.rs:315:9:315:10 | n2 |  |
+| variables.rs:316:28:316:28 | 6 | variables.rs:316:9:316:29 | CallExpr |  |
+| variables.rs:317:5:317:13 | PathExpr | variables.rs:317:15:317:16 | n2 |  |
+| variables.rs:317:5:317:17 | CallExpr | variables.rs:303:23:318:1 | BlockExpr |  |
+| variables.rs:317:5:317:18 | ExprStmt | variables.rs:317:5:317:13 | PathExpr |  |
+| variables.rs:317:15:317:16 | n2 | variables.rs:317:5:317:17 | CallExpr |  |
+| variables.rs:320:1:327:1 | enter for_variable | variables.rs:321:5:321:42 | LetStmt |  |
+| variables.rs:320:1:327:1 | exit for_variable (normal) | variables.rs:320:1:327:1 | exit for_variable |  |
+| variables.rs:320:19:327:1 | BlockExpr | variables.rs:320:1:327:1 | exit for_variable (normal) |  |
+| variables.rs:321:5:321:42 | LetStmt | variables.rs:321:15:321:22 | "apples" |  |
+| variables.rs:321:9:321:9 | v | variables.rs:324:12:324:12 | v | match, no-match |
+| variables.rs:321:13:321:41 | RefExpr | variables.rs:321:9:321:9 | v |  |
+| variables.rs:321:14:321:41 | ArrayExpr | variables.rs:321:13:321:41 | RefExpr |  |
+| variables.rs:321:15:321:22 | "apples" | variables.rs:321:25:321:30 | "cake" |  |
+| variables.rs:321:25:321:30 | "cake" | variables.rs:321:33:321:40 | "coffee" |  |
+| variables.rs:321:33:321:40 | "coffee" | variables.rs:321:14:321:41 | ArrayExpr |  |
+| variables.rs:323:5:326:5 | ForExpr | variables.rs:320:19:327:1 | BlockExpr |  |
+| variables.rs:323:9:323:12 | text | variables.rs:323:5:326:5 | ForExpr | no-match |
+| variables.rs:323:9:323:12 | text | variables.rs:325:9:325:24 | ExprStmt | match |
+| variables.rs:324:12:324:12 | v | variables.rs:323:9:323:12 | text |  |
+| variables.rs:324:14:326:5 | BlockExpr | variables.rs:323:9:323:12 | text |  |
+| variables.rs:325:9:325:17 | PathExpr | variables.rs:325:19:325:22 | text |  |
+| variables.rs:325:9:325:23 | CallExpr | variables.rs:324:14:326:5 | BlockExpr |  |
+| variables.rs:325:9:325:24 | ExprStmt | variables.rs:325:9:325:17 | PathExpr |  |
+| variables.rs:325:19:325:22 | text | variables.rs:325:9:325:23 | CallExpr |  |
+| variables.rs:329:1:335:1 | enter add_assign | variables.rs:330:5:330:18 | LetStmt |  |
+| variables.rs:329:1:335:1 | exit add_assign (normal) | variables.rs:329:1:335:1 | exit add_assign |  |
+| variables.rs:329:17:335:1 | BlockExpr | variables.rs:329:1:335:1 | exit add_assign (normal) |  |
+| variables.rs:330:5:330:18 | LetStmt | variables.rs:330:17:330:17 | 0 |  |
+| variables.rs:330:9:330:13 | a | variables.rs:331:5:331:11 | ExprStmt | match, no-match |
+| variables.rs:330:17:330:17 | 0 | variables.rs:330:9:330:13 | a |  |
+| variables.rs:331:5:331:5 | a | variables.rs:331:10:331:10 | 1 |  |
+| variables.rs:331:5:331:10 | ... += ... | variables.rs:332:5:332:17 | ExprStmt |  |
+| variables.rs:331:5:331:11 | ExprStmt | variables.rs:331:5:331:5 | a |  |
+| variables.rs:331:10:331:10 | 1 | variables.rs:331:5:331:10 | ... += ... |  |
+| variables.rs:332:5:332:13 | PathExpr | variables.rs:332:15:332:15 | a |  |
+| variables.rs:332:5:332:16 | CallExpr | variables.rs:333:5:333:28 | ExprStmt |  |
+| variables.rs:332:5:332:17 | ExprStmt | variables.rs:332:5:332:13 | PathExpr |  |
+| variables.rs:332:15:332:15 | a | variables.rs:332:5:332:16 | CallExpr |  |
+| variables.rs:333:5:333:27 | MethodCallExpr | variables.rs:334:5:334:17 | ExprStmt |  |
+| variables.rs:333:5:333:28 | ExprStmt | variables.rs:333:5:333:27 | MethodCallExpr |  |
+| variables.rs:334:5:334:13 | PathExpr | variables.rs:334:15:334:15 | a |  |
+| variables.rs:334:5:334:16 | CallExpr | variables.rs:329:17:335:1 | BlockExpr |  |
+| variables.rs:334:5:334:17 | ExprStmt | variables.rs:334:5:334:13 | PathExpr |  |
+| variables.rs:334:15:334:15 | a | variables.rs:334:5:334:16 | CallExpr |  |
+| variables.rs:337:1:343:1 | enter mutate | variables.rs:338:5:338:18 | LetStmt |  |
+| variables.rs:337:1:343:1 | exit mutate (normal) | variables.rs:337:1:343:1 | exit mutate |  |
+| variables.rs:337:13:343:1 | BlockExpr | variables.rs:337:1:343:1 | exit mutate (normal) |  |
+| variables.rs:338:5:338:18 | LetStmt | variables.rs:338:17:338:17 | 1 |  |
+| variables.rs:338:9:338:13 | i | variables.rs:339:5:340:15 | LetStmt | match, no-match |
+| variables.rs:338:17:338:17 | 1 | variables.rs:338:9:338:13 | i |  |
+| variables.rs:339:5:340:15 | LetStmt | variables.rs:340:14:340:14 | i |  |
+| variables.rs:339:9:339:13 | ref_i | variables.rs:341:5:341:15 | ExprStmt | match, no-match |
+| variables.rs:340:9:340:14 | RefExpr | variables.rs:339:9:339:13 | ref_i |  |
+| variables.rs:340:14:340:14 | i | variables.rs:340:9:340:14 | RefExpr |  |
+| variables.rs:341:5:341:10 | * ... | variables.rs:341:14:341:14 | 2 |  |
+| variables.rs:341:5:341:14 | ... = ... | variables.rs:342:5:342:17 | ExprStmt |  |
+| variables.rs:341:5:341:15 | ExprStmt | variables.rs:341:6:341:10 | ref_i |  |
+| variables.rs:341:6:341:10 | ref_i | variables.rs:341:5:341:10 | * ... |  |
+| variables.rs:341:14:341:14 | 2 | variables.rs:341:5:341:14 | ... = ... |  |
+| variables.rs:342:5:342:13 | PathExpr | variables.rs:342:15:342:15 | i |  |
+| variables.rs:342:5:342:16 | CallExpr | variables.rs:337:13:343:1 | BlockExpr |  |
+| variables.rs:342:5:342:17 | ExprStmt | variables.rs:342:5:342:13 | PathExpr |  |
+| variables.rs:342:15:342:15 | i | variables.rs:342:5:342:16 | CallExpr |  |
+| variables.rs:345:1:349:1 | enter mutate_param | variables.rs:346:5:348:11 | ExprStmt |  |
+| variables.rs:345:1:349:1 | exit mutate_param (normal) | variables.rs:345:1:349:1 | exit mutate_param |  |
+| variables.rs:345:31:349:1 | BlockExpr | variables.rs:345:1:349:1 | exit mutate_param (normal) |  |
+| variables.rs:346:5:346:6 | * ... | variables.rs:347:10:347:10 | x |  |
+| variables.rs:346:5:348:10 | ... = ... | variables.rs:345:31:349:1 | BlockExpr |  |
+| variables.rs:346:5:348:11 | ExprStmt | variables.rs:346:6:346:6 | x |  |
+| variables.rs:346:6:346:6 | x | variables.rs:346:5:346:6 | * ... |  |
+| variables.rs:347:9:347:10 | * ... | variables.rs:348:10:348:10 | x |  |
+| variables.rs:347:9:348:10 | ... + ... | variables.rs:346:5:348:10 | ... = ... |  |
+| variables.rs:347:10:347:10 | x | variables.rs:347:9:347:10 | * ... |  |
+| variables.rs:348:9:348:10 | * ... | variables.rs:347:9:348:10 | ... + ... |  |
+| variables.rs:348:10:348:10 | x | variables.rs:348:9:348:10 | * ... |  |
+| variables.rs:351:1:355:1 | enter mutate_arg | variables.rs:352:5:352:18 | LetStmt |  |
+| variables.rs:351:1:355:1 | exit mutate_arg (normal) | variables.rs:351:1:355:1 | exit mutate_arg |  |
+| variables.rs:351:17:355:1 | BlockExpr | variables.rs:351:1:355:1 | exit mutate_arg (normal) |  |
+| variables.rs:352:5:352:18 | LetStmt | variables.rs:352:17:352:17 | 2 |  |
+| variables.rs:352:9:352:13 | x | variables.rs:353:5:353:25 | ExprStmt | match, no-match |
+| variables.rs:352:17:352:17 | 2 | variables.rs:352:9:352:13 | x |  |
+| variables.rs:353:5:353:16 | PathExpr | variables.rs:353:23:353:23 | x |  |
+| variables.rs:353:5:353:24 | CallExpr | variables.rs:354:5:354:17 | ExprStmt |  |
+| variables.rs:353:5:353:25 | ExprStmt | variables.rs:353:5:353:16 | PathExpr |  |
+| variables.rs:353:18:353:23 | RefExpr | variables.rs:353:5:353:24 | CallExpr |  |
+| variables.rs:353:23:353:23 | x | variables.rs:353:18:353:23 | RefExpr |  |
+| variables.rs:354:5:354:13 | PathExpr | variables.rs:354:15:354:15 | x |  |
+| variables.rs:354:5:354:16 | CallExpr | variables.rs:351:17:355:1 | BlockExpr |  |
+| variables.rs:354:5:354:17 | ExprStmt | variables.rs:354:5:354:13 | PathExpr |  |
+| variables.rs:354:15:354:15 | x | variables.rs:354:5:354:16 | CallExpr |  |
+| variables.rs:357:1:383:1 | enter main | variables.rs:358:5:358:25 | ExprStmt |  |
+| variables.rs:357:1:383:1 | exit main (normal) | variables.rs:357:1:383:1 | exit main |  |
+| variables.rs:357:11:383:1 | BlockExpr | variables.rs:357:1:383:1 | exit main (normal) |  |
+| variables.rs:358:5:358:22 | PathExpr | variables.rs:358:5:358:24 | CallExpr |  |
+| variables.rs:358:5:358:24 | CallExpr | variables.rs:359:5:359:23 | ExprStmt |  |
+| variables.rs:358:5:358:25 | ExprStmt | variables.rs:358:5:358:22 | PathExpr |  |
+| variables.rs:359:5:359:20 | PathExpr | variables.rs:359:5:359:22 | CallExpr |  |
+| variables.rs:359:5:359:22 | CallExpr | variables.rs:360:5:360:23 | ExprStmt |  |
+| variables.rs:359:5:359:23 | ExprStmt | variables.rs:359:5:359:20 | PathExpr |  |
+| variables.rs:360:5:360:20 | PathExpr | variables.rs:360:5:360:22 | CallExpr |  |
+| variables.rs:360:5:360:22 | CallExpr | variables.rs:361:5:361:23 | ExprStmt |  |
+| variables.rs:360:5:360:23 | ExprStmt | variables.rs:360:5:360:20 | PathExpr |  |
+| variables.rs:361:5:361:20 | PathExpr | variables.rs:361:5:361:22 | CallExpr |  |
+| variables.rs:361:5:361:22 | CallExpr | variables.rs:362:5:362:19 | ExprStmt |  |
+| variables.rs:361:5:361:23 | ExprStmt | variables.rs:361:5:361:20 | PathExpr |  |
+| variables.rs:362:5:362:16 | PathExpr | variables.rs:362:5:362:18 | CallExpr |  |
+| variables.rs:362:5:362:18 | CallExpr | variables.rs:363:5:363:19 | ExprStmt |  |
+| variables.rs:362:5:362:19 | ExprStmt | variables.rs:362:5:362:16 | PathExpr |  |
+| variables.rs:363:5:363:16 | PathExpr | variables.rs:363:5:363:18 | CallExpr |  |
+| variables.rs:363:5:363:18 | CallExpr | variables.rs:364:5:364:19 | ExprStmt |  |
+| variables.rs:363:5:363:19 | ExprStmt | variables.rs:363:5:363:16 | PathExpr |  |
+| variables.rs:364:5:364:16 | PathExpr | variables.rs:364:5:364:18 | CallExpr |  |
+| variables.rs:364:5:364:18 | CallExpr | variables.rs:365:5:365:19 | ExprStmt |  |
+| variables.rs:364:5:364:19 | ExprStmt | variables.rs:364:5:364:16 | PathExpr |  |
+| variables.rs:365:5:365:16 | PathExpr | variables.rs:365:5:365:18 | CallExpr |  |
+| variables.rs:365:5:365:18 | CallExpr | variables.rs:366:5:366:21 | ExprStmt |  |
+| variables.rs:365:5:365:19 | ExprStmt | variables.rs:365:5:365:16 | PathExpr |  |
+| variables.rs:366:5:366:18 | PathExpr | variables.rs:366:5:366:20 | CallExpr |  |
+| variables.rs:366:5:366:20 | CallExpr | variables.rs:367:5:367:21 | ExprStmt |  |
+| variables.rs:366:5:366:21 | ExprStmt | variables.rs:366:5:366:18 | PathExpr |  |
+| variables.rs:367:5:367:18 | PathExpr | variables.rs:367:5:367:20 | CallExpr |  |
+| variables.rs:367:5:367:20 | CallExpr | variables.rs:368:5:368:21 | ExprStmt |  |
+| variables.rs:367:5:367:21 | ExprStmt | variables.rs:367:5:367:18 | PathExpr |  |
+| variables.rs:368:5:368:18 | PathExpr | variables.rs:368:5:368:20 | CallExpr |  |
+| variables.rs:368:5:368:20 | CallExpr | variables.rs:369:5:369:21 | ExprStmt |  |
+| variables.rs:368:5:368:21 | ExprStmt | variables.rs:368:5:368:18 | PathExpr |  |
+| variables.rs:369:5:369:18 | PathExpr | variables.rs:369:5:369:20 | CallExpr |  |
+| variables.rs:369:5:369:20 | CallExpr | variables.rs:370:5:370:21 | ExprStmt |  |
+| variables.rs:369:5:369:21 | ExprStmt | variables.rs:369:5:369:18 | PathExpr |  |
+| variables.rs:370:5:370:18 | PathExpr | variables.rs:370:5:370:20 | CallExpr |  |
+| variables.rs:370:5:370:20 | CallExpr | variables.rs:371:5:371:21 | ExprStmt |  |
+| variables.rs:370:5:370:21 | ExprStmt | variables.rs:370:5:370:18 | PathExpr |  |
+| variables.rs:371:5:371:18 | PathExpr | variables.rs:371:5:371:20 | CallExpr |  |
+| variables.rs:371:5:371:20 | CallExpr | variables.rs:372:5:372:21 | ExprStmt |  |
+| variables.rs:371:5:371:21 | ExprStmt | variables.rs:371:5:371:18 | PathExpr |  |
+| variables.rs:372:5:372:18 | PathExpr | variables.rs:372:5:372:20 | CallExpr |  |
+| variables.rs:372:5:372:20 | CallExpr | variables.rs:373:5:373:21 | ExprStmt |  |
+| variables.rs:372:5:372:21 | ExprStmt | variables.rs:372:5:372:18 | PathExpr |  |
+| variables.rs:373:5:373:18 | PathExpr | variables.rs:373:5:373:20 | CallExpr |  |
+| variables.rs:373:5:373:20 | CallExpr | variables.rs:374:5:374:21 | ExprStmt |  |
+| variables.rs:373:5:373:21 | ExprStmt | variables.rs:373:5:373:18 | PathExpr |  |
+| variables.rs:374:5:374:18 | PathExpr | variables.rs:374:5:374:20 | CallExpr |  |
+| variables.rs:374:5:374:20 | CallExpr | variables.rs:375:5:375:36 | ExprStmt |  |
+| variables.rs:374:5:374:21 | ExprStmt | variables.rs:374:5:374:18 | PathExpr |  |
+| variables.rs:375:5:375:18 | PathExpr | variables.rs:375:20:375:22 | "a" |  |
+| variables.rs:375:5:375:35 | CallExpr | variables.rs:376:5:376:37 | ExprStmt |  |
+| variables.rs:375:5:375:36 | ExprStmt | variables.rs:375:5:375:18 | PathExpr |  |
+| variables.rs:375:20:375:22 | "a" | variables.rs:375:26:375:28 | "b" |  |
+| variables.rs:375:25:375:34 | TupleExpr | variables.rs:375:5:375:35 | CallExpr |  |
+| variables.rs:375:26:375:28 | "b" | variables.rs:375:31:375:33 | "c" |  |
+| variables.rs:375:31:375:33 | "c" | variables.rs:375:25:375:34 | TupleExpr |  |
+| variables.rs:376:5:376:18 | PathExpr | variables.rs:376:20:376:31 | PathExpr |  |
+| variables.rs:376:5:376:36 | CallExpr | variables.rs:377:5:377:26 | ExprStmt |  |
+| variables.rs:376:5:376:37 | ExprStmt | variables.rs:376:5:376:18 | PathExpr |  |
+| variables.rs:376:20:376:31 | PathExpr | variables.rs:376:33:376:34 | 45 |  |
+| variables.rs:376:20:376:35 | CallExpr | variables.rs:376:5:376:36 | CallExpr |  |
+| variables.rs:376:33:376:34 | 45 | variables.rs:376:20:376:35 | CallExpr |  |
+| variables.rs:377:5:377:23 | PathExpr | variables.rs:377:5:377:25 | CallExpr |  |
+| variables.rs:377:5:377:25 | CallExpr | variables.rs:378:5:378:23 | ExprStmt |  |
+| variables.rs:377:5:377:26 | ExprStmt | variables.rs:377:5:377:23 | PathExpr |  |
+| variables.rs:378:5:378:20 | PathExpr | variables.rs:378:5:378:22 | CallExpr |  |
+| variables.rs:378:5:378:22 | CallExpr | variables.rs:379:5:379:19 | ExprStmt |  |
+| variables.rs:378:5:378:23 | ExprStmt | variables.rs:378:5:378:20 | PathExpr |  |
+| variables.rs:379:5:379:16 | PathExpr | variables.rs:379:5:379:18 | CallExpr |  |
+| variables.rs:379:5:379:18 | CallExpr | variables.rs:380:5:380:17 | ExprStmt |  |
+| variables.rs:379:5:379:19 | ExprStmt | variables.rs:379:5:379:16 | PathExpr |  |
+| variables.rs:380:5:380:14 | PathExpr | variables.rs:380:5:380:16 | CallExpr |  |
+| variables.rs:380:5:380:16 | CallExpr | variables.rs:381:5:381:13 | ExprStmt |  |
+| variables.rs:380:5:380:17 | ExprStmt | variables.rs:380:5:380:14 | PathExpr |  |
+| variables.rs:381:5:381:10 | PathExpr | variables.rs:381:5:381:12 | CallExpr |  |
+| variables.rs:381:5:381:12 | CallExpr | variables.rs:382:5:382:17 | ExprStmt |  |
+| variables.rs:381:5:381:13 | ExprStmt | variables.rs:381:5:381:10 | PathExpr |  |
+| variables.rs:382:5:382:14 | PathExpr | variables.rs:382:5:382:16 | CallExpr |  |
+| variables.rs:382:5:382:16 | CallExpr | variables.rs:357:11:383:1 | BlockExpr |  |
+| variables.rs:382:5:382:17 | ExprStmt | variables.rs:382:5:382:14 | PathExpr |  |
 breakTarget
 continueTarget
diff --git a/rust/ql/test/library-tests/variables/variables.expected b/rust/ql/test/library-tests/variables/variables.expected
index ad85ccfbfcc8..807fc9ff8919 100644
--- a/rust/ql/test/library-tests/variables/variables.expected
+++ b/rust/ql/test/library-tests/variables/variables.expected
@@ -1,261 +1,308 @@
 testFailures
+| variables.rs:331:5:331:5 | a | Unexpected result: read_access=a |
+| variables.rs:331:5:331:5 | a | Unexpected result: write_access=a |
+| variables.rs:331:13:331:25 | Comment | Missing result:access=a |
+| variables.rs:333:11:333:11 | a | Unexpected result: read_access=a |
+| variables.rs:333:30:333:42 | Comment | Missing result:access=a |
+| variables.rs:340:14:340:14 | i | Unexpected result: read_access=i |
+| variables.rs:340:17:340:29 | Comment | Missing result:access=i |
+| variables.rs:341:6:341:10 | ref_i | Unexpected result: write_access=ref_i |
+| variables.rs:341:17:341:38 | Comment | Missing result:read_access=ref_i |
+| variables.rs:346:6:346:6 | x | Unexpected result: write_access=x |
+| variables.rs:346:10:346:27 | Comment | Missing result:read_access=x |
+| variables.rs:353:23:353:23 | x | Unexpected result: read_access=x |
+| variables.rs:353:27:353:39 | Comment | Missing result:access=x |
 failures
 variable
-| variables.rs:1:14:1:14 | s |
-| variables.rs:5:14:5:14 | i |
-| variables.rs:10:9:10:10 | x1 |
-| variables.rs:15:13:15:14 | x2 |
-| variables.rs:22:9:22:10 | x3 |
+| variables.rs:3:14:3:14 | s |
+| variables.rs:7:14:7:14 | i |
+| variables.rs:12:9:12:10 | x1 |
+| variables.rs:17:13:17:14 | x2 |
 | variables.rs:24:9:24:10 | x3 |
-| variables.rs:30:9:30:10 | x4 |
-| variables.rs:33:13:33:14 | x4 |
-| variables.rs:47:13:47:14 | a1 |
-| variables.rs:48:13:48:14 | b1 |
-| variables.rs:51:13:51:13 | x |
-| variables.rs:52:13:52:13 | y |
-| variables.rs:62:9:62:10 | p1 |
-| variables.rs:64:12:64:13 | a2 |
-| variables.rs:65:12:65:13 | b2 |
-| variables.rs:72:9:72:10 | s1 |
-| variables.rs:74:21:74:22 | s2 |
-| variables.rs:81:14:81:15 | x5 |
-| variables.rs:89:9:89:10 | s1 |
-| variables.rs:91:24:91:25 | s2 |
-| variables.rs:98:9:98:10 | x6 |
-| variables.rs:99:9:99:10 | y1 |
-| variables.rs:103:14:103:15 | y1 |
-| variables.rs:108:9:108:12 | None |
-| variables.rs:115:9:115:15 | numbers |
-| variables.rs:119:13:119:17 | first |
-| variables.rs:120:13:120:17 | third |
-| variables.rs:121:13:121:17 | fifth |
-| variables.rs:131:13:131:17 | first |
-| variables.rs:133:13:133:16 | last |
-| variables.rs:142:9:142:10 | p2 |
-| variables.rs:146:16:146:17 | x7 |
-| variables.rs:156:9:156:11 | msg |
-| variables.rs:160:17:160:27 | id_variable |
-| variables.rs:165:26:165:27 | id |
-| variables.rs:176:9:176:14 | either |
-| variables.rs:178:9:178:44 | a3 |
-| variables.rs:190:9:190:10 | tv |
-| variables.rs:192:9:192:81 | a4 |
-| variables.rs:196:9:196:83 | a5 |
-| variables.rs:200:9:200:83 | a6 |
-| variables.rs:206:9:206:14 | either |
-| variables.rs:208:9:208:44 | a7 |
-| variables.rs:216:9:216:14 | either |
-| variables.rs:219:13:219:13 | e |
-| variables.rs:220:14:220:51 | a11 |
-| variables.rs:223:33:223:35 | a12 |
-| variables.rs:240:9:240:10 | fv |
-| variables.rs:242:9:242:109 | a13 |
-| variables.rs:248:5:248:6 | a8 |
-| variables.rs:250:9:250:10 | b3 |
-| variables.rs:251:9:251:10 | c1 |
-| variables.rs:259:6:259:41 | a9 |
-| variables.rs:266:13:266:15 | a10 |
-| variables.rs:267:13:267:14 | b4 |
-| variables.rs:268:13:268:14 | c2 |
-| variables.rs:289:13:289:15 | a10 |
-| variables.rs:290:13:290:14 | b4 |
-| variables.rs:302:9:302:23 | example_closure |
-| variables.rs:303:10:303:10 | x |
-| variables.rs:305:9:305:10 | n1 |
-| variables.rs:310:9:310:26 | immutable_variable |
-| variables.rs:311:10:311:10 | x |
-| variables.rs:313:9:313:10 | n2 |
-| variables.rs:319:9:319:9 | v |
-| variables.rs:321:9:321:12 | text |
+| variables.rs:26:9:26:10 | x3 |
+| variables.rs:32:9:32:10 | x4 |
+| variables.rs:35:13:35:14 | x4 |
+| variables.rs:49:13:49:14 | a1 |
+| variables.rs:50:13:50:14 | b1 |
+| variables.rs:53:13:53:13 | x |
+| variables.rs:54:13:54:13 | y |
+| variables.rs:64:9:64:10 | p1 |
+| variables.rs:66:12:66:13 | a2 |
+| variables.rs:67:12:67:13 | b2 |
+| variables.rs:74:9:74:10 | s1 |
+| variables.rs:76:21:76:22 | s2 |
+| variables.rs:83:14:83:15 | x5 |
+| variables.rs:91:9:91:10 | s1 |
+| variables.rs:93:24:93:25 | s2 |
+| variables.rs:100:9:100:10 | x6 |
+| variables.rs:101:9:101:10 | y1 |
+| variables.rs:105:14:105:15 | y1 |
+| variables.rs:110:9:110:12 | None |
+| variables.rs:117:9:117:15 | numbers |
+| variables.rs:121:13:121:17 | first |
+| variables.rs:122:13:122:17 | third |
+| variables.rs:123:13:123:17 | fifth |
+| variables.rs:133:13:133:17 | first |
+| variables.rs:135:13:135:16 | last |
+| variables.rs:144:9:144:10 | p2 |
+| variables.rs:148:16:148:17 | x7 |
+| variables.rs:158:9:158:11 | msg |
+| variables.rs:162:17:162:27 | id_variable |
+| variables.rs:167:26:167:27 | id |
+| variables.rs:178:9:178:14 | either |
+| variables.rs:180:9:180:44 | a3 |
+| variables.rs:192:9:192:10 | tv |
+| variables.rs:194:9:194:81 | a4 |
+| variables.rs:198:9:198:83 | a5 |
+| variables.rs:202:9:202:83 | a6 |
+| variables.rs:208:9:208:14 | either |
+| variables.rs:210:9:210:44 | a7 |
+| variables.rs:218:9:218:14 | either |
+| variables.rs:221:13:221:13 | e |
+| variables.rs:222:14:222:51 | a11 |
+| variables.rs:225:33:225:35 | a12 |
+| variables.rs:242:9:242:10 | fv |
+| variables.rs:244:9:244:109 | a13 |
+| variables.rs:250:5:250:6 | a8 |
+| variables.rs:252:9:252:10 | b3 |
+| variables.rs:253:9:253:10 | c1 |
+| variables.rs:261:6:261:41 | a9 |
+| variables.rs:268:13:268:15 | a10 |
+| variables.rs:269:13:269:14 | b4 |
+| variables.rs:270:13:270:14 | c2 |
+| variables.rs:291:13:291:15 | a10 |
+| variables.rs:292:13:292:14 | b4 |
+| variables.rs:304:9:304:23 | example_closure |
+| variables.rs:305:10:305:10 | x |
+| variables.rs:307:9:307:10 | n1 |
+| variables.rs:312:9:312:26 | immutable_variable |
+| variables.rs:313:10:313:10 | x |
+| variables.rs:315:9:315:10 | n2 |
+| variables.rs:321:9:321:9 | v |
+| variables.rs:323:9:323:12 | text |
+| variables.rs:330:13:330:13 | a |
+| variables.rs:338:13:338:13 | i |
+| variables.rs:339:9:339:13 | ref_i |
+| variables.rs:345:17:345:17 | x |
+| variables.rs:352:13:352:13 | x |
 variableAccess
-| variables.rs:11:15:11:16 | x1 | variables.rs:10:9:10:10 | x1 |
-| variables.rs:16:15:16:16 | x2 | variables.rs:15:13:15:14 | x2 |
-| variables.rs:17:5:17:6 | x2 | variables.rs:15:13:15:14 | x2 |
-| variables.rs:18:15:18:16 | x2 | variables.rs:15:13:15:14 | x2 |
-| variables.rs:23:15:23:16 | x3 | variables.rs:22:9:22:10 | x3 |
-| variables.rs:25:9:25:10 | x3 | variables.rs:22:9:22:10 | x3 |
-| variables.rs:26:15:26:16 | x3 | variables.rs:24:9:24:10 | x3 |
-| variables.rs:31:15:31:16 | x4 | variables.rs:30:9:30:10 | x4 |
-| variables.rs:34:19:34:20 | x4 | variables.rs:33:13:33:14 | x4 |
-| variables.rs:36:15:36:16 | x4 | variables.rs:30:9:30:10 | x4 |
-| variables.rs:55:15:55:16 | a1 | variables.rs:47:13:47:14 | a1 |
-| variables.rs:56:15:56:16 | b1 | variables.rs:48:13:48:14 | b1 |
-| variables.rs:57:15:57:15 | x | variables.rs:51:13:51:13 | x |
-| variables.rs:58:15:58:15 | y | variables.rs:52:13:52:13 | y |
-| variables.rs:66:9:66:10 | p1 | variables.rs:62:9:62:10 | p1 |
-| variables.rs:67:15:67:16 | a2 | variables.rs:64:12:64:13 | a2 |
-| variables.rs:68:15:68:16 | b2 | variables.rs:65:12:65:13 | b2 |
-| variables.rs:75:11:75:12 | s1 | variables.rs:72:9:72:10 | s1 |
-| variables.rs:76:19:76:20 | s2 | variables.rs:74:21:74:22 | s2 |
-| variables.rs:85:15:85:16 | x5 | variables.rs:81:14:81:15 | x5 |
-| variables.rs:92:11:92:12 | s1 | variables.rs:89:9:89:10 | s1 |
-| variables.rs:93:19:93:20 | s2 | variables.rs:91:24:91:25 | s2 |
-| variables.rs:101:11:101:12 | x6 | variables.rs:98:9:98:10 | x6 |
-| variables.rs:106:23:106:24 | y1 | variables.rs:103:14:103:15 | y1 |
-| variables.rs:111:15:111:16 | y1 | variables.rs:99:9:99:10 | y1 |
-| variables.rs:117:11:117:17 | numbers | variables.rs:115:9:115:15 | numbers |
-| variables.rs:123:23:123:27 | first | variables.rs:119:13:119:17 | first |
-| variables.rs:124:23:124:27 | third | variables.rs:120:13:120:17 | third |
-| variables.rs:125:23:125:27 | fifth | variables.rs:121:13:121:17 | fifth |
-| variables.rs:129:11:129:17 | numbers | variables.rs:115:9:115:15 | numbers |
-| variables.rs:135:23:135:27 | first | variables.rs:131:13:131:17 | first |
-| variables.rs:136:23:136:26 | last | variables.rs:133:13:133:16 | last |
-| variables.rs:144:11:144:12 | p2 | variables.rs:142:9:142:10 | p2 |
-| variables.rs:147:24:147:25 | x7 | variables.rs:146:16:146:17 | x7 |
-| variables.rs:158:11:158:13 | msg | variables.rs:156:9:156:11 | msg |
-| variables.rs:161:24:161:34 | id_variable | variables.rs:160:17:160:27 | id_variable |
-| variables.rs:166:23:166:24 | id | variables.rs:165:26:165:27 | id |
-| variables.rs:177:11:177:16 | either | variables.rs:176:9:176:14 | either |
-| variables.rs:179:26:179:27 | a3 | variables.rs:178:9:178:44 | a3 |
-| variables.rs:191:11:191:12 | tv | variables.rs:190:9:190:10 | tv |
-| variables.rs:193:26:193:27 | a4 | variables.rs:192:9:192:81 | a4 |
-| variables.rs:195:11:195:12 | tv | variables.rs:190:9:190:10 | tv |
-| variables.rs:197:26:197:27 | a5 | variables.rs:196:9:196:83 | a5 |
-| variables.rs:199:11:199:12 | tv | variables.rs:190:9:190:10 | tv |
-| variables.rs:201:26:201:27 | a6 | variables.rs:200:9:200:83 | a6 |
-| variables.rs:207:11:207:16 | either | variables.rs:206:9:206:14 | either |
-| variables.rs:209:16:209:17 | a7 | variables.rs:208:9:208:44 | a7 |
-| variables.rs:210:26:210:27 | a7 | variables.rs:208:9:208:44 | a7 |
-| variables.rs:218:11:218:16 | either | variables.rs:216:9:216:14 | either |
-| variables.rs:222:23:222:25 | a11 | variables.rs:220:14:220:51 | a11 |
-| variables.rs:224:15:224:15 | e | variables.rs:219:13:219:13 | e |
-| variables.rs:225:28:225:30 | a12 | variables.rs:223:33:223:35 | a12 |
-| variables.rs:241:11:241:12 | fv | variables.rs:240:9:240:10 | fv |
-| variables.rs:243:26:243:28 | a13 | variables.rs:242:9:242:109 | a13 |
-| variables.rs:253:15:253:16 | a8 | variables.rs:248:5:248:6 | a8 |
-| variables.rs:254:15:254:16 | b3 | variables.rs:250:9:250:10 | b3 |
-| variables.rs:255:15:255:16 | c1 | variables.rs:251:9:251:10 | c1 |
-| variables.rs:261:15:261:16 | a9 | variables.rs:259:6:259:41 | a9 |
-| variables.rs:270:15:270:17 | a10 | variables.rs:266:13:266:15 | a10 |
-| variables.rs:271:15:271:16 | b4 | variables.rs:267:13:267:14 | b4 |
-| variables.rs:272:15:272:16 | c2 | variables.rs:268:13:268:14 | c2 |
-| variables.rs:275:9:275:10 | c2 | variables.rs:268:13:268:14 | c2 |
-| variables.rs:276:9:276:10 | b4 | variables.rs:267:13:267:14 | b4 |
-| variables.rs:277:9:277:11 | a10 | variables.rs:266:13:266:15 | a10 |
-| variables.rs:279:9:279:11 | a10 | variables.rs:266:13:266:15 | a10 |
-| variables.rs:280:9:280:10 | b4 | variables.rs:267:13:267:14 | b4 |
-| variables.rs:281:9:281:10 | c2 | variables.rs:268:13:268:14 | c2 |
-| variables.rs:283:15:283:17 | a10 | variables.rs:266:13:266:15 | a10 |
-| variables.rs:284:15:284:16 | b4 | variables.rs:267:13:267:14 | b4 |
-| variables.rs:285:15:285:16 | c2 | variables.rs:268:13:268:14 | c2 |
-| variables.rs:292:23:292:25 | a10 | variables.rs:289:13:289:15 | a10 |
-| variables.rs:293:23:293:24 | b4 | variables.rs:290:13:290:14 | b4 |
-| variables.rs:297:15:297:17 | a10 | variables.rs:266:13:266:15 | a10 |
-| variables.rs:298:15:298:16 | b4 | variables.rs:267:13:267:14 | b4 |
-| variables.rs:304:9:304:9 | x | variables.rs:303:10:303:10 | x |
-| variables.rs:306:9:306:23 | example_closure | variables.rs:302:9:302:23 | example_closure |
-| variables.rs:307:15:307:16 | n1 | variables.rs:305:9:305:10 | n1 |
-| variables.rs:312:9:312:9 | x | variables.rs:311:10:311:10 | x |
-| variables.rs:314:9:314:26 | immutable_variable | variables.rs:310:9:310:26 | immutable_variable |
-| variables.rs:315:15:315:16 | n2 | variables.rs:313:9:313:10 | n2 |
-| variables.rs:322:12:322:12 | v | variables.rs:319:9:319:9 | v |
-| variables.rs:323:19:323:22 | text | variables.rs:321:9:321:12 | text |
+| variables.rs:13:15:13:16 | x1 | variables.rs:12:9:12:10 | x1 |
+| variables.rs:18:15:18:16 | x2 | variables.rs:17:13:17:14 | x2 |
+| variables.rs:19:5:19:6 | x2 | variables.rs:17:13:17:14 | x2 |
+| variables.rs:20:15:20:16 | x2 | variables.rs:17:13:17:14 | x2 |
+| variables.rs:25:15:25:16 | x3 | variables.rs:24:9:24:10 | x3 |
+| variables.rs:27:9:27:10 | x3 | variables.rs:24:9:24:10 | x3 |
+| variables.rs:28:15:28:16 | x3 | variables.rs:26:9:26:10 | x3 |
+| variables.rs:33:15:33:16 | x4 | variables.rs:32:9:32:10 | x4 |
+| variables.rs:36:19:36:20 | x4 | variables.rs:35:13:35:14 | x4 |
+| variables.rs:38:15:38:16 | x4 | variables.rs:32:9:32:10 | x4 |
+| variables.rs:57:15:57:16 | a1 | variables.rs:49:13:49:14 | a1 |
+| variables.rs:58:15:58:16 | b1 | variables.rs:50:13:50:14 | b1 |
+| variables.rs:59:15:59:15 | x | variables.rs:53:13:53:13 | x |
+| variables.rs:60:15:60:15 | y | variables.rs:54:13:54:13 | y |
+| variables.rs:68:9:68:10 | p1 | variables.rs:64:9:64:10 | p1 |
+| variables.rs:69:15:69:16 | a2 | variables.rs:66:12:66:13 | a2 |
+| variables.rs:70:15:70:16 | b2 | variables.rs:67:12:67:13 | b2 |
+| variables.rs:77:11:77:12 | s1 | variables.rs:74:9:74:10 | s1 |
+| variables.rs:78:19:78:20 | s2 | variables.rs:76:21:76:22 | s2 |
+| variables.rs:87:15:87:16 | x5 | variables.rs:83:14:83:15 | x5 |
+| variables.rs:94:11:94:12 | s1 | variables.rs:91:9:91:10 | s1 |
+| variables.rs:95:19:95:20 | s2 | variables.rs:93:24:93:25 | s2 |
+| variables.rs:103:11:103:12 | x6 | variables.rs:100:9:100:10 | x6 |
+| variables.rs:108:23:108:24 | y1 | variables.rs:105:14:105:15 | y1 |
+| variables.rs:113:15:113:16 | y1 | variables.rs:101:9:101:10 | y1 |
+| variables.rs:119:11:119:17 | numbers | variables.rs:117:9:117:15 | numbers |
+| variables.rs:125:23:125:27 | first | variables.rs:121:13:121:17 | first |
+| variables.rs:126:23:126:27 | third | variables.rs:122:13:122:17 | third |
+| variables.rs:127:23:127:27 | fifth | variables.rs:123:13:123:17 | fifth |
+| variables.rs:131:11:131:17 | numbers | variables.rs:117:9:117:15 | numbers |
+| variables.rs:137:23:137:27 | first | variables.rs:133:13:133:17 | first |
+| variables.rs:138:23:138:26 | last | variables.rs:135:13:135:16 | last |
+| variables.rs:146:11:146:12 | p2 | variables.rs:144:9:144:10 | p2 |
+| variables.rs:149:24:149:25 | x7 | variables.rs:148:16:148:17 | x7 |
+| variables.rs:160:11:160:13 | msg | variables.rs:158:9:158:11 | msg |
+| variables.rs:163:24:163:34 | id_variable | variables.rs:162:17:162:27 | id_variable |
+| variables.rs:168:23:168:24 | id | variables.rs:167:26:167:27 | id |
+| variables.rs:179:11:179:16 | either | variables.rs:178:9:178:14 | either |
+| variables.rs:181:26:181:27 | a3 | variables.rs:180:9:180:44 | a3 |
+| variables.rs:193:11:193:12 | tv | variables.rs:192:9:192:10 | tv |
+| variables.rs:195:26:195:27 | a4 | variables.rs:194:9:194:81 | a4 |
+| variables.rs:197:11:197:12 | tv | variables.rs:192:9:192:10 | tv |
+| variables.rs:199:26:199:27 | a5 | variables.rs:198:9:198:83 | a5 |
+| variables.rs:201:11:201:12 | tv | variables.rs:192:9:192:10 | tv |
+| variables.rs:203:26:203:27 | a6 | variables.rs:202:9:202:83 | a6 |
+| variables.rs:209:11:209:16 | either | variables.rs:208:9:208:14 | either |
+| variables.rs:211:16:211:17 | a7 | variables.rs:210:9:210:44 | a7 |
+| variables.rs:212:26:212:27 | a7 | variables.rs:210:9:210:44 | a7 |
+| variables.rs:220:11:220:16 | either | variables.rs:218:9:218:14 | either |
+| variables.rs:224:23:224:25 | a11 | variables.rs:222:14:222:51 | a11 |
+| variables.rs:226:15:226:15 | e | variables.rs:221:13:221:13 | e |
+| variables.rs:227:28:227:30 | a12 | variables.rs:225:33:225:35 | a12 |
+| variables.rs:243:11:243:12 | fv | variables.rs:242:9:242:10 | fv |
+| variables.rs:245:26:245:28 | a13 | variables.rs:244:9:244:109 | a13 |
+| variables.rs:255:15:255:16 | a8 | variables.rs:250:5:250:6 | a8 |
+| variables.rs:256:15:256:16 | b3 | variables.rs:252:9:252:10 | b3 |
+| variables.rs:257:15:257:16 | c1 | variables.rs:253:9:253:10 | c1 |
+| variables.rs:263:15:263:16 | a9 | variables.rs:261:6:261:41 | a9 |
+| variables.rs:272:15:272:17 | a10 | variables.rs:268:13:268:15 | a10 |
+| variables.rs:273:15:273:16 | b4 | variables.rs:269:13:269:14 | b4 |
+| variables.rs:274:15:274:16 | c2 | variables.rs:270:13:270:14 | c2 |
+| variables.rs:277:9:277:10 | c2 | variables.rs:270:13:270:14 | c2 |
+| variables.rs:278:9:278:10 | b4 | variables.rs:269:13:269:14 | b4 |
+| variables.rs:279:9:279:11 | a10 | variables.rs:268:13:268:15 | a10 |
+| variables.rs:281:9:281:11 | a10 | variables.rs:268:13:268:15 | a10 |
+| variables.rs:282:9:282:10 | b4 | variables.rs:269:13:269:14 | b4 |
+| variables.rs:283:9:283:10 | c2 | variables.rs:270:13:270:14 | c2 |
+| variables.rs:285:15:285:17 | a10 | variables.rs:268:13:268:15 | a10 |
+| variables.rs:286:15:286:16 | b4 | variables.rs:269:13:269:14 | b4 |
+| variables.rs:287:15:287:16 | c2 | variables.rs:270:13:270:14 | c2 |
+| variables.rs:294:23:294:25 | a10 | variables.rs:291:13:291:15 | a10 |
+| variables.rs:295:23:295:24 | b4 | variables.rs:292:13:292:14 | b4 |
+| variables.rs:299:15:299:17 | a10 | variables.rs:268:13:268:15 | a10 |
+| variables.rs:300:15:300:16 | b4 | variables.rs:269:13:269:14 | b4 |
+| variables.rs:306:9:306:9 | x | variables.rs:305:10:305:10 | x |
+| variables.rs:308:9:308:23 | example_closure | variables.rs:304:9:304:23 | example_closure |
+| variables.rs:309:15:309:16 | n1 | variables.rs:307:9:307:10 | n1 |
+| variables.rs:314:9:314:9 | x | variables.rs:313:10:313:10 | x |
+| variables.rs:316:9:316:26 | immutable_variable | variables.rs:312:9:312:26 | immutable_variable |
+| variables.rs:317:15:317:16 | n2 | variables.rs:315:9:315:10 | n2 |
+| variables.rs:324:12:324:12 | v | variables.rs:321:9:321:9 | v |
+| variables.rs:325:19:325:22 | text | variables.rs:323:9:323:12 | text |
+| variables.rs:331:5:331:5 | a | variables.rs:330:13:330:13 | a |
+| variables.rs:332:15:332:15 | a | variables.rs:330:13:330:13 | a |
+| variables.rs:333:11:333:11 | a | variables.rs:330:13:330:13 | a |
+| variables.rs:334:15:334:15 | a | variables.rs:330:13:330:13 | a |
+| variables.rs:340:14:340:14 | i | variables.rs:338:13:338:13 | i |
+| variables.rs:341:6:341:10 | ref_i | variables.rs:339:9:339:13 | ref_i |
+| variables.rs:342:15:342:15 | i | variables.rs:338:13:338:13 | i |
+| variables.rs:346:6:346:6 | x | variables.rs:345:17:345:17 | x |
+| variables.rs:347:10:347:10 | x | variables.rs:345:17:345:17 | x |
+| variables.rs:348:10:348:10 | x | variables.rs:345:17:345:17 | x |
+| variables.rs:353:23:353:23 | x | variables.rs:352:13:352:13 | x |
+| variables.rs:354:15:354:15 | x | variables.rs:352:13:352:13 | x |
 variableWriteAccess
-| variables.rs:17:5:17:6 | x2 | variables.rs:15:13:15:14 | x2 |
-| variables.rs:275:9:275:10 | c2 | variables.rs:268:13:268:14 | c2 |
-| variables.rs:276:9:276:10 | b4 | variables.rs:267:13:267:14 | b4 |
-| variables.rs:277:9:277:11 | a10 | variables.rs:266:13:266:15 | a10 |
+| variables.rs:19:5:19:6 | x2 | variables.rs:17:13:17:14 | x2 |
+| variables.rs:277:9:277:10 | c2 | variables.rs:270:13:270:14 | c2 |
+| variables.rs:278:9:278:10 | b4 | variables.rs:269:13:269:14 | b4 |
+| variables.rs:279:9:279:11 | a10 | variables.rs:268:13:268:15 | a10 |
+| variables.rs:331:5:331:5 | a | variables.rs:330:13:330:13 | a |
+| variables.rs:341:6:341:10 | ref_i | variables.rs:339:9:339:13 | ref_i |
+| variables.rs:346:6:346:6 | x | variables.rs:345:17:345:17 | x |
 variableReadAccess
-| variables.rs:11:15:11:16 | x1 | variables.rs:10:9:10:10 | x1 |
-| variables.rs:16:15:16:16 | x2 | variables.rs:15:13:15:14 | x2 |
-| variables.rs:18:15:18:16 | x2 | variables.rs:15:13:15:14 | x2 |
-| variables.rs:23:15:23:16 | x3 | variables.rs:22:9:22:10 | x3 |
-| variables.rs:25:9:25:10 | x3 | variables.rs:22:9:22:10 | x3 |
-| variables.rs:26:15:26:16 | x3 | variables.rs:24:9:24:10 | x3 |
-| variables.rs:31:15:31:16 | x4 | variables.rs:30:9:30:10 | x4 |
-| variables.rs:34:19:34:20 | x4 | variables.rs:33:13:33:14 | x4 |
-| variables.rs:36:15:36:16 | x4 | variables.rs:30:9:30:10 | x4 |
-| variables.rs:55:15:55:16 | a1 | variables.rs:47:13:47:14 | a1 |
-| variables.rs:56:15:56:16 | b1 | variables.rs:48:13:48:14 | b1 |
-| variables.rs:57:15:57:15 | x | variables.rs:51:13:51:13 | x |
-| variables.rs:58:15:58:15 | y | variables.rs:52:13:52:13 | y |
-| variables.rs:66:9:66:10 | p1 | variables.rs:62:9:62:10 | p1 |
-| variables.rs:67:15:67:16 | a2 | variables.rs:64:12:64:13 | a2 |
-| variables.rs:68:15:68:16 | b2 | variables.rs:65:12:65:13 | b2 |
-| variables.rs:75:11:75:12 | s1 | variables.rs:72:9:72:10 | s1 |
-| variables.rs:76:19:76:20 | s2 | variables.rs:74:21:74:22 | s2 |
-| variables.rs:85:15:85:16 | x5 | variables.rs:81:14:81:15 | x5 |
-| variables.rs:92:11:92:12 | s1 | variables.rs:89:9:89:10 | s1 |
-| variables.rs:93:19:93:20 | s2 | variables.rs:91:24:91:25 | s2 |
-| variables.rs:101:11:101:12 | x6 | variables.rs:98:9:98:10 | x6 |
-| variables.rs:106:23:106:24 | y1 | variables.rs:103:14:103:15 | y1 |
-| variables.rs:111:15:111:16 | y1 | variables.rs:99:9:99:10 | y1 |
-| variables.rs:117:11:117:17 | numbers | variables.rs:115:9:115:15 | numbers |
-| variables.rs:123:23:123:27 | first | variables.rs:119:13:119:17 | first |
-| variables.rs:124:23:124:27 | third | variables.rs:120:13:120:17 | third |
-| variables.rs:125:23:125:27 | fifth | variables.rs:121:13:121:17 | fifth |
-| variables.rs:129:11:129:17 | numbers | variables.rs:115:9:115:15 | numbers |
-| variables.rs:135:23:135:27 | first | variables.rs:131:13:131:17 | first |
-| variables.rs:136:23:136:26 | last | variables.rs:133:13:133:16 | last |
-| variables.rs:144:11:144:12 | p2 | variables.rs:142:9:142:10 | p2 |
-| variables.rs:147:24:147:25 | x7 | variables.rs:146:16:146:17 | x7 |
-| variables.rs:158:11:158:13 | msg | variables.rs:156:9:156:11 | msg |
-| variables.rs:161:24:161:34 | id_variable | variables.rs:160:17:160:27 | id_variable |
-| variables.rs:166:23:166:24 | id | variables.rs:165:26:165:27 | id |
-| variables.rs:177:11:177:16 | either | variables.rs:176:9:176:14 | either |
-| variables.rs:179:26:179:27 | a3 | variables.rs:178:9:178:44 | a3 |
-| variables.rs:191:11:191:12 | tv | variables.rs:190:9:190:10 | tv |
-| variables.rs:193:26:193:27 | a4 | variables.rs:192:9:192:81 | a4 |
-| variables.rs:195:11:195:12 | tv | variables.rs:190:9:190:10 | tv |
-| variables.rs:197:26:197:27 | a5 | variables.rs:196:9:196:83 | a5 |
-| variables.rs:199:11:199:12 | tv | variables.rs:190:9:190:10 | tv |
-| variables.rs:201:26:201:27 | a6 | variables.rs:200:9:200:83 | a6 |
-| variables.rs:207:11:207:16 | either | variables.rs:206:9:206:14 | either |
-| variables.rs:209:16:209:17 | a7 | variables.rs:208:9:208:44 | a7 |
-| variables.rs:210:26:210:27 | a7 | variables.rs:208:9:208:44 | a7 |
-| variables.rs:218:11:218:16 | either | variables.rs:216:9:216:14 | either |
-| variables.rs:222:23:222:25 | a11 | variables.rs:220:14:220:51 | a11 |
-| variables.rs:224:15:224:15 | e | variables.rs:219:13:219:13 | e |
-| variables.rs:225:28:225:30 | a12 | variables.rs:223:33:223:35 | a12 |
-| variables.rs:241:11:241:12 | fv | variables.rs:240:9:240:10 | fv |
-| variables.rs:243:26:243:28 | a13 | variables.rs:242:9:242:109 | a13 |
-| variables.rs:253:15:253:16 | a8 | variables.rs:248:5:248:6 | a8 |
-| variables.rs:254:15:254:16 | b3 | variables.rs:250:9:250:10 | b3 |
-| variables.rs:255:15:255:16 | c1 | variables.rs:251:9:251:10 | c1 |
-| variables.rs:261:15:261:16 | a9 | variables.rs:259:6:259:41 | a9 |
-| variables.rs:270:15:270:17 | a10 | variables.rs:266:13:266:15 | a10 |
-| variables.rs:271:15:271:16 | b4 | variables.rs:267:13:267:14 | b4 |
-| variables.rs:272:15:272:16 | c2 | variables.rs:268:13:268:14 | c2 |
-| variables.rs:279:9:279:11 | a10 | variables.rs:266:13:266:15 | a10 |
-| variables.rs:280:9:280:10 | b4 | variables.rs:267:13:267:14 | b4 |
-| variables.rs:281:9:281:10 | c2 | variables.rs:268:13:268:14 | c2 |
-| variables.rs:283:15:283:17 | a10 | variables.rs:266:13:266:15 | a10 |
-| variables.rs:284:15:284:16 | b4 | variables.rs:267:13:267:14 | b4 |
-| variables.rs:285:15:285:16 | c2 | variables.rs:268:13:268:14 | c2 |
-| variables.rs:292:23:292:25 | a10 | variables.rs:289:13:289:15 | a10 |
-| variables.rs:293:23:293:24 | b4 | variables.rs:290:13:290:14 | b4 |
-| variables.rs:297:15:297:17 | a10 | variables.rs:266:13:266:15 | a10 |
-| variables.rs:298:15:298:16 | b4 | variables.rs:267:13:267:14 | b4 |
-| variables.rs:304:9:304:9 | x | variables.rs:303:10:303:10 | x |
-| variables.rs:306:9:306:23 | example_closure | variables.rs:302:9:302:23 | example_closure |
-| variables.rs:307:15:307:16 | n1 | variables.rs:305:9:305:10 | n1 |
-| variables.rs:312:9:312:9 | x | variables.rs:311:10:311:10 | x |
-| variables.rs:314:9:314:26 | immutable_variable | variables.rs:310:9:310:26 | immutable_variable |
-| variables.rs:315:15:315:16 | n2 | variables.rs:313:9:313:10 | n2 |
-| variables.rs:322:12:322:12 | v | variables.rs:319:9:319:9 | v |
-| variables.rs:323:19:323:22 | text | variables.rs:321:9:321:12 | text |
+| variables.rs:13:15:13:16 | x1 | variables.rs:12:9:12:10 | x1 |
+| variables.rs:18:15:18:16 | x2 | variables.rs:17:13:17:14 | x2 |
+| variables.rs:20:15:20:16 | x2 | variables.rs:17:13:17:14 | x2 |
+| variables.rs:25:15:25:16 | x3 | variables.rs:24:9:24:10 | x3 |
+| variables.rs:27:9:27:10 | x3 | variables.rs:24:9:24:10 | x3 |
+| variables.rs:28:15:28:16 | x3 | variables.rs:26:9:26:10 | x3 |
+| variables.rs:33:15:33:16 | x4 | variables.rs:32:9:32:10 | x4 |
+| variables.rs:36:19:36:20 | x4 | variables.rs:35:13:35:14 | x4 |
+| variables.rs:38:15:38:16 | x4 | variables.rs:32:9:32:10 | x4 |
+| variables.rs:57:15:57:16 | a1 | variables.rs:49:13:49:14 | a1 |
+| variables.rs:58:15:58:16 | b1 | variables.rs:50:13:50:14 | b1 |
+| variables.rs:59:15:59:15 | x | variables.rs:53:13:53:13 | x |
+| variables.rs:60:15:60:15 | y | variables.rs:54:13:54:13 | y |
+| variables.rs:68:9:68:10 | p1 | variables.rs:64:9:64:10 | p1 |
+| variables.rs:69:15:69:16 | a2 | variables.rs:66:12:66:13 | a2 |
+| variables.rs:70:15:70:16 | b2 | variables.rs:67:12:67:13 | b2 |
+| variables.rs:77:11:77:12 | s1 | variables.rs:74:9:74:10 | s1 |
+| variables.rs:78:19:78:20 | s2 | variables.rs:76:21:76:22 | s2 |
+| variables.rs:87:15:87:16 | x5 | variables.rs:83:14:83:15 | x5 |
+| variables.rs:94:11:94:12 | s1 | variables.rs:91:9:91:10 | s1 |
+| variables.rs:95:19:95:20 | s2 | variables.rs:93:24:93:25 | s2 |
+| variables.rs:103:11:103:12 | x6 | variables.rs:100:9:100:10 | x6 |
+| variables.rs:108:23:108:24 | y1 | variables.rs:105:14:105:15 | y1 |
+| variables.rs:113:15:113:16 | y1 | variables.rs:101:9:101:10 | y1 |
+| variables.rs:119:11:119:17 | numbers | variables.rs:117:9:117:15 | numbers |
+| variables.rs:125:23:125:27 | first | variables.rs:121:13:121:17 | first |
+| variables.rs:126:23:126:27 | third | variables.rs:122:13:122:17 | third |
+| variables.rs:127:23:127:27 | fifth | variables.rs:123:13:123:17 | fifth |
+| variables.rs:131:11:131:17 | numbers | variables.rs:117:9:117:15 | numbers |
+| variables.rs:137:23:137:27 | first | variables.rs:133:13:133:17 | first |
+| variables.rs:138:23:138:26 | last | variables.rs:135:13:135:16 | last |
+| variables.rs:146:11:146:12 | p2 | variables.rs:144:9:144:10 | p2 |
+| variables.rs:149:24:149:25 | x7 | variables.rs:148:16:148:17 | x7 |
+| variables.rs:160:11:160:13 | msg | variables.rs:158:9:158:11 | msg |
+| variables.rs:163:24:163:34 | id_variable | variables.rs:162:17:162:27 | id_variable |
+| variables.rs:168:23:168:24 | id | variables.rs:167:26:167:27 | id |
+| variables.rs:179:11:179:16 | either | variables.rs:178:9:178:14 | either |
+| variables.rs:181:26:181:27 | a3 | variables.rs:180:9:180:44 | a3 |
+| variables.rs:193:11:193:12 | tv | variables.rs:192:9:192:10 | tv |
+| variables.rs:195:26:195:27 | a4 | variables.rs:194:9:194:81 | a4 |
+| variables.rs:197:11:197:12 | tv | variables.rs:192:9:192:10 | tv |
+| variables.rs:199:26:199:27 | a5 | variables.rs:198:9:198:83 | a5 |
+| variables.rs:201:11:201:12 | tv | variables.rs:192:9:192:10 | tv |
+| variables.rs:203:26:203:27 | a6 | variables.rs:202:9:202:83 | a6 |
+| variables.rs:209:11:209:16 | either | variables.rs:208:9:208:14 | either |
+| variables.rs:211:16:211:17 | a7 | variables.rs:210:9:210:44 | a7 |
+| variables.rs:212:26:212:27 | a7 | variables.rs:210:9:210:44 | a7 |
+| variables.rs:220:11:220:16 | either | variables.rs:218:9:218:14 | either |
+| variables.rs:224:23:224:25 | a11 | variables.rs:222:14:222:51 | a11 |
+| variables.rs:226:15:226:15 | e | variables.rs:221:13:221:13 | e |
+| variables.rs:227:28:227:30 | a12 | variables.rs:225:33:225:35 | a12 |
+| variables.rs:243:11:243:12 | fv | variables.rs:242:9:242:10 | fv |
+| variables.rs:245:26:245:28 | a13 | variables.rs:244:9:244:109 | a13 |
+| variables.rs:255:15:255:16 | a8 | variables.rs:250:5:250:6 | a8 |
+| variables.rs:256:15:256:16 | b3 | variables.rs:252:9:252:10 | b3 |
+| variables.rs:257:15:257:16 | c1 | variables.rs:253:9:253:10 | c1 |
+| variables.rs:263:15:263:16 | a9 | variables.rs:261:6:261:41 | a9 |
+| variables.rs:272:15:272:17 | a10 | variables.rs:268:13:268:15 | a10 |
+| variables.rs:273:15:273:16 | b4 | variables.rs:269:13:269:14 | b4 |
+| variables.rs:274:15:274:16 | c2 | variables.rs:270:13:270:14 | c2 |
+| variables.rs:281:9:281:11 | a10 | variables.rs:268:13:268:15 | a10 |
+| variables.rs:282:9:282:10 | b4 | variables.rs:269:13:269:14 | b4 |
+| variables.rs:283:9:283:10 | c2 | variables.rs:270:13:270:14 | c2 |
+| variables.rs:285:15:285:17 | a10 | variables.rs:268:13:268:15 | a10 |
+| variables.rs:286:15:286:16 | b4 | variables.rs:269:13:269:14 | b4 |
+| variables.rs:287:15:287:16 | c2 | variables.rs:270:13:270:14 | c2 |
+| variables.rs:294:23:294:25 | a10 | variables.rs:291:13:291:15 | a10 |
+| variables.rs:295:23:295:24 | b4 | variables.rs:292:13:292:14 | b4 |
+| variables.rs:299:15:299:17 | a10 | variables.rs:268:13:268:15 | a10 |
+| variables.rs:300:15:300:16 | b4 | variables.rs:269:13:269:14 | b4 |
+| variables.rs:306:9:306:9 | x | variables.rs:305:10:305:10 | x |
+| variables.rs:308:9:308:23 | example_closure | variables.rs:304:9:304:23 | example_closure |
+| variables.rs:309:15:309:16 | n1 | variables.rs:307:9:307:10 | n1 |
+| variables.rs:314:9:314:9 | x | variables.rs:313:10:313:10 | x |
+| variables.rs:316:9:316:26 | immutable_variable | variables.rs:312:9:312:26 | immutable_variable |
+| variables.rs:317:15:317:16 | n2 | variables.rs:315:9:315:10 | n2 |
+| variables.rs:324:12:324:12 | v | variables.rs:321:9:321:9 | v |
+| variables.rs:325:19:325:22 | text | variables.rs:323:9:323:12 | text |
+| variables.rs:331:5:331:5 | a | variables.rs:330:13:330:13 | a |
+| variables.rs:332:15:332:15 | a | variables.rs:330:13:330:13 | a |
+| variables.rs:333:11:333:11 | a | variables.rs:330:13:330:13 | a |
+| variables.rs:334:15:334:15 | a | variables.rs:330:13:330:13 | a |
+| variables.rs:340:14:340:14 | i | variables.rs:338:13:338:13 | i |
+| variables.rs:342:15:342:15 | i | variables.rs:338:13:338:13 | i |
+| variables.rs:347:10:347:10 | x | variables.rs:345:17:345:17 | x |
+| variables.rs:348:10:348:10 | x | variables.rs:345:17:345:17 | x |
+| variables.rs:353:23:353:23 | x | variables.rs:352:13:352:13 | x |
+| variables.rs:354:15:354:15 | x | variables.rs:352:13:352:13 | x |
 variableInitializer
-| variables.rs:10:9:10:10 | x1 | variables.rs:10:14:10:16 | "a" |
-| variables.rs:15:13:15:14 | x2 | variables.rs:15:18:15:18 | 4 |
-| variables.rs:22:9:22:10 | x3 | variables.rs:22:14:22:14 | 1 |
-| variables.rs:24:9:24:10 | x3 | variables.rs:25:9:25:14 | ... + ... |
-| variables.rs:30:9:30:10 | x4 | variables.rs:30:14:30:16 | "a" |
-| variables.rs:33:13:33:14 | x4 | variables.rs:33:18:33:20 | "b" |
-| variables.rs:62:9:62:10 | p1 | variables.rs:62:14:62:37 | RecordExpr |
-| variables.rs:72:9:72:10 | s1 | variables.rs:72:14:72:41 | CallExpr |
-| variables.rs:89:9:89:10 | s1 | variables.rs:89:14:89:41 | CallExpr |
-| variables.rs:98:9:98:10 | x6 | variables.rs:98:14:98:20 | CallExpr |
-| variables.rs:99:9:99:10 | y1 | variables.rs:99:14:99:15 | 10 |
-| variables.rs:115:9:115:15 | numbers | variables.rs:115:19:115:35 | TupleExpr |
-| variables.rs:142:9:142:10 | p2 | variables.rs:142:14:142:37 | RecordExpr |
-| variables.rs:156:9:156:11 | msg | variables.rs:156:15:156:38 | RecordExpr |
-| variables.rs:176:9:176:14 | either | variables.rs:176:18:176:33 | CallExpr |
-| variables.rs:190:9:190:10 | tv | variables.rs:190:14:190:36 | CallExpr |
-| variables.rs:206:9:206:14 | either | variables.rs:206:18:206:33 | CallExpr |
-| variables.rs:216:9:216:14 | either | variables.rs:216:18:216:33 | CallExpr |
-| variables.rs:240:9:240:10 | fv | variables.rs:240:14:240:35 | CallExpr |
-| variables.rs:302:9:302:23 | example_closure | variables.rs:303:9:304:9 | ClosureExpr |
-| variables.rs:305:9:305:10 | n1 | variables.rs:306:9:306:26 | CallExpr |
-| variables.rs:310:9:310:26 | immutable_variable | variables.rs:311:9:312:9 | ClosureExpr |
-| variables.rs:313:9:313:10 | n2 | variables.rs:314:9:314:29 | CallExpr |
-| variables.rs:319:9:319:9 | v | variables.rs:319:13:319:41 | RefExpr |
+| variables.rs:12:9:12:10 | x1 | variables.rs:12:14:12:16 | "a" |
+| variables.rs:17:13:17:14 | x2 | variables.rs:17:18:17:18 | 4 |
+| variables.rs:24:9:24:10 | x3 | variables.rs:24:14:24:14 | 1 |
+| variables.rs:26:9:26:10 | x3 | variables.rs:27:9:27:14 | ... + ... |
+| variables.rs:32:9:32:10 | x4 | variables.rs:32:14:32:16 | "a" |
+| variables.rs:35:13:35:14 | x4 | variables.rs:35:18:35:20 | "b" |
+| variables.rs:64:9:64:10 | p1 | variables.rs:64:14:64:37 | RecordExpr |
+| variables.rs:74:9:74:10 | s1 | variables.rs:74:14:74:41 | CallExpr |
+| variables.rs:91:9:91:10 | s1 | variables.rs:91:14:91:41 | CallExpr |
+| variables.rs:100:9:100:10 | x6 | variables.rs:100:14:100:20 | CallExpr |
+| variables.rs:101:9:101:10 | y1 | variables.rs:101:14:101:15 | 10 |
+| variables.rs:117:9:117:15 | numbers | variables.rs:117:19:117:35 | TupleExpr |
+| variables.rs:144:9:144:10 | p2 | variables.rs:144:14:144:37 | RecordExpr |
+| variables.rs:158:9:158:11 | msg | variables.rs:158:15:158:38 | RecordExpr |
+| variables.rs:178:9:178:14 | either | variables.rs:178:18:178:33 | CallExpr |
+| variables.rs:192:9:192:10 | tv | variables.rs:192:14:192:36 | CallExpr |
+| variables.rs:208:9:208:14 | either | variables.rs:208:18:208:33 | CallExpr |
+| variables.rs:218:9:218:14 | either | variables.rs:218:18:218:33 | CallExpr |
+| variables.rs:242:9:242:10 | fv | variables.rs:242:14:242:35 | CallExpr |
+| variables.rs:304:9:304:23 | example_closure | variables.rs:305:9:306:9 | ClosureExpr |
+| variables.rs:307:9:307:10 | n1 | variables.rs:308:9:308:26 | CallExpr |
+| variables.rs:312:9:312:26 | immutable_variable | variables.rs:313:9:314:9 | ClosureExpr |
+| variables.rs:315:9:315:10 | n2 | variables.rs:316:9:316:29 | CallExpr |
+| variables.rs:321:9:321:9 | v | variables.rs:321:13:321:41 | RefExpr |
+| variables.rs:330:13:330:13 | a | variables.rs:330:17:330:17 | 0 |
+| variables.rs:338:13:338:13 | i | variables.rs:338:17:338:17 | 1 |
+| variables.rs:339:9:339:13 | ref_i | variables.rs:340:9:340:14 | RefExpr |
+| variables.rs:352:13:352:13 | x | variables.rs:352:17:352:17 | 2 |
diff --git a/rust/ql/test/library-tests/variables/variables.ql b/rust/ql/test/library-tests/variables/variables.ql
index dcca73d5cf28..9657c361fd59 100644
--- a/rust/ql/test/library-tests/variables/variables.ql
+++ b/rust/ql/test/library-tests/variables/variables.ql
@@ -12,7 +12,7 @@ query predicate variableReadAccess(VariableReadAccess va, Variable v) { v = va.g
 query predicate variableInitializer(Variable v, Expr e) { e = v.getInitializer() }
 
 module VariableAccessTest implements TestSig {
-  string getARelevantTag() { result = "access" }
+  string getARelevantTag() { result = ["", "write_", "read_"] + "access" }
 
   private predicate declAt(Variable v, string filepath, int line) {
     v.getLocation().hasLocationInfo(filepath, _, _, line, _)
@@ -38,8 +38,15 @@ module VariableAccessTest implements TestSig {
     exists(VariableAccess va |
       location = va.getLocation() and
       element = va.toString() and
-      tag = "access" and
       decl(va.getVariable(), value)
+    |
+      va instanceof VariableWriteAccess and tag = "write_access"
+      or
+      va instanceof VariableReadAccess and tag = "read_access"
+      or
+      not va instanceof VariableWriteAccess and
+      not va instanceof VariableReadAccess and
+      tag = "access"
     )
   }
 }
diff --git a/rust/ql/test/library-tests/variables/variables.rs b/rust/ql/test/library-tests/variables/variables.rs
index 85fa052a7aa2..52c5288a6b32 100644
--- a/rust/ql/test/library-tests/variables/variables.rs
+++ b/rust/ql/test/library-tests/variables/variables.rs
@@ -1,3 +1,5 @@
+use std::ops::AddAssign;
+
 fn print_str(s: &str) {
     println!("{}", s);
 }
@@ -8,32 +10,32 @@ fn print_i64(i: i64) {
 
 fn immutable_variable() {
     let x1 = "a"; // x1
-    print_str(x1); // $ access=x1
+    print_str(x1); // $ read_access=x1
 }
 
 fn mutable_variable() {
     let mut x2 = 4; // x2
-    print_i64(x2); // $ access=x2
-    x2 = 5; // $ access=x2
-    print_i64(x2); // $ access=x2
+    print_i64(x2); // $ read_access=x2
+    x2 = 5; // $ write_access=x2
+    print_i64(x2); // $ read_access=x2
 }
 
 fn variable_shadow1() {
     let x3 = 1; // x3_1
-    print_i64(x3); // $ access=x3_1
+    print_i64(x3); // $ read_access=x3_1
     let x3 = // x3_2
-        x3 + 1; // $ access=x3_1
-    print_i64(x3); // $ access=x3_2
+        x3 + 1; // $ read_access=x3_1
+    print_i64(x3); // $ read_access=x3_2
 }
 
 fn variable_shadow2() {
     let x4 = "a"; // x4_1
-    print_str(x4); // $ access=x4_1
+    print_str(x4); // $ read_access=x4_1
     {
         let x4 = "b"; // x4_2
-        print_str(x4); // $ access=x4_2
+        print_str(x4); // $ read_access=x4_2
     }
-    print_str(x4); // $ access=x4_1
+    print_str(x4); // $ read_access=x4_1
 }
 
 struct Point<'a> {
@@ -52,10 +54,10 @@ fn let_pattern1() {
             y, // y
         },
     ) = (("a", "b"), Point { x: "x", y: "y" });
-    print_str(a1); // $ access=a1
-    print_str(b1); // $ access=b1
-    print_str(x); // $ access=x
-    print_str(y); // $ access=y
+    print_str(a1); // $ read_access=a1
+    print_str(b1); // $ read_access=b1
+    print_str(x); // $ read_access=x
+    print_str(y); // $ read_access=y
 }
 
 fn let_pattern2() {
@@ -63,34 +65,34 @@ fn let_pattern2() {
     let Point {
         x: a2, // a2
         y: b2, // b2
-    } = p1; // $ access=p1
-    print_str(a2); // $ access=a2
-    print_str(b2); // $ access=b2
+    } = p1; // $ read_access=p1
+    print_str(a2); // $ read_access=a2
+    print_str(b2); // $ read_access=b2
 }
 
 fn let_pattern3() {
     let s1 = Some(String::from("Hello!")); // s1
 
     if let Some(ref s2) // s2
-        = s1 { // $ access=s1
-        print_str(s2); // $ access=s2
+        = s1 { // $ read_access=s1
+        print_str(s2); // $ read_access=s2
     }
 }
 
 fn let_pattern4() {
-    let Some(x5): Option<&str> = Some("x5") else {
-        // x5
-        todo!()
-    };
-    print_str(x5); // $ access=x5
+    let Some(x5): Option<&str> = Some("x5") // x5
+        else {
+            todo!()
+        };
+    print_str(x5); // $ read_access=x5
 }
 
 fn let_pattern5() {
     let s1 = Some(String::from("Hello!")); // s1
 
     while let Some(ref s2) // s2
-        = s1 { // $ access=s1
-        print_str(s2); // $ access=s2
+        = s1 { // $ read_access=s1
+        print_str(s2); // $ read_access=s2
     }
 }
 
@@ -98,42 +100,42 @@ fn match_pattern1() {
     let x6 = Some(5); // x6
     let y1 = 10; // y1_1
 
-    match x6 { // $ access=x6
+    match x6 { // $ read_access=x6
         Some(50) => print_str("Got 50"),
         Some(y1) // y1_2
         =>
         {
-            print_i64(y1)// $ access=y1_2
+            print_i64(y1)// $ read_access=y1_2
         } 
         None => print_str("NONE"),
     }
 
-    print_i64(y1); // $ access=y1_1
+    print_i64(y1); // $ read_access=y1_1
 }
 
 fn match_pattern2() {
     let numbers = (2, 4, 8, 16, 32); // numbers
 
-    match numbers { // $ access=numbers
+    match numbers { // $ read_access=numbers
         (
             first, _, // first
             third, _, // third
             fifth // fifth
         ) => {
-            print_i64(first); // $ access=first
-            print_i64(third); // $ access=third
-            print_i64(fifth); // $ access=fifth
+            print_i64(first); // $ read_access=first
+            print_i64(third); // $ read_access=third
+            print_i64(fifth); // $ read_access=fifth
         }
     }
 
-    match numbers { // $ access=numbers
+    match numbers { // $ read_access=numbers
         (
             first, // first
             ..,
             last // last
         ) => {
-            print_i64(first); // $ access=first
-            print_i64(last); // $ access=last
+            print_i64(first); // $ read_access=first
+            print_i64(last); // $ read_access=last
         }
     }
 }
@@ -141,10 +143,10 @@ fn match_pattern2() {
 fn match_pattern3() {
     let p2 = Point { x: "x", y: "y" }; // p2
 
-    match p2 { // $ access=p2
+    match p2 { // $ read_access=p2
         Point {
             x: x7, .. // x7
-        } => print_str(x7), // $ access=x7
+        } => print_str(x7), // $ read_access=x7
     }
 }
 
@@ -155,15 +157,15 @@ enum Message {
 fn match_pattern4() {
     let msg = Message::Hello { id: 0 }; // msg
 
-    match msg { // $ access=msg
+    match msg { // $ read_access=msg
         Message::Hello {
             id: id_variable @ 3..=7, // id_variable
-        } => print_i64(id_variable), // $ access=id_variable
+        } => print_i64(id_variable), // $ read_access=id_variable
         Message::Hello { id: 10..=12 } => {
             println!("Found an id in another range")
         }
         Message::Hello { id } => // id
-            print_i64(id), // $ access=id
+            print_i64(id), // $ read_access=id
     }
 }
 
@@ -174,9 +176,9 @@ enum Either {
 
 fn match_pattern5() {
     let either = Either::Left(32); // either
-    match either { // $ access=either
+    match either { // $ read_access=either
         Either::Left(a3) | Either::Right(a3) // a3
-            => print_i64(a3), // $ access=a3
+            => print_i64(a3), // $ read_access=a3
     }
 }
 
@@ -188,26 +190,26 @@ enum ThreeValued {
 
 fn match_pattern6() {
     let tv = ThreeValued::Second(62); // tv
-    match tv { // $ access=tv
+    match tv { // $ read_access=tv
         ThreeValued::First(a4) | ThreeValued::Second(a4) | ThreeValued::Third(a4) // a4
-            => print_i64(a4), // $ access=a4
+            => print_i64(a4), // $ read_access=a4
     }
-    match tv { // $ access=tv
+    match tv { // $ read_access=tv
         (ThreeValued::First(a5) | ThreeValued::Second(a5)) | ThreeValued::Third(a5) // a5
-            => print_i64(a5), // $ access=a5
+            => print_i64(a5), // $ read_access=a5
     }
-    match tv { // $ access=tv
+    match tv { // $ read_access=tv
         ThreeValued::First(a6) | (ThreeValued::Second(a6) | ThreeValued::Third(a6)) // a6
-            => print_i64(a6), // $ access=a6
+            => print_i64(a6), // $ read_access=a6
     }
 }
 
 fn match_pattern7() {
     let either = Either::Left(32); // either
-    match either { // $ access=either
+    match either { // $ read_access=either
         Either::Left(a7) | Either::Right(a7) // a7
-            if a7 > 0 // $ access=a7
-            => print_i64(a7), // $ access=a7
+            if a7 > 0 // $ read_access=a7
+            => print_i64(a7), // $ read_access=a7
         _ => (),
     }
 }
@@ -215,14 +217,14 @@ fn match_pattern7() {
 fn match_pattern8() {
     let either = Either::Left(32); // either
 
-    match either { // $ access=either
+    match either { // $ read_access=either
         ref e @ // e
             (Either::Left(a11) | Either::Right(a11)) // a11
         => {
-            print_i64(a11); // $ access=a11
+            print_i64(a11); // $ read_access=a11
             if let Either::Left(a12) // a12
-            = e { // $ access=e
-                print_i64(*a12); // $ access=a12
+            = e { // $ read_access=e
+                print_i64(*a12); // $ read_access=a12
             }
         }
         _ => (),
@@ -238,9 +240,9 @@ enum FourValued {
 
 fn match_pattern9() {
     let fv = FourValued::Second(62); // tv
-    match fv { // $ access=tv
+    match fv { // $ read_access=tv
         FourValued::First(a13) | (FourValued::Second(a13) | FourValued::Third(a13)) | FourValued::Fourth(a13) // a13
-            => print_i64(a13), // $ access=a13
+            => print_i64(a13), // $ read_access=a13
     }
 }
 
@@ -250,15 +252,15 @@ fn param_pattern1(
         b3, // b3
         c1, // c1
     ): (&str, &str)) -> () {
-    print_str(a8); // $ access=a8
-    print_str(b3); // $ access=b3
-    print_str(c1); // $ access=c1
+    print_str(a8); // $ read_access=a8
+    print_str(b3); // $ read_access=b3
+    print_str(c1); // $ read_access=c1
 }
 
 fn param_pattern2(
     (Either::Left(a9) | Either::Right(a9)): Either // a9
 ) -> () {
-    print_i64(a9); // $ access=a9
+    print_i64(a9); // $ read_access=a9
 }
 
 fn destruct_assignment() {
@@ -267,63 +269,91 @@ fn destruct_assignment() {
         mut b4, // b4
         mut c2 // c2
     ) = (1, 2, 3);
-    print_i64(a10); // $ access=a10
-    print_i64(b4); // $ access=b4
-    print_i64(c2); // $ access=c2
+    print_i64(a10); // $ read_access=a10
+    print_i64(b4); // $ read_access=b4
+    print_i64(c2); // $ read_access=c2
 
     (
-        c2, // $ access=c2
-        b4, // $ access=b4
-        a10 // $ access=a10
+        c2, // $ write_access=c2
+        b4, // $ write_access=b4
+        a10 // $ write_access=a10
     ) = (
-        a10, // $ access=a10
-        b4, // $ access=b4
-        c2 // $ access=c2
+        a10, // $ read_access=a10
+        b4, // $ read_access=b4
+        c2 // $ read_access=c2
     );
-    print_i64(a10); // $ access=a10
-    print_i64(b4); // $ access=b4
-    print_i64(c2); // $ access=c2
+    print_i64(a10); // $ read_access=a10
+    print_i64(b4); // $ read_access=b4
+    print_i64(c2); // $ read_access=c2
 
     match (4, 5) {
         (
             a10, // a10_2
             b4 // b4
         ) => {
-            print_i64(a10); // $ access=a10_2
-            print_i64(b4); // $ access=b4
+            print_i64(a10); // $ read_access=a10_2
+            print_i64(b4); // $ read_access=b4
         }
     }
 
-    print_i64(a10); // $ access=a10
-    print_i64(b4); // $ access=b4
+    print_i64(a10); // $ read_access=a10
+    print_i64(b4); // $ read_access=b4
 }
 
 fn closure_variable() {
     let example_closure = // example_closure
         |x: i64| // x_1
-        x; // $ access=x_1
+        x; // $ read_access=x_1
     let n1 = // n1
-        example_closure(5); // $ access=example_closure
-    print_i64(n1); // $ access=n1
+        example_closure(5); // $ read_access=example_closure
+    print_i64(n1); // $ read_access=n1
 
     immutable_variable();
     let immutable_variable =
         |x: i64| // x_2
-        x; // $ access=x_2
+        x; // $ read_access=x_2
     let n2 = // n2
-        immutable_variable(6); // $ access=immutable_variable
-    print_i64(n2); // $ access=n2
+        immutable_variable(6); // $ read_access=immutable_variable
+    print_i64(n2); // $ read_access=n2
 }
 
 fn for_variable() {
     let v = &["apples", "cake", "coffee"]; // v
 
     for text // text
-        in v { // $ access=v
-        print_str(text); // $ access=text
+        in v { // $ read_access=v
+        print_str(text); // $ read_access=text
     }
 }
 
+fn add_assign() {
+    let mut a = 0; // a
+    a += 1; // $ access=a
+    print_i64(a); // $ read_access=a
+    (&mut a).add_assign(10); // $ access=a
+    print_i64(a); // $ read_access=a
+}
+
+fn mutate() {
+    let mut i = 1; // i
+    let ref_i = // ref_i
+        &mut i; // $ access=i
+    *ref_i = 2; // $ read_access=ref_i
+    print_i64(i); // $ read_access=i
+}
+
+fn mutate_param(x : &mut i64) { // x
+    *x = // $ read_access=x
+        *x + // $ read_access=x
+        *x; // $ read_access=x
+}
+
+fn mutate_arg() {
+    let mut x = 2; // x
+    mutate_param(&mut x); // $ access=x
+    print_i64(x); // $ read_access=x
+}
+
 fn main() {
     immutable_variable();
     mutable_variable();
@@ -347,4 +377,7 @@ fn main() {
     destruct_assignment();
     closure_variable();
     for_variable();
+    add_assign();
+    mutate();
+    mutate_arg();
 }

From a9cf33ce185aa585936fec173f48275cd188f602 Mon Sep 17 00:00:00 2001
From: Tom Hvitved <hvitved@github.com>
Date: Thu, 3 Oct 2024 13:33:22 +0200
Subject: [PATCH 160/347] Rust: `&x` is neither a read nor a write

---
 .../rust/elements/AssignmentOperation.qll     | 49 +++++++++++++++++++
 .../rust/elements/internal/VariableImpl.qll   | 25 ++++------
 rust/ql/lib/rust.qll                          |  1 +
 .../variables/variables.expected              | 22 +--------
 4 files changed, 61 insertions(+), 36 deletions(-)
 create mode 100644 rust/ql/lib/codeql/rust/elements/AssignmentOperation.qll

diff --git a/rust/ql/lib/codeql/rust/elements/AssignmentOperation.qll b/rust/ql/lib/codeql/rust/elements/AssignmentOperation.qll
new file mode 100644
index 000000000000..be7b2c82cf47
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/AssignmentOperation.qll
@@ -0,0 +1,49 @@
+/** Provides classes for assignment operations. */
+
+private import rust
+private import codeql.rust.elements.internal.BinaryExprImpl
+
+/** An assignment operation. */
+abstract private class AssignmentOperationImpl extends Impl::BinaryExpr { }
+
+final class AssignmentOperation = AssignmentOperationImpl;
+
+/**
+ * An assignment expression, for example
+ *
+ * ```rust
+ * x = y;
+ * ```
+ */
+final class AssignmentExpr extends AssignmentOperationImpl {
+  AssignmentExpr() { this.getOperatorName() = "=" }
+
+  override string getAPrimaryQlClass() { result = "AssignmentExpr" }
+}
+
+/**
+ * A compound assignment expression, for example
+ *
+ * ```rust
+ * x += y;
+ * ```
+ *
+ * Note that compound assignment expressions are syntatic sugar for
+ * trait invocations, i.e., the above actually means
+ *
+ * ```rust
+ * (&mut x).add_assign(y);
+ * ```
+ */
+final class CompoundAssignmentExpr extends AssignmentOperationImpl {
+  private string operator;
+
+  CompoundAssignmentExpr() { this.getOperatorName().regexpCapture("(.)=", 1) = operator }
+
+  /**
+   * Gets the operator of this compound assignment expression.
+   */
+  string getOperator() { result = operator }
+
+  override string getAPrimaryQlClass() { result = "CompoundAssignmentExpr" }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/VariableImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/VariableImpl.qll
index 7a77c45fe2ae..b9e9bb7cb48a 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/VariableImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/VariableImpl.qll
@@ -395,34 +395,27 @@ module Impl {
   }
 
   /** Holds if `e` occurs in the LHS of an assignment or compound assignment. */
-  private predicate assignLhs(Expr e, boolean compound) {
-    exists(BinaryExpr be, string op |
-      op = be.getOperatorName().regexpCapture("(.*)=", 1) and
-      e = be.getLhs()
-    |
-      op = "" and compound = false
-      or
-      op != "" and compound = true
-    )
+  private predicate assignmentExprDescendant(Expr e) {
+    e = any(AssignmentExpr ae).getLhs()
     or
     exists(Expr mid |
-      assignLhs(mid, compound) and
-      getImmediateParent(e) = mid
+      assignmentExprDescendant(mid) and
+      getImmediateParent(e) = mid and
+      not mid.(PrefixExpr).getOperatorName() = "*"
     )
   }
 
   /** A variable write. */
   class VariableWriteAccess extends VariableAccess {
-    VariableWriteAccess() { assignLhs(this, _) }
+    VariableWriteAccess() { assignmentExprDescendant(this) }
   }
 
   /** A variable read. */
   class VariableReadAccess extends VariableAccess {
     VariableReadAccess() {
-      not this instanceof VariableWriteAccess
-      or
-      // consider LHS in compound assignments both reads and writes
-      assignLhs(this, true)
+      not this instanceof VariableWriteAccess and
+      not this = any(RefExpr re).getExpr() and
+      not this = any(CompoundAssignmentExpr cae).getLhs()
     }
   }
 
diff --git a/rust/ql/lib/rust.qll b/rust/ql/lib/rust.qll
index 7723400c41b6..58425b6490e8 100644
--- a/rust/ql/lib/rust.qll
+++ b/rust/ql/lib/rust.qll
@@ -3,5 +3,6 @@
 import codeql.rust.elements
 import codeql.Locations
 import codeql.files.FileSystem
+import codeql.rust.elements.AssignmentOperation
 import codeql.rust.elements.LogicalOperation
 import codeql.rust.elements.Variable
diff --git a/rust/ql/test/library-tests/variables/variables.expected b/rust/ql/test/library-tests/variables/variables.expected
index 807fc9ff8919..ccc1cd6072be 100644
--- a/rust/ql/test/library-tests/variables/variables.expected
+++ b/rust/ql/test/library-tests/variables/variables.expected
@@ -1,17 +1,4 @@
 testFailures
-| variables.rs:331:5:331:5 | a | Unexpected result: read_access=a |
-| variables.rs:331:5:331:5 | a | Unexpected result: write_access=a |
-| variables.rs:331:13:331:25 | Comment | Missing result:access=a |
-| variables.rs:333:11:333:11 | a | Unexpected result: read_access=a |
-| variables.rs:333:30:333:42 | Comment | Missing result:access=a |
-| variables.rs:340:14:340:14 | i | Unexpected result: read_access=i |
-| variables.rs:340:17:340:29 | Comment | Missing result:access=i |
-| variables.rs:341:6:341:10 | ref_i | Unexpected result: write_access=ref_i |
-| variables.rs:341:17:341:38 | Comment | Missing result:read_access=ref_i |
-| variables.rs:346:6:346:6 | x | Unexpected result: write_access=x |
-| variables.rs:346:10:346:27 | Comment | Missing result:read_access=x |
-| variables.rs:353:23:353:23 | x | Unexpected result: read_access=x |
-| variables.rs:353:27:353:39 | Comment | Missing result:access=x |
 failures
 variable
 | variables.rs:3:14:3:14 | s |
@@ -185,9 +172,6 @@ variableWriteAccess
 | variables.rs:277:9:277:10 | c2 | variables.rs:270:13:270:14 | c2 |
 | variables.rs:278:9:278:10 | b4 | variables.rs:269:13:269:14 | b4 |
 | variables.rs:279:9:279:11 | a10 | variables.rs:268:13:268:15 | a10 |
-| variables.rs:331:5:331:5 | a | variables.rs:330:13:330:13 | a |
-| variables.rs:341:6:341:10 | ref_i | variables.rs:339:9:339:13 | ref_i |
-| variables.rs:346:6:346:6 | x | variables.rs:345:17:345:17 | x |
 variableReadAccess
 | variables.rs:13:15:13:16 | x1 | variables.rs:12:9:12:10 | x1 |
 | variables.rs:18:15:18:16 | x2 | variables.rs:17:13:17:14 | x2 |
@@ -267,15 +251,13 @@ variableReadAccess
 | variables.rs:317:15:317:16 | n2 | variables.rs:315:9:315:10 | n2 |
 | variables.rs:324:12:324:12 | v | variables.rs:321:9:321:9 | v |
 | variables.rs:325:19:325:22 | text | variables.rs:323:9:323:12 | text |
-| variables.rs:331:5:331:5 | a | variables.rs:330:13:330:13 | a |
 | variables.rs:332:15:332:15 | a | variables.rs:330:13:330:13 | a |
-| variables.rs:333:11:333:11 | a | variables.rs:330:13:330:13 | a |
 | variables.rs:334:15:334:15 | a | variables.rs:330:13:330:13 | a |
-| variables.rs:340:14:340:14 | i | variables.rs:338:13:338:13 | i |
+| variables.rs:341:6:341:10 | ref_i | variables.rs:339:9:339:13 | ref_i |
 | variables.rs:342:15:342:15 | i | variables.rs:338:13:338:13 | i |
+| variables.rs:346:6:346:6 | x | variables.rs:345:17:345:17 | x |
 | variables.rs:347:10:347:10 | x | variables.rs:345:17:345:17 | x |
 | variables.rs:348:10:348:10 | x | variables.rs:345:17:345:17 | x |
-| variables.rs:353:23:353:23 | x | variables.rs:352:13:352:13 | x |
 | variables.rs:354:15:354:15 | x | variables.rs:352:13:352:13 | x |
 variableInitializer
 | variables.rs:12:9:12:10 | x1 | variables.rs:12:14:12:16 | "a" |

From aa5e0c39ba23a26eadf51bbfa2f0e11c63052995 Mon Sep 17 00:00:00 2001
From: Tom Hvitved <hvitved@github.com>
Date: Wed, 2 Oct 2024 14:52:32 +0200
Subject: [PATCH 161/347] Rust: Implement `ConditionalCompletionSplitting`

---
 rust/ql/consistency-queries/CfgConsistency.ql |   2 -
 .../rust/controlflow/internal/Completion.qll  |  29 ++--
 .../internal/ControlFlowGraphImpl.qll         |  63 ++++----
 .../rust/controlflow/internal/Splitting.qll   | 108 ++++++++++++-
 .../library-tests/controlflow/Cfg.expected    | 149 ++++++++++--------
 5 files changed, 225 insertions(+), 126 deletions(-)

diff --git a/rust/ql/consistency-queries/CfgConsistency.ql b/rust/ql/consistency-queries/CfgConsistency.ql
index 6964b7bbcb18..3a95fde507b4 100644
--- a/rust/ql/consistency-queries/CfgConsistency.ql
+++ b/rust/ql/consistency-queries/CfgConsistency.ql
@@ -12,8 +12,6 @@ query predicate nonPostOrderExpr(Expr e, string cls) {
   cls = e.getPrimaryQlClasses() and
   not e instanceof LetExpr and
   not e instanceof ParenExpr and
-  not e instanceof LogicalAndExpr and // todo
-  not e instanceof LogicalOrExpr and
   exists(AstNode last, Completion c |
     CfgImpl::last(e, last, c) and
     last != e and
diff --git a/rust/ql/lib/codeql/rust/controlflow/internal/Completion.qll b/rust/ql/lib/codeql/rust/controlflow/internal/Completion.qll
index 15619f06a2fe..fc427ce32f88 100644
--- a/rust/ql/lib/codeql/rust/controlflow/internal/Completion.qll
+++ b/rust/ql/lib/codeql/rust/controlflow/internal/Completion.qll
@@ -63,10 +63,8 @@ abstract class ConditionalCompletion extends NormalCompletion {
 }
 
 /** Holds if node `n` has the Boolean constant value `value`. */
-private predicate isBooleanConstant(AstNode n, Boolean value) {
-  n.(LiteralExpr).getTextValue() = value.toString()
-  or
-  isBooleanConstant(n.(ParenExpr).getExpr(), value)
+private predicate isBooleanConstant(LiteralExpr le, Boolean value) {
+  le.getTextValue() = value.toString()
 }
 
 /**
@@ -83,29 +81,22 @@ class BooleanCompletion extends ConditionalCompletion, TBooleanCompletion {
     or
     any(MatchGuard guard).getCondition() = e
     or
-    exists(BinaryExpr expr |
-      expr.getOperatorName() = ["&&", "||"] and
-      e = expr.getLhs()
-    )
+    e = any(BinaryLogicalOperation blo).getLhs()
     or
     exists(Expr parent | this.isValidForSpecific0(parent) |
       e = parent.(ParenExpr).getExpr()
       or
-      parent =
-        any(PrefixExpr expr |
-          expr.getOperatorName() = "!" and
-          e = expr.getExpr()
-        )
+      e = parent.(LogicalNotExpr).getExpr()
       or
-      parent =
-        any(BinaryExpr expr |
-          expr.getOperatorName() = ["&&", "||"] and
-          e = expr.getRhs()
-        )
+      e = parent.(BinaryLogicalOperation).getRhs()
       or
       parent = any(IfExpr ie | e = [ie.getThen(), ie.getElse()])
       or
-      parent = any(BlockExpr be | e = be.getStmtList().getTailExpr())
+      e = parent.(MatchExpr).getAnArm().getExpr()
+      or
+      e = parent.(BlockExpr).getStmtList().getTailExpr()
+      or
+      e = any(BreakExpr be | be.getTarget() = parent).getExpr()
     )
   }
 
diff --git a/rust/ql/lib/codeql/rust/controlflow/internal/ControlFlowGraphImpl.qll b/rust/ql/lib/codeql/rust/controlflow/internal/ControlFlowGraphImpl.qll
index 17add12b9404..6ade39203c96 100644
--- a/rust/ql/lib/codeql/rust/controlflow/internal/ControlFlowGraphImpl.qll
+++ b/rust/ql/lib/codeql/rust/controlflow/internal/ControlFlowGraphImpl.qll
@@ -44,9 +44,6 @@ private module CfgInput implements InputSig<Location> {
   /** Hold if `t` represents a conditional successor type. */
   predicate successorTypeIsCondition(SuccessorType t) { t instanceof Cfg::BooleanSuccessor }
 
-  /** Gets the maximum number of splits allowed for a given node. */
-  int maxSplits() { result = 0 }
-
   /** Holds if `first` is first executed when entering `scope`. */
   predicate scopeFirst(CfgScope scope, AstNode first) { scope.scopeFirst(first) }
 
@@ -86,53 +83,49 @@ class BinaryOpExprTree extends StandardPostOrderTree instanceof BinaryExpr {
   }
 }
 
-class LogicalOrBinaryOpExprTree extends PreOrderTree, LogicalOrExpr {
+class LogicalOrTree extends PostOrderTree, LogicalOrExpr {
   final override predicate propagatesAbnormal(AstNode child) { child = this.getAnOperand() }
 
+  override predicate first(AstNode node) { first(this.getLhs(), node) }
+
   override predicate succ(AstNode pred, AstNode succ, Completion c) {
-    // Edge to the first node in the lhs
-    pred = this and
-    first(this.getLhs(), succ) and
-    completionIsSimple(c)
+    // Edge from lhs to rhs
+    last(this.getLhs(), pred, c) and
+    c.(BooleanCompletion).failed() and
+    first(this.getRhs(), succ)
     or
-    // Edge from the last node in the lhs to the first node in the rhs
+    // Edge from lhs to this
     last(this.getLhs(), pred, c) and
-    first(this.getRhs(), succ) and
-    c.(BooleanCompletion).failed()
-  }
-
-  override predicate last(AstNode node, Completion c) {
-    // Lhs. as the last node
-    last(this.getLhs(), node, c) and
-    c.(BooleanCompletion).succeeded()
+    c.(BooleanCompletion).succeeded() and
+    succ = this
     or
-    // Rhs. as the last node
-    last(this.getRhs(), node, c)
+    // Edge from rhs to this
+    last(this.getRhs(), pred, c) and
+    succ = this and
+    completionIsNormal(c)
   }
 }
 
-class LogicalAndBinaryOpExprTree extends PreOrderTree, LogicalAndExpr {
+class LogicalAndTree extends PostOrderTree, LogicalAndExpr {
   final override predicate propagatesAbnormal(AstNode child) { child = this.getAnOperand() }
 
+  override predicate first(AstNode node) { first(this.getLhs(), node) }
+
   override predicate succ(AstNode pred, AstNode succ, Completion c) {
-    // Edge to the first node in the lhs
-    pred = this and
-    first(this.getLhs(), succ) and
-    completionIsSimple(c)
+    // Edge from lhs to rhs
+    last(this.getLhs(), pred, c) and
+    c.(BooleanCompletion).succeeded() and
+    first(this.getRhs(), succ)
     or
-    // Edge from the last node in the lhs to the first node in the rhs
+    // Edge from lhs to this
     last(this.getLhs(), pred, c) and
-    first(this.getRhs(), succ) and
-    c.(BooleanCompletion).succeeded()
-  }
-
-  override predicate last(AstNode node, Completion c) {
-    // Lhs. as the last node
-    last(this.getLhs(), node, c) and
-    c.(BooleanCompletion).failed()
+    c.(BooleanCompletion).failed() and
+    succ = this
     or
-    // Rhs. as the last node
-    last(this.getRhs(), node, c)
+    // Edge from rhs to this
+    last(this.getRhs(), pred, c) and
+    succ = this and
+    completionIsNormal(c)
   }
 }
 
diff --git a/rust/ql/lib/codeql/rust/controlflow/internal/Splitting.qll b/rust/ql/lib/codeql/rust/controlflow/internal/Splitting.qll
index b4f0a060be6d..10965649caa5 100644
--- a/rust/ql/lib/codeql/rust/controlflow/internal/Splitting.qll
+++ b/rust/ql/lib/codeql/rust/controlflow/internal/Splitting.qll
@@ -1,17 +1,115 @@
+private import rust
+private import ControlFlowGraphImpl
+private import Scope
+
 cached
 private module Cached {
-  // Not using CFG splitting, so the following are just placeholder types.
   cached
-  newtype TSplitKind = TSplitKindUnit()
+  newtype TSplitKind = TConditionalCompletionSplitKind()
 
   cached
-  newtype TSplit = TSplitUnit()
+  newtype TSplit = TConditionalCompletionSplit(ConditionalCompletion c)
 }
 
 import Cached
 
 /** A split for a control flow node. */
-class Split extends TSplit {
+abstract private class Split_ extends TSplit {
   /** Gets a textual representation of this split. */
-  string toString() { none() }
+  abstract string toString();
+}
+
+final class Split = Split_;
+
+private module ConditionalCompletionSplitting {
+  /**
+   * A split for conditional completions. For example, in
+   *
+   * ```rust
+   * if x && !y {
+   *   // ...
+   * }
+   * ```
+   *
+   * we record whether `x`, `y`, and `!y` evaluate to `true` or `false`, and restrict
+   * the edges out of `!y` and `x && !y` accordingly.
+   */
+  class ConditionalCompletionSplit extends Split_, TConditionalCompletionSplit {
+    ConditionalCompletion completion;
+
+    ConditionalCompletionSplit() { this = TConditionalCompletionSplit(completion) }
+
+    override string toString() { result = completion.toString() }
+  }
+
+  private class ConditionalCompletionSplitKind extends SplitKind, TConditionalCompletionSplitKind {
+    override int getListOrder() { result = 0 }
+
+    override predicate isEnabled(AstNode cfe) { this.appliesTo(cfe) }
+
+    override string toString() { result = "ConditionalCompletion" }
+  }
+
+  private class ConditionalCompletionSplitImpl extends SplitImpl instanceof ConditionalCompletionSplit
+  {
+    ConditionalCompletion completion;
+
+    ConditionalCompletionSplitImpl() { this = TConditionalCompletionSplit(completion) }
+
+    override ConditionalCompletionSplitKind getKind() { any() }
+
+    override predicate hasEntry(AstNode pred, AstNode succ, Completion c) {
+      succ(pred, succ, c) and
+      last(succ, _, completion) and
+      (
+        last(succ.(LogicalNotExpr).getExpr(), pred, c) and
+        completion.(BooleanCompletion).getDual() = c
+        or
+        last(succ.(BinaryLogicalOperation).getAnOperand(), pred, c) and
+        completion = c
+        or
+        succ =
+          any(IfExpr ie |
+            last([ie.getThen(), ie.getElse()], pred, c) and
+            completion = c
+          )
+        or
+        last(succ.(MatchExpr).getAnArm().getExpr(), pred, c) and
+        completion = c
+        or
+        last(succ.(BlockExpr).getStmtList().getTailExpr(), pred, c) and
+        completion = c
+      )
+      or
+      succ(pred, succ, c) and
+      last(succ.(BreakExpr).getExpr(), pred, c) and
+      exists(AstNode target |
+        succ(succ, target, _) and
+        last(target, _, completion)
+      ) and
+      completion = c
+    }
+
+    override predicate hasEntryScope(CfgScope scope, AstNode first) { none() }
+
+    override predicate hasExit(AstNode pred, AstNode succ, Completion c) {
+      this.appliesTo(pred) and
+      succ(pred, succ, c) and
+      if c instanceof ConditionalCompletion
+      then completion = c
+      else not this.hasSuccessor(pred, succ, c)
+    }
+
+    override predicate hasExitScope(CfgScope scope, AstNode last, Completion c) {
+      this.appliesTo(last) and
+      scope.scopeLast(last, c) and
+      if c instanceof ConditionalCompletion then completion = c else any()
+    }
+
+    override predicate hasSuccessor(AstNode pred, AstNode succ, Completion c) {
+      this.appliesTo(pred) and
+      succ(pred, succ, c) and
+      not c instanceof ConditionalCompletion
+    }
+  }
 }
diff --git a/rust/ql/test/library-tests/controlflow/Cfg.expected b/rust/ql/test/library-tests/controlflow/Cfg.expected
index 39fc6b96b621..61b71f15118d 100644
--- a/rust/ql/test/library-tests/controlflow/Cfg.expected
+++ b/rust/ql/test/library-tests/controlflow/Cfg.expected
@@ -234,20 +234,24 @@ edges
 | test.rs:128:5:134:5 | exit test_nested_if (normal) | test.rs:128:5:134:5 | exit test_nested_if |  |
 | test.rs:128:38:134:5 | BlockExpr | test.rs:128:5:134:5 | exit test_nested_if (normal) |  |
 | test.rs:129:9:133:9 | IfExpr | test.rs:128:38:134:5 | BlockExpr |  |
-| test.rs:129:13:129:48 | IfExpr | test.rs:130:13:130:13 | 1 | true |
-| test.rs:129:13:129:48 | IfExpr | test.rs:132:13:132:13 | 0 | false |
+| test.rs:129:13:129:48 | [boolean(false)] IfExpr | test.rs:132:13:132:13 | 0 | false |
+| test.rs:129:13:129:48 | [boolean(true)] IfExpr | test.rs:130:13:130:13 | 1 | true |
 | test.rs:129:16:129:16 | PathExpr | test.rs:129:20:129:20 | 0 |  |
 | test.rs:129:16:129:20 | ... < ... | test.rs:129:24:129:24 | a | true |
 | test.rs:129:16:129:20 | ... < ... | test.rs:129:41:129:41 | a | false |
 | test.rs:129:20:129:20 | 0 | test.rs:129:16:129:20 | ... < ... |  |
-| test.rs:129:22:129:32 | BlockExpr | test.rs:129:13:129:48 | IfExpr | false, true |
+| test.rs:129:22:129:32 | [boolean(false)] BlockExpr | test.rs:129:13:129:48 | [boolean(false)] IfExpr | false |
+| test.rs:129:22:129:32 | [boolean(true)] BlockExpr | test.rs:129:13:129:48 | [boolean(true)] IfExpr | true |
 | test.rs:129:24:129:24 | a | test.rs:129:29:129:30 | 10 |  |
-| test.rs:129:24:129:30 | ... < ... | test.rs:129:22:129:32 | BlockExpr | false, true |
+| test.rs:129:24:129:30 | ... < ... | test.rs:129:22:129:32 | [boolean(false)] BlockExpr | false |
+| test.rs:129:24:129:30 | ... < ... | test.rs:129:22:129:32 | [boolean(true)] BlockExpr | true |
 | test.rs:129:28:129:30 | - ... | test.rs:129:24:129:30 | ... < ... |  |
 | test.rs:129:29:129:30 | 10 | test.rs:129:28:129:30 | - ... |  |
-| test.rs:129:39:129:48 | BlockExpr | test.rs:129:13:129:48 | IfExpr | false, true |
+| test.rs:129:39:129:48 | [boolean(false)] BlockExpr | test.rs:129:13:129:48 | [boolean(false)] IfExpr | false |
+| test.rs:129:39:129:48 | [boolean(true)] BlockExpr | test.rs:129:13:129:48 | [boolean(true)] IfExpr | true |
 | test.rs:129:41:129:41 | a | test.rs:129:45:129:46 | 10 |  |
-| test.rs:129:41:129:46 | ... > ... | test.rs:129:39:129:48 | BlockExpr | false, true |
+| test.rs:129:41:129:46 | ... > ... | test.rs:129:39:129:48 | [boolean(false)] BlockExpr | false |
+| test.rs:129:41:129:46 | ... > ... | test.rs:129:39:129:48 | [boolean(true)] BlockExpr | true |
 | test.rs:129:45:129:46 | 10 | test.rs:129:41:129:46 | ... > ... |  |
 | test.rs:129:51:131:9 | BlockExpr | test.rs:129:9:133:9 | IfExpr |  |
 | test.rs:130:13:130:13 | 1 | test.rs:129:51:131:9 | BlockExpr |  |
@@ -257,14 +261,14 @@ edges
 | test.rs:136:5:145:5 | exit test_nested_if_match (normal) | test.rs:136:5:145:5 | exit test_nested_if_match |  |
 | test.rs:136:44:145:5 | BlockExpr | test.rs:136:5:145:5 | exit test_nested_if_match (normal) |  |
 | test.rs:137:9:144:9 | IfExpr | test.rs:136:44:145:5 | BlockExpr |  |
-| test.rs:137:13:140:9 | MatchExpr | test.rs:141:13:141:13 | 1 | true |
-| test.rs:137:13:140:9 | MatchExpr | test.rs:143:13:143:13 | 0 | false |
+| test.rs:137:13:140:9 | [boolean(false)] MatchExpr | test.rs:143:13:143:13 | 0 | false |
+| test.rs:137:13:140:9 | [boolean(true)] MatchExpr | test.rs:141:13:141:13 | 1 | true |
 | test.rs:137:19:137:19 | a | test.rs:138:13:138:13 | LiteralPat |  |
 | test.rs:138:13:138:13 | LiteralPat | test.rs:138:18:138:21 | true | match |
 | test.rs:138:13:138:13 | LiteralPat | test.rs:139:13:139:13 | WildcardPat | no-match |
-| test.rs:138:18:138:21 | true | test.rs:137:13:140:9 | MatchExpr |  |
+| test.rs:138:18:138:21 | true | test.rs:137:13:140:9 | [boolean(true)] MatchExpr | true |
 | test.rs:139:13:139:13 | WildcardPat | test.rs:139:18:139:22 | false | match |
-| test.rs:139:18:139:22 | false | test.rs:137:13:140:9 | MatchExpr |  |
+| test.rs:139:18:139:22 | false | test.rs:137:13:140:9 | [boolean(false)] MatchExpr | false |
 | test.rs:140:12:142:9 | BlockExpr | test.rs:137:9:144:9 | IfExpr |  |
 | test.rs:141:13:141:13 | 1 | test.rs:140:12:142:9 | BlockExpr |  |
 | test.rs:142:16:144:9 | BlockExpr | test.rs:137:9:144:9 | IfExpr |  |
@@ -273,12 +277,13 @@ edges
 | test.rs:147:5:156:5 | exit test_nested_if_block (normal) | test.rs:147:5:156:5 | exit test_nested_if_block |  |
 | test.rs:147:44:156:5 | BlockExpr | test.rs:147:5:156:5 | exit test_nested_if_block (normal) |  |
 | test.rs:148:9:155:9 | IfExpr | test.rs:147:44:156:5 | BlockExpr |  |
-| test.rs:148:12:151:9 | BlockExpr | test.rs:152:13:152:13 | 1 | true |
-| test.rs:148:12:151:9 | BlockExpr | test.rs:154:13:154:13 | 0 | false |
+| test.rs:148:12:151:9 | [boolean(false)] BlockExpr | test.rs:154:13:154:13 | 0 | false |
+| test.rs:148:12:151:9 | [boolean(true)] BlockExpr | test.rs:152:13:152:13 | 1 | true |
 | test.rs:149:13:149:14 | TupleExpr | test.rs:150:13:150:13 | a |  |
 | test.rs:149:13:149:15 | ExprStmt | test.rs:149:13:149:14 | TupleExpr |  |
 | test.rs:150:13:150:13 | a | test.rs:150:17:150:17 | 0 |  |
-| test.rs:150:13:150:17 | ... > ... | test.rs:148:12:151:9 | BlockExpr | false, true |
+| test.rs:150:13:150:17 | ... > ... | test.rs:148:12:151:9 | [boolean(false)] BlockExpr | false |
+| test.rs:150:13:150:17 | ... > ... | test.rs:148:12:151:9 | [boolean(true)] BlockExpr | true |
 | test.rs:150:17:150:17 | 0 | test.rs:150:13:150:17 | ... > ... |  |
 | test.rs:151:11:153:9 | BlockExpr | test.rs:148:9:155:9 | IfExpr |  |
 | test.rs:152:13:152:13 | 1 | test.rs:151:11:153:9 | BlockExpr |  |
@@ -303,8 +308,8 @@ edges
 | test.rs:167:5:178:5 | exit test_if_loop1 (normal) | test.rs:167:5:178:5 | exit test_if_loop1 |  |
 | test.rs:167:37:178:5 | BlockExpr | test.rs:167:5:178:5 | exit test_if_loop1 (normal) |  |
 | test.rs:168:9:177:9 | IfExpr | test.rs:167:37:178:5 | BlockExpr |  |
-| test.rs:168:13:173:9 | LoopExpr | test.rs:174:13:174:13 | 1 | true |
-| test.rs:168:13:173:9 | LoopExpr | test.rs:176:13:176:13 | 0 | false |
+| test.rs:168:13:173:9 | [boolean(false)] LoopExpr | test.rs:176:13:176:13 | 0 | false |
+| test.rs:168:13:173:9 | [boolean(true)] LoopExpr | test.rs:174:13:174:13 | 1 | true |
 | test.rs:168:18:173:9 | BlockExpr | test.rs:169:13:171:14 | ExprStmt |  |
 | test.rs:169:13:171:13 | IfExpr | test.rs:172:13:172:19 | ExprStmt |  |
 | test.rs:169:13:171:14 | ExprStmt | test.rs:169:16:169:16 | a |  |
@@ -312,10 +317,12 @@ edges
 | test.rs:169:16:169:20 | ... > ... | test.rs:169:13:171:13 | IfExpr | false |
 | test.rs:169:16:169:20 | ... > ... | test.rs:170:17:170:29 | ExprStmt | true |
 | test.rs:169:20:169:20 | 0 | test.rs:169:16:169:20 | ... > ... |  |
-| test.rs:170:17:170:28 | BreakExpr | test.rs:168:13:173:9 | LoopExpr | break |
+| test.rs:170:17:170:28 | [boolean(false)] BreakExpr | test.rs:168:13:173:9 | [boolean(false)] LoopExpr | break |
+| test.rs:170:17:170:28 | [boolean(true)] BreakExpr | test.rs:168:13:173:9 | [boolean(true)] LoopExpr | break |
 | test.rs:170:17:170:29 | ExprStmt | test.rs:170:23:170:23 | a |  |
 | test.rs:170:23:170:23 | a | test.rs:170:27:170:28 | 10 |  |
-| test.rs:170:23:170:28 | ... > ... | test.rs:170:17:170:28 | BreakExpr |  |
+| test.rs:170:23:170:28 | ... > ... | test.rs:170:17:170:28 | [boolean(false)] BreakExpr | false |
+| test.rs:170:23:170:28 | ... > ... | test.rs:170:17:170:28 | [boolean(true)] BreakExpr | true |
 | test.rs:170:27:170:28 | 10 | test.rs:170:23:170:28 | ... > ... |  |
 | test.rs:172:13:172:13 | a | test.rs:172:17:172:18 | 10 |  |
 | test.rs:172:13:172:18 | ... < ... | test.rs:168:18:173:9 | BlockExpr |  |
@@ -329,8 +336,8 @@ edges
 | test.rs:180:5:191:5 | exit test_if_loop2 (normal) | test.rs:180:5:191:5 | exit test_if_loop2 |  |
 | test.rs:180:37:191:5 | BlockExpr | test.rs:180:5:191:5 | exit test_if_loop2 (normal) |  |
 | test.rs:181:9:190:9 | IfExpr | test.rs:180:37:191:5 | BlockExpr |  |
-| test.rs:181:13:186:9 | LoopExpr | test.rs:187:13:187:13 | 1 | true |
-| test.rs:181:13:186:9 | LoopExpr | test.rs:189:13:189:13 | 0 | false |
+| test.rs:181:13:186:9 | [boolean(false)] LoopExpr | test.rs:189:13:189:13 | 0 | false |
+| test.rs:181:13:186:9 | [boolean(true)] LoopExpr | test.rs:187:13:187:13 | 1 | true |
 | test.rs:181:26:186:9 | BlockExpr | test.rs:182:13:184:14 | ExprStmt |  |
 | test.rs:182:13:184:13 | IfExpr | test.rs:185:13:185:19 | ExprStmt |  |
 | test.rs:182:13:184:14 | ExprStmt | test.rs:182:16:182:16 | a |  |
@@ -338,10 +345,12 @@ edges
 | test.rs:182:16:182:20 | ... > ... | test.rs:182:13:184:13 | IfExpr | false |
 | test.rs:182:16:182:20 | ... > ... | test.rs:183:17:183:36 | ExprStmt | true |
 | test.rs:182:20:182:20 | 0 | test.rs:182:16:182:20 | ... > ... |  |
-| test.rs:183:17:183:35 | BreakExpr | test.rs:181:13:186:9 | LoopExpr | break |
+| test.rs:183:17:183:35 | [boolean(false)] BreakExpr | test.rs:181:13:186:9 | [boolean(false)] LoopExpr | break |
+| test.rs:183:17:183:35 | [boolean(true)] BreakExpr | test.rs:181:13:186:9 | [boolean(true)] LoopExpr | break |
 | test.rs:183:17:183:36 | ExprStmt | test.rs:183:30:183:30 | a |  |
 | test.rs:183:30:183:30 | a | test.rs:183:34:183:35 | 10 |  |
-| test.rs:183:30:183:35 | ... > ... | test.rs:183:17:183:35 | BreakExpr |  |
+| test.rs:183:30:183:35 | ... > ... | test.rs:183:17:183:35 | [boolean(false)] BreakExpr | false |
+| test.rs:183:30:183:35 | ... > ... | test.rs:183:17:183:35 | [boolean(true)] BreakExpr | true |
 | test.rs:183:34:183:35 | 10 | test.rs:183:30:183:35 | ... > ... |  |
 | test.rs:185:13:185:13 | a | test.rs:185:17:185:18 | 10 |  |
 | test.rs:185:13:185:18 | ... < ... | test.rs:181:26:186:9 | BlockExpr |  |
@@ -355,12 +364,14 @@ edges
 | test.rs:193:5:201:5 | exit test_labelled_block (normal) | test.rs:193:5:201:5 | exit test_labelled_block |  |
 | test.rs:193:43:201:5 | BlockExpr | test.rs:193:5:201:5 | exit test_labelled_block (normal) |  |
 | test.rs:194:9:200:9 | IfExpr | test.rs:193:43:201:5 | BlockExpr |  |
-| test.rs:194:13:196:9 | BlockExpr | test.rs:197:13:197:13 | 1 | true |
-| test.rs:194:13:196:9 | BlockExpr | test.rs:199:13:199:13 | 0 | false |
-| test.rs:195:13:195:30 | BreakExpr | test.rs:194:13:196:9 | BlockExpr | break |
+| test.rs:194:13:196:9 | [boolean(false)] BlockExpr | test.rs:199:13:199:13 | 0 | false |
+| test.rs:194:13:196:9 | [boolean(true)] BlockExpr | test.rs:197:13:197:13 | 1 | true |
+| test.rs:195:13:195:30 | [boolean(false)] BreakExpr | test.rs:194:13:196:9 | [boolean(false)] BlockExpr | break |
+| test.rs:195:13:195:30 | [boolean(true)] BreakExpr | test.rs:194:13:196:9 | [boolean(true)] BlockExpr | break |
 | test.rs:195:13:195:31 | ExprStmt | test.rs:195:26:195:26 | a |  |
 | test.rs:195:26:195:26 | a | test.rs:195:30:195:30 | 0 |  |
-| test.rs:195:26:195:30 | ... > ... | test.rs:195:13:195:30 | BreakExpr |  |
+| test.rs:195:26:195:30 | ... > ... | test.rs:195:13:195:30 | [boolean(false)] BreakExpr | false |
+| test.rs:195:26:195:30 | ... > ... | test.rs:195:13:195:30 | [boolean(true)] BreakExpr | true |
 | test.rs:195:30:195:30 | 0 | test.rs:195:26:195:30 | ... > ... |  |
 | test.rs:196:12:198:9 | BlockExpr | test.rs:194:9:200:9 | IfExpr |  |
 | test.rs:197:13:197:13 | 1 | test.rs:196:12:198:9 | BlockExpr |  |
@@ -369,43 +380,46 @@ edges
 | test.rs:206:5:209:5 | enter test_and_operator | test.rs:207:9:207:28 | LetStmt |  |
 | test.rs:206:5:209:5 | exit test_and_operator (normal) | test.rs:206:5:209:5 | exit test_and_operator |  |
 | test.rs:206:61:209:5 | BlockExpr | test.rs:206:5:209:5 | exit test_and_operator (normal) |  |
-| test.rs:207:9:207:28 | LetStmt | test.rs:207:17:207:27 | ... && ... |  |
+| test.rs:207:9:207:28 | LetStmt | test.rs:207:17:207:17 | a |  |
 | test.rs:207:13:207:13 | d | test.rs:208:9:208:9 | d | match, no-match |
-| test.rs:207:17:207:17 | a | test.rs:207:13:207:13 | d | false |
+| test.rs:207:17:207:17 | a | test.rs:207:17:207:22 | [boolean(false)] ... && ... | false |
 | test.rs:207:17:207:17 | a | test.rs:207:22:207:22 | b | true |
-| test.rs:207:17:207:22 | ... && ... | test.rs:207:17:207:17 | a |  |
-| test.rs:207:17:207:27 | ... && ... | test.rs:207:17:207:22 | ... && ... |  |
-| test.rs:207:22:207:22 | b | test.rs:207:13:207:13 | d | false |
-| test.rs:207:22:207:22 | b | test.rs:207:27:207:27 | c | true |
-| test.rs:207:27:207:27 | c | test.rs:207:13:207:13 | d |  |
+| test.rs:207:17:207:22 | [boolean(false)] ... && ... | test.rs:207:17:207:27 | ... && ... | false |
+| test.rs:207:17:207:22 | [boolean(true)] ... && ... | test.rs:207:27:207:27 | c | true |
+| test.rs:207:17:207:27 | ... && ... | test.rs:207:13:207:13 | d |  |
+| test.rs:207:22:207:22 | b | test.rs:207:17:207:22 | [boolean(false)] ... && ... | false |
+| test.rs:207:22:207:22 | b | test.rs:207:17:207:22 | [boolean(true)] ... && ... | true |
+| test.rs:207:27:207:27 | c | test.rs:207:17:207:27 | ... && ... |  |
 | test.rs:208:9:208:9 | d | test.rs:206:61:209:5 | BlockExpr |  |
 | test.rs:211:5:214:5 | enter test_or_operator | test.rs:212:9:212:28 | LetStmt |  |
 | test.rs:211:5:214:5 | exit test_or_operator (normal) | test.rs:211:5:214:5 | exit test_or_operator |  |
 | test.rs:211:60:214:5 | BlockExpr | test.rs:211:5:214:5 | exit test_or_operator (normal) |  |
-| test.rs:212:9:212:28 | LetStmt | test.rs:212:17:212:27 | ... \|\| ... |  |
+| test.rs:212:9:212:28 | LetStmt | test.rs:212:17:212:17 | a |  |
 | test.rs:212:13:212:13 | d | test.rs:213:9:213:9 | d | match, no-match |
-| test.rs:212:17:212:17 | a | test.rs:212:13:212:13 | d | true |
+| test.rs:212:17:212:17 | a | test.rs:212:17:212:22 | [boolean(true)] ... \|\| ... | true |
 | test.rs:212:17:212:17 | a | test.rs:212:22:212:22 | b | false |
-| test.rs:212:17:212:22 | ... \|\| ... | test.rs:212:17:212:17 | a |  |
-| test.rs:212:17:212:27 | ... \|\| ... | test.rs:212:17:212:22 | ... \|\| ... |  |
-| test.rs:212:22:212:22 | b | test.rs:212:13:212:13 | d | true |
-| test.rs:212:22:212:22 | b | test.rs:212:27:212:27 | c | false |
-| test.rs:212:27:212:27 | c | test.rs:212:13:212:13 | d |  |
+| test.rs:212:17:212:22 | [boolean(false)] ... \|\| ... | test.rs:212:27:212:27 | c | false |
+| test.rs:212:17:212:22 | [boolean(true)] ... \|\| ... | test.rs:212:17:212:27 | ... \|\| ... | true |
+| test.rs:212:17:212:27 | ... \|\| ... | test.rs:212:13:212:13 | d |  |
+| test.rs:212:22:212:22 | b | test.rs:212:17:212:22 | [boolean(false)] ... \|\| ... | false |
+| test.rs:212:22:212:22 | b | test.rs:212:17:212:22 | [boolean(true)] ... \|\| ... | true |
+| test.rs:212:27:212:27 | c | test.rs:212:17:212:27 | ... \|\| ... |  |
 | test.rs:213:9:213:9 | d | test.rs:211:60:214:5 | BlockExpr |  |
 | test.rs:216:5:219:5 | enter test_or_operator_2 | test.rs:217:9:217:36 | LetStmt |  |
 | test.rs:216:5:219:5 | exit test_or_operator_2 (normal) | test.rs:216:5:219:5 | exit test_or_operator_2 |  |
 | test.rs:216:61:219:5 | BlockExpr | test.rs:216:5:219:5 | exit test_or_operator_2 (normal) |  |
-| test.rs:217:9:217:36 | LetStmt | test.rs:217:17:217:35 | ... \|\| ... |  |
+| test.rs:217:9:217:36 | LetStmt | test.rs:217:17:217:17 | a |  |
 | test.rs:217:13:217:13 | d | test.rs:218:9:218:9 | d | match, no-match |
-| test.rs:217:17:217:17 | a | test.rs:217:13:217:13 | d | true |
+| test.rs:217:17:217:17 | a | test.rs:217:17:217:30 | [boolean(true)] ... \|\| ... | true |
 | test.rs:217:17:217:17 | a | test.rs:217:23:217:23 | b | false |
-| test.rs:217:17:217:30 | ... \|\| ... | test.rs:217:17:217:17 | a |  |
-| test.rs:217:17:217:35 | ... \|\| ... | test.rs:217:17:217:30 | ... \|\| ... |  |
+| test.rs:217:17:217:30 | [boolean(false)] ... \|\| ... | test.rs:217:35:217:35 | c | false |
+| test.rs:217:17:217:30 | [boolean(true)] ... \|\| ... | test.rs:217:17:217:35 | ... \|\| ... | true |
+| test.rs:217:17:217:35 | ... \|\| ... | test.rs:217:13:217:13 | d |  |
 | test.rs:217:23:217:23 | b | test.rs:217:28:217:29 | 28 |  |
-| test.rs:217:23:217:29 | ... == ... | test.rs:217:13:217:13 | d | true |
-| test.rs:217:23:217:29 | ... == ... | test.rs:217:35:217:35 | c | false |
+| test.rs:217:23:217:29 | ... == ... | test.rs:217:17:217:30 | [boolean(false)] ... \|\| ... | false |
+| test.rs:217:23:217:29 | ... == ... | test.rs:217:17:217:30 | [boolean(true)] ... \|\| ... | true |
 | test.rs:217:28:217:29 | 28 | test.rs:217:23:217:29 | ... == ... |  |
-| test.rs:217:35:217:35 | c | test.rs:217:13:217:13 | d |  |
+| test.rs:217:35:217:35 | c | test.rs:217:17:217:35 | ... \|\| ... |  |
 | test.rs:218:9:218:9 | d | test.rs:216:61:219:5 | BlockExpr |  |
 | test.rs:221:5:224:5 | enter test_not_operator | test.rs:222:9:222:19 | LetStmt |  |
 | test.rs:221:5:224:5 | exit test_not_operator (normal) | test.rs:221:5:224:5 | exit test_not_operator |  |
@@ -415,34 +429,38 @@ edges
 | test.rs:222:17:222:18 | ! ... | test.rs:222:13:222:13 | d |  |
 | test.rs:222:18:222:18 | a | test.rs:222:17:222:18 | ! ... |  |
 | test.rs:223:9:223:9 | d | test.rs:221:43:224:5 | BlockExpr |  |
-| test.rs:226:5:232:5 | enter test_if_and_operator | test.rs:227:12:227:22 | ... && ... |  |
+| test.rs:226:5:232:5 | enter test_if_and_operator | test.rs:227:12:227:12 | a |  |
 | test.rs:226:5:232:5 | exit test_if_and_operator (normal) | test.rs:226:5:232:5 | exit test_if_and_operator |  |
 | test.rs:226:63:232:5 | BlockExpr | test.rs:226:5:232:5 | exit test_if_and_operator (normal) |  |
 | test.rs:227:9:231:9 | IfExpr | test.rs:226:63:232:5 | BlockExpr |  |
+| test.rs:227:12:227:12 | a | test.rs:227:12:227:17 | [boolean(false)] ... && ... | false |
 | test.rs:227:12:227:12 | a | test.rs:227:17:227:17 | b | true |
-| test.rs:227:12:227:12 | a | test.rs:230:13:230:17 | false | false |
-| test.rs:227:12:227:17 | ... && ... | test.rs:227:12:227:12 | a |  |
-| test.rs:227:12:227:22 | ... && ... | test.rs:227:12:227:17 | ... && ... |  |
-| test.rs:227:17:227:17 | b | test.rs:227:22:227:22 | c | true |
-| test.rs:227:17:227:17 | b | test.rs:230:13:230:17 | false | false |
-| test.rs:227:22:227:22 | c | test.rs:228:13:228:16 | true | true |
-| test.rs:227:22:227:22 | c | test.rs:230:13:230:17 | false | false |
+| test.rs:227:12:227:17 | [boolean(false)] ... && ... | test.rs:227:12:227:22 | [boolean(false)] ... && ... | false |
+| test.rs:227:12:227:17 | [boolean(true)] ... && ... | test.rs:227:22:227:22 | c | true |
+| test.rs:227:12:227:22 | [boolean(false)] ... && ... | test.rs:230:13:230:17 | false | false |
+| test.rs:227:12:227:22 | [boolean(true)] ... && ... | test.rs:228:13:228:16 | true | true |
+| test.rs:227:17:227:17 | b | test.rs:227:12:227:17 | [boolean(false)] ... && ... | false |
+| test.rs:227:17:227:17 | b | test.rs:227:12:227:17 | [boolean(true)] ... && ... | true |
+| test.rs:227:22:227:22 | c | test.rs:227:12:227:22 | [boolean(false)] ... && ... | false |
+| test.rs:227:22:227:22 | c | test.rs:227:12:227:22 | [boolean(true)] ... && ... | true |
 | test.rs:227:24:229:9 | BlockExpr | test.rs:227:9:231:9 | IfExpr |  |
 | test.rs:228:13:228:16 | true | test.rs:227:24:229:9 | BlockExpr |  |
 | test.rs:229:16:231:9 | BlockExpr | test.rs:227:9:231:9 | IfExpr |  |
 | test.rs:230:13:230:17 | false | test.rs:229:16:231:9 | BlockExpr |  |
-| test.rs:234:5:240:5 | enter test_if_or_operator | test.rs:235:12:235:22 | ... \|\| ... |  |
+| test.rs:234:5:240:5 | enter test_if_or_operator | test.rs:235:12:235:12 | a |  |
 | test.rs:234:5:240:5 | exit test_if_or_operator (normal) | test.rs:234:5:240:5 | exit test_if_or_operator |  |
 | test.rs:234:62:240:5 | BlockExpr | test.rs:234:5:240:5 | exit test_if_or_operator (normal) |  |
 | test.rs:235:9:239:9 | IfExpr | test.rs:234:62:240:5 | BlockExpr |  |
+| test.rs:235:12:235:12 | a | test.rs:235:12:235:17 | [boolean(true)] ... \|\| ... | true |
 | test.rs:235:12:235:12 | a | test.rs:235:17:235:17 | b | false |
-| test.rs:235:12:235:12 | a | test.rs:236:13:236:16 | true | true |
-| test.rs:235:12:235:17 | ... \|\| ... | test.rs:235:12:235:12 | a |  |
-| test.rs:235:12:235:22 | ... \|\| ... | test.rs:235:12:235:17 | ... \|\| ... |  |
-| test.rs:235:17:235:17 | b | test.rs:235:22:235:22 | c | false |
-| test.rs:235:17:235:17 | b | test.rs:236:13:236:16 | true | true |
-| test.rs:235:22:235:22 | c | test.rs:236:13:236:16 | true | true |
-| test.rs:235:22:235:22 | c | test.rs:238:13:238:17 | false | false |
+| test.rs:235:12:235:17 | [boolean(false)] ... \|\| ... | test.rs:235:22:235:22 | c | false |
+| test.rs:235:12:235:17 | [boolean(true)] ... \|\| ... | test.rs:235:12:235:22 | [boolean(true)] ... \|\| ... | true |
+| test.rs:235:12:235:22 | [boolean(false)] ... \|\| ... | test.rs:238:13:238:17 | false | false |
+| test.rs:235:12:235:22 | [boolean(true)] ... \|\| ... | test.rs:236:13:236:16 | true | true |
+| test.rs:235:17:235:17 | b | test.rs:235:12:235:17 | [boolean(false)] ... \|\| ... | false |
+| test.rs:235:17:235:17 | b | test.rs:235:12:235:17 | [boolean(true)] ... \|\| ... | true |
+| test.rs:235:22:235:22 | c | test.rs:235:12:235:22 | [boolean(false)] ... \|\| ... | false |
+| test.rs:235:22:235:22 | c | test.rs:235:12:235:22 | [boolean(true)] ... \|\| ... | true |
 | test.rs:235:24:237:9 | BlockExpr | test.rs:235:9:239:9 | IfExpr |  |
 | test.rs:236:13:236:16 | true | test.rs:235:24:237:9 | BlockExpr |  |
 | test.rs:237:16:239:9 | BlockExpr | test.rs:235:9:239:9 | IfExpr |  |
@@ -451,9 +469,10 @@ edges
 | test.rs:242:5:248:5 | exit test_if_not_operator (normal) | test.rs:242:5:248:5 | exit test_if_not_operator |  |
 | test.rs:242:46:248:5 | BlockExpr | test.rs:242:5:248:5 | exit test_if_not_operator (normal) |  |
 | test.rs:243:9:247:9 | IfExpr | test.rs:242:46:248:5 | BlockExpr |  |
-| test.rs:243:12:243:13 | ! ... | test.rs:244:13:244:16 | true | true |
-| test.rs:243:12:243:13 | ! ... | test.rs:246:13:246:17 | false | false |
-| test.rs:243:13:243:13 | a | test.rs:243:12:243:13 | ! ... | false, true |
+| test.rs:243:12:243:13 | [boolean(false)] ! ... | test.rs:246:13:246:17 | false | false |
+| test.rs:243:12:243:13 | [boolean(true)] ! ... | test.rs:244:13:244:16 | true | true |
+| test.rs:243:13:243:13 | a | test.rs:243:12:243:13 | [boolean(false)] ! ... | true |
+| test.rs:243:13:243:13 | a | test.rs:243:12:243:13 | [boolean(true)] ! ... | false |
 | test.rs:243:15:245:9 | BlockExpr | test.rs:243:9:247:9 | IfExpr |  |
 | test.rs:244:13:244:16 | true | test.rs:243:15:245:9 | BlockExpr |  |
 | test.rs:245:16:247:9 | BlockExpr | test.rs:243:9:247:9 | IfExpr |  |

From 2832318711852c0b0c14d4ca690830cbd7d64e53 Mon Sep 17 00:00:00 2001
From: Tom Hvitved <hvitved@github.com>
Date: Fri, 20 Sep 2024 14:39:21 +0200
Subject: [PATCH 162/347] Java: Account for top-level `res` folders in
 `AndroidLayoutXmlFile`

---
 java/ql/lib/semmle/code/java/frameworks/android/Layout.qll | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/java/ql/lib/semmle/code/java/frameworks/android/Layout.qll b/java/ql/lib/semmle/code/java/frameworks/android/Layout.qll
index d7f0b0e2e6cb..ee430b62d577 100644
--- a/java/ql/lib/semmle/code/java/frameworks/android/Layout.qll
+++ b/java/ql/lib/semmle/code/java/frameworks/android/Layout.qll
@@ -6,7 +6,7 @@ private import semmle.code.java.dataflow.DataFlow
 
 /** An Android Layout XML file. */
 class AndroidLayoutXmlFile extends XmlFile {
-  AndroidLayoutXmlFile() { this.getRelativePath().matches("%/res/layout/%.xml") }
+  AndroidLayoutXmlFile() { this.getRelativePath().regexpMatch("(.*/)?res/layout/.*\\.xml") }
 }
 
 /** A component declared in an Android layout file. */

From bf0675e5bac2f47c3dd385185511e79d35f7924c Mon Sep 17 00:00:00 2001
From: Tom Hvitved <hvitved@github.com>
Date: Mon, 23 Sep 2024 10:17:52 +0200
Subject: [PATCH 163/347] Kotlin: Update two tests

---
 java/ql/test-kotlin1/library-tests/classes/local_anonymous.ql | 4 +---
 java/ql/test-kotlin2/library-tests/classes/local_anonymous.ql | 4 +---
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/java/ql/test-kotlin1/library-tests/classes/local_anonymous.ql b/java/ql/test-kotlin1/library-tests/classes/local_anonymous.ql
index af8e63e50d8d..479c6111d42e 100644
--- a/java/ql/test-kotlin1/library-tests/classes/local_anonymous.ql
+++ b/java/ql/test-kotlin1/library-tests/classes/local_anonymous.ql
@@ -1,8 +1,6 @@
 import java
 
-private predicate filterFile(Top t) {
-  t.getFile().getRelativePath().matches("%/local_anonymous.kt")
-}
+private predicate filterFile(Top t) { t.getFile().getRelativePath().matches("%local_anonymous.kt") }
 
 private string isAnonymousType(Type t) {
   if t instanceof AnonymousClass then result = "anonymous" else result = "not anonymous"
diff --git a/java/ql/test-kotlin2/library-tests/classes/local_anonymous.ql b/java/ql/test-kotlin2/library-tests/classes/local_anonymous.ql
index af8e63e50d8d..479c6111d42e 100644
--- a/java/ql/test-kotlin2/library-tests/classes/local_anonymous.ql
+++ b/java/ql/test-kotlin2/library-tests/classes/local_anonymous.ql
@@ -1,8 +1,6 @@
 import java
 
-private predicate filterFile(Top t) {
-  t.getFile().getRelativePath().matches("%/local_anonymous.kt")
-}
+private predicate filterFile(Top t) { t.getFile().getRelativePath().matches("%local_anonymous.kt") }
 
 private string isAnonymousType(Type t) {
   if t instanceof AnonymousClass then result = "anonymous" else result = "not anonymous"

From 953461d1aaf05b63104c61cf31cbbda77f8d0b3a Mon Sep 17 00:00:00 2001
From: Tom Hvitved <hvitved@github.com>
Date: Mon, 23 Sep 2024 11:51:00 +0200
Subject: [PATCH 164/347] C++: Update expected test output

---
 .../test/library-tests/files/Files.expected   |  8 ++---
 .../query-tests/Diagnostics/Info.expected     | 10 +++---
 .../DocumentApi/DocumentApi.expected          | 32 +++++++++----------
 .../ExternalDependencies.expected             |  8 ++---
 .../ExternalDependenciesSourceLinks.expected  |  8 ++---
 5 files changed, 33 insertions(+), 33 deletions(-)

diff --git a/cpp/ql/test/library-tests/files/Files.expected b/cpp/ql/test/library-tests/files/Files.expected
index 68187793433b..13f3a6b2da17 100644
--- a/cpp/ql/test/library-tests/files/Files.expected
+++ b/cpp/ql/test/library-tests/files/Files.expected
@@ -1,4 +1,4 @@
-| c.c | library-tests/files/c.c | CFile, MetricFile | C |  |  |
-| files1.cpp | library-tests/files/files1.cpp | CppFile, MetricFile | C++ | swap | t |
-| files1.h | library-tests/files/files1.h | HeaderFile, MetricFile |  | swap |  |
-| files2.cpp | library-tests/files/files2.cpp | CppFile, MetricFile | C++ | g | x, y |
+| c.c | c.c | CFile, MetricFile | C |  |  |
+| files1.cpp | files1.cpp | CppFile, MetricFile | C++ | swap | t |
+| files1.h | files1.h | HeaderFile, MetricFile |  | swap |  |
+| files2.cpp | files2.cpp | CppFile, MetricFile | C++ | g | x, y |
diff --git a/cpp/ql/test/query-tests/Diagnostics/Info.expected b/cpp/ql/test/query-tests/Diagnostics/Info.expected
index 55e3310fd19b..a32541303609 100644
--- a/cpp/ql/test/query-tests/Diagnostics/Info.expected
+++ b/cpp/ql/test/query-tests/Diagnostics/Info.expected
@@ -1,6 +1,6 @@
-| containserror.cpp:0:0:0:0 | containserror.cpp | query-tests/Diagnostics/containserror.cpp | fromSource, normalTermination |
-| containswarning.cpp:0:0:0:0 | containswarning.cpp | query-tests/Diagnostics/containswarning.cpp | fromSource, normalTermination |
-| doesnotcompile.cpp:0:0:0:0 | doesnotcompile.cpp | query-tests/Diagnostics/doesnotcompile.cpp | ExtractionProblem (severity 1), fromSource, normalTermination |
+| containserror.cpp:0:0:0:0 | containserror.cpp | containserror.cpp | fromSource, normalTermination |
+| containswarning.cpp:0:0:0:0 | containswarning.cpp | containswarning.cpp | fromSource, normalTermination |
+| doesnotcompile.cpp:0:0:0:0 | doesnotcompile.cpp | doesnotcompile.cpp | ExtractionProblem (severity 1), fromSource, normalTermination |
 | file://:0:0:0:0 |  |  |  |
-| header.h:0:0:0:0 | header.h | query-tests/Diagnostics/header.h | fromSource |
-| successful.cpp:0:0:0:0 | successful.cpp | query-tests/Diagnostics/successful.cpp | fromSource, normalTermination |
+| header.h:0:0:0:0 | header.h | header.h | fromSource |
+| successful.cpp:0:0:0:0 | successful.cpp | successful.cpp | fromSource, normalTermination |
diff --git a/cpp/ql/test/query-tests/Documentation/DocumentApi/DocumentApi.expected b/cpp/ql/test/query-tests/Documentation/DocumentApi/DocumentApi.expected
index b19d88acdc28..62d47bc8db0b 100644
--- a/cpp/ql/test/query-tests/Documentation/DocumentApi/DocumentApi.expected
+++ b/cpp/ql/test/query-tests/Documentation/DocumentApi/DocumentApi.expected
@@ -1,16 +1,16 @@
-| comment_prototypes.c:29:6:29:11 | proto6 | Functions called from other files should be documented (called from $@). | comment_prototypes_caller1.c:9:5:9:10 | call to proto6 | query-tests/Documentation/DocumentApi/comment_prototypes_caller1.c |
-| comment_prototypes.c:29:6:29:11 | proto6 | Functions called from other files should be documented (called from $@). | comment_prototypes_caller2.c:9:5:9:10 | call to proto6 | query-tests/Documentation/DocumentApi/comment_prototypes_caller2.c |
-| comment_prototypes.c:34:6:34:11 | proto7 | Functions called from other files should be documented (called from $@). | comment_prototypes_caller1.c:10:5:10:10 | call to proto7 | query-tests/Documentation/DocumentApi/comment_prototypes_caller1.c |
-| comment_prototypes.c:34:6:34:11 | proto7 | Functions called from other files should be documented (called from $@). | comment_prototypes_caller2.c:10:5:10:10 | call to proto7 | query-tests/Documentation/DocumentApi/comment_prototypes_caller2.c |
-| comment_prototypes.c:45:6:45:11 | proto9 | Functions called from other files should be documented (called from $@). | comment_prototypes_caller1.c:12:5:12:10 | call to proto9 | query-tests/Documentation/DocumentApi/comment_prototypes_caller1.c |
-| comment_prototypes.c:45:6:45:11 | proto9 | Functions called from other files should be documented (called from $@). | comment_prototypes_caller2.c:12:5:12:10 | call to proto9 | query-tests/Documentation/DocumentApi/comment_prototypes_caller2.c |
-| comment_prototypes.c:50:6:50:12 | proto10 | Functions called from other files should be documented (called from $@). | comment_prototypes_caller1.c:13:5:13:11 | call to proto10 | query-tests/Documentation/DocumentApi/comment_prototypes_caller1.c |
-| comment_prototypes.c:50:6:50:12 | proto10 | Functions called from other files should be documented (called from $@). | comment_prototypes_caller2.c:13:5:13:11 | call to proto10 | query-tests/Documentation/DocumentApi/comment_prototypes_caller2.c |
-| comment_prototypes.c:55:6:55:12 | proto11 | Functions called from other files should be documented (called from $@). | comment_prototypes_caller1.c:14:5:14:11 | call to proto11 | query-tests/Documentation/DocumentApi/comment_prototypes_caller1.c |
-| comment_prototypes.c:55:6:55:12 | proto11 | Functions called from other files should be documented (called from $@). | comment_prototypes_caller2.c:14:5:14:11 | call to proto11 | query-tests/Documentation/DocumentApi/comment_prototypes_caller2.c |
-| comment_prototypes.c:66:6:66:12 | proto13 | Functions called from other files should be documented (called from $@). | comment_prototypes_caller1.c:16:5:16:11 | call to proto13 | query-tests/Documentation/DocumentApi/comment_prototypes_caller1.c |
-| comment_prototypes.c:66:6:66:12 | proto13 | Functions called from other files should be documented (called from $@). | comment_prototypes_caller2.c:16:5:16:11 | call to proto13 | query-tests/Documentation/DocumentApi/comment_prototypes_caller2.c |
-| definition.c:2:6:2:7 | f1 | Functions called from other files should be documented (called from $@). | user1.c:9:5:9:6 | call to f1 | query-tests/Documentation/DocumentApi/user1.c |
-| definition.c:2:6:2:7 | f1 | Functions called from other files should be documented (called from $@). | user2.c:7:5:7:6 | call to f1 | query-tests/Documentation/DocumentApi/user2.c |
-| definition.c:32:6:32:7 | f6 | Functions called from other files should be documented (called from $@). | user1.c:14:5:14:6 | call to f6 | query-tests/Documentation/DocumentApi/user1.c |
-| definition.c:32:6:32:7 | f6 | Functions called from other files should be documented (called from $@). | user2.c:10:5:10:6 | call to f6 | query-tests/Documentation/DocumentApi/user2.c |
+| comment_prototypes.c:29:6:29:11 | proto6 | Functions called from other files should be documented (called from $@). | comment_prototypes_caller1.c:9:5:9:10 | call to proto6 | comment_prototypes_caller1.c |
+| comment_prototypes.c:29:6:29:11 | proto6 | Functions called from other files should be documented (called from $@). | comment_prototypes_caller2.c:9:5:9:10 | call to proto6 | comment_prototypes_caller2.c |
+| comment_prototypes.c:34:6:34:11 | proto7 | Functions called from other files should be documented (called from $@). | comment_prototypes_caller1.c:10:5:10:10 | call to proto7 | comment_prototypes_caller1.c |
+| comment_prototypes.c:34:6:34:11 | proto7 | Functions called from other files should be documented (called from $@). | comment_prototypes_caller2.c:10:5:10:10 | call to proto7 | comment_prototypes_caller2.c |
+| comment_prototypes.c:45:6:45:11 | proto9 | Functions called from other files should be documented (called from $@). | comment_prototypes_caller1.c:12:5:12:10 | call to proto9 | comment_prototypes_caller1.c |
+| comment_prototypes.c:45:6:45:11 | proto9 | Functions called from other files should be documented (called from $@). | comment_prototypes_caller2.c:12:5:12:10 | call to proto9 | comment_prototypes_caller2.c |
+| comment_prototypes.c:50:6:50:12 | proto10 | Functions called from other files should be documented (called from $@). | comment_prototypes_caller1.c:13:5:13:11 | call to proto10 | comment_prototypes_caller1.c |
+| comment_prototypes.c:50:6:50:12 | proto10 | Functions called from other files should be documented (called from $@). | comment_prototypes_caller2.c:13:5:13:11 | call to proto10 | comment_prototypes_caller2.c |
+| comment_prototypes.c:55:6:55:12 | proto11 | Functions called from other files should be documented (called from $@). | comment_prototypes_caller1.c:14:5:14:11 | call to proto11 | comment_prototypes_caller1.c |
+| comment_prototypes.c:55:6:55:12 | proto11 | Functions called from other files should be documented (called from $@). | comment_prototypes_caller2.c:14:5:14:11 | call to proto11 | comment_prototypes_caller2.c |
+| comment_prototypes.c:66:6:66:12 | proto13 | Functions called from other files should be documented (called from $@). | comment_prototypes_caller1.c:16:5:16:11 | call to proto13 | comment_prototypes_caller1.c |
+| comment_prototypes.c:66:6:66:12 | proto13 | Functions called from other files should be documented (called from $@). | comment_prototypes_caller2.c:16:5:16:11 | call to proto13 | comment_prototypes_caller2.c |
+| definition.c:2:6:2:7 | f1 | Functions called from other files should be documented (called from $@). | user1.c:9:5:9:6 | call to f1 | user1.c |
+| definition.c:2:6:2:7 | f1 | Functions called from other files should be documented (called from $@). | user2.c:7:5:7:6 | call to f1 | user2.c |
+| definition.c:32:6:32:7 | f6 | Functions called from other files should be documented (called from $@). | user1.c:14:5:14:6 | call to f6 | user1.c |
+| definition.c:32:6:32:7 | f6 | Functions called from other files should be documented (called from $@). | user2.c:10:5:10:6 | call to f6 | user2.c |
diff --git a/cpp/ql/test/query-tests/Metrics/Dependencies/ExternalDependencies.expected b/cpp/ql/test/query-tests/Metrics/Dependencies/ExternalDependencies.expected
index a42506f8be11..795f6dba431a 100644
--- a/cpp/ql/test/query-tests/Metrics/Dependencies/ExternalDependencies.expected
+++ b/cpp/ql/test/query-tests/Metrics/Dependencies/ExternalDependencies.expected
@@ -1,4 +1,4 @@
-| /query-tests/Metrics/Dependencies/main.cpp<\|>LibC<\|>unknown | 5 |
-| /query-tests/Metrics/Dependencies/include.h<\|>LibD<\|>unknown | 1 |
-| /query-tests/Metrics/Dependencies/main.cpp<\|>LibA<\|>unknown | 1 |
-| /query-tests/Metrics/Dependencies/main.cpp<\|>LibB<\|>unknown | 1 |
+| /main.cpp<\|>LibC<\|>unknown | 5 |
+| /include.h<\|>LibD<\|>unknown | 1 |
+| /main.cpp<\|>LibA<\|>unknown | 1 |
+| /main.cpp<\|>LibB<\|>unknown | 1 |
diff --git a/cpp/ql/test/query-tests/Metrics/Dependencies/ExternalDependenciesSourceLinks.expected b/cpp/ql/test/query-tests/Metrics/Dependencies/ExternalDependenciesSourceLinks.expected
index f5399bf6ac31..b00deb76d7d8 100644
--- a/cpp/ql/test/query-tests/Metrics/Dependencies/ExternalDependenciesSourceLinks.expected
+++ b/cpp/ql/test/query-tests/Metrics/Dependencies/ExternalDependenciesSourceLinks.expected
@@ -1,4 +1,4 @@
-| /query-tests/Metrics/Dependencies/include.h<\|>LibD<\|>unknown | include.h:0:0:0:0 | include.h |
-| /query-tests/Metrics/Dependencies/main.cpp<\|>LibA<\|>unknown | main.cpp:0:0:0:0 | main.cpp |
-| /query-tests/Metrics/Dependencies/main.cpp<\|>LibB<\|>unknown | main.cpp:0:0:0:0 | main.cpp |
-| /query-tests/Metrics/Dependencies/main.cpp<\|>LibC<\|>unknown | main.cpp:0:0:0:0 | main.cpp |
+| /include.h<\|>LibD<\|>unknown | include.h:0:0:0:0 | include.h |
+| /main.cpp<\|>LibA<\|>unknown | main.cpp:0:0:0:0 | main.cpp |
+| /main.cpp<\|>LibB<\|>unknown | main.cpp:0:0:0:0 | main.cpp |
+| /main.cpp<\|>LibC<\|>unknown | main.cpp:0:0:0:0 | main.cpp |

From b3b9406e4563c8457670e7bf99279921b54289f3 Mon Sep 17 00:00:00 2001
From: Tom Hvitved <hvitved@github.com>
Date: Mon, 23 Sep 2024 16:38:10 +0200
Subject: [PATCH 165/347] Python: Update test

---
 .../experimental/library-tests/CallGraph/InlineCallGraphTest.ql | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/python/ql/test/experimental/library-tests/CallGraph/InlineCallGraphTest.ql b/python/ql/test/experimental/library-tests/CallGraph/InlineCallGraphTest.ql
index 1f2b37168b73..e1b14363639b 100644
--- a/python/ql/test/experimental/library-tests/CallGraph/InlineCallGraphTest.ql
+++ b/python/ql/test/experimental/library-tests/CallGraph/InlineCallGraphTest.ql
@@ -65,7 +65,7 @@ string getCallEdgeValue(CallNode call, Function target) {
   else
     exists(string fixedRelativePath |
       fixedRelativePath =
-        target.getLocation().getFile().getRelativePath().regexpCapture(".*/CallGraph[^/]*/(.*)", 1)
+        target.getLocation().getFile().getAbsolutePath().regexpCapture(".*/CallGraph[^/]*/(.*)", 1)
     |
       // the value needs to be enclosed in quotes to allow special characters
       result = "\"" + fixedRelativePath + ":" + betterQualName(target) + "\""

From d0ca39fb03ea11f164023b6b991fd78fad3d91af Mon Sep 17 00:00:00 2001
From: Tom Hvitved <hvitved@github.com>
Date: Thu, 26 Sep 2024 12:52:54 +0200
Subject: [PATCH 166/347] JS: Update expected test output

---
 .../Files/relativePaths.expected              |  4 +-
 .../test/library-tests/Modules/tests.expected | 20 +++----
 .../test/library-tests/NodeJS/tests.expected  |  6 +-
 .../TypeScript/EmbeddedInScript/Test.expected | 18 +++---
 .../HasQualifiedNameFallback/Test.expected    |  2 +-
 .../TypeScript/PathMapping/Imports.expected   | 14 ++---
 .../Namespaces.expected                       | 42 +++++++-------
 .../ResolveNamespace.expected                 | 56 +++++++++----------
 .../ResolveTypeName.expected                  | 38 ++++++-------
 .../RegressionTests/EmptyName/test.expected   |  6 +-
 .../ExportEqualsExpr/test.expected            |  4 +-
 .../SemicolonInName/test.expected             |  2 +-
 .../SyntaxErrors/SyntaxErrors.expected        |  2 +-
 .../TypeScript/Types/tests.expected           | 50 ++++++++---------
 .../ExternalDependencies.expected             | 18 +++---
 .../NodeJS/CyclicImport/CyclicImport.expected |  4 +-
 .../CWE-200/PrivateFileExposure.expected      |  8 +--
 .../tests.expected                            |  4 +-
 18 files changed, 148 insertions(+), 150 deletions(-)

diff --git a/javascript/ql/test/library-tests/Files/relativePaths.expected b/javascript/ql/test/library-tests/Files/relativePaths.expected
index d70416666954..16c365fdbb13 100644
--- a/javascript/ql/test/library-tests/Files/relativePaths.expected
+++ b/javascript/ql/test/library-tests/Files/relativePaths.expected
@@ -1,2 +1,2 @@
-| a.js:0:0:0:0 | a.js | library-tests/Files/a.js |
-| b/c.js:0:0:0:0 | b/c.js | library-tests/Files/b/c.js |
+| a.js:0:0:0:0 | a.js | a.js |
+| b/c.js:0:0:0:0 | b/c.js | b/c.js |
diff --git a/javascript/ql/test/library-tests/Modules/tests.expected b/javascript/ql/test/library-tests/Modules/tests.expected
index cec0b96049e8..bf0efddba553 100644
--- a/javascript/ql/test/library-tests/Modules/tests.expected
+++ b/javascript/ql/test/library-tests/Modules/tests.expected
@@ -115,16 +115,16 @@ test_ReExportDeclarations
 | m/c.js:5:1:5:30 | export  ... '../b'; | m/c.js:5:24:5:29 | '../b' |
 | reExportNamespace.js:1:1:1:26 | export  ...  "./a"; | reExportNamespace.js:1:21:1:25 | "./a" |
 test_getAnImportedModule
-| library-tests/Modules/b.js | library-tests/Modules/a.js |
-| library-tests/Modules/d.js | library-tests/Modules/a.js |
-| library-tests/Modules/d.js | library-tests/Modules/b.js |
-| library-tests/Modules/es2015_require.js | library-tests/Modules/d.js |
-| library-tests/Modules/f.ts | library-tests/Modules/e.js |
-| library-tests/Modules/g.ts | library-tests/Modules/f.ts |
-| library-tests/Modules/import-indirect-path.js | library-tests/Modules/a.js |
-| library-tests/Modules/import-ts-with-js-extension.ts | library-tests/Modules/f.ts |
-| library-tests/Modules/m/c.js | library-tests/Modules/b.js |
-| library-tests/Modules/reExportNamespaceClient.js | library-tests/Modules/reExportNamespace.js |
+| b.js | a.js |
+| d.js | a.js |
+| d.js | b.js |
+| es2015_require.js | d.js |
+| f.ts | e.js |
+| g.ts | f.ts |
+| import-indirect-path.js | a.js |
+| import-ts-with-js-extension.ts | f.ts |
+| m/c.js | b.js |
+| reExportNamespaceClient.js | reExportNamespace.js |
 test_getExportedName
 | arbitrarySpecifier.ts:5:10:5:30 | Foo_new ... o::new" | Foo::new |
 | arbitrarySpecifier.ts:6:13:6:28 | * as "Foo_types" | Foo_types |
diff --git a/javascript/ql/test/library-tests/NodeJS/tests.expected b/javascript/ql/test/library-tests/NodeJS/tests.expected
index 2f5d09245ec8..b97c6a345e8f 100644
--- a/javascript/ql/test/library-tests/NodeJS/tests.expected
+++ b/javascript/ql/test/library-tests/NodeJS/tests.expected
@@ -94,12 +94,12 @@ requireImport
 | a.js:3:6:3:23 | require('./sub/c') | ./sub/c | sub/c.js:1:1:4:0 | <toplevel> |
 | a.js:4:6:4:29 | require ... /d.js') | ./sub/../d.js | d.js:1:1:7:15 | <toplevel> |
 | a.js:7:1:7:18 | require('./sub/c') | ./sub/c | sub/c.js:1:1:4:0 | <toplevel> |
-| a.js:10:1:10:18 | require(__dirname) | /library-tests/NodeJS | index.js:1:1:3:0 | <toplevel> |
-| a.js:11:1:11:25 | require ... + '/e') | /library-tests/NodeJS/e | e.js:1:1:6:0 | <toplevel> |
+| a.js:10:1:10:18 | require(__dirname) |  | index.js:1:1:3:0 | <toplevel> |
+| a.js:11:1:11:25 | require ... + '/e') | /e | e.js:1:1:6:0 | <toplevel> |
 | a.js:12:1:12:28 | require ...  + 'c') | ./sub/c | sub/c.js:1:1:4:0 | <toplevel> |
 | b.js:1:1:1:18 | require('./sub/c') | ./sub/c | sub/c.js:1:1:4:0 | <toplevel> |
 | d.js:7:1:7:14 | require('foo') | foo | sub/f.js:1:1:4:17 | <toplevel> |
-| index.js:2:1:2:41 | require ... b.js")) | /library-tests/NodeJS/index.js/../b.js | b.js:1:1:8:0 | <toplevel> |
+| index.js:2:1:2:41 | require ... b.js")) | /index.js/../b.js | b.js:1:1:8:0 | <toplevel> |
 | mjs-files/require-from-js.js:1:12:1:36 | require ... on-me') | ./depend-on-me | mjs-files/depend-on-me.mjs:1:1:7:1 | <toplevel> |
 | mjs-files/require-from-js.js:2:12:2:39 | require ... me.js') | ./depend-on-me.js | mjs-files/depend-on-me.js:1:1:8:0 | <toplevel> |
 | mjs-files/require-from-js.js:3:12:3:40 | require ... e.mjs') | ./depend-on-me.mjs | mjs-files/depend-on-me.mjs:1:1:7:1 | <toplevel> |
diff --git a/javascript/ql/test/library-tests/TypeScript/EmbeddedInScript/Test.expected b/javascript/ql/test/library-tests/TypeScript/EmbeddedInScript/Test.expected
index 711e94cfdaa1..2bb7faf59eb9 100644
--- a/javascript/ql/test/library-tests/TypeScript/EmbeddedInScript/Test.expected
+++ b/javascript/ql/test/library-tests/TypeScript/EmbeddedInScript/Test.expected
@@ -8,27 +8,27 @@ exprType
 | htmlfile.html:5:26:5:28 | foo | () => void |
 | htmlfile.html:5:26:5:30 | foo() | void |
 | htmlfile.html:5:26:5:42 | foo() as number[] | number[] |
-| other.ts:1:8:1:16 | Component | typeof default in library-tests/TypeScript/EmbeddedInScript/test.vue |
+| other.ts:1:8:1:16 | Component | typeof default in test.vue |
 | other.ts:1:23:1:34 | "./test.vue" | any |
-| other.ts:2:8:2:19 | ComponentTsx | typeof default in library-tests/TypeScript/EmbeddedInScript/test_tsx.vue |
+| other.ts:2:8:2:19 | ComponentTsx | typeof default in test_tsx.vue |
 | other.ts:2:26:2:41 | "./test_tsx.vue" | any |
 | other.ts:4:1:4:15 | new Component() | MyComponent |
-| other.ts:4:5:4:13 | Component | typeof default in library-tests/TypeScript/EmbeddedInScript/test.vue |
+| other.ts:4:5:4:13 | Component | typeof default in test.vue |
 | other.ts:5:1:5:18 | new ComponentTsx() | MyComponentTsx |
-| other.ts:5:5:5:16 | ComponentTsx | typeof default in library-tests/TypeScript/EmbeddedInScript/test_tsx.vue |
+| other.ts:5:5:5:16 | ComponentTsx | typeof default in test_tsx.vue |
 | other.ts:7:17:7:19 | foo | () => void |
-| test.vue:2:15:2:19 | other | typeof library-tests/TypeScript/EmbeddedInScript/other.ts |
+| test.vue:2:15:2:19 | other | typeof other.ts |
 | test.vue:2:26:2:34 | "./other" | any |
 | test.vue:3:24:3:34 | MyComponent | MyComponent |
 | test.vue:4:7:4:7 | x | number |
-| test_tsx.vue:2:15:2:19 | other | typeof library-tests/TypeScript/EmbeddedInScript/other.ts |
+| test_tsx.vue:2:15:2:19 | other | typeof other.ts |
 | test_tsx.vue:2:26:2:34 | "./other" | any |
 | test_tsx.vue:3:24:3:37 | MyComponentTsx | MyComponentTsx |
 | test_tsx.vue:4:7:4:7 | x | number |
 symbols
-| other.ts:1:1:8:0 | <toplevel> | library-tests/TypeScript/EmbeddedInScript/other.ts |
-| test.vue:2:3:6:0 | <toplevel> | library-tests/TypeScript/EmbeddedInScript/test.vue |
-| test_tsx.vue:2:3:6:0 | <toplevel> | library-tests/TypeScript/EmbeddedInScript/test_tsx.vue |
+| other.ts:1:1:8:0 | <toplevel> | other.ts |
+| test.vue:2:3:6:0 | <toplevel> | test.vue |
+| test_tsx.vue:2:3:6:0 | <toplevel> | test_tsx.vue |
 importTarget
 | htmlfile.html:4:13:4:42 | import  ... other"; | other.ts:1:1:8:0 | <toplevel> |
 | other.ts:1:1:1:35 | import  ... t.vue"; | test.vue:2:3:6:0 | <toplevel> |
diff --git a/javascript/ql/test/library-tests/TypeScript/HasQualifiedNameFallback/Test.expected b/javascript/ql/test/library-tests/TypeScript/HasQualifiedNameFallback/Test.expected
index 5da73c5cfe45..5ee97e2dfb59 100644
--- a/javascript/ql/test/library-tests/TypeScript/HasQualifiedNameFallback/Test.expected
+++ b/javascript/ql/test/library-tests/TypeScript/HasQualifiedNameFallback/Test.expected
@@ -1,12 +1,12 @@
 hasQualifiedNameModule
 | default-import | default | tst.ts:11:9:11:21 | DefaultImport |
 | import-assign | Foo | tst.ts:10:9:10:15 | asn.Foo |
-| library-tests/TypeScript/HasQualifiedNameFallback/tst.ts | ExportedClass | relative.ts:4:8:4:20 | ExportedClass |
 | named-import | Name1 | tst.ts:7:9:7:13 | Name1 |
 | named-import | Name1 | tst.ts:13:9:13:13 | Name1 |
 | named-import | Name1 | tst.ts:13:9:13:21 | Name1<number> |
 | named-import | Name2 | tst.ts:8:9:8:13 | Name2 |
 | namespace-import | Foo | tst.ts:9:9:9:21 | namespace.Foo |
+| tst.ts | ExportedClass | relative.ts:4:8:4:20 | ExportedClass |
 hasQualifiedNameGlobal
 | UnresolvedName | tst.ts:12:9:12:22 | UnresolvedName |
 paramExample
diff --git a/javascript/ql/test/library-tests/TypeScript/PathMapping/Imports.expected b/javascript/ql/test/library-tests/TypeScript/PathMapping/Imports.expected
index c608ea2c7b61..886391b14552 100644
--- a/javascript/ql/test/library-tests/TypeScript/PathMapping/Imports.expected
+++ b/javascript/ql/test/library-tests/TypeScript/PathMapping/Imports.expected
@@ -1,11 +1,11 @@
 symbols
-| src/lib/foo.ts:1:1:4:0 | <toplevel> | library-tests/TypeScript/PathMapping/src/lib/foo.ts |
-| src/lib/foo.ts:1:8:3:1 | functio ...  123;\\n} | foo in library-tests/TypeScript/PathMapping/src/lib/foo.ts |
-| test/test_foo.ts:1:1:1:28 | import  ... @/foo"; | library-tests/TypeScript/PathMapping/src/lib/foo.ts |
-| test/test_foo.ts:1:1:7:0 | <toplevel> | library-tests/TypeScript/PathMapping/test/test_foo.ts |
-| test/test_foo.ts:2:17:2:32 | require("@/foo") | library-tests/TypeScript/PathMapping/src/lib/foo.ts |
-| test/test_foo.ts:4:1:4:5 | foo() | foo in library-tests/TypeScript/PathMapping/src/lib/foo.ts |
-| test/test_foo.ts:6:1:6:12 | foolib.foo() | foo in library-tests/TypeScript/PathMapping/src/lib/foo.ts |
+| src/lib/foo.ts:1:1:4:0 | <toplevel> | src/lib/foo.ts |
+| src/lib/foo.ts:1:8:3:1 | functio ...  123;\\n} | foo in src/lib/foo.ts |
+| test/test_foo.ts:1:1:1:28 | import  ... @/foo"; | src/lib/foo.ts |
+| test/test_foo.ts:1:1:7:0 | <toplevel> | test/test_foo.ts |
+| test/test_foo.ts:2:17:2:32 | require("@/foo") | src/lib/foo.ts |
+| test/test_foo.ts:4:1:4:5 | foo() | foo in src/lib/foo.ts |
+| test/test_foo.ts:6:1:6:12 | foolib.foo() | foo in src/lib/foo.ts |
 #select
 | test/test_foo.ts:1:1:1:28 | import  ... @/foo"; | src/lib/foo.ts:1:1:4:0 | <toplevel> |
 | test/test_foo.ts:2:17:2:32 | require("@/foo") | src/lib/foo.ts:1:1:4:0 | <toplevel> |
diff --git a/javascript/ql/test/library-tests/TypeScript/QualifiedNameResolution/Namespaces.expected b/javascript/ql/test/library-tests/TypeScript/QualifiedNameResolution/Namespaces.expected
index 214b23594e7f..0494011bc70a 100644
--- a/javascript/ql/test/library-tests/TypeScript/QualifiedNameResolution/Namespaces.expected
+++ b/javascript/ql/test/library-tests/TypeScript/QualifiedNameResolution/Namespaces.expected
@@ -1,33 +1,33 @@
-| A in library-tests/TypeScript/QualifiedNameResolution/enums.ts |
-| A in library-tests/TypeScript/QualifiedNameResolution/export-qualified.ts |
-| A in library-tests/TypeScript/QualifiedNameResolution/namespaces.ts |
-| A.B in library-tests/TypeScript/QualifiedNameResolution/export-qualified.ts |
-| A.C in library-tests/TypeScript/QualifiedNameResolution/namespaces.ts |
-| A.E in library-tests/TypeScript/QualifiedNameResolution/enums.ts |
+| A in enums.ts |
+| A in export-qualified.ts |
+| A in namespaces.ts |
+| A.B in export-qualified.ts |
+| A.C in namespaces.ts |
+| A.E in enums.ts |
 | B in namespaces.ts:3 |
 | B in namespaces.ts:10 |
 | B.Bx in namespaces.ts:3 |
 | B.Bx in namespaces.ts:10 |
-| D in library-tests/TypeScript/QualifiedNameResolution/export-specifiers.ts |
-| D in library-tests/TypeScript/QualifiedNameResolution/namespaces.ts |
-| D in library-tests/TypeScript/QualifiedNameResolution/otherlib.ts |
-| D.F in library-tests/TypeScript/QualifiedNameResolution/namespaces.ts |
+| D in export-specifiers.ts |
+| D in namespaces.ts |
+| D in otherlib.ts |
+| D.F in namespaces.ts |
 | E in namespaces.ts:17 |
 | E in namespaces.ts:22 |
 | Foo in global scope |
-| G in library-tests/TypeScript/QualifiedNameResolution/namespaces.ts |
-| G.J in library-tests/TypeScript/QualifiedNameResolution/namespaces.ts |
+| G in namespaces.ts |
+| G.J in namespaces.ts |
 | Glob in global scope |
 | H in namespaces.ts:27 |
 | H.I in namespaces.ts:27 |
-| N in library-tests/TypeScript/QualifiedNameResolution/export-specifiers.ts |
+| N in export-specifiers.ts |
 | X in global scope |
-| X in library-tests/TypeScript/QualifiedNameResolution/namespaces.ts |
-| X.Y in library-tests/TypeScript/QualifiedNameResolution/namespaces.ts |
-| X.Y.Z in library-tests/TypeScript/QualifiedNameResolution/namespaces.ts |
+| X in namespaces.ts |
+| X.Y in namespaces.ts |
+| X.Y.Z in namespaces.ts |
 | Y in global scope |
-| library-tests/TypeScript/QualifiedNameResolution/export-class.ts |
-| library-tests/TypeScript/QualifiedNameResolution/namespaces.ts |
-| library-tests/TypeScript/QualifiedNameResolution/otherlib.ts |
-| library-tests/TypeScript/QualifiedNameResolution/reexport-all.ts |
-| library-tests/TypeScript/QualifiedNameResolution/reexport-named.ts |
+| export-class.ts |
+| namespaces.ts |
+| otherlib.ts |
+| reexport-all.ts |
+| reexport-named.ts |
diff --git a/javascript/ql/test/library-tests/TypeScript/QualifiedNameResolution/ResolveNamespace.expected b/javascript/ql/test/library-tests/TypeScript/QualifiedNameResolution/ResolveNamespace.expected
index 20df7b95bd9a..7ec8faec19ff 100644
--- a/javascript/ql/test/library-tests/TypeScript/QualifiedNameResolution/ResolveNamespace.expected
+++ b/javascript/ql/test/library-tests/TypeScript/QualifiedNameResolution/ResolveNamespace.expected
@@ -1,31 +1,31 @@
 | ambient.ts:5:16:5:18 | Foo | Foo in global scope |
-| enums.ts:9:8:9:8 | A | A in library-tests/TypeScript/QualifiedNameResolution/enums.ts |
-| enums.ts:9:8:9:10 | A.E | A.E in library-tests/TypeScript/QualifiedNameResolution/enums.ts |
-| enums.ts:10:8:10:8 | A | A in library-tests/TypeScript/QualifiedNameResolution/enums.ts |
-| export-qualified-client.ts:3:8:3:9 | AB | A.B in library-tests/TypeScript/QualifiedNameResolution/export-qualified.ts |
-| export-specifiers-client.ts:4:8:4:8 | N | N in library-tests/TypeScript/QualifiedNameResolution/export-specifiers.ts |
-| export-specifiers-client.ts:5:8:5:8 | D | D in library-tests/TypeScript/QualifiedNameResolution/export-specifiers.ts |
+| enums.ts:9:8:9:8 | A | A in enums.ts |
+| enums.ts:9:8:9:10 | A.E | A.E in enums.ts |
+| enums.ts:10:8:10:8 | A | A in enums.ts |
+| export-qualified-client.ts:3:8:3:9 | AB | A.B in export-qualified.ts |
+| export-specifiers-client.ts:4:8:4:8 | N | N in export-specifiers.ts |
+| export-specifiers-client.ts:5:8:5:8 | D | D in export-specifiers.ts |
 | global.ts:5:9:5:12 | Glob | Glob in global scope |
 | import-in-namespace.ts:9:13:9:13 | A | X in global scope |
-| namespaces-client.ts:4:9:4:10 | ns | library-tests/TypeScript/QualifiedNameResolution/namespaces.ts |
-| namespaces-client.ts:4:9:4:12 | ns.G | G in library-tests/TypeScript/QualifiedNameResolution/namespaces.ts |
-| namespaces-client.ts:5:9:5:9 | G | G in library-tests/TypeScript/QualifiedNameResolution/namespaces.ts |
-| namespaces-client.ts:6:9:6:9 | G | G in library-tests/TypeScript/QualifiedNameResolution/namespaces.ts |
-| namespaces-client.ts:6:9:6:11 | G.J | G.J in library-tests/TypeScript/QualifiedNameResolution/namespaces.ts |
-| reexport-all-client.ts:4:9:4:10 | ns | library-tests/TypeScript/QualifiedNameResolution/reexport-all.ts |
-| reexport-all-client.ts:4:9:4:12 | ns.G | G in library-tests/TypeScript/QualifiedNameResolution/namespaces.ts |
-| reexport-all-client.ts:5:9:5:9 | G | G in library-tests/TypeScript/QualifiedNameResolution/namespaces.ts |
-| reexport-all-client.ts:6:9:6:9 | G | G in library-tests/TypeScript/QualifiedNameResolution/namespaces.ts |
-| reexport-all-client.ts:6:9:6:11 | G.J | G.J in library-tests/TypeScript/QualifiedNameResolution/namespaces.ts |
-| reexport-all-client.ts:8:8:8:8 | D | D in library-tests/TypeScript/QualifiedNameResolution/otherlib.ts |
-| reexport-all-client.ts:9:8:9:9 | ns | library-tests/TypeScript/QualifiedNameResolution/reexport-all.ts |
-| reexport-all-client.ts:9:8:9:11 | ns.D | D in library-tests/TypeScript/QualifiedNameResolution/otherlib.ts |
-| reexport-all-client.ts:11:8:11:9 | ns | library-tests/TypeScript/QualifiedNameResolution/reexport-all.ts |
-| reexport-named-client.ts:4:9:4:10 | ns | library-tests/TypeScript/QualifiedNameResolution/reexport-named.ts |
-| reexport-named-client.ts:4:9:4:12 | ns.G | G in library-tests/TypeScript/QualifiedNameResolution/namespaces.ts |
-| reexport-named-client.ts:5:9:5:9 | G | G in library-tests/TypeScript/QualifiedNameResolution/namespaces.ts |
-| reexport-named-client.ts:6:9:6:9 | G | G in library-tests/TypeScript/QualifiedNameResolution/namespaces.ts |
-| reexport-named-client.ts:6:9:6:11 | G.J | G.J in library-tests/TypeScript/QualifiedNameResolution/namespaces.ts |
-| reexport-named-client.ts:8:8:8:8 | X | D in library-tests/TypeScript/QualifiedNameResolution/namespaces.ts |
-| reexport-named-client.ts:9:8:9:9 | ns | library-tests/TypeScript/QualifiedNameResolution/reexport-named.ts |
-| reexport-named-client.ts:9:8:9:11 | ns.X | D in library-tests/TypeScript/QualifiedNameResolution/namespaces.ts |
+| namespaces-client.ts:4:9:4:10 | ns | namespaces.ts |
+| namespaces-client.ts:4:9:4:12 | ns.G | G in namespaces.ts |
+| namespaces-client.ts:5:9:5:9 | G | G in namespaces.ts |
+| namespaces-client.ts:6:9:6:9 | G | G in namespaces.ts |
+| namespaces-client.ts:6:9:6:11 | G.J | G.J in namespaces.ts |
+| reexport-all-client.ts:4:9:4:10 | ns | reexport-all.ts |
+| reexport-all-client.ts:4:9:4:12 | ns.G | G in namespaces.ts |
+| reexport-all-client.ts:5:9:5:9 | G | G in namespaces.ts |
+| reexport-all-client.ts:6:9:6:9 | G | G in namespaces.ts |
+| reexport-all-client.ts:6:9:6:11 | G.J | G.J in namespaces.ts |
+| reexport-all-client.ts:8:8:8:8 | D | D in otherlib.ts |
+| reexport-all-client.ts:9:8:9:9 | ns | reexport-all.ts |
+| reexport-all-client.ts:9:8:9:11 | ns.D | D in otherlib.ts |
+| reexport-all-client.ts:11:8:11:9 | ns | reexport-all.ts |
+| reexport-named-client.ts:4:9:4:10 | ns | reexport-named.ts |
+| reexport-named-client.ts:4:9:4:12 | ns.G | G in namespaces.ts |
+| reexport-named-client.ts:5:9:5:9 | G | G in namespaces.ts |
+| reexport-named-client.ts:6:9:6:9 | G | G in namespaces.ts |
+| reexport-named-client.ts:6:9:6:11 | G.J | G.J in namespaces.ts |
+| reexport-named-client.ts:8:8:8:8 | X | D in namespaces.ts |
+| reexport-named-client.ts:9:8:9:9 | ns | reexport-named.ts |
+| reexport-named-client.ts:9:8:9:11 | ns.X | D in namespaces.ts |
diff --git a/javascript/ql/test/library-tests/TypeScript/QualifiedNameResolution/ResolveTypeName.expected b/javascript/ql/test/library-tests/TypeScript/QualifiedNameResolution/ResolveTypeName.expected
index 008b2cbbbeb0..1629bdac5b15 100644
--- a/javascript/ql/test/library-tests/TypeScript/QualifiedNameResolution/ResolveTypeName.expected
+++ b/javascript/ql/test/library-tests/TypeScript/QualifiedNameResolution/ResolveTypeName.expected
@@ -1,27 +1,27 @@
 | ambient.ts:5:16:5:20 | Foo.C | Foo.C in global scope |
-| enums.ts:9:8:9:12 | A.E.x | A.E.x in library-tests/TypeScript/QualifiedNameResolution/enums.ts |
-| enums.ts:10:8:10:10 | A.E | A.E in library-tests/TypeScript/QualifiedNameResolution/enums.ts |
-| export-class-client-renamed.ts:3:8:3:8 | X | Banana in library-tests/TypeScript/QualifiedNameResolution/export-class.ts |
-| export-class-client.ts:3:8:3:13 | Banana | Banana in library-tests/TypeScript/QualifiedNameResolution/export-class.ts |
-| export-qualified-client.ts:3:8:3:11 | AB.C | A.B.C in library-tests/TypeScript/QualifiedNameResolution/export-qualified.ts |
-| export-specifiers-client.ts:4:8:4:10 | N.C | N.C in library-tests/TypeScript/QualifiedNameResolution/export-specifiers.ts |
-| export-specifiers-client.ts:5:8:5:10 | D.C | D.C in library-tests/TypeScript/QualifiedNameResolution/export-specifiers.ts |
-| export-specifiers-client.ts:6:8:6:8 | C | C in library-tests/TypeScript/QualifiedNameResolution/export-specifiers.ts |
+| enums.ts:9:8:9:12 | A.E.x | A.E.x in enums.ts |
+| enums.ts:10:8:10:10 | A.E | A.E in enums.ts |
+| export-class-client-renamed.ts:3:8:3:8 | X | Banana in export-class.ts |
+| export-class-client.ts:3:8:3:13 | Banana | Banana in export-class.ts |
+| export-qualified-client.ts:3:8:3:11 | AB.C | A.B.C in export-qualified.ts |
+| export-specifiers-client.ts:4:8:4:10 | N.C | N.C in export-specifiers.ts |
+| export-specifiers-client.ts:5:8:5:10 | D.C | D.C in export-specifiers.ts |
+| export-specifiers-client.ts:6:8:6:8 | C | C in export-specifiers.ts |
 | global.ts:5:9:5:14 | Glob.C | Glob.C in global scope |
 | import-in-namespace.ts:9:13:9:15 | A.C | X.C in global scope |
 | import-in-namespace.ts:10:13:10:13 | D | X.C in global scope |
-| namespaces-client.ts:4:9:4:14 | ns.G.C | G.C in library-tests/TypeScript/QualifiedNameResolution/namespaces.ts |
-| namespaces-client.ts:5:9:5:11 | G.C | G.C in library-tests/TypeScript/QualifiedNameResolution/namespaces.ts |
-| namespaces-client.ts:6:9:6:13 | G.J.C | G.J.C in library-tests/TypeScript/QualifiedNameResolution/namespaces.ts |
-| reexport-all-client.ts:4:9:4:14 | ns.G.C | G.C in library-tests/TypeScript/QualifiedNameResolution/namespaces.ts |
-| reexport-all-client.ts:5:9:5:11 | G.C | G.C in library-tests/TypeScript/QualifiedNameResolution/namespaces.ts |
-| reexport-all-client.ts:6:9:6:13 | G.J.C | G.J.C in library-tests/TypeScript/QualifiedNameResolution/namespaces.ts |
+| namespaces-client.ts:4:9:4:14 | ns.G.C | G.C in namespaces.ts |
+| namespaces-client.ts:5:9:5:11 | G.C | G.C in namespaces.ts |
+| namespaces-client.ts:6:9:6:13 | G.J.C | G.J.C in namespaces.ts |
+| reexport-all-client.ts:4:9:4:14 | ns.G.C | G.C in namespaces.ts |
+| reexport-all-client.ts:5:9:5:11 | G.C | G.C in namespaces.ts |
+| reexport-all-client.ts:6:9:6:13 | G.J.C | G.J.C in namespaces.ts |
 | reexport-all-client.ts:8:8:8:10 | D.F | D.F in unknown scope |
 | reexport-all-client.ts:9:8:9:13 | ns.D.F | ns.D.F in unknown scope |
-| reexport-all-client.ts:11:8:11:16 | ns.Banana | Banana in library-tests/TypeScript/QualifiedNameResolution/export-class.ts |
-| reexport-named-client.ts:4:9:4:14 | ns.G.C | G.C in library-tests/TypeScript/QualifiedNameResolution/namespaces.ts |
-| reexport-named-client.ts:5:9:5:11 | G.C | G.C in library-tests/TypeScript/QualifiedNameResolution/namespaces.ts |
-| reexport-named-client.ts:6:9:6:13 | G.J.C | G.J.C in library-tests/TypeScript/QualifiedNameResolution/namespaces.ts |
+| reexport-all-client.ts:11:8:11:16 | ns.Banana | Banana in export-class.ts |
+| reexport-named-client.ts:4:9:4:14 | ns.G.C | G.C in namespaces.ts |
+| reexport-named-client.ts:5:9:5:11 | G.C | G.C in namespaces.ts |
+| reexport-named-client.ts:6:9:6:13 | G.J.C | G.J.C in namespaces.ts |
 | reexport-named-client.ts:8:8:8:10 | X.F | X.F in unknown scope |
 | reexport-named-client.ts:9:8:9:13 | ns.X.F | ns.X.F in unknown scope |
-| reexport-named-client.ts:11:9:11:9 | Y | Banana in library-tests/TypeScript/QualifiedNameResolution/export-class.ts |
+| reexport-named-client.ts:11:9:11:9 | Y | Banana in export-class.ts |
diff --git a/javascript/ql/test/library-tests/TypeScript/RegressionTests/EmptyName/test.expected b/javascript/ql/test/library-tests/TypeScript/RegressionTests/EmptyName/test.expected
index 47317a00a867..85cb86df42a2 100644
--- a/javascript/ql/test/library-tests/TypeScript/RegressionTests/EmptyName/test.expected
+++ b/javascript/ql/test/library-tests/TypeScript/RegressionTests/EmptyName/test.expected
@@ -1,4 +1,4 @@
 | MK in unknown scope |
-| Mapped in library-tests/TypeScript/RegressionTests/EmptyName/test.ts |
-| fn in library-tests/TypeScript/RegressionTests/EmptyName/test.ts |
-| library-tests/TypeScript/RegressionTests/EmptyName/test.ts |
+| Mapped in test.ts |
+| fn in test.ts |
+| test.ts |
diff --git a/javascript/ql/test/library-tests/TypeScript/RegressionTests/ExportEqualsExpr/test.expected b/javascript/ql/test/library-tests/TypeScript/RegressionTests/ExportEqualsExpr/test.expected
index 3736c602bc32..24fc12058753 100644
--- a/javascript/ql/test/library-tests/TypeScript/RegressionTests/ExportEqualsExpr/test.expected
+++ b/javascript/ql/test/library-tests/TypeScript/RegressionTests/ExportEqualsExpr/test.expected
@@ -1,7 +1,7 @@
 | "bar" in global scope |
 | C in module 'bar' |
 | Foo in global scope |
-| Foo in library-tests/TypeScript/RegressionTests/ExportEqualsExpr/tst.ts |
-| library-tests/TypeScript/RegressionTests/ExportEqualsExpr/tst.ts |
+| Foo in tst.ts |
 | module 'bar' |
 | module 'foo' |
+| tst.ts |
diff --git a/javascript/ql/test/library-tests/TypeScript/RegressionTests/SemicolonInName/test.expected b/javascript/ql/test/library-tests/TypeScript/RegressionTests/SemicolonInName/test.expected
index 074e6d0c2777..603eaba0d279 100644
--- a/javascript/ql/test/library-tests/TypeScript/RegressionTests/SemicolonInName/test.expected
+++ b/javascript/ql/test/library-tests/TypeScript/RegressionTests/SemicolonInName/test.expected
@@ -1,2 +1,2 @@
 | Bar.Foo in global scope | Bar in global scope |
-| fn in library-tests/TypeScript/RegressionTests/SemicolonInName/test.ts | library-tests/TypeScript/RegressionTests/SemicolonInName/test.ts |
+| fn in test.ts | test.ts |
diff --git a/javascript/ql/test/library-tests/TypeScript/SyntaxErrors/SyntaxErrors.expected b/javascript/ql/test/library-tests/TypeScript/SyntaxErrors/SyntaxErrors.expected
index 58e88ed6fe11..cca870438e91 100644
--- a/javascript/ql/test/library-tests/TypeScript/SyntaxErrors/SyntaxErrors.expected
+++ b/javascript/ql/test/library-tests/TypeScript/SyntaxErrors/SyntaxErrors.expected
@@ -1 +1 @@
-| library-tests/TypeScript/SyntaxErrors/jsdocTypes.ts | This file contains a parse error |
+| jsdocTypes.ts | This file contains a parse error |
diff --git a/javascript/ql/test/library-tests/TypeScript/Types/tests.expected b/javascript/ql/test/library-tests/TypeScript/Types/tests.expected
index 1cf1ca607ae3..b786fae3713e 100644
--- a/javascript/ql/test/library-tests/TypeScript/Types/tests.expected
+++ b/javascript/ql/test/library-tests/TypeScript/Types/tests.expected
@@ -1,7 +1,7 @@
 booleans
 | boolean |
 getExprType
-| boolean-type.ts:1:13:1:17 | dummy | typeof library-tests/TypeScript/Types/dummy.ts |
+| boolean-type.ts:1:13:1:17 | dummy | typeof dummy.ts |
 | boolean-type.ts:1:24:1:32 | "./dummy" | any |
 | boolean-type.ts:3:5:3:9 | true1 | true |
 | boolean-type.ts:4:5:4:9 | true2 | true |
@@ -24,7 +24,7 @@ getExprType
 | middle-rest.ts:3:8:3:11 | true | true |
 | middle-rest.ts:3:14:3:20 | "hello" | "hello" |
 | middle-rest.ts:3:23:3:25 | 123 | 123 |
-| tst.ts:1:13:1:17 | dummy | typeof library-tests/TypeScript/Types/dummy.ts |
+| tst.ts:1:13:1:17 | dummy | typeof dummy.ts |
 | tst.ts:1:24:1:32 | "./dummy" | any |
 | tst.ts:3:5:3:10 | numVar | number |
 | tst.ts:5:5:5:8 | num1 | number |
@@ -127,7 +127,7 @@ getExprType
 | tst.ts:69:24:69:45 | {yetAno ... : true} | MyUnion2 |
 | tst.ts:69:25:69:38 | yetAnotherType | true |
 | tst.ts:69:41:69:44 | true | true |
-| tst.ts:71:8:71:11 | TS43 | typeof TS43 in library-tests/TypeScript/Types/tst.ts |
+| tst.ts:71:8:71:11 | TS43 | typeof TS43 in tst.ts |
 | tst.ts:74:5:74:22 | get size(): number | number |
 | tst.ts:74:9:74:12 | size | number |
 | tst.ts:75:5:75:47 | set siz ... olean); | number |
@@ -175,7 +175,7 @@ getExprType
 | tst.ts:126:7:126:22 | this.#someMethod | () => number |
 | tst.ts:126:7:126:24 | this.#someMethod() | number |
 | tst.ts:127:14:127:28 | this.#someValue | number |
-| tst.ts:132:8:132:11 | TS44 | typeof TS44 in library-tests/TypeScript/Types/tst.ts |
+| tst.ts:132:8:132:11 | TS44 | typeof TS44 in tst.ts |
 | tst.ts:133:12:133:14 | foo | (arg: unknown) => void |
 | tst.ts:133:16:133:18 | arg | unknown |
 | tst.ts:134:11:134:21 | argIsString | boolean |
@@ -260,7 +260,7 @@ getExprType
 | tst.ts:189:11:189:15 | count | number |
 | tst.ts:189:19:189:21 | Foo | typeof Foo in tst.ts:132 |
 | tst.ts:189:19:189:28 | Foo.#count | number |
-| tst.ts:195:8:195:11 | TS45 | typeof TS45 in library-tests/TypeScript/Types/tst.ts |
+| tst.ts:195:8:195:11 | TS45 | typeof TS45 in tst.ts |
 | tst.ts:207:5:207:8 | body | string |
 | tst.ts:212:7:212:13 | message | string |
 | tst.ts:215:19:215:25 | handler | (r: Success \| Error) => void |
@@ -301,7 +301,7 @@ getExprType
 | tst.ts:238:11:238:14 | Foo3 | { foo: string; } |
 | tst.ts:238:11:238:18 | Foo3.foo | string |
 | tst.ts:238:16:238:18 | foo | string |
-| tst.ts:240:8:240:11 | TS46 | typeof TS46 in library-tests/TypeScript/Types/tst.ts |
+| tst.ts:240:8:240:11 | TS46 | typeof TS46 in tst.ts |
 | tst.ts:241:9:241:12 | Base | Base |
 | tst.ts:243:9:243:15 | Derived | Derived |
 | tst.ts:243:25:243:28 | Base | Base |
@@ -481,27 +481,27 @@ getExprType
 | tst.ts:362:9:362:11 | log | (...data: any[]) => void |
 | tst.ts:362:13:362:24 | tstModuleCJS | () => "a" \| "b" |
 | tst.ts:362:13:362:26 | tstModuleCJS() | "a" \| "b" |
-| tst.ts:368:13:368:13 | A | typeof library-tests/TypeScript/Types/tstSuffixA.ts |
+| tst.ts:368:13:368:13 | A | typeof tstSuffixA.ts |
 | tst.ts:368:20:368:33 | './tstSuffixA' | any |
 | tst.ts:370:1:370:7 | console | Console |
 | tst.ts:370:1:370:11 | console.log | (...data: any[]) => void |
 | tst.ts:370:1:370:29 | console ... File()) | void |
 | tst.ts:370:9:370:11 | log | (...data: any[]) => void |
-| tst.ts:370:13:370:13 | A | typeof library-tests/TypeScript/Types/tstSuffixA.ts |
+| tst.ts:370:13:370:13 | A | typeof tstSuffixA.ts |
 | tst.ts:370:13:370:26 | A.resolvedFile | () => "tstSuffixA.ts" |
 | tst.ts:370:13:370:28 | A.resolvedFile() | "tstSuffixA.ts" |
 | tst.ts:370:15:370:26 | resolvedFile | () => "tstSuffixA.ts" |
-| tst.ts:372:13:372:13 | B | typeof library-tests/TypeScript/Types/tstSuffixB.ios.ts |
+| tst.ts:372:13:372:13 | B | typeof tstSuffixB.ios.ts |
 | tst.ts:372:20:372:33 | './tstSuffixB' | any |
 | tst.ts:374:1:374:7 | console | Console |
 | tst.ts:374:1:374:11 | console.log | (...data: any[]) => void |
 | tst.ts:374:1:374:29 | console ... File()) | void |
 | tst.ts:374:9:374:11 | log | (...data: any[]) => void |
-| tst.ts:374:13:374:13 | B | typeof library-tests/TypeScript/Types/tstSuffixB.ios.ts |
+| tst.ts:374:13:374:13 | B | typeof tstSuffixB.ios.ts |
 | tst.ts:374:13:374:26 | B.resolvedFile | () => "tstSuffixB.ios.ts" |
 | tst.ts:374:13:374:28 | B.resolvedFile() | "tstSuffixB.ios.ts" |
 | tst.ts:374:15:374:26 | resolvedFile | () => "tstSuffixB.ios.ts" |
-| tst.ts:379:8:379:11 | TS48 | typeof TS48 in library-tests/TypeScript/Types/tst.ts |
+| tst.ts:379:8:379:11 | TS48 | typeof TS48 in tst.ts |
 | tst.ts:383:22:383:35 | chooseRandomly | <T>(x: T, y: T) => T |
 | tst.ts:383:40:383:40 | x | T |
 | tst.ts:383:46:383:46 | y | T |
@@ -518,7 +518,7 @@ getExprType
 | tst.ts:385:56:385:56 | 0 | 0 |
 | tst.ts:385:59:385:63 | false | false |
 | tst.ts:385:66:385:71 | "bye!" | "bye!" |
-| tst.ts:390:8:390:11 | TS49 | typeof TS49 in library-tests/TypeScript/Types/tst.ts |
+| tst.ts:390:8:390:11 | TS49 | typeof TS49 in tst.ts |
 | tst.ts:395:9:395:15 | palette | { red: [number, number, number]; green: string;... |
 | tst.ts:395:19:399:3 | {\\n    r ... 5],\\n  } | Record<Colors, string \| RGB> |
 | tst.ts:395:19:399:42 | {\\n    r ...  \| RGB> | { red: [number, number, number]; green: string;... |
@@ -559,7 +559,7 @@ getExprType
 | tst.ts:423:7:423:22 | this.name = name | string |
 | tst.ts:423:12:423:15 | name | string |
 | tst.ts:423:19:423:22 | name | string |
-| tst.ts:430:8:430:11 | TS50 | typeof TS50 in library-tests/TypeScript/Types/tst.ts |
+| tst.ts:430:8:430:11 | TS50 | typeof TS50 in tst.ts |
 | tst.ts:432:33:432:36 | args | Args |
 | tst.ts:433:68:433:71 | args | Args |
 | tst.ts:435:15:435:24 | methodName | string |
@@ -632,7 +632,7 @@ getExprType
 | tst.ts:467:15:467:17 | foo | readonly ["a", "b", "c"] |
 | tst.ts:467:15:467:20 | foo[1] | "b" |
 | tst.ts:467:19:467:19 | 1 | 1 |
-| tst.ts:472:8:472:11 | TS52 | typeof TS52 in library-tests/TypeScript/Types/tst.ts |
+| tst.ts:472:8:472:11 | TS52 | typeof TS52 in tst.ts |
 | tst.ts:473:11:473:19 | SomeClass | SomeClass |
 | tst.ts:474:10:474:36 | ((_targ ...  => {}) | (_target: undefined, _context: ClassFieldDecora... |
 | tst.ts:474:11:474:35 | (_targe ... ) => {} | (_target: undefined, _context: ClassFieldDecora... |
@@ -657,7 +657,7 @@ getExprType
 | tst.ts:483:17:483:58 | ["hello ... string> | [first: string, string] |
 | tst.ts:483:18:483:24 | "hello" | "hello" |
 | tst.ts:483:27:483:33 | "world" | "world" |
-| tst.ts:486:8:486:11 | TS54 | typeof TS54 in library-tests/TypeScript/Types/tst.ts |
+| tst.ts:486:8:486:11 | TS54 | typeof TS54 in tst.ts |
 | tst.ts:487:48:487:53 | colors | C[] |
 | tst.ts:488:12:488:17 | colors | C[] |
 | tst.ts:488:12:488:20 | colors[0] | C |
@@ -691,7 +691,7 @@ getExprType
 | tst.ts:494:24:494:24 | 0 | 0 |
 | tst.ts:494:28:494:33 | "even" | "even" |
 | tst.ts:494:36:494:40 | "odd" | "odd" |
-| tst.ts:498:8:498:11 | TS55 | typeof TS55 in library-tests/TypeScript/Types/tst.ts |
+| tst.ts:498:8:498:11 | TS55 | typeof TS55 in tst.ts |
 | tst.ts:499:9:499:15 | strings | string[] |
 | tst.ts:499:19:499:32 | (["foo", 123]) | (string \| number)[] |
 | tst.ts:499:19:500:11 | (["foo" ... .filter | { <S extends string \| number>(predicate: (value... |
@@ -779,18 +779,18 @@ getExprType
 | type_alias.ts:26:19:26:20 | id | string |
 | type_alias.ts:26:23:26:36 | "second-child" | "second-child" |
 | type_alias.ts:26:41:26:62 | "I'm th ...  child" | "I'm the second child" |
-| type_definition_objects.ts:1:13:1:17 | dummy | typeof library-tests/TypeScript/Types/dummy.ts |
+| type_definition_objects.ts:1:13:1:17 | dummy | typeof dummy.ts |
 | type_definition_objects.ts:1:24:1:32 | "./dummy" | any |
 | type_definition_objects.ts:3:14:3:14 | C | C |
-| type_definition_objects.ts:4:5:4:12 | classObj | typeof C in library-tests/TypeScript/Types/type_definition_objects.ts |
-| type_definition_objects.ts:4:16:4:16 | C | typeof C in library-tests/TypeScript/Types/type_definition_objects.ts |
+| type_definition_objects.ts:4:5:4:12 | classObj | typeof C in type_definition_objects.ts |
+| type_definition_objects.ts:4:16:4:16 | C | typeof C in type_definition_objects.ts |
 | type_definition_objects.ts:6:13:6:13 | E | E |
-| type_definition_objects.ts:7:5:7:11 | enumObj | typeof E in library-tests/TypeScript/Types/type_definition_objects.ts |
-| type_definition_objects.ts:7:15:7:15 | E | typeof E in library-tests/TypeScript/Types/type_definition_objects.ts |
-| type_definition_objects.ts:9:18:9:18 | N | typeof N in library-tests/TypeScript/Types/type_definition_objects.ts |
-| type_definition_objects.ts:10:5:10:16 | namespaceObj | typeof N in library-tests/TypeScript/Types/type_definition_objects.ts |
-| type_definition_objects.ts:10:20:10:20 | N | typeof N in library-tests/TypeScript/Types/type_definition_objects.ts |
-| type_definitions.ts:1:13:1:17 | dummy | typeof library-tests/TypeScript/Types/dummy.ts |
+| type_definition_objects.ts:7:5:7:11 | enumObj | typeof E in type_definition_objects.ts |
+| type_definition_objects.ts:7:15:7:15 | E | typeof E in type_definition_objects.ts |
+| type_definition_objects.ts:9:18:9:18 | N | typeof N in type_definition_objects.ts |
+| type_definition_objects.ts:10:5:10:16 | namespaceObj | typeof N in type_definition_objects.ts |
+| type_definition_objects.ts:10:20:10:20 | N | typeof N in type_definition_objects.ts |
+| type_definitions.ts:1:13:1:17 | dummy | typeof dummy.ts |
 | type_definitions.ts:1:24:1:32 | "./dummy" | any |
 | type_definitions.ts:4:3:4:3 | x | S |
 | type_definitions.ts:6:5:6:5 | i | I<number> |
diff --git a/javascript/ql/test/query-tests/Metrics/ExternalDependencies/ExternalDependencies.expected b/javascript/ql/test/query-tests/Metrics/ExternalDependencies/ExternalDependencies.expected
index d690d12e11b1..39b6d8ffcad8 100644
--- a/javascript/ql/test/query-tests/Metrics/ExternalDependencies/ExternalDependencies.expected
+++ b/javascript/ql/test/query-tests/Metrics/ExternalDependencies/ExternalDependencies.expected
@@ -1,9 +1,9 @@
-| /query-tests/Metrics/ExternalDependencies/src/tst.html<\|>jquery<\|>23.0.0 | 4 |
-| /query-tests/Metrics/ExternalDependencies/src/a.js<\|>lib3<\|>unknown | 3 |
-| /query-tests/Metrics/ExternalDependencies/src/tst.html<\|>jquery<\|>42.0.0 | 3 |
-| /query-tests/Metrics/ExternalDependencies/src/a.js<\|>lib1<\|>1.0.2 | 2 |
-| /query-tests/Metrics/ExternalDependencies/src/b.js<\|>lib3<\|>unknown | 2 |
-| /query-tests/Metrics/ExternalDependencies/src/a.js<\|>lib2<\|>1.0.0 | 1 |
-| /query-tests/Metrics/ExternalDependencies/src/b.js<\|>lib2<\|>1.0.0 | 1 |
-| /query-tests/Metrics/ExternalDependencies/src/sub/c.js<\|>lib1<\|>1.0.2 | 1 |
-| /query-tests/Metrics/ExternalDependencies/src/sub/subsub/d.js<\|>lib1<\|>1.0.3 | 1 |
+| /src/tst.html<\|>jquery<\|>23.0.0 | 4 |
+| /src/a.js<\|>lib3<\|>unknown | 3 |
+| /src/tst.html<\|>jquery<\|>42.0.0 | 3 |
+| /src/a.js<\|>lib1<\|>1.0.2 | 2 |
+| /src/b.js<\|>lib3<\|>unknown | 2 |
+| /src/a.js<\|>lib2<\|>1.0.0 | 1 |
+| /src/b.js<\|>lib2<\|>1.0.0 | 1 |
+| /src/sub/c.js<\|>lib1<\|>1.0.2 | 1 |
+| /src/sub/subsub/d.js<\|>lib1<\|>1.0.3 | 1 |
diff --git a/javascript/ql/test/query-tests/NodeJS/CyclicImport/CyclicImport.expected b/javascript/ql/test/query-tests/NodeJS/CyclicImport/CyclicImport.expected
index c19bb2303441..2fb5f863389e 100644
--- a/javascript/ql/test/query-tests/NodeJS/CyclicImport/CyclicImport.expected
+++ b/javascript/ql/test/query-tests/NodeJS/CyclicImport/CyclicImport.expected
@@ -1,7 +1,7 @@
 | a.js:4:9:4:25 | require('./b.js') | Module a imports module b, which in turn $@ it. | b.js:4:9:4:25 | require('./a.js') | imports |
 | b.js:4:9:4:25 | require('./a.js') | Module b imports module a, which in turn $@ it. | a.js:4:9:4:25 | require('./b.js') | imports |
 | selfimport.js:1:1:1:23 | require ... mport') | Module selfimport directly imports itself. | selfimport.js:1:1:1:24 | <toplevel> |  |
-| test1/a.js:1:1:1:27 | require ... ner/a') | Module .../test1/a.js imports module .../inner/a.js, which in turn $@ it. | test2/inner/a.js:1:1:1:24 | require ... st1/a') | imports |
+| test1/a.js:1:1:1:27 | require ... ner/a') | Module /test1/a.js imports module .../inner/a.js, which in turn $@ it. | test2/inner/a.js:1:1:1:24 | require ... st1/a') | imports |
 | test1/a.js:2:1:2:14 | require('./b') | Module a imports module b, which in turn $@ it. | test1/b.js:1:1:1:27 | require ... ner/a') | indirectly imports |
 | test1/b.js:1:1:1:27 | require ... ner/a') | Module b imports module a, which in turn $@ it. | test2/inner/a.js:1:1:1:24 | require ... st1/a') | indirectly imports |
-| test2/inner/a.js:1:1:1:24 | require ... st1/a') | Module .../inner/a.js imports module .../test1/a.js, which in turn $@ it. | test1/a.js:1:1:1:27 | require ... ner/a') | imports |
+| test2/inner/a.js:1:1:1:24 | require ... st1/a') | Module .../inner/a.js imports module /test1/a.js, which in turn $@ it. | test1/a.js:1:1:1:27 | require ... ner/a') | imports |
diff --git a/javascript/ql/test/query-tests/Security/CWE-200/PrivateFileExposure.expected b/javascript/ql/test/query-tests/Security/CWE-200/PrivateFileExposure.expected
index 3cf199ce3714..39a5a884af13 100644
--- a/javascript/ql/test/query-tests/Security/CWE-200/PrivateFileExposure.expected
+++ b/javascript/ql/test/query-tests/Security/CWE-200/PrivateFileExposure.expected
@@ -1,6 +1,6 @@
-| lib/tst.js:7:1:7:45 | app.use ... rname)) | Serves the folder query-tests/Security/CWE-200/lib, which can contain private information. |
-| lib/tst.js:9:1:9:43 | app.use ... otDir)) | Serves the folder query-tests/Security/CWE-200/lib, which can contain private information. |
-| lib/tst.js:11:1:11:52 | app.use ... + '/')) | Serves the folder query-tests/Security/CWE-200/lib, which can contain private information. |
+| lib/tst.js:7:1:7:45 | app.use ... rname)) | Serves the folder lib, which can contain private information. |
+| lib/tst.js:9:1:9:43 | app.use ... otDir)) | Serves the folder lib, which can contain private information. |
+| lib/tst.js:11:1:11:52 | app.use ... + '/')) | Serves the folder lib, which can contain private information. |
 | private-file-exposure.js:8:1:8:49 | app.use ... ular')) | Serves the folder "./node_modules/angular", which can contain private information. |
 | private-file-exposure.js:9:1:9:59 | app.use ... ular')) | Serves the folder "node_modules/angular", which can contain private information. |
 | private-file-exposure.js:10:1:10:67 | app.use ... mate')) | Serves the folder "node_modules/angular-animate", which can contain private information. |
@@ -20,4 +20,4 @@
 | private-file-exposure.js:43:1:43:46 | app.use ... )("/")) | Serves the root folder, which can contain private information. |
 | private-file-exposure.js:51:5:51:88 | app.use ... les'))) | Serves the folder "../node_modules", which can contain private information. |
 | private-file-exposure.js:70:5:70:71 | serveHa ... ular"}) | Serves the folder "./node_modules/angular", which can contain private information. |
-| subfolder/private-file-exposure-2.js:6:1:6:34 | app.use ... rname)) | Serves the folder query-tests/Security/CWE-200/subfolder, which can contain private information. |
+| subfolder/private-file-exposure-2.js:6:1:6:34 | app.use ... rname)) | Serves the folder subfolder, which can contain private information. |
diff --git a/javascript/ql/test/tutorials/Introducing the JavaScript libraries/tests.expected b/javascript/ql/test/tutorials/Introducing the JavaScript libraries/tests.expected
index d9f7f8005021..bd22abd7c823 100644
--- a/javascript/ql/test/tutorials/Introducing the JavaScript libraries/tests.expected	
+++ b/javascript/ql/test/tutorials/Introducing the JavaScript libraries/tests.expected	
@@ -1,7 +1,5 @@
 test_query1
-|  | 0 |
-| tutorials | 0 |
-| tutorials/Introducing the JavaScript libraries | 2 |
+|  | 2 |
 test_query3
 | tst.js:27:1:27:4 | <!-- | Do not use HTML comments. |
 test_query4

From c064a9e092d6eceed41ab390c689e47cada67b31 Mon Sep 17 00:00:00 2001
From: yoff <lerchedahl@gmail.com>
Date: Fri, 4 Oct 2024 14:01:18 +0200
Subject: [PATCH 167/347] Update
 python/ql/lib/semmle/python/frameworks/Stdlib.qll

Co-authored-by: Rasmus Wriedt Larsen <rasmuswriedtlarsen@gmail.com>
---
 python/ql/lib/semmle/python/frameworks/Stdlib.qll | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/python/ql/lib/semmle/python/frameworks/Stdlib.qll b/python/ql/lib/semmle/python/frameworks/Stdlib.qll
index 038b3f851932..bd5cc99df995 100644
--- a/python/ql/lib/semmle/python/frameworks/Stdlib.qll
+++ b/python/ql/lib/semmle/python/frameworks/Stdlib.qll
@@ -4239,7 +4239,7 @@ module StdlibPrivate {
       )
       or
       // Imprecise content in any argument ends up on the container itself.
-      input = "Argument[0..]" and
+      input = "Argument[0]" and
       output = "ReturnValue" and
       preservesValue = false
     }

From 201c4aad13c529884bdeb3bef7d89e6968055b44 Mon Sep 17 00:00:00 2001
From: Rasmus Lerchedahl Petersen <yoff@github.com>
Date: Fri, 4 Oct 2024 14:09:33 +0200
Subject: [PATCH 168/347] Python: add comment

---
 .../semmle/python/dataflow/new/internal/DataFlowDispatch.qll   | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/python/ql/lib/semmle/python/dataflow/new/internal/DataFlowDispatch.qll b/python/ql/lib/semmle/python/dataflow/new/internal/DataFlowDispatch.qll
index 88a6ed903146..5e987eadc275 100644
--- a/python/ql/lib/semmle/python/dataflow/new/internal/DataFlowDispatch.qll
+++ b/python/ql/lib/semmle/python/dataflow/new/internal/DataFlowDispatch.qll
@@ -368,6 +368,9 @@ abstract class DataFlowFunction extends DataFlowCallable, TFunction {
   int positionalOffset() { result = 0 }
 
   override ParameterNode getParameter(ParameterPosition ppos) {
+    // Do not handle lower bound positions (such as `[1..]`) here
+    // they are handled by parameter matching and would create
+    // inconsistencies here as multiple parameters could match such a position.
     exists(int index | ppos.isPositional(index) |
       result.getParameter() = func.getArg(index + this.positionalOffset())
     )

From 977767b0d609d9c9caffbe332ff9ca5c3ee3dd40 Mon Sep 17 00:00:00 2001
From: Rasmus Lerchedahl Petersen <yoff@github.com>
Date: Fri, 4 Oct 2024 14:14:30 +0200
Subject: [PATCH 169/347] Python: comment around dictionary comprehensions

---
 .../lib/semmle/python/dataflow/new/internal/DataFlowPrivate.qll | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/python/ql/lib/semmle/python/dataflow/new/internal/DataFlowPrivate.qll b/python/ql/lib/semmle/python/dataflow/new/internal/DataFlowPrivate.qll
index 3d2329f0ad98..b29be706c4fc 100644
--- a/python/ql/lib/semmle/python/dataflow/new/internal/DataFlowPrivate.qll
+++ b/python/ql/lib/semmle/python/dataflow/new/internal/DataFlowPrivate.qll
@@ -182,6 +182,8 @@ predicate yieldStoreStep(Node nodeFrom, Content c, Node nodeTo) {
   exists(Yield yield |
     nodeTo.asCfgNode() = yield.getAFlowNode() and
     nodeFrom.asCfgNode() = yield.getValue().getAFlowNode() and
+    // TODO: Consider if this will also need to transfer dictionary content
+    // once dictionary comprehensions are supported.
     c instanceof ListElementContent
   )
 }

From 50c2d108caf5b27a29c6965a22273bafc4bc2c93 Mon Sep 17 00:00:00 2001
From: Tom Hvitved <hvitved@github.com>
Date: Fri, 4 Oct 2024 14:48:07 +0200
Subject: [PATCH 170/347] Rust: Fix `CompoundAssignmentExpr` charpred

---
 rust/ql/lib/codeql/rust/elements/AssignmentOperation.qll | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/rust/ql/lib/codeql/rust/elements/AssignmentOperation.qll b/rust/ql/lib/codeql/rust/elements/AssignmentOperation.qll
index be7b2c82cf47..368e5738c191 100644
--- a/rust/ql/lib/codeql/rust/elements/AssignmentOperation.qll
+++ b/rust/ql/lib/codeql/rust/elements/AssignmentOperation.qll
@@ -38,7 +38,9 @@ final class AssignmentExpr extends AssignmentOperationImpl {
 final class CompoundAssignmentExpr extends AssignmentOperationImpl {
   private string operator;
 
-  CompoundAssignmentExpr() { this.getOperatorName().regexpCapture("(.)=", 1) = operator }
+  CompoundAssignmentExpr() {
+    this.getOperatorName().regexpCapture("(\\+|-|\\*|/|%|&|\\||\\^|<<|>>)=", 1) = operator
+  }
 
   /**
    * Gets the operator of this compound assignment expression.

From 6f5b949ec86f1eec423171802b995eac27c6553b Mon Sep 17 00:00:00 2001
From: Rasmus Lerchedahl Petersen <yoff@github.com>
Date: Fri, 4 Oct 2024 15:30:02 +0200
Subject: [PATCH 171/347] Python: adjust test expectations note that we do
 retain precision in `test_dict_from_keyword()`

---
 python/ql/lib/semmle/python/frameworks/Stdlib.qll           | 2 +-
 .../test/library-tests/dataflow/coverage/test_builtins.py   | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/python/ql/lib/semmle/python/frameworks/Stdlib.qll b/python/ql/lib/semmle/python/frameworks/Stdlib.qll
index 6781d2385caa..c7179dbd46c0 100644
--- a/python/ql/lib/semmle/python/frameworks/Stdlib.qll
+++ b/python/ql/lib/semmle/python/frameworks/Stdlib.qll
@@ -4271,7 +4271,7 @@ module StdlibPrivate {
         preservesValue = true
       )
       or
-      // Imprecise content in any argument ends up on the container itself.
+      // Imprecise content in the first argument ends up on the container itself.
       input = "Argument[0]" and
       output = "ReturnValue" and
       preservesValue = false
diff --git a/python/ql/test/library-tests/dataflow/coverage/test_builtins.py b/python/ql/test/library-tests/dataflow/coverage/test_builtins.py
index 36523aeaeea3..3195e9b5f6d4 100644
--- a/python/ql/test/library-tests/dataflow/coverage/test_builtins.py
+++ b/python/ql/test/library-tests/dataflow/coverage/test_builtins.py
@@ -145,10 +145,10 @@ def test_dict_from_dict():
 @expects(4)
 def test_dict_from_multiple_args():
     d = dict([("k", SOURCE), ("k1", NONSOURCE)], k2 = SOURCE, k3 = NONSOURCE)
-    SINK(d["k"]) #$ MISSING: flow="SOURCE, l:-1 -> d['k']"
-    SINK_F(d["k1"])
+    SINK(d["k"]) #$ flow="SOURCE, l:-1 -> d['k']"
+    SINK_F(d["k1"]) #$ SPURIOUS: flow="SOURCE, l:-2 -> d['k1']" // due to imprecise list content
     SINK(d["k2"]) #$ flow="SOURCE, l:-3 -> d['k2']"
-    SINK_F(d["k3"])
+    SINK_F(d["k3"]) #$ SPURIOUS: flow="SOURCE, l:-4 -> d['k3']" // due to imprecise list content
 
 ## Container methods
 

From b8eb2ab10077af3cb2041940ee4ef8cdc59f4da9 Mon Sep 17 00:00:00 2001
From: Jeroen Ketema <jketema@github.com>
Date: Fri, 4 Oct 2024 15:37:22 +0200
Subject: [PATCH 172/347] C++: Add some documentation on the printed IR

---
 .../ir/implementation/aliased_ssa/PrintIR.qll | 106 ++++++++++++++++++
 .../cpp/ir/implementation/raw/PrintIR.qll     | 106 ++++++++++++++++++
 .../implementation/unaliased_ssa/PrintIR.qll  | 106 ++++++++++++++++++
 3 files changed, 318 insertions(+)

diff --git a/cpp/ql/lib/semmle/code/cpp/ir/implementation/aliased_ssa/PrintIR.qll b/cpp/ql/lib/semmle/code/cpp/ir/implementation/aliased_ssa/PrintIR.qll
index c4b18d9cb61c..5e634a7c3225 100644
--- a/cpp/ql/lib/semmle/code/cpp/ir/implementation/aliased_ssa/PrintIR.qll
+++ b/cpp/ql/lib/semmle/code/cpp/ir/implementation/aliased_ssa/PrintIR.qll
@@ -6,6 +6,112 @@
  * uses, however, it is better to write a query that imports `PrintIR.qll`, extends
  * `PrintIRConfiguration`, and overrides `shouldPrintDeclaration()` to select a subset of declarations
  * to dump.
+ *
+ * Anatomy of a printed IR instruction
+ *
+ * An instruction:
+ *
+ * ```
+ * # 2281|     v2281_19(void) = Call[~String]     : func:r2281_18, this:r2281_17
+ * ```
+ *
+ * The prefix `# 2281|` specifies that this instruction was generated by the C++ source code on line 2281.
+ * Scrolling up in the printed output, one will eventually find the name of the file to which the line
+ * belongs.
+ *
+ * `v2281_19(void)` is the result of the instruction. Here, `v` means this is a void result or operand (so
+ * there should be no later uses of the result; see below for other possible values). The `2281_19` is a
+ * unique ID for the result. This is usually just the line number plus a small integer suffix to make it
+ * unique within the function. The type of the result is `void`. In this case, it is `void`, because
+ * `~String` returns `void`. The type of the result is usually just the name of the appropriate C++ type,
+ * but it will sometimes be a type like `glval<int>`, which means result holds a glvalue, which at the
+ * IR level works like a pointer. In other words, in the source code the type was `int`, but it is really
+ * more like an `int*`. We see this, for example, in `x = y;`, where `x` is a glvalue.
+ *
+ * `Call` is the opcode of the instruction. Common opcodes include:
+ *
+ * * Arithmetic operations: `Add`, `Sub`, `Mul`, etc.
+ * * Memory access operations: `Load`, `Store`.
+ * * Function calls: `Call`.
+ * * Literals: `Constant`.
+ * * Variable addresses: `VariableAddress`.
+ * * Function entry points: `EnterFunction`.
+ * * Return form a function: `Return`, `ReturnVoid`. Note that the value being returned is set separately by a
+ *   `Store` to a special `#return` variable.
+ * * Stack unwinding for C++ function that throw and where the exception escapes the function: `Unwind`.
+ * * Common exit point for `Unwind` and `Return`: `ExitFunction`.
+ * * SSA-related opcodes: `Phi`, `Chi`.
+ *
+ * `[~String]` denotes additional information. The information might be present earlier in the IR, as is the case
+ * for `Call`, where it is the name of the called function. This is also the case for `Load` and `Store`, where it
+ * is the name of the variable that loaded or stored (if known). In the case of `Constant`, `FieldAddress`, and
+ * `VariableAddress`, the information between brackets does not occur earlier.
+ *
+ * `func:r2281_18` and `this:r28281_17` are the operands of the instruction. The `func:` prefix denotes the operand
+ * that holds the address of the called function. The `this:` prefix denotes the argument to the special `this`
+ * parameter of an instance member function. `r2281_18`, `r2281_17` are the unique IDs of the operands. Each of these
+ * matches the ID of a previously seen result, showing where that value came from. The `r` means that these are
+ * "register" operands (see below).
+ *
+ * Result and operand kinds:
+ *
+ * Every result and operand is one of these three kinds:
+ *
+ * * `r` "register". These operands are not stored in any particular memory location. We can think of them as
+ *   temporary values created during the evaluation of an expression. A register operand almost always has one
+ *   use, often in the same block as its definition.
+ * *  `m` "memory". These operands represents accesses to a specific memory location. The location could be a
+ *    local variable, a global variable, a field of an object, an element of an array, or any memory that we happen
+ *    to have a pointer to. These only occur as the result of a `Store`, the source operand of a `Load` or on the
+ *    SSA instructions (`Phi`, `Chi`).
+ * * `v` "void". Really just a register operand, but we mark register operands of type void with this special prefix
+ *   so we know that there is no actual value there.
+ *
+ * Branches in the IR:
+ *
+ * The IR is divided into basic blocks. At the end of each block, there are one or more edges showing the possible
+ * control flow successors of the block.
+ *
+ * ```
+ * #   44|     v44_3(void)    = ConditionalBranch : r44_2
+ * #-----|   False -> Block 4
+ * #-----|   True -> Block 3
+ * ```
+ * Here we have a block that ends with a conditional branch. The two edges show where the control flows to depending
+ * on whether the condition is true or false.
+ *
+ * SSA instructions:
+ *
+ * We use `Phi` instructions in SSA to create a single definition for a variable that might be assigned on multiple
+ * control flow paths. The `Phi` instruction merges the potential values of that variable from each predecessor edge,
+ * and the resulting definition is then used wherever that variable is accessed later on.
+ *
+ * When dealing with aliased memory, we use the `Chi` instruction to create a single definition for memory that might
+ * or might not have been updated by a store, depending on the actual address that was written to. For example, take:
+ *
+ * ```cpp
+ * int x = 5;
+ * int y = 7;
+ * int* p = condition ? &x : &y;
+ * p = 6;
+ * return x;
+ * ```
+ *
+ * At the point where we store to `*p`, we do not know whether `p` points to `x` or `y`. Thus, we do not know whether
+ * `return x;` is going to return the value that `x` was originally initialized to (5), or whether it will return 6,
+ *  because it was overwritten by `*p = 6;`. We insert a `Chi` instruction immediately after the store to `*p`:
+ *
+ * ```
+ * r2(int)     = Constant[6]
+ * r3(int*)    = <<value of p>>
+ * m4(int)     = Store           : &r3, r2  // Stores the constant 6 to *p
+ * m5(unknown) = Chi             : total:m1, partial:m4
+ * ```
+ * The `partial:` operand represents the memory that was just stored. The `total:` operand represents the previous
+ * contents of all of the memory that `p` might have pointed to (in this case, both `x` and `y`). The result of the
+ * `Chi` represents the new contents of whatever memory the `total:` operand referred to. We usually do not know exactly
+ * which parts of that memory were overwritten, but it does model that any of that memory could have been modified, so
+ * that later instructions do not assume that the memory was unchanged.
  */
 
 private import internal.IRInternal
diff --git a/cpp/ql/lib/semmle/code/cpp/ir/implementation/raw/PrintIR.qll b/cpp/ql/lib/semmle/code/cpp/ir/implementation/raw/PrintIR.qll
index c4b18d9cb61c..5e634a7c3225 100644
--- a/cpp/ql/lib/semmle/code/cpp/ir/implementation/raw/PrintIR.qll
+++ b/cpp/ql/lib/semmle/code/cpp/ir/implementation/raw/PrintIR.qll
@@ -6,6 +6,112 @@
  * uses, however, it is better to write a query that imports `PrintIR.qll`, extends
  * `PrintIRConfiguration`, and overrides `shouldPrintDeclaration()` to select a subset of declarations
  * to dump.
+ *
+ * Anatomy of a printed IR instruction
+ *
+ * An instruction:
+ *
+ * ```
+ * # 2281|     v2281_19(void) = Call[~String]     : func:r2281_18, this:r2281_17
+ * ```
+ *
+ * The prefix `# 2281|` specifies that this instruction was generated by the C++ source code on line 2281.
+ * Scrolling up in the printed output, one will eventually find the name of the file to which the line
+ * belongs.
+ *
+ * `v2281_19(void)` is the result of the instruction. Here, `v` means this is a void result or operand (so
+ * there should be no later uses of the result; see below for other possible values). The `2281_19` is a
+ * unique ID for the result. This is usually just the line number plus a small integer suffix to make it
+ * unique within the function. The type of the result is `void`. In this case, it is `void`, because
+ * `~String` returns `void`. The type of the result is usually just the name of the appropriate C++ type,
+ * but it will sometimes be a type like `glval<int>`, which means result holds a glvalue, which at the
+ * IR level works like a pointer. In other words, in the source code the type was `int`, but it is really
+ * more like an `int*`. We see this, for example, in `x = y;`, where `x` is a glvalue.
+ *
+ * `Call` is the opcode of the instruction. Common opcodes include:
+ *
+ * * Arithmetic operations: `Add`, `Sub`, `Mul`, etc.
+ * * Memory access operations: `Load`, `Store`.
+ * * Function calls: `Call`.
+ * * Literals: `Constant`.
+ * * Variable addresses: `VariableAddress`.
+ * * Function entry points: `EnterFunction`.
+ * * Return form a function: `Return`, `ReturnVoid`. Note that the value being returned is set separately by a
+ *   `Store` to a special `#return` variable.
+ * * Stack unwinding for C++ function that throw and where the exception escapes the function: `Unwind`.
+ * * Common exit point for `Unwind` and `Return`: `ExitFunction`.
+ * * SSA-related opcodes: `Phi`, `Chi`.
+ *
+ * `[~String]` denotes additional information. The information might be present earlier in the IR, as is the case
+ * for `Call`, where it is the name of the called function. This is also the case for `Load` and `Store`, where it
+ * is the name of the variable that loaded or stored (if known). In the case of `Constant`, `FieldAddress`, and
+ * `VariableAddress`, the information between brackets does not occur earlier.
+ *
+ * `func:r2281_18` and `this:r28281_17` are the operands of the instruction. The `func:` prefix denotes the operand
+ * that holds the address of the called function. The `this:` prefix denotes the argument to the special `this`
+ * parameter of an instance member function. `r2281_18`, `r2281_17` are the unique IDs of the operands. Each of these
+ * matches the ID of a previously seen result, showing where that value came from. The `r` means that these are
+ * "register" operands (see below).
+ *
+ * Result and operand kinds:
+ *
+ * Every result and operand is one of these three kinds:
+ *
+ * * `r` "register". These operands are not stored in any particular memory location. We can think of them as
+ *   temporary values created during the evaluation of an expression. A register operand almost always has one
+ *   use, often in the same block as its definition.
+ * *  `m` "memory". These operands represents accesses to a specific memory location. The location could be a
+ *    local variable, a global variable, a field of an object, an element of an array, or any memory that we happen
+ *    to have a pointer to. These only occur as the result of a `Store`, the source operand of a `Load` or on the
+ *    SSA instructions (`Phi`, `Chi`).
+ * * `v` "void". Really just a register operand, but we mark register operands of type void with this special prefix
+ *   so we know that there is no actual value there.
+ *
+ * Branches in the IR:
+ *
+ * The IR is divided into basic blocks. At the end of each block, there are one or more edges showing the possible
+ * control flow successors of the block.
+ *
+ * ```
+ * #   44|     v44_3(void)    = ConditionalBranch : r44_2
+ * #-----|   False -> Block 4
+ * #-----|   True -> Block 3
+ * ```
+ * Here we have a block that ends with a conditional branch. The two edges show where the control flows to depending
+ * on whether the condition is true or false.
+ *
+ * SSA instructions:
+ *
+ * We use `Phi` instructions in SSA to create a single definition for a variable that might be assigned on multiple
+ * control flow paths. The `Phi` instruction merges the potential values of that variable from each predecessor edge,
+ * and the resulting definition is then used wherever that variable is accessed later on.
+ *
+ * When dealing with aliased memory, we use the `Chi` instruction to create a single definition for memory that might
+ * or might not have been updated by a store, depending on the actual address that was written to. For example, take:
+ *
+ * ```cpp
+ * int x = 5;
+ * int y = 7;
+ * int* p = condition ? &x : &y;
+ * p = 6;
+ * return x;
+ * ```
+ *
+ * At the point where we store to `*p`, we do not know whether `p` points to `x` or `y`. Thus, we do not know whether
+ * `return x;` is going to return the value that `x` was originally initialized to (5), or whether it will return 6,
+ *  because it was overwritten by `*p = 6;`. We insert a `Chi` instruction immediately after the store to `*p`:
+ *
+ * ```
+ * r2(int)     = Constant[6]
+ * r3(int*)    = <<value of p>>
+ * m4(int)     = Store           : &r3, r2  // Stores the constant 6 to *p
+ * m5(unknown) = Chi             : total:m1, partial:m4
+ * ```
+ * The `partial:` operand represents the memory that was just stored. The `total:` operand represents the previous
+ * contents of all of the memory that `p` might have pointed to (in this case, both `x` and `y`). The result of the
+ * `Chi` represents the new contents of whatever memory the `total:` operand referred to. We usually do not know exactly
+ * which parts of that memory were overwritten, but it does model that any of that memory could have been modified, so
+ * that later instructions do not assume that the memory was unchanged.
  */
 
 private import internal.IRInternal
diff --git a/cpp/ql/lib/semmle/code/cpp/ir/implementation/unaliased_ssa/PrintIR.qll b/cpp/ql/lib/semmle/code/cpp/ir/implementation/unaliased_ssa/PrintIR.qll
index c4b18d9cb61c..5e634a7c3225 100644
--- a/cpp/ql/lib/semmle/code/cpp/ir/implementation/unaliased_ssa/PrintIR.qll
+++ b/cpp/ql/lib/semmle/code/cpp/ir/implementation/unaliased_ssa/PrintIR.qll
@@ -6,6 +6,112 @@
  * uses, however, it is better to write a query that imports `PrintIR.qll`, extends
  * `PrintIRConfiguration`, and overrides `shouldPrintDeclaration()` to select a subset of declarations
  * to dump.
+ *
+ * Anatomy of a printed IR instruction
+ *
+ * An instruction:
+ *
+ * ```
+ * # 2281|     v2281_19(void) = Call[~String]     : func:r2281_18, this:r2281_17
+ * ```
+ *
+ * The prefix `# 2281|` specifies that this instruction was generated by the C++ source code on line 2281.
+ * Scrolling up in the printed output, one will eventually find the name of the file to which the line
+ * belongs.
+ *
+ * `v2281_19(void)` is the result of the instruction. Here, `v` means this is a void result or operand (so
+ * there should be no later uses of the result; see below for other possible values). The `2281_19` is a
+ * unique ID for the result. This is usually just the line number plus a small integer suffix to make it
+ * unique within the function. The type of the result is `void`. In this case, it is `void`, because
+ * `~String` returns `void`. The type of the result is usually just the name of the appropriate C++ type,
+ * but it will sometimes be a type like `glval<int>`, which means result holds a glvalue, which at the
+ * IR level works like a pointer. In other words, in the source code the type was `int`, but it is really
+ * more like an `int*`. We see this, for example, in `x = y;`, where `x` is a glvalue.
+ *
+ * `Call` is the opcode of the instruction. Common opcodes include:
+ *
+ * * Arithmetic operations: `Add`, `Sub`, `Mul`, etc.
+ * * Memory access operations: `Load`, `Store`.
+ * * Function calls: `Call`.
+ * * Literals: `Constant`.
+ * * Variable addresses: `VariableAddress`.
+ * * Function entry points: `EnterFunction`.
+ * * Return form a function: `Return`, `ReturnVoid`. Note that the value being returned is set separately by a
+ *   `Store` to a special `#return` variable.
+ * * Stack unwinding for C++ function that throw and where the exception escapes the function: `Unwind`.
+ * * Common exit point for `Unwind` and `Return`: `ExitFunction`.
+ * * SSA-related opcodes: `Phi`, `Chi`.
+ *
+ * `[~String]` denotes additional information. The information might be present earlier in the IR, as is the case
+ * for `Call`, where it is the name of the called function. This is also the case for `Load` and `Store`, where it
+ * is the name of the variable that loaded or stored (if known). In the case of `Constant`, `FieldAddress`, and
+ * `VariableAddress`, the information between brackets does not occur earlier.
+ *
+ * `func:r2281_18` and `this:r28281_17` are the operands of the instruction. The `func:` prefix denotes the operand
+ * that holds the address of the called function. The `this:` prefix denotes the argument to the special `this`
+ * parameter of an instance member function. `r2281_18`, `r2281_17` are the unique IDs of the operands. Each of these
+ * matches the ID of a previously seen result, showing where that value came from. The `r` means that these are
+ * "register" operands (see below).
+ *
+ * Result and operand kinds:
+ *
+ * Every result and operand is one of these three kinds:
+ *
+ * * `r` "register". These operands are not stored in any particular memory location. We can think of them as
+ *   temporary values created during the evaluation of an expression. A register operand almost always has one
+ *   use, often in the same block as its definition.
+ * *  `m` "memory". These operands represents accesses to a specific memory location. The location could be a
+ *    local variable, a global variable, a field of an object, an element of an array, or any memory that we happen
+ *    to have a pointer to. These only occur as the result of a `Store`, the source operand of a `Load` or on the
+ *    SSA instructions (`Phi`, `Chi`).
+ * * `v` "void". Really just a register operand, but we mark register operands of type void with this special prefix
+ *   so we know that there is no actual value there.
+ *
+ * Branches in the IR:
+ *
+ * The IR is divided into basic blocks. At the end of each block, there are one or more edges showing the possible
+ * control flow successors of the block.
+ *
+ * ```
+ * #   44|     v44_3(void)    = ConditionalBranch : r44_2
+ * #-----|   False -> Block 4
+ * #-----|   True -> Block 3
+ * ```
+ * Here we have a block that ends with a conditional branch. The two edges show where the control flows to depending
+ * on whether the condition is true or false.
+ *
+ * SSA instructions:
+ *
+ * We use `Phi` instructions in SSA to create a single definition for a variable that might be assigned on multiple
+ * control flow paths. The `Phi` instruction merges the potential values of that variable from each predecessor edge,
+ * and the resulting definition is then used wherever that variable is accessed later on.
+ *
+ * When dealing with aliased memory, we use the `Chi` instruction to create a single definition for memory that might
+ * or might not have been updated by a store, depending on the actual address that was written to. For example, take:
+ *
+ * ```cpp
+ * int x = 5;
+ * int y = 7;
+ * int* p = condition ? &x : &y;
+ * p = 6;
+ * return x;
+ * ```
+ *
+ * At the point where we store to `*p`, we do not know whether `p` points to `x` or `y`. Thus, we do not know whether
+ * `return x;` is going to return the value that `x` was originally initialized to (5), or whether it will return 6,
+ *  because it was overwritten by `*p = 6;`. We insert a `Chi` instruction immediately after the store to `*p`:
+ *
+ * ```
+ * r2(int)     = Constant[6]
+ * r3(int*)    = <<value of p>>
+ * m4(int)     = Store           : &r3, r2  // Stores the constant 6 to *p
+ * m5(unknown) = Chi             : total:m1, partial:m4
+ * ```
+ * The `partial:` operand represents the memory that was just stored. The `total:` operand represents the previous
+ * contents of all of the memory that `p` might have pointed to (in this case, both `x` and `y`). The result of the
+ * `Chi` represents the new contents of whatever memory the `total:` operand referred to. We usually do not know exactly
+ * which parts of that memory were overwritten, but it does model that any of that memory could have been modified, so
+ * that later instructions do not assume that the memory was unchanged.
  */
 
 private import internal.IRInternal

From d24bdbb4e4a636be60f53011b6571a1946e66775 Mon Sep 17 00:00:00 2001
From: Ian Lynagh <igfoo@github.com>
Date: Fri, 4 Oct 2024 17:34:39 +0100
Subject: [PATCH 173/347] Java: Typo in a comment

---
 java/ql/lib/semmle/code/java/Exception.qll | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/java/ql/lib/semmle/code/java/Exception.qll b/java/ql/lib/semmle/code/java/Exception.qll
index c2c8e5682817..0b92975a580d 100644
--- a/java/ql/lib/semmle/code/java/Exception.qll
+++ b/java/ql/lib/semmle/code/java/Exception.qll
@@ -7,7 +7,7 @@ import Type
 
 /**
  * An Exception represents an element listed in the `throws` clause
- * of a method of constructor.
+ * of a method or constructor.
  *
  * For example, `E` is an exception thrown by method `m` in
  * `void m() throws E;`, whereas `T` is an exception _type_ in

From f1afa2bf5956671770c3c1346cb83a8ed8fc2d56 Mon Sep 17 00:00:00 2001
From: Tom Hvitved <hvitved@github.com>
Date: Mon, 7 Oct 2024 09:16:12 +0200
Subject: [PATCH 174/347] Ruby: Fix expected test output

---
 ruby/ql/test/library-tests/frameworks/sinatra/Sinatra.expected | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ruby/ql/test/library-tests/frameworks/sinatra/Sinatra.expected b/ruby/ql/test/library-tests/frameworks/sinatra/Sinatra.expected
index 71adfaf8478a..e8d50ed8ba30 100644
--- a/ruby/ql/test/library-tests/frameworks/sinatra/Sinatra.expected
+++ b/ruby/ql/test/library-tests/frameworks/sinatra/Sinatra.expected
@@ -32,7 +32,7 @@ params
 erbCalls
 | app.rb:76:5:76:36 | call to erb | views/index.erb:0:0:0:0 | views/index.erb |
 erbSyntheticGlobals
-| SinatraErbLocalsHash(library-tests/frameworks/sinatra/views/index.erb,library-tests/frameworks/sinatra/app.rb@76:5:76:36) | views/index.erb:0:0:0:0 | views/index.erb |
+| SinatraErbLocalsHash(views/index.erb,app.rb@76:5:76:36) | views/index.erb:0:0:0:0 | views/index.erb |
 filters
 | app.rb:84:3:87:5 | call to before | before |
 | app.rb:98:3:100:5 | call to after | after |

From 16feaf15e23a1bdca602f77b4c68940c1b0366e0 Mon Sep 17 00:00:00 2001
From: Tom Hvitved <hvitved@github.com>
Date: Mon, 7 Oct 2024 09:22:39 +0200
Subject: [PATCH 175/347] Go: Update expected test output

---
 .../test/library-tests/semmle/go/PrintAst/PrintAst.expected | 6 +++---
 .../semmle/go/PrintAst/PrintAstExcludeComments.expected     | 6 +++---
 .../semmle/go/PrintAst/PrintAstNestedFunction.expected      | 6 +++---
 .../semmle/go/PrintAst/PrintAstRestrictFile.expected        | 2 +-
 .../semmle/go/PrintAst/PrintAstRestrictFunction.expected    | 6 +++---
 .../test/query-tests/Diagnostics/ExtractionErrors.expected  | 4 ++--
 .../Diagnostics/SuccessfullyExtractedFiles.expected         | 1 -
 7 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/go/ql/test/library-tests/semmle/go/PrintAst/PrintAst.expected b/go/ql/test/library-tests/semmle/go/PrintAst/PrintAst.expected
index eb792c7028ed..41815e473a03 100644
--- a/go/ql/test/library-tests/semmle/go/PrintAst/PrintAst.expected
+++ b/go/ql/test/library-tests/semmle/go/PrintAst/PrintAst.expected
@@ -1,9 +1,9 @@
 go.mod:
-#    0| [GoModFile] library-tests/semmle/go/PrintAst/go.mod
+#    0| [GoModFile] go.mod
 #    1|   0: [GoModModuleLine] go.mod module line
 #    3|   1: [GoModGoLine] go.mod go line
 input.go:
-#    0| [GoFile] library-tests/semmle/go/PrintAst/input.go
+#    0| [GoFile] input.go
 #    1|   package: [Ident] main
 #    5|   1: [CommentGroup] comment group
 #    5|     0: [SlashSlashComment] comment
@@ -597,7 +597,7 @@ input.go:
 #  145|             Type = []int
 #  145|         1: [BlockStmt] block statement
 other.go:
-#    0| [GoFile] library-tests/semmle/go/PrintAst/other.go
+#    0| [GoFile] other.go
 #    1|   package: [Ident] main
 #    3|   1: [FuncDecl] function declaration
 #    3|     0: [FunctionName, Ident] main
diff --git a/go/ql/test/library-tests/semmle/go/PrintAst/PrintAstExcludeComments.expected b/go/ql/test/library-tests/semmle/go/PrintAst/PrintAstExcludeComments.expected
index e0777268f048..570ce08f2394 100644
--- a/go/ql/test/library-tests/semmle/go/PrintAst/PrintAstExcludeComments.expected
+++ b/go/ql/test/library-tests/semmle/go/PrintAst/PrintAstExcludeComments.expected
@@ -1,9 +1,9 @@
 go.mod:
-#    0| [GoModFile] library-tests/semmle/go/PrintAst/go.mod
+#    0| [GoModFile] go.mod
 #    1|   0: [GoModModuleLine] go.mod module line
 #    3|   1: [GoModGoLine] go.mod go line
 input.go:
-#    0| [GoFile] library-tests/semmle/go/PrintAst/input.go
+#    0| [GoFile] input.go
 #    1|   package: [Ident] main
 #    3|   1: [ImportDecl] import declaration
 #    3|     0: [ImportSpec] import specifier
@@ -577,7 +577,7 @@ input.go:
 #  145|             Type = []int
 #  145|         1: [BlockStmt] block statement
 other.go:
-#    0| [GoFile] library-tests/semmle/go/PrintAst/other.go
+#    0| [GoFile] other.go
 #    1|   package: [Ident] main
 #    3|   1: [FuncDecl] function declaration
 #    3|     0: [FunctionName, Ident] main
diff --git a/go/ql/test/library-tests/semmle/go/PrintAst/PrintAstNestedFunction.expected b/go/ql/test/library-tests/semmle/go/PrintAst/PrintAstNestedFunction.expected
index 7a04ffd637c6..c8a01b1ba97a 100644
--- a/go/ql/test/library-tests/semmle/go/PrintAst/PrintAstNestedFunction.expected
+++ b/go/ql/test/library-tests/semmle/go/PrintAst/PrintAstNestedFunction.expected
@@ -1,9 +1,9 @@
 go.mod:
-#    0| [GoModFile] library-tests/semmle/go/PrintAst/go.mod
+#    0| [GoModFile] go.mod
 #    1|   0: [GoModModuleLine] go.mod module line
 #    3|   1: [GoModGoLine] go.mod go line
 input.go:
-#    0| [GoFile] library-tests/semmle/go/PrintAst/input.go
+#    0| [GoFile] input.go
 #    1|   package: [Ident] main
 #    5|   1: [CommentGroup] comment group
 #    5|     0: [SlashSlashComment] comment
@@ -29,7 +29,7 @@ input.go:
 #    3|     0: [ImportSpec] import specifier
 #    3|       0: [StringLit] "fmt"
 other.go:
-#    0| [GoFile] library-tests/semmle/go/PrintAst/other.go
+#    0| [GoFile] other.go
 #    1|   package: [Ident] main
 #    8|   1: [FuncDecl] function declaration
 #    8|     0: [FunctionName, Ident] hasNested
diff --git a/go/ql/test/library-tests/semmle/go/PrintAst/PrintAstRestrictFile.expected b/go/ql/test/library-tests/semmle/go/PrintAst/PrintAstRestrictFile.expected
index 3df7749557d5..1981fde0357e 100644
--- a/go/ql/test/library-tests/semmle/go/PrintAst/PrintAstRestrictFile.expected
+++ b/go/ql/test/library-tests/semmle/go/PrintAst/PrintAstRestrictFile.expected
@@ -1,5 +1,5 @@
 other.go:
-#    0| [GoFile] library-tests/semmle/go/PrintAst/other.go
+#    0| [GoFile] other.go
 #    1|   package: [Ident] main
 #    3|   1: [FuncDecl] function declaration
 #    3|     0: [FunctionName, Ident] main
diff --git a/go/ql/test/library-tests/semmle/go/PrintAst/PrintAstRestrictFunction.expected b/go/ql/test/library-tests/semmle/go/PrintAst/PrintAstRestrictFunction.expected
index 85f2335d5b03..5783960cedc2 100644
--- a/go/ql/test/library-tests/semmle/go/PrintAst/PrintAstRestrictFunction.expected
+++ b/go/ql/test/library-tests/semmle/go/PrintAst/PrintAstRestrictFunction.expected
@@ -1,9 +1,9 @@
 go.mod:
-#    0| [GoModFile] library-tests/semmle/go/PrintAst/go.mod
+#    0| [GoModFile] go.mod
 #    1|   0: [GoModModuleLine] go.mod module line
 #    3|   1: [GoModGoLine] go.mod go line
 input.go:
-#    0| [GoFile] library-tests/semmle/go/PrintAst/input.go
+#    0| [GoFile] input.go
 #    1|   package: [Ident] main
 #    5|   1: [CommentGroup] comment group
 #    5|     0: [SlashSlashComment] comment
@@ -29,7 +29,7 @@ input.go:
 #    3|     0: [ImportSpec] import specifier
 #    3|       0: [StringLit] "fmt"
 other.go:
-#    0| [GoFile] library-tests/semmle/go/PrintAst/other.go
+#    0| [GoFile] other.go
 #    1|   package: [Ident] main
 #    6|   1: [FuncDecl] function declaration
 #    6|     0: [FunctionName, Ident] g
diff --git a/go/ql/test/query-tests/Diagnostics/ExtractionErrors.expected b/go/ql/test/query-tests/Diagnostics/ExtractionErrors.expected
index b3a9e8631f08..c5afba4d05dd 100644
--- a/go/ql/test/query-tests/Diagnostics/ExtractionErrors.expected
+++ b/go/ql/test/query-tests/Diagnostics/ExtractionErrors.expected
@@ -1,5 +1,5 @@
-| Extraction failed in query-tests/Diagnostics/badimport.go with error invalid import path (invalid character U+007B '{') | 2 |
-| Extraction failed in query-tests/Diagnostics/type.go with error cannot use v (variable of type V) as T value in argument to takesT | 2 |
+| Extraction failed in badimport.go with error invalid import path (invalid character U+007B '{') | 2 |
+| Extraction failed in type.go with error cannot use v (variable of type V) as T value in argument to takesT | 2 |
 | Extraction failed with error expected ';', found wnvwun | 2 |
 | Extraction failed with error expected 'IDENT', found newline | 2 |
 | Extraction failed with error expected 'package', found avvu | 2 |
diff --git a/go/ql/test/query-tests/Diagnostics/SuccessfullyExtractedFiles.expected b/go/ql/test/query-tests/Diagnostics/SuccessfullyExtractedFiles.expected
index f038c938c6dc..999b4a4eb4f1 100644
--- a/go/ql/test/query-tests/Diagnostics/SuccessfullyExtractedFiles.expected
+++ b/go/ql/test/query-tests/Diagnostics/SuccessfullyExtractedFiles.expected
@@ -1,4 +1,3 @@
-| ../../go.mod:0:0:0:0 | ../../go.mod |  |
 | badimport.go:0:0:0:0 | badimport.go |  |
 | type.go:0:0:0:0 | type.go |  |
 | util.go:0:0:0:0 | util.go |  |

From 6196fd2cc13a31461f11fd52e3c58d8cd10a7c6a Mon Sep 17 00:00:00 2001
From: Tom Hvitved <hvitved@github.com>
Date: Mon, 7 Oct 2024 09:45:08 +0200
Subject: [PATCH 176/347] Swift: Update expected test output

---
 swift/ql/test/query-tests/Diagnostics/Info.expected | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/swift/ql/test/query-tests/Diagnostics/Info.expected b/swift/ql/test/query-tests/Diagnostics/Info.expected
index 5cc633358ca6..5c5b1da94ead 100644
--- a/swift/ql/test/query-tests/Diagnostics/Info.expected
+++ b/swift/ql/test/query-tests/Diagnostics/Info.expected
@@ -1,3 +1,3 @@
-| error.swift:0:0:0:0 | error.swift | query-tests/Diagnostics/error.swift |  |
+| error.swift:0:0:0:0 | error.swift | error.swift |  |
 | file://:0:0:0:0 |  |  |  |
-| main.swift:0:0:0:0 | main.swift | query-tests/Diagnostics/main.swift | isSuccessfullyExtracted |
+| main.swift:0:0:0:0 | main.swift | main.swift | isSuccessfullyExtracted |

From 26f8e64a352c8fcee1adc3f40e0e3fe04685acba Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 7 Oct 2024 09:26:56 +0000
Subject: [PATCH 177/347] Bump golang.org/x/tools

Bumps the extractor-dependencies group in /go/extractor with 1 update: [golang.org/x/tools](https://github.com/golang/tools).


Updates `golang.org/x/tools` from 0.25.0 to 0.26.0
- [Release notes](https://github.com/golang/tools/releases)
- [Commits](https://github.com/golang/tools/compare/v0.25.0...v0.26.0)

---
updated-dependencies:
- dependency-name: golang.org/x/tools
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: extractor-dependencies
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 go/extractor/go.mod | 2 +-
 go/extractor/go.sum | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/go/extractor/go.mod b/go/extractor/go.mod
index 691996e75f1e..a0dfec15866f 100644
--- a/go/extractor/go.mod
+++ b/go/extractor/go.mod
@@ -10,7 +10,7 @@ toolchain go1.23.1
 //    bazel mod tidy
 require (
 	golang.org/x/mod v0.21.0
-	golang.org/x/tools v0.25.0
+	golang.org/x/tools v0.26.0
 )
 
 require golang.org/x/sync v0.8.0 // indirect
diff --git a/go/extractor/go.sum b/go/extractor/go.sum
index ed8839215f25..1bf208ccc72c 100644
--- a/go/extractor/go.sum
+++ b/go/extractor/go.sum
@@ -2,5 +2,5 @@ golang.org/x/mod v0.21.0 h1:vvrHzRwRfVKSiLrG+d4FMl/Qi4ukBCE6kZlTUkDYRT0=
 golang.org/x/mod v0.21.0/go.mod h1:6SkKJ3Xj0I0BrPOZoBy3bdMptDDU9oJrpohJ3eWZ1fY=
 golang.org/x/sync v0.8.0 h1:3NFvSEYkUoMifnESzZl15y791HH1qU2xm6eCJU5ZPXQ=
 golang.org/x/sync v0.8.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
-golang.org/x/tools v0.25.0 h1:oFU9pkj/iJgs+0DT+VMHrx+oBKs/LJMV+Uvg78sl+fE=
-golang.org/x/tools v0.25.0/go.mod h1:/vtpO8WL1N9cQC3FN5zPqb//fRXskFHbLKk4OW1Q7rg=
+golang.org/x/tools v0.26.0 h1:v/60pFQmzmT9ExmjDv2gGIfi3OqfKoEP6I5+umXlbnQ=
+golang.org/x/tools v0.26.0/go.mod h1:TPVVj70c7JJ3WCazhD8OdXcZg/og+b9+tH/KxylGwH0=

From 1ce0ba508354e3e921f06c00230449b0f296de86 Mon Sep 17 00:00:00 2001
From: Asger F <asgerf@github.com>
Date: Mon, 7 Oct 2024 14:48:28 +0200
Subject: [PATCH 178/347] SSA: Make WithState private

---
 shared/ssa/codeql/ssa/Ssa.qll | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/shared/ssa/codeql/ssa/Ssa.qll b/shared/ssa/codeql/ssa/Ssa.qll
index 4b6ae906b823..d3b1414dfcfc 100644
--- a/shared/ssa/codeql/ssa/Ssa.qll
+++ b/shared/ssa/codeql/ssa/Ssa.qll
@@ -1635,7 +1635,7 @@ module Make<LocationSig Location, InputSig<Location> Input> {
     bindingset[this]
     signature class StateSig;
 
-    module WithState<StateSig State> {
+    private module WithState<StateSig State> {
       /**
        * Holds if the guard `g` validates the expression `e` upon evaluating to `branch`, blocking
        * flow in the given `state`.

From ed266dac5f535e18cb7668a346d47bbae137bc04 Mon Sep 17 00:00:00 2001
From: Jeroen Ketema <jketema@github.com>
Date: Mon, 7 Oct 2024 22:42:18 +0200
Subject: [PATCH 179/347] C++: Address review comments

---
 .../semmle/code/cpp/ir/implementation/aliased_ssa/PrintIR.qll | 4 ++--
 cpp/ql/lib/semmle/code/cpp/ir/implementation/raw/PrintIR.qll  | 4 ++--
 .../code/cpp/ir/implementation/unaliased_ssa/PrintIR.qll      | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/cpp/ql/lib/semmle/code/cpp/ir/implementation/aliased_ssa/PrintIR.qll b/cpp/ql/lib/semmle/code/cpp/ir/implementation/aliased_ssa/PrintIR.qll
index 5e634a7c3225..7fd66ba84414 100644
--- a/cpp/ql/lib/semmle/code/cpp/ir/implementation/aliased_ssa/PrintIR.qll
+++ b/cpp/ql/lib/semmle/code/cpp/ir/implementation/aliased_ssa/PrintIR.qll
@@ -36,7 +36,7 @@
  * * Literals: `Constant`.
  * * Variable addresses: `VariableAddress`.
  * * Function entry points: `EnterFunction`.
- * * Return form a function: `Return`, `ReturnVoid`. Note that the value being returned is set separately by a
+ * * Return from a function: `Return`, `ReturnVoid`. Note that the value being returned is set separately by a
  *   `Store` to a special `#return` variable.
  * * Stack unwinding for C++ function that throw and where the exception escapes the function: `Unwind`.
  * * Common exit point for `Unwind` and `Return`: `ExitFunction`.
@@ -93,7 +93,7 @@
  * int x = 5;
  * int y = 7;
  * int* p = condition ? &x : &y;
- * p = 6;
+ * *p = 6;
  * return x;
  * ```
  *
diff --git a/cpp/ql/lib/semmle/code/cpp/ir/implementation/raw/PrintIR.qll b/cpp/ql/lib/semmle/code/cpp/ir/implementation/raw/PrintIR.qll
index 5e634a7c3225..7fd66ba84414 100644
--- a/cpp/ql/lib/semmle/code/cpp/ir/implementation/raw/PrintIR.qll
+++ b/cpp/ql/lib/semmle/code/cpp/ir/implementation/raw/PrintIR.qll
@@ -36,7 +36,7 @@
  * * Literals: `Constant`.
  * * Variable addresses: `VariableAddress`.
  * * Function entry points: `EnterFunction`.
- * * Return form a function: `Return`, `ReturnVoid`. Note that the value being returned is set separately by a
+ * * Return from a function: `Return`, `ReturnVoid`. Note that the value being returned is set separately by a
  *   `Store` to a special `#return` variable.
  * * Stack unwinding for C++ function that throw and where the exception escapes the function: `Unwind`.
  * * Common exit point for `Unwind` and `Return`: `ExitFunction`.
@@ -93,7 +93,7 @@
  * int x = 5;
  * int y = 7;
  * int* p = condition ? &x : &y;
- * p = 6;
+ * *p = 6;
  * return x;
  * ```
  *
diff --git a/cpp/ql/lib/semmle/code/cpp/ir/implementation/unaliased_ssa/PrintIR.qll b/cpp/ql/lib/semmle/code/cpp/ir/implementation/unaliased_ssa/PrintIR.qll
index 5e634a7c3225..7fd66ba84414 100644
--- a/cpp/ql/lib/semmle/code/cpp/ir/implementation/unaliased_ssa/PrintIR.qll
+++ b/cpp/ql/lib/semmle/code/cpp/ir/implementation/unaliased_ssa/PrintIR.qll
@@ -36,7 +36,7 @@
  * * Literals: `Constant`.
  * * Variable addresses: `VariableAddress`.
  * * Function entry points: `EnterFunction`.
- * * Return form a function: `Return`, `ReturnVoid`. Note that the value being returned is set separately by a
+ * * Return from a function: `Return`, `ReturnVoid`. Note that the value being returned is set separately by a
  *   `Store` to a special `#return` variable.
  * * Stack unwinding for C++ function that throw and where the exception escapes the function: `Unwind`.
  * * Common exit point for `Unwind` and `Return`: `ExitFunction`.
@@ -93,7 +93,7 @@
  * int x = 5;
  * int y = 7;
  * int* p = condition ? &x : &y;
- * p = 6;
+ * *p = 6;
  * return x;
  * ```
  *

From 96dda8808ca4fdd4de2dc4d9d991b7fce9f2c91f Mon Sep 17 00:00:00 2001
From: Paolo Tranquilli <redsun82@gihub.com>
Date: Tue, 8 Oct 2024 10:03:00 +0200
Subject: [PATCH 180/347] Rust: rename `generate-schema -> ast-generator`

---
 Cargo.lock                                    | 20 ++++++++---------
 Cargo.toml                                    |  2 +-
 MODULE.bazel                                  |  2 +-
 .../.gitignore                                |  0
 .../BUILD.bazel                               |  2 +-
 .../Cargo.toml                                |  3 +--
 .../rust.ungram                               |  0
 .../src/codegen.rs                            |  0
 .../src/codegen/grammar.rs                    |  0
 .../src/codegen/grammar/ast_src.rs            |  0
 .../src/flags.rs                              |  0
 .../src/main.rs                               | 22 +++++++++----------
 rust/extractor/src/translate/generated.rs     |  2 +-
 rust/generate-schema/Cargo.lock               | 16 --------------
 rust/schema/ast.py                            |  3 +--
 15 files changed, 26 insertions(+), 46 deletions(-)
 rename rust/{generate-schema => ast-generator}/.gitignore (100%)
 rename rust/{generate-schema => ast-generator}/BUILD.bazel (91%)
 rename rust/{generate-schema => ast-generator}/Cargo.toml (84%)
 rename rust/{generate-schema => ast-generator}/rust.ungram (100%)
 rename rust/{generate-schema => ast-generator}/src/codegen.rs (100%)
 rename rust/{generate-schema => ast-generator}/src/codegen/grammar.rs (100%)
 rename rust/{generate-schema => ast-generator}/src/codegen/grammar/ast_src.rs (100%)
 rename rust/{generate-schema => ast-generator}/src/flags.rs (100%)
 rename rust/{generate-schema => ast-generator}/src/main.rs (96%)
 delete mode 100644 rust/generate-schema/Cargo.lock

diff --git a/Cargo.lock b/Cargo.lock
index a0d31f77ad8b..07176705783f 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -112,6 +112,16 @@ version = "0.7.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50"
 
+[[package]]
+name = "ast-generator"
+version = "0.1.0"
+dependencies = [
+ "itertools 0.10.5",
+ "proc-macro2",
+ "quote",
+ "ungrammar",
+]
+
 [[package]]
 name = "atomic"
 version = "0.6.0"
@@ -681,16 +691,6 @@ version = "0.4.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7ab85b9b05e3978cc9a9cf8fea7f01b494e1a09ed3037e16ba39edc7a29eb61a"
 
-[[package]]
-name = "generate-schema"
-version = "0.1.0"
-dependencies = [
- "itertools 0.10.5",
- "proc-macro2",
- "quote",
- "ungrammar",
-]
-
 [[package]]
 name = "getrandom"
 version = "0.2.15"
diff --git a/Cargo.toml b/Cargo.toml
index 4b80e2ac9b77..b63e3971ee5f 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -7,7 +7,7 @@ members = [
     "ruby/extractor",
     "rust/extractor",
     "rust/extractor/macros",
-    "rust/generate-schema",
+    "rust/ast-generator",
 ]
 
 [patch.crates-io]
diff --git a/MODULE.bazel b/MODULE.bazel
index 38f182d14bac..4a2219d43a54 100644
--- a/MODULE.bazel
+++ b/MODULE.bazel
@@ -61,7 +61,7 @@ r.from_cargo(
         "//ruby/extractor:Cargo.toml",
         "//rust/extractor:Cargo.toml",
         "//rust/extractor/macros:Cargo.toml",
-        "//rust/generate-schema:Cargo.toml",
+        "//rust/ast-generator:Cargo.toml",
         "//shared/tree-sitter-extractor:Cargo.toml",
     ],
 )
diff --git a/rust/generate-schema/.gitignore b/rust/ast-generator/.gitignore
similarity index 100%
rename from rust/generate-schema/.gitignore
rename to rust/ast-generator/.gitignore
diff --git a/rust/generate-schema/BUILD.bazel b/rust/ast-generator/BUILD.bazel
similarity index 91%
rename from rust/generate-schema/BUILD.bazel
rename to rust/ast-generator/BUILD.bazel
index 2a1be1d2c1ad..19c078e2342c 100644
--- a/rust/generate-schema/BUILD.bazel
+++ b/rust/ast-generator/BUILD.bazel
@@ -1,7 +1,7 @@
 load("//misc/bazel:rust.bzl", "codeql_rust_binary")
 
 codeql_rust_binary(
-    name = "generate-schema",
+    name = "ast-generator",
     srcs = glob(["src/**/*.rs"]),
     aliases = aliases(),
     proc_macro_deps = all_crate_deps(
diff --git a/rust/generate-schema/Cargo.toml b/rust/ast-generator/Cargo.toml
similarity index 84%
rename from rust/generate-schema/Cargo.toml
rename to rust/ast-generator/Cargo.toml
index 0eb36ecbc63c..c04619f5d4f9 100644
--- a/rust/generate-schema/Cargo.toml
+++ b/rust/ast-generator/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "generate-schema"
+name = "ast-generator"
 version = "0.1.0"
 edition = "2021"
 
@@ -8,4 +8,3 @@ ungrammar = "1.16.1"
 proc-macro2 = "1.0.33"
 quote = "1.0.12"
 itertools = "0.10.1"
-
diff --git a/rust/generate-schema/rust.ungram b/rust/ast-generator/rust.ungram
similarity index 100%
rename from rust/generate-schema/rust.ungram
rename to rust/ast-generator/rust.ungram
diff --git a/rust/generate-schema/src/codegen.rs b/rust/ast-generator/src/codegen.rs
similarity index 100%
rename from rust/generate-schema/src/codegen.rs
rename to rust/ast-generator/src/codegen.rs
diff --git a/rust/generate-schema/src/codegen/grammar.rs b/rust/ast-generator/src/codegen/grammar.rs
similarity index 100%
rename from rust/generate-schema/src/codegen/grammar.rs
rename to rust/ast-generator/src/codegen/grammar.rs
diff --git a/rust/generate-schema/src/codegen/grammar/ast_src.rs b/rust/ast-generator/src/codegen/grammar/ast_src.rs
similarity index 100%
rename from rust/generate-schema/src/codegen/grammar/ast_src.rs
rename to rust/ast-generator/src/codegen/grammar/ast_src.rs
diff --git a/rust/generate-schema/src/flags.rs b/rust/ast-generator/src/flags.rs
similarity index 100%
rename from rust/generate-schema/src/flags.rs
rename to rust/ast-generator/src/flags.rs
diff --git a/rust/generate-schema/src/main.rs b/rust/ast-generator/src/main.rs
similarity index 96%
rename from rust/generate-schema/src/main.rs
rename to rust/ast-generator/src/main.rs
index 20e70f2344bc..4d0c1acd81ef 100644
--- a/rust/generate-schema/src/main.rs
+++ b/rust/ast-generator/src/main.rs
@@ -55,24 +55,24 @@ fn write_schema(
     let mut buf: Vec<u8> = Vec::new();
     writeln!(
         buf,
-        "# Generated by `cargo generate-schema`, do not edit by hand.\n"
+        "# Generated by `ast-generator`, do not edit by hand.\n"
     )?;
     writeln!(buf, "from .prelude import *\n")?;
 
     for node in &grammar.enums {
         let super_classses = if let Some(cls) = super_types.get(&node.name) {
-            let super_classes: Vec<String> = cls.iter().map(|x| class_name(x)).collect();
+            let super_classes: Vec<String> = cls.iter().map(class_name).collect();
             super_classes.join(",")
         } else {
             "AstNode".to_owned()
         };
         writeln!(buf, "class {}({}):", class_name(&node.name), super_classses)?;
         writeln!(buf, "   pass")?;
-        writeln!(buf, "")?;
+        writeln!(buf)?;
     }
     for node in &grammar.nodes {
         let super_classses = if let Some(cls) = super_types.get(&node.name) {
-            let super_classes: Vec<String> = cls.iter().map(|x| class_name(x)).collect();
+            let super_classes: Vec<String> = cls.iter().map(class_name).collect();
             super_classes.join(",")
         } else {
             "AstNode".to_owned()
@@ -111,7 +111,7 @@ fn write_schema(
         if empty {
             writeln!(buf, "   pass")?;
         }
-        writeln!(buf, "")?;
+        writeln!(buf)?;
     }
     Ok(String::from_utf8_lossy(&buf).to_string())
 }
@@ -408,7 +408,7 @@ fn write_extractor(grammar: &AstSrc) -> std::io::Result<String> {
     let mut buf: Vec<u8> = Vec::new();
     writeln!(
         buf,
-        "//! Generated by `cargo generate-schema`, do not edit by hand.\n
+        "//! Generated by `ast-generator`, do not edit by hand.\n
 use crate::generated;
 use super::base::{{TextValue, Translator}};
 use crate::trap::{{Label, TrapId}};
@@ -462,7 +462,7 @@ impl Translator {{
             type_name,
             class_name
         )?;
-        for field in get_fields(&node) {
+        for field in get_fields(node) {
             if &field.tp == "SyntaxToken" {
                 continue;
             }
@@ -500,7 +500,7 @@ impl Translator {{
             class_name
         )?;
         writeln!(buf, "            id: TrapId::Star,")?;
-        for field in get_fields(&node) {
+        for field in get_fields(node) {
             if field.tp == "SyntaxToken" {
                 continue;
             }
@@ -523,7 +523,7 @@ impl Translator {{
 }
 
 fn main() -> std::io::Result<()> {
-    let grammar: Grammar = fs::read_to_string(project_root().join("generate-schema/rust.ungram"))
+    let grammar: Grammar = fs::read_to_string(project_root().join("ast-generator/rust.ungram"))
         .unwrap()
         .parse()
         .unwrap();
@@ -537,9 +537,7 @@ fn main() -> std::io::Result<()> {
     let mut super_types: BTreeMap<String, BTreeSet<String>> = BTreeMap::new();
     for node in &grammar.enums {
         for variant in &node.variants {
-            let set = super_types
-                .entry(variant.to_owned())
-                .or_insert_with(|| BTreeSet::new());
+            let set = super_types.entry(variant.to_owned()).or_default();
             set.insert(node.name.to_owned());
         }
     }
diff --git a/rust/extractor/src/translate/generated.rs b/rust/extractor/src/translate/generated.rs
index d7b7760febf1..f6f2df6483be 100644
--- a/rust/extractor/src/translate/generated.rs
+++ b/rust/extractor/src/translate/generated.rs
@@ -1,4 +1,4 @@
-//! Generated by `cargo generate-schema`, do not edit by hand.
+//! Generated by `ast-generator`, do not edit by hand.
 
 use super::base::{TextValue, Translator};
 use crate::generated;
diff --git a/rust/generate-schema/Cargo.lock b/rust/generate-schema/Cargo.lock
deleted file mode 100644
index 9ca5960b7803..000000000000
--- a/rust/generate-schema/Cargo.lock
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file is automatically @generated by Cargo.
-# It is not intended for manual editing.
-version = 3
-
-[[package]]
-name = "generate-schema"
-version = "0.1.0"
-dependencies = [
- "ungrammar",
-]
-
-[[package]]
-name = "ungrammar"
-version = "1.16.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a3e5df347f0bf3ec1d670aad6ca5c6a1859cd9ea61d2113125794654ccced68f"
diff --git a/rust/schema/ast.py b/rust/schema/ast.py
index 13eb54e7acf3..665afe12b7d9 100644
--- a/rust/schema/ast.py
+++ b/rust/schema/ast.py
@@ -1,4 +1,4 @@
-# Generated by `cargo generate-schema`, do not edit by hand.
+# Generated by `ast-generator`, do not edit by hand.
 
 from .prelude import *
 
@@ -663,4 +663,3 @@ class YeetExpr(Expr):
 class YieldExpr(Expr):
    attrs: list["Attr"] | child
    expr: optional["Expr"] | child
-

From 26ac84aa6e2cf843c4adc433b62005f2241f3075 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nora=20Dimitrijevi=C4=87?= <d10c@users.noreply.github.com>
Date: Tue, 24 Sep 2024 11:53:26 +0200
Subject: [PATCH 181/347] Fix trailing whitespace in docs

---
 .../extensible-predicates.rst                 |   4 +-
 docs/codeql/ql-language-reference/modules.rst |  58 +++----
 docs/codeql/ql-language-reference/types.rst   | 144 +++++++++---------
 3 files changed, 103 insertions(+), 103 deletions(-)

diff --git a/docs/codeql/codeql-language-guides/extensible-predicates.rst b/docs/codeql/codeql-language-guides/extensible-predicates.rst
index 7b00f09785e1..9b9b99d4b5a6 100644
--- a/docs/codeql/codeql-language-guides/extensible-predicates.rst
+++ b/docs/codeql/codeql-language-guides/extensible-predicates.rst
@@ -27,8 +27,8 @@ This example of an extensible predicate for a source is taken from the core Java
 .. code-block:: ql
 
     extensible predicate sourceModel(
-      string package, string type, boolean subtypes, string name, 
-      string signature, string ext, string output, string kind, 
+      string package, string type, boolean subtypes, string name,
+      string signature, string ext, string output, string kind,
       string provenance
     );
 
diff --git a/docs/codeql/ql-language-reference/modules.rst b/docs/codeql/ql-language-reference/modules.rst
index 7b2b16f3b7bf..29df9dc62155 100644
--- a/docs/codeql/ql-language-reference/modules.rst
+++ b/docs/codeql/ql-language-reference/modules.rst
@@ -4,10 +4,10 @@
 
 Modules
 #######
-   
-Modules provide a way of organizing QL code by grouping together related types, predicates, and other modules. 
 
-You can import modules into other files, which avoids duplication, and helps 
+Modules provide a way of organizing QL code by grouping together related types, predicates, and other modules.
+
+You can import modules into other files, which avoids duplication, and helps
 structure your code into more manageable pieces.
 
 .. _defining-module:
@@ -16,7 +16,7 @@ Defining a module
 *****************
 
 There are various ways to define modules—here is an example of the simplest way, declaring an
-:ref:`explicit module  <explicit-modules>` named ``Example`` containing 
+:ref:`explicit module  <explicit-modules>` named ``Example`` containing
 a class ``OneTwoThree``:
 
 .. code-block:: ql
@@ -27,17 +27,17 @@ a class ``OneTwoThree``:
           this = 1 or this = 2 or this = 3
         }
       }
-    } 
+    }
 
 The name of a module can be any `identifier <https://codeql.github.com/docs/ql-language-reference/ql-language-specification/#identifiers>`_
-that starts with an uppercase or lowercase letter. 
+that starts with an uppercase or lowercase letter.
 
 ``.ql`` or ``.qll`` files also implicitly define modules.
 For more information, see ":ref:`kinds-of-modules`."
 
 You can also annotate a module. For more information, see of ":ref:`annotations-overview`."
 
-Note that you can only annotate :ref:`explicit modules <explicit-modules>`. 
+Note that you can only annotate :ref:`explicit modules <explicit-modules>`.
 File modules cannot be annotated.
 
 .. _kinds-of-modules:
@@ -48,7 +48,7 @@ Kinds of modules
 File modules
 ============
 
-Each query file (extension ``.ql``) and library file (extension ``.qll``) implicitly defines 
+Each query file (extension ``.ql``) and library file (extension ``.qll``) implicitly defines
 a module. The module has the same name as the file, but any spaces in the file name are replaced
 by underscores (``_``). The contents of the file form the :ref:`body of the module <module-bodies>`.
 
@@ -57,7 +57,7 @@ by underscores (``_``). The contents of the file form the :ref:`body of the modu
 Library modules
 ---------------
 
-A library module is defined by a ``.qll`` file. It can contain any of the 
+A library module is defined by a ``.qll`` file. It can contain any of the
 elements listed in :ref:`module-bodies` below, apart from select clauses.
 
 For example, consider the following QL library:
@@ -75,19 +75,19 @@ For example, consider the following QL library:
 This file defines a library module named ``OneTwoThreeLib``. The body of this module
 defines the class ``OneTwoThree``.
 
-.. _query-modules: 
+.. _query-modules:
 
 Query modules
 -------------
 
-A query module is defined by a ``.ql`` file. It can contain any of the elements listed 
-in :ref:`module-bodies` below. 
+A query module is defined by a ``.ql`` file. It can contain any of the elements listed
+in :ref:`module-bodies` below.
 
 Query modules are slightly different from other modules:
 
 - A query module can't be imported.
-- A query module must have at least one query in its 
-  :ref:`namespace <namespaces>`. This is usually a :ref:`select clause <select-clauses>`, 
+- A query module must have at least one query in its
+  :ref:`namespace <namespaces>`. This is usually a :ref:`select clause <select-clauses>`,
   but can also be a :ref:`query predicate <query-predicates>`.
 
 For example:
@@ -97,7 +97,7 @@ For example:
 .. code-block:: ql
 
     import OneTwoThreeLib
-    
+
     from OneTwoThree ott
     where ott = 1 or ott = 2
     select ott
@@ -110,13 +110,13 @@ This file defines a query module named ``OneTwoQuery``. The body of this module
 Explicit modules
 ================
 
-You can also define a module within another module. This is an explicit module definition. 
+You can also define a module within another module. This is an explicit module definition.
 
-An explicit module is defined with the keyword ``module`` followed by 
-the module name, and then the module body enclosed in braces. It can contain any 
-of the elements listed in ":ref:`module-bodies`" below, apart from select clauses. 
+An explicit module is defined with the keyword ``module`` followed by
+the module name, and then the module body enclosed in braces. It can contain any
+of the elements listed in ":ref:`module-bodies`" below, apart from select clauses.
 
-For example, you could add the following QL snippet to the library file **OneTwoThreeLib.qll** 
+For example, you could add the following QL snippet to the library file **OneTwoThreeLib.qll**
 defined :ref:`above <library-modules>`:
 
 .. code-block:: ql
@@ -129,7 +129,7 @@ defined :ref:`above <library-modules>`:
         }
       }
     }
-    
+
 This defines an explicit module named ``M``. The body of this module defines
 the class ``OneTwo``.
 
@@ -226,7 +226,7 @@ Module bodies
 *************
 
 The body of a module is the code inside the module definition, for example
-the class ``OneTwo`` in the :ref:`explicit module <explicit-modules>` ``M``. 
+the class ``OneTwo`` in the :ref:`explicit module <explicit-modules>` ``M``.
 
 In general, the body of a module can contain the following constructs:
 
@@ -243,11 +243,11 @@ In general, the body of a module can contain the following constructs:
 Importing modules
 *****************
 
-The main benefit of storing code in a module is that you can reuse it in other modules. 
-To access the contents of an external module, you can import the module using an 
+The main benefit of storing code in a module is that you can reuse it in other modules.
+To access the contents of an external module, you can import the module using an
 :ref:`import statement <import-statements>`.
 
-When you import a module this brings all the names in its namespace, apart from :ref:`private` names, 
+When you import a module this brings all the names in its namespace, apart from :ref:`private` names,
 into the :ref:`namespace <namespaces>` of the current module.
 
 .. _import-statements:
@@ -263,7 +263,7 @@ Import statements are used for importing modules. They are of the form:
     import <module_expression2>
 
 Import statements are usually listed at the beginning of the module. Each
-import statement imports one module. You can import multiple modules by 
+import statement imports one module. You can import multiple modules by
 including multiple import statements (one for each module you want to import).
 
 An import statement can also be :ref:`annotated <annotations-overview>` with
@@ -272,14 +272,14 @@ An import statement can also be :ref:`annotated <annotations-overview>` with
 only reachable through deprecated imports in a given context then usage of the
 name in that context will generate deprecation warnings.
 
-You can import a module under a different name using the ``as`` keyword, 
+You can import a module under a different name using the ``as`` keyword,
 for example ``import javascript as js``.
 
 The ``<module_expression>`` itself can be a module name, a selection, or a qualified
 reference. For more information, see ":ref:`name-resolution`."
 
 For information about how import statements are looked up, see "`Module resolution <https://codeql.github.com/docs/ql-language-reference/ql-language-specification/#module-resolution>`__"
-in the QL language specification. 
+in the QL language specification.
 
 Built-in modules
 ****************
@@ -353,7 +353,7 @@ Sets
 
 The built-in ``InternSets`` module is parameterized by ``Key`` and ``Value`` types
 and a ``Value getAValue(Key key)`` relation. The module groups the ``Value``
-column by ``Key`` and creates a set for each group of values related by a key. 
+column by ``Key`` and creates a set for each group of values related by a key.
 
 The ``InternSets`` module exports a functional ``Set getSet(Key key)`` relation
 that relates keys with the set of value related to the given key by
diff --git a/docs/codeql/ql-language-reference/types.rst b/docs/codeql/ql-language-reference/types.rst
index 12aadc7213a3..14c5613b4128 100644
--- a/docs/codeql/ql-language-reference/types.rst
+++ b/docs/codeql/ql-language-reference/types.rst
@@ -10,12 +10,12 @@ Types
 QL is a statically typed language, so each variable must have a declared type.
 
 A type is a set of values.
-For example, the type ``int`` is the set of integers. 
-Note that a value can belong to more than one of these sets, which means that it can have more 
+For example, the type ``int`` is the set of integers.
+Note that a value can belong to more than one of these sets, which means that it can have more
 than one type.
 
 The kinds of types in QL are :ref:`primitive types <primitive-types>`, :ref:`classes <classes>`,
-:ref:`character types <character-types>`, :ref:`class domain types <domain-types>`, 
+:ref:`character types <character-types>`, :ref:`class domain types <domain-types>`,
 :ref:`algebraic datatypes <algebraic-datatypes>`, :ref:`type unions <type-unions>`,
 and :ref:`database types <database-types>`.
 
@@ -31,23 +31,23 @@ independent of the database that you are querying.
    .. _boolean:
 
 #. **boolean**: This type contains the values ``true`` and ``false``.
-    
+
    .. _float:
 
 #. **float**: This type contains 64-bit floating point numbers, such as ``6.28`` and ``-0.618``.
-    
+
    .. _int:
 
 #. **int**: This type contains 32-bit `two's complement <https://en.wikipedia.org/wiki/Two%27s_complement>`_ integers, such as ``-1`` and ``42``.
-    
+
    .. _string:
 
 #. **string**: This type contains finite strings of 16-bit characters.
-    
+
    .. _date:
 
-#. **date**: This type contains dates (and optionally times). 
-    
+#. **date**: This type contains dates (and optionally times).
+
 
 QL has a range of built-in operations defined on primitive types. These are available by using dispatch on expressions of the appropriate type. For example, ``1.toString()`` is the string representation of the integer constant ``1``. For a full list of built-in operations available in QL, see the
 section on `built-ins <https://codeql.github.com/docs/ql-language-reference/ql-language-specification/#built-ins>`__ in the QL language specification.
@@ -65,7 +65,7 @@ Classes provide an easy way to reuse and structure code. For example, you can:
   - Define :ref:`member predicates <member-predicates>` on those values.
   - Define subclasses that :ref:`override member predicates <overriding-member-predicates>`.
 
-A class in QL doesn't "create" a new object, it just represents a logical property. A value is 
+A class in QL doesn't "create" a new object, it just represents a logical property. A value is
 in a particular class if it satisfies that logical property.
 
 .. _defining-a-class:
@@ -75,8 +75,8 @@ Defining a class
 
 To define a class, you write:
 
-#. The keyword ``class``. 
-#. The name of the class. This is an `identifier <https://codeql.github.com/docs/ql-language-reference/ql-language-specification/#identifiers>`_ 
+#. The keyword ``class``.
+#. The name of the class. This is an `identifier <https://codeql.github.com/docs/ql-language-reference/ql-language-specification/#identifiers>`_
    starting with an uppercase letter.
 #. The supertypes that the class is derived from via `extends` and/or `instanceof`
 #. The :ref:`body of the class <class-bodies>`, enclosed in braces.
@@ -89,11 +89,11 @@ For example:
       OneTwoThree() { // characteristic predicate
         this = 1 or this = 2 or this = 3
       }
- 
+
       string getAString() { // member predicate
         result = "One, two or three: " + this.toString()
       }
-    
+
       predicate isEven() { // member predicate
         this = 2
       }
@@ -101,7 +101,7 @@ For example:
 
 This defines a class ``OneTwoThree``, which contains the values ``1``, ``2``, and ``3``. The
 :ref:`characteristic predicate <characteristic-predicates>` captures the logical property of
-"being one of the integers 1, 2, or 3." 
+"being one of the integers 1, 2, or 3."
 
 .. index:: extends
 
@@ -132,12 +132,12 @@ Class bodies
 The body of a class can contain:
   -  A :ref:`characteristic predicate <characteristic-predicates>` declaration.
   -  Any number of :ref:`member predicate <member-predicates>` declarations.
-  -  Any number of :ref:`field <fields>` declarations. 
+  -  Any number of :ref:`field <fields>` declarations.
 
 When you define a class, that class also inherits all non-:ref:`private` member predicates and
 fields from its supertypes.
 
-Depending on whether they are final, you can :ref:`override <overriding-member-predicates>` or 
+Depending on whether they are final, you can :ref:`override <overriding-member-predicates>` or
 :ref:`shadow <final-extensions>` those predicates and fields to give them a more specific definition.
 
 .. _characteristic-predicates:
@@ -181,22 +181,22 @@ This call returns ``"ONE, TWO OR THREE: 1"``.
 
 .. pull-quote:: Note
 
-    Characteristic predicates and member predicates often use the variable ``this``. 
-    This variable always refers to a member of the class—in this case a value belonging to the 
+    Characteristic predicates and member predicates often use the variable ``this``.
+    This variable always refers to a member of the class—in this case a value belonging to the
     class ``OneTwoThree``.
-    In the :ref:`characteristic predicate <characteristic-predicates>`, the variable ``this`` 
+    In the :ref:`characteristic predicate <characteristic-predicates>`, the variable ``this``
     constrains the values that are in the class.
-    In a :ref:`member predicate <member-predicates>`, ``this`` acts in the same way as any 
+    In a :ref:`member predicate <member-predicates>`, ``this`` acts in the same way as any
     other argument to the predicate.
 
 .. index:: field
-.. _fields: 
+.. _fields:
 
 Fields
 ------
 
 These are variables declared in the body of a class. A class can have any number of field
-declarations (that is, variable declarations) within its body. You can use these variables in 
+declarations (that is, variable declarations) within its body. You can use these variables in
 predicate declarations inside the class. Much like the :ref:`variable <this>` ``this``, fields
 must be constrained in the :ref:`characteristic predicate <characteristic-predicates>`.
 
@@ -207,21 +207,21 @@ For example:
     class SmallInt extends int {
       SmallInt() { this = [1 .. 10] }
     }
-    
+
     class DivisibleInt extends SmallInt {
       SmallInt divisor;   // declaration of the field `divisor`
       DivisibleInt() { this % divisor = 0 }
-    	
+
       SmallInt getADivisor() { result = divisor }
     }
-    
+
     from DivisibleInt i
     select i, i.getADivisor()
 
 In this example, the declaration ``SmallInt divisor`` introduces a field ``divisor``, constrains
 it in the characteristic predicate, and then uses it in the declaration of the member predicate
 ``getADivisor``. This is similar to introducing variables in a :ref:`select clause <select-clauses>`
-by declaring them in the ``from`` part. 
+by declaring them in the ``from`` part.
 
 You can also annotate predicates and fields. See the list of :ref:`annotations <annotations-overview>`
 that are available.
@@ -231,7 +231,7 @@ that are available.
 Concrete classes
 ================
 
-The classes in the above examples are all **concrete** classes. They are defined by 
+The classes in the above examples are all **concrete** classes. They are defined by
 restricting the values in a larger type. The values in a concrete class are precisely those
 values in the intersection of the supertypes that also satisfy the
 :ref:`characteristic predicate <characteristic-predicates>` of the class.
@@ -241,32 +241,32 @@ values in the intersection of the supertypes that also satisfy the
 Abstract classes
 ================
 
-A class :ref:`annotated <abstract>` with ``abstract``, known as an **abstract** class, is also a restriction of 
-the values in a larger type. However, an abstract class is defined as the union of its 
-subclasses. In particular, for a value to be in an abstract class, it must satisfy the 
+A class :ref:`annotated <abstract>` with ``abstract``, known as an **abstract** class, is also a restriction of
+the values in a larger type. However, an abstract class is defined as the union of its
+subclasses. In particular, for a value to be in an abstract class, it must satisfy the
 characteristic predicate of the class itself **and** the characteristic predicate of a subclass.
 Note that final extensions are not considered subclasses in this context.
 
-An abstract class is useful if you want to group multiple existing classes together 
-under a common name. You can then define member predicates on all those classes. You can also 
-extend predefined abstract classes: for example, if you import a library that contains an 
+An abstract class is useful if you want to group multiple existing classes together
+under a common name. You can then define member predicates on all those classes. You can also
+extend predefined abstract classes: for example, if you import a library that contains an
 abstract class, you can add more subclasses to it.
 
 **Example**
 
-If you are writing a security query, you may be interested in identifying 
-all expressions that can be interpreted as SQL queries. 
+If you are writing a security query, you may be interested in identifying
+all expressions that can be interpreted as SQL queries.
 You can use the following abstract class to describe these expressions:
 
 .. code-block:: ql
 
     abstract class SqlExpr extends Expr {
-      ... 
+      ...
     }
 
 Now define various subclasses—one for each kind of database management system. For example, you
-can define a subclass ``class PostgresSqlExpr extends SqlExpr``, which contains expressions 
-passed to some Postgres API that performs a database query. 
+can define a subclass ``class PostgresSqlExpr extends SqlExpr``, which contains expressions
+passed to some Postgres API that performs a database query.
 You can define similar subclasses for MySQL and other database management systems.
 
 The abstract class ``SqlExpr`` refers to all of those different expressions. If you want to add
@@ -278,7 +278,7 @@ there is no need to update the queries that rely on it.
 
    You must take care when you add a new subclass to an existing abstract class. Adding a subclass
    is not an isolated change, it also extends the abstract class since that is a union of its
-   subclasses. 
+   subclasses.
 
 .. _overriding-member-predicates:
 
@@ -288,7 +288,7 @@ Overriding member predicates
 If a class inherits a member predicate from a non-final supertype, you can **override** the
 inherited definition. You do this by defining a member predicate with the same name and arity
 as the inherited predicate, and by adding the ``override`` :ref:`annotation <override>`.
-This is useful if you want to refine the predicate to give a more specific result for the 
+This is useful if you want to refine the predicate to give a more specific result for the
 values in the subclass.
 
 For example, extending the class from the :ref:`first example <defining-a-class>`:
@@ -299,7 +299,7 @@ For example, extending the class from the :ref:`first example <defining-a-class>
       OneTwo() {
         this = 1 or this = 2
       }
-    
+
       override string getAString() {
         result = "One or two: " + this.toString()
       }
@@ -328,7 +328,7 @@ look like this:
 | 3 | One, two or three: 3    |
 +---+-------------------------+
 
-In QL, unlike other object-oriented languages, different subtypes of the same types don't need to be 
+In QL, unlike other object-oriented languages, different subtypes of the same types don't need to be
 disjoint. For example, you could define another subclass of ``OneTwoThree``, which overlaps
 with ``OneTwo``:
 
@@ -338,14 +338,14 @@ with ``OneTwo``:
       TwoThree() {
         this = 2 or this = 3
       }
-    
+
       override string getAString() {
         result = "Two or three: " + this.toString()
       }
     }
 
-Now the value 2 is included in both class types ``OneTwo`` and ``TwoThree``. Both of these classes 
-override the original definition of ``getAString()``. There are two new "most specific" definitions, 
+Now the value 2 is included in both class types ``OneTwo`` and ``TwoThree``. Both of these classes
+override the original definition of ``getAString()``. There are two new "most specific" definitions,
 so running the above query gives the following results:
 
 +---+-------------------------+
@@ -373,7 +373,7 @@ For example, using the definitions from the above section:
 
     class Two extends OneTwo, TwoThree {}
 
-Any value in the class ``Two`` must satisfy the logical property represented by ``OneTwo``, 
+Any value in the class ``Two`` must satisfy the logical property represented by ``OneTwo``,
 **and** the logical property represented by ``TwoThree``. Here the class ``Two`` contains one
 value, namely 2.
 
@@ -401,12 +401,12 @@ For example, extending the class from the :ref:`first example <defining-a-class>
 .. code-block:: ql
 
     final class FinalOneTwoThree = OneTwoThree;
-    
+
     class OneTwoFinalExtension extends FinalOneTwoThree {
       OneTwoFinalExtension() {
         this = 1 or this = 2
       }
-    
+
       string getAString() {
         result = "One or two: " + this.toString()
       }
@@ -507,19 +507,19 @@ Had ``Bar`` been defined as ``extends Foo``, then ``select any(Foo f).foo()`` wo
 Character types and class domain types
 **************************************
 
-You can't refer to these types directly, but each class in QL implicitly defines a character 
-type and a class domain type. (These are rather more subtle concepts and don't appear very 
+You can't refer to these types directly, but each class in QL implicitly defines a character
+type and a class domain type. (These are rather more subtle concepts and don't appear very
 often in practical query writing.)
 
-The **character type** of a QL class is the set of values satisfying the :ref:`characteristic 
-predicate <characteristic-predicates>` of the class. 
-It is a subset of the domain type. For concrete classes, a value belongs to 
-the class if, and only if, it is in the character type. For :ref:`abstract classes 
+The **character type** of a QL class is the set of values satisfying the :ref:`characteristic
+predicate <characteristic-predicates>` of the class.
+It is a subset of the domain type. For concrete classes, a value belongs to
+the class if, and only if, it is in the character type. For :ref:`abstract classes
 <abstract-classes>`, a value must also belong to at least one of the subclasses, in addition to
-being in the character type. 
+being in the character type.
 
 The **domain type** of a QL class is the intersection of the character types of all its supertypes, that is, a value
-belongs to the domain type if it belongs to every supertype. It occurs as the type of ``this`` 
+belongs to the domain type if it belongs to every supertype. It occurs as the type of ``this``
 in the characteristic predicate of a class.
 
 .. index:: newtype
@@ -570,13 +570,13 @@ The branch definitions have the following form:
 
     <BranchName>(<arguments>) { <body> }
 
-- The type name and the branch names must be `identifiers <https://codeql.github.com/docs/ql-language-reference/ql-language-specification/#identifiers>`_ 
+- The type name and the branch names must be `identifiers <https://codeql.github.com/docs/ql-language-reference/ql-language-specification/#identifiers>`_
   starting with an uppercase letter. Conventionally, they start with ``T``.
 - The different branches of an algebraic datatype are separated by ``or``.
 - The arguments to a branch, if any, are :ref:`variable declarations <variable-declarations>`
   separated by commas.
 - The body of a branch is a :ref:`predicate <predicates>` body. You can omit the branch body, in which case
-  it defaults to ``any()``. 
+  it defaults to ``any()``.
   Note that branch bodies are evaluated fully, so they must be finite. They should be kept small
   for good performance.
 
@@ -586,28 +586,28 @@ For example, the following algebraic datatype has three branches:
 
     newtype T =
       Type1(A a, B b) { body(a, b) }
-      or 
+      or
       Type2(C c)
-      or 
+      or
       Type3()
 
 Standard pattern for using algebraic datatypes
 ==============================================
 
-Algebraic datatypes are different from :ref:`classes <classes>`. In particular, algebraic datatypes don't have a 
+Algebraic datatypes are different from :ref:`classes <classes>`. In particular, algebraic datatypes don't have a
 ``toString()`` member predicate, so you can't use them in a :ref:`select clause <select-clauses>`.
 
-Classes are often used to extend algebraic datatypes (and to provide a ``toString()`` predicate). 
+Classes are often used to extend algebraic datatypes (and to provide a ``toString()`` predicate).
 In the standard QL language libraries, this is usually done as follows:
 
 - Define a class ``A`` that extends the algebraic datatype and optionally declares :ref:`abstract`
   predicates.
-- For each branch type, define a class ``B`` that extends both ``A`` and the branch type, 
+- For each branch type, define a class ``B`` that extends both ``A`` and the branch type,
   and provide a definition for any abstract predicates from ``A``.
 - Annotate the algebraic datatype with :ref:`private`, and leave the classes public.
 
 For example, the following code snippet from the CodeQL data-flow library for C# defines classes
-for dealing with tainted or untainted values. In this case, it doesn't make sense for 
+for dealing with tainted or untainted values. In this case, it doesn't make sense for
 ``TaintType`` to extend a database type. It is part of the taint analysis, not the underlying
 program, so it's helpful to extend a new type (namely ``TTaintType``):
 
@@ -617,24 +617,24 @@ program, so it's helpful to extend a new type (namely ``TTaintType``):
       TExactValue()
       or
       TTaintedValue()
-    
+
     /** Describes how data is tainted. */
     class TaintType extends TTaintType {
       string toString() {
         this = TExactValue() and result = "exact"
-        or 
+        or
         this = TTaintedValue() and result = "tainted"
       }
     }
-    
+
     /** A taint type where the data is untainted. */
     class Untainted extends TaintType, TExactValue {
     }
-    
+
     /** A taint type where the data is tainted. */
     class Tainted extends TaintType, TTaintedValue {
     }
-    
+
 .. _type-unions:
 
 Type unions
@@ -672,7 +672,7 @@ If we had implemented ``DefiniteInitialization`` as a class extension instead, i
 
 .. code-block:: ql
 
-    // THIS WON'T WORK: The implicit type check for InitialValueSource involves an illegal recursion 
+    // THIS WON'T WORK: The implicit type check for InitialValueSource involves an illegal recursion
     // DefiniteInitialization -> InitialValueSource -> UnknownInitialGarbage -> ¬DefiniteInitialization!
     class DefiniteInitialization extends InitialValueSource {
       DefiniteInitialization() {
@@ -692,7 +692,7 @@ Database types are defined in the database schema. This means that they depend o
 that you are querying, and vary according to the data you are analyzing.
 
 For example, if you are querying a CodeQL database for a Java project, the database types may
-include ``@ifstmt``, representing an if statement in the Java code, and ``@variable``, 
+include ``@ifstmt``, representing an if statement in the Java code, and ``@variable``,
 representing a variable.
 
 .. _type-compatibility:

From 328f32269268b025e6ba30cbbe6e1272fbc614dc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nora=20Dimitrijevi=C4=87?= <d10c@users.noreply.github.com>
Date: Tue, 24 Sep 2024 11:54:13 +0200
Subject: [PATCH 182/347] BigInt documentation

---
 .../extensible-predicates.rst                 |  2 +-
 docs/codeql/ql-language-reference/modules.rst | 27 +++++++++++++++++++
 .../ql-language-specification.rst             |  8 +++---
 docs/codeql/ql-language-reference/types.rst   |  2 ++
 4 files changed, 35 insertions(+), 4 deletions(-)

diff --git a/docs/codeql/codeql-language-guides/extensible-predicates.rst b/docs/codeql/codeql-language-guides/extensible-predicates.rst
index 9b9b99d4b5a6..7d5f6d8c9ccd 100644
--- a/docs/codeql/codeql-language-guides/extensible-predicates.rst
+++ b/docs/codeql/codeql-language-guides/extensible-predicates.rst
@@ -36,7 +36,7 @@ An extensible predicate is a CodeQL predicate with the following restrictions:
 
 - It uses the ``extensible`` keyword.
 - It has no body.
-- All predicate parameters have primitive types.
+- All predicate parameters have type ``string``, ``int``, ``float``, ``boolean``, or ``date``.
 - It is not in a module.
 
 Columns shared by all extensible predicates
diff --git a/docs/codeql/ql-language-reference/modules.rst b/docs/codeql/ql-language-reference/modules.rst
index 29df9dc62155..75b61667246e 100644
--- a/docs/codeql/ql-language-reference/modules.rst
+++ b/docs/codeql/ql-language-reference/modules.rst
@@ -424,3 +424,30 @@ The above query therefore evalutes to:
 +----+----+
 | 4  | 4  |
 +----+----+
+
+.. index:: BigInt
+.. _bigint:
+
+BigInt
+======
+
+The built-in ``QlBuiltins`` module provides an **experimental** type ``BigInt`` of arbitrary-precision integers.
+
+This type is not available in the CodeQL CLI by default, but you can enable it by passing the ``--allow-experimental=bigint``
+option to the CodeQL CLI. Consequently, BigInts are currently disallowed in query results and dbscheme columns.
+
+Unlike ``int`` and ``float``, there is no automatic conversion between ``BigInt`` and other numeric types.
+Instead, big integers can be constructed using the ``.toBigInt()`` methods of ``int`` and ``string``.
+
+The other built-in operations are:
+
+*   comparisons between ``BigInt``\s: ``=``, ``!=``, ``<``, ``<=``, ``>``, ``>=``,
+*   conversions from ``BigInt``\s to strings or integers (if within range): ``.toString()``, ``.toInt()``,
+*   ``BigInt`` arithmetic: binary ``+``, ``-``, ``*``, ``/``, ``%``, unary ``-``,
+*   bitwise operations: ``.bitAnd(BigInt)``, ``.bitOr(BigInt)``,
+    ``.bitXor(BigInt)``, ``.bitShiftLeft(int)``, ``.bitShiftRightSigned(int)``,
+    ``.bitNot()``,
+*   aggregates: ``min``, ``max``, (``strict``)\ ``sum``, (``strict``)\ ``count``, ``avg``,
+    ``rank``, ``unique``, ``any``.
+*   other: ``.pow(int)``, ``.abs()``, ``.gcd(BigInt)``, ``.minimum(BigInt)``,
+    ``.maximum(BigInt)``.
diff --git a/docs/codeql/ql-language-reference/ql-language-specification.rst b/docs/codeql/ql-language-reference/ql-language-specification.rst
index ae0057d3cf62..60e5ece73303 100644
--- a/docs/codeql/ql-language-reference/ql-language-specification.rst
+++ b/docs/codeql/ql-language-reference/ql-language-specification.rst
@@ -359,7 +359,7 @@ Kinds of types
 
 Types in QL are either *primitive* types, *database* types, *class* types, *character* types, *class domain* types, type *parameters*, or *instantiation-nested* types.
 
-The primitive types are ``boolean``, ``date``, ``float``, ``int``, and ``string``.
+The primitive types are ``boolean``, ``date``, ``float``, ``int``, ``string``, and ``QlBuiltins::BigInt``.
 
 Database types are supplied as part of the database. Each database type has a *name*, which is an identifier starting with an at sign (``@``, U+0040) followed by lower-case letter. Database types have some number of *base types*, which are other database types. In a valid database, the base types relation is non-cyclic.
 
@@ -433,7 +433,7 @@ Values are the fundamental data that QL programs compute over. This section spec
 Kinds of values
 ~~~~~~~~~~~~~~~
 
-There are six kinds of values in QL: one kind for each of the five primitive types, and *entities*. Each value has a type.
+There are seven kinds of values in QL: one kind for each of the six primitive types, and *entities*. Each value has a type.
 
 A boolean value is of type ``boolean``, and may have one of two distinct values: ``true`` or ``false``.
 
@@ -445,6 +445,8 @@ An integer value is of type ``int``. Each value is a 32-bit two's complement int
 
 A string is a finite sequence of 16-bit characters. The characters are interpreted as Unicode code points.
 
+A :ref:`big integer <bigint>` value is of type ``QlBuiltins::BigInt``. Each value is a signed arbitrary-precision integer.
+
 The database includes a number of opaque entity values. Each such value has a type that is one of the database types, and an identifying integer. An entity value is written as the name of its database type followed by its identifying integer in parentheses. For example, ``@tree(12)``, ``@person(16)``, and ``@location(38132)`` are entity values. The identifying integers are left opaque to programmers in this specification, so an implementation of QL is free to use some other set of countable labels to identify its entities.
 
 Ordering
@@ -458,7 +460,7 @@ For dates, the ordering is chronological.
 
 For floats, the ordering is as specified in IEEE 754 when one exists, except that NaN is considered equal to itself and is ordered after all other floats, and negative zero is considered to be strictly less than positive zero.
 
-For integers, the ordering is as for two's complement integers.
+For integers (and :ref:`big integers <bigint>`), the ordering is numerical.
 
 For strings, the ordering is lexicographic.
 
diff --git a/docs/codeql/ql-language-reference/types.rst b/docs/codeql/ql-language-reference/types.rst
index 14c5613b4128..e14f542dcf88 100644
--- a/docs/codeql/ql-language-reference/types.rst
+++ b/docs/codeql/ql-language-reference/types.rst
@@ -52,6 +52,8 @@ independent of the database that you are querying.
 QL has a range of built-in operations defined on primitive types. These are available by using dispatch on expressions of the appropriate type. For example, ``1.toString()`` is the string representation of the integer constant ``1``. For a full list of built-in operations available in QL, see the
 section on `built-ins <https://codeql.github.com/docs/ql-language-reference/ql-language-specification/#built-ins>`__ in the QL language specification.
 
+Additionally, there is an experimental arbitrary-precision integer primitive type at :ref:`QlBuiltins::BigInt <bigint>`. This type is not available in the CodeQL CLI by default, but you can enable it by passing the ``--allow-experimental=bigint`` option to the CodeQL CLI.
+
 .. index:: class
 .. _classes:
 

From 61c3aa62887ca8ff3a23f08cbc620463b6dd5331 Mon Sep 17 00:00:00 2001
From: Paolo Tranquilli <redsun82@gihub.com>
Date: Tue, 8 Oct 2024 10:37:53 +0200
Subject: [PATCH 183/347] Rust: integrate rust code generation into
 `//rust/codegen`

---
 rust/ast-generator/BUILD.bazel            |   7 +
 rust/ast-generator/src/codegen.rs         |   2 +-
 rust/ast-generator/src/main.rs            |  24 +-
 rust/codegen/BUILD.bazel                  |  24 +-
 rust/codegen/codegen.sh                   |  13 +
 rust/extractor/src/translate/generated.rs | 396 ++++++----------------
 6 files changed, 148 insertions(+), 318 deletions(-)
 create mode 100755 rust/codegen/codegen.sh

diff --git a/rust/ast-generator/BUILD.bazel b/rust/ast-generator/BUILD.bazel
index 19c078e2342c..2449dfa1d325 100644
--- a/rust/ast-generator/BUILD.bazel
+++ b/rust/ast-generator/BUILD.bazel
@@ -1,3 +1,4 @@
+load("@tree_sitter_extractors_deps//:defs.bzl", "aliases", "all_crate_deps")
 load("//misc/bazel:rust.bzl", "codeql_rust_binary")
 
 codeql_rust_binary(
@@ -12,3 +13,9 @@ codeql_rust_binary(
         normal = True,
     ),
 )
+
+filegroup(
+    name = "manifest",
+    srcs = ["Cargo.toml"],
+    visibility = ["//rust:__subpackages__"],
+)
diff --git a/rust/ast-generator/src/codegen.rs b/rust/ast-generator/src/codegen.rs
index 337a42bef195..6d66eeab5feb 100644
--- a/rust/ast-generator/src/codegen.rs
+++ b/rust/ast-generator/src/codegen.rs
@@ -12,5 +12,5 @@ pub fn ensure_file_contents(
     contents: &String,
     _check: bool,
 ) {
-    std::fs::write(path, contents).expect("Unable to write file");
+    std::fs::write(path, contents).unwrap_or_else(|_| panic!("Unable to write {}", path.display()));
 }
diff --git a/rust/ast-generator/src/main.rs b/rust/ast-generator/src/main.rs
index 4d0c1acd81ef..8d4114c8bde5 100644
--- a/rust/ast-generator/src/main.rs
+++ b/rust/ast-generator/src/main.rs
@@ -57,7 +57,7 @@ fn write_schema(
         buf,
         "# Generated by `ast-generator`, do not edit by hand.\n"
     )?;
-    writeln!(buf, "from .prelude import *\n")?;
+    writeln!(buf, "from .prelude import *")?;
 
     for node in &grammar.enums {
         let super_classses = if let Some(cls) = super_types.get(&node.name) {
@@ -66,9 +66,13 @@ fn write_schema(
         } else {
             "AstNode".to_owned()
         };
-        writeln!(buf, "class {}({}):", class_name(&node.name), super_classses)?;
+        writeln!(
+            buf,
+            "\nclass {}({}):",
+            class_name(&node.name),
+            super_classses
+        )?;
         writeln!(buf, "   pass")?;
-        writeln!(buf)?;
     }
     for node in &grammar.nodes {
         let super_classses = if let Some(cls) = super_types.get(&node.name) {
@@ -77,7 +81,12 @@ fn write_schema(
         } else {
             "AstNode".to_owned()
         };
-        writeln!(buf, "class {}({}):", class_name(&node.name), super_classses)?;
+        writeln!(
+            buf,
+            "\nclass {}({}):",
+            class_name(&node.name),
+            super_classses
+        )?;
         let mut empty = true;
         for field in get_fields(node) {
             if field.tp == "SyntaxToken" {
@@ -111,7 +120,6 @@ fn write_schema(
         if empty {
             writeln!(buf, "   pass")?;
         }
-        writeln!(buf)?;
     }
     Ok(String::from_utf8_lossy(&buf).to_string())
 }
@@ -409,6 +417,8 @@ fn write_extractor(grammar: &AstSrc) -> std::io::Result<String> {
     writeln!(
         buf,
         "//! Generated by `ast-generator`, do not edit by hand.\n
+#![cfg_attr(any(), rustfmt::skip)]
+
 use crate::generated;
 use super::base::{{TextValue, Translator}};
 use crate::trap::{{Label, TrapId}};
@@ -548,7 +558,7 @@ fn main() -> std::io::Result<()> {
         super_class_x.cmp(&super_class_y).then(x.name.cmp(&y.name))
     });
     let schema = write_schema(&grammar, super_types)?;
-    let schema_path = PathBuf::from("../schema/ast.py");
+    let schema_path = project_root().join("schema/ast.py");
     codegen::ensure_file_contents(
         crate::flags::CodegenType::Grammar,
         &schema_path,
@@ -557,7 +567,7 @@ fn main() -> std::io::Result<()> {
     );
 
     let extractor = write_extractor(&grammar)?;
-    let extractor_path = PathBuf::from("../extractor/src/translate/generated.rs");
+    let extractor_path = project_root().join("extractor/src/translate/generated.rs");
     codegen::ensure_file_contents(
         crate::flags::CodegenType::Grammar,
         &extractor_path,
diff --git a/rust/codegen/BUILD.bazel b/rust/codegen/BUILD.bazel
index 99f737538a6b..43e057a6fbf6 100644
--- a/rust/codegen/BUILD.bazel
+++ b/rust/codegen/BUILD.bazel
@@ -1,15 +1,17 @@
-load("@bazel_skylib//rules:native_binary.bzl", "native_binary")
+_args = [
+    "//rust/ast-generator",
+    "//rust/ast-generator:manifest",
+    "//misc/codegen",
+    "//rust:codegen-conf",
+]
 
-native_binary(
+sh_binary(
     name = "codegen",
-    src = "//misc/codegen",
-    out = "codegen",
-    args = [
-        "--configuration-file=$(location //rust:codegen-conf)",
-    ],
-    data = [
-        "//rust:codegen-conf",
-        "//rust:schema",
-    ],
+    srcs = ["codegen.sh"],
+    args = ["$(rlocationpath %s)" % a for a in _args],
+    data = _args,
     visibility = ["//rust:__subpackages__"],
+    deps = [
+        "//misc/bazel:sh_runfiles",
+    ],
 )
diff --git a/rust/codegen/codegen.sh b/rust/codegen/codegen.sh
new file mode 100755
index 000000000000..e56f40627e65
--- /dev/null
+++ b/rust/codegen/codegen.sh
@@ -0,0 +1,13 @@
+#!/bin/bash
+
+set -eu
+
+source misc/bazel/runfiles.sh 2>/dev/null || source external/ql~/misc/bazel/runfiles.sh
+
+ast_generator="$(rlocation "$1")"
+ast_generator_manifest="$(rlocation "$2")"
+codegen="$(rlocation "$3")"
+codegen_conf="$(rlocation "$4")"
+
+CARGO_MANIFEST_DIR="$(dirname "$ast_generator_manifest")" "$ast_generator"
+"$codegen" --configuration-file="$codegen_conf"
diff --git a/rust/extractor/src/translate/generated.rs b/rust/extractor/src/translate/generated.rs
index f6f2df6483be..57d3cbc186b9 100644
--- a/rust/extractor/src/translate/generated.rs
+++ b/rust/extractor/src/translate/generated.rs
@@ -1,7 +1,9 @@
 //! Generated by `ast-generator`, do not edit by hand.
 
-use super::base::{TextValue, Translator};
+#![cfg_attr(any(), rustfmt::skip)]
+
 use crate::generated;
+use super::base::{TextValue, Translator};
 use crate::trap::{Label, TrapId};
 use ra_ap_syntax::ast::{
     HasArgList, HasAttrs, HasGenericArgs, HasGenericParams, HasLoopBody, HasModuleItem, HasName,
@@ -67,10 +69,7 @@ impl Translator {
         }
     }
 
-    pub(crate) fn emit_extern_item(
-        &mut self,
-        node: ast::ExternItem,
-    ) -> Label<generated::ExternItem> {
+    pub(crate) fn emit_extern_item(&mut self, node: ast::ExternItem) -> Label<generated::ExternItem> {
         match node {
             ast::ExternItem::Fn(inner) => self.emit_fn(inner).into(),
             ast::ExternItem::MacroCall(inner) => self.emit_macro_call(inner).into(),
@@ -86,10 +85,7 @@ impl Translator {
         }
     }
 
-    pub(crate) fn emit_generic_arg(
-        &mut self,
-        node: ast::GenericArg,
-    ) -> Label<generated::GenericArg> {
+    pub(crate) fn emit_generic_arg(&mut self, node: ast::GenericArg) -> Label<generated::GenericArg> {
         match node {
             ast::GenericArg::AssocTypeArg(inner) => self.emit_assoc_type_arg(inner).into(),
             ast::GenericArg::ConstArg(inner) => self.emit_const_arg(inner).into(),
@@ -98,10 +94,7 @@ impl Translator {
         }
     }
 
-    pub(crate) fn emit_generic_param(
-        &mut self,
-        node: ast::GenericParam,
-    ) -> Label<generated::GenericParam> {
+    pub(crate) fn emit_generic_param(&mut self, node: ast::GenericParam) -> Label<generated::GenericParam> {
         match node {
             ast::GenericParam::ConstParam(inner) => self.emit_const_param(inner).into(),
             ast::GenericParam::LifetimeParam(inner) => self.emit_lifetime_param(inner).into(),
@@ -240,14 +233,8 @@ impl Translator {
         label
     }
 
-    pub(crate) fn emit_assoc_item_list(
-        &mut self,
-        node: ast::AssocItemList,
-    ) -> Label<generated::AssocItemList> {
-        let assoc_items = node
-            .assoc_items()
-            .map(|x| self.emit_assoc_item(x))
-            .collect();
+    pub(crate) fn emit_assoc_item_list(&mut self, node: ast::AssocItemList) -> Label<generated::AssocItemList> {
+        let assoc_items = node.assoc_items().map(|x| self.emit_assoc_item(x)).collect();
         let attrs = node.attrs().map(|x| self.emit_attr(x)).collect();
         let label = self.trap.emit(generated::AssocItemList {
             id: TrapId::Star,
@@ -259,20 +246,13 @@ impl Translator {
         label
     }
 
-    pub(crate) fn emit_assoc_type_arg(
-        &mut self,
-        node: ast::AssocTypeArg,
-    ) -> Label<generated::AssocTypeArg> {
+    pub(crate) fn emit_assoc_type_arg(&mut self, node: ast::AssocTypeArg) -> Label<generated::AssocTypeArg> {
         let const_arg = node.const_arg().map(|x| self.emit_const_arg(x));
-        let generic_arg_list = node
-            .generic_arg_list()
-            .map(|x| self.emit_generic_arg_list(x));
+        let generic_arg_list = node.generic_arg_list().map(|x| self.emit_generic_arg_list(x));
         let name_ref = node.name_ref().map(|x| self.emit_name_ref(x));
         let param_list = node.param_list().map(|x| self.emit_param_list(x));
         let ret_type = node.ret_type().map(|x| self.emit_ret_type(x));
-        let return_type_syntax = node
-            .return_type_syntax()
-            .map(|x| self.emit_return_type_syntax(x));
+        let return_type_syntax = node.return_type_syntax().map(|x| self.emit_return_type_syntax(x));
         let ty = node.ty().map(|x| self.emit_type(x));
         let type_bound_list = node.type_bound_list().map(|x| self.emit_type_bound_list(x));
         let label = self.trap.emit(generated::AssocTypeArg {
@@ -315,10 +295,7 @@ impl Translator {
         label
     }
 
-    pub(crate) fn emit_become_expr(
-        &mut self,
-        node: ast::BecomeExpr,
-    ) -> Label<generated::BecomeExpr> {
+    pub(crate) fn emit_become_expr(&mut self, node: ast::BecomeExpr) -> Label<generated::BecomeExpr> {
         let attrs = node.attrs().map(|x| self.emit_attr(x)).collect();
         let expr = node.expr().map(|x| self.emit_expr(x));
         let label = self.trap.emit(generated::BecomeExpr {
@@ -419,13 +396,8 @@ impl Translator {
         label
     }
 
-    pub(crate) fn emit_closure_binder(
-        &mut self,
-        node: ast::ClosureBinder,
-    ) -> Label<generated::ClosureBinder> {
-        let generic_param_list = node
-            .generic_param_list()
-            .map(|x| self.emit_generic_param_list(x));
+    pub(crate) fn emit_closure_binder(&mut self, node: ast::ClosureBinder) -> Label<generated::ClosureBinder> {
+        let generic_param_list = node.generic_param_list().map(|x| self.emit_generic_param_list(x));
         let label = self.trap.emit(generated::ClosureBinder {
             id: TrapId::Star,
             generic_param_list,
@@ -435,10 +407,7 @@ impl Translator {
         label
     }
 
-    pub(crate) fn emit_closure_expr(
-        &mut self,
-        node: ast::ClosureExpr,
-    ) -> Label<generated::ClosureExpr> {
+    pub(crate) fn emit_closure_expr(&mut self, node: ast::ClosureExpr) -> Label<generated::ClosureExpr> {
         let attrs = node.attrs().map(|x| self.emit_attr(x)).collect();
         let body = node.body().map(|x| self.emit_expr(x));
         let closure_binder = node.closure_binder().map(|x| self.emit_closure_binder(x));
@@ -487,10 +456,7 @@ impl Translator {
         label
     }
 
-    pub(crate) fn emit_const_block_pat(
-        &mut self,
-        node: ast::ConstBlockPat,
-    ) -> Label<generated::ConstBlockPat> {
+    pub(crate) fn emit_const_block_pat(&mut self, node: ast::ConstBlockPat) -> Label<generated::ConstBlockPat> {
         let block_expr = node.block_expr().map(|x| self.emit_block_expr(x));
         let label = self.trap.emit(generated::ConstBlockPat {
             id: TrapId::Star,
@@ -501,10 +467,7 @@ impl Translator {
         label
     }
 
-    pub(crate) fn emit_const_param(
-        &mut self,
-        node: ast::ConstParam,
-    ) -> Label<generated::ConstParam> {
+    pub(crate) fn emit_const_param(&mut self, node: ast::ConstParam) -> Label<generated::ConstParam> {
         let attrs = node.attrs().map(|x| self.emit_attr(x)).collect();
         let default_val = node.default_val().map(|x| self.emit_const_arg(x));
         let name = node.name().map(|x| self.emit_name(x));
@@ -521,10 +484,7 @@ impl Translator {
         label
     }
 
-    pub(crate) fn emit_continue_expr(
-        &mut self,
-        node: ast::ContinueExpr,
-    ) -> Label<generated::ContinueExpr> {
+    pub(crate) fn emit_continue_expr(&mut self, node: ast::ContinueExpr) -> Label<generated::ContinueExpr> {
         let attrs = node.attrs().map(|x| self.emit_attr(x)).collect();
         let lifetime = node.lifetime().map(|x| self.emit_lifetime(x));
         let label = self.trap.emit(generated::ContinueExpr {
@@ -537,10 +497,7 @@ impl Translator {
         label
     }
 
-    pub(crate) fn emit_dyn_trait_type(
-        &mut self,
-        node: ast::DynTraitType,
-    ) -> Label<generated::DynTraitType> {
+    pub(crate) fn emit_dyn_trait_type(&mut self, node: ast::DynTraitType) -> Label<generated::DynTraitType> {
         let type_bound_list = node.type_bound_list().map(|x| self.emit_type_bound_list(x));
         let label = self.trap.emit(generated::DynTraitType {
             id: TrapId::Star,
@@ -553,9 +510,7 @@ impl Translator {
 
     pub(crate) fn emit_enum(&mut self, node: ast::Enum) -> Label<generated::Enum> {
         let attrs = node.attrs().map(|x| self.emit_attr(x)).collect();
-        let generic_param_list = node
-            .generic_param_list()
-            .map(|x| self.emit_generic_param_list(x));
+        let generic_param_list = node.generic_param_list().map(|x| self.emit_generic_param_list(x));
         let name = node.name().map(|x| self.emit_name(x));
         let variant_list = node.variant_list().map(|x| self.emit_variant_list(x));
         let visibility = node.visibility().map(|x| self.emit_visibility(x));
@@ -585,15 +540,10 @@ impl Translator {
         label
     }
 
-    pub(crate) fn emit_extern_block(
-        &mut self,
-        node: ast::ExternBlock,
-    ) -> Label<generated::ExternBlock> {
+    pub(crate) fn emit_extern_block(&mut self, node: ast::ExternBlock) -> Label<generated::ExternBlock> {
         let abi = node.abi().map(|x| self.emit_abi(x));
         let attrs = node.attrs().map(|x| self.emit_attr(x)).collect();
-        let extern_item_list = node
-            .extern_item_list()
-            .map(|x| self.emit_extern_item_list(x));
+        let extern_item_list = node.extern_item_list().map(|x| self.emit_extern_item_list(x));
         let label = self.trap.emit(generated::ExternBlock {
             id: TrapId::Star,
             abi,
@@ -605,10 +555,7 @@ impl Translator {
         label
     }
 
-    pub(crate) fn emit_extern_crate(
-        &mut self,
-        node: ast::ExternCrate,
-    ) -> Label<generated::ExternCrate> {
+    pub(crate) fn emit_extern_crate(&mut self, node: ast::ExternCrate) -> Label<generated::ExternCrate> {
         let attrs = node.attrs().map(|x| self.emit_attr(x)).collect();
         let name_ref = node.name_ref().map(|x| self.emit_name_ref(x));
         let rename = node.rename().map(|x| self.emit_rename(x));
@@ -625,15 +572,9 @@ impl Translator {
         label
     }
 
-    pub(crate) fn emit_extern_item_list(
-        &mut self,
-        node: ast::ExternItemList,
-    ) -> Label<generated::ExternItemList> {
+    pub(crate) fn emit_extern_item_list(&mut self, node: ast::ExternItemList) -> Label<generated::ExternItemList> {
         let attrs = node.attrs().map(|x| self.emit_attr(x)).collect();
-        let extern_items = node
-            .extern_items()
-            .map(|x| self.emit_extern_item(x))
-            .collect();
+        let extern_items = node.extern_items().map(|x| self.emit_extern_item(x)).collect();
         let label = self.trap.emit(generated::ExternItemList {
             id: TrapId::Star,
             attrs,
@@ -663,9 +604,7 @@ impl Translator {
         let abi = node.abi().map(|x| self.emit_abi(x));
         let attrs = node.attrs().map(|x| self.emit_attr(x)).collect();
         let body = node.body().map(|x| self.emit_block_expr(x));
-        let generic_param_list = node
-            .generic_param_list()
-            .map(|x| self.emit_generic_param_list(x));
+        let generic_param_list = node.generic_param_list().map(|x| self.emit_generic_param_list(x));
         let name = node.name().map(|x| self.emit_name(x));
         let param_list = node.param_list().map(|x| self.emit_param_list(x));
         let ret_type = node.ret_type().map(|x| self.emit_ret_type(x));
@@ -723,9 +662,7 @@ impl Translator {
     }
 
     pub(crate) fn emit_for_type(&mut self, node: ast::ForType) -> Label<generated::ForType> {
-        let generic_param_list = node
-            .generic_param_list()
-            .map(|x| self.emit_generic_param_list(x));
+        let generic_param_list = node.generic_param_list().map(|x| self.emit_generic_param_list(x));
         let ty = node.ty().map(|x| self.emit_type(x));
         let label = self.trap.emit(generated::ForType {
             id: TrapId::Star,
@@ -737,10 +674,7 @@ impl Translator {
         label
     }
 
-    pub(crate) fn emit_format_args_arg(
-        &mut self,
-        node: ast::FormatArgsArg,
-    ) -> Label<generated::FormatArgsArg> {
+    pub(crate) fn emit_format_args_arg(&mut self, node: ast::FormatArgsArg) -> Label<generated::FormatArgsArg> {
         let expr = node.expr().map(|x| self.emit_expr(x));
         let name = node.name().map(|x| self.emit_name(x));
         let label = self.trap.emit(generated::FormatArgsArg {
@@ -753,10 +687,7 @@ impl Translator {
         label
     }
 
-    pub(crate) fn emit_format_args_expr(
-        &mut self,
-        node: ast::FormatArgsExpr,
-    ) -> Label<generated::FormatArgsExpr> {
+    pub(crate) fn emit_format_args_expr(&mut self, node: ast::FormatArgsExpr) -> Label<generated::FormatArgsExpr> {
         let args = node.args().map(|x| self.emit_format_args_arg(x)).collect();
         let attrs = node.attrs().map(|x| self.emit_attr(x)).collect();
         let template = node.template().map(|x| self.emit_expr(x));
@@ -771,14 +702,8 @@ impl Translator {
         label
     }
 
-    pub(crate) fn emit_generic_arg_list(
-        &mut self,
-        node: ast::GenericArgList,
-    ) -> Label<generated::GenericArgList> {
-        let generic_args = node
-            .generic_args()
-            .map(|x| self.emit_generic_arg(x))
-            .collect();
+    pub(crate) fn emit_generic_arg_list(&mut self, node: ast::GenericArgList) -> Label<generated::GenericArgList> {
+        let generic_args = node.generic_args().map(|x| self.emit_generic_arg(x)).collect();
         let label = self.trap.emit(generated::GenericArgList {
             id: TrapId::Star,
             generic_args,
@@ -788,14 +713,8 @@ impl Translator {
         label
     }
 
-    pub(crate) fn emit_generic_param_list(
-        &mut self,
-        node: ast::GenericParamList,
-    ) -> Label<generated::GenericParamList> {
-        let generic_params = node
-            .generic_params()
-            .map(|x| self.emit_generic_param(x))
-            .collect();
+    pub(crate) fn emit_generic_param_list(&mut self, node: ast::GenericParamList) -> Label<generated::GenericParamList> {
+        let generic_params = node.generic_params().map(|x| self.emit_generic_param(x)).collect();
         let label = self.trap.emit(generated::GenericParamList {
             id: TrapId::Star,
             generic_params,
@@ -840,9 +759,7 @@ impl Translator {
     pub(crate) fn emit_impl(&mut self, node: ast::Impl) -> Label<generated::Impl> {
         let assoc_item_list = node.assoc_item_list().map(|x| self.emit_assoc_item_list(x));
         let attrs = node.attrs().map(|x| self.emit_attr(x)).collect();
-        let generic_param_list = node
-            .generic_param_list()
-            .map(|x| self.emit_generic_param_list(x));
+        let generic_param_list = node.generic_param_list().map(|x| self.emit_generic_param_list(x));
         let self_ty = node.self_ty().map(|x| self.emit_type(x));
         let trait_ = node.trait_().map(|x| self.emit_type(x));
         let visibility = node.visibility().map(|x| self.emit_visibility(x));
@@ -862,10 +779,7 @@ impl Translator {
         label
     }
 
-    pub(crate) fn emit_impl_trait_type(
-        &mut self,
-        node: ast::ImplTraitType,
-    ) -> Label<generated::ImplTraitType> {
+    pub(crate) fn emit_impl_trait_type(&mut self, node: ast::ImplTraitType) -> Label<generated::ImplTraitType> {
         let type_bound_list = node.type_bound_list().map(|x| self.emit_type_bound_list(x));
         let label = self.trap.emit(generated::ImplTraitType {
             id: TrapId::Star,
@@ -892,7 +806,9 @@ impl Translator {
     }
 
     pub(crate) fn emit_infer_type(&mut self, node: ast::InferType) -> Label<generated::InferType> {
-        let label = self.trap.emit(generated::InferType { id: TrapId::Star });
+        let label = self.trap.emit(generated::InferType {
+            id: TrapId::Star,
+        });
         self.emit_location(label, &node);
         self.emit_tokens(label.into(), node.syntax().children_with_tokens());
         label
@@ -978,10 +894,7 @@ impl Translator {
         label
     }
 
-    pub(crate) fn emit_lifetime_arg(
-        &mut self,
-        node: ast::LifetimeArg,
-    ) -> Label<generated::LifetimeArg> {
+    pub(crate) fn emit_lifetime_arg(&mut self, node: ast::LifetimeArg) -> Label<generated::LifetimeArg> {
         let lifetime = node.lifetime().map(|x| self.emit_lifetime(x));
         let label = self.trap.emit(generated::LifetimeArg {
             id: TrapId::Star,
@@ -992,10 +905,7 @@ impl Translator {
         label
     }
 
-    pub(crate) fn emit_lifetime_param(
-        &mut self,
-        node: ast::LifetimeParam,
-    ) -> Label<generated::LifetimeParam> {
+    pub(crate) fn emit_lifetime_param(&mut self, node: ast::LifetimeParam) -> Label<generated::LifetimeParam> {
         let attrs = node.attrs().map(|x| self.emit_attr(x)).collect();
         let lifetime = node.lifetime().map(|x| self.emit_lifetime(x));
         let type_bound_list = node.type_bound_list().map(|x| self.emit_type_bound_list(x));
@@ -1023,10 +933,7 @@ impl Translator {
         label
     }
 
-    pub(crate) fn emit_literal_pat(
-        &mut self,
-        node: ast::LiteralPat,
-    ) -> Label<generated::LiteralPat> {
+    pub(crate) fn emit_literal_pat(&mut self, node: ast::LiteralPat) -> Label<generated::LiteralPat> {
         let literal = node.literal().map(|x| self.emit_literal(x));
         let label = self.trap.emit(generated::LiteralPat {
             id: TrapId::Star,
@@ -1108,10 +1015,7 @@ impl Translator {
         label
     }
 
-    pub(crate) fn emit_macro_rules(
-        &mut self,
-        node: ast::MacroRules,
-    ) -> Label<generated::MacroRules> {
+    pub(crate) fn emit_macro_rules(&mut self, node: ast::MacroRules) -> Label<generated::MacroRules> {
         let attrs = node.attrs().map(|x| self.emit_attr(x)).collect();
         let name = node.name().map(|x| self.emit_name(x));
         let token_tree = node.token_tree().map(|x| self.emit_token_tree(x));
@@ -1156,10 +1060,7 @@ impl Translator {
         label
     }
 
-    pub(crate) fn emit_match_arm_list(
-        &mut self,
-        node: ast::MatchArmList,
-    ) -> Label<generated::MatchArmList> {
+    pub(crate) fn emit_match_arm_list(&mut self, node: ast::MatchArmList) -> Label<generated::MatchArmList> {
         let arms = node.arms().map(|x| self.emit_match_arm(x)).collect();
         let attrs = node.attrs().map(|x| self.emit_attr(x)).collect();
         let label = self.trap.emit(generated::MatchArmList {
@@ -1187,10 +1088,7 @@ impl Translator {
         label
     }
 
-    pub(crate) fn emit_match_guard(
-        &mut self,
-        node: ast::MatchGuard,
-    ) -> Label<generated::MatchGuard> {
+    pub(crate) fn emit_match_guard(&mut self, node: ast::MatchGuard) -> Label<generated::MatchGuard> {
         let condition = node.condition().map(|x| self.emit_expr(x));
         let label = self.trap.emit(generated::MatchGuard {
             id: TrapId::Star,
@@ -1216,15 +1114,10 @@ impl Translator {
         label
     }
 
-    pub(crate) fn emit_method_call_expr(
-        &mut self,
-        node: ast::MethodCallExpr,
-    ) -> Label<generated::MethodCallExpr> {
+    pub(crate) fn emit_method_call_expr(&mut self, node: ast::MethodCallExpr) -> Label<generated::MethodCallExpr> {
         let arg_list = node.arg_list().map(|x| self.emit_arg_list(x));
         let attrs = node.attrs().map(|x| self.emit_attr(x)).collect();
-        let generic_arg_list = node
-            .generic_arg_list()
-            .map(|x| self.emit_generic_arg_list(x));
+        let generic_arg_list = node.generic_arg_list().map(|x| self.emit_generic_arg_list(x));
         let name_ref = node.name_ref().map(|x| self.emit_name_ref(x));
         let receiver = node.receiver().map(|x| self.emit_expr(x));
         let label = self.trap.emit(generated::MethodCallExpr {
@@ -1280,16 +1173,15 @@ impl Translator {
     }
 
     pub(crate) fn emit_never_type(&mut self, node: ast::NeverType) -> Label<generated::NeverType> {
-        let label = self.trap.emit(generated::NeverType { id: TrapId::Star });
+        let label = self.trap.emit(generated::NeverType {
+            id: TrapId::Star,
+        });
         self.emit_location(label, &node);
         self.emit_tokens(label.into(), node.syntax().children_with_tokens());
         label
     }
 
-    pub(crate) fn emit_offset_of_expr(
-        &mut self,
-        node: ast::OffsetOfExpr,
-    ) -> Label<generated::OffsetOfExpr> {
+    pub(crate) fn emit_offset_of_expr(&mut self, node: ast::OffsetOfExpr) -> Label<generated::OffsetOfExpr> {
         let attrs = node.attrs().map(|x| self.emit_attr(x)).collect();
         let fields = node.fields().map(|x| self.emit_name_ref(x)).collect();
         let ty = node.ty().map(|x| self.emit_type(x));
@@ -1415,20 +1307,13 @@ impl Translator {
         label
     }
 
-    pub(crate) fn emit_path_segment(
-        &mut self,
-        node: ast::PathSegment,
-    ) -> Label<generated::PathSegment> {
-        let generic_arg_list = node
-            .generic_arg_list()
-            .map(|x| self.emit_generic_arg_list(x));
+    pub(crate) fn emit_path_segment(&mut self, node: ast::PathSegment) -> Label<generated::PathSegment> {
+        let generic_arg_list = node.generic_arg_list().map(|x| self.emit_generic_arg_list(x));
         let name_ref = node.name_ref().map(|x| self.emit_name_ref(x));
         let param_list = node.param_list().map(|x| self.emit_param_list(x));
         let path_type = node.path_type().map(|x| self.emit_path_type(x));
         let ret_type = node.ret_type().map(|x| self.emit_ret_type(x));
-        let return_type_syntax = node
-            .return_type_syntax()
-            .map(|x| self.emit_return_type_syntax(x));
+        let return_type_syntax = node.return_type_syntax().map(|x| self.emit_return_type_syntax(x));
         let ty = node.ty().map(|x| self.emit_type(x));
         let label = self.trap.emit(generated::PathSegment {
             id: TrapId::Star,
@@ -1456,10 +1341,7 @@ impl Translator {
         label
     }
 
-    pub(crate) fn emit_prefix_expr(
-        &mut self,
-        node: ast::PrefixExpr,
-    ) -> Label<generated::PrefixExpr> {
+    pub(crate) fn emit_prefix_expr(&mut self, node: ast::PrefixExpr) -> Label<generated::PrefixExpr> {
         let attrs = node.attrs().map(|x| self.emit_attr(x)).collect();
         let expr = node.expr().map(|x| self.emit_expr(x));
         let operator_name = node.try_get_text();
@@ -1517,14 +1399,9 @@ impl Translator {
         label
     }
 
-    pub(crate) fn emit_record_expr(
-        &mut self,
-        node: ast::RecordExpr,
-    ) -> Label<generated::RecordExpr> {
+    pub(crate) fn emit_record_expr(&mut self, node: ast::RecordExpr) -> Label<generated::RecordExpr> {
         let path = node.path().map(|x| self.emit_path(x));
-        let record_expr_field_list = node
-            .record_expr_field_list()
-            .map(|x| self.emit_record_expr_field_list(x));
+        let record_expr_field_list = node.record_expr_field_list().map(|x| self.emit_record_expr_field_list(x));
         let label = self.trap.emit(generated::RecordExpr {
             id: TrapId::Star,
             path,
@@ -1535,10 +1412,7 @@ impl Translator {
         label
     }
 
-    pub(crate) fn emit_record_expr_field(
-        &mut self,
-        node: ast::RecordExprField,
-    ) -> Label<generated::RecordExprField> {
+    pub(crate) fn emit_record_expr_field(&mut self, node: ast::RecordExprField) -> Label<generated::RecordExprField> {
         let attrs = node.attrs().map(|x| self.emit_attr(x)).collect();
         let expr = node.expr().map(|x| self.emit_expr(x));
         let name_ref = node.name_ref().map(|x| self.emit_name_ref(x));
@@ -1553,15 +1427,9 @@ impl Translator {
         label
     }
 
-    pub(crate) fn emit_record_expr_field_list(
-        &mut self,
-        node: ast::RecordExprFieldList,
-    ) -> Label<generated::RecordExprFieldList> {
+    pub(crate) fn emit_record_expr_field_list(&mut self, node: ast::RecordExprFieldList) -> Label<generated::RecordExprFieldList> {
         let attrs = node.attrs().map(|x| self.emit_attr(x)).collect();
-        let fields = node
-            .fields()
-            .map(|x| self.emit_record_expr_field(x))
-            .collect();
+        let fields = node.fields().map(|x| self.emit_record_expr_field(x)).collect();
         let spread = node.spread().map(|x| self.emit_expr(x));
         let label = self.trap.emit(generated::RecordExprFieldList {
             id: TrapId::Star,
@@ -1574,10 +1442,7 @@ impl Translator {
         label
     }
 
-    pub(crate) fn emit_record_field(
-        &mut self,
-        node: ast::RecordField,
-    ) -> Label<generated::RecordField> {
+    pub(crate) fn emit_record_field(&mut self, node: ast::RecordField) -> Label<generated::RecordField> {
         let attrs = node.attrs().map(|x| self.emit_attr(x)).collect();
         let name = node.name().map(|x| self.emit_name(x));
         let ty = node.ty().map(|x| self.emit_type(x));
@@ -1594,10 +1459,7 @@ impl Translator {
         label
     }
 
-    pub(crate) fn emit_record_field_list(
-        &mut self,
-        node: ast::RecordFieldList,
-    ) -> Label<generated::RecordFieldList> {
+    pub(crate) fn emit_record_field_list(&mut self, node: ast::RecordFieldList) -> Label<generated::RecordFieldList> {
         let fields = node.fields().map(|x| self.emit_record_field(x)).collect();
         let label = self.trap.emit(generated::RecordFieldList {
             id: TrapId::Star,
@@ -1610,9 +1472,7 @@ impl Translator {
 
     pub(crate) fn emit_record_pat(&mut self, node: ast::RecordPat) -> Label<generated::RecordPat> {
         let path = node.path().map(|x| self.emit_path(x));
-        let record_pat_field_list = node
-            .record_pat_field_list()
-            .map(|x| self.emit_record_pat_field_list(x));
+        let record_pat_field_list = node.record_pat_field_list().map(|x| self.emit_record_pat_field_list(x));
         let label = self.trap.emit(generated::RecordPat {
             id: TrapId::Star,
             path,
@@ -1623,10 +1483,7 @@ impl Translator {
         label
     }
 
-    pub(crate) fn emit_record_pat_field(
-        &mut self,
-        node: ast::RecordPatField,
-    ) -> Label<generated::RecordPatField> {
+    pub(crate) fn emit_record_pat_field(&mut self, node: ast::RecordPatField) -> Label<generated::RecordPatField> {
         let attrs = node.attrs().map(|x| self.emit_attr(x)).collect();
         let name_ref = node.name_ref().map(|x| self.emit_name_ref(x));
         let pat = node.pat().map(|x| self.emit_pat(x));
@@ -1641,14 +1498,8 @@ impl Translator {
         label
     }
 
-    pub(crate) fn emit_record_pat_field_list(
-        &mut self,
-        node: ast::RecordPatFieldList,
-    ) -> Label<generated::RecordPatFieldList> {
-        let fields = node
-            .fields()
-            .map(|x| self.emit_record_pat_field(x))
-            .collect();
+    pub(crate) fn emit_record_pat_field_list(&mut self, node: ast::RecordPatFieldList) -> Label<generated::RecordPatFieldList> {
+        let fields = node.fields().map(|x| self.emit_record_pat_field(x)).collect();
         let rest_pat = node.rest_pat().map(|x| self.emit_rest_pat(x));
         let label = self.trap.emit(generated::RecordPatFieldList {
             id: TrapId::Star,
@@ -1730,10 +1581,7 @@ impl Translator {
         label
     }
 
-    pub(crate) fn emit_return_expr(
-        &mut self,
-        node: ast::ReturnExpr,
-    ) -> Label<generated::ReturnExpr> {
+    pub(crate) fn emit_return_expr(&mut self, node: ast::ReturnExpr) -> Label<generated::ReturnExpr> {
         let attrs = node.attrs().map(|x| self.emit_attr(x)).collect();
         let expr = node.expr().map(|x| self.emit_expr(x));
         let label = self.trap.emit(generated::ReturnExpr {
@@ -1746,13 +1594,10 @@ impl Translator {
         label
     }
 
-    pub(crate) fn emit_return_type_syntax(
-        &mut self,
-        node: ast::ReturnTypeSyntax,
-    ) -> Label<generated::ReturnTypeSyntax> {
-        let label = self
-            .trap
-            .emit(generated::ReturnTypeSyntax { id: TrapId::Star });
+    pub(crate) fn emit_return_type_syntax(&mut self, node: ast::ReturnTypeSyntax) -> Label<generated::ReturnTypeSyntax> {
+        let label = self.trap.emit(generated::ReturnTypeSyntax {
+            id: TrapId::Star,
+        });
         self.emit_location(label, &node);
         self.emit_tokens(label.into(), node.syntax().children_with_tokens());
         label
@@ -1797,10 +1642,7 @@ impl Translator {
         label
     }
 
-    pub(crate) fn emit_source_file(
-        &mut self,
-        node: ast::SourceFile,
-    ) -> Label<generated::SourceFile> {
+    pub(crate) fn emit_source_file(&mut self, node: ast::SourceFile) -> Label<generated::SourceFile> {
         let attrs = node.attrs().map(|x| self.emit_attr(x)).collect();
         let items = node.items().map(|x| self.emit_item(x)).collect();
         let label = self.trap.emit(generated::SourceFile {
@@ -1850,9 +1692,7 @@ impl Translator {
     pub(crate) fn emit_struct(&mut self, node: ast::Struct) -> Label<generated::Struct> {
         let attrs = node.attrs().map(|x| self.emit_attr(x)).collect();
         let field_list = node.field_list().map(|x| self.emit_field_list(x));
-        let generic_param_list = node
-            .generic_param_list()
-            .map(|x| self.emit_generic_param_list(x));
+        let generic_param_list = node.generic_param_list().map(|x| self.emit_generic_param_list(x));
         let name = node.name().map(|x| self.emit_name(x));
         let visibility = node.visibility().map(|x| self.emit_visibility(x));
         let where_clause = node.where_clause().map(|x| self.emit_where_clause(x));
@@ -1871,7 +1711,9 @@ impl Translator {
     }
 
     pub(crate) fn emit_token_tree(&mut self, node: ast::TokenTree) -> Label<generated::TokenTree> {
-        let label = self.trap.emit(generated::TokenTree { id: TrapId::Star });
+        let label = self.trap.emit(generated::TokenTree {
+            id: TrapId::Star,
+        });
         self.emit_location(label, &node);
         self.emit_tokens(label.into(), node.syntax().children_with_tokens());
         label
@@ -1880,9 +1722,7 @@ impl Translator {
     pub(crate) fn emit_trait(&mut self, node: ast::Trait) -> Label<generated::Trait> {
         let assoc_item_list = node.assoc_item_list().map(|x| self.emit_assoc_item_list(x));
         let attrs = node.attrs().map(|x| self.emit_attr(x)).collect();
-        let generic_param_list = node
-            .generic_param_list()
-            .map(|x| self.emit_generic_param_list(x));
+        let generic_param_list = node.generic_param_list().map(|x| self.emit_generic_param_list(x));
         let name = node.name().map(|x| self.emit_name(x));
         let type_bound_list = node.type_bound_list().map(|x| self.emit_type_bound_list(x));
         let visibility = node.visibility().map(|x| self.emit_visibility(x));
@@ -1902,14 +1742,9 @@ impl Translator {
         label
     }
 
-    pub(crate) fn emit_trait_alias(
-        &mut self,
-        node: ast::TraitAlias,
-    ) -> Label<generated::TraitAlias> {
+    pub(crate) fn emit_trait_alias(&mut self, node: ast::TraitAlias) -> Label<generated::TraitAlias> {
         let attrs = node.attrs().map(|x| self.emit_attr(x)).collect();
-        let generic_param_list = node
-            .generic_param_list()
-            .map(|x| self.emit_generic_param_list(x));
+        let generic_param_list = node.generic_param_list().map(|x| self.emit_generic_param_list(x));
         let name = node.name().map(|x| self.emit_name(x));
         let type_bound_list = node.type_bound_list().map(|x| self.emit_type_bound_list(x));
         let visibility = node.visibility().map(|x| self.emit_visibility(x));
@@ -1954,10 +1789,7 @@ impl Translator {
         label
     }
 
-    pub(crate) fn emit_tuple_field(
-        &mut self,
-        node: ast::TupleField,
-    ) -> Label<generated::TupleField> {
+    pub(crate) fn emit_tuple_field(&mut self, node: ast::TupleField) -> Label<generated::TupleField> {
         let attrs = node.attrs().map(|x| self.emit_attr(x)).collect();
         let ty = node.ty().map(|x| self.emit_type(x));
         let visibility = node.visibility().map(|x| self.emit_visibility(x));
@@ -1972,10 +1804,7 @@ impl Translator {
         label
     }
 
-    pub(crate) fn emit_tuple_field_list(
-        &mut self,
-        node: ast::TupleFieldList,
-    ) -> Label<generated::TupleFieldList> {
+    pub(crate) fn emit_tuple_field_list(&mut self, node: ast::TupleFieldList) -> Label<generated::TupleFieldList> {
         let fields = node.fields().map(|x| self.emit_tuple_field(x)).collect();
         let label = self.trap.emit(generated::TupleFieldList {
             id: TrapId::Star,
@@ -1997,10 +1826,7 @@ impl Translator {
         label
     }
 
-    pub(crate) fn emit_tuple_struct_pat(
-        &mut self,
-        node: ast::TupleStructPat,
-    ) -> Label<generated::TupleStructPat> {
+    pub(crate) fn emit_tuple_struct_pat(&mut self, node: ast::TupleStructPat) -> Label<generated::TupleStructPat> {
         let fields = node.fields().map(|x| self.emit_pat(x)).collect();
         let path = node.path().map(|x| self.emit_path(x));
         let label = self.trap.emit(generated::TupleStructPat {
@@ -2026,9 +1852,7 @@ impl Translator {
 
     pub(crate) fn emit_type_alias(&mut self, node: ast::TypeAlias) -> Label<generated::TypeAlias> {
         let attrs = node.attrs().map(|x| self.emit_attr(x)).collect();
-        let generic_param_list = node
-            .generic_param_list()
-            .map(|x| self.emit_generic_param_list(x));
+        let generic_param_list = node.generic_param_list().map(|x| self.emit_generic_param_list(x));
         let name = node.name().map(|x| self.emit_name(x));
         let ty = node.ty().map(|x| self.emit_type(x));
         let type_bound_list = node.type_bound_list().map(|x| self.emit_type_bound_list(x));
@@ -2061,9 +1885,7 @@ impl Translator {
     }
 
     pub(crate) fn emit_type_bound(&mut self, node: ast::TypeBound) -> Label<generated::TypeBound> {
-        let generic_param_list = node
-            .generic_param_list()
-            .map(|x| self.emit_generic_param_list(x));
+        let generic_param_list = node.generic_param_list().map(|x| self.emit_generic_param_list(x));
         let lifetime = node.lifetime().map(|x| self.emit_lifetime(x));
         let ty = node.ty().map(|x| self.emit_type(x));
         let label = self.trap.emit(generated::TypeBound {
@@ -2077,10 +1899,7 @@ impl Translator {
         label
     }
 
-    pub(crate) fn emit_type_bound_list(
-        &mut self,
-        node: ast::TypeBoundList,
-    ) -> Label<generated::TypeBoundList> {
+    pub(crate) fn emit_type_bound_list(&mut self, node: ast::TypeBoundList) -> Label<generated::TypeBoundList> {
         let bounds = node.bounds().map(|x| self.emit_type_bound(x)).collect();
         let label = self.trap.emit(generated::TypeBoundList {
             id: TrapId::Star,
@@ -2108,10 +1927,7 @@ impl Translator {
         label
     }
 
-    pub(crate) fn emit_underscore_expr(
-        &mut self,
-        node: ast::UnderscoreExpr,
-    ) -> Label<generated::UnderscoreExpr> {
+    pub(crate) fn emit_underscore_expr(&mut self, node: ast::UnderscoreExpr) -> Label<generated::UnderscoreExpr> {
         let attrs = node.attrs().map(|x| self.emit_attr(x)).collect();
         let label = self.trap.emit(generated::UnderscoreExpr {
             id: TrapId::Star,
@@ -2124,13 +1940,9 @@ impl Translator {
 
     pub(crate) fn emit_union(&mut self, node: ast::Union) -> Label<generated::Union> {
         let attrs = node.attrs().map(|x| self.emit_attr(x)).collect();
-        let generic_param_list = node
-            .generic_param_list()
-            .map(|x| self.emit_generic_param_list(x));
+        let generic_param_list = node.generic_param_list().map(|x| self.emit_generic_param_list(x));
         let name = node.name().map(|x| self.emit_name(x));
-        let record_field_list = node
-            .record_field_list()
-            .map(|x| self.emit_record_field_list(x));
+        let record_field_list = node.record_field_list().map(|x| self.emit_record_field_list(x));
         let visibility = node.visibility().map(|x| self.emit_visibility(x));
         let where_clause = node.where_clause().map(|x| self.emit_where_clause(x));
         let label = self.trap.emit(generated::Union {
@@ -2177,10 +1989,7 @@ impl Translator {
         label
     }
 
-    pub(crate) fn emit_use_tree_list(
-        &mut self,
-        node: ast::UseTreeList,
-    ) -> Label<generated::UseTreeList> {
+    pub(crate) fn emit_use_tree_list(&mut self, node: ast::UseTreeList) -> Label<generated::UseTreeList> {
         let use_trees = node.use_trees().map(|x| self.emit_use_tree(x)).collect();
         let label = self.trap.emit(generated::UseTreeList {
             id: TrapId::Star,
@@ -2210,10 +2019,7 @@ impl Translator {
         label
     }
 
-    pub(crate) fn emit_variant_list(
-        &mut self,
-        node: ast::VariantList,
-    ) -> Label<generated::VariantList> {
+    pub(crate) fn emit_variant_list(&mut self, node: ast::VariantList) -> Label<generated::VariantList> {
         let variants = node.variants().map(|x| self.emit_variant(x)).collect();
         let label = self.trap.emit(generated::VariantList {
             id: TrapId::Star,
@@ -2224,10 +2030,7 @@ impl Translator {
         label
     }
 
-    pub(crate) fn emit_visibility(
-        &mut self,
-        node: ast::Visibility,
-    ) -> Label<generated::Visibility> {
+    pub(crate) fn emit_visibility(&mut self, node: ast::Visibility) -> Label<generated::Visibility> {
         let path = node.path().map(|x| self.emit_path(x));
         let label = self.trap.emit(generated::Visibility {
             id: TrapId::Star,
@@ -2238,10 +2041,7 @@ impl Translator {
         label
     }
 
-    pub(crate) fn emit_where_clause(
-        &mut self,
-        node: ast::WhereClause,
-    ) -> Label<generated::WhereClause> {
+    pub(crate) fn emit_where_clause(&mut self, node: ast::WhereClause) -> Label<generated::WhereClause> {
         let predicates = node.predicates().map(|x| self.emit_where_pred(x)).collect();
         let label = self.trap.emit(generated::WhereClause {
             id: TrapId::Star,
@@ -2253,9 +2053,7 @@ impl Translator {
     }
 
     pub(crate) fn emit_where_pred(&mut self, node: ast::WherePred) -> Label<generated::WherePred> {
-        let generic_param_list = node
-            .generic_param_list()
-            .map(|x| self.emit_generic_param_list(x));
+        let generic_param_list = node.generic_param_list().map(|x| self.emit_generic_param_list(x));
         let lifetime = node.lifetime().map(|x| self.emit_lifetime(x));
         let ty = node.ty().map(|x| self.emit_type(x));
         let type_bound_list = node.type_bound_list().map(|x| self.emit_type_bound_list(x));
@@ -2288,11 +2086,10 @@ impl Translator {
         label
     }
 
-    pub(crate) fn emit_wildcard_pat(
-        &mut self,
-        node: ast::WildcardPat,
-    ) -> Label<generated::WildcardPat> {
-        let label = self.trap.emit(generated::WildcardPat { id: TrapId::Star });
+    pub(crate) fn emit_wildcard_pat(&mut self, node: ast::WildcardPat) -> Label<generated::WildcardPat> {
+        let label = self.trap.emit(generated::WildcardPat {
+            id: TrapId::Star,
+        });
         self.emit_location(label, &node);
         self.emit_tokens(label.into(), node.syntax().children_with_tokens());
         label
@@ -2323,4 +2120,5 @@ impl Translator {
         self.emit_tokens(label.into(), node.syntax().children_with_tokens());
         label
     }
+
 }

From c9bd9e93033478bc99a8602b248136c0b6741b1c Mon Sep 17 00:00:00 2001
From: Mathias Vorreiter Pedersen <mathiasvp@github.com>
Date: Mon, 7 Oct 2024 16:47:43 +0100
Subject: [PATCH 184/347] C++: Modernize the
 'cpp/unclear-array-index-validation' query by getting rid of the
 DefaultTaintTracking barriers and replacing them with a 'BarrierGuard'
 instantiation.

---
 .../CWE-129/ImproperArrayIndexValidation.ql   | 100 ++++--------------
 1 file changed, 21 insertions(+), 79 deletions(-)

diff --git a/cpp/ql/src/Security/CWE/CWE-129/ImproperArrayIndexValidation.ql b/cpp/ql/src/Security/CWE/CWE-129/ImproperArrayIndexValidation.ql
index 107be7bddfde..0c5802a4c564 100644
--- a/cpp/ql/src/Security/CWE/CWE-129/ImproperArrayIndexValidation.ql
+++ b/cpp/ql/src/Security/CWE/CWE-129/ImproperArrayIndexValidation.ql
@@ -14,102 +14,44 @@
 
 import cpp
 import semmle.code.cpp.controlflow.IRGuards
-import semmle.code.cpp.security.FlowSources
-import semmle.code.cpp.ir.dataflow.TaintTracking
+import semmle.code.cpp.security.FlowSources as FS
+import semmle.code.cpp.dataflow.new.TaintTracking
 import semmle.code.cpp.rangeanalysis.RangeAnalysisUtils
 import ImproperArrayIndexValidation::PathGraph
-import semmle.code.cpp.security.Security
 
-predicate hasUpperBound(VariableAccess offsetExpr) {
-  exists(BasicBlock controlled, StackVariable offsetVar, SsaDefinition def |
-    controlled.contains(offsetExpr) and
-    linearBoundControls(controlled, def, offsetVar) and
-    offsetExpr = def.getAUse(offsetVar)
-  )
-}
-
-pragma[noinline]
-predicate linearBoundControls(BasicBlock controlled, SsaDefinition def, StackVariable offsetVar) {
-  exists(GuardCondition guard, boolean branch |
-    guard.controls(controlled, branch) and
-    cmpWithLinearBound(guard, def.getAUse(offsetVar), Lesser(), branch)
-  )
-}
-
-predicate readsVariable(LoadInstruction load, Variable var) {
-  load.getSourceAddress().(VariableAddressInstruction).getAstVariable() = var
+predicate isFlowSource(FS::FlowSource source, string sourceType) {
+  sourceType = source.getSourceType()
 }
 
-predicate hasUpperBoundsCheck(Variable var) {
-  exists(RelationalOperation oper, VariableAccess access |
-    oper.getAnOperand() = access and
-    access.getTarget() = var and
-    // Comparing to 0 is not an upper bound check
-    not oper.getAnOperand().getValue() = "0"
+predicate guardChecks(IRGuardCondition g, Expr e, boolean branch) {
+  exists(Operand op | op.getDef().getConvertedResultExpression() = e |
+    // op < k
+    g.comparesLt(op, _, true, any(BooleanValue bv | bv.getValue() = branch))
+    or
+    // op < _ + k
+    g.comparesLt(op, _, _, true, branch)
+    or
+    // op == k
+    g.comparesEq(op, _, true, any(BooleanValue bv | bv.getValue() = branch))
+    or
+    // op == _ + k
+    g.comparesEq(op, _, _, true, branch)
   )
 }
 
-predicate nodeIsBarrierEqualityCandidate(DataFlow::Node node, Operand access, Variable checkedVar) {
-  readsVariable(node.asInstruction(), checkedVar) and
-  any(IRGuardCondition guard).ensuresEq(access, _, _, node.asInstruction().getBlock(), true)
-}
-
-predicate isFlowSource(FlowSource source, string sourceType) { sourceType = source.getSourceType() }
-
-predicate predictableInstruction(Instruction instr) {
-  instr instanceof ConstantInstruction
-  or
-  instr instanceof StringConstantInstruction
-  or
-  // This could be a conversion on a string literal
-  predictableInstruction(instr.(UnaryInstruction).getUnary())
-}
-
 module ImproperArrayIndexValidationConfig implements DataFlow::ConfigSig {
   predicate isSource(DataFlow::Node source) { isFlowSource(source, _) }
 
   predicate isBarrier(DataFlow::Node node) {
-    hasUpperBound(node.asExpr())
-    or
-    // These barriers are ported from `DefaultTaintTracking` because this query is quite noisy
-    // otherwise.
-    exists(Variable checkedVar |
-      readsVariable(node.asInstruction(), checkedVar) and
-      hasUpperBoundsCheck(checkedVar)
-    )
-    or
-    exists(Variable checkedVar, Operand access |
-      readsVariable(access.getDef(), checkedVar) and
-      nodeIsBarrierEqualityCandidate(node, access, checkedVar)
-    )
-    or
-    // Don't use dataflow into binary instructions if both operands are unpredictable
-    exists(BinaryInstruction iTo |
-      iTo = node.asInstruction() and
-      not predictableInstruction(iTo.getLeft()) and
-      not predictableInstruction(iTo.getRight()) and
-      // propagate taint from either the pointer or the offset, regardless of predictability
-      not iTo instanceof PointerArithmeticInstruction
-    )
-    or
-    // don't use dataflow through calls to pure functions if two or more operands
-    // are unpredictable
-    exists(Instruction iFrom1, Instruction iFrom2, CallInstruction iTo |
-      iTo = node.asInstruction() and
-      isPureFunction(iTo.getStaticCallTarget().getName()) and
-      iFrom1 = iTo.getAnArgument() and
-      iFrom2 = iTo.getAnArgument() and
-      not predictableInstruction(iFrom1) and
-      not predictableInstruction(iFrom2) and
-      iFrom1 != iFrom2
-    )
+    node = DataFlow::BarrierGuard<guardChecks/3>::getABarrierNode()
   }
 
+  predicate isBarrierOut(DataFlow::Node node) { isSink(node) }
+
   predicate isSink(DataFlow::Node sink) {
     exists(ArrayExpr arrayExpr, VariableAccess offsetExpr |
       offsetExpr = arrayExpr.getArrayOffset() and
-      sink.asExpr() = offsetExpr and
-      not hasUpperBound(offsetExpr)
+      sink.asExpr() = offsetExpr
     )
   }
 }

From f6f5f5d4b4212ca38e81c2fc04c6fb675a5bc7a7 Mon Sep 17 00:00:00 2001
From: Mathias Vorreiter Pedersen <mathiasvp@github.com>
Date: Mon, 7 Oct 2024 16:49:34 +0100
Subject: [PATCH 185/347] C++: Accept test changes.

---
 .../ImproperArrayIndexValidation.expected                  | 7 +++++++
 .../CWE-129/semmle/ImproperArrayIndexValidation/test1.c    | 2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/cpp/ql/test/query-tests/Security/CWE/CWE-129/semmle/ImproperArrayIndexValidation/ImproperArrayIndexValidation.expected b/cpp/ql/test/query-tests/Security/CWE/CWE-129/semmle/ImproperArrayIndexValidation/ImproperArrayIndexValidation.expected
index d6ffc7aed578..3692ec4509df 100644
--- a/cpp/ql/test/query-tests/Security/CWE/CWE-129/semmle/ImproperArrayIndexValidation/ImproperArrayIndexValidation.expected
+++ b/cpp/ql/test/query-tests/Security/CWE/CWE-129/semmle/ImproperArrayIndexValidation/ImproperArrayIndexValidation.expected
@@ -2,12 +2,15 @@ edges
 | test1.c:7:26:7:29 | **argv | test1.c:8:11:8:14 | call to atoi | provenance | TaintFunction |
 | test1.c:8:11:8:14 | call to atoi | test1.c:9:9:9:9 | i | provenance |  |
 | test1.c:8:11:8:14 | call to atoi | test1.c:11:9:11:9 | i | provenance |  |
+| test1.c:8:11:8:14 | call to atoi | test1.c:12:9:12:9 | i | provenance |  |
 | test1.c:8:11:8:14 | call to atoi | test1.c:13:9:13:9 | i | provenance |  |
 | test1.c:9:9:9:9 | i | test1.c:16:16:16:16 | i | provenance |  |
 | test1.c:11:9:11:9 | i | test1.c:32:16:32:16 | i | provenance |  |
+| test1.c:12:9:12:9 | i | test1.c:40:16:40:16 | i | provenance |  |
 | test1.c:13:9:13:9 | i | test1.c:48:16:48:16 | i | provenance |  |
 | test1.c:16:16:16:16 | i | test1.c:18:16:18:16 | i | provenance |  |
 | test1.c:32:16:32:16 | i | test1.c:33:11:33:11 | i | provenance |  |
+| test1.c:40:16:40:16 | i | test1.c:41:11:41:11 | i | provenance |  |
 | test1.c:48:16:48:16 | i | test1.c:51:3:51:7 | ... = ... | provenance |  |
 | test1.c:51:3:51:7 | ... = ... | test1.c:53:15:53:15 | j | provenance |  |
 nodes
@@ -15,11 +18,14 @@ nodes
 | test1.c:8:11:8:14 | call to atoi | semmle.label | call to atoi |
 | test1.c:9:9:9:9 | i | semmle.label | i |
 | test1.c:11:9:11:9 | i | semmle.label | i |
+| test1.c:12:9:12:9 | i | semmle.label | i |
 | test1.c:13:9:13:9 | i | semmle.label | i |
 | test1.c:16:16:16:16 | i | semmle.label | i |
 | test1.c:18:16:18:16 | i | semmle.label | i |
 | test1.c:32:16:32:16 | i | semmle.label | i |
 | test1.c:33:11:33:11 | i | semmle.label | i |
+| test1.c:40:16:40:16 | i | semmle.label | i |
+| test1.c:41:11:41:11 | i | semmle.label | i |
 | test1.c:48:16:48:16 | i | semmle.label | i |
 | test1.c:51:3:51:7 | ... = ... | semmle.label | ... = ... |
 | test1.c:53:15:53:15 | j | semmle.label | j |
@@ -27,4 +33,5 @@ subpaths
 #select
 | test1.c:18:16:18:16 | i | test1.c:7:26:7:29 | **argv | test1.c:18:16:18:16 | i | An array indexing expression depends on $@ that might be outside the bounds of the array. | test1.c:7:26:7:29 | **argv | a command-line argument |
 | test1.c:33:11:33:11 | i | test1.c:7:26:7:29 | **argv | test1.c:33:11:33:11 | i | An array indexing expression depends on $@ that might be outside the bounds of the array. | test1.c:7:26:7:29 | **argv | a command-line argument |
+| test1.c:41:11:41:11 | i | test1.c:7:26:7:29 | **argv | test1.c:41:11:41:11 | i | An array indexing expression depends on $@ that might be outside the bounds of the array. | test1.c:7:26:7:29 | **argv | a command-line argument |
 | test1.c:53:15:53:15 | j | test1.c:7:26:7:29 | **argv | test1.c:53:15:53:15 | j | An array indexing expression depends on $@ that might be outside the bounds of the array. | test1.c:7:26:7:29 | **argv | a command-line argument |
diff --git a/cpp/ql/test/query-tests/Security/CWE/CWE-129/semmle/ImproperArrayIndexValidation/test1.c b/cpp/ql/test/query-tests/Security/CWE/CWE-129/semmle/ImproperArrayIndexValidation/test1.c
index 08484aef51fc..926b81dad7c3 100644
--- a/cpp/ql/test/query-tests/Security/CWE/CWE-129/semmle/ImproperArrayIndexValidation/test1.c
+++ b/cpp/ql/test/query-tests/Security/CWE/CWE-129/semmle/ImproperArrayIndexValidation/test1.c
@@ -38,7 +38,7 @@ void test3(int i) {
 }
 
 void test4(int i) {
-  myArray[i] = 0; // BAD: i has not been validated [NOT REPORTED]
+  myArray[i] = 0; // BAD: i has not been validated
 
   if ((i < 0) || (i >= 10)) return;
 

From afb5e4f8417c01760f0ac309624b912c9f8ab892 Mon Sep 17 00:00:00 2001
From: Mathias Vorreiter Pedersen <mathiasvp@github.com>
Date: Mon, 7 Oct 2024 16:57:48 +0100
Subject: [PATCH 186/347] C++: Add test spacing.

---
 .../ImproperArrayIndexValidation.expected     | 44 +++++++++----------
 .../ImproperArrayIndexValidation/test1.c      |  5 +++
 2 files changed, 27 insertions(+), 22 deletions(-)

diff --git a/cpp/ql/test/query-tests/Security/CWE/CWE-129/semmle/ImproperArrayIndexValidation/ImproperArrayIndexValidation.expected b/cpp/ql/test/query-tests/Security/CWE/CWE-129/semmle/ImproperArrayIndexValidation/ImproperArrayIndexValidation.expected
index 3692ec4509df..6f9ecd1d85d7 100644
--- a/cpp/ql/test/query-tests/Security/CWE/CWE-129/semmle/ImproperArrayIndexValidation/ImproperArrayIndexValidation.expected
+++ b/cpp/ql/test/query-tests/Security/CWE/CWE-129/semmle/ImproperArrayIndexValidation/ImproperArrayIndexValidation.expected
@@ -4,15 +4,15 @@ edges
 | test1.c:8:11:8:14 | call to atoi | test1.c:11:9:11:9 | i | provenance |  |
 | test1.c:8:11:8:14 | call to atoi | test1.c:12:9:12:9 | i | provenance |  |
 | test1.c:8:11:8:14 | call to atoi | test1.c:13:9:13:9 | i | provenance |  |
-| test1.c:9:9:9:9 | i | test1.c:16:16:16:16 | i | provenance |  |
-| test1.c:11:9:11:9 | i | test1.c:32:16:32:16 | i | provenance |  |
-| test1.c:12:9:12:9 | i | test1.c:40:16:40:16 | i | provenance |  |
-| test1.c:13:9:13:9 | i | test1.c:48:16:48:16 | i | provenance |  |
-| test1.c:16:16:16:16 | i | test1.c:18:16:18:16 | i | provenance |  |
-| test1.c:32:16:32:16 | i | test1.c:33:11:33:11 | i | provenance |  |
-| test1.c:40:16:40:16 | i | test1.c:41:11:41:11 | i | provenance |  |
-| test1.c:48:16:48:16 | i | test1.c:51:3:51:7 | ... = ... | provenance |  |
-| test1.c:51:3:51:7 | ... = ... | test1.c:53:15:53:15 | j | provenance |  |
+| test1.c:9:9:9:9 | i | test1.c:17:16:17:16 | i | provenance |  |
+| test1.c:11:9:11:9 | i | test1.c:33:16:33:16 | i | provenance |  |
+| test1.c:12:9:12:9 | i | test1.c:41:16:41:16 | i | provenance |  |
+| test1.c:13:9:13:9 | i | test1.c:49:16:49:16 | i | provenance |  |
+| test1.c:17:16:17:16 | i | test1.c:19:16:19:16 | i | provenance |  |
+| test1.c:33:16:33:16 | i | test1.c:34:11:34:11 | i | provenance |  |
+| test1.c:41:16:41:16 | i | test1.c:42:11:42:11 | i | provenance |  |
+| test1.c:49:16:49:16 | i | test1.c:52:3:52:7 | ... = ... | provenance |  |
+| test1.c:52:3:52:7 | ... = ... | test1.c:54:15:54:15 | j | provenance |  |
 nodes
 | test1.c:7:26:7:29 | **argv | semmle.label | **argv |
 | test1.c:8:11:8:14 | call to atoi | semmle.label | call to atoi |
@@ -20,18 +20,18 @@ nodes
 | test1.c:11:9:11:9 | i | semmle.label | i |
 | test1.c:12:9:12:9 | i | semmle.label | i |
 | test1.c:13:9:13:9 | i | semmle.label | i |
-| test1.c:16:16:16:16 | i | semmle.label | i |
-| test1.c:18:16:18:16 | i | semmle.label | i |
-| test1.c:32:16:32:16 | i | semmle.label | i |
-| test1.c:33:11:33:11 | i | semmle.label | i |
-| test1.c:40:16:40:16 | i | semmle.label | i |
-| test1.c:41:11:41:11 | i | semmle.label | i |
-| test1.c:48:16:48:16 | i | semmle.label | i |
-| test1.c:51:3:51:7 | ... = ... | semmle.label | ... = ... |
-| test1.c:53:15:53:15 | j | semmle.label | j |
+| test1.c:17:16:17:16 | i | semmle.label | i |
+| test1.c:19:16:19:16 | i | semmle.label | i |
+| test1.c:33:16:33:16 | i | semmle.label | i |
+| test1.c:34:11:34:11 | i | semmle.label | i |
+| test1.c:41:16:41:16 | i | semmle.label | i |
+| test1.c:42:11:42:11 | i | semmle.label | i |
+| test1.c:49:16:49:16 | i | semmle.label | i |
+| test1.c:52:3:52:7 | ... = ... | semmle.label | ... = ... |
+| test1.c:54:15:54:15 | j | semmle.label | j |
 subpaths
 #select
-| test1.c:18:16:18:16 | i | test1.c:7:26:7:29 | **argv | test1.c:18:16:18:16 | i | An array indexing expression depends on $@ that might be outside the bounds of the array. | test1.c:7:26:7:29 | **argv | a command-line argument |
-| test1.c:33:11:33:11 | i | test1.c:7:26:7:29 | **argv | test1.c:33:11:33:11 | i | An array indexing expression depends on $@ that might be outside the bounds of the array. | test1.c:7:26:7:29 | **argv | a command-line argument |
-| test1.c:41:11:41:11 | i | test1.c:7:26:7:29 | **argv | test1.c:41:11:41:11 | i | An array indexing expression depends on $@ that might be outside the bounds of the array. | test1.c:7:26:7:29 | **argv | a command-line argument |
-| test1.c:53:15:53:15 | j | test1.c:7:26:7:29 | **argv | test1.c:53:15:53:15 | j | An array indexing expression depends on $@ that might be outside the bounds of the array. | test1.c:7:26:7:29 | **argv | a command-line argument |
+| test1.c:19:16:19:16 | i | test1.c:7:26:7:29 | **argv | test1.c:19:16:19:16 | i | An array indexing expression depends on $@ that might be outside the bounds of the array. | test1.c:7:26:7:29 | **argv | a command-line argument |
+| test1.c:34:11:34:11 | i | test1.c:7:26:7:29 | **argv | test1.c:34:11:34:11 | i | An array indexing expression depends on $@ that might be outside the bounds of the array. | test1.c:7:26:7:29 | **argv | a command-line argument |
+| test1.c:42:11:42:11 | i | test1.c:7:26:7:29 | **argv | test1.c:42:11:42:11 | i | An array indexing expression depends on $@ that might be outside the bounds of the array. | test1.c:7:26:7:29 | **argv | a command-line argument |
+| test1.c:54:15:54:15 | j | test1.c:7:26:7:29 | **argv | test1.c:54:15:54:15 | j | An array indexing expression depends on $@ that might be outside the bounds of the array. | test1.c:7:26:7:29 | **argv | a command-line argument |
diff --git a/cpp/ql/test/query-tests/Security/CWE/CWE-129/semmle/ImproperArrayIndexValidation/test1.c b/cpp/ql/test/query-tests/Security/CWE/CWE-129/semmle/ImproperArrayIndexValidation/test1.c
index 926b81dad7c3..2c6a15d9ee1d 100644
--- a/cpp/ql/test/query-tests/Security/CWE/CWE-129/semmle/ImproperArrayIndexValidation/test1.c
+++ b/cpp/ql/test/query-tests/Security/CWE/CWE-129/semmle/ImproperArrayIndexValidation/test1.c
@@ -11,6 +11,7 @@ int main(int argc, char *argv[]) {
   test3(i);
   test4(i);
   test5(i);
+  test6(i);
 }
 
 void test1(int i) {
@@ -52,3 +53,7 @@ void test5(int i) {
 
   j = myArray[j]; // BAD: j has not been validated
 }
+
+void test6(int i) {
+
+}
\ No newline at end of file

From c3d9ea1820f9274bf9e1342b1f767e028ceeb106 Mon Sep 17 00:00:00 2001
From: Mathias Vorreiter Pedersen <mathiasvp@github.com>
Date: Mon, 7 Oct 2024 17:01:06 +0100
Subject: [PATCH 187/347] C++: Add FP.

---
 .../ImproperArrayIndexValidation.expected                | 9 +++++++++
 .../CWE-129/semmle/ImproperArrayIndexValidation/test1.c  | 4 ++++
 2 files changed, 13 insertions(+)

diff --git a/cpp/ql/test/query-tests/Security/CWE/CWE-129/semmle/ImproperArrayIndexValidation/ImproperArrayIndexValidation.expected b/cpp/ql/test/query-tests/Security/CWE/CWE-129/semmle/ImproperArrayIndexValidation/ImproperArrayIndexValidation.expected
index 6f9ecd1d85d7..0631ac646f5c 100644
--- a/cpp/ql/test/query-tests/Security/CWE/CWE-129/semmle/ImproperArrayIndexValidation/ImproperArrayIndexValidation.expected
+++ b/cpp/ql/test/query-tests/Security/CWE/CWE-129/semmle/ImproperArrayIndexValidation/ImproperArrayIndexValidation.expected
@@ -4,15 +4,19 @@ edges
 | test1.c:8:11:8:14 | call to atoi | test1.c:11:9:11:9 | i | provenance |  |
 | test1.c:8:11:8:14 | call to atoi | test1.c:12:9:12:9 | i | provenance |  |
 | test1.c:8:11:8:14 | call to atoi | test1.c:13:9:13:9 | i | provenance |  |
+| test1.c:8:11:8:14 | call to atoi | test1.c:14:9:14:9 | i | provenance |  |
 | test1.c:9:9:9:9 | i | test1.c:17:16:17:16 | i | provenance |  |
 | test1.c:11:9:11:9 | i | test1.c:33:16:33:16 | i | provenance |  |
 | test1.c:12:9:12:9 | i | test1.c:41:16:41:16 | i | provenance |  |
 | test1.c:13:9:13:9 | i | test1.c:49:16:49:16 | i | provenance |  |
+| test1.c:14:9:14:9 | i | test1.c:59:16:59:16 | i | provenance |  |
 | test1.c:17:16:17:16 | i | test1.c:19:16:19:16 | i | provenance |  |
 | test1.c:33:16:33:16 | i | test1.c:34:11:34:11 | i | provenance |  |
 | test1.c:41:16:41:16 | i | test1.c:42:11:42:11 | i | provenance |  |
 | test1.c:49:16:49:16 | i | test1.c:52:3:52:7 | ... = ... | provenance |  |
 | test1.c:52:3:52:7 | ... = ... | test1.c:54:15:54:15 | j | provenance |  |
+| test1.c:59:16:59:16 | i | test1.c:60:21:60:21 | i | provenance |  |
+| test1.c:60:21:60:21 | i | test1.c:62:11:62:11 | s | provenance |  |
 nodes
 | test1.c:7:26:7:29 | **argv | semmle.label | **argv |
 | test1.c:8:11:8:14 | call to atoi | semmle.label | call to atoi |
@@ -20,6 +24,7 @@ nodes
 | test1.c:11:9:11:9 | i | semmle.label | i |
 | test1.c:12:9:12:9 | i | semmle.label | i |
 | test1.c:13:9:13:9 | i | semmle.label | i |
+| test1.c:14:9:14:9 | i | semmle.label | i |
 | test1.c:17:16:17:16 | i | semmle.label | i |
 | test1.c:19:16:19:16 | i | semmle.label | i |
 | test1.c:33:16:33:16 | i | semmle.label | i |
@@ -29,9 +34,13 @@ nodes
 | test1.c:49:16:49:16 | i | semmle.label | i |
 | test1.c:52:3:52:7 | ... = ... | semmle.label | ... = ... |
 | test1.c:54:15:54:15 | j | semmle.label | j |
+| test1.c:59:16:59:16 | i | semmle.label | i |
+| test1.c:60:21:60:21 | i | semmle.label | i |
+| test1.c:62:11:62:11 | s | semmle.label | s |
 subpaths
 #select
 | test1.c:19:16:19:16 | i | test1.c:7:26:7:29 | **argv | test1.c:19:16:19:16 | i | An array indexing expression depends on $@ that might be outside the bounds of the array. | test1.c:7:26:7:29 | **argv | a command-line argument |
 | test1.c:34:11:34:11 | i | test1.c:7:26:7:29 | **argv | test1.c:34:11:34:11 | i | An array indexing expression depends on $@ that might be outside the bounds of the array. | test1.c:7:26:7:29 | **argv | a command-line argument |
 | test1.c:42:11:42:11 | i | test1.c:7:26:7:29 | **argv | test1.c:42:11:42:11 | i | An array indexing expression depends on $@ that might be outside the bounds of the array. | test1.c:7:26:7:29 | **argv | a command-line argument |
 | test1.c:54:15:54:15 | j | test1.c:7:26:7:29 | **argv | test1.c:54:15:54:15 | j | An array indexing expression depends on $@ that might be outside the bounds of the array. | test1.c:7:26:7:29 | **argv | a command-line argument |
+| test1.c:62:11:62:11 | s | test1.c:7:26:7:29 | **argv | test1.c:62:11:62:11 | s | An array indexing expression depends on $@ that might be outside the bounds of the array. | test1.c:7:26:7:29 | **argv | a command-line argument |
diff --git a/cpp/ql/test/query-tests/Security/CWE/CWE-129/semmle/ImproperArrayIndexValidation/test1.c b/cpp/ql/test/query-tests/Security/CWE/CWE-129/semmle/ImproperArrayIndexValidation/test1.c
index 2c6a15d9ee1d..2aa77fc9ee13 100644
--- a/cpp/ql/test/query-tests/Security/CWE/CWE-129/semmle/ImproperArrayIndexValidation/test1.c
+++ b/cpp/ql/test/query-tests/Security/CWE/CWE-129/semmle/ImproperArrayIndexValidation/test1.c
@@ -54,6 +54,10 @@ void test5(int i) {
   j = myArray[j]; // BAD: j has not been validated
 }
 
+extern int myTable[256];
+
 void test6(int i) {
+  unsigned char s = i;
 
+  myTable[s] = 0; // GOOD: Input is small [FALSE POSITIVE]
 }
\ No newline at end of file

From a2cdb9c1731057d5ad6cdd46ff40aed8fec02c7e Mon Sep 17 00:00:00 2001
From: Mathias Vorreiter Pedersen <mathiasvp@github.com>
Date: Mon, 7 Oct 2024 17:15:22 +0100
Subject: [PATCH 188/347] C++: Use range analysis at the sink to exclude
 trivial FPs.

---
 .../CWE/CWE-129/ImproperArrayIndexValidation.ql  | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/cpp/ql/src/Security/CWE/CWE-129/ImproperArrayIndexValidation.ql b/cpp/ql/src/Security/CWE/CWE-129/ImproperArrayIndexValidation.ql
index 0c5802a4c564..1978fc984d69 100644
--- a/cpp/ql/src/Security/CWE/CWE-129/ImproperArrayIndexValidation.ql
+++ b/cpp/ql/src/Security/CWE/CWE-129/ImproperArrayIndexValidation.ql
@@ -16,7 +16,7 @@ import cpp
 import semmle.code.cpp.controlflow.IRGuards
 import semmle.code.cpp.security.FlowSources as FS
 import semmle.code.cpp.dataflow.new.TaintTracking
-import semmle.code.cpp.rangeanalysis.RangeAnalysisUtils
+import semmle.code.cpp.rangeanalysis.SimpleRangeAnalysis
 import ImproperArrayIndexValidation::PathGraph
 
 predicate isFlowSource(FS::FlowSource source, string sourceType) {
@@ -39,6 +39,17 @@ predicate guardChecks(IRGuardCondition g, Expr e, boolean branch) {
   )
 }
 
+/**
+ * Holds if `arrayExpr` accesses an `ArrayType` with a constant size `N`, and
+ * the value of `offsetExpr` is known to be smaller than `N`.
+ */
+predicate offsetIsAlwaysInBounds(ArrayExpr arrayExpr, VariableAccess offsetExpr) {
+  exists(ArrayType arrayType |
+    arrayType = arrayExpr.getArrayBase().getUnspecifiedType() and
+    arrayType.getArraySize() > upperBound(offsetExpr.getFullyConverted())
+  )
+}
+
 module ImproperArrayIndexValidationConfig implements DataFlow::ConfigSig {
   predicate isSource(DataFlow::Node source) { isFlowSource(source, _) }
 
@@ -51,7 +62,8 @@ module ImproperArrayIndexValidationConfig implements DataFlow::ConfigSig {
   predicate isSink(DataFlow::Node sink) {
     exists(ArrayExpr arrayExpr, VariableAccess offsetExpr |
       offsetExpr = arrayExpr.getArrayOffset() and
-      sink.asExpr() = offsetExpr
+      sink.asExpr() = offsetExpr and
+      not offsetIsAlwaysInBounds(arrayExpr, offsetExpr)
     )
   }
 }

From 8bb21e1b499f740d1fa9e37103af9be0b9dc84cf Mon Sep 17 00:00:00 2001
From: Mathias Vorreiter Pedersen <mathiasvp@github.com>
Date: Mon, 7 Oct 2024 17:15:32 +0100
Subject: [PATCH 189/347] C++: Accept test changes.

---
 .../ImproperArrayIndexValidation.expected                | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/cpp/ql/test/query-tests/Security/CWE/CWE-129/semmle/ImproperArrayIndexValidation/ImproperArrayIndexValidation.expected b/cpp/ql/test/query-tests/Security/CWE/CWE-129/semmle/ImproperArrayIndexValidation/ImproperArrayIndexValidation.expected
index 0631ac646f5c..6f9ecd1d85d7 100644
--- a/cpp/ql/test/query-tests/Security/CWE/CWE-129/semmle/ImproperArrayIndexValidation/ImproperArrayIndexValidation.expected
+++ b/cpp/ql/test/query-tests/Security/CWE/CWE-129/semmle/ImproperArrayIndexValidation/ImproperArrayIndexValidation.expected
@@ -4,19 +4,15 @@ edges
 | test1.c:8:11:8:14 | call to atoi | test1.c:11:9:11:9 | i | provenance |  |
 | test1.c:8:11:8:14 | call to atoi | test1.c:12:9:12:9 | i | provenance |  |
 | test1.c:8:11:8:14 | call to atoi | test1.c:13:9:13:9 | i | provenance |  |
-| test1.c:8:11:8:14 | call to atoi | test1.c:14:9:14:9 | i | provenance |  |
 | test1.c:9:9:9:9 | i | test1.c:17:16:17:16 | i | provenance |  |
 | test1.c:11:9:11:9 | i | test1.c:33:16:33:16 | i | provenance |  |
 | test1.c:12:9:12:9 | i | test1.c:41:16:41:16 | i | provenance |  |
 | test1.c:13:9:13:9 | i | test1.c:49:16:49:16 | i | provenance |  |
-| test1.c:14:9:14:9 | i | test1.c:59:16:59:16 | i | provenance |  |
 | test1.c:17:16:17:16 | i | test1.c:19:16:19:16 | i | provenance |  |
 | test1.c:33:16:33:16 | i | test1.c:34:11:34:11 | i | provenance |  |
 | test1.c:41:16:41:16 | i | test1.c:42:11:42:11 | i | provenance |  |
 | test1.c:49:16:49:16 | i | test1.c:52:3:52:7 | ... = ... | provenance |  |
 | test1.c:52:3:52:7 | ... = ... | test1.c:54:15:54:15 | j | provenance |  |
-| test1.c:59:16:59:16 | i | test1.c:60:21:60:21 | i | provenance |  |
-| test1.c:60:21:60:21 | i | test1.c:62:11:62:11 | s | provenance |  |
 nodes
 | test1.c:7:26:7:29 | **argv | semmle.label | **argv |
 | test1.c:8:11:8:14 | call to atoi | semmle.label | call to atoi |
@@ -24,7 +20,6 @@ nodes
 | test1.c:11:9:11:9 | i | semmle.label | i |
 | test1.c:12:9:12:9 | i | semmle.label | i |
 | test1.c:13:9:13:9 | i | semmle.label | i |
-| test1.c:14:9:14:9 | i | semmle.label | i |
 | test1.c:17:16:17:16 | i | semmle.label | i |
 | test1.c:19:16:19:16 | i | semmle.label | i |
 | test1.c:33:16:33:16 | i | semmle.label | i |
@@ -34,13 +29,9 @@ nodes
 | test1.c:49:16:49:16 | i | semmle.label | i |
 | test1.c:52:3:52:7 | ... = ... | semmle.label | ... = ... |
 | test1.c:54:15:54:15 | j | semmle.label | j |
-| test1.c:59:16:59:16 | i | semmle.label | i |
-| test1.c:60:21:60:21 | i | semmle.label | i |
-| test1.c:62:11:62:11 | s | semmle.label | s |
 subpaths
 #select
 | test1.c:19:16:19:16 | i | test1.c:7:26:7:29 | **argv | test1.c:19:16:19:16 | i | An array indexing expression depends on $@ that might be outside the bounds of the array. | test1.c:7:26:7:29 | **argv | a command-line argument |
 | test1.c:34:11:34:11 | i | test1.c:7:26:7:29 | **argv | test1.c:34:11:34:11 | i | An array indexing expression depends on $@ that might be outside the bounds of the array. | test1.c:7:26:7:29 | **argv | a command-line argument |
 | test1.c:42:11:42:11 | i | test1.c:7:26:7:29 | **argv | test1.c:42:11:42:11 | i | An array indexing expression depends on $@ that might be outside the bounds of the array. | test1.c:7:26:7:29 | **argv | a command-line argument |
 | test1.c:54:15:54:15 | j | test1.c:7:26:7:29 | **argv | test1.c:54:15:54:15 | j | An array indexing expression depends on $@ that might be outside the bounds of the array. | test1.c:7:26:7:29 | **argv | a command-line argument |
-| test1.c:62:11:62:11 | s | test1.c:7:26:7:29 | **argv | test1.c:62:11:62:11 | s | An array indexing expression depends on $@ that might be outside the bounds of the array. | test1.c:7:26:7:29 | **argv | a command-line argument |

From 823d5acd69eb713cb99e89336b92444ccf88a53d Mon Sep 17 00:00:00 2001
From: Mathias Vorreiter Pedersen <mathiasvp@github.com>
Date: Mon, 7 Oct 2024 19:04:26 +0100
Subject: [PATCH 190/347] C++: Spacing.

---
 .../ImproperArrayIndexValidation.expected     | 44 +++++++++----------
 .../ImproperArrayIndexValidation/test1.c      |  5 ++-
 2 files changed, 26 insertions(+), 23 deletions(-)

diff --git a/cpp/ql/test/query-tests/Security/CWE/CWE-129/semmle/ImproperArrayIndexValidation/ImproperArrayIndexValidation.expected b/cpp/ql/test/query-tests/Security/CWE/CWE-129/semmle/ImproperArrayIndexValidation/ImproperArrayIndexValidation.expected
index 6f9ecd1d85d7..184af69e72c4 100644
--- a/cpp/ql/test/query-tests/Security/CWE/CWE-129/semmle/ImproperArrayIndexValidation/ImproperArrayIndexValidation.expected
+++ b/cpp/ql/test/query-tests/Security/CWE/CWE-129/semmle/ImproperArrayIndexValidation/ImproperArrayIndexValidation.expected
@@ -4,15 +4,15 @@ edges
 | test1.c:8:11:8:14 | call to atoi | test1.c:11:9:11:9 | i | provenance |  |
 | test1.c:8:11:8:14 | call to atoi | test1.c:12:9:12:9 | i | provenance |  |
 | test1.c:8:11:8:14 | call to atoi | test1.c:13:9:13:9 | i | provenance |  |
-| test1.c:9:9:9:9 | i | test1.c:17:16:17:16 | i | provenance |  |
-| test1.c:11:9:11:9 | i | test1.c:33:16:33:16 | i | provenance |  |
-| test1.c:12:9:12:9 | i | test1.c:41:16:41:16 | i | provenance |  |
-| test1.c:13:9:13:9 | i | test1.c:49:16:49:16 | i | provenance |  |
-| test1.c:17:16:17:16 | i | test1.c:19:16:19:16 | i | provenance |  |
-| test1.c:33:16:33:16 | i | test1.c:34:11:34:11 | i | provenance |  |
-| test1.c:41:16:41:16 | i | test1.c:42:11:42:11 | i | provenance |  |
-| test1.c:49:16:49:16 | i | test1.c:52:3:52:7 | ... = ... | provenance |  |
-| test1.c:52:3:52:7 | ... = ... | test1.c:54:15:54:15 | j | provenance |  |
+| test1.c:9:9:9:9 | i | test1.c:18:16:18:16 | i | provenance |  |
+| test1.c:11:9:11:9 | i | test1.c:34:16:34:16 | i | provenance |  |
+| test1.c:12:9:12:9 | i | test1.c:42:16:42:16 | i | provenance |  |
+| test1.c:13:9:13:9 | i | test1.c:50:16:50:16 | i | provenance |  |
+| test1.c:18:16:18:16 | i | test1.c:20:16:20:16 | i | provenance |  |
+| test1.c:34:16:34:16 | i | test1.c:35:11:35:11 | i | provenance |  |
+| test1.c:42:16:42:16 | i | test1.c:43:11:43:11 | i | provenance |  |
+| test1.c:50:16:50:16 | i | test1.c:53:3:53:7 | ... = ... | provenance |  |
+| test1.c:53:3:53:7 | ... = ... | test1.c:55:15:55:15 | j | provenance |  |
 nodes
 | test1.c:7:26:7:29 | **argv | semmle.label | **argv |
 | test1.c:8:11:8:14 | call to atoi | semmle.label | call to atoi |
@@ -20,18 +20,18 @@ nodes
 | test1.c:11:9:11:9 | i | semmle.label | i |
 | test1.c:12:9:12:9 | i | semmle.label | i |
 | test1.c:13:9:13:9 | i | semmle.label | i |
-| test1.c:17:16:17:16 | i | semmle.label | i |
-| test1.c:19:16:19:16 | i | semmle.label | i |
-| test1.c:33:16:33:16 | i | semmle.label | i |
-| test1.c:34:11:34:11 | i | semmle.label | i |
-| test1.c:41:16:41:16 | i | semmle.label | i |
-| test1.c:42:11:42:11 | i | semmle.label | i |
-| test1.c:49:16:49:16 | i | semmle.label | i |
-| test1.c:52:3:52:7 | ... = ... | semmle.label | ... = ... |
-| test1.c:54:15:54:15 | j | semmle.label | j |
+| test1.c:18:16:18:16 | i | semmle.label | i |
+| test1.c:20:16:20:16 | i | semmle.label | i |
+| test1.c:34:16:34:16 | i | semmle.label | i |
+| test1.c:35:11:35:11 | i | semmle.label | i |
+| test1.c:42:16:42:16 | i | semmle.label | i |
+| test1.c:43:11:43:11 | i | semmle.label | i |
+| test1.c:50:16:50:16 | i | semmle.label | i |
+| test1.c:53:3:53:7 | ... = ... | semmle.label | ... = ... |
+| test1.c:55:15:55:15 | j | semmle.label | j |
 subpaths
 #select
-| test1.c:19:16:19:16 | i | test1.c:7:26:7:29 | **argv | test1.c:19:16:19:16 | i | An array indexing expression depends on $@ that might be outside the bounds of the array. | test1.c:7:26:7:29 | **argv | a command-line argument |
-| test1.c:34:11:34:11 | i | test1.c:7:26:7:29 | **argv | test1.c:34:11:34:11 | i | An array indexing expression depends on $@ that might be outside the bounds of the array. | test1.c:7:26:7:29 | **argv | a command-line argument |
-| test1.c:42:11:42:11 | i | test1.c:7:26:7:29 | **argv | test1.c:42:11:42:11 | i | An array indexing expression depends on $@ that might be outside the bounds of the array. | test1.c:7:26:7:29 | **argv | a command-line argument |
-| test1.c:54:15:54:15 | j | test1.c:7:26:7:29 | **argv | test1.c:54:15:54:15 | j | An array indexing expression depends on $@ that might be outside the bounds of the array. | test1.c:7:26:7:29 | **argv | a command-line argument |
+| test1.c:20:16:20:16 | i | test1.c:7:26:7:29 | **argv | test1.c:20:16:20:16 | i | An array indexing expression depends on $@ that might be outside the bounds of the array. | test1.c:7:26:7:29 | **argv | a command-line argument |
+| test1.c:35:11:35:11 | i | test1.c:7:26:7:29 | **argv | test1.c:35:11:35:11 | i | An array indexing expression depends on $@ that might be outside the bounds of the array. | test1.c:7:26:7:29 | **argv | a command-line argument |
+| test1.c:43:11:43:11 | i | test1.c:7:26:7:29 | **argv | test1.c:43:11:43:11 | i | An array indexing expression depends on $@ that might be outside the bounds of the array. | test1.c:7:26:7:29 | **argv | a command-line argument |
+| test1.c:55:15:55:15 | j | test1.c:7:26:7:29 | **argv | test1.c:55:15:55:15 | j | An array indexing expression depends on $@ that might be outside the bounds of the array. | test1.c:7:26:7:29 | **argv | a command-line argument |
diff --git a/cpp/ql/test/query-tests/Security/CWE/CWE-129/semmle/ImproperArrayIndexValidation/test1.c b/cpp/ql/test/query-tests/Security/CWE/CWE-129/semmle/ImproperArrayIndexValidation/test1.c
index 2aa77fc9ee13..0d3b45752c21 100644
--- a/cpp/ql/test/query-tests/Security/CWE/CWE-129/semmle/ImproperArrayIndexValidation/test1.c
+++ b/cpp/ql/test/query-tests/Security/CWE/CWE-129/semmle/ImproperArrayIndexValidation/test1.c
@@ -12,6 +12,7 @@ int main(int argc, char *argv[]) {
   test4(i);
   test5(i);
   test6(i);
+  test7(argv[1]);
 }
 
 void test1(int i) {
@@ -60,4 +61,6 @@ void test6(int i) {
   unsigned char s = i;
 
   myTable[s] = 0; // GOOD: Input is small [FALSE POSITIVE]
-}
\ No newline at end of file
+}
+
+void test7(char *s) { }
\ No newline at end of file

From 6ca978e1ccaa55e7155d21330fe44b0386be975d Mon Sep 17 00:00:00 2001
From: Mathias Vorreiter Pedersen <mathiasvp@github.com>
Date: Mon, 7 Oct 2024 18:52:44 +0100
Subject: [PATCH 191/347] C++: Add FP test.

---
 .../ImproperArrayIndexValidation.expected         |  6 ++++++
 .../semmle/ImproperArrayIndexValidation/test1.c   | 15 ++++++++++++++-
 2 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/cpp/ql/test/query-tests/Security/CWE/CWE-129/semmle/ImproperArrayIndexValidation/ImproperArrayIndexValidation.expected b/cpp/ql/test/query-tests/Security/CWE/CWE-129/semmle/ImproperArrayIndexValidation/ImproperArrayIndexValidation.expected
index 184af69e72c4..7be82edfc096 100644
--- a/cpp/ql/test/query-tests/Security/CWE/CWE-129/semmle/ImproperArrayIndexValidation/ImproperArrayIndexValidation.expected
+++ b/cpp/ql/test/query-tests/Security/CWE/CWE-129/semmle/ImproperArrayIndexValidation/ImproperArrayIndexValidation.expected
@@ -13,6 +13,8 @@ edges
 | test1.c:42:16:42:16 | i | test1.c:43:11:43:11 | i | provenance |  |
 | test1.c:50:16:50:16 | i | test1.c:53:3:53:7 | ... = ... | provenance |  |
 | test1.c:53:3:53:7 | ... = ... | test1.c:55:15:55:15 | j | provenance |  |
+| test1.c:76:11:76:23 | ... = ... | test1.c:77:20:77:21 | ch | provenance |  |
+| test1.c:76:16:76:19 | call to getc | test1.c:76:11:76:23 | ... = ... | provenance |  |
 nodes
 | test1.c:7:26:7:29 | **argv | semmle.label | **argv |
 | test1.c:8:11:8:14 | call to atoi | semmle.label | call to atoi |
@@ -29,9 +31,13 @@ nodes
 | test1.c:50:16:50:16 | i | semmle.label | i |
 | test1.c:53:3:53:7 | ... = ... | semmle.label | ... = ... |
 | test1.c:55:15:55:15 | j | semmle.label | j |
+| test1.c:76:11:76:23 | ... = ... | semmle.label | ... = ... |
+| test1.c:76:16:76:19 | call to getc | semmle.label | call to getc |
+| test1.c:77:20:77:21 | ch | semmle.label | ch |
 subpaths
 #select
 | test1.c:20:16:20:16 | i | test1.c:7:26:7:29 | **argv | test1.c:20:16:20:16 | i | An array indexing expression depends on $@ that might be outside the bounds of the array. | test1.c:7:26:7:29 | **argv | a command-line argument |
 | test1.c:35:11:35:11 | i | test1.c:7:26:7:29 | **argv | test1.c:35:11:35:11 | i | An array indexing expression depends on $@ that might be outside the bounds of the array. | test1.c:7:26:7:29 | **argv | a command-line argument |
 | test1.c:43:11:43:11 | i | test1.c:7:26:7:29 | **argv | test1.c:43:11:43:11 | i | An array indexing expression depends on $@ that might be outside the bounds of the array. | test1.c:7:26:7:29 | **argv | a command-line argument |
 | test1.c:55:15:55:15 | j | test1.c:7:26:7:29 | **argv | test1.c:55:15:55:15 | j | An array indexing expression depends on $@ that might be outside the bounds of the array. | test1.c:7:26:7:29 | **argv | a command-line argument |
+| test1.c:77:20:77:21 | ch | test1.c:76:16:76:19 | call to getc | test1.c:77:20:77:21 | ch | An array indexing expression depends on $@ that might be outside the bounds of the array. | test1.c:76:16:76:19 | call to getc | external |
diff --git a/cpp/ql/test/query-tests/Security/CWE/CWE-129/semmle/ImproperArrayIndexValidation/test1.c b/cpp/ql/test/query-tests/Security/CWE/CWE-129/semmle/ImproperArrayIndexValidation/test1.c
index 0d3b45752c21..f688c19cf5bc 100644
--- a/cpp/ql/test/query-tests/Security/CWE/CWE-129/semmle/ImproperArrayIndexValidation/test1.c
+++ b/cpp/ql/test/query-tests/Security/CWE/CWE-129/semmle/ImproperArrayIndexValidation/test1.c
@@ -63,4 +63,17 @@ void test6(int i) {
   myTable[s] = 0; // GOOD: Input is small [FALSE POSITIVE]
 }
 
-void test7(char *s) { }
\ No newline at end of file
+typedef void FILE;
+#define EOF (-1)
+
+int getc(FILE*);
+
+extern int myMaxCharTable[256];
+
+void test7(FILE* fp) {
+  int ch;
+  while ((ch = getc(fp)) != EOF) {
+    myMaxCharTable[ch] = 0; // GOOD [FALSE POSITIVE]
+  }
+}
+

From f7392d6498aa1780700db6b9987fae42fd39384f Mon Sep 17 00:00:00 2001
From: Mathias Vorreiter Pedersen <mathiasvp@github.com>
Date: Mon, 7 Oct 2024 19:00:03 +0100
Subject: [PATCH 192/347] C++: Range analysis of 'getc'.

---
 .../cpp/rangeanalysis/SimpleRangeAnalysis.qll | 49 +++++++++++++++++++
 1 file changed, 49 insertions(+)

diff --git a/cpp/ql/lib/semmle/code/cpp/rangeanalysis/SimpleRangeAnalysis.qll b/cpp/ql/lib/semmle/code/cpp/rangeanalysis/SimpleRangeAnalysis.qll
index 1ce7a6a4f5a8..990def8b2f1c 100644
--- a/cpp/ql/lib/semmle/code/cpp/rangeanalysis/SimpleRangeAnalysis.qll
+++ b/cpp/ql/lib/semmle/code/cpp/rangeanalysis/SimpleRangeAnalysis.qll
@@ -192,6 +192,37 @@ private class UnsignedMulExpr extends MulExpr {
   }
 }
 
+/**
+ * Gets the value of the `EOF` macro.
+ *
+ * This is typically `"-1"`, but this is not guaranteed to be the case on all
+ * systems.
+ */
+private int getEofValue() {
+  exists(MacroInvocation mi |
+    mi.getMacroName() = "EOF" and
+    result = unique( | | mi.getExpr().getValue().toInt())
+  )
+}
+
+/** Get standard `getc` function or related variants. */
+private class Getc extends Function {
+  Getc() { this.hasGlobalOrStdOrBslName(["fgetc", "getc"]) }
+}
+
+/** A call to `getc` */
+private class CallToGetc extends FunctionCall {
+  CallToGetc() { this.getTarget() instanceof Getc }
+}
+
+/**
+ * A call to `getc` that we can analyze because we know
+ * the value of the `EOF` macro.
+ */
+private class AnalyzableCallToGetc extends CallToGetc {
+  AnalyzableCallToGetc() { exists(getEofValue()) }
+}
+
 /**
  * Holds if `expr` is effectively a multiplication of `operand` with the
  * positive constant `positive`.
@@ -287,6 +318,8 @@ private predicate analyzableExpr(Expr e) {
     or
     e instanceof RemExpr
     or
+    e instanceof AnalyzableCallToGetc
+    or
     // A conversion is analyzable, provided that its child has an arithmetic
     // type. (Sometimes the child is a reference type, and so does not get
     // any bounds.) Rather than checking whether the type of the child is
@@ -861,6 +894,14 @@ private float getLowerBoundsImpl(Expr expr) {
       )
     )
     or
+    exists(AnalyzableCallToGetc getc |
+      expr = getc and
+      // from https://en.cppreference.com/w/c/io/fgetc:
+      // On success, returns the obtained character as an unsigned char
+      // converted to an int. On failure, returns EOF.
+      result = min([typeLowerBound(any(UnsignedCharType pct)), getEofValue()])
+    )
+    or
     // If the conversion is to an arithmetic type then we just return the
     // lower bound of the child. We do not need to handle truncation and
     // overflow here, because that is done in `getTruncatedLowerBounds`.
@@ -1055,6 +1096,14 @@ private float getUpperBoundsImpl(Expr expr) {
       )
     )
     or
+    exists(AnalyzableCallToGetc getc |
+      expr = getc and
+      // from https://en.cppreference.com/w/c/io/fgetc:
+      // On success, returns the obtained character as an unsigned char
+      // converted to an int. On failure, returns EOF.
+      result = max([typeUpperBound(any(UnsignedCharType pct)), getEofValue()])
+    )
+    or
     // If the conversion is to an arithmetic type then we just return the
     // upper bound of the child. We do not need to handle truncation and
     // overflow here, because that is done in `getTruncatedUpperBounds`.

From d6618edf01e9eb0da94227f3a2d381810f682ab5 Mon Sep 17 00:00:00 2001
From: Mathias Vorreiter Pedersen <mathiasvp@github.com>
Date: Mon, 7 Oct 2024 19:00:13 +0100
Subject: [PATCH 193/347] C++: Accept test changes.

---
 .../ImproperArrayIndexValidation.expected                   | 6 ------
 .../CWE/CWE-129/semmle/ImproperArrayIndexValidation/test1.c | 2 +-
 2 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/cpp/ql/test/query-tests/Security/CWE/CWE-129/semmle/ImproperArrayIndexValidation/ImproperArrayIndexValidation.expected b/cpp/ql/test/query-tests/Security/CWE/CWE-129/semmle/ImproperArrayIndexValidation/ImproperArrayIndexValidation.expected
index 7be82edfc096..184af69e72c4 100644
--- a/cpp/ql/test/query-tests/Security/CWE/CWE-129/semmle/ImproperArrayIndexValidation/ImproperArrayIndexValidation.expected
+++ b/cpp/ql/test/query-tests/Security/CWE/CWE-129/semmle/ImproperArrayIndexValidation/ImproperArrayIndexValidation.expected
@@ -13,8 +13,6 @@ edges
 | test1.c:42:16:42:16 | i | test1.c:43:11:43:11 | i | provenance |  |
 | test1.c:50:16:50:16 | i | test1.c:53:3:53:7 | ... = ... | provenance |  |
 | test1.c:53:3:53:7 | ... = ... | test1.c:55:15:55:15 | j | provenance |  |
-| test1.c:76:11:76:23 | ... = ... | test1.c:77:20:77:21 | ch | provenance |  |
-| test1.c:76:16:76:19 | call to getc | test1.c:76:11:76:23 | ... = ... | provenance |  |
 nodes
 | test1.c:7:26:7:29 | **argv | semmle.label | **argv |
 | test1.c:8:11:8:14 | call to atoi | semmle.label | call to atoi |
@@ -31,13 +29,9 @@ nodes
 | test1.c:50:16:50:16 | i | semmle.label | i |
 | test1.c:53:3:53:7 | ... = ... | semmle.label | ... = ... |
 | test1.c:55:15:55:15 | j | semmle.label | j |
-| test1.c:76:11:76:23 | ... = ... | semmle.label | ... = ... |
-| test1.c:76:16:76:19 | call to getc | semmle.label | call to getc |
-| test1.c:77:20:77:21 | ch | semmle.label | ch |
 subpaths
 #select
 | test1.c:20:16:20:16 | i | test1.c:7:26:7:29 | **argv | test1.c:20:16:20:16 | i | An array indexing expression depends on $@ that might be outside the bounds of the array. | test1.c:7:26:7:29 | **argv | a command-line argument |
 | test1.c:35:11:35:11 | i | test1.c:7:26:7:29 | **argv | test1.c:35:11:35:11 | i | An array indexing expression depends on $@ that might be outside the bounds of the array. | test1.c:7:26:7:29 | **argv | a command-line argument |
 | test1.c:43:11:43:11 | i | test1.c:7:26:7:29 | **argv | test1.c:43:11:43:11 | i | An array indexing expression depends on $@ that might be outside the bounds of the array. | test1.c:7:26:7:29 | **argv | a command-line argument |
 | test1.c:55:15:55:15 | j | test1.c:7:26:7:29 | **argv | test1.c:55:15:55:15 | j | An array indexing expression depends on $@ that might be outside the bounds of the array. | test1.c:7:26:7:29 | **argv | a command-line argument |
-| test1.c:77:20:77:21 | ch | test1.c:76:16:76:19 | call to getc | test1.c:77:20:77:21 | ch | An array indexing expression depends on $@ that might be outside the bounds of the array. | test1.c:76:16:76:19 | call to getc | external |
diff --git a/cpp/ql/test/query-tests/Security/CWE/CWE-129/semmle/ImproperArrayIndexValidation/test1.c b/cpp/ql/test/query-tests/Security/CWE/CWE-129/semmle/ImproperArrayIndexValidation/test1.c
index f688c19cf5bc..89619626de91 100644
--- a/cpp/ql/test/query-tests/Security/CWE/CWE-129/semmle/ImproperArrayIndexValidation/test1.c
+++ b/cpp/ql/test/query-tests/Security/CWE/CWE-129/semmle/ImproperArrayIndexValidation/test1.c
@@ -73,7 +73,7 @@ extern int myMaxCharTable[256];
 void test7(FILE* fp) {
   int ch;
   while ((ch = getc(fp)) != EOF) {
-    myMaxCharTable[ch] = 0; // GOOD [FALSE POSITIVE]
+    myMaxCharTable[ch] = 0; // GOOD
   }
 }
 

From b00c5457992c0bb88e1554269dade2f1eb5d3477 Mon Sep 17 00:00:00 2001
From: Mathias Vorreiter Pedersen <mathiasvp@github.com>
Date: Mon, 7 Oct 2024 19:18:41 +0100
Subject: [PATCH 194/347] C++: Add change notes.

---
 cpp/ql/lib/change-notes/2024-10-07-range-analysis-of-getc.md  | 4 ++++
 .../change-notes/2024-10-07-unclear-array-index-validation.md | 4 ++++
 2 files changed, 8 insertions(+)
 create mode 100644 cpp/ql/lib/change-notes/2024-10-07-range-analysis-of-getc.md
 create mode 100644 cpp/ql/src/change-notes/2024-10-07-unclear-array-index-validation.md

diff --git a/cpp/ql/lib/change-notes/2024-10-07-range-analysis-of-getc.md b/cpp/ql/lib/change-notes/2024-10-07-range-analysis-of-getc.md
new file mode 100644
index 000000000000..f796fba2ece2
--- /dev/null
+++ b/cpp/ql/lib/change-notes/2024-10-07-range-analysis-of-getc.md
@@ -0,0 +1,4 @@
+---
+category: minorAnalysis
+---
+* The `SimpleRangeAnalysis` library (`semmle.code.cpp.rangeanalysis.SimpleRangeAnalysis`) now generates more precise ranges for calls to `fgetc` and `getc`.
\ No newline at end of file
diff --git a/cpp/ql/src/change-notes/2024-10-07-unclear-array-index-validation.md b/cpp/ql/src/change-notes/2024-10-07-unclear-array-index-validation.md
new file mode 100644
index 000000000000..97944e9da7ae
--- /dev/null
+++ b/cpp/ql/src/change-notes/2024-10-07-unclear-array-index-validation.md
@@ -0,0 +1,4 @@
+---
+category: minorAnalysis
+---
+* The `cpp/unclear-array-index-validation` ("Unclear validation of array index") query has been imoroved to reduce false positives increase true positives.
\ No newline at end of file

From 36937a0988419a0b40a1083f0d96a347e7d3b2d1 Mon Sep 17 00:00:00 2001
From: Florin Coada <coadaflorin@github.com>
Date: Tue, 8 Oct 2024 11:28:15 +0100
Subject: [PATCH 195/347] Adding unified changelog for 2.19.1

---
 .../codeql-changelog/codeql-cli-2.19.1.rst    | 137 ++++++++++++++++++
 .../codeql-changelog/index.rst                |   1 +
 2 files changed, 138 insertions(+)
 create mode 100644 docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.19.1.rst

diff --git a/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.19.1.rst b/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.19.1.rst
new file mode 100644
index 000000000000..5fe18dde3d46
--- /dev/null
+++ b/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.19.1.rst
@@ -0,0 +1,137 @@
+.. _codeql-cli-2.19.1:
+
+==========================
+CodeQL 2.19.1 (2024-10-04)
+==========================
+
+.. contents:: Contents
+   :depth: 2
+   :local:
+   :backlinks: none
+
+This is an overview of changes in the CodeQL CLI and relevant CodeQL query and library packs. For additional updates on changes to the CodeQL code scanning experience, check out the `code scanning section on the GitHub blog <https://github.blog/tag/code-scanning/>`__, `relevant GitHub Changelog updates <https://github.blog/changelog/label/code-scanning/>`__, `changes in the CodeQL extension for Visual Studio Code <https://marketplace.visualstudio.com/items/GitHub.vscode-codeql/changelog>`__, and the `CodeQL Action changelog <https://github.com/github/codeql-action/blob/main/CHANGELOG.md>`__.
+
+Security Coverage
+-----------------
+
+CodeQL 2.19.1 runs a total of 426 security queries when configured with the Default suite (covering 164 CWE). The Extended suite enables an additional 128 queries (covering 34 more CWE).
+
+CodeQL CLI
+----------
+
+New Features
+~~~~~~~~~~~~
+
+*   The command :code:`codeql generate query-help` now supports Markdown help files.
+    The Markdown help format is commonly used in custom CodeQL query packs. This new feature allows us to generate SARIF reporting descriptors for CodeQL queries that include Markdown help directly from a query Markdown help file.
+    
+*   Added a new command, :code:`codeql resolve packs`. This command shows each step in the pack search process, including what packs were found in each step. With the
+    :code:`--show-hidden-packs` option, it can also show details on which packs were hidden by packs found earlier in the search sequence. :code:`codeql resolve packs` is intended as a replacement for most uses of :code:`codeql resolve qlpacks`, whose output is both less detailed and less accurate.
+
+Query Packs
+-----------
+
+Minor Analysis Improvements
+~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+C/C++
+"""""
+
+*   Fixed false positives in the :code:`cpp/wrong-number-format-arguments` ("Too few arguments to formatting function") query when the formatting function has been declared implicitly.
+
+C#
+""
+
+*   C#: The indexer and :code:`Add` method on :code:`System.Web.UI.AttributeCollection` is no longer considered an HTML sink.
+
+Java/Kotlin
+"""""""""""
+
+*   Added taint summary model for :code:`org.springframework.core.io.InputStreamSource#getInputStream()`.
+
+New Queries
+~~~~~~~~~~~
+
+Python
+""""""
+
+*   The :code:`py/cors-misconfiguration-with-credentials` query, which finds insecure CORS middleware configurations.
+
+Query Metadata Changes
+~~~~~~~~~~~~~~~~~~~~~~
+
+Golang
+""""""
+
+*   The precision of the :code:`go/incorrect-integer-conversion-query` query was decreased from :code:`very-high` to :code:`high`, since there is at least one known class of false positives involving dynamic bounds checking.
+
+Language Libraries
+------------------
+
+Breaking Changes
+~~~~~~~~~~~~~~~~
+
+C#
+""
+
+*   C#: Add support for MaD directly on properties and indexers using *attributes*. Using :code:`Attribute.Getter` or :code:`Attribute.Setter` in the model :code:`ext` field applies the model to the getter or setter for properties and indexers. Prior to this change :code:`Attribute` models unintentionally worked for property setters (if the property is decorated with the matching attribute). That is, a model that uses the :code:`Attribute` feature directly on a property for a property setter needs to be changed to :code:`Attribute.Setter`.
+*   C#: Remove all CIL tables and related QL library functionality.
+
+Minor Analysis Improvements
+~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+C#
+""
+
+*   :code:`DataFlow::Node` instances are no longer created for library methods and fields that are not callable (either statically or dynamically) or otherwise referred to from source code. This may affect third-party queries that use these nodes to identify library methods or fields that are present in DLL files where those methods or fields are unreferenced. If this presents a problem, consider using :code:`Callable` and other non-dataflow classes to identify such library entities.
+*   C#: Add extractor support for attributes on indexers.
+
+Golang
+""""""
+
+*   A method in the method set of an embedded field of a struct should not be promoted to the method set of the struct if the struct has a method with the same name. This was not being enforced, which meant that there were two methods with the same qualified name, and models were sometimes being applied when they shouldn't have been. This has now been fixed.
+
+Python
+""""""
+
+*   The common sanitizer guard :code:`StringConstCompareBarrier` has been renamed to :code:`ConstCompareBarrier` and expanded to cover comparisons with other constant values such as :code:`None`. This may result in fewer false positive results for several queries.
+
+Swift
+"""""
+
+*   All AST classes in :code:`codeql.swift.elements` are now :code:`final`, which means that it is no longer possible to :code:`override` predicates defined in those classes (it is, however, still possible to :code:`extend` the classes).
+
+Deprecated APIs
+~~~~~~~~~~~~~~~
+
+C#
+""
+
+*   The class :code:`ThreatModelFlowSource` has been renamed to :code:`ActiveThreatModelSource` to more clearly reflect it only contains the currently active threat model sources. :code:`ThreatModelFlowSource` has been marked as deprecated.
+
+Golang
+""""""
+
+*   The class :code:`ThreatModelFlowSource` has been renamed to :code:`ActiveThreatModelSource` to more clearly reflect it only contains the currently active threat model sources. :code:`ThreatModelFlowSource` has been marked as deprecated.
+
+Java/Kotlin
+"""""""""""
+
+*   The :code:`Field.getSourceDeclaration()` predicate has been deprecated. The result was always the original field, so calls to it can simply be removed.
+*   The :code:`Field.isSourceDeclaration()` predicate has been deprecated. It always holds.
+*   The :code:`RefType.nestedName()` predicate has been deprecated, and :code:`RefType.getNestedName()` added to replace it.
+*   The class :code:`ThreatModelFlowSource` has been renamed to :code:`ActiveThreatModelSource` to more clearly reflect it only contains the currently active threat model sources. :code:`ThreatModelFlowSource` has been marked as deprecated.
+
+New Features
+~~~~~~~~~~~~
+
+Java/Kotlin
+"""""""""""
+
+*   The Java extractor and QL libraries now support Java 23.
+*   Kotlin versions up to 2.1.0\ *x* are now supported.
+
+Python
+""""""
+
+*   Added support for custom threat-models, which can be used in most of our taint-tracking queries, see our `documentation <https://docs.github.com/en/code-security/code-scanning/creating-an-advanced-setup-for-code-scanning/customizing-your-advanced-setup-for-code-scanning#extending-codeql-coverage-with-threat-models>`__ for more details.
diff --git a/docs/codeql/codeql-overview/codeql-changelog/index.rst b/docs/codeql/codeql-overview/codeql-changelog/index.rst
index 1270d569efb1..4c8d07bd9408 100644
--- a/docs/codeql/codeql-overview/codeql-changelog/index.rst
+++ b/docs/codeql/codeql-overview/codeql-changelog/index.rst
@@ -11,6 +11,7 @@ A list of queries for each suite and language `is available here <https://docs.g
 .. toctree::
    :maxdepth: 1
 
+   codeql-cli-2.19.1
    codeql-cli-2.19.0
    codeql-cli-2.18.4
    codeql-cli-2.18.3

From f084bb7bcf4690df2789781c07e1e0fb7b63a82e Mon Sep 17 00:00:00 2001
From: Geoffrey White <40627776+geoffw0@users.noreply.github.com>
Date: Tue, 8 Oct 2024 11:27:09 +0100
Subject: [PATCH 196/347] Rust: A couple of interesting cases with
 short-circuiting.

---
 .../unusedentities/UnreachableCode.expected   | 22 +++++++++----------
 .../query-tests/unusedentities/unreachable.rs | 16 ++++++++++++++
 2 files changed, 27 insertions(+), 11 deletions(-)

diff --git a/rust/ql/test/query-tests/unusedentities/UnreachableCode.expected b/rust/ql/test/query-tests/unusedentities/UnreachableCode.expected
index 83aba7040460..5e7e99c47c6c 100644
--- a/rust/ql/test/query-tests/unusedentities/UnreachableCode.expected
+++ b/rust/ql/test/query-tests/unusedentities/UnreachableCode.expected
@@ -2,15 +2,15 @@
 | unreachable.rs:32:3:32:17 | ExprStmt | This code is never reached. |
 | unreachable.rs:39:3:39:17 | ExprStmt | This code is never reached. |
 | unreachable.rs:48:2:48:16 | ExprStmt | This code is never reached. |
-| unreachable.rs:89:3:91:3 | MatchArm | This code is never reached. |
-| unreachable.rs:92:3:94:3 | MatchArm | This code is never reached. |
-| unreachable.rs:96:2:96:16 | ExprStmt | This code is never reached. |
-| unreachable.rs:99:3:101:3 | MatchArm | This code is never reached. |
-| unreachable.rs:102:3:104:3 | MatchArm | This code is never reached. |
-| unreachable.rs:106:2:106:16 | ExprStmt | This code is never reached. |
-| unreachable.rs:113:3:113:17 | ExprStmt | This code is never reached. |
-| unreachable.rs:118:4:118:18 | ExprStmt | This code is never reached. |
-| unreachable.rs:122:4:122:18 | ExprStmt | This code is never reached. |
-| unreachable.rs:126:4:126:18 | ExprStmt | This code is never reached. |
+| unreachable.rs:105:3:107:3 | MatchArm | This code is never reached. |
+| unreachable.rs:108:3:110:3 | MatchArm | This code is never reached. |
+| unreachable.rs:112:2:112:16 | ExprStmt | This code is never reached. |
+| unreachable.rs:115:3:117:3 | MatchArm | This code is never reached. |
+| unreachable.rs:118:3:120:3 | MatchArm | This code is never reached. |
+| unreachable.rs:122:2:122:16 | ExprStmt | This code is never reached. |
+| unreachable.rs:129:3:129:17 | ExprStmt | This code is never reached. |
 | unreachable.rs:134:4:134:18 | ExprStmt | This code is never reached. |
-| unreachable.rs:137:2:137:16 | ExprStmt | This code is never reached. |
+| unreachable.rs:138:4:138:18 | ExprStmt | This code is never reached. |
+| unreachable.rs:142:4:142:18 | ExprStmt | This code is never reached. |
+| unreachable.rs:150:4:150:18 | ExprStmt | This code is never reached. |
+| unreachable.rs:153:2:153:16 | ExprStmt | This code is never reached. |
diff --git a/rust/ql/test/query-tests/unusedentities/unreachable.rs b/rust/ql/test/query-tests/unusedentities/unreachable.rs
index 3dbda4981e9c..45f758164c70 100644
--- a/rust/ql/test/query-tests/unusedentities/unreachable.rs
+++ b/rust/ql/test/query-tests/unusedentities/unreachable.rs
@@ -82,6 +82,22 @@ fn unreachable_panic() {
 		_ = maybe.unwrap(); // (always panics)
 		do_something(); // BAD: unreachable code [NOT DETECTED]
 	}
+
+	if cond() {
+		do_something();
+		_ = false && panic!(); // does not panic due to short-circuiting
+		do_something();
+		_ = false || panic!();
+		do_something(); // BAD: unreachable code [NOT DETECTED]
+	}
+
+	if cond() {
+		do_something();
+		_ = true || panic!(); // does not panic due to short-circuiting
+		do_something();
+		_ = true && panic!();
+		do_something(); // BAD: unreachable code [NOT DETECTED]
+	}
 }
 
 fn unreachable_match() {

From 9e3f4cd1838b4a27714a550bb93daf6b04914026 Mon Sep 17 00:00:00 2001
From: Geoffrey White <40627776+geoffw0@users.noreply.github.com>
Date: Tue, 8 Oct 2024 11:32:36 +0100
Subject: [PATCH 197/347] Rust: Accept test changes after merging main.

---
 .../unusedentities/UnreachableCode.expected    | 16 +++++++++++++---
 .../ql/test/query-tests/unusedentities/main.rs | 18 +++++++++---------
 .../query-tests/unusedentities/unreachable.rs  | 14 +++++++-------
 3 files changed, 29 insertions(+), 19 deletions(-)

diff --git a/rust/ql/test/query-tests/unusedentities/UnreachableCode.expected b/rust/ql/test/query-tests/unusedentities/UnreachableCode.expected
index 5e7e99c47c6c..671485c781f6 100644
--- a/rust/ql/test/query-tests/unusedentities/UnreachableCode.expected
+++ b/rust/ql/test/query-tests/unusedentities/UnreachableCode.expected
@@ -1,7 +1,18 @@
-| main.rs:114:3:114:29 | ExprStmt | This code is never reached. |
+| main.rs:216:9:217:9 | MatchArm | This code is never reached. |
+| main.rs:218:9:219:9 | MatchArm | This code is never reached. |
+| main.rs:224:9:226:9 | MatchArm | This code is never reached. |
+| main.rs:227:9:228:9 | MatchArm | This code is never reached. |
+| main.rs:233:9:234:9 | MatchArm | This code is never reached. |
+| main.rs:235:9:235:28 | MatchArm | This code is never reached. |
+| main.rs:240:9:240:26 | MatchArm | This code is never reached. |
+| main.rs:241:9:241:25 | MatchArm | This code is never reached. |
+| unreachable.rs:12:3:12:17 | ExprStmt | This code is never reached. |
+| unreachable.rs:20:3:20:17 | ExprStmt | This code is never reached. |
 | unreachable.rs:32:3:32:17 | ExprStmt | This code is never reached. |
 | unreachable.rs:39:3:39:17 | ExprStmt | This code is never reached. |
 | unreachable.rs:48:2:48:16 | ExprStmt | This code is never reached. |
+| unreachable.rs:89:3:89:17 | ExprStmt | This code is never reached. |
+| unreachable.rs:97:3:97:17 | ExprStmt | This code is never reached. |
 | unreachable.rs:105:3:107:3 | MatchArm | This code is never reached. |
 | unreachable.rs:108:3:110:3 | MatchArm | This code is never reached. |
 | unreachable.rs:112:2:112:16 | ExprStmt | This code is never reached. |
@@ -9,8 +20,7 @@
 | unreachable.rs:118:3:120:3 | MatchArm | This code is never reached. |
 | unreachable.rs:122:2:122:16 | ExprStmt | This code is never reached. |
 | unreachable.rs:129:3:129:17 | ExprStmt | This code is never reached. |
-| unreachable.rs:134:4:134:18 | ExprStmt | This code is never reached. |
 | unreachable.rs:138:4:138:18 | ExprStmt | This code is never reached. |
-| unreachable.rs:142:4:142:18 | ExprStmt | This code is never reached. |
+| unreachable.rs:144:3:144:17 | ExprStmt | This code is never reached. |
 | unreachable.rs:150:4:150:18 | ExprStmt | This code is never reached. |
 | unreachable.rs:153:2:153:16 | ExprStmt | This code is never reached. |
diff --git a/rust/ql/test/query-tests/unusedentities/main.rs b/rust/ql/test/query-tests/unusedentities/main.rs
index dc7d89d329a3..765cbcf0d4b5 100644
--- a/rust/ql/test/query-tests/unusedentities/main.rs
+++ b/rust/ql/test/query-tests/unusedentities/main.rs
@@ -111,7 +111,7 @@ fn arrays() {
 
     println!("lets use {:?}", js);
 
-    for k // SPURIOUS: unused variable [macros not yet supported]
+    for k
 	in ks
 	{
         println!("lets use {}", k); // [unreachable FALSE POSITIVE]
@@ -213,32 +213,32 @@ fn if_lets() {
 
     let c = Some(60);
     match c {
-        Some(val) => { // BAD: unused variable
+        Some(val) => { // BAD: unused variable SPURIOUS: unreachable
         }
-        None => { // SPURIOUS: unused variable 'None'
+        None => { // SPURIOUS: unused variable 'None', unreachable
         }
     }
 
     let d = Some(70);
     match d {
-        Some(val) => {
+        Some(val) => { // SPURIOUS: unreachable
             total += val;
         }
-        None => { // SPURIOUS: unused variable 'None'
+        None => { // SPURIOUS: unused variable 'None', unreachable
         }
     }
 
     let e = MyOption::Some(80);
     match e {
-        MyOption::Some(val) => { // BAD: unused variable
+        MyOption::Some(val) => { // BAD: unused variable, unreachable
         }
-        MyOption::None => {}
+        MyOption::None => {} // SPURIOUS: unreachable
     }
 
     let f = YesOrNo::Yes;
     match f {
-        YesOrNo::Yes => {}
-        YesOrNo::No => {}
+        YesOrNo::Yes => {} // SPURIOUS: unreachable
+        YesOrNo::No => {} // SPURIOUS: unreachable
     }
 }
 
diff --git a/rust/ql/test/query-tests/unusedentities/unreachable.rs b/rust/ql/test/query-tests/unusedentities/unreachable.rs
index 45f758164c70..8fed7851df03 100644
--- a/rust/ql/test/query-tests/unusedentities/unreachable.rs
+++ b/rust/ql/test/query-tests/unusedentities/unreachable.rs
@@ -9,7 +9,7 @@ fn do_something() {
 
 fn unreachable_if() {
 	if false {
-		do_something(); // BAD: unreachable code [NOT DETECTED]
+		do_something(); // BAD: unreachable code
 	} else {
 		do_something();
 	}
@@ -17,7 +17,7 @@ fn unreachable_if() {
 	if true {
 		do_something();
 	} else {
-		do_something(); // BAD: unreachable code [NOT DETECTED]
+		do_something(); // BAD: unreachable code
 	}
 
 	let v = get_a_number();
@@ -86,7 +86,7 @@ fn unreachable_panic() {
 	if cond() {
 		do_something();
 		_ = false && panic!(); // does not panic due to short-circuiting
-		do_something();
+		do_something(); // SPURIOUS: unreachable
 		_ = false || panic!();
 		do_something(); // BAD: unreachable code [NOT DETECTED]
 	}
@@ -94,7 +94,7 @@ fn unreachable_panic() {
 	if cond() {
 		do_something();
 		_ = true || panic!(); // does not panic due to short-circuiting
-		do_something();
+		do_something(); // SPURIOUS: unreachable
 		_ = true && panic!();
 		do_something(); // BAD: unreachable code [NOT DETECTED]
 	}
@@ -131,7 +131,7 @@ fn unreachable_loop() {
 
 	if cond() {
 		while cond() {
-			do_something();{ // [unreachable FALSE POSITIVE]
+			do_something();{
 		}
 
 		while false {
@@ -139,9 +139,9 @@ fn unreachable_loop() {
 		}
 
 		while true {
-			do_something(); // [unreachable FALSE POSITIVE]
+			do_something();
 		}
-		do_something(); // BAD: unreachable code [NOT DETECTED]
+		do_something(); // BAD: unreachable code
 	}
 
 	loop {

From 40096ebb6216d5f6b370b1b53eee21116288473e Mon Sep 17 00:00:00 2001
From: Geoffrey White <40627776+geoffw0@users.noreply.github.com>
Date: Tue, 8 Oct 2024 11:46:45 +0100
Subject: [PATCH 198/347] Rust: More cleanup after merge.

---
 rust/ql/test/query-tests/unusedentities/main.rs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/rust/ql/test/query-tests/unusedentities/main.rs b/rust/ql/test/query-tests/unusedentities/main.rs
index 765cbcf0d4b5..79d8ddfa6fce 100644
--- a/rust/ql/test/query-tests/unusedentities/main.rs
+++ b/rust/ql/test/query-tests/unusedentities/main.rs
@@ -111,7 +111,7 @@ fn arrays() {
 
     println!("lets use {:?}", js);
 
-    for k
+    for k // SPURIOUS: unused variable [macros not yet supported]
 	in ks
 	{
         println!("lets use {}", k); // [unreachable FALSE POSITIVE]
@@ -251,12 +251,12 @@ fn main() {
 	arrays();
 	statics();
 	println!("lets use result {}", parameters(1, 2, 3));
-    loops();
-    if_lets();
+	loops();
+	if_lets();
 	unreachable_if();
 	unreachable_panic();
 	unreachable_match();
 	unreachable_loop();
 
-    println!("lets use result {}", parameters(1, 2, 3));
+	println!("lets use result {}", parameters(1, 2, 3));
 }

From 5d7a92cf1330ba8de74b9f759dc161ae77cf4504 Mon Sep 17 00:00:00 2001
From: Geoffrey White <40627776+geoffw0@users.noreply.github.com>
Date: Tue, 8 Oct 2024 11:58:53 +0100
Subject: [PATCH 199/347] Rust: Add example from discussion.

---
 .../unusedentities/UnreachableCode.expected   | 28 ++++++++++---------
 .../query-tests/unusedentities/unreachable.rs | 12 ++++++++
 2 files changed, 27 insertions(+), 13 deletions(-)

diff --git a/rust/ql/test/query-tests/unusedentities/UnreachableCode.expected b/rust/ql/test/query-tests/unusedentities/UnreachableCode.expected
index 671485c781f6..12393781849c 100644
--- a/rust/ql/test/query-tests/unusedentities/UnreachableCode.expected
+++ b/rust/ql/test/query-tests/unusedentities/UnreachableCode.expected
@@ -10,17 +10,19 @@
 | unreachable.rs:20:3:20:17 | ExprStmt | This code is never reached. |
 | unreachable.rs:32:3:32:17 | ExprStmt | This code is never reached. |
 | unreachable.rs:39:3:39:17 | ExprStmt | This code is never reached. |
-| unreachable.rs:48:2:48:16 | ExprStmt | This code is never reached. |
-| unreachable.rs:89:3:89:17 | ExprStmt | This code is never reached. |
-| unreachable.rs:97:3:97:17 | ExprStmt | This code is never reached. |
-| unreachable.rs:105:3:107:3 | MatchArm | This code is never reached. |
-| unreachable.rs:108:3:110:3 | MatchArm | This code is never reached. |
-| unreachable.rs:112:2:112:16 | ExprStmt | This code is never reached. |
-| unreachable.rs:115:3:117:3 | MatchArm | This code is never reached. |
-| unreachable.rs:118:3:120:3 | MatchArm | This code is never reached. |
-| unreachable.rs:122:2:122:16 | ExprStmt | This code is never reached. |
-| unreachable.rs:129:3:129:17 | ExprStmt | This code is never reached. |
-| unreachable.rs:138:4:138:18 | ExprStmt | This code is never reached. |
-| unreachable.rs:144:3:144:17 | ExprStmt | This code is never reached. |
+| unreachable.rs:46:6:46:8 | ParenExpr | This code is never reached. |
+| unreachable.rs:48:7:48:10 | ParenExpr | This code is never reached. |
+| unreachable.rs:60:2:60:16 | ExprStmt | This code is never reached. |
+| unreachable.rs:101:3:101:17 | ExprStmt | This code is never reached. |
+| unreachable.rs:109:3:109:17 | ExprStmt | This code is never reached. |
+| unreachable.rs:117:3:119:3 | MatchArm | This code is never reached. |
+| unreachable.rs:120:3:122:3 | MatchArm | This code is never reached. |
+| unreachable.rs:124:2:124:16 | ExprStmt | This code is never reached. |
+| unreachable.rs:127:3:129:3 | MatchArm | This code is never reached. |
+| unreachable.rs:130:3:132:3 | MatchArm | This code is never reached. |
+| unreachable.rs:134:2:134:16 | ExprStmt | This code is never reached. |
+| unreachable.rs:141:3:141:17 | ExprStmt | This code is never reached. |
 | unreachable.rs:150:4:150:18 | ExprStmt | This code is never reached. |
-| unreachable.rs:153:2:153:16 | ExprStmt | This code is never reached. |
+| unreachable.rs:156:3:156:17 | ExprStmt | This code is never reached. |
+| unreachable.rs:162:4:162:18 | ExprStmt | This code is never reached. |
+| unreachable.rs:165:2:165:16 | ExprStmt | This code is never reached. |
diff --git a/rust/ql/test/query-tests/unusedentities/unreachable.rs b/rust/ql/test/query-tests/unusedentities/unreachable.rs
index 8fed7851df03..023ba216daec 100644
--- a/rust/ql/test/query-tests/unusedentities/unreachable.rs
+++ b/rust/ql/test/query-tests/unusedentities/unreachable.rs
@@ -40,6 +40,18 @@ fn unreachable_if() {
 	}
 	do_something();
 
+	if cond() {
+		bool x = cond();
+
+		if (x) { // SPURIOUS: unreachable
+			do_something();
+			if (!x) { // SPURIOUS: unreachable
+				do_something(); // BAD: unreachable code [NOT DETECTED]
+			}
+			do_something();
+		}
+	}
+
 	if cond() {
 		return;
 	} else {

From 6bde26d9fde42acc5def3f38fc06c5d33c39c17f Mon Sep 17 00:00:00 2001
From: Geoffrey White <40627776+geoffw0@users.noreply.github.com>
Date: Tue, 8 Oct 2024 12:07:31 +0100
Subject: [PATCH 200/347] Rust: Switch firstUnreachable to hvitved's suggested
 implementation.

---
 .../queries/unusedentities/UnreachableCode.ql | 28 +++++++++++++------
 1 file changed, 19 insertions(+), 9 deletions(-)

diff --git a/rust/ql/src/queries/unusedentities/UnreachableCode.ql b/rust/ql/src/queries/unusedentities/UnreachableCode.ql
index 3458bb338c55..d095ebeb523e 100644
--- a/rust/ql/src/queries/unusedentities/UnreachableCode.ql
+++ b/rust/ql/src/queries/unusedentities/UnreachableCode.ql
@@ -12,19 +12,29 @@ import rust
 import codeql.rust.controlflow.ControlFlowGraph
 import codeql.rust.controlflow.internal.ControlFlowGraphImpl as ControlFlowGraphImpl
 
+/**
+ * Holds if `n` is an AST node that's unreachable.
+ */
+private predicate unreachable(AstNode n) {
+  not n = any(CfgNode cfn).getAstNode()
+}
+
 /**
  * Holds if `n` is an AST node that's unreachable, and is not the successor
  * of an unreachable node (which would be a duplicate result).
  */
-predicate firstUnreachable(AstNode n) {
-  // entry nodes are reachable
-  not exists(CfgScope s | s.scopeFirst(n)) and
-  // we never want a `ControlFlowTree` successor node:
-  //  - if the predecessor is reachable, so are we.
-  //  - if the predecessor is unreachable, we're not the *first* unreachable node.
-  not ControlFlowGraphImpl::succ(_, n, _)
-  // (note that an unreachable cycle of nodes could be missed by this logic, in
-  //  general it wouldn't be possible to pick one node to represent it)
+private predicate firstUnreachable(AstNode n) {
+  unreachable(n) and
+  (
+    // no predecessor -> we are the first unreachable node.
+    not ControlFlowGraphImpl::succ(_, n, _)
+    or
+    // reachable predecessor -> we are the first unreachable node.
+    exists(AstNode pred |
+      ControlFlowGraphImpl::succ(pred, n, _) and
+      not unreachable(pred)
+    )
+  )
 }
 
 /**

From cb1ca4c75cffd702dec7fe7af7053439f6953f80 Mon Sep 17 00:00:00 2001
From: Tom Hvitved <hvitved@github.com>
Date: Tue, 8 Oct 2024 13:41:24 +0200
Subject: [PATCH 201/347] Update
 rust/ql/lib/codeql/rust/controlflow/internal/Completion.qll

Co-authored-by: Geoffrey White <40627776+geoffw0@users.noreply.github.com>
---
 rust/ql/lib/codeql/rust/controlflow/internal/Completion.qll | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rust/ql/lib/codeql/rust/controlflow/internal/Completion.qll b/rust/ql/lib/codeql/rust/controlflow/internal/Completion.qll
index fc427ce32f88..c0aac56b8f1d 100644
--- a/rust/ql/lib/codeql/rust/controlflow/internal/Completion.qll
+++ b/rust/ql/lib/codeql/rust/controlflow/internal/Completion.qll
@@ -62,7 +62,7 @@ abstract class ConditionalCompletion extends NormalCompletion {
   abstract ConditionalCompletion getDual();
 }
 
-/** Holds if node `n` has the Boolean constant value `value`. */
+/** Holds if node `le` has the Boolean constant value `value`. */
 private predicate isBooleanConstant(LiteralExpr le, Boolean value) {
   le.getTextValue() = value.toString()
 }

From 3b1d917c2b83e58dcdcc385e66f74a779bdedcf7 Mon Sep 17 00:00:00 2001
From: Geoffrey White <40627776+geoffw0@users.noreply.github.com>
Date: Tue, 8 Oct 2024 13:30:28 +0100
Subject: [PATCH 202/347] Rust: Autoformat.

---
 rust/ql/src/queries/unusedentities/UnreachableCode.ql | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/rust/ql/src/queries/unusedentities/UnreachableCode.ql b/rust/ql/src/queries/unusedentities/UnreachableCode.ql
index d095ebeb523e..2cb3944d8191 100644
--- a/rust/ql/src/queries/unusedentities/UnreachableCode.ql
+++ b/rust/ql/src/queries/unusedentities/UnreachableCode.ql
@@ -15,9 +15,7 @@ import codeql.rust.controlflow.internal.ControlFlowGraphImpl as ControlFlowGraph
 /**
  * Holds if `n` is an AST node that's unreachable.
  */
-private predicate unreachable(AstNode n) {
-  not n = any(CfgNode cfn).getAstNode()
-}
+private predicate unreachable(AstNode n) { not n = any(CfgNode cfn).getAstNode() }
 
 /**
  * Holds if `n` is an AST node that's unreachable, and is not the successor

From 7235ba8f915240113925f643c8da060f14991b00 Mon Sep 17 00:00:00 2001
From: Geoffrey White <40627776+geoffw0@users.noreply.github.com>
Date: Tue, 8 Oct 2024 13:37:13 +0100
Subject: [PATCH 203/347] Rust: Fix test compilation errors.

---
 rust/ql/test/query-tests/unusedentities/unreachable.rs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/rust/ql/test/query-tests/unusedentities/unreachable.rs b/rust/ql/test/query-tests/unusedentities/unreachable.rs
index 023ba216daec..32bcf6eb59b8 100644
--- a/rust/ql/test/query-tests/unusedentities/unreachable.rs
+++ b/rust/ql/test/query-tests/unusedentities/unreachable.rs
@@ -41,7 +41,7 @@ fn unreachable_if() {
 	do_something();
 
 	if cond() {
-		bool x = cond();
+		let x = cond();
 
 		if (x) { // SPURIOUS: unreachable
 			do_something();
@@ -143,7 +143,7 @@ fn unreachable_loop() {
 
 	if cond() {
 		while cond() {
-			do_something();{
+			do_something();
 		}
 
 		while false {

From a7dbe2944826a9d48b6838048e02569430e9a16f Mon Sep 17 00:00:00 2001
From: Geoffrey White <40627776+geoffw0@users.noreply.github.com>
Date: Tue, 8 Oct 2024 13:49:07 +0100
Subject: [PATCH 204/347] Rust: Add parenthesis example to test.

---
 .../test/query-tests/unusedentities/UnreachableCode.expected  | 3 +++
 rust/ql/test/query-tests/unusedentities/main.rs               | 3 +--
 rust/ql/test/query-tests/unusedentities/unreachable.rs        | 4 ++++
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/rust/ql/test/query-tests/unusedentities/UnreachableCode.expected b/rust/ql/test/query-tests/unusedentities/UnreachableCode.expected
index 12393781849c..0aeec4ce5c88 100644
--- a/rust/ql/test/query-tests/unusedentities/UnreachableCode.expected
+++ b/rust/ql/test/query-tests/unusedentities/UnreachableCode.expected
@@ -26,3 +26,6 @@
 | unreachable.rs:156:3:156:17 | ExprStmt | This code is never reached. |
 | unreachable.rs:162:4:162:18 | ExprStmt | This code is never reached. |
 | unreachable.rs:165:2:165:16 | ExprStmt | This code is never reached. |
+| unreachable.rs:171:10:171:16 | ParenExpr | This code is never reached. |
+| unreachable.rs:171:11:171:15 | ParenExpr | This code is never reached. |
+| unreachable.rs:171:12:171:14 | ParenExpr | This code is never reached. |
diff --git a/rust/ql/test/query-tests/unusedentities/main.rs b/rust/ql/test/query-tests/unusedentities/main.rs
index 79d8ddfa6fce..a7186a19aa1c 100644
--- a/rust/ql/test/query-tests/unusedentities/main.rs
+++ b/rust/ql/test/query-tests/unusedentities/main.rs
@@ -257,6 +257,5 @@ fn main() {
 	unreachable_panic();
 	unreachable_match();
 	unreachable_loop();
-
-	println!("lets use result {}", parameters(1, 2, 3));
+	unreachable_paren();
 }
diff --git a/rust/ql/test/query-tests/unusedentities/unreachable.rs b/rust/ql/test/query-tests/unusedentities/unreachable.rs
index 32bcf6eb59b8..9c1625a29203 100644
--- a/rust/ql/test/query-tests/unusedentities/unreachable.rs
+++ b/rust/ql/test/query-tests/unusedentities/unreachable.rs
@@ -166,3 +166,7 @@ fn unreachable_loop() {
 	do_something();
 	do_something();
 }
+
+fn unreachable_paren() {
+	let _ = (((1))); // SPURIOUS: unreachable (x3)
+}

From 70d530a49c9de94502da22990c0c04d272096c64 Mon Sep 17 00:00:00 2001
From: Geoffrey White <40627776+geoffw0@users.noreply.github.com>
Date: Tue, 8 Oct 2024 13:52:15 +0100
Subject: [PATCH 205/347] Rust: Exclude nodes that aren't part of the CFG.

---
 rust/ql/src/queries/unusedentities/UnreachableCode.ql | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/rust/ql/src/queries/unusedentities/UnreachableCode.ql b/rust/ql/src/queries/unusedentities/UnreachableCode.ql
index 2cb3944d8191..e4a418c882c2 100644
--- a/rust/ql/src/queries/unusedentities/UnreachableCode.ql
+++ b/rust/ql/src/queries/unusedentities/UnreachableCode.ql
@@ -15,7 +15,10 @@ import codeql.rust.controlflow.internal.ControlFlowGraphImpl as ControlFlowGraph
 /**
  * Holds if `n` is an AST node that's unreachable.
  */
-private predicate unreachable(AstNode n) { not n = any(CfgNode cfn).getAstNode() }
+private predicate unreachable(AstNode n) {
+  not n = any(CfgNode cfn).getAstNode() and // reachable nodes
+  n instanceof ControlFlowGraphImpl::ControlFlowTree // part of the CFG
+}
 
 /**
  * Holds if `n` is an AST node that's unreachable, and is not the successor

From 08d6d5496199c45b23bf1c99b64ab018c7140acc Mon Sep 17 00:00:00 2001
From: Tom Hvitved <hvitved@github.com>
Date: Tue, 8 Oct 2024 15:00:38 +0200
Subject: [PATCH 206/347] Rust: Add AST consistency queries

---
 rust/ql/consistency-queries/AstConsistency.ql | 21 +++++++++++++++++++
 1 file changed, 21 insertions(+)
 create mode 100644 rust/ql/consistency-queries/AstConsistency.ql

diff --git a/rust/ql/consistency-queries/AstConsistency.ql b/rust/ql/consistency-queries/AstConsistency.ql
new file mode 100644
index 000000000000..2187f53b61fe
--- /dev/null
+++ b/rust/ql/consistency-queries/AstConsistency.ql
@@ -0,0 +1,21 @@
+import rust
+import codeql.rust.elements.internal.generated.ParentChild
+
+query predicate multipleToString(Element e, string s) {
+  s = strictconcat(e.toString(), ",") and
+  strictcount(e.toString()) > 1
+}
+
+query predicate multipleLocations(Locatable e) { strictcount(e.getLocation()) > 1 }
+
+query predicate multiplePrimaryQlClasses(Element e, string s) {
+  s = e.getPrimaryQlClasses() and
+  strictcount(e.getAPrimaryQlClass()) > 1
+}
+
+private Element getParent(Element child) { child = getChildAndAccessor(result, _, _) }
+
+query predicate multipleParents(Element child, Element parent) {
+  parent = getParent(child) and
+  strictcount(getParent(child)) > 1
+}

From 92bca9c268dd0e6a7743525cebc25279c747b788 Mon Sep 17 00:00:00 2001
From: Taus <tausbn@github.com>
Date: Tue, 8 Oct 2024 15:44:29 +0000
Subject: [PATCH 207/347] Python: Update CORS query tags and change note

Makes it more clear that the query is experimental.
---
 python/ql/src/change-notes/released/1.3.0.md                    | 2 +-
 .../Security/CWE-942/CorsMisconfigurationMiddleware.ql          | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/python/ql/src/change-notes/released/1.3.0.md b/python/ql/src/change-notes/released/1.3.0.md
index 5679632843a0..eee07453dee7 100644
--- a/python/ql/src/change-notes/released/1.3.0.md
+++ b/python/ql/src/change-notes/released/1.3.0.md
@@ -2,4 +2,4 @@
 
 ### New Queries
 
-* The `py/cors-misconfiguration-with-credentials` query, which finds insecure CORS middleware configurations.
+* The experimental `py/cors-misconfiguration-with-credentials` query, which finds insecure CORS middleware configurations.
diff --git a/python/ql/src/experimental/Security/CWE-942/CorsMisconfigurationMiddleware.ql b/python/ql/src/experimental/Security/CWE-942/CorsMisconfigurationMiddleware.ql
index 9d2b461b9865..af92800ba003 100644
--- a/python/ql/src/experimental/Security/CWE-942/CorsMisconfigurationMiddleware.ql
+++ b/python/ql/src/experimental/Security/CWE-942/CorsMisconfigurationMiddleware.ql
@@ -8,6 +8,7 @@
  * @precision high
  * @id py/cors-misconfiguration-with-credentials
  * @tags security
+ *       experimental
  *       external/cwe/cwe-942
  */
 

From f1e22687ab579892fb2b9ce6ecebf7a2c268809f Mon Sep 17 00:00:00 2001
From: Jeroen Ketema <jketema@github.com>
Date: Tue, 8 Oct 2024 20:09:31 +0200
Subject: [PATCH 208/347] C++: Fix ODR violations in tests

In QLtest we do not have linkage awareness, so having multiple functions with
the same name in the same test causes ODR violations.
---
 .../CWE/CWE-125/semmle/tests/test.cpp         | 28 +++++++--------
 .../CWE/CWE-125/semmle/tests/test1.cpp        | 20 +++++------
 .../CWE/CWE-125/semmle/tests/test2.cpp        | 22 ++++++------
 .../CWE/CWE-125/semmle/tests/test3.cpp        | 10 +++---
 .../CWE-131/NoSpaceForZeroTerminator/test.c   | 18 +++++-----
 .../CWE-131/NoSpaceForZeroTerminator/test.cpp | 26 +++++++-------
 .../NoSpaceForZeroTerminator/test2.cpp        | 10 +++---
 .../semmle/tainted/ArithmeticTainted.expected | 36 +++++++------------
 .../tainted/IntegerOverflowTainted.expected   | 17 ++++-----
 .../CWE/CWE-190/semmle/tainted/main.cpp       | 12 +++++++
 .../CWE/CWE-190/semmle/tainted/test.c         |  2 +-
 .../CWE/CWE-190/semmle/tainted/test3.c        |  2 +-
 .../CWE/CWE-190/semmle/tainted/test4.cpp      |  2 +-
 .../CWE/CWE-497/semmle/tests/tests2.cpp       |  2 +-
 14 files changed, 101 insertions(+), 106 deletions(-)
 create mode 100644 cpp/ql/test/query-tests/Security/CWE/CWE-190/semmle/tainted/main.cpp

diff --git a/cpp/ql/test/experimental/query-tests/Security/CWE/CWE-125/semmle/tests/test.cpp b/cpp/ql/test/experimental/query-tests/Security/CWE/CWE-125/semmle/tests/test.cpp
index b5e8096af2ac..b4f0830039d8 100644
--- a/cpp/ql/test/experimental/query-tests/Security/CWE/CWE-125/semmle/tests/test.cpp
+++ b/cpp/ql/test/experimental/query-tests/Security/CWE/CWE-125/semmle/tests/test.cpp
@@ -6,7 +6,7 @@ int wprintf (const wchar_t* format, ...);
 int strlen( const char * string );
 int checkErrors();
 
-void goodTest0()
+static void goodTest0()
 {
   char * ptr = "123456789";
   int ret;
@@ -17,7 +17,7 @@ void goodTest0()
     ptr += ret;
   }
 }
-void goodTest1(const char* ptr)
+static void goodTest1(const char* ptr)
 {
   int ret;
   int len;
@@ -27,7 +27,7 @@ void goodTest1(const char* ptr)
     ptr += ret;
   }
 }
-void goodTest2(char* ptr)
+static void goodTest2(char* ptr)
 {
   int ret;
   ptr[10]=0;
@@ -38,7 +38,7 @@ void goodTest2(char* ptr)
   }
 }
 
-void goodTest3(const char* ptr)
+static void goodTest3(const char* ptr)
 {
   int ret;
   int len;
@@ -48,7 +48,7 @@ void goodTest3(const char* ptr)
     ptr += ret;
   }
 }
-void goodTest4(const char* ptr)
+static void goodTest4(const char* ptr)
 {
   int ret;
   int len;
@@ -58,7 +58,7 @@ void goodTest4(const char* ptr)
     ptr += ret;
   }
 }
-void badTest1(const char* ptr)
+static void badTest1(const char* ptr)
 {
   int ret;
   int len;
@@ -68,7 +68,7 @@ void badTest1(const char* ptr)
     ptr += ret;
   }
 }
-void badTest2(const char* ptr)
+static void badTest2(const char* ptr)
 {
   int ret;
   int len;
@@ -79,7 +79,7 @@ void badTest2(const char* ptr)
   }
 }
 
-void goodTest5(const char* ptr,wchar_t *wc,int wc_len)
+static void goodTest5(const char* ptr,wchar_t *wc,int wc_len)
 {
   int ret;
   int len;
@@ -96,7 +96,7 @@ void goodTest5(const char* ptr,wchar_t *wc,int wc_len)
   }
 }
 
-void badTest3(const char* ptr,int wc_len)
+static void badTest3(const char* ptr,int wc_len)
 {
   int ret;
   int len;
@@ -113,7 +113,7 @@ void badTest3(const char* ptr,int wc_len)
     wc++;
   }
 }
-void badTest4(const char* ptr,int wc_len)
+static void badTest4(const char* ptr,int wc_len)
 {
   int ret;
   int len;
@@ -130,7 +130,7 @@ void badTest4(const char* ptr,int wc_len)
     wc++;
   }
 }
-void badTest5(const char* ptr,int wc_len)
+static void badTest5(const char* ptr,int wc_len)
 {
   int ret;
   int len;
@@ -148,7 +148,7 @@ void badTest5(const char* ptr,int wc_len)
   }
 }
 
-void badTest6(const char* ptr,int wc_len)
+static void badTest6(const char* ptr,int wc_len)
 {
   int ret;
   int len;
@@ -171,7 +171,7 @@ void badTest6(const char* ptr,int wc_len)
     ptr+=ret;
   }
 }
-void badTest7(const char* ptr,int wc_len)
+static void badTest7(const char* ptr,int wc_len)
 {
   int ret;
   int len;
@@ -188,7 +188,7 @@ void badTest7(const char* ptr,int wc_len)
     ptr+=ret;
   }
 }
-void badTest8(const char* ptr,wchar_t *wc)
+static void badTest8(const char* ptr,wchar_t *wc)
 {
   int ret;
   int len;
diff --git a/cpp/ql/test/experimental/query-tests/Security/CWE/CWE-125/semmle/tests/test1.cpp b/cpp/ql/test/experimental/query-tests/Security/CWE/CWE-125/semmle/tests/test1.cpp
index 828b91a44f19..d66f36d38b97 100644
--- a/cpp/ql/test/experimental/query-tests/Security/CWE/CWE-125/semmle/tests/test1.cpp
+++ b/cpp/ql/test/experimental/query-tests/Security/CWE/CWE-125/semmle/tests/test1.cpp
@@ -24,7 +24,7 @@ typedef unsigned int size_t;
 void* calloc (size_t num, size_t size);
 void* malloc (size_t size);
 
-void badTest1(void *src,  int size) {
+static void badTest1(void *src,  int size) {
     WideCharToMultiByte(CP_ACP, 0, (LPCWSTR)src, -1, (LPSTR)src, size, 0, 0); // BAD
     MultiByteToWideChar(CP_ACP, 0, (LPCSTR)src, -1, (LPCWSTR)src, 30); // BAD
 }
@@ -39,43 +39,43 @@ void goodTest2(){
   }
   printf("%s\n", dst);
 }
-void badTest2(){
+static void badTest2(){
   wchar_t src[] = L"0123456789ABCDEF";
   char dst[16];
   WideCharToMultiByte(CP_UTF8, 0, src, -1, dst, 16, NULL, NULL); // BAD
   printf("%s\n", dst);
 }
-void goodTest3(){
+static void goodTest3(){
   char src[] = "0123456789ABCDEF";
   int size = MultiByteToWideChar(CP_UTF8, 0, src,sizeof(src),NULL,0);
   wchar_t * dst = (wchar_t*)calloc(size + 1, sizeof(wchar_t));
   MultiByteToWideChar(CP_UTF8, 0, src, -1, dst, size+1); // GOOD
 }
-void badTest3(){
+static void badTest3(){
   char src[] = "0123456789ABCDEF";
   int size = MultiByteToWideChar(CP_UTF8, 0, src,sizeof(src),NULL,0);
   wchar_t * dst = (wchar_t*)calloc(size + 1, 1);
   MultiByteToWideChar(CP_UTF8, 0, src, -1, dst, size+1); // BAD
 }
-void goodTest4(){
+static void goodTest4(){
   char src[] = "0123456789ABCDEF";
   int size = MultiByteToWideChar(CP_UTF8, 0, src,sizeof(src),NULL,0);
   wchar_t * dst = (wchar_t*)malloc((size + 1)*sizeof(wchar_t));
   MultiByteToWideChar(CP_UTF8, 0, src, -1, dst, size+1); // GOOD
 }
-void badTest4(){
+static void badTest4(){
   char src[] = "0123456789ABCDEF";
   int size = MultiByteToWideChar(CP_UTF8, 0, src,sizeof(src),NULL,0);
   wchar_t * dst = (wchar_t*)malloc(size + 1);
   MultiByteToWideChar(CP_UTF8, 0, src, -1, dst, size+1); // BAD
 }
-int goodTest5(void *src){
+static int goodTest5(void *src){
   return WideCharToMultiByte(CP_ACP, 0, (LPCWSTR)src, -1, 0, 0, 0, 0); // GOOD
 }
-int badTest5 (void *src) {
+static int badTest5 (void *src) {
   return WideCharToMultiByte(CP_ACP, 0, (LPCWSTR)src, -1, 0, 3, 0, 0);  // BAD
 }
-void goodTest6(WCHAR *src)
+static void goodTest6(WCHAR *src)
 {
   int size;
   char dst[5] ="";
@@ -87,7 +87,7 @@ void goodTest6(WCHAR *src)
   WideCharToMultiByte(CP_ACP, 0, src, -1, dst, sizeof(dst), 0, 0); // GOOD
   printf("%s\n", dst);
 }
-void badTest6(WCHAR *src)
+static void badTest6(WCHAR *src)
 {
     char dst[5] ="";
     WideCharToMultiByte(CP_ACP, 0, src, -1, dst, 260, 0, 0); // BAD
diff --git a/cpp/ql/test/experimental/query-tests/Security/CWE/CWE-125/semmle/tests/test2.cpp b/cpp/ql/test/experimental/query-tests/Security/CWE/CWE-125/semmle/tests/test2.cpp
index 99dc3e47e5ba..65e5a9ee275f 100644
--- a/cpp/ql/test/experimental/query-tests/Security/CWE/CWE-125/semmle/tests/test2.cpp
+++ b/cpp/ql/test/experimental/query-tests/Security/CWE/CWE-125/semmle/tests/test2.cpp
@@ -11,14 +11,14 @@ size_t _mbstowcs_l(wchar_t *wcstr,const char *mbstr,size_t count, _locale_t loca
 size_t mbsrtowcs(wchar_t *wcstr,const char *mbstr,size_t count, mbstate_t *mbstate);
 
 
-void badTest1(void *src,  int size) {
+static void badTest1(void *src,  int size) {
     mbstowcs((wchar_t*)src,(char*)src,size); // BAD
     _locale_t locale;
     _mbstowcs_l((wchar_t*)src,(char*)src,size,locale); // BAD
     mbstate_t *mbstate;
     mbsrtowcs((wchar_t*)src,(char*)src,size,mbstate); // BAD
 }
-void goodTest2(){
+static void goodTest2(){
   char src[] = "0123456789ABCDEF";
   wchar_t dst[16];
   int res = mbstowcs(dst, src,16); // GOOD
@@ -29,43 +29,43 @@ void goodTest2(){
   }
   printf("%s\n", dst);
 }
-void badTest2(){
+static void badTest2(){
   char src[] = "0123456789ABCDEF";
   wchar_t dst[16];
   mbstowcs(dst, src,16); // BAD
   printf("%s\n", dst);
 }
-void goodTest3(){
+static void goodTest3(){
   char src[] = "0123456789ABCDEF";
   int size = mbstowcs(NULL, src,NULL);
   wchar_t * dst = (wchar_t*)calloc(size + 1, sizeof(wchar_t));
   mbstowcs(dst, src,size+1); // GOOD
 }
-void badTest3(){
+static void badTest3(){
   char src[] = "0123456789ABCDEF";
   int size = mbstowcs(NULL, src,NULL);
   wchar_t * dst = (wchar_t*)calloc(size + 1, 1);
   mbstowcs(dst, src,size+1); // BAD
 }
-void goodTest4(){
+static void goodTest4(){
   char src[] = "0123456789ABCDEF";
   int size = mbstowcs(NULL, src,NULL);
   wchar_t * dst = (wchar_t*)malloc((size + 1)*sizeof(wchar_t));
   mbstowcs(dst, src,size+1); // GOOD
 }
-void badTest4(){
+static void badTest4(){
   char src[] = "0123456789ABCDEF";
   int size = mbstowcs(NULL, src,NULL);
   wchar_t * dst = (wchar_t*)malloc(size + 1);
   mbstowcs(dst, src,size+1); // BAD
 }
-int goodTest5(void *src){
+static int goodTest5(void *src){
   return mbstowcs(NULL, (char*)src,NULL); // GOOD
 }
-int badTest5 (void *src) {
+static int badTest5 (void *src) {
   return mbstowcs(NULL, (char*)src,3); // BAD
 }
-void goodTest6(void *src){
+static void goodTest6(void *src){
   wchar_t dst[5];
   int size = mbstowcs(NULL, (char*)src,NULL);
   if(size>=sizeof(dst)){
@@ -75,7 +75,7 @@ void goodTest6(void *src){
   mbstowcs(dst, (char*)src,sizeof(dst)); // GOOD
   printf("%s\n", dst);
 }
-void badTest6(void *src){
+static void badTest6(void *src){
   wchar_t dst[5];
   mbstowcs(dst, (char*)src,260); // BAD
   printf("%s\n", dst);
diff --git a/cpp/ql/test/experimental/query-tests/Security/CWE/CWE-125/semmle/tests/test3.cpp b/cpp/ql/test/experimental/query-tests/Security/CWE/CWE-125/semmle/tests/test3.cpp
index e37052e839b1..662cdfc7be81 100644
--- a/cpp/ql/test/experimental/query-tests/Security/CWE/CWE-125/semmle/tests/test3.cpp
+++ b/cpp/ql/test/experimental/query-tests/Security/CWE/CWE-125/semmle/tests/test3.cpp
@@ -9,14 +9,14 @@ void goodTest1(unsigned char *src){
   unsigned char dst[50];
   _mbsnbcpy(dst,src,sizeof(dst)); // GOOD
 }
-size_t badTest1(unsigned char *src){
+static size_t badTest1(unsigned char *src){
   int cb = 0;
   unsigned char dst[50];
   while( cb < sizeof(dst) )
     dst[cb++]=*src++; // BAD
   return _mbclen(dst);
 }
-void goodTest2(unsigned char *src){
+static void goodTest2(unsigned char *src){
 
   int cb = 0;
   unsigned char dst[50];
@@ -27,7 +27,7 @@ void goodTest2(unsigned char *src){
     src=_mbsinc(src);
   }
 }
-void badTest2(unsigned char *src){
+static void badTest2(unsigned char *src){
 
   int cb = 0;
   unsigned char dst[50];
@@ -38,11 +38,11 @@ void badTest2(unsigned char *src){
     src=_mbsinc(src);
   }
 }
-void goodTest3(){
+static void goodTest3(){
   wchar_t name[50];
   name[sizeof(name) / sizeof(*name) - 1] = L'\0'; // GOOD
 }
-void badTest3(){
+static void badTest3(){
   wchar_t name[50];
   name[sizeof(name) - 1] = L'\0'; // BAD
 }
diff --git a/cpp/ql/test/query-tests/Security/CWE/CWE-131/NoSpaceForZeroTerminator/test.c b/cpp/ql/test/query-tests/Security/CWE/CWE-131/NoSpaceForZeroTerminator/test.c
index 21dcad6f2fd5..551b2441a41c 100644
--- a/cpp/ql/test/query-tests/Security/CWE/CWE-131/NoSpaceForZeroTerminator/test.c
+++ b/cpp/ql/test/query-tests/Security/CWE/CWE-131/NoSpaceForZeroTerminator/test.c
@@ -11,14 +11,14 @@ char *strcpy(char *s1, const char *s2);
 
 //// Test code /////
 
-void bad0(char *str) {
+static void bad0(char *str) {
     // BAD -- Not allocating space for '\0' terminator
     char *buffer = malloc(strlen(str));
     strcpy(buffer, str);
     free(buffer);
 }
 
-void good0(char *str) {
+static void good0(char *str) {
     // GOOD -- Allocating extra byte for terminator
     char *buffer = malloc(strlen(str)+1);
     strcpy(buffer, str);
@@ -26,7 +26,7 @@ void good0(char *str) {
 }
 
 
-void bad1(char *str) {
+static void bad1(char *str) {
     int len = strlen(str);
     // BAD -- Not allocating space for '\0' terminator
     char *buffer = malloc(len);
@@ -34,7 +34,7 @@ void bad1(char *str) {
     free(buffer);
 }
 
-void good1(char *str) {
+static void good1(char *str) {
     int len = strlen(str);
     // GOOD -- Allocating extra byte for terminator
     char *buffer = malloc(len+1);
@@ -43,7 +43,7 @@ void good1(char *str) {
 }
 
 
-void bad2(char *str) {
+static void bad2(char *str) {
     int len = strlen(str);
     // BAD -- Not allocating space for '\0' terminator
     char *buffer = malloc(len);
@@ -51,7 +51,7 @@ void bad2(char *str) {
     free(buffer);
 }
 
-void good2(char *str) {
+static void good2(char *str) {
     int len = strlen(str)+1;
     // GOOD -- Allocating extra byte for terminator
     char *buffer = malloc(len);
@@ -59,14 +59,14 @@ void good2(char *str) {
     free(buffer);
 }
 
-void bad3(char *str) {
+static void bad3(char *str) {
     // BAD -- Not allocating space for '\0' terminator
     char *buffer = malloc(strlen(str) * sizeof(char));
     strcpy(buffer, str);
     free(buffer);
 }
 
-void good3(char *str) {
+static void good3(char *str) {
     // GOOD -- Allocating extra byte for terminator
     char *buffer = malloc((strlen(str) + 1) * sizeof(char));
     strcpy(buffer, str);
@@ -75,7 +75,7 @@ void good3(char *str) {
 
 void *memcpy(void *s1, const void *s2, size_t n);
 
-void good4(char *str) {
+static void good4(char *str) {
 	// GOOD -- allocating a non zero-terminated string
 	int len = strlen(str);
 	char *buffer = malloc(len);
diff --git a/cpp/ql/test/query-tests/Security/CWE/CWE-131/NoSpaceForZeroTerminator/test.cpp b/cpp/ql/test/query-tests/Security/CWE/CWE-131/NoSpaceForZeroTerminator/test.cpp
index 63b2b4e760a7..24032a91ef15 100644
--- a/cpp/ql/test/query-tests/Security/CWE/CWE-131/NoSpaceForZeroTerminator/test.cpp
+++ b/cpp/ql/test/query-tests/Security/CWE/CWE-131/NoSpaceForZeroTerminator/test.cpp
@@ -19,28 +19,28 @@ int strcmp(const char *s1, const char *s2);
 
 //// Test code /////
 
-void bad1(wchar_t *wstr) {
+static void bad1(wchar_t *wstr) {
     // BAD -- Not allocating space for '\0' terminator
     wchar_t *wbuffer = (wchar_t *)malloc(wcslen(wstr));
     wcscpy(wbuffer, wstr);
     free(wbuffer);
 }
 
-void bad2(wchar_t *wstr) {
+static void bad2(wchar_t *wstr) {
     // BAD -- Not allocating space for '\0' terminator
     wchar_t *wbuffer = (wchar_t *)malloc(wcslen(wstr) * sizeof(wchar_t));
     wcscpy(wbuffer, wstr);
     free(wbuffer);
 }
 
-void good1(wchar_t *wstr) {
+static void good1(wchar_t *wstr) {
     // GOOD -- Allocating extra character for terminator
     wchar_t *wbuffer = (wchar_t *)malloc((wcslen(wstr) + 1) * sizeof(wchar_t));
     wcscpy(wbuffer, wstr);
     free(wbuffer);
 }
 
-void bad3(char *str) {
+static void bad3(char *str) {
     // BAD -- zero-termination proved by sprintf (as destination)
     char *buffer = (char *)malloc(strlen(str));
     sprintf(buffer, "%s", str);
@@ -50,7 +50,7 @@ void bad3(char *str) {
 void decode(char *dest, char *src);
 void wdecode(wchar_t *dest, wchar_t *src);
 
-void bad4(char *str) {
+static void bad4(char *str) {
     // BAD -- zero-termination proved by wprintf (as parameter)
     char *buffer = (char *)malloc(strlen(str));
     decode(buffer, str);
@@ -58,7 +58,7 @@ void bad4(char *str) {
     free(buffer);
 }
 
-void bad5(char *str) {
+static void bad5(char *str) {
     // BAD -- zero-termination proved by strcat (as destination)
     char *buffer = (char *)malloc(strlen(str));
     buffer[0] = 0;
@@ -66,7 +66,7 @@ void bad5(char *str) {
     free(buffer);
 }
 
-void bad6(char *str, char *dest) {
+static void bad6(char *str, char *dest) {
     // BAD -- zero-termination proved by strcat (as source)
     char *buffer = (char *)malloc(strlen(str));
     decode(buffer, str);
@@ -74,7 +74,7 @@ void bad6(char *str, char *dest) {
     free(buffer);
 }
 
-void bad7(char *str, char *str2) {
+static void bad7(char *str, char *str2) {
     // BAD -- zero-termination proved by strcmp
     char *buffer = (char *)malloc(strlen(str));
     decode(buffer, str);
@@ -84,7 +84,7 @@ void bad7(char *str, char *str2) {
     free(buffer);
 }
 
-void bad8(wchar_t *str) {
+static void bad8(wchar_t *str) {
     // BAD -- zero-termination proved by wcslen
     wchar_t *wbuffer = (wchar_t *)malloc(wcslen(str));
     wdecode(wbuffer, str);
@@ -94,21 +94,21 @@ void bad8(wchar_t *str) {
     free(wbuffer);
 }
 
-void good2(char *str, char *dest) {
+static void good2(char *str, char *dest) {
     // GOOD -- zero-termination not proven
     char *buffer = (char *)malloc(strlen(str));
     decode(buffer, str);
     free(buffer);
 }
 
-void bad9(wchar_t *wstr) {
+static void bad9(wchar_t *wstr) {
     // BAD -- using new
     wchar_t *wbuffer = new wchar_t[wcslen(wstr)];
     wcscpy(wbuffer, wstr);
     delete wbuffer;
 }
 
-void good3(char *str) {
+static void good3(char *str) {
     // GOOD -- zero-termination not required for this printf
     char *buffer = (char *)malloc(strlen(str));
     decode(buffer, str);
@@ -116,7 +116,7 @@ void good3(char *str) {
     free(buffer);
 }
 
-void good4(char *str) {
+static void good4(char *str) {
     // GOOD -- zero-termination not required for this printf
     char *buffer = (char *)malloc(strlen(str));
     decode(buffer, str);
diff --git a/cpp/ql/test/query-tests/Security/CWE/CWE-131/NoSpaceForZeroTerminator/test2.cpp b/cpp/ql/test/query-tests/Security/CWE/CWE-131/NoSpaceForZeroTerminator/test2.cpp
index 3b02e89b8525..7c7f74066976 100644
--- a/cpp/ql/test/query-tests/Security/CWE/CWE-131/NoSpaceForZeroTerminator/test2.cpp
+++ b/cpp/ql/test/query-tests/Security/CWE/CWE-131/NoSpaceForZeroTerminator/test2.cpp
@@ -38,35 +38,35 @@ namespace std
 
 //// Test code /////
 
-void bad1(char *str) {
+static void bad1(char *str) {
     // BAD -- Not allocating space for '\0' terminator [NOT DETECTED]
     char *buffer = (char *)malloc(strlen(str));
     std::string str2(buffer);
     free(buffer);
 }
 
-void good1(char *str) {
+static void good1(char *str) {
     // GOOD --- copy does not overrun due to size limit
     char *buffer = (char *)malloc(strlen(str));
     std::string str2(buffer, strlen(str));
     free(buffer);
 }
 
-void bad2(wchar_t *str) {
+static void bad2(wchar_t *str) {
     // BAD -- Not allocating space for '\0' terminator [NOT DETECTED]
     wchar_t *buffer = (wchar_t *)calloc(wcslen(str), sizeof(wchar_t));
     wcscpy(buffer, str);
     free(buffer);
 }
 
-void bad3(wchar_t *str) {
+static void bad3(wchar_t *str) {
     // BAD -- Not allocating space for '\0' terminator
     wchar_t *buffer = (wchar_t *)calloc(sizeof(wchar_t), wcslen(str));
     wcscpy(buffer, str);
     free(buffer);
 }
 
-void bad4(char *str) {
+static void bad4(char *str) {
     // BAD -- Not allocating space for '\0' terminator
     char *buffer = (char *)realloc(0, strlen(str));
     strcpy(buffer, str);
diff --git a/cpp/ql/test/query-tests/Security/CWE/CWE-190/semmle/tainted/ArithmeticTainted.expected b/cpp/ql/test/query-tests/Security/CWE/CWE-190/semmle/tainted/ArithmeticTainted.expected
index c60b26aae407..34aa8a7a7e4a 100644
--- a/cpp/ql/test/query-tests/Security/CWE/CWE-190/semmle/tainted/ArithmeticTainted.expected
+++ b/cpp/ql/test/query-tests/Security/CWE/CWE-190/semmle/tainted/ArithmeticTainted.expected
@@ -1,4 +1,6 @@
 edges
+| main.cpp:7:27:7:30 | **argv | main.cpp:8:17:8:20 | **argv | provenance |  |
+| main.cpp:8:17:8:20 | **argv | test.c:10:28:10:31 | **argv | provenance |  |
 | test2.cpp:12:21:12:21 | v | test2.cpp:14:11:14:11 | v | provenance |  |
 | test2.cpp:25:22:25:23 | fscanf output argument | test2.cpp:27:13:27:13 | v | provenance |  |
 | test2.cpp:27:13:27:13 | v | test2.cpp:12:21:12:21 | v | provenance |  |
@@ -6,18 +8,15 @@ edges
 | test2.cpp:38:13:38:16 | call to atoi | test2.cpp:39:3:39:18 | ... = ... | provenance |  |
 | test2.cpp:38:13:38:16 | call to atoi | test2.cpp:39:9:39:11 | num | provenance |  |
 | test2.cpp:39:3:39:18 | ... = ... | test2.cpp:40:3:40:5 | num | provenance |  |
-| test3.c:10:27:10:30 | **argv | test.c:11:24:11:27 | call to atoi | provenance | TaintFunction |
-| test3.c:10:27:10:30 | **argv | test.c:41:5:41:24 | ... = ... | provenance | TaintFunction |
-| test3.c:10:27:10:30 | **argv | test.c:51:5:51:24 | ... = ... | provenance | TaintFunction |
 | test5.cpp:5:5:5:17 | *getTaintedInt | test5.cpp:17:6:17:18 | call to getTaintedInt | provenance |  |
 | test5.cpp:5:5:5:17 | *getTaintedInt | test5.cpp:18:6:18:18 | call to getTaintedInt | provenance |  |
 | test5.cpp:9:7:9:9 | gets output argument | test5.cpp:10:9:10:27 | call to strtoul | provenance | TaintFunction |
 | test5.cpp:10:9:10:27 | call to strtoul | test5.cpp:5:5:5:17 | *getTaintedInt | provenance |  |
 | test5.cpp:18:2:18:20 | ... = ... | test5.cpp:19:6:19:6 | y | provenance |  |
 | test5.cpp:18:6:18:18 | call to getTaintedInt | test5.cpp:18:2:18:20 | ... = ... | provenance |  |
-| test.c:10:27:10:30 | **argv | test.c:11:24:11:27 | call to atoi | provenance | TaintFunction |
-| test.c:10:27:10:30 | **argv | test.c:41:5:41:24 | ... = ... | provenance | TaintFunction |
-| test.c:10:27:10:30 | **argv | test.c:51:5:51:24 | ... = ... | provenance | TaintFunction |
+| test.c:10:28:10:31 | **argv | test.c:11:24:11:27 | call to atoi | provenance | TaintFunction |
+| test.c:10:28:10:31 | **argv | test.c:41:5:41:24 | ... = ... | provenance | TaintFunction |
+| test.c:10:28:10:31 | **argv | test.c:51:5:51:24 | ... = ... | provenance | TaintFunction |
 | test.c:11:24:11:27 | call to atoi | test.c:14:15:14:28 | maxConnections | provenance |  |
 | test.c:41:5:41:24 | ... = ... | test.c:44:7:44:10 | len2 | provenance |  |
 | test.c:41:5:41:24 | ... = ... | test.c:44:7:44:12 | ... -- | provenance |  |
@@ -26,6 +25,8 @@ edges
 | test.c:51:5:51:24 | ... = ... | test.c:54:7:54:12 | ... -- | provenance |  |
 | test.c:54:7:54:12 | ... -- | test.c:54:7:54:10 | len3 | provenance |  |
 nodes
+| main.cpp:7:27:7:30 | **argv | semmle.label | **argv |
+| main.cpp:8:17:8:20 | **argv | semmle.label | **argv |
 | test2.cpp:12:21:12:21 | v | semmle.label | v |
 | test2.cpp:14:11:14:11 | v | semmle.label | v |
 | test2.cpp:25:22:25:23 | fscanf output argument | semmle.label | fscanf output argument |
@@ -35,7 +36,6 @@ nodes
 | test2.cpp:39:3:39:18 | ... = ... | semmle.label | ... = ... |
 | test2.cpp:39:9:39:11 | num | semmle.label | num |
 | test2.cpp:40:3:40:5 | num | semmle.label | num |
-| test3.c:10:27:10:30 | **argv | semmle.label | **argv |
 | test5.cpp:5:5:5:17 | *getTaintedInt | semmle.label | *getTaintedInt |
 | test5.cpp:9:7:9:9 | gets output argument | semmle.label | gets output argument |
 | test5.cpp:10:9:10:27 | call to strtoul | semmle.label | call to strtoul |
@@ -43,7 +43,7 @@ nodes
 | test5.cpp:18:2:18:20 | ... = ... | semmle.label | ... = ... |
 | test5.cpp:18:6:18:18 | call to getTaintedInt | semmle.label | call to getTaintedInt |
 | test5.cpp:19:6:19:6 | y | semmle.label | y |
-| test.c:10:27:10:30 | **argv | semmle.label | **argv |
+| test.c:10:28:10:31 | **argv | semmle.label | **argv |
 | test.c:11:24:11:27 | call to atoi | semmle.label | call to atoi |
 | test.c:14:15:14:28 | maxConnections | semmle.label | maxConnections |
 | test.c:41:5:41:24 | ... = ... | semmle.label | ... = ... |
@@ -61,19 +61,7 @@ subpaths
 | test5.cpp:17:6:17:18 | call to getTaintedInt | test5.cpp:9:7:9:9 | gets output argument | test5.cpp:17:6:17:18 | call to getTaintedInt | $@ flows to an operand of an arithmetic expression, potentially causing an overflow. | test5.cpp:9:7:9:9 | gets output argument | string read by gets |
 | test5.cpp:19:6:19:6 | y | test5.cpp:9:7:9:9 | gets output argument | test5.cpp:19:6:19:6 | y | $@ flows to an operand of an arithmetic expression, potentially causing an overflow. | test5.cpp:9:7:9:9 | gets output argument | string read by gets |
 | test5.cpp:19:6:19:6 | y | test5.cpp:9:7:9:9 | gets output argument | test5.cpp:19:6:19:6 | y | $@ flows to an operand of an arithmetic expression, potentially causing an underflow. | test5.cpp:9:7:9:9 | gets output argument | string read by gets |
-| test.c:14:15:14:28 | maxConnections | test3.c:10:27:10:30 | **argv | test.c:14:15:14:28 | maxConnections | $@ flows to an operand of an arithmetic expression, potentially causing an overflow. | test3.c:10:27:10:30 | **argv | a command-line argument |
-| test.c:14:15:14:28 | maxConnections | test3.c:10:27:10:30 | **argv | test.c:14:15:14:28 | maxConnections | $@ flows to an operand of an arithmetic expression, potentially causing an overflow. | test.c:10:27:10:30 | **argv | a command-line argument |
-| test.c:14:15:14:28 | maxConnections | test3.c:10:27:10:30 | **argv | test.c:14:15:14:28 | maxConnections | $@ flows to an operand of an arithmetic expression, potentially causing an underflow. | test3.c:10:27:10:30 | **argv | a command-line argument |
-| test.c:14:15:14:28 | maxConnections | test3.c:10:27:10:30 | **argv | test.c:14:15:14:28 | maxConnections | $@ flows to an operand of an arithmetic expression, potentially causing an underflow. | test.c:10:27:10:30 | **argv | a command-line argument |
-| test.c:14:15:14:28 | maxConnections | test.c:10:27:10:30 | **argv | test.c:14:15:14:28 | maxConnections | $@ flows to an operand of an arithmetic expression, potentially causing an overflow. | test3.c:10:27:10:30 | **argv | a command-line argument |
-| test.c:14:15:14:28 | maxConnections | test.c:10:27:10:30 | **argv | test.c:14:15:14:28 | maxConnections | $@ flows to an operand of an arithmetic expression, potentially causing an overflow. | test.c:10:27:10:30 | **argv | a command-line argument |
-| test.c:14:15:14:28 | maxConnections | test.c:10:27:10:30 | **argv | test.c:14:15:14:28 | maxConnections | $@ flows to an operand of an arithmetic expression, potentially causing an underflow. | test3.c:10:27:10:30 | **argv | a command-line argument |
-| test.c:14:15:14:28 | maxConnections | test.c:10:27:10:30 | **argv | test.c:14:15:14:28 | maxConnections | $@ flows to an operand of an arithmetic expression, potentially causing an underflow. | test.c:10:27:10:30 | **argv | a command-line argument |
-| test.c:44:7:44:10 | len2 | test3.c:10:27:10:30 | **argv | test.c:44:7:44:10 | len2 | $@ flows to an operand of an arithmetic expression, potentially causing an underflow. | test3.c:10:27:10:30 | **argv | a command-line argument |
-| test.c:44:7:44:10 | len2 | test3.c:10:27:10:30 | **argv | test.c:44:7:44:10 | len2 | $@ flows to an operand of an arithmetic expression, potentially causing an underflow. | test.c:10:27:10:30 | **argv | a command-line argument |
-| test.c:44:7:44:10 | len2 | test.c:10:27:10:30 | **argv | test.c:44:7:44:10 | len2 | $@ flows to an operand of an arithmetic expression, potentially causing an underflow. | test3.c:10:27:10:30 | **argv | a command-line argument |
-| test.c:44:7:44:10 | len2 | test.c:10:27:10:30 | **argv | test.c:44:7:44:10 | len2 | $@ flows to an operand of an arithmetic expression, potentially causing an underflow. | test.c:10:27:10:30 | **argv | a command-line argument |
-| test.c:54:7:54:10 | len3 | test3.c:10:27:10:30 | **argv | test.c:54:7:54:10 | len3 | $@ flows to an operand of an arithmetic expression, potentially causing an underflow. | test3.c:10:27:10:30 | **argv | a command-line argument |
-| test.c:54:7:54:10 | len3 | test3.c:10:27:10:30 | **argv | test.c:54:7:54:10 | len3 | $@ flows to an operand of an arithmetic expression, potentially causing an underflow. | test.c:10:27:10:30 | **argv | a command-line argument |
-| test.c:54:7:54:10 | len3 | test.c:10:27:10:30 | **argv | test.c:54:7:54:10 | len3 | $@ flows to an operand of an arithmetic expression, potentially causing an underflow. | test3.c:10:27:10:30 | **argv | a command-line argument |
-| test.c:54:7:54:10 | len3 | test.c:10:27:10:30 | **argv | test.c:54:7:54:10 | len3 | $@ flows to an operand of an arithmetic expression, potentially causing an underflow. | test.c:10:27:10:30 | **argv | a command-line argument |
+| test.c:14:15:14:28 | maxConnections | main.cpp:7:27:7:30 | **argv | test.c:14:15:14:28 | maxConnections | $@ flows to an operand of an arithmetic expression, potentially causing an overflow. | main.cpp:7:27:7:30 | **argv | a command-line argument |
+| test.c:14:15:14:28 | maxConnections | main.cpp:7:27:7:30 | **argv | test.c:14:15:14:28 | maxConnections | $@ flows to an operand of an arithmetic expression, potentially causing an underflow. | main.cpp:7:27:7:30 | **argv | a command-line argument |
+| test.c:44:7:44:10 | len2 | main.cpp:7:27:7:30 | **argv | test.c:44:7:44:10 | len2 | $@ flows to an operand of an arithmetic expression, potentially causing an underflow. | main.cpp:7:27:7:30 | **argv | a command-line argument |
+| test.c:54:7:54:10 | len3 | main.cpp:7:27:7:30 | **argv | test.c:54:7:54:10 | len3 | $@ flows to an operand of an arithmetic expression, potentially causing an underflow. | main.cpp:7:27:7:30 | **argv | a command-line argument |
diff --git a/cpp/ql/test/query-tests/Security/CWE/CWE-190/semmle/tainted/IntegerOverflowTainted.expected b/cpp/ql/test/query-tests/Security/CWE/CWE-190/semmle/tainted/IntegerOverflowTainted.expected
index a79144feaca0..ae20929d7b8a 100644
--- a/cpp/ql/test/query-tests/Security/CWE/CWE-190/semmle/tainted/IntegerOverflowTainted.expected
+++ b/cpp/ql/test/query-tests/Security/CWE/CWE-190/semmle/tainted/IntegerOverflowTainted.expected
@@ -4,20 +4,15 @@
 | test2.cpp:17:11:17:22 | ... * ... | $@ flows an expression which might overflow. | test2.cpp:25:22:25:23 | fscanf output argument | value read by fscanf |
 | test2.cpp:39:9:39:18 | ... + ... | $@ flows an expression which might overflow. | test2.cpp:36:9:36:14 | fgets output argument | string read by fgets |
 | test2.cpp:40:3:40:13 | ... += ... | $@ flows an expression which might overflow. | test2.cpp:36:9:36:14 | fgets output argument | string read by fgets |
-| test3.c:12:11:12:34 | * ... | $@ flows an expression which might overflow negatively. | test3.c:10:27:10:30 | **argv | a command-line argument |
-| test3.c:12:11:12:34 | * ... | $@ flows an expression which might overflow negatively. | test.c:10:27:10:30 | **argv | a command-line argument |
-| test3.c:13:11:13:20 | * ... | $@ flows an expression which might overflow negatively. | test3.c:10:27:10:30 | **argv | a command-line argument |
-| test3.c:13:11:13:20 | * ... | $@ flows an expression which might overflow negatively. | test.c:10:27:10:30 | **argv | a command-line argument |
-| test4.cpp:13:7:13:20 | access to array | $@ flows an expression which might overflow negatively. | test4.cpp:8:27:8:30 | **argv | a command-line argument |
+| test3.c:12:11:12:34 | * ... | $@ flows an expression which might overflow negatively. | main.cpp:7:27:7:30 | **argv | a command-line argument |
+| test3.c:13:11:13:20 | * ... | $@ flows an expression which might overflow negatively. | main.cpp:7:27:7:30 | **argv | a command-line argument |
+| test4.cpp:13:7:13:20 | access to array | $@ flows an expression which might overflow negatively. | main.cpp:7:27:7:30 | **argv | a command-line argument |
 | test5.cpp:10:9:10:27 | call to strtoul | $@ flows an expression which might overflow. | test5.cpp:9:7:9:9 | gets output argument | string read by gets |
 | test5.cpp:17:6:17:27 | ... * ... | $@ flows an expression which might overflow. | test5.cpp:9:7:9:9 | gets output argument | string read by gets |
 | test5.cpp:19:6:19:13 | ... * ... | $@ flows an expression which might overflow. | test5.cpp:9:7:9:9 | gets output argument | string read by gets |
 | test6.cpp:11:10:11:15 | s | $@ flows an expression which might overflow. | test6.cpp:39:23:39:24 | fscanf output argument | value read by fscanf |
 | test6.cpp:16:10:16:15 | s | $@ flows an expression which might overflow. | test6.cpp:39:23:39:24 | fscanf output argument | value read by fscanf |
 | test6.cpp:30:11:30:16 | s | $@ flows an expression which might overflow. | test6.cpp:39:23:39:24 | fscanf output argument | value read by fscanf |
-| test.c:14:15:14:35 | ... * ... | $@ flows an expression which might overflow. | test3.c:10:27:10:30 | **argv | a command-line argument |
-| test.c:14:15:14:35 | ... * ... | $@ flows an expression which might overflow. | test.c:10:27:10:30 | **argv | a command-line argument |
-| test.c:44:7:44:12 | ... -- | $@ flows an expression which might overflow negatively. | test3.c:10:27:10:30 | **argv | a command-line argument |
-| test.c:44:7:44:12 | ... -- | $@ flows an expression which might overflow negatively. | test.c:10:27:10:30 | **argv | a command-line argument |
-| test.c:54:7:54:12 | ... -- | $@ flows an expression which might overflow negatively. | test3.c:10:27:10:30 | **argv | a command-line argument |
-| test.c:54:7:54:12 | ... -- | $@ flows an expression which might overflow negatively. | test.c:10:27:10:30 | **argv | a command-line argument |
+| test.c:14:15:14:35 | ... * ... | $@ flows an expression which might overflow. | main.cpp:7:27:7:30 | **argv | a command-line argument |
+| test.c:44:7:44:12 | ... -- | $@ flows an expression which might overflow negatively. | main.cpp:7:27:7:30 | **argv | a command-line argument |
+| test.c:54:7:54:12 | ... -- | $@ flows an expression which might overflow negatively. | main.cpp:7:27:7:30 | **argv | a command-line argument |
diff --git a/cpp/ql/test/query-tests/Security/CWE/CWE-190/semmle/tainted/main.cpp b/cpp/ql/test/query-tests/Security/CWE/CWE-190/semmle/tainted/main.cpp
new file mode 100644
index 000000000000..645b5893deaa
--- /dev/null
+++ b/cpp/ql/test/query-tests/Security/CWE/CWE-190/semmle/tainted/main.cpp
@@ -0,0 +1,12 @@
+extern "C" {
+int main1(int argc, char** argv);
+int main3(int argc, char** argv);
+}
+int main4(int argc, char** argv);
+
+int main(int argc, char** argv) {
+    main1(argc, argv);
+    main3(argc, argv);
+    main4(argc, argv);
+    return 0;
+}
diff --git a/cpp/ql/test/query-tests/Security/CWE/CWE-190/semmle/tainted/test.c b/cpp/ql/test/query-tests/Security/CWE/CWE-190/semmle/tainted/test.c
index 29ab7cc8f25c..b39e54084ac3 100644
--- a/cpp/ql/test/query-tests/Security/CWE/CWE-190/semmle/tainted/test.c
+++ b/cpp/ql/test/query-tests/Security/CWE/CWE-190/semmle/tainted/test.c
@@ -7,7 +7,7 @@ void startServer(int heapSize);
 typedef unsigned long size_t;
 size_t strlen(const char *s);
 
-int main(int argc, char** argv) {
+int main1(int argc, char** argv) {
   int maxConnections = atoi(argv[1]);
 
   // BAD: arithmetic on a user input without any validation
diff --git a/cpp/ql/test/query-tests/Security/CWE/CWE-190/semmle/tainted/test3.c b/cpp/ql/test/query-tests/Security/CWE/CWE-190/semmle/tainted/test3.c
index 57c3b529f586..a8116e058530 100644
--- a/cpp/ql/test/query-tests/Security/CWE/CWE-190/semmle/tainted/test3.c
+++ b/cpp/ql/test/query-tests/Security/CWE/CWE-190/semmle/tainted/test3.c
@@ -7,7 +7,7 @@
 // Regression test for ODASA-6054: IntegerOverflowTainted should
 // not report a result if the overflow happens in a macro expansion
 // from a macro that is defined in a system header.
-int main(int argc, char **argv) {
+int main3(int argc, char **argv) {
   char *cmd = argv[0];
   int x = (int)(unsigned char)*cmd;  // BAD: overflow
   int y = CAST(*cmd);  // BAD: overflow in macro expansion (macro is not from a system header)
diff --git a/cpp/ql/test/query-tests/Security/CWE/CWE-190/semmle/tainted/test4.cpp b/cpp/ql/test/query-tests/Security/CWE/CWE-190/semmle/tainted/test4.cpp
index 054aea93fbad..ad4cc80d30ac 100644
--- a/cpp/ql/test/query-tests/Security/CWE/CWE-190/semmle/tainted/test4.cpp
+++ b/cpp/ql/test/query-tests/Security/CWE/CWE-190/semmle/tainted/test4.cpp
@@ -5,7 +5,7 @@
 // by comparing the value to 0. This means that the cast cannot overflow,
 // regardless of what the input type is.
 
-int main(int argc, char **argv) {
+int main4(int argc, char **argv) {
   char *p = argv[0];
   if (!p[0]) {  // GOOD: cast to bool.
     return 1;
diff --git a/cpp/ql/test/query-tests/Security/CWE/CWE-497/semmle/tests/tests2.cpp b/cpp/ql/test/query-tests/Security/CWE/CWE-497/semmle/tests/tests2.cpp
index 4c72bc61f31d..c22d74b7a758 100644
--- a/cpp/ql/test/query-tests/Security/CWE/CWE-497/semmle/tests/tests2.cpp
+++ b/cpp/ql/test/query-tests/Security/CWE/CWE-497/semmle/tests/tests2.cpp
@@ -50,7 +50,7 @@ int val();
 const char *global1 = mysql_get_client_info();
 const char *global2 = "abc";
 
-void test1()
+void test7()
 {
 	int sock = socket(val(), val(), val());
 

From dcbb66d3660c073e7b94581d7cb16fe32db9622b Mon Sep 17 00:00:00 2001
From: Chris Smowton <chris@smowton.net>
Date: Tue, 3 Sep 2024 11:55:41 +0100
Subject: [PATCH 209/347] Go: extract and expose struct tags, interface method
 IDs

This enables us to distinguish all database types in QL. Previously structs with the same field names and types but differing tags, and interface types with matching method names and at least one non-exported method but declared in differing packages, were impossible or only sometimes possible to distinguish in QL. With this change these types can be distinguished, as well as permitting queries to examine struct field tags, e.g. to read JSON field name associations.
---
 .../go.dbscheme                               | 546 +++++++++++++++++
 .../old.dbscheme                              | 552 ++++++++++++++++++
 .../upgrade.properties                        |   5 +
 go/extractor/dbscheme/tables.go               |  14 +
 go/extractor/extractor.go                     |   8 +
 go/ql/lib/go.dbscheme                         |   6 +
 go/ql/lib/semmle/go/Scopes.qll                |   7 +
 go/ql/lib/semmle/go/Types.qll                 |  44 +-
 .../component_tags.ql                         |   7 +
 .../go.dbscheme                               | 552 ++++++++++++++++++
 .../old.dbscheme                              | 546 +++++++++++++++++
 .../upgrade.properties                        |   3 +
 .../semmle/go/Types/Field_getPackage.expected |   4 +
 .../go/Types/Field_hasQualifiedName2.expected |   4 +
 .../go/Types/Field_hasQualifiedName3.expected |   4 +
 .../semmle/go/Types/InterfaceIds.expected     |   2 +
 .../semmle/go/Types/InterfaceIds.ql           |   6 +
 .../semmle/go/Types/MethodCount.expected      |   1 +
 .../semmle/go/Types/MethodTypes.expected      |   2 +
 .../Types/Method_hasQualifiedName2.expected   |   2 +
 .../Types/Method_hasQualifiedName3.expected   |   2 +
 .../semmle/go/Types/Methods.expected          |   2 +
 .../semmle/go/Types/QualifiedNames.expected   |   4 +
 .../semmle/go/Types/StructFields.expected     |   4 +
 .../semmle/go/Types/Types.expected            |   4 +
 .../semmle/go/Types/pkg1/interfaces.go        |   5 +
 .../library-tests/semmle/go/Types/pkg2/tst.go |   5 +
 .../semmle/go/Types/struct_tags.expected      |   4 +
 .../semmle/go/Types/struct_tags.go            |  11 +
 .../semmle/go/Types/struct_tags.ql            |   6 +
 30 files changed, 2359 insertions(+), 3 deletions(-)
 create mode 100644 go/downgrades/e47462df302b3e58a60d2e21f99aba63f973326f/go.dbscheme
 create mode 100644 go/downgrades/e47462df302b3e58a60d2e21f99aba63f973326f/old.dbscheme
 create mode 100644 go/downgrades/e47462df302b3e58a60d2e21f99aba63f973326f/upgrade.properties
 create mode 100644 go/ql/lib/upgrades/a58b81b1b4c4cccc8ca11731c1db86622f33af57/component_tags.ql
 create mode 100644 go/ql/lib/upgrades/a58b81b1b4c4cccc8ca11731c1db86622f33af57/go.dbscheme
 create mode 100644 go/ql/lib/upgrades/a58b81b1b4c4cccc8ca11731c1db86622f33af57/old.dbscheme
 create mode 100644 go/ql/lib/upgrades/a58b81b1b4c4cccc8ca11731c1db86622f33af57/upgrade.properties
 create mode 100644 go/ql/test/library-tests/semmle/go/Types/InterfaceIds.expected
 create mode 100644 go/ql/test/library-tests/semmle/go/Types/InterfaceIds.ql
 create mode 100644 go/ql/test/library-tests/semmle/go/Types/struct_tags.expected
 create mode 100644 go/ql/test/library-tests/semmle/go/Types/struct_tags.go
 create mode 100644 go/ql/test/library-tests/semmle/go/Types/struct_tags.ql

diff --git a/go/downgrades/e47462df302b3e58a60d2e21f99aba63f973326f/go.dbscheme b/go/downgrades/e47462df302b3e58a60d2e21f99aba63f973326f/go.dbscheme
new file mode 100644
index 000000000000..a58b81b1b4c4
--- /dev/null
+++ b/go/downgrades/e47462df302b3e58a60d2e21f99aba63f973326f/go.dbscheme
@@ -0,0 +1,546 @@
+/** Auto-generated dbscheme; do not edit. */
+
+
+/** Duplicate code **/
+
+duplicateCode(
+  unique int id : @duplication,
+  varchar(900) relativePath : string ref,
+  int equivClass : int ref);
+
+similarCode(
+  unique int id : @similarity,
+  varchar(900) relativePath : string ref,
+  int equivClass : int ref);
+
+@duplication_or_similarity = @duplication | @similarity;
+
+tokens(
+  int id : @duplication_or_similarity ref,
+  int offset : int ref,
+  int beginLine : int ref,
+  int beginColumn : int ref,
+  int endLine : int ref,
+  int endColumn : int ref);
+
+/** External data **/
+
+externalData(
+  int id : @externalDataElement,
+  varchar(900) path : string ref,
+  int column: int ref,
+  varchar(900) value : string ref
+);
+
+snapshotDate(unique date snapshotDate : date ref);
+
+sourceLocationPrefix(varchar(900) prefix : string ref);
+
+
+/*
+ * XML Files
+ */
+
+xmlEncoding(
+  unique int id: @file ref,
+  string encoding: string ref
+);
+
+xmlDTDs(
+  unique int id: @xmldtd,
+  string root: string ref,
+  string publicId: string ref,
+  string systemId: string ref,
+  int fileid: @file ref
+);
+
+xmlElements(
+  unique int id: @xmlelement,
+  string name: string ref,
+  int parentid: @xmlparent ref,
+  int idx: int ref,
+  int fileid: @file ref
+);
+
+xmlAttrs(
+  unique int id: @xmlattribute,
+  int elementid: @xmlelement ref,
+  string name: string ref,
+  string value: string ref,
+  int idx: int ref,
+  int fileid: @file ref
+);
+
+xmlNs(
+  int id: @xmlnamespace,
+  string prefixName: string ref,
+  string URI: string ref,
+  int fileid: @file ref
+);
+
+xmlHasNs(
+  int elementId: @xmlnamespaceable ref,
+  int nsId: @xmlnamespace ref,
+  int fileid: @file ref
+);
+
+xmlComments(
+  unique int id: @xmlcomment,
+  string text: string ref,
+  int parentid: @xmlparent ref,
+  int fileid: @file ref
+);
+
+xmlChars(
+  unique int id: @xmlcharacters,
+  string text: string ref,
+  int parentid: @xmlparent ref,
+  int idx: int ref,
+  int isCDATA: int ref,
+  int fileid: @file ref
+);
+
+@xmlparent = @file | @xmlelement;
+@xmlnamespaceable = @xmlelement | @xmlattribute;
+
+xmllocations(
+  int xmlElement: @xmllocatable ref,
+  int location: @location_default ref
+);
+
+@xmllocatable = @xmlcharacters | @xmlelement | @xmlcomment | @xmlattribute | @xmldtd | @file | @xmlnamespace;
+
+compilations(unique int id: @compilation, string cwd: string ref);
+
+#keyset[id, num]
+compilation_args(int id: @compilation ref, int num: int ref, string arg: string ref);
+
+#keyset[id, num, kind]
+compilation_time(int id: @compilation ref, int num: int ref, int kind: int ref, float secs: float ref);
+
+diagnostic_for(unique int diagnostic: @diagnostic ref, int compilation: @compilation ref, int file_number: int ref, int file_number_diagnostic_number: int ref);
+
+compilation_finished(unique int id: @compilation ref, float cpu_seconds: float ref, float elapsed_seconds: float ref);
+
+#keyset[id, num]
+compilation_compiling_files(int id: @compilation ref, int num: int ref, int file: @file ref);
+
+diagnostics(unique int id: @diagnostic, int severity: int ref, string error_tag: string ref, string error_message: string ref,
+            string full_error_message: string ref, int location: @location ref);
+
+locations_default(unique int id: @location_default, int file: @file ref, int beginLine: int ref, int beginColumn: int ref,
+                  int endLine: int ref, int endColumn: int ref);
+
+numlines(int element_id: @sourceline ref, int num_lines: int ref, int num_code: int ref, int num_comment: int ref);
+
+files(unique int id: @file, string name: string ref);
+
+folders(unique int id: @folder, string name: string ref);
+
+containerparent(int parent: @container ref, unique int child: @container ref);
+
+has_location(unique int locatable: @locatable ref, int location: @location ref);
+
+#keyset[parent, idx]
+comment_groups(unique int id: @comment_group, int parent: @file ref, int idx: int ref);
+
+comments(unique int id: @comment, int kind: int ref, int parent: @comment_group ref, int idx: int ref, string text: string ref);
+
+doc_comments(unique int node: @documentable ref, int comment: @comment_group ref);
+
+#keyset[parent, idx]
+exprs(unique int id: @expr, int kind: int ref, int parent: @exprparent ref, int idx: int ref);
+
+literals(unique int expr: @expr ref, string value: string ref, string raw: string ref);
+
+constvalues(unique int expr: @expr ref, string value: string ref, string exact: string ref);
+
+fields(unique int id: @field, int parent: @fieldparent ref, int idx: int ref);
+
+typeparamdecls(unique int id: @typeparamdecl, int parent: @typeparamdeclparent ref, int idx: int ref);
+
+#keyset[parent, idx]
+stmts(unique int id: @stmt, int kind: int ref, int parent: @stmtparent ref, int idx: int ref);
+
+#keyset[parent, idx]
+decls(unique int id: @decl, int kind: int ref, int parent: @declparent ref, int idx: int ref);
+
+#keyset[parent, idx]
+specs(unique int id: @spec, int kind: int ref, int parent: @gendecl ref, int idx: int ref);
+
+scopes(unique int id: @scope, int kind: int ref);
+
+scopenesting(unique int inner: @scope ref, int outer: @scope ref);
+
+scopenodes(unique int node: @scopenode ref, int scope: @localscope ref);
+
+objects(unique int id: @object, int kind: int ref, string name: string ref);
+
+objectscopes(unique int object: @object ref, int scope: @scope ref);
+
+objecttypes(unique int object: @object ref, int tp: @type ref);
+
+methodreceivers(unique int method: @object ref, int receiver: @object ref);
+
+fieldstructs(unique int field: @object ref, int struct: @structtype ref);
+
+methodhosts(int method: @object ref, int host: @namedtype ref);
+
+defs(int ident: @ident ref, int object: @object ref);
+
+uses(int ident: @ident ref, int object: @object ref);
+
+types(unique int id: @type, int kind: int ref);
+
+type_of(unique int expr: @expr ref, int tp: @type ref);
+
+typename(unique int tp: @type ref, string name: string ref);
+
+key_type(unique int map: @maptype ref, int tp: @type ref);
+
+element_type(unique int container: @containertype ref, int tp: @type ref);
+
+base_type(unique int ptr: @pointertype ref, int tp: @type ref);
+
+underlying_type(unique int named: @namedtype ref, int tp: @type ref);
+
+#keyset[parent, index]
+component_types(int parent: @compositetype ref, int index: int ref, string name: string ref, int tp: @type ref);
+
+array_length(unique int tp: @arraytype ref, string len: string ref);
+
+type_objects(unique int tp: @type ref, int object: @object ref);
+
+packages(unique int id: @package, string name: string ref, string path: string ref, int scope: @packagescope ref);
+
+#keyset[parent, idx]
+modexprs(unique int id: @modexpr, int kind: int ref, int parent: @modexprparent ref, int idx: int ref);
+
+#keyset[parent, idx]
+modtokens(string token: string ref, int parent: @modexpr ref, int idx: int ref);
+
+#keyset[package, idx]
+errors(unique int id: @error, int kind: int ref, string msg: string ref, string rawpos: string ref,
+       string file: string ref, int line: int ref, int col: int ref, int package: @package ref, int idx: int ref);
+
+has_ellipsis(int id: @callorconversionexpr ref);
+
+variadic(int id: @signaturetype ref);
+
+#keyset[parent, idx]
+typeparam(unique int tp: @typeparamtype ref, string name: string ref, int bound: @compositetype ref,
+          int parent: @typeparamparentobject ref, int idx: int ref);
+
+@container = @file | @folder;
+
+@locatable = @xmllocatable | @node | @localscope;
+
+@node = @documentable | @exprparent | @modexprparent | @fieldparent | @stmtparent | @declparent | @typeparamdeclparent
+      | @scopenode | @comment_group | @comment;
+
+@documentable = @file | @field | @typeparamdecl | @spec | @gendecl | @funcdecl | @modexpr;
+
+@exprparent = @funcdef | @file | @expr | @field | @stmt | @decl | @typeparamdecl | @spec;
+
+@modexprparent = @file | @modexpr;
+
+@fieldparent = @decl | @structtypeexpr | @functypeexpr | @interfacetypeexpr;
+
+@stmtparent = @funcdef | @stmt | @decl;
+
+@declparent = @file | @declstmt;
+
+@typeparamdeclparent = @funcdecl | @typespec;
+
+@funcdef = @funclit | @funcdecl;
+
+@scopenode = @file | @functypeexpr | @blockstmt | @ifstmt | @caseclause | @switchstmt | @commclause | @loopstmt;
+
+@location = @location_default;
+
+@sourceline = @locatable;
+
+case @comment.kind of
+  0 = @slashslashcomment
+| 1 = @slashstarcomment;
+
+case @expr.kind of
+  0 = @badexpr
+| 1 = @ident
+| 2 = @ellipsis
+| 3 = @intlit
+| 4 = @floatlit
+| 5 = @imaglit
+| 6 = @charlit
+| 7 = @stringlit
+| 8 = @funclit
+| 9 = @compositelit
+| 10 = @parenexpr
+| 11 = @selectorexpr
+| 12 = @indexexpr
+| 13 = @genericfunctioninstantiationexpr
+| 14 = @generictypeinstantiationexpr
+| 15 = @sliceexpr
+| 16 = @typeassertexpr
+| 17 = @callorconversionexpr
+| 18 = @starexpr
+| 19 = @keyvalueexpr
+| 20 = @arraytypeexpr
+| 21 = @structtypeexpr
+| 22 = @functypeexpr
+| 23 = @interfacetypeexpr
+| 24 = @maptypeexpr
+| 25 = @typesetliteralexpr
+| 26 = @plusexpr
+| 27 = @minusexpr
+| 28 = @notexpr
+| 29 = @complementexpr
+| 30 = @derefexpr
+| 31 = @addressexpr
+| 32 = @arrowexpr
+| 33 = @lorexpr
+| 34 = @landexpr
+| 35 = @eqlexpr
+| 36 = @neqexpr
+| 37 = @lssexpr
+| 38 = @leqexpr
+| 39 = @gtrexpr
+| 40 = @geqexpr
+| 41 = @addexpr
+| 42 = @subexpr
+| 43 = @orexpr
+| 44 = @xorexpr
+| 45 = @mulexpr
+| 46 = @quoexpr
+| 47 = @remexpr
+| 48 = @shlexpr
+| 49 = @shrexpr
+| 50 = @andexpr
+| 51 = @andnotexpr
+| 52 = @sendchantypeexpr
+| 53 = @recvchantypeexpr
+| 54 = @sendrcvchantypeexpr;
+
+@basiclit = @intlit | @floatlit | @imaglit | @charlit | @stringlit;
+
+@operatorexpr = @logicalexpr | @arithmeticexpr | @bitwiseexpr | @unaryexpr | @binaryexpr;
+
+@logicalexpr = @logicalunaryexpr | @logicalbinaryexpr;
+
+@arithmeticexpr = @arithmeticunaryexpr | @arithmeticbinaryexpr;
+
+@bitwiseexpr = @bitwiseunaryexpr | @bitwisebinaryexpr;
+
+@unaryexpr = @logicalunaryexpr | @bitwiseunaryexpr | @arithmeticunaryexpr | @derefexpr | @addressexpr | @arrowexpr;
+
+@logicalunaryexpr = @notexpr;
+
+@bitwiseunaryexpr = @complementexpr;
+
+@arithmeticunaryexpr = @plusexpr | @minusexpr;
+
+@binaryexpr = @logicalbinaryexpr | @bitwisebinaryexpr | @arithmeticbinaryexpr | @comparison;
+
+@logicalbinaryexpr = @lorexpr | @landexpr;
+
+@bitwisebinaryexpr = @shiftexpr | @orexpr | @xorexpr | @andexpr | @andnotexpr;
+
+@arithmeticbinaryexpr = @addexpr | @subexpr | @mulexpr | @quoexpr | @remexpr;
+
+@shiftexpr = @shlexpr | @shrexpr;
+
+@comparison = @equalitytest | @relationalcomparison;
+
+@equalitytest = @eqlexpr | @neqexpr;
+
+@relationalcomparison = @lssexpr | @leqexpr | @gtrexpr | @geqexpr;
+
+@chantypeexpr = @sendchantypeexpr | @recvchantypeexpr | @sendrcvchantypeexpr;
+
+case @stmt.kind of
+  0 = @badstmt
+| 1 = @declstmt
+| 2 = @emptystmt
+| 3 = @labeledstmt
+| 4 = @exprstmt
+| 5 = @sendstmt
+| 6 = @incstmt
+| 7 = @decstmt
+| 8 = @gostmt
+| 9 = @deferstmt
+| 10 = @returnstmt
+| 11 = @breakstmt
+| 12 = @continuestmt
+| 13 = @gotostmt
+| 14 = @fallthroughstmt
+| 15 = @blockstmt
+| 16 = @ifstmt
+| 17 = @caseclause
+| 18 = @exprswitchstmt
+| 19 = @typeswitchstmt
+| 20 = @commclause
+| 21 = @selectstmt
+| 22 = @forstmt
+| 23 = @rangestmt
+| 24 = @assignstmt
+| 25 = @definestmt
+| 26 = @addassignstmt
+| 27 = @subassignstmt
+| 28 = @mulassignstmt
+| 29 = @quoassignstmt
+| 30 = @remassignstmt
+| 31 = @andassignstmt
+| 32 = @orassignstmt
+| 33 = @xorassignstmt
+| 34 = @shlassignstmt
+| 35 = @shrassignstmt
+| 36 = @andnotassignstmt;
+
+@incdecstmt = @incstmt | @decstmt;
+
+@assignment = @simpleassignstmt | @compoundassignstmt;
+
+@simpleassignstmt = @assignstmt | @definestmt;
+
+@compoundassignstmt = @addassignstmt | @subassignstmt | @mulassignstmt | @quoassignstmt | @remassignstmt
+                    | @andassignstmt | @orassignstmt | @xorassignstmt | @shlassignstmt | @shrassignstmt | @andnotassignstmt;
+
+@branchstmt = @breakstmt | @continuestmt | @gotostmt | @fallthroughstmt;
+
+@switchstmt = @exprswitchstmt | @typeswitchstmt;
+
+@loopstmt = @forstmt | @rangestmt;
+
+case @decl.kind of
+  0 = @baddecl
+| 1 = @importdecl
+| 2 = @constdecl
+| 3 = @typedecl
+| 4 = @vardecl
+| 5 = @funcdecl;
+
+@gendecl = @importdecl | @constdecl | @typedecl | @vardecl;
+
+case @spec.kind of
+  0 = @importspec
+| 1 = @valuespec
+| 2 = @typedefspec
+| 3 = @aliasspec;
+
+@typespec = @typedefspec | @aliasspec;
+
+case @object.kind of
+  0 = @pkgobject
+| 1 = @decltypeobject
+| 2 = @builtintypeobject
+| 3 = @declconstobject
+| 4 = @builtinconstobject
+| 5 = @declvarobject
+| 6 = @declfunctionobject
+| 7 = @builtinfunctionobject
+| 8 = @labelobject;
+
+@typeparamparentobject = @decltypeobject | @declfunctionobject;
+
+@declobject = @decltypeobject | @declconstobject | @declvarobject | @declfunctionobject;
+
+@builtinobject = @builtintypeobject | @builtinconstobject | @builtinfunctionobject;
+
+@typeobject = @decltypeobject | @builtintypeobject;
+
+@valueobject = @constobject | @varobject | @functionobject;
+
+@constobject = @declconstobject | @builtinconstobject;
+
+@varobject = @declvarobject;
+
+@functionobject = @declfunctionobject | @builtinfunctionobject;
+
+case @scope.kind of
+  0 = @universescope
+| 1 = @packagescope
+| 2 = @localscope;
+
+case @type.kind of
+  0 = @invalidtype
+| 1 = @boolexprtype
+| 2 = @inttype
+| 3 = @int8type
+| 4 = @int16type
+| 5 = @int32type
+| 6 = @int64type
+| 7 = @uinttype
+| 8 = @uint8type
+| 9 = @uint16type
+| 10 = @uint32type
+| 11 = @uint64type
+| 12 = @uintptrtype
+| 13 = @float32type
+| 14 = @float64type
+| 15 = @complex64type
+| 16 = @complex128type
+| 17 = @stringexprtype
+| 18 = @unsafepointertype
+| 19 = @boolliteraltype
+| 20 = @intliteraltype
+| 21 = @runeliteraltype
+| 22 = @floatliteraltype
+| 23 = @complexliteraltype
+| 24 = @stringliteraltype
+| 25 = @nilliteraltype
+| 26 = @typeparamtype
+| 27 = @arraytype
+| 28 = @slicetype
+| 29 = @structtype
+| 30 = @pointertype
+| 31 = @interfacetype
+| 32 = @tupletype
+| 33 = @signaturetype
+| 34 = @maptype
+| 35 = @sendchantype
+| 36 = @recvchantype
+| 37 = @sendrcvchantype
+| 38 = @namedtype
+| 39 = @typesetliteraltype;
+
+@basictype = @booltype | @numerictype | @stringtype | @literaltype | @invalidtype | @unsafepointertype;
+
+@booltype = @boolexprtype | @boolliteraltype;
+
+@numerictype = @integertype | @floattype | @complextype;
+
+@integertype = @signedintegertype | @unsignedintegertype;
+
+@signedintegertype = @inttype | @int8type | @int16type | @int32type | @int64type | @intliteraltype | @runeliteraltype;
+
+@unsignedintegertype = @uinttype | @uint8type | @uint16type | @uint32type | @uint64type | @uintptrtype;
+
+@floattype = @float32type | @float64type | @floatliteraltype;
+
+@complextype = @complex64type | @complex128type | @complexliteraltype;
+
+@stringtype = @stringexprtype | @stringliteraltype;
+
+@literaltype = @boolliteraltype | @intliteraltype | @runeliteraltype | @floatliteraltype | @complexliteraltype
+             | @stringliteraltype | @nilliteraltype;
+
+@compositetype = @typeparamtype | @containertype | @structtype | @pointertype | @interfacetype | @tupletype
+               | @signaturetype | @namedtype | @typesetliteraltype;
+
+@containertype = @arraytype | @slicetype | @maptype | @chantype;
+
+@chantype = @sendchantype | @recvchantype | @sendrcvchantype;
+
+case @modexpr.kind of
+  0 = @modcommentblock
+| 1 = @modline
+| 2 = @modlineblock
+| 3 = @modlparen
+| 4 = @modrparen;
+
+case @error.kind of
+  0 = @unknownerror
+| 1 = @listerror
+| 2 = @parseerror
+| 3 = @typeerror;
+
diff --git a/go/downgrades/e47462df302b3e58a60d2e21f99aba63f973326f/old.dbscheme b/go/downgrades/e47462df302b3e58a60d2e21f99aba63f973326f/old.dbscheme
new file mode 100644
index 000000000000..e47462df302b
--- /dev/null
+++ b/go/downgrades/e47462df302b3e58a60d2e21f99aba63f973326f/old.dbscheme
@@ -0,0 +1,552 @@
+/** Auto-generated dbscheme; do not edit. */
+
+
+/** Duplicate code **/
+
+duplicateCode(
+  unique int id : @duplication,
+  varchar(900) relativePath : string ref,
+  int equivClass : int ref);
+
+similarCode(
+  unique int id : @similarity,
+  varchar(900) relativePath : string ref,
+  int equivClass : int ref);
+
+@duplication_or_similarity = @duplication | @similarity;
+
+tokens(
+  int id : @duplication_or_similarity ref,
+  int offset : int ref,
+  int beginLine : int ref,
+  int beginColumn : int ref,
+  int endLine : int ref,
+  int endColumn : int ref);
+
+/** External data **/
+
+externalData(
+  int id : @externalDataElement,
+  varchar(900) path : string ref,
+  int column: int ref,
+  varchar(900) value : string ref
+);
+
+snapshotDate(unique date snapshotDate : date ref);
+
+sourceLocationPrefix(varchar(900) prefix : string ref);
+
+
+/*
+ * XML Files
+ */
+
+xmlEncoding(
+  unique int id: @file ref,
+  string encoding: string ref
+);
+
+xmlDTDs(
+  unique int id: @xmldtd,
+  string root: string ref,
+  string publicId: string ref,
+  string systemId: string ref,
+  int fileid: @file ref
+);
+
+xmlElements(
+  unique int id: @xmlelement,
+  string name: string ref,
+  int parentid: @xmlparent ref,
+  int idx: int ref,
+  int fileid: @file ref
+);
+
+xmlAttrs(
+  unique int id: @xmlattribute,
+  int elementid: @xmlelement ref,
+  string name: string ref,
+  string value: string ref,
+  int idx: int ref,
+  int fileid: @file ref
+);
+
+xmlNs(
+  int id: @xmlnamespace,
+  string prefixName: string ref,
+  string URI: string ref,
+  int fileid: @file ref
+);
+
+xmlHasNs(
+  int elementId: @xmlnamespaceable ref,
+  int nsId: @xmlnamespace ref,
+  int fileid: @file ref
+);
+
+xmlComments(
+  unique int id: @xmlcomment,
+  string text: string ref,
+  int parentid: @xmlparent ref,
+  int fileid: @file ref
+);
+
+xmlChars(
+  unique int id: @xmlcharacters,
+  string text: string ref,
+  int parentid: @xmlparent ref,
+  int idx: int ref,
+  int isCDATA: int ref,
+  int fileid: @file ref
+);
+
+@xmlparent = @file | @xmlelement;
+@xmlnamespaceable = @xmlelement | @xmlattribute;
+
+xmllocations(
+  int xmlElement: @xmllocatable ref,
+  int location: @location_default ref
+);
+
+@xmllocatable = @xmlcharacters | @xmlelement | @xmlcomment | @xmlattribute | @xmldtd | @file | @xmlnamespace;
+
+compilations(unique int id: @compilation, string cwd: string ref);
+
+#keyset[id, num]
+compilation_args(int id: @compilation ref, int num: int ref, string arg: string ref);
+
+#keyset[id, num, kind]
+compilation_time(int id: @compilation ref, int num: int ref, int kind: int ref, float secs: float ref);
+
+diagnostic_for(unique int diagnostic: @diagnostic ref, int compilation: @compilation ref, int file_number: int ref, int file_number_diagnostic_number: int ref);
+
+compilation_finished(unique int id: @compilation ref, float cpu_seconds: float ref, float elapsed_seconds: float ref);
+
+#keyset[id, num]
+compilation_compiling_files(int id: @compilation ref, int num: int ref, int file: @file ref);
+
+diagnostics(unique int id: @diagnostic, int severity: int ref, string error_tag: string ref, string error_message: string ref,
+            string full_error_message: string ref, int location: @location ref);
+
+locations_default(unique int id: @location_default, int file: @file ref, int beginLine: int ref, int beginColumn: int ref,
+                  int endLine: int ref, int endColumn: int ref);
+
+numlines(int element_id: @sourceline ref, int num_lines: int ref, int num_code: int ref, int num_comment: int ref);
+
+files(unique int id: @file, string name: string ref);
+
+folders(unique int id: @folder, string name: string ref);
+
+containerparent(int parent: @container ref, unique int child: @container ref);
+
+has_location(unique int locatable: @locatable ref, int location: @location ref);
+
+#keyset[parent, idx]
+comment_groups(unique int id: @comment_group, int parent: @file ref, int idx: int ref);
+
+comments(unique int id: @comment, int kind: int ref, int parent: @comment_group ref, int idx: int ref, string text: string ref);
+
+doc_comments(unique int node: @documentable ref, int comment: @comment_group ref);
+
+#keyset[parent, idx]
+exprs(unique int id: @expr, int kind: int ref, int parent: @exprparent ref, int idx: int ref);
+
+literals(unique int expr: @expr ref, string value: string ref, string raw: string ref);
+
+constvalues(unique int expr: @expr ref, string value: string ref, string exact: string ref);
+
+fields(unique int id: @field, int parent: @fieldparent ref, int idx: int ref);
+
+typeparamdecls(unique int id: @typeparamdecl, int parent: @typeparamdeclparent ref, int idx: int ref);
+
+#keyset[parent, idx]
+stmts(unique int id: @stmt, int kind: int ref, int parent: @stmtparent ref, int idx: int ref);
+
+#keyset[parent, idx]
+decls(unique int id: @decl, int kind: int ref, int parent: @declparent ref, int idx: int ref);
+
+#keyset[parent, idx]
+specs(unique int id: @spec, int kind: int ref, int parent: @gendecl ref, int idx: int ref);
+
+scopes(unique int id: @scope, int kind: int ref);
+
+scopenesting(unique int inner: @scope ref, int outer: @scope ref);
+
+scopenodes(unique int node: @scopenode ref, int scope: @localscope ref);
+
+objects(unique int id: @object, int kind: int ref, string name: string ref);
+
+objectscopes(unique int object: @object ref, int scope: @scope ref);
+
+objecttypes(unique int object: @object ref, int tp: @type ref);
+
+methodreceivers(unique int method: @object ref, int receiver: @object ref);
+
+fieldstructs(unique int field: @object ref, int struct: @structtype ref);
+
+methodhosts(int method: @object ref, int host: @namedtype ref);
+
+defs(int ident: @ident ref, int object: @object ref);
+
+uses(int ident: @ident ref, int object: @object ref);
+
+types(unique int id: @type, int kind: int ref);
+
+type_of(unique int expr: @expr ref, int tp: @type ref);
+
+typename(unique int tp: @type ref, string name: string ref);
+
+key_type(unique int map: @maptype ref, int tp: @type ref);
+
+element_type(unique int container: @containertype ref, int tp: @type ref);
+
+base_type(unique int ptr: @pointertype ref, int tp: @type ref);
+
+underlying_type(unique int named: @namedtype ref, int tp: @type ref);
+
+#keyset[parent, index]
+component_types(int parent: @compositetype ref, int index: int ref, string name: string ref, int tp: @type ref);
+
+#keyset[parent, index]
+component_tags(int parent: @compositetype ref, int index: int ref, string tag: string ref);
+
+#keyset[interface, index]
+interface_private_method_ids(int interface: @interfacetype ref, int index: int ref, string id: string ref);
+
+array_length(unique int tp: @arraytype ref, string len: string ref);
+
+type_objects(unique int tp: @type ref, int object: @object ref);
+
+packages(unique int id: @package, string name: string ref, string path: string ref, int scope: @packagescope ref);
+
+#keyset[parent, idx]
+modexprs(unique int id: @modexpr, int kind: int ref, int parent: @modexprparent ref, int idx: int ref);
+
+#keyset[parent, idx]
+modtokens(string token: string ref, int parent: @modexpr ref, int idx: int ref);
+
+#keyset[package, idx]
+errors(unique int id: @error, int kind: int ref, string msg: string ref, string rawpos: string ref,
+       string file: string ref, int line: int ref, int col: int ref, int package: @package ref, int idx: int ref);
+
+has_ellipsis(int id: @callorconversionexpr ref);
+
+variadic(int id: @signaturetype ref);
+
+#keyset[parent, idx]
+typeparam(unique int tp: @typeparamtype ref, string name: string ref, int bound: @compositetype ref,
+          int parent: @typeparamparentobject ref, int idx: int ref);
+
+@container = @file | @folder;
+
+@locatable = @xmllocatable | @node | @localscope;
+
+@node = @documentable | @exprparent | @modexprparent | @fieldparent | @stmtparent | @declparent | @typeparamdeclparent
+      | @scopenode | @comment_group | @comment;
+
+@documentable = @file | @field | @typeparamdecl | @spec | @gendecl | @funcdecl | @modexpr;
+
+@exprparent = @funcdef | @file | @expr | @field | @stmt | @decl | @typeparamdecl | @spec;
+
+@modexprparent = @file | @modexpr;
+
+@fieldparent = @decl | @structtypeexpr | @functypeexpr | @interfacetypeexpr;
+
+@stmtparent = @funcdef | @stmt | @decl;
+
+@declparent = @file | @declstmt;
+
+@typeparamdeclparent = @funcdecl | @typespec;
+
+@funcdef = @funclit | @funcdecl;
+
+@scopenode = @file | @functypeexpr | @blockstmt | @ifstmt | @caseclause | @switchstmt | @commclause | @loopstmt;
+
+@location = @location_default;
+
+@sourceline = @locatable;
+
+case @comment.kind of
+  0 = @slashslashcomment
+| 1 = @slashstarcomment;
+
+case @expr.kind of
+  0 = @badexpr
+| 1 = @ident
+| 2 = @ellipsis
+| 3 = @intlit
+| 4 = @floatlit
+| 5 = @imaglit
+| 6 = @charlit
+| 7 = @stringlit
+| 8 = @funclit
+| 9 = @compositelit
+| 10 = @parenexpr
+| 11 = @selectorexpr
+| 12 = @indexexpr
+| 13 = @genericfunctioninstantiationexpr
+| 14 = @generictypeinstantiationexpr
+| 15 = @sliceexpr
+| 16 = @typeassertexpr
+| 17 = @callorconversionexpr
+| 18 = @starexpr
+| 19 = @keyvalueexpr
+| 20 = @arraytypeexpr
+| 21 = @structtypeexpr
+| 22 = @functypeexpr
+| 23 = @interfacetypeexpr
+| 24 = @maptypeexpr
+| 25 = @typesetliteralexpr
+| 26 = @plusexpr
+| 27 = @minusexpr
+| 28 = @notexpr
+| 29 = @complementexpr
+| 30 = @derefexpr
+| 31 = @addressexpr
+| 32 = @arrowexpr
+| 33 = @lorexpr
+| 34 = @landexpr
+| 35 = @eqlexpr
+| 36 = @neqexpr
+| 37 = @lssexpr
+| 38 = @leqexpr
+| 39 = @gtrexpr
+| 40 = @geqexpr
+| 41 = @addexpr
+| 42 = @subexpr
+| 43 = @orexpr
+| 44 = @xorexpr
+| 45 = @mulexpr
+| 46 = @quoexpr
+| 47 = @remexpr
+| 48 = @shlexpr
+| 49 = @shrexpr
+| 50 = @andexpr
+| 51 = @andnotexpr
+| 52 = @sendchantypeexpr
+| 53 = @recvchantypeexpr
+| 54 = @sendrcvchantypeexpr;
+
+@basiclit = @intlit | @floatlit | @imaglit | @charlit | @stringlit;
+
+@operatorexpr = @logicalexpr | @arithmeticexpr | @bitwiseexpr | @unaryexpr | @binaryexpr;
+
+@logicalexpr = @logicalunaryexpr | @logicalbinaryexpr;
+
+@arithmeticexpr = @arithmeticunaryexpr | @arithmeticbinaryexpr;
+
+@bitwiseexpr = @bitwiseunaryexpr | @bitwisebinaryexpr;
+
+@unaryexpr = @logicalunaryexpr | @bitwiseunaryexpr | @arithmeticunaryexpr | @derefexpr | @addressexpr | @arrowexpr;
+
+@logicalunaryexpr = @notexpr;
+
+@bitwiseunaryexpr = @complementexpr;
+
+@arithmeticunaryexpr = @plusexpr | @minusexpr;
+
+@binaryexpr = @logicalbinaryexpr | @bitwisebinaryexpr | @arithmeticbinaryexpr | @comparison;
+
+@logicalbinaryexpr = @lorexpr | @landexpr;
+
+@bitwisebinaryexpr = @shiftexpr | @orexpr | @xorexpr | @andexpr | @andnotexpr;
+
+@arithmeticbinaryexpr = @addexpr | @subexpr | @mulexpr | @quoexpr | @remexpr;
+
+@shiftexpr = @shlexpr | @shrexpr;
+
+@comparison = @equalitytest | @relationalcomparison;
+
+@equalitytest = @eqlexpr | @neqexpr;
+
+@relationalcomparison = @lssexpr | @leqexpr | @gtrexpr | @geqexpr;
+
+@chantypeexpr = @sendchantypeexpr | @recvchantypeexpr | @sendrcvchantypeexpr;
+
+case @stmt.kind of
+  0 = @badstmt
+| 1 = @declstmt
+| 2 = @emptystmt
+| 3 = @labeledstmt
+| 4 = @exprstmt
+| 5 = @sendstmt
+| 6 = @incstmt
+| 7 = @decstmt
+| 8 = @gostmt
+| 9 = @deferstmt
+| 10 = @returnstmt
+| 11 = @breakstmt
+| 12 = @continuestmt
+| 13 = @gotostmt
+| 14 = @fallthroughstmt
+| 15 = @blockstmt
+| 16 = @ifstmt
+| 17 = @caseclause
+| 18 = @exprswitchstmt
+| 19 = @typeswitchstmt
+| 20 = @commclause
+| 21 = @selectstmt
+| 22 = @forstmt
+| 23 = @rangestmt
+| 24 = @assignstmt
+| 25 = @definestmt
+| 26 = @addassignstmt
+| 27 = @subassignstmt
+| 28 = @mulassignstmt
+| 29 = @quoassignstmt
+| 30 = @remassignstmt
+| 31 = @andassignstmt
+| 32 = @orassignstmt
+| 33 = @xorassignstmt
+| 34 = @shlassignstmt
+| 35 = @shrassignstmt
+| 36 = @andnotassignstmt;
+
+@incdecstmt = @incstmt | @decstmt;
+
+@assignment = @simpleassignstmt | @compoundassignstmt;
+
+@simpleassignstmt = @assignstmt | @definestmt;
+
+@compoundassignstmt = @addassignstmt | @subassignstmt | @mulassignstmt | @quoassignstmt | @remassignstmt
+                    | @andassignstmt | @orassignstmt | @xorassignstmt | @shlassignstmt | @shrassignstmt | @andnotassignstmt;
+
+@branchstmt = @breakstmt | @continuestmt | @gotostmt | @fallthroughstmt;
+
+@switchstmt = @exprswitchstmt | @typeswitchstmt;
+
+@loopstmt = @forstmt | @rangestmt;
+
+case @decl.kind of
+  0 = @baddecl
+| 1 = @importdecl
+| 2 = @constdecl
+| 3 = @typedecl
+| 4 = @vardecl
+| 5 = @funcdecl;
+
+@gendecl = @importdecl | @constdecl | @typedecl | @vardecl;
+
+case @spec.kind of
+  0 = @importspec
+| 1 = @valuespec
+| 2 = @typedefspec
+| 3 = @aliasspec;
+
+@typespec = @typedefspec | @aliasspec;
+
+case @object.kind of
+  0 = @pkgobject
+| 1 = @decltypeobject
+| 2 = @builtintypeobject
+| 3 = @declconstobject
+| 4 = @builtinconstobject
+| 5 = @declvarobject
+| 6 = @declfunctionobject
+| 7 = @builtinfunctionobject
+| 8 = @labelobject;
+
+@typeparamparentobject = @decltypeobject | @declfunctionobject;
+
+@declobject = @decltypeobject | @declconstobject | @declvarobject | @declfunctionobject;
+
+@builtinobject = @builtintypeobject | @builtinconstobject | @builtinfunctionobject;
+
+@typeobject = @decltypeobject | @builtintypeobject;
+
+@valueobject = @constobject | @varobject | @functionobject;
+
+@constobject = @declconstobject | @builtinconstobject;
+
+@varobject = @declvarobject;
+
+@functionobject = @declfunctionobject | @builtinfunctionobject;
+
+case @scope.kind of
+  0 = @universescope
+| 1 = @packagescope
+| 2 = @localscope;
+
+case @type.kind of
+  0 = @invalidtype
+| 1 = @boolexprtype
+| 2 = @inttype
+| 3 = @int8type
+| 4 = @int16type
+| 5 = @int32type
+| 6 = @int64type
+| 7 = @uinttype
+| 8 = @uint8type
+| 9 = @uint16type
+| 10 = @uint32type
+| 11 = @uint64type
+| 12 = @uintptrtype
+| 13 = @float32type
+| 14 = @float64type
+| 15 = @complex64type
+| 16 = @complex128type
+| 17 = @stringexprtype
+| 18 = @unsafepointertype
+| 19 = @boolliteraltype
+| 20 = @intliteraltype
+| 21 = @runeliteraltype
+| 22 = @floatliteraltype
+| 23 = @complexliteraltype
+| 24 = @stringliteraltype
+| 25 = @nilliteraltype
+| 26 = @typeparamtype
+| 27 = @arraytype
+| 28 = @slicetype
+| 29 = @structtype
+| 30 = @pointertype
+| 31 = @interfacetype
+| 32 = @tupletype
+| 33 = @signaturetype
+| 34 = @maptype
+| 35 = @sendchantype
+| 36 = @recvchantype
+| 37 = @sendrcvchantype
+| 38 = @namedtype
+| 39 = @typesetliteraltype;
+
+@basictype = @booltype | @numerictype | @stringtype | @literaltype | @invalidtype | @unsafepointertype;
+
+@booltype = @boolexprtype | @boolliteraltype;
+
+@numerictype = @integertype | @floattype | @complextype;
+
+@integertype = @signedintegertype | @unsignedintegertype;
+
+@signedintegertype = @inttype | @int8type | @int16type | @int32type | @int64type | @intliteraltype | @runeliteraltype;
+
+@unsignedintegertype = @uinttype | @uint8type | @uint16type | @uint32type | @uint64type | @uintptrtype;
+
+@floattype = @float32type | @float64type | @floatliteraltype;
+
+@complextype = @complex64type | @complex128type | @complexliteraltype;
+
+@stringtype = @stringexprtype | @stringliteraltype;
+
+@literaltype = @boolliteraltype | @intliteraltype | @runeliteraltype | @floatliteraltype | @complexliteraltype
+             | @stringliteraltype | @nilliteraltype;
+
+@compositetype = @typeparamtype | @containertype | @structtype | @pointertype | @interfacetype | @tupletype
+               | @signaturetype | @namedtype | @typesetliteraltype;
+
+@containertype = @arraytype | @slicetype | @maptype | @chantype;
+
+@chantype = @sendchantype | @recvchantype | @sendrcvchantype;
+
+case @modexpr.kind of
+  0 = @modcommentblock
+| 1 = @modline
+| 2 = @modlineblock
+| 3 = @modlparen
+| 4 = @modrparen;
+
+case @error.kind of
+  0 = @unknownerror
+| 1 = @listerror
+| 2 = @parseerror
+| 3 = @typeerror;
+
diff --git a/go/downgrades/e47462df302b3e58a60d2e21f99aba63f973326f/upgrade.properties b/go/downgrades/e47462df302b3e58a60d2e21f99aba63f973326f/upgrade.properties
new file mode 100644
index 000000000000..976c2c81bfa4
--- /dev/null
+++ b/go/downgrades/e47462df302b3e58a60d2e21f99aba63f973326f/upgrade.properties
@@ -0,0 +1,5 @@
+description: Remove component-tags and interface-method-id tables
+compatibility: full
+
+component_tags.rel: delete
+interface_private_method_ids.rel: delete
diff --git a/go/extractor/dbscheme/tables.go b/go/extractor/dbscheme/tables.go
index e987cb402ae4..89cc7ffeadb0 100644
--- a/go/extractor/dbscheme/tables.go
+++ b/go/extractor/dbscheme/tables.go
@@ -1150,6 +1150,20 @@ var ComponentTypesTable = NewTable("component_types",
 	EntityColumn(TypeType, "tp"),
 ).KeySet("parent", "index")
 
+// ComponentTagsTable is the table associating composite types with their component types' tags
+var ComponentTagsTable = NewTable("component_tags",
+	EntityColumn(CompositeType, "parent"),
+	IntColumn("index"),
+	StringColumn("tag"),
+).KeySet("parent", "index")
+
+// InterfacePrivateMethodIdsTable is the table associating interface types with their private method ids
+var InterfacePrivateMethodIdsTable = NewTable("interface_private_method_ids",
+	EntityColumn(InterfaceType, "interface"),
+	IntColumn("index"),
+	StringColumn("id"),
+).KeySet("interface", "index")
+
 // ArrayLengthTable is the table associating array types with their length (represented as a string
 // since Go array lengths are 64-bit and hence do not always fit into a QL integer)
 var ArrayLengthTable = NewTable("array_length",
diff --git a/go/extractor/extractor.go b/go/extractor/extractor.go
index b1d476d10948..33186a9380f8 100644
--- a/go/extractor/extractor.go
+++ b/go/extractor/extractor.go
@@ -1624,6 +1624,7 @@ func extractType(tw *trap.Writer, tp types.Type) trap.Label {
 					name = ""
 				}
 				extractComponentType(tw, lbl, i, name, field.Type())
+				dbscheme.ComponentTagsTable.Emit(tw, lbl, i, tp.Tag(i))
 			}
 		case *types.Pointer:
 			kind = dbscheme.PointerType.Index()
@@ -1641,6 +1642,13 @@ func extractType(tw *trap.Writer, tp types.Type) trap.Label {
 				extractMethod(tw, meth)
 
 				extractComponentType(tw, lbl, i, meth.Name(), meth.Type())
+
+				// meth.Id() will be equal to meth.Name() for an exported method, or
+				// packge-qualified otherwise.
+				privateMethodId := meth.Id()
+				if privateMethodId != meth.Name() {
+					dbscheme.InterfacePrivateMethodIdsTable.Emit(tw, lbl, i, privateMethodId)
+				}
 			}
 			for i := 0; i < tp.NumEmbeddeds(); i++ {
 				component := tp.EmbeddedType(i)
diff --git a/go/ql/lib/go.dbscheme b/go/ql/lib/go.dbscheme
index a58b81b1b4c4..e47462df302b 100644
--- a/go/ql/lib/go.dbscheme
+++ b/go/ql/lib/go.dbscheme
@@ -207,6 +207,12 @@ underlying_type(unique int named: @namedtype ref, int tp: @type ref);
 #keyset[parent, index]
 component_types(int parent: @compositetype ref, int index: int ref, string name: string ref, int tp: @type ref);
 
+#keyset[parent, index]
+component_tags(int parent: @compositetype ref, int index: int ref, string tag: string ref);
+
+#keyset[interface, index]
+interface_private_method_ids(int interface: @interfacetype ref, int index: int ref, string id: string ref);
+
 array_length(unique int tp: @arraytype ref, string len: string ref);
 
 type_objects(unique int tp: @type ref, int object: @object ref);
diff --git a/go/ql/lib/semmle/go/Scopes.qll b/go/ql/lib/semmle/go/Scopes.qll
index 7386b81868fc..32213d1efca3 100644
--- a/go/ql/lib/semmle/go/Scopes.qll
+++ b/go/ql/lib/semmle/go/Scopes.qll
@@ -385,6 +385,13 @@ class Field extends Variable {
       this = base.getField(f)
     )
   }
+
+  /**
+   * Gets the tag associated with this field, or the empty string if this field has no tag.
+   */
+  string getTag() {
+    declaringType.hasOwnFieldWithTag(_, this.getName(), this.getType(), _, result)
+  }
 }
 
 /**
diff --git a/go/ql/lib/semmle/go/Types.qll b/go/ql/lib/semmle/go/Types.qll
index f7bb6afe3d7a..16e2c528ef47 100644
--- a/go/ql/lib/semmle/go/Types.qll
+++ b/go/ql/lib/semmle/go/Types.qll
@@ -457,6 +457,17 @@ class StructType extends @structtype, CompositeType {
     )
   }
 
+  /**
+   * Holds if this struct contains a field `name` with type `tp` and tag `tag`;
+   * `isEmbedded` is true if the field is embedded.
+   *
+   * Note that this predicate does not take promoted fields into account.
+   */
+  predicate hasOwnFieldWithTag(int i, string name, Type tp, boolean isEmbedded, string tag) {
+    this.hasOwnField(i, name, tp, isEmbedded) and
+    component_tags(this, i, tag)
+  }
+
   /**
    * Get a field with the name `name`; `isEmbedded` is true if the field is embedded.
    *
@@ -575,10 +586,12 @@ class StructType extends @structtype, CompositeType {
   override string pp() {
     result =
       "struct { " +
-        concat(int i, string name, Type tp |
-          component_types(this, i, name, tp)
+        concat(int i, string name, Type tp, string tag, string tagToPrint |
+          component_types(this, i, name, tp) and
+          component_tags(this, i, tag) and
+          (if tag = "" then tagToPrint = "" else tagToPrint = " `" + tag + "`")
         |
-          name + " " + tp.pp(), "; " order by i
+          name + " " + tp.pp() + tagToPrint, "; " order by i
         ) + " }"
   }
 
@@ -747,6 +760,31 @@ class InterfaceType extends @interfacetype, CompositeType {
     exists(int i | i >= 0 | component_types(this, i, name, result))
   }
 
+  /**
+   * Gets the type of method `id` of this interface type.
+   *
+   * This differs from `getMethodType` in that if the method is not exported, the `id`
+   * will be package-qualified. This means that the set of `id`s` together with any
+   * embedded types fully distinguishes the interface from any other, whereas the set
+   * of names matched by `getMethodName` may be ambiguous between interfaces with matching
+   * exported methods and unexported methods that have matching names but belong to
+   * different packages.
+   *
+   * For example, `interface { Exported() int; notExported() int }` declared in two
+   * different packages defines two distinct types, but they appear identical according to
+   * `getMethodType`.
+   */
+  Type getMethodTypeById(string id) {
+    exists(int i, string name | i >= 0 |
+      component_types(this, i, name, result) and
+      (
+        interface_private_method_ids(this, i, id)
+        or
+        name = id and not interface_private_method_ids(this, i, _)
+      )
+    )
+  }
+
   override predicate hasMethod(string m, SignatureType t) { t = this.getMethodType(m) }
 
   /**
diff --git a/go/ql/lib/upgrades/a58b81b1b4c4cccc8ca11731c1db86622f33af57/component_tags.ql b/go/ql/lib/upgrades/a58b81b1b4c4cccc8ca11731c1db86622f33af57/component_tags.ql
new file mode 100644
index 000000000000..7efd29b4ea53
--- /dev/null
+++ b/go/ql/lib/upgrades/a58b81b1b4c4cccc8ca11731c1db86622f33af57/component_tags.ql
@@ -0,0 +1,7 @@
+class StructType extends @structtype {
+  string toString() { result = "struct type" }
+}
+
+from StructType st, int index
+where component_types(st, index, _, _)
+select st, index, ""
diff --git a/go/ql/lib/upgrades/a58b81b1b4c4cccc8ca11731c1db86622f33af57/go.dbscheme b/go/ql/lib/upgrades/a58b81b1b4c4cccc8ca11731c1db86622f33af57/go.dbscheme
new file mode 100644
index 000000000000..e47462df302b
--- /dev/null
+++ b/go/ql/lib/upgrades/a58b81b1b4c4cccc8ca11731c1db86622f33af57/go.dbscheme
@@ -0,0 +1,552 @@
+/** Auto-generated dbscheme; do not edit. */
+
+
+/** Duplicate code **/
+
+duplicateCode(
+  unique int id : @duplication,
+  varchar(900) relativePath : string ref,
+  int equivClass : int ref);
+
+similarCode(
+  unique int id : @similarity,
+  varchar(900) relativePath : string ref,
+  int equivClass : int ref);
+
+@duplication_or_similarity = @duplication | @similarity;
+
+tokens(
+  int id : @duplication_or_similarity ref,
+  int offset : int ref,
+  int beginLine : int ref,
+  int beginColumn : int ref,
+  int endLine : int ref,
+  int endColumn : int ref);
+
+/** External data **/
+
+externalData(
+  int id : @externalDataElement,
+  varchar(900) path : string ref,
+  int column: int ref,
+  varchar(900) value : string ref
+);
+
+snapshotDate(unique date snapshotDate : date ref);
+
+sourceLocationPrefix(varchar(900) prefix : string ref);
+
+
+/*
+ * XML Files
+ */
+
+xmlEncoding(
+  unique int id: @file ref,
+  string encoding: string ref
+);
+
+xmlDTDs(
+  unique int id: @xmldtd,
+  string root: string ref,
+  string publicId: string ref,
+  string systemId: string ref,
+  int fileid: @file ref
+);
+
+xmlElements(
+  unique int id: @xmlelement,
+  string name: string ref,
+  int parentid: @xmlparent ref,
+  int idx: int ref,
+  int fileid: @file ref
+);
+
+xmlAttrs(
+  unique int id: @xmlattribute,
+  int elementid: @xmlelement ref,
+  string name: string ref,
+  string value: string ref,
+  int idx: int ref,
+  int fileid: @file ref
+);
+
+xmlNs(
+  int id: @xmlnamespace,
+  string prefixName: string ref,
+  string URI: string ref,
+  int fileid: @file ref
+);
+
+xmlHasNs(
+  int elementId: @xmlnamespaceable ref,
+  int nsId: @xmlnamespace ref,
+  int fileid: @file ref
+);
+
+xmlComments(
+  unique int id: @xmlcomment,
+  string text: string ref,
+  int parentid: @xmlparent ref,
+  int fileid: @file ref
+);
+
+xmlChars(
+  unique int id: @xmlcharacters,
+  string text: string ref,
+  int parentid: @xmlparent ref,
+  int idx: int ref,
+  int isCDATA: int ref,
+  int fileid: @file ref
+);
+
+@xmlparent = @file | @xmlelement;
+@xmlnamespaceable = @xmlelement | @xmlattribute;
+
+xmllocations(
+  int xmlElement: @xmllocatable ref,
+  int location: @location_default ref
+);
+
+@xmllocatable = @xmlcharacters | @xmlelement | @xmlcomment | @xmlattribute | @xmldtd | @file | @xmlnamespace;
+
+compilations(unique int id: @compilation, string cwd: string ref);
+
+#keyset[id, num]
+compilation_args(int id: @compilation ref, int num: int ref, string arg: string ref);
+
+#keyset[id, num, kind]
+compilation_time(int id: @compilation ref, int num: int ref, int kind: int ref, float secs: float ref);
+
+diagnostic_for(unique int diagnostic: @diagnostic ref, int compilation: @compilation ref, int file_number: int ref, int file_number_diagnostic_number: int ref);
+
+compilation_finished(unique int id: @compilation ref, float cpu_seconds: float ref, float elapsed_seconds: float ref);
+
+#keyset[id, num]
+compilation_compiling_files(int id: @compilation ref, int num: int ref, int file: @file ref);
+
+diagnostics(unique int id: @diagnostic, int severity: int ref, string error_tag: string ref, string error_message: string ref,
+            string full_error_message: string ref, int location: @location ref);
+
+locations_default(unique int id: @location_default, int file: @file ref, int beginLine: int ref, int beginColumn: int ref,
+                  int endLine: int ref, int endColumn: int ref);
+
+numlines(int element_id: @sourceline ref, int num_lines: int ref, int num_code: int ref, int num_comment: int ref);
+
+files(unique int id: @file, string name: string ref);
+
+folders(unique int id: @folder, string name: string ref);
+
+containerparent(int parent: @container ref, unique int child: @container ref);
+
+has_location(unique int locatable: @locatable ref, int location: @location ref);
+
+#keyset[parent, idx]
+comment_groups(unique int id: @comment_group, int parent: @file ref, int idx: int ref);
+
+comments(unique int id: @comment, int kind: int ref, int parent: @comment_group ref, int idx: int ref, string text: string ref);
+
+doc_comments(unique int node: @documentable ref, int comment: @comment_group ref);
+
+#keyset[parent, idx]
+exprs(unique int id: @expr, int kind: int ref, int parent: @exprparent ref, int idx: int ref);
+
+literals(unique int expr: @expr ref, string value: string ref, string raw: string ref);
+
+constvalues(unique int expr: @expr ref, string value: string ref, string exact: string ref);
+
+fields(unique int id: @field, int parent: @fieldparent ref, int idx: int ref);
+
+typeparamdecls(unique int id: @typeparamdecl, int parent: @typeparamdeclparent ref, int idx: int ref);
+
+#keyset[parent, idx]
+stmts(unique int id: @stmt, int kind: int ref, int parent: @stmtparent ref, int idx: int ref);
+
+#keyset[parent, idx]
+decls(unique int id: @decl, int kind: int ref, int parent: @declparent ref, int idx: int ref);
+
+#keyset[parent, idx]
+specs(unique int id: @spec, int kind: int ref, int parent: @gendecl ref, int idx: int ref);
+
+scopes(unique int id: @scope, int kind: int ref);
+
+scopenesting(unique int inner: @scope ref, int outer: @scope ref);
+
+scopenodes(unique int node: @scopenode ref, int scope: @localscope ref);
+
+objects(unique int id: @object, int kind: int ref, string name: string ref);
+
+objectscopes(unique int object: @object ref, int scope: @scope ref);
+
+objecttypes(unique int object: @object ref, int tp: @type ref);
+
+methodreceivers(unique int method: @object ref, int receiver: @object ref);
+
+fieldstructs(unique int field: @object ref, int struct: @structtype ref);
+
+methodhosts(int method: @object ref, int host: @namedtype ref);
+
+defs(int ident: @ident ref, int object: @object ref);
+
+uses(int ident: @ident ref, int object: @object ref);
+
+types(unique int id: @type, int kind: int ref);
+
+type_of(unique int expr: @expr ref, int tp: @type ref);
+
+typename(unique int tp: @type ref, string name: string ref);
+
+key_type(unique int map: @maptype ref, int tp: @type ref);
+
+element_type(unique int container: @containertype ref, int tp: @type ref);
+
+base_type(unique int ptr: @pointertype ref, int tp: @type ref);
+
+underlying_type(unique int named: @namedtype ref, int tp: @type ref);
+
+#keyset[parent, index]
+component_types(int parent: @compositetype ref, int index: int ref, string name: string ref, int tp: @type ref);
+
+#keyset[parent, index]
+component_tags(int parent: @compositetype ref, int index: int ref, string tag: string ref);
+
+#keyset[interface, index]
+interface_private_method_ids(int interface: @interfacetype ref, int index: int ref, string id: string ref);
+
+array_length(unique int tp: @arraytype ref, string len: string ref);
+
+type_objects(unique int tp: @type ref, int object: @object ref);
+
+packages(unique int id: @package, string name: string ref, string path: string ref, int scope: @packagescope ref);
+
+#keyset[parent, idx]
+modexprs(unique int id: @modexpr, int kind: int ref, int parent: @modexprparent ref, int idx: int ref);
+
+#keyset[parent, idx]
+modtokens(string token: string ref, int parent: @modexpr ref, int idx: int ref);
+
+#keyset[package, idx]
+errors(unique int id: @error, int kind: int ref, string msg: string ref, string rawpos: string ref,
+       string file: string ref, int line: int ref, int col: int ref, int package: @package ref, int idx: int ref);
+
+has_ellipsis(int id: @callorconversionexpr ref);
+
+variadic(int id: @signaturetype ref);
+
+#keyset[parent, idx]
+typeparam(unique int tp: @typeparamtype ref, string name: string ref, int bound: @compositetype ref,
+          int parent: @typeparamparentobject ref, int idx: int ref);
+
+@container = @file | @folder;
+
+@locatable = @xmllocatable | @node | @localscope;
+
+@node = @documentable | @exprparent | @modexprparent | @fieldparent | @stmtparent | @declparent | @typeparamdeclparent
+      | @scopenode | @comment_group | @comment;
+
+@documentable = @file | @field | @typeparamdecl | @spec | @gendecl | @funcdecl | @modexpr;
+
+@exprparent = @funcdef | @file | @expr | @field | @stmt | @decl | @typeparamdecl | @spec;
+
+@modexprparent = @file | @modexpr;
+
+@fieldparent = @decl | @structtypeexpr | @functypeexpr | @interfacetypeexpr;
+
+@stmtparent = @funcdef | @stmt | @decl;
+
+@declparent = @file | @declstmt;
+
+@typeparamdeclparent = @funcdecl | @typespec;
+
+@funcdef = @funclit | @funcdecl;
+
+@scopenode = @file | @functypeexpr | @blockstmt | @ifstmt | @caseclause | @switchstmt | @commclause | @loopstmt;
+
+@location = @location_default;
+
+@sourceline = @locatable;
+
+case @comment.kind of
+  0 = @slashslashcomment
+| 1 = @slashstarcomment;
+
+case @expr.kind of
+  0 = @badexpr
+| 1 = @ident
+| 2 = @ellipsis
+| 3 = @intlit
+| 4 = @floatlit
+| 5 = @imaglit
+| 6 = @charlit
+| 7 = @stringlit
+| 8 = @funclit
+| 9 = @compositelit
+| 10 = @parenexpr
+| 11 = @selectorexpr
+| 12 = @indexexpr
+| 13 = @genericfunctioninstantiationexpr
+| 14 = @generictypeinstantiationexpr
+| 15 = @sliceexpr
+| 16 = @typeassertexpr
+| 17 = @callorconversionexpr
+| 18 = @starexpr
+| 19 = @keyvalueexpr
+| 20 = @arraytypeexpr
+| 21 = @structtypeexpr
+| 22 = @functypeexpr
+| 23 = @interfacetypeexpr
+| 24 = @maptypeexpr
+| 25 = @typesetliteralexpr
+| 26 = @plusexpr
+| 27 = @minusexpr
+| 28 = @notexpr
+| 29 = @complementexpr
+| 30 = @derefexpr
+| 31 = @addressexpr
+| 32 = @arrowexpr
+| 33 = @lorexpr
+| 34 = @landexpr
+| 35 = @eqlexpr
+| 36 = @neqexpr
+| 37 = @lssexpr
+| 38 = @leqexpr
+| 39 = @gtrexpr
+| 40 = @geqexpr
+| 41 = @addexpr
+| 42 = @subexpr
+| 43 = @orexpr
+| 44 = @xorexpr
+| 45 = @mulexpr
+| 46 = @quoexpr
+| 47 = @remexpr
+| 48 = @shlexpr
+| 49 = @shrexpr
+| 50 = @andexpr
+| 51 = @andnotexpr
+| 52 = @sendchantypeexpr
+| 53 = @recvchantypeexpr
+| 54 = @sendrcvchantypeexpr;
+
+@basiclit = @intlit | @floatlit | @imaglit | @charlit | @stringlit;
+
+@operatorexpr = @logicalexpr | @arithmeticexpr | @bitwiseexpr | @unaryexpr | @binaryexpr;
+
+@logicalexpr = @logicalunaryexpr | @logicalbinaryexpr;
+
+@arithmeticexpr = @arithmeticunaryexpr | @arithmeticbinaryexpr;
+
+@bitwiseexpr = @bitwiseunaryexpr | @bitwisebinaryexpr;
+
+@unaryexpr = @logicalunaryexpr | @bitwiseunaryexpr | @arithmeticunaryexpr | @derefexpr | @addressexpr | @arrowexpr;
+
+@logicalunaryexpr = @notexpr;
+
+@bitwiseunaryexpr = @complementexpr;
+
+@arithmeticunaryexpr = @plusexpr | @minusexpr;
+
+@binaryexpr = @logicalbinaryexpr | @bitwisebinaryexpr | @arithmeticbinaryexpr | @comparison;
+
+@logicalbinaryexpr = @lorexpr | @landexpr;
+
+@bitwisebinaryexpr = @shiftexpr | @orexpr | @xorexpr | @andexpr | @andnotexpr;
+
+@arithmeticbinaryexpr = @addexpr | @subexpr | @mulexpr | @quoexpr | @remexpr;
+
+@shiftexpr = @shlexpr | @shrexpr;
+
+@comparison = @equalitytest | @relationalcomparison;
+
+@equalitytest = @eqlexpr | @neqexpr;
+
+@relationalcomparison = @lssexpr | @leqexpr | @gtrexpr | @geqexpr;
+
+@chantypeexpr = @sendchantypeexpr | @recvchantypeexpr | @sendrcvchantypeexpr;
+
+case @stmt.kind of
+  0 = @badstmt
+| 1 = @declstmt
+| 2 = @emptystmt
+| 3 = @labeledstmt
+| 4 = @exprstmt
+| 5 = @sendstmt
+| 6 = @incstmt
+| 7 = @decstmt
+| 8 = @gostmt
+| 9 = @deferstmt
+| 10 = @returnstmt
+| 11 = @breakstmt
+| 12 = @continuestmt
+| 13 = @gotostmt
+| 14 = @fallthroughstmt
+| 15 = @blockstmt
+| 16 = @ifstmt
+| 17 = @caseclause
+| 18 = @exprswitchstmt
+| 19 = @typeswitchstmt
+| 20 = @commclause
+| 21 = @selectstmt
+| 22 = @forstmt
+| 23 = @rangestmt
+| 24 = @assignstmt
+| 25 = @definestmt
+| 26 = @addassignstmt
+| 27 = @subassignstmt
+| 28 = @mulassignstmt
+| 29 = @quoassignstmt
+| 30 = @remassignstmt
+| 31 = @andassignstmt
+| 32 = @orassignstmt
+| 33 = @xorassignstmt
+| 34 = @shlassignstmt
+| 35 = @shrassignstmt
+| 36 = @andnotassignstmt;
+
+@incdecstmt = @incstmt | @decstmt;
+
+@assignment = @simpleassignstmt | @compoundassignstmt;
+
+@simpleassignstmt = @assignstmt | @definestmt;
+
+@compoundassignstmt = @addassignstmt | @subassignstmt | @mulassignstmt | @quoassignstmt | @remassignstmt
+                    | @andassignstmt | @orassignstmt | @xorassignstmt | @shlassignstmt | @shrassignstmt | @andnotassignstmt;
+
+@branchstmt = @breakstmt | @continuestmt | @gotostmt | @fallthroughstmt;
+
+@switchstmt = @exprswitchstmt | @typeswitchstmt;
+
+@loopstmt = @forstmt | @rangestmt;
+
+case @decl.kind of
+  0 = @baddecl
+| 1 = @importdecl
+| 2 = @constdecl
+| 3 = @typedecl
+| 4 = @vardecl
+| 5 = @funcdecl;
+
+@gendecl = @importdecl | @constdecl | @typedecl | @vardecl;
+
+case @spec.kind of
+  0 = @importspec
+| 1 = @valuespec
+| 2 = @typedefspec
+| 3 = @aliasspec;
+
+@typespec = @typedefspec | @aliasspec;
+
+case @object.kind of
+  0 = @pkgobject
+| 1 = @decltypeobject
+| 2 = @builtintypeobject
+| 3 = @declconstobject
+| 4 = @builtinconstobject
+| 5 = @declvarobject
+| 6 = @declfunctionobject
+| 7 = @builtinfunctionobject
+| 8 = @labelobject;
+
+@typeparamparentobject = @decltypeobject | @declfunctionobject;
+
+@declobject = @decltypeobject | @declconstobject | @declvarobject | @declfunctionobject;
+
+@builtinobject = @builtintypeobject | @builtinconstobject | @builtinfunctionobject;
+
+@typeobject = @decltypeobject | @builtintypeobject;
+
+@valueobject = @constobject | @varobject | @functionobject;
+
+@constobject = @declconstobject | @builtinconstobject;
+
+@varobject = @declvarobject;
+
+@functionobject = @declfunctionobject | @builtinfunctionobject;
+
+case @scope.kind of
+  0 = @universescope
+| 1 = @packagescope
+| 2 = @localscope;
+
+case @type.kind of
+  0 = @invalidtype
+| 1 = @boolexprtype
+| 2 = @inttype
+| 3 = @int8type
+| 4 = @int16type
+| 5 = @int32type
+| 6 = @int64type
+| 7 = @uinttype
+| 8 = @uint8type
+| 9 = @uint16type
+| 10 = @uint32type
+| 11 = @uint64type
+| 12 = @uintptrtype
+| 13 = @float32type
+| 14 = @float64type
+| 15 = @complex64type
+| 16 = @complex128type
+| 17 = @stringexprtype
+| 18 = @unsafepointertype
+| 19 = @boolliteraltype
+| 20 = @intliteraltype
+| 21 = @runeliteraltype
+| 22 = @floatliteraltype
+| 23 = @complexliteraltype
+| 24 = @stringliteraltype
+| 25 = @nilliteraltype
+| 26 = @typeparamtype
+| 27 = @arraytype
+| 28 = @slicetype
+| 29 = @structtype
+| 30 = @pointertype
+| 31 = @interfacetype
+| 32 = @tupletype
+| 33 = @signaturetype
+| 34 = @maptype
+| 35 = @sendchantype
+| 36 = @recvchantype
+| 37 = @sendrcvchantype
+| 38 = @namedtype
+| 39 = @typesetliteraltype;
+
+@basictype = @booltype | @numerictype | @stringtype | @literaltype | @invalidtype | @unsafepointertype;
+
+@booltype = @boolexprtype | @boolliteraltype;
+
+@numerictype = @integertype | @floattype | @complextype;
+
+@integertype = @signedintegertype | @unsignedintegertype;
+
+@signedintegertype = @inttype | @int8type | @int16type | @int32type | @int64type | @intliteraltype | @runeliteraltype;
+
+@unsignedintegertype = @uinttype | @uint8type | @uint16type | @uint32type | @uint64type | @uintptrtype;
+
+@floattype = @float32type | @float64type | @floatliteraltype;
+
+@complextype = @complex64type | @complex128type | @complexliteraltype;
+
+@stringtype = @stringexprtype | @stringliteraltype;
+
+@literaltype = @boolliteraltype | @intliteraltype | @runeliteraltype | @floatliteraltype | @complexliteraltype
+             | @stringliteraltype | @nilliteraltype;
+
+@compositetype = @typeparamtype | @containertype | @structtype | @pointertype | @interfacetype | @tupletype
+               | @signaturetype | @namedtype | @typesetliteraltype;
+
+@containertype = @arraytype | @slicetype | @maptype | @chantype;
+
+@chantype = @sendchantype | @recvchantype | @sendrcvchantype;
+
+case @modexpr.kind of
+  0 = @modcommentblock
+| 1 = @modline
+| 2 = @modlineblock
+| 3 = @modlparen
+| 4 = @modrparen;
+
+case @error.kind of
+  0 = @unknownerror
+| 1 = @listerror
+| 2 = @parseerror
+| 3 = @typeerror;
+
diff --git a/go/ql/lib/upgrades/a58b81b1b4c4cccc8ca11731c1db86622f33af57/old.dbscheme b/go/ql/lib/upgrades/a58b81b1b4c4cccc8ca11731c1db86622f33af57/old.dbscheme
new file mode 100644
index 000000000000..a58b81b1b4c4
--- /dev/null
+++ b/go/ql/lib/upgrades/a58b81b1b4c4cccc8ca11731c1db86622f33af57/old.dbscheme
@@ -0,0 +1,546 @@
+/** Auto-generated dbscheme; do not edit. */
+
+
+/** Duplicate code **/
+
+duplicateCode(
+  unique int id : @duplication,
+  varchar(900) relativePath : string ref,
+  int equivClass : int ref);
+
+similarCode(
+  unique int id : @similarity,
+  varchar(900) relativePath : string ref,
+  int equivClass : int ref);
+
+@duplication_or_similarity = @duplication | @similarity;
+
+tokens(
+  int id : @duplication_or_similarity ref,
+  int offset : int ref,
+  int beginLine : int ref,
+  int beginColumn : int ref,
+  int endLine : int ref,
+  int endColumn : int ref);
+
+/** External data **/
+
+externalData(
+  int id : @externalDataElement,
+  varchar(900) path : string ref,
+  int column: int ref,
+  varchar(900) value : string ref
+);
+
+snapshotDate(unique date snapshotDate : date ref);
+
+sourceLocationPrefix(varchar(900) prefix : string ref);
+
+
+/*
+ * XML Files
+ */
+
+xmlEncoding(
+  unique int id: @file ref,
+  string encoding: string ref
+);
+
+xmlDTDs(
+  unique int id: @xmldtd,
+  string root: string ref,
+  string publicId: string ref,
+  string systemId: string ref,
+  int fileid: @file ref
+);
+
+xmlElements(
+  unique int id: @xmlelement,
+  string name: string ref,
+  int parentid: @xmlparent ref,
+  int idx: int ref,
+  int fileid: @file ref
+);
+
+xmlAttrs(
+  unique int id: @xmlattribute,
+  int elementid: @xmlelement ref,
+  string name: string ref,
+  string value: string ref,
+  int idx: int ref,
+  int fileid: @file ref
+);
+
+xmlNs(
+  int id: @xmlnamespace,
+  string prefixName: string ref,
+  string URI: string ref,
+  int fileid: @file ref
+);
+
+xmlHasNs(
+  int elementId: @xmlnamespaceable ref,
+  int nsId: @xmlnamespace ref,
+  int fileid: @file ref
+);
+
+xmlComments(
+  unique int id: @xmlcomment,
+  string text: string ref,
+  int parentid: @xmlparent ref,
+  int fileid: @file ref
+);
+
+xmlChars(
+  unique int id: @xmlcharacters,
+  string text: string ref,
+  int parentid: @xmlparent ref,
+  int idx: int ref,
+  int isCDATA: int ref,
+  int fileid: @file ref
+);
+
+@xmlparent = @file | @xmlelement;
+@xmlnamespaceable = @xmlelement | @xmlattribute;
+
+xmllocations(
+  int xmlElement: @xmllocatable ref,
+  int location: @location_default ref
+);
+
+@xmllocatable = @xmlcharacters | @xmlelement | @xmlcomment | @xmlattribute | @xmldtd | @file | @xmlnamespace;
+
+compilations(unique int id: @compilation, string cwd: string ref);
+
+#keyset[id, num]
+compilation_args(int id: @compilation ref, int num: int ref, string arg: string ref);
+
+#keyset[id, num, kind]
+compilation_time(int id: @compilation ref, int num: int ref, int kind: int ref, float secs: float ref);
+
+diagnostic_for(unique int diagnostic: @diagnostic ref, int compilation: @compilation ref, int file_number: int ref, int file_number_diagnostic_number: int ref);
+
+compilation_finished(unique int id: @compilation ref, float cpu_seconds: float ref, float elapsed_seconds: float ref);
+
+#keyset[id, num]
+compilation_compiling_files(int id: @compilation ref, int num: int ref, int file: @file ref);
+
+diagnostics(unique int id: @diagnostic, int severity: int ref, string error_tag: string ref, string error_message: string ref,
+            string full_error_message: string ref, int location: @location ref);
+
+locations_default(unique int id: @location_default, int file: @file ref, int beginLine: int ref, int beginColumn: int ref,
+                  int endLine: int ref, int endColumn: int ref);
+
+numlines(int element_id: @sourceline ref, int num_lines: int ref, int num_code: int ref, int num_comment: int ref);
+
+files(unique int id: @file, string name: string ref);
+
+folders(unique int id: @folder, string name: string ref);
+
+containerparent(int parent: @container ref, unique int child: @container ref);
+
+has_location(unique int locatable: @locatable ref, int location: @location ref);
+
+#keyset[parent, idx]
+comment_groups(unique int id: @comment_group, int parent: @file ref, int idx: int ref);
+
+comments(unique int id: @comment, int kind: int ref, int parent: @comment_group ref, int idx: int ref, string text: string ref);
+
+doc_comments(unique int node: @documentable ref, int comment: @comment_group ref);
+
+#keyset[parent, idx]
+exprs(unique int id: @expr, int kind: int ref, int parent: @exprparent ref, int idx: int ref);
+
+literals(unique int expr: @expr ref, string value: string ref, string raw: string ref);
+
+constvalues(unique int expr: @expr ref, string value: string ref, string exact: string ref);
+
+fields(unique int id: @field, int parent: @fieldparent ref, int idx: int ref);
+
+typeparamdecls(unique int id: @typeparamdecl, int parent: @typeparamdeclparent ref, int idx: int ref);
+
+#keyset[parent, idx]
+stmts(unique int id: @stmt, int kind: int ref, int parent: @stmtparent ref, int idx: int ref);
+
+#keyset[parent, idx]
+decls(unique int id: @decl, int kind: int ref, int parent: @declparent ref, int idx: int ref);
+
+#keyset[parent, idx]
+specs(unique int id: @spec, int kind: int ref, int parent: @gendecl ref, int idx: int ref);
+
+scopes(unique int id: @scope, int kind: int ref);
+
+scopenesting(unique int inner: @scope ref, int outer: @scope ref);
+
+scopenodes(unique int node: @scopenode ref, int scope: @localscope ref);
+
+objects(unique int id: @object, int kind: int ref, string name: string ref);
+
+objectscopes(unique int object: @object ref, int scope: @scope ref);
+
+objecttypes(unique int object: @object ref, int tp: @type ref);
+
+methodreceivers(unique int method: @object ref, int receiver: @object ref);
+
+fieldstructs(unique int field: @object ref, int struct: @structtype ref);
+
+methodhosts(int method: @object ref, int host: @namedtype ref);
+
+defs(int ident: @ident ref, int object: @object ref);
+
+uses(int ident: @ident ref, int object: @object ref);
+
+types(unique int id: @type, int kind: int ref);
+
+type_of(unique int expr: @expr ref, int tp: @type ref);
+
+typename(unique int tp: @type ref, string name: string ref);
+
+key_type(unique int map: @maptype ref, int tp: @type ref);
+
+element_type(unique int container: @containertype ref, int tp: @type ref);
+
+base_type(unique int ptr: @pointertype ref, int tp: @type ref);
+
+underlying_type(unique int named: @namedtype ref, int tp: @type ref);
+
+#keyset[parent, index]
+component_types(int parent: @compositetype ref, int index: int ref, string name: string ref, int tp: @type ref);
+
+array_length(unique int tp: @arraytype ref, string len: string ref);
+
+type_objects(unique int tp: @type ref, int object: @object ref);
+
+packages(unique int id: @package, string name: string ref, string path: string ref, int scope: @packagescope ref);
+
+#keyset[parent, idx]
+modexprs(unique int id: @modexpr, int kind: int ref, int parent: @modexprparent ref, int idx: int ref);
+
+#keyset[parent, idx]
+modtokens(string token: string ref, int parent: @modexpr ref, int idx: int ref);
+
+#keyset[package, idx]
+errors(unique int id: @error, int kind: int ref, string msg: string ref, string rawpos: string ref,
+       string file: string ref, int line: int ref, int col: int ref, int package: @package ref, int idx: int ref);
+
+has_ellipsis(int id: @callorconversionexpr ref);
+
+variadic(int id: @signaturetype ref);
+
+#keyset[parent, idx]
+typeparam(unique int tp: @typeparamtype ref, string name: string ref, int bound: @compositetype ref,
+          int parent: @typeparamparentobject ref, int idx: int ref);
+
+@container = @file | @folder;
+
+@locatable = @xmllocatable | @node | @localscope;
+
+@node = @documentable | @exprparent | @modexprparent | @fieldparent | @stmtparent | @declparent | @typeparamdeclparent
+      | @scopenode | @comment_group | @comment;
+
+@documentable = @file | @field | @typeparamdecl | @spec | @gendecl | @funcdecl | @modexpr;
+
+@exprparent = @funcdef | @file | @expr | @field | @stmt | @decl | @typeparamdecl | @spec;
+
+@modexprparent = @file | @modexpr;
+
+@fieldparent = @decl | @structtypeexpr | @functypeexpr | @interfacetypeexpr;
+
+@stmtparent = @funcdef | @stmt | @decl;
+
+@declparent = @file | @declstmt;
+
+@typeparamdeclparent = @funcdecl | @typespec;
+
+@funcdef = @funclit | @funcdecl;
+
+@scopenode = @file | @functypeexpr | @blockstmt | @ifstmt | @caseclause | @switchstmt | @commclause | @loopstmt;
+
+@location = @location_default;
+
+@sourceline = @locatable;
+
+case @comment.kind of
+  0 = @slashslashcomment
+| 1 = @slashstarcomment;
+
+case @expr.kind of
+  0 = @badexpr
+| 1 = @ident
+| 2 = @ellipsis
+| 3 = @intlit
+| 4 = @floatlit
+| 5 = @imaglit
+| 6 = @charlit
+| 7 = @stringlit
+| 8 = @funclit
+| 9 = @compositelit
+| 10 = @parenexpr
+| 11 = @selectorexpr
+| 12 = @indexexpr
+| 13 = @genericfunctioninstantiationexpr
+| 14 = @generictypeinstantiationexpr
+| 15 = @sliceexpr
+| 16 = @typeassertexpr
+| 17 = @callorconversionexpr
+| 18 = @starexpr
+| 19 = @keyvalueexpr
+| 20 = @arraytypeexpr
+| 21 = @structtypeexpr
+| 22 = @functypeexpr
+| 23 = @interfacetypeexpr
+| 24 = @maptypeexpr
+| 25 = @typesetliteralexpr
+| 26 = @plusexpr
+| 27 = @minusexpr
+| 28 = @notexpr
+| 29 = @complementexpr
+| 30 = @derefexpr
+| 31 = @addressexpr
+| 32 = @arrowexpr
+| 33 = @lorexpr
+| 34 = @landexpr
+| 35 = @eqlexpr
+| 36 = @neqexpr
+| 37 = @lssexpr
+| 38 = @leqexpr
+| 39 = @gtrexpr
+| 40 = @geqexpr
+| 41 = @addexpr
+| 42 = @subexpr
+| 43 = @orexpr
+| 44 = @xorexpr
+| 45 = @mulexpr
+| 46 = @quoexpr
+| 47 = @remexpr
+| 48 = @shlexpr
+| 49 = @shrexpr
+| 50 = @andexpr
+| 51 = @andnotexpr
+| 52 = @sendchantypeexpr
+| 53 = @recvchantypeexpr
+| 54 = @sendrcvchantypeexpr;
+
+@basiclit = @intlit | @floatlit | @imaglit | @charlit | @stringlit;
+
+@operatorexpr = @logicalexpr | @arithmeticexpr | @bitwiseexpr | @unaryexpr | @binaryexpr;
+
+@logicalexpr = @logicalunaryexpr | @logicalbinaryexpr;
+
+@arithmeticexpr = @arithmeticunaryexpr | @arithmeticbinaryexpr;
+
+@bitwiseexpr = @bitwiseunaryexpr | @bitwisebinaryexpr;
+
+@unaryexpr = @logicalunaryexpr | @bitwiseunaryexpr | @arithmeticunaryexpr | @derefexpr | @addressexpr | @arrowexpr;
+
+@logicalunaryexpr = @notexpr;
+
+@bitwiseunaryexpr = @complementexpr;
+
+@arithmeticunaryexpr = @plusexpr | @minusexpr;
+
+@binaryexpr = @logicalbinaryexpr | @bitwisebinaryexpr | @arithmeticbinaryexpr | @comparison;
+
+@logicalbinaryexpr = @lorexpr | @landexpr;
+
+@bitwisebinaryexpr = @shiftexpr | @orexpr | @xorexpr | @andexpr | @andnotexpr;
+
+@arithmeticbinaryexpr = @addexpr | @subexpr | @mulexpr | @quoexpr | @remexpr;
+
+@shiftexpr = @shlexpr | @shrexpr;
+
+@comparison = @equalitytest | @relationalcomparison;
+
+@equalitytest = @eqlexpr | @neqexpr;
+
+@relationalcomparison = @lssexpr | @leqexpr | @gtrexpr | @geqexpr;
+
+@chantypeexpr = @sendchantypeexpr | @recvchantypeexpr | @sendrcvchantypeexpr;
+
+case @stmt.kind of
+  0 = @badstmt
+| 1 = @declstmt
+| 2 = @emptystmt
+| 3 = @labeledstmt
+| 4 = @exprstmt
+| 5 = @sendstmt
+| 6 = @incstmt
+| 7 = @decstmt
+| 8 = @gostmt
+| 9 = @deferstmt
+| 10 = @returnstmt
+| 11 = @breakstmt
+| 12 = @continuestmt
+| 13 = @gotostmt
+| 14 = @fallthroughstmt
+| 15 = @blockstmt
+| 16 = @ifstmt
+| 17 = @caseclause
+| 18 = @exprswitchstmt
+| 19 = @typeswitchstmt
+| 20 = @commclause
+| 21 = @selectstmt
+| 22 = @forstmt
+| 23 = @rangestmt
+| 24 = @assignstmt
+| 25 = @definestmt
+| 26 = @addassignstmt
+| 27 = @subassignstmt
+| 28 = @mulassignstmt
+| 29 = @quoassignstmt
+| 30 = @remassignstmt
+| 31 = @andassignstmt
+| 32 = @orassignstmt
+| 33 = @xorassignstmt
+| 34 = @shlassignstmt
+| 35 = @shrassignstmt
+| 36 = @andnotassignstmt;
+
+@incdecstmt = @incstmt | @decstmt;
+
+@assignment = @simpleassignstmt | @compoundassignstmt;
+
+@simpleassignstmt = @assignstmt | @definestmt;
+
+@compoundassignstmt = @addassignstmt | @subassignstmt | @mulassignstmt | @quoassignstmt | @remassignstmt
+                    | @andassignstmt | @orassignstmt | @xorassignstmt | @shlassignstmt | @shrassignstmt | @andnotassignstmt;
+
+@branchstmt = @breakstmt | @continuestmt | @gotostmt | @fallthroughstmt;
+
+@switchstmt = @exprswitchstmt | @typeswitchstmt;
+
+@loopstmt = @forstmt | @rangestmt;
+
+case @decl.kind of
+  0 = @baddecl
+| 1 = @importdecl
+| 2 = @constdecl
+| 3 = @typedecl
+| 4 = @vardecl
+| 5 = @funcdecl;
+
+@gendecl = @importdecl | @constdecl | @typedecl | @vardecl;
+
+case @spec.kind of
+  0 = @importspec
+| 1 = @valuespec
+| 2 = @typedefspec
+| 3 = @aliasspec;
+
+@typespec = @typedefspec | @aliasspec;
+
+case @object.kind of
+  0 = @pkgobject
+| 1 = @decltypeobject
+| 2 = @builtintypeobject
+| 3 = @declconstobject
+| 4 = @builtinconstobject
+| 5 = @declvarobject
+| 6 = @declfunctionobject
+| 7 = @builtinfunctionobject
+| 8 = @labelobject;
+
+@typeparamparentobject = @decltypeobject | @declfunctionobject;
+
+@declobject = @decltypeobject | @declconstobject | @declvarobject | @declfunctionobject;
+
+@builtinobject = @builtintypeobject | @builtinconstobject | @builtinfunctionobject;
+
+@typeobject = @decltypeobject | @builtintypeobject;
+
+@valueobject = @constobject | @varobject | @functionobject;
+
+@constobject = @declconstobject | @builtinconstobject;
+
+@varobject = @declvarobject;
+
+@functionobject = @declfunctionobject | @builtinfunctionobject;
+
+case @scope.kind of
+  0 = @universescope
+| 1 = @packagescope
+| 2 = @localscope;
+
+case @type.kind of
+  0 = @invalidtype
+| 1 = @boolexprtype
+| 2 = @inttype
+| 3 = @int8type
+| 4 = @int16type
+| 5 = @int32type
+| 6 = @int64type
+| 7 = @uinttype
+| 8 = @uint8type
+| 9 = @uint16type
+| 10 = @uint32type
+| 11 = @uint64type
+| 12 = @uintptrtype
+| 13 = @float32type
+| 14 = @float64type
+| 15 = @complex64type
+| 16 = @complex128type
+| 17 = @stringexprtype
+| 18 = @unsafepointertype
+| 19 = @boolliteraltype
+| 20 = @intliteraltype
+| 21 = @runeliteraltype
+| 22 = @floatliteraltype
+| 23 = @complexliteraltype
+| 24 = @stringliteraltype
+| 25 = @nilliteraltype
+| 26 = @typeparamtype
+| 27 = @arraytype
+| 28 = @slicetype
+| 29 = @structtype
+| 30 = @pointertype
+| 31 = @interfacetype
+| 32 = @tupletype
+| 33 = @signaturetype
+| 34 = @maptype
+| 35 = @sendchantype
+| 36 = @recvchantype
+| 37 = @sendrcvchantype
+| 38 = @namedtype
+| 39 = @typesetliteraltype;
+
+@basictype = @booltype | @numerictype | @stringtype | @literaltype | @invalidtype | @unsafepointertype;
+
+@booltype = @boolexprtype | @boolliteraltype;
+
+@numerictype = @integertype | @floattype | @complextype;
+
+@integertype = @signedintegertype | @unsignedintegertype;
+
+@signedintegertype = @inttype | @int8type | @int16type | @int32type | @int64type | @intliteraltype | @runeliteraltype;
+
+@unsignedintegertype = @uinttype | @uint8type | @uint16type | @uint32type | @uint64type | @uintptrtype;
+
+@floattype = @float32type | @float64type | @floatliteraltype;
+
+@complextype = @complex64type | @complex128type | @complexliteraltype;
+
+@stringtype = @stringexprtype | @stringliteraltype;
+
+@literaltype = @boolliteraltype | @intliteraltype | @runeliteraltype | @floatliteraltype | @complexliteraltype
+             | @stringliteraltype | @nilliteraltype;
+
+@compositetype = @typeparamtype | @containertype | @structtype | @pointertype | @interfacetype | @tupletype
+               | @signaturetype | @namedtype | @typesetliteraltype;
+
+@containertype = @arraytype | @slicetype | @maptype | @chantype;
+
+@chantype = @sendchantype | @recvchantype | @sendrcvchantype;
+
+case @modexpr.kind of
+  0 = @modcommentblock
+| 1 = @modline
+| 2 = @modlineblock
+| 3 = @modlparen
+| 4 = @modrparen;
+
+case @error.kind of
+  0 = @unknownerror
+| 1 = @listerror
+| 2 = @parseerror
+| 3 = @typeerror;
+
diff --git a/go/ql/lib/upgrades/a58b81b1b4c4cccc8ca11731c1db86622f33af57/upgrade.properties b/go/ql/lib/upgrades/a58b81b1b4c4cccc8ca11731c1db86622f33af57/upgrade.properties
new file mode 100644
index 000000000000..5eacd9417fc7
--- /dev/null
+++ b/go/ql/lib/upgrades/a58b81b1b4c4cccc8ca11731c1db86622f33af57/upgrade.properties
@@ -0,0 +1,3 @@
+description: Add tables for struct tags and interface method IDs
+compatibility: full
+component_tags.rel: run component_tags.qlo
diff --git a/go/ql/test/library-tests/semmle/go/Types/Field_getPackage.expected b/go/ql/test/library-tests/semmle/go/Types/Field_getPackage.expected
index 758199c63523..50bd36a2174e 100644
--- a/go/ql/test/library-tests/semmle/go/Types/Field_getPackage.expected
+++ b/go/ql/test/library-tests/semmle/go/Types/Field_getPackage.expected
@@ -46,3 +46,7 @@
 | pkg1/tst.go:30:2:30:5 | flag | package github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg1 |
 | pkg2/tst.go:4:2:4:2 | g | package github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg2 |
 | pkg2/tst.go:8:2:8:2 | g | package github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg2 |
+| struct_tags.go:4:3:4:8 | field1 | package github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types |
+| struct_tags.go:5:3:5:8 | field2 | package github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types |
+| struct_tags.go:9:3:9:8 | field1 | package github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types |
+| struct_tags.go:10:3:10:8 | field2 | package github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types |
diff --git a/go/ql/test/library-tests/semmle/go/Types/Field_hasQualifiedName2.expected b/go/ql/test/library-tests/semmle/go/Types/Field_hasQualifiedName2.expected
index 4c69f36880be..bfdde9bb82d0 100644
--- a/go/ql/test/library-tests/semmle/go/Types/Field_hasQualifiedName2.expected
+++ b/go/ql/test/library-tests/semmle/go/Types/Field_hasQualifiedName2.expected
@@ -64,3 +64,7 @@
 | pkg2/tst.go:4:2:4:2 | g | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg2.T | g |
 | pkg2/tst.go:8:2:8:2 | g | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg2.G | g |
 | pkg2/tst.go:8:2:8:2 | g | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg2.T | g |
+| struct_tags.go:4:3:4:8 | field1 | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types.S1 | field1 |
+| struct_tags.go:5:3:5:8 | field2 | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types.S1 | field2 |
+| struct_tags.go:9:3:9:8 | field1 | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types.S2 | field1 |
+| struct_tags.go:10:3:10:8 | field2 | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types.S2 | field2 |
diff --git a/go/ql/test/library-tests/semmle/go/Types/Field_hasQualifiedName3.expected b/go/ql/test/library-tests/semmle/go/Types/Field_hasQualifiedName3.expected
index 4fe8aee19f4c..559bce80b73c 100644
--- a/go/ql/test/library-tests/semmle/go/Types/Field_hasQualifiedName3.expected
+++ b/go/ql/test/library-tests/semmle/go/Types/Field_hasQualifiedName3.expected
@@ -64,3 +64,7 @@
 | pkg2/tst.go:4:2:4:2 | g | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg2 | T | g |
 | pkg2/tst.go:8:2:8:2 | g | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg2 | G | g |
 | pkg2/tst.go:8:2:8:2 | g | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg2 | T | g |
+| struct_tags.go:4:3:4:8 | field1 | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types | S1 | field1 |
+| struct_tags.go:5:3:5:8 | field2 | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types | S1 | field2 |
+| struct_tags.go:9:3:9:8 | field1 | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types | S2 | field1 |
+| struct_tags.go:10:3:10:8 | field2 | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types | S2 | field2 |
diff --git a/go/ql/test/library-tests/semmle/go/Types/InterfaceIds.expected b/go/ql/test/library-tests/semmle/go/Types/InterfaceIds.expected
new file mode 100644
index 000000000000..13f82aca2839
--- /dev/null
+++ b/go/ql/test/library-tests/semmle/go/Types/InterfaceIds.expected
@@ -0,0 +1,2 @@
+| interface { Exported func() ; notExported func()  } | func()  | Exported |
+| interface { Exported func() ; notExported func()  } | func()  | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg1.notExported |
diff --git a/go/ql/test/library-tests/semmle/go/Types/InterfaceIds.ql b/go/ql/test/library-tests/semmle/go/Types/InterfaceIds.ql
new file mode 100644
index 000000000000..b36e807aa3c3
--- /dev/null
+++ b/go/ql/test/library-tests/semmle/go/Types/InterfaceIds.ql
@@ -0,0 +1,6 @@
+import go
+
+from NamedType nt, InterfaceType it, Type methodType, string id
+where nt.getName() = "MixedExportedAndNot" and it = nt.getUnderlyingType()
+and methodType = it.getMethodTypeById(id)
+select it.pp(), methodType.pp(), id
diff --git a/go/ql/test/library-tests/semmle/go/Types/MethodCount.expected b/go/ql/test/library-tests/semmle/go/Types/MethodCount.expected
index 2b6dc32cada9..a91da6a8e90c 100644
--- a/go/ql/test/library-tests/semmle/go/Types/MethodCount.expected
+++ b/go/ql/test/library-tests/semmle/go/Types/MethodCount.expected
@@ -14,6 +14,7 @@
 | C | 2 |
 | Foo | 1 |
 | GenericInterface | 1 |
+| MixedExportedAndNot | 2 |
 | MyInterface | 17 |
 | T | 1 |
 | T3 | 1 |
diff --git a/go/ql/test/library-tests/semmle/go/Types/MethodTypes.expected b/go/ql/test/library-tests/semmle/go/Types/MethodTypes.expected
index da2e9c1eb308..50f66d1c4128 100644
--- a/go/ql/test/library-tests/semmle/go/Types/MethodTypes.expected
+++ b/go/ql/test/library-tests/semmle/go/Types/MethodTypes.expected
@@ -48,6 +48,8 @@
 | pkg1/interfaces.go:26:6:26:14 | AExtended | m | func()  |
 | pkg1/interfaces.go:26:6:26:14 | AExtended | n | func()  |
 | pkg1/interfaces.go:31:6:31:7 | A2 | m | func()  |
+| pkg1/interfaces.go:35:6:35:24 | MixedExportedAndNot | Exported | func()  |
+| pkg1/interfaces.go:35:6:35:24 | MixedExportedAndNot | notExported | func()  |
 | pkg1/tst.go:3:6:3:6 | T | half | func() Foo |
 | pkg1/tst.go:14:6:14:7 | T3 | half | func() Foo |
 | pkg1/tst.go:19:6:19:7 | T4 | half | func() Foo |
diff --git a/go/ql/test/library-tests/semmle/go/Types/Method_hasQualifiedName2.expected b/go/ql/test/library-tests/semmle/go/Types/Method_hasQualifiedName2.expected
index bf1bd76aa338..94b3a0759152 100644
--- a/go/ql/test/library-tests/semmle/go/Types/Method_hasQualifiedName2.expected
+++ b/go/ql/test/library-tests/semmle/go/Types/Method_hasQualifiedName2.expected
@@ -53,6 +53,8 @@
 | pkg1/interfaces.go:14:2:14:2 | o | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg1.C | o |
 | pkg1/interfaces.go:28:2:28:2 | n | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg1.AExtended | n |
 | pkg1/interfaces.go:32:2:32:2 | m | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg1.A2 | m |
+| pkg1/interfaces.go:36:2:36:9 | Exported | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg1.MixedExportedAndNot | Exported |
+| pkg1/interfaces.go:37:2:37:12 | notExported | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg1.MixedExportedAndNot | notExported |
 | pkg1/tst.go:33:16:33:19 | half | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg1.Foo | half |
 | pkg1/tst.go:33:16:33:19 | half | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg1.T | half |
 | pkg1/tst.go:33:16:33:19 | half | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg1.T3 | half |
diff --git a/go/ql/test/library-tests/semmle/go/Types/Method_hasQualifiedName3.expected b/go/ql/test/library-tests/semmle/go/Types/Method_hasQualifiedName3.expected
index 24eac7cebc14..7a625f1ac93c 100644
--- a/go/ql/test/library-tests/semmle/go/Types/Method_hasQualifiedName3.expected
+++ b/go/ql/test/library-tests/semmle/go/Types/Method_hasQualifiedName3.expected
@@ -53,6 +53,8 @@
 | pkg1/interfaces.go:14:2:14:2 | o | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg1 | C | o |
 | pkg1/interfaces.go:28:2:28:2 | n | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg1 | AExtended | n |
 | pkg1/interfaces.go:32:2:32:2 | m | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg1 | A2 | m |
+| pkg1/interfaces.go:36:2:36:9 | Exported | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg1 | MixedExportedAndNot | Exported |
+| pkg1/interfaces.go:37:2:37:12 | notExported | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg1 | MixedExportedAndNot | notExported |
 | pkg1/tst.go:33:16:33:19 | half | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg1 | Foo | half |
 | pkg1/tst.go:33:16:33:19 | half | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg1 | T | half |
 | pkg1/tst.go:33:16:33:19 | half | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg1 | T3 | half |
diff --git a/go/ql/test/library-tests/semmle/go/Types/Methods.expected b/go/ql/test/library-tests/semmle/go/Types/Methods.expected
index 8b2406ec8589..ac32d41d9ea9 100644
--- a/go/ql/test/library-tests/semmle/go/Types/Methods.expected
+++ b/go/ql/test/library-tests/semmle/go/Types/Methods.expected
@@ -24,6 +24,8 @@
 | C | o | pkg1/interfaces.go:14:2:14:2 | o |
 | Foo | half | pkg1/tst.go:33:16:33:19 | half |
 | GenericInterface | GetT | generic.go:33:2:33:5 | GetT |
+| MixedExportedAndNot | Exported | pkg1/interfaces.go:36:2:36:9 | Exported |
+| MixedExportedAndNot | notExported | pkg1/interfaces.go:37:2:37:12 | notExported |
 | MyInterface | clone | generic.go:48:2:48:6 | clone |
 | MyInterface | dummy1 | generic.go:49:2:49:7 | dummy1 |
 | MyInterface | dummy2 | generic.go:50:2:50:7 | dummy2 |
diff --git a/go/ql/test/library-tests/semmle/go/Types/QualifiedNames.expected b/go/ql/test/library-tests/semmle/go/Types/QualifiedNames.expected
index bedfbc5fa00a..b2befe28a2d1 100644
--- a/go/ql/test/library-tests/semmle/go/Types/QualifiedNames.expected
+++ b/go/ql/test/library-tests/semmle/go/Types/QualifiedNames.expected
@@ -90,6 +90,7 @@
 | pkg1/interfaces.go:21:6:21:7 | AC | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg1.AC |
 | pkg1/interfaces.go:26:6:26:14 | AExtended | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg1.AExtended |
 | pkg1/interfaces.go:31:6:31:7 | A2 | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg1.A2 |
+| pkg1/interfaces.go:35:6:35:24 | MixedExportedAndNot | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg1.MixedExportedAndNot |
 | pkg1/tst.go:3:6:3:6 | T | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg1.T |
 | pkg1/tst.go:9:6:9:7 | T2 | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg1.T2 |
 | pkg1/tst.go:14:6:14:7 | T3 | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg1.T3 |
@@ -98,3 +99,6 @@
 | pkg1/tst.go:29:6:29:8 | Bar | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg1.Bar |
 | pkg2/tst.go:3:6:3:6 | T | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg2.T |
 | pkg2/tst.go:7:6:7:6 | G | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg2.G |
+| pkg2/tst.go:11:6:11:24 | MixedExportedAndNot | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg2.MixedExportedAndNot |
+| struct_tags.go:3:6:3:7 | S1 | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types.S1 |
+| struct_tags.go:8:6:8:7 | S2 | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types.S2 |
diff --git a/go/ql/test/library-tests/semmle/go/Types/StructFields.expected b/go/ql/test/library-tests/semmle/go/Types/StructFields.expected
index 5bce8e1d7df1..a8194965721e 100644
--- a/go/ql/test/library-tests/semmle/go/Types/StructFields.expected
+++ b/go/ql/test/library-tests/semmle/go/Types/StructFields.expected
@@ -66,3 +66,7 @@
 | pkg2/tst.go:3:6:3:6 | T | pkg2/tst.go:7:8:9:1 | struct type | g | int |
 | pkg2/tst.go:7:6:7:6 | G | pkg2/tst.go:3:8:5:1 | struct type | g | int |
 | pkg2/tst.go:7:6:7:6 | G | pkg2/tst.go:7:8:9:1 | struct type | g | int |
+| struct_tags.go:3:6:3:7 | S1 | struct_tags.go:3:9:6:1 | struct type | field1 | int |
+| struct_tags.go:3:6:3:7 | S1 | struct_tags.go:3:9:6:1 | struct type | field2 | int |
+| struct_tags.go:8:6:8:7 | S2 | struct_tags.go:8:9:11:1 | struct type | field1 | int |
+| struct_tags.go:8:6:8:7 | S2 | struct_tags.go:8:9:11:1 | struct type | field2 | int |
diff --git a/go/ql/test/library-tests/semmle/go/Types/Types.expected b/go/ql/test/library-tests/semmle/go/Types/Types.expected
index 3801769db02d..19cfb7bd4f2e 100644
--- a/go/ql/test/library-tests/semmle/go/Types/Types.expected
+++ b/go/ql/test/library-tests/semmle/go/Types/Types.expected
@@ -90,6 +90,7 @@
 | pkg1/interfaces.go:21:6:21:7 | AC | AC |
 | pkg1/interfaces.go:26:6:26:14 | AExtended | AExtended |
 | pkg1/interfaces.go:31:6:31:7 | A2 | A2 |
+| pkg1/interfaces.go:35:6:35:24 | MixedExportedAndNot | MixedExportedAndNot |
 | pkg1/tst.go:3:6:3:6 | T | T |
 | pkg1/tst.go:9:6:9:7 | T2 | T2 |
 | pkg1/tst.go:14:6:14:7 | T3 | T3 |
@@ -98,3 +99,6 @@
 | pkg1/tst.go:29:6:29:8 | Bar | Bar |
 | pkg2/tst.go:3:6:3:6 | T | T |
 | pkg2/tst.go:7:6:7:6 | G | G |
+| pkg2/tst.go:11:6:11:24 | MixedExportedAndNot | MixedExportedAndNot |
+| struct_tags.go:3:6:3:7 | S1 | S1 |
+| struct_tags.go:8:6:8:7 | S2 | S2 |
diff --git a/go/ql/test/library-tests/semmle/go/Types/pkg1/interfaces.go b/go/ql/test/library-tests/semmle/go/Types/pkg1/interfaces.go
index caeb62ea40ca..81a5e5854072 100644
--- a/go/ql/test/library-tests/semmle/go/Types/pkg1/interfaces.go
+++ b/go/ql/test/library-tests/semmle/go/Types/pkg1/interfaces.go
@@ -31,3 +31,8 @@ type AExtended interface {
 type A2 interface {
 	m()
 }
+
+type MixedExportedAndNot interface {
+	Exported()
+	notExported()
+}
diff --git a/go/ql/test/library-tests/semmle/go/Types/pkg2/tst.go b/go/ql/test/library-tests/semmle/go/Types/pkg2/tst.go
index 7f6f7f2d2877..bb4139c3b5a6 100644
--- a/go/ql/test/library-tests/semmle/go/Types/pkg2/tst.go
+++ b/go/ql/test/library-tests/semmle/go/Types/pkg2/tst.go
@@ -7,3 +7,8 @@ type T struct {
 type G struct {
 	g int
 }
+
+type MixedExportedAndNot {
+        Exported()
+        notExported()
+}
diff --git a/go/ql/test/library-tests/semmle/go/Types/struct_tags.expected b/go/ql/test/library-tests/semmle/go/Types/struct_tags.expected
new file mode 100644
index 000000000000..d0668076d5fe
--- /dev/null
+++ b/go/ql/test/library-tests/semmle/go/Types/struct_tags.expected
@@ -0,0 +1,4 @@
+| struct { field1 int `tag1a`; field2 int `tag2a` } | struct_tags.go:4:3:4:8 | field1 | tag1a |
+| struct { field1 int `tag1a`; field2 int `tag2a` } | struct_tags.go:5:3:5:8 | field2 | tag2a |
+| struct { field1 int `tag1b`; field2 int `tag2b` } | struct_tags.go:9:3:9:8 | field1 | tag1b |
+| struct { field1 int `tag1b`; field2 int `tag2b` } | struct_tags.go:10:3:10:8 | field2 | tag2b |
diff --git a/go/ql/test/library-tests/semmle/go/Types/struct_tags.go b/go/ql/test/library-tests/semmle/go/Types/struct_tags.go
new file mode 100644
index 000000000000..ae3efaf8dcbf
--- /dev/null
+++ b/go/ql/test/library-tests/semmle/go/Types/struct_tags.go
@@ -0,0 +1,11 @@
+package main
+
+type S1 struct {
+  field1 int `tag1a`
+  field2 int `tag2a`
+}
+
+type S2 struct {
+  field1 int `tag1b`
+  field2 int `tag2b`
+}
diff --git a/go/ql/test/library-tests/semmle/go/Types/struct_tags.ql b/go/ql/test/library-tests/semmle/go/Types/struct_tags.ql
new file mode 100644
index 000000000000..4eb120e9f03a
--- /dev/null
+++ b/go/ql/test/library-tests/semmle/go/Types/struct_tags.ql
@@ -0,0 +1,6 @@
+import go
+
+from StructType s, Field f, string tag
+where f = s.getOwnField(_, _) and tag = f.getTag()
+and tag != ""
+select s.pp(), f, tag

From 9bb2a4bfcea5acffdd3bb966540044add5d3abd3 Mon Sep 17 00:00:00 2001
From: Chris Smowton <chris@smowton.net>
Date: Tue, 3 Sep 2024 12:17:51 +0100
Subject: [PATCH 210/347] Change note

---
 go/ql/lib/change-notes/2024-09-03-tags-and-interface-ids.md | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 go/ql/lib/change-notes/2024-09-03-tags-and-interface-ids.md

diff --git a/go/ql/lib/change-notes/2024-09-03-tags-and-interface-ids.md b/go/ql/lib/change-notes/2024-09-03-tags-and-interface-ids.md
new file mode 100644
index 000000000000..2baa8cd6da2c
--- /dev/null
+++ b/go/ql/lib/change-notes/2024-09-03-tags-and-interface-ids.md
@@ -0,0 +1,5 @@
+---
+category: minorAnalysis
+---
+* Added methods `StructTag.hasOwnFieldWithTag` and `Field.getTag`, which enable CodeQL queries to examine struct field tags.
+* Added method `InterfaceType.getMethodTypeById`, which enables CodeQL queries to distinguish interfaces with matching non-exported method names that are declared in different packages, and are therefore incompatible.

From 22ed2f9ae38804f92f9acf9aa393d08ac4cd5cbc Mon Sep 17 00:00:00 2001
From: Chris Smowton <chris@smowton.net>
Date: Tue, 3 Sep 2024 12:27:12 +0100
Subject: [PATCH 211/347] Autoformat CodeQL

---
 go/ql/lib/semmle/go/Scopes.qll                           | 4 +---
 go/ql/test/library-tests/semmle/go/Types/InterfaceIds.ql | 6 ++++--
 go/ql/test/library-tests/semmle/go/Types/struct_tags.ql  | 6 ++++--
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/go/ql/lib/semmle/go/Scopes.qll b/go/ql/lib/semmle/go/Scopes.qll
index 32213d1efca3..82785b00cdc6 100644
--- a/go/ql/lib/semmle/go/Scopes.qll
+++ b/go/ql/lib/semmle/go/Scopes.qll
@@ -389,9 +389,7 @@ class Field extends Variable {
   /**
    * Gets the tag associated with this field, or the empty string if this field has no tag.
    */
-  string getTag() {
-    declaringType.hasOwnFieldWithTag(_, this.getName(), this.getType(), _, result)
-  }
+  string getTag() { declaringType.hasOwnFieldWithTag(_, this.getName(), this.getType(), _, result) }
 }
 
 /**
diff --git a/go/ql/test/library-tests/semmle/go/Types/InterfaceIds.ql b/go/ql/test/library-tests/semmle/go/Types/InterfaceIds.ql
index b36e807aa3c3..5b04b068e6ba 100644
--- a/go/ql/test/library-tests/semmle/go/Types/InterfaceIds.ql
+++ b/go/ql/test/library-tests/semmle/go/Types/InterfaceIds.ql
@@ -1,6 +1,8 @@
 import go
 
 from NamedType nt, InterfaceType it, Type methodType, string id
-where nt.getName() = "MixedExportedAndNot" and it = nt.getUnderlyingType()
-and methodType = it.getMethodTypeById(id)
+where
+  nt.getName() = "MixedExportedAndNot" and
+  it = nt.getUnderlyingType() and
+  methodType = it.getMethodTypeById(id)
 select it.pp(), methodType.pp(), id
diff --git a/go/ql/test/library-tests/semmle/go/Types/struct_tags.ql b/go/ql/test/library-tests/semmle/go/Types/struct_tags.ql
index 4eb120e9f03a..05ce098aed4b 100644
--- a/go/ql/test/library-tests/semmle/go/Types/struct_tags.ql
+++ b/go/ql/test/library-tests/semmle/go/Types/struct_tags.ql
@@ -1,6 +1,8 @@
 import go
 
 from StructType s, Field f, string tag
-where f = s.getOwnField(_, _) and tag = f.getTag()
-and tag != ""
+where
+  f = s.getOwnField(_, _) and
+  tag = f.getTag() and
+  tag != ""
 select s.pp(), f, tag

From 5d14070cd4f89919839bc9452f04f92ae217417d Mon Sep 17 00:00:00 2001
From: Chris Smowton <chris@smowton.net>
Date: Tue, 3 Sep 2024 12:44:33 +0100
Subject: [PATCH 212/347] Fix test file

---
 go/ql/test/library-tests/semmle/go/Types/InterfaceIds.expected  | 1 +
 go/ql/test/library-tests/semmle/go/Types/MethodTypes.expected   | 2 ++
 .../semmle/go/Types/Method_hasQualifiedName2.expected           | 2 ++
 .../semmle/go/Types/Method_hasQualifiedName3.expected           | 2 ++
 go/ql/test/library-tests/semmle/go/Types/Methods.expected       | 2 ++
 go/ql/test/library-tests/semmle/go/Types/pkg2/tst.go            | 2 +-
 6 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/go/ql/test/library-tests/semmle/go/Types/InterfaceIds.expected b/go/ql/test/library-tests/semmle/go/Types/InterfaceIds.expected
index 13f82aca2839..9bcfcde1db96 100644
--- a/go/ql/test/library-tests/semmle/go/Types/InterfaceIds.expected
+++ b/go/ql/test/library-tests/semmle/go/Types/InterfaceIds.expected
@@ -1,2 +1,3 @@
 | interface { Exported func() ; notExported func()  } | func()  | Exported |
 | interface { Exported func() ; notExported func()  } | func()  | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg1.notExported |
+| interface { Exported func() ; notExported func()  } | func()  | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg2.notExported |
diff --git a/go/ql/test/library-tests/semmle/go/Types/MethodTypes.expected b/go/ql/test/library-tests/semmle/go/Types/MethodTypes.expected
index 50f66d1c4128..695f2cb7e906 100644
--- a/go/ql/test/library-tests/semmle/go/Types/MethodTypes.expected
+++ b/go/ql/test/library-tests/semmle/go/Types/MethodTypes.expected
@@ -53,3 +53,5 @@
 | pkg1/tst.go:3:6:3:6 | T | half | func() Foo |
 | pkg1/tst.go:14:6:14:7 | T3 | half | func() Foo |
 | pkg1/tst.go:19:6:19:7 | T4 | half | func() Foo |
+| pkg2/tst.go:11:6:11:24 | MixedExportedAndNot | Exported | func()  |
+| pkg2/tst.go:11:6:11:24 | MixedExportedAndNot | notExported | func()  |
diff --git a/go/ql/test/library-tests/semmle/go/Types/Method_hasQualifiedName2.expected b/go/ql/test/library-tests/semmle/go/Types/Method_hasQualifiedName2.expected
index 94b3a0759152..41b744e78e7f 100644
--- a/go/ql/test/library-tests/semmle/go/Types/Method_hasQualifiedName2.expected
+++ b/go/ql/test/library-tests/semmle/go/Types/Method_hasQualifiedName2.expected
@@ -59,3 +59,5 @@
 | pkg1/tst.go:33:16:33:19 | half | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg1.T | half |
 | pkg1/tst.go:33:16:33:19 | half | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg1.T3 | half |
 | pkg1/tst.go:33:16:33:19 | half | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg1.T4 | half |
+| pkg2/tst.go:12:9:12:16 | Exported | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg2.MixedExportedAndNot | Exported |
+| pkg2/tst.go:13:9:13:19 | notExported | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg2.MixedExportedAndNot | notExported |
diff --git a/go/ql/test/library-tests/semmle/go/Types/Method_hasQualifiedName3.expected b/go/ql/test/library-tests/semmle/go/Types/Method_hasQualifiedName3.expected
index 7a625f1ac93c..c0aa74196854 100644
--- a/go/ql/test/library-tests/semmle/go/Types/Method_hasQualifiedName3.expected
+++ b/go/ql/test/library-tests/semmle/go/Types/Method_hasQualifiedName3.expected
@@ -59,3 +59,5 @@
 | pkg1/tst.go:33:16:33:19 | half | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg1 | T | half |
 | pkg1/tst.go:33:16:33:19 | half | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg1 | T3 | half |
 | pkg1/tst.go:33:16:33:19 | half | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg1 | T4 | half |
+| pkg2/tst.go:12:9:12:16 | Exported | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg2 | MixedExportedAndNot | Exported |
+| pkg2/tst.go:13:9:13:19 | notExported | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg2 | MixedExportedAndNot | notExported |
diff --git a/go/ql/test/library-tests/semmle/go/Types/Methods.expected b/go/ql/test/library-tests/semmle/go/Types/Methods.expected
index ac32d41d9ea9..914b29bdcfb1 100644
--- a/go/ql/test/library-tests/semmle/go/Types/Methods.expected
+++ b/go/ql/test/library-tests/semmle/go/Types/Methods.expected
@@ -25,7 +25,9 @@
 | Foo | half | pkg1/tst.go:33:16:33:19 | half |
 | GenericInterface | GetT | generic.go:33:2:33:5 | GetT |
 | MixedExportedAndNot | Exported | pkg1/interfaces.go:36:2:36:9 | Exported |
+| MixedExportedAndNot | Exported | pkg2/tst.go:12:9:12:16 | Exported |
 | MixedExportedAndNot | notExported | pkg1/interfaces.go:37:2:37:12 | notExported |
+| MixedExportedAndNot | notExported | pkg2/tst.go:13:9:13:19 | notExported |
 | MyInterface | clone | generic.go:48:2:48:6 | clone |
 | MyInterface | dummy1 | generic.go:49:2:49:7 | dummy1 |
 | MyInterface | dummy2 | generic.go:50:2:50:7 | dummy2 |
diff --git a/go/ql/test/library-tests/semmle/go/Types/pkg2/tst.go b/go/ql/test/library-tests/semmle/go/Types/pkg2/tst.go
index bb4139c3b5a6..b5f00526671f 100644
--- a/go/ql/test/library-tests/semmle/go/Types/pkg2/tst.go
+++ b/go/ql/test/library-tests/semmle/go/Types/pkg2/tst.go
@@ -8,7 +8,7 @@ type G struct {
 	g int
 }
 
-type MixedExportedAndNot {
+type MixedExportedAndNot interface {
         Exported()
         notExported()
 }

From 7a7ff4a91ea24c06be2ffd016373119c1e282968 Mon Sep 17 00:00:00 2001
From: Chris Smowton <chris@smowton.net>
Date: Mon, 30 Sep 2024 16:33:26 +0100
Subject: [PATCH 213/347] Apply review comments

---
 .../go.dbscheme                               |  0
 .../old.dbscheme                              |  2 +-
 .../upgrade.properties                        |  0
 go/extractor/dbscheme/tables.go               |  6 ++--
 go/extractor/extractor.go                     | 11 +++----
 .../2024-09-03-tags-and-interface-ids.md      |  4 +--
 go/ql/lib/go.dbscheme                         |  2 +-
 go/ql/lib/semmle/go/Types.qll                 | 31 ++++++++++++-------
 .../go.dbscheme                               |  2 +-
 ...s.expected => InterfaceMethodIds.expected} |  0
 ...{InterfaceIds.ql => InterfaceMethodIds.ql} |  2 +-
 11 files changed, 34 insertions(+), 26 deletions(-)
 rename go/downgrades/{e47462df302b3e58a60d2e21f99aba63f973326f => d2066c23fe3de023d76d7e5a52dec6771d308534}/go.dbscheme (100%)
 rename go/downgrades/{e47462df302b3e58a60d2e21f99aba63f973326f => d2066c23fe3de023d76d7e5a52dec6771d308534}/old.dbscheme (99%)
 rename go/downgrades/{e47462df302b3e58a60d2e21f99aba63f973326f => d2066c23fe3de023d76d7e5a52dec6771d308534}/upgrade.properties (100%)
 rename go/ql/test/library-tests/semmle/go/Types/{InterfaceIds.expected => InterfaceMethodIds.expected} (100%)
 rename go/ql/test/library-tests/semmle/go/Types/{InterfaceIds.ql => InterfaceMethodIds.ql} (79%)

diff --git a/go/downgrades/e47462df302b3e58a60d2e21f99aba63f973326f/go.dbscheme b/go/downgrades/d2066c23fe3de023d76d7e5a52dec6771d308534/go.dbscheme
similarity index 100%
rename from go/downgrades/e47462df302b3e58a60d2e21f99aba63f973326f/go.dbscheme
rename to go/downgrades/d2066c23fe3de023d76d7e5a52dec6771d308534/go.dbscheme
diff --git a/go/downgrades/e47462df302b3e58a60d2e21f99aba63f973326f/old.dbscheme b/go/downgrades/d2066c23fe3de023d76d7e5a52dec6771d308534/old.dbscheme
similarity index 99%
rename from go/downgrades/e47462df302b3e58a60d2e21f99aba63f973326f/old.dbscheme
rename to go/downgrades/d2066c23fe3de023d76d7e5a52dec6771d308534/old.dbscheme
index e47462df302b..d2066c23fe3d 100644
--- a/go/downgrades/e47462df302b3e58a60d2e21f99aba63f973326f/old.dbscheme
+++ b/go/downgrades/d2066c23fe3de023d76d7e5a52dec6771d308534/old.dbscheme
@@ -208,7 +208,7 @@ underlying_type(unique int named: @namedtype ref, int tp: @type ref);
 component_types(int parent: @compositetype ref, int index: int ref, string name: string ref, int tp: @type ref);
 
 #keyset[parent, index]
-component_tags(int parent: @compositetype ref, int index: int ref, string tag: string ref);
+component_tags(int parent: @structtype ref, int index: int ref, string tag: string ref);
 
 #keyset[interface, index]
 interface_private_method_ids(int interface: @interfacetype ref, int index: int ref, string id: string ref);
diff --git a/go/downgrades/e47462df302b3e58a60d2e21f99aba63f973326f/upgrade.properties b/go/downgrades/d2066c23fe3de023d76d7e5a52dec6771d308534/upgrade.properties
similarity index 100%
rename from go/downgrades/e47462df302b3e58a60d2e21f99aba63f973326f/upgrade.properties
rename to go/downgrades/d2066c23fe3de023d76d7e5a52dec6771d308534/upgrade.properties
diff --git a/go/extractor/dbscheme/tables.go b/go/extractor/dbscheme/tables.go
index 89cc7ffeadb0..ec74c7a2c0d7 100644
--- a/go/extractor/dbscheme/tables.go
+++ b/go/extractor/dbscheme/tables.go
@@ -1150,14 +1150,14 @@ var ComponentTypesTable = NewTable("component_types",
 	EntityColumn(TypeType, "tp"),
 ).KeySet("parent", "index")
 
-// ComponentTagsTable is the table associating composite types with their component types' tags
+// ComponentTagsTable is the table associating struct types with their component types' tags
 var ComponentTagsTable = NewTable("component_tags",
-	EntityColumn(CompositeType, "parent"),
+	EntityColumn(StructType, "parent"),
 	IntColumn("index"),
 	StringColumn("tag"),
 ).KeySet("parent", "index")
 
-// InterfacePrivateMethodIdsTable is the table associating interface types with their private method ids
+// InterfacePrivateMethodIdsTable is the table associating interface types with the indices and ids of their private methods.
 var InterfacePrivateMethodIdsTable = NewTable("interface_private_method_ids",
 	EntityColumn(InterfaceType, "interface"),
 	IntColumn("index"),
diff --git a/go/extractor/extractor.go b/go/extractor/extractor.go
index 33186a9380f8..8a399eb2b902 100644
--- a/go/extractor/extractor.go
+++ b/go/extractor/extractor.go
@@ -1624,7 +1624,9 @@ func extractType(tw *trap.Writer, tp types.Type) trap.Label {
 					name = ""
 				}
 				extractComponentType(tw, lbl, i, name, field.Type())
-				dbscheme.ComponentTagsTable.Emit(tw, lbl, i, tp.Tag(i))
+				if tp.Tag(i) != "" {
+					dbscheme.ComponentTagsTable.Emit(tw, lbl, i, tp.Tag(i))
+				}
 			}
 		case *types.Pointer:
 			kind = dbscheme.PointerType.Index()
@@ -1643,11 +1645,8 @@ func extractType(tw *trap.Writer, tp types.Type) trap.Label {
 
 				extractComponentType(tw, lbl, i, meth.Name(), meth.Type())
 
-				// meth.Id() will be equal to meth.Name() for an exported method, or
-				// packge-qualified otherwise.
-				privateMethodId := meth.Id()
-				if privateMethodId != meth.Name() {
-					dbscheme.InterfacePrivateMethodIdsTable.Emit(tw, lbl, i, privateMethodId)
+				if !meth.Exported() {
+					dbscheme.InterfacePrivateMethodIdsTable.Emit(tw, lbl, i, meth.Id())
 				}
 			}
 			for i := 0; i < tp.NumEmbeddeds(); i++ {
diff --git a/go/ql/lib/change-notes/2024-09-03-tags-and-interface-ids.md b/go/ql/lib/change-notes/2024-09-03-tags-and-interface-ids.md
index 2baa8cd6da2c..c8c6e88ab4cb 100644
--- a/go/ql/lib/change-notes/2024-09-03-tags-and-interface-ids.md
+++ b/go/ql/lib/change-notes/2024-09-03-tags-and-interface-ids.md
@@ -1,5 +1,5 @@
 ---
 category: minorAnalysis
 ---
-* Added methods `StructTag.hasOwnFieldWithTag` and `Field.getTag`, which enable CodeQL queries to examine struct field tags.
-* Added method `InterfaceType.getMethodTypeById`, which enables CodeQL queries to distinguish interfaces with matching non-exported method names that are declared in different packages, and are therefore incompatible.
+* Added member predicates `StructTag.hasOwnFieldWithTag` and `Field.getTag`, which enable CodeQL queries to examine struct field tags.
+* Added member predicate `InterfaceType.getMethodTypeByQualifiedName`, which enables CodeQL queries to distinguish interfaces with matching non-exported method names that are declared in different packages, and are therefore incompatible.
diff --git a/go/ql/lib/go.dbscheme b/go/ql/lib/go.dbscheme
index e47462df302b..d2066c23fe3d 100644
--- a/go/ql/lib/go.dbscheme
+++ b/go/ql/lib/go.dbscheme
@@ -208,7 +208,7 @@ underlying_type(unique int named: @namedtype ref, int tp: @type ref);
 component_types(int parent: @compositetype ref, int index: int ref, string name: string ref, int tp: @type ref);
 
 #keyset[parent, index]
-component_tags(int parent: @compositetype ref, int index: int ref, string tag: string ref);
+component_tags(int parent: @structtype ref, int index: int ref, string tag: string ref);
 
 #keyset[interface, index]
 interface_private_method_ids(int interface: @interfacetype ref, int index: int ref, string id: string ref);
diff --git a/go/ql/lib/semmle/go/Types.qll b/go/ql/lib/semmle/go/Types.qll
index 16e2c528ef47..51e9a9539202 100644
--- a/go/ql/lib/semmle/go/Types.qll
+++ b/go/ql/lib/semmle/go/Types.qll
@@ -465,7 +465,11 @@ class StructType extends @structtype, CompositeType {
    */
   predicate hasOwnFieldWithTag(int i, string name, Type tp, boolean isEmbedded, string tag) {
     this.hasOwnField(i, name, tp, isEmbedded) and
-    component_tags(this, i, tag)
+    (
+      component_tags(this, i, tag)
+      or
+      not component_tags(this, i, _) and tag = ""
+    )
   }
 
   /**
@@ -586,10 +590,13 @@ class StructType extends @structtype, CompositeType {
   override string pp() {
     result =
       "struct { " +
-        concat(int i, string name, Type tp, string tag, string tagToPrint |
+        concat(int i, string name, Type tp, string tagToPrint |
           component_types(this, i, name, tp) and
-          component_tags(this, i, tag) and
-          (if tag = "" then tagToPrint = "" else tagToPrint = " `" + tag + "`")
+          (
+            tagToPrint = " `" + any(string tag | component_tags(this, i, tag)) + "`"
+            or
+            tagToPrint = "" and not component_tags(this, i, _)
+          )
         |
           name + " " + tp.pp() + tagToPrint, "; " order by i
         ) + " }"
@@ -761,10 +768,10 @@ class InterfaceType extends @interfacetype, CompositeType {
   }
 
   /**
-   * Gets the type of method `id` of this interface type.
+   * Gets the type of method `qname` of this interface type.
    *
-   * This differs from `getMethodType` in that if the method is not exported, the `id`
-   * will be package-qualified. This means that the set of `id`s` together with any
+   * This differs from `getMethodType` in that if the method is not exported, the `qname`
+   * will be package-qualified. This means that the set of `qname`s` together with any
    * embedded types fully distinguishes the interface from any other, whereas the set
    * of names matched by `getMethodName` may be ambiguous between interfaces with matching
    * exported methods and unexported methods that have matching names but belong to
@@ -772,15 +779,17 @@ class InterfaceType extends @interfacetype, CompositeType {
    *
    * For example, `interface { Exported() int; notExported() int }` declared in two
    * different packages defines two distinct types, but they appear identical according to
-   * `getMethodType`.
+   * `getMethodType`. If the packages were named `a` and `b`, `getMethodType` would yield
+   * `notExported -> int` for both, whereas this method would yield `a.notExported -> int`
+   * and `b.notExported -> int` respectively.
    */
-  Type getMethodTypeById(string id) {
+  Type getMethodTypeByQualifiedName(string qname) {
     exists(int i, string name | i >= 0 |
       component_types(this, i, name, result) and
       (
-        interface_private_method_ids(this, i, id)
+        interface_private_method_ids(this, i, qname)
         or
-        name = id and not interface_private_method_ids(this, i, _)
+        name = qname and not interface_private_method_ids(this, i, _)
       )
     )
   }
diff --git a/go/ql/lib/upgrades/a58b81b1b4c4cccc8ca11731c1db86622f33af57/go.dbscheme b/go/ql/lib/upgrades/a58b81b1b4c4cccc8ca11731c1db86622f33af57/go.dbscheme
index e47462df302b..d2066c23fe3d 100644
--- a/go/ql/lib/upgrades/a58b81b1b4c4cccc8ca11731c1db86622f33af57/go.dbscheme
+++ b/go/ql/lib/upgrades/a58b81b1b4c4cccc8ca11731c1db86622f33af57/go.dbscheme
@@ -208,7 +208,7 @@ underlying_type(unique int named: @namedtype ref, int tp: @type ref);
 component_types(int parent: @compositetype ref, int index: int ref, string name: string ref, int tp: @type ref);
 
 #keyset[parent, index]
-component_tags(int parent: @compositetype ref, int index: int ref, string tag: string ref);
+component_tags(int parent: @structtype ref, int index: int ref, string tag: string ref);
 
 #keyset[interface, index]
 interface_private_method_ids(int interface: @interfacetype ref, int index: int ref, string id: string ref);
diff --git a/go/ql/test/library-tests/semmle/go/Types/InterfaceIds.expected b/go/ql/test/library-tests/semmle/go/Types/InterfaceMethodIds.expected
similarity index 100%
rename from go/ql/test/library-tests/semmle/go/Types/InterfaceIds.expected
rename to go/ql/test/library-tests/semmle/go/Types/InterfaceMethodIds.expected
diff --git a/go/ql/test/library-tests/semmle/go/Types/InterfaceIds.ql b/go/ql/test/library-tests/semmle/go/Types/InterfaceMethodIds.ql
similarity index 79%
rename from go/ql/test/library-tests/semmle/go/Types/InterfaceIds.ql
rename to go/ql/test/library-tests/semmle/go/Types/InterfaceMethodIds.ql
index 5b04b068e6ba..b6246cf683a0 100644
--- a/go/ql/test/library-tests/semmle/go/Types/InterfaceIds.ql
+++ b/go/ql/test/library-tests/semmle/go/Types/InterfaceMethodIds.ql
@@ -4,5 +4,5 @@ from NamedType nt, InterfaceType it, Type methodType, string id
 where
   nt.getName() = "MixedExportedAndNot" and
   it = nt.getUnderlyingType() and
-  methodType = it.getMethodTypeById(id)
+  methodType = it.getMethodTypeByQualifiedName(id)
 select it.pp(), methodType.pp(), id

From e1963a5fcd0c00aba6f2ba5bf3acd6f2663a99b9 Mon Sep 17 00:00:00 2001
From: Chris Smowton <chris@smowton.net>
Date: Mon, 30 Sep 2024 16:35:58 +0100
Subject: [PATCH 214/347] autoformat

---
 .../semmle/go/Types/Field_getPackage.expected             | 8 ++++----
 .../semmle/go/Types/Field_hasQualifiedName2.expected      | 8 ++++----
 .../semmle/go/Types/Field_hasQualifiedName3.expected      | 8 ++++----
 .../semmle/go/Types/Method_hasQualifiedName2.expected     | 4 ++--
 .../semmle/go/Types/Method_hasQualifiedName3.expected     | 4 ++--
 go/ql/test/library-tests/semmle/go/Types/Methods.expected | 4 ++--
 go/ql/test/library-tests/semmle/go/Types/pkg2/tst.go      | 4 ++--
 .../library-tests/semmle/go/Types/struct_tags.expected    | 8 ++++----
 go/ql/test/library-tests/semmle/go/Types/struct_tags.go   | 8 ++++----
 9 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/go/ql/test/library-tests/semmle/go/Types/Field_getPackage.expected b/go/ql/test/library-tests/semmle/go/Types/Field_getPackage.expected
index 50bd36a2174e..6fd88c35259e 100644
--- a/go/ql/test/library-tests/semmle/go/Types/Field_getPackage.expected
+++ b/go/ql/test/library-tests/semmle/go/Types/Field_getPackage.expected
@@ -46,7 +46,7 @@
 | pkg1/tst.go:30:2:30:5 | flag | package github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg1 |
 | pkg2/tst.go:4:2:4:2 | g | package github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg2 |
 | pkg2/tst.go:8:2:8:2 | g | package github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg2 |
-| struct_tags.go:4:3:4:8 | field1 | package github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types |
-| struct_tags.go:5:3:5:8 | field2 | package github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types |
-| struct_tags.go:9:3:9:8 | field1 | package github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types |
-| struct_tags.go:10:3:10:8 | field2 | package github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types |
+| struct_tags.go:4:2:4:7 | field1 | package github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types |
+| struct_tags.go:5:2:5:7 | field2 | package github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types |
+| struct_tags.go:9:2:9:7 | field1 | package github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types |
+| struct_tags.go:10:2:10:7 | field2 | package github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types |
diff --git a/go/ql/test/library-tests/semmle/go/Types/Field_hasQualifiedName2.expected b/go/ql/test/library-tests/semmle/go/Types/Field_hasQualifiedName2.expected
index bfdde9bb82d0..910d9a0dd5ff 100644
--- a/go/ql/test/library-tests/semmle/go/Types/Field_hasQualifiedName2.expected
+++ b/go/ql/test/library-tests/semmle/go/Types/Field_hasQualifiedName2.expected
@@ -64,7 +64,7 @@
 | pkg2/tst.go:4:2:4:2 | g | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg2.T | g |
 | pkg2/tst.go:8:2:8:2 | g | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg2.G | g |
 | pkg2/tst.go:8:2:8:2 | g | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg2.T | g |
-| struct_tags.go:4:3:4:8 | field1 | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types.S1 | field1 |
-| struct_tags.go:5:3:5:8 | field2 | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types.S1 | field2 |
-| struct_tags.go:9:3:9:8 | field1 | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types.S2 | field1 |
-| struct_tags.go:10:3:10:8 | field2 | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types.S2 | field2 |
+| struct_tags.go:4:2:4:7 | field1 | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types.S1 | field1 |
+| struct_tags.go:5:2:5:7 | field2 | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types.S1 | field2 |
+| struct_tags.go:9:2:9:7 | field1 | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types.S2 | field1 |
+| struct_tags.go:10:2:10:7 | field2 | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types.S2 | field2 |
diff --git a/go/ql/test/library-tests/semmle/go/Types/Field_hasQualifiedName3.expected b/go/ql/test/library-tests/semmle/go/Types/Field_hasQualifiedName3.expected
index 559bce80b73c..1b8e88be66ff 100644
--- a/go/ql/test/library-tests/semmle/go/Types/Field_hasQualifiedName3.expected
+++ b/go/ql/test/library-tests/semmle/go/Types/Field_hasQualifiedName3.expected
@@ -64,7 +64,7 @@
 | pkg2/tst.go:4:2:4:2 | g | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg2 | T | g |
 | pkg2/tst.go:8:2:8:2 | g | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg2 | G | g |
 | pkg2/tst.go:8:2:8:2 | g | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg2 | T | g |
-| struct_tags.go:4:3:4:8 | field1 | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types | S1 | field1 |
-| struct_tags.go:5:3:5:8 | field2 | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types | S1 | field2 |
-| struct_tags.go:9:3:9:8 | field1 | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types | S2 | field1 |
-| struct_tags.go:10:3:10:8 | field2 | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types | S2 | field2 |
+| struct_tags.go:4:2:4:7 | field1 | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types | S1 | field1 |
+| struct_tags.go:5:2:5:7 | field2 | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types | S1 | field2 |
+| struct_tags.go:9:2:9:7 | field1 | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types | S2 | field1 |
+| struct_tags.go:10:2:10:7 | field2 | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types | S2 | field2 |
diff --git a/go/ql/test/library-tests/semmle/go/Types/Method_hasQualifiedName2.expected b/go/ql/test/library-tests/semmle/go/Types/Method_hasQualifiedName2.expected
index 41b744e78e7f..e39dc1c37bf2 100644
--- a/go/ql/test/library-tests/semmle/go/Types/Method_hasQualifiedName2.expected
+++ b/go/ql/test/library-tests/semmle/go/Types/Method_hasQualifiedName2.expected
@@ -59,5 +59,5 @@
 | pkg1/tst.go:33:16:33:19 | half | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg1.T | half |
 | pkg1/tst.go:33:16:33:19 | half | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg1.T3 | half |
 | pkg1/tst.go:33:16:33:19 | half | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg1.T4 | half |
-| pkg2/tst.go:12:9:12:16 | Exported | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg2.MixedExportedAndNot | Exported |
-| pkg2/tst.go:13:9:13:19 | notExported | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg2.MixedExportedAndNot | notExported |
+| pkg2/tst.go:12:2:12:9 | Exported | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg2.MixedExportedAndNot | Exported |
+| pkg2/tst.go:13:2:13:12 | notExported | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg2.MixedExportedAndNot | notExported |
diff --git a/go/ql/test/library-tests/semmle/go/Types/Method_hasQualifiedName3.expected b/go/ql/test/library-tests/semmle/go/Types/Method_hasQualifiedName3.expected
index c0aa74196854..6bf4488df233 100644
--- a/go/ql/test/library-tests/semmle/go/Types/Method_hasQualifiedName3.expected
+++ b/go/ql/test/library-tests/semmle/go/Types/Method_hasQualifiedName3.expected
@@ -59,5 +59,5 @@
 | pkg1/tst.go:33:16:33:19 | half | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg1 | T | half |
 | pkg1/tst.go:33:16:33:19 | half | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg1 | T3 | half |
 | pkg1/tst.go:33:16:33:19 | half | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg1 | T4 | half |
-| pkg2/tst.go:12:9:12:16 | Exported | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg2 | MixedExportedAndNot | Exported |
-| pkg2/tst.go:13:9:13:19 | notExported | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg2 | MixedExportedAndNot | notExported |
+| pkg2/tst.go:12:2:12:9 | Exported | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg2 | MixedExportedAndNot | Exported |
+| pkg2/tst.go:13:2:13:12 | notExported | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg2 | MixedExportedAndNot | notExported |
diff --git a/go/ql/test/library-tests/semmle/go/Types/Methods.expected b/go/ql/test/library-tests/semmle/go/Types/Methods.expected
index 914b29bdcfb1..d84593653ad9 100644
--- a/go/ql/test/library-tests/semmle/go/Types/Methods.expected
+++ b/go/ql/test/library-tests/semmle/go/Types/Methods.expected
@@ -25,9 +25,9 @@
 | Foo | half | pkg1/tst.go:33:16:33:19 | half |
 | GenericInterface | GetT | generic.go:33:2:33:5 | GetT |
 | MixedExportedAndNot | Exported | pkg1/interfaces.go:36:2:36:9 | Exported |
-| MixedExportedAndNot | Exported | pkg2/tst.go:12:9:12:16 | Exported |
+| MixedExportedAndNot | Exported | pkg2/tst.go:12:2:12:9 | Exported |
 | MixedExportedAndNot | notExported | pkg1/interfaces.go:37:2:37:12 | notExported |
-| MixedExportedAndNot | notExported | pkg2/tst.go:13:9:13:19 | notExported |
+| MixedExportedAndNot | notExported | pkg2/tst.go:13:2:13:12 | notExported |
 | MyInterface | clone | generic.go:48:2:48:6 | clone |
 | MyInterface | dummy1 | generic.go:49:2:49:7 | dummy1 |
 | MyInterface | dummy2 | generic.go:50:2:50:7 | dummy2 |
diff --git a/go/ql/test/library-tests/semmle/go/Types/pkg2/tst.go b/go/ql/test/library-tests/semmle/go/Types/pkg2/tst.go
index b5f00526671f..af91e514b77c 100644
--- a/go/ql/test/library-tests/semmle/go/Types/pkg2/tst.go
+++ b/go/ql/test/library-tests/semmle/go/Types/pkg2/tst.go
@@ -9,6 +9,6 @@ type G struct {
 }
 
 type MixedExportedAndNot interface {
-        Exported()
-        notExported()
+	Exported()
+	notExported()
 }
diff --git a/go/ql/test/library-tests/semmle/go/Types/struct_tags.expected b/go/ql/test/library-tests/semmle/go/Types/struct_tags.expected
index d0668076d5fe..33c7afd80ec6 100644
--- a/go/ql/test/library-tests/semmle/go/Types/struct_tags.expected
+++ b/go/ql/test/library-tests/semmle/go/Types/struct_tags.expected
@@ -1,4 +1,4 @@
-| struct { field1 int `tag1a`; field2 int `tag2a` } | struct_tags.go:4:3:4:8 | field1 | tag1a |
-| struct { field1 int `tag1a`; field2 int `tag2a` } | struct_tags.go:5:3:5:8 | field2 | tag2a |
-| struct { field1 int `tag1b`; field2 int `tag2b` } | struct_tags.go:9:3:9:8 | field1 | tag1b |
-| struct { field1 int `tag1b`; field2 int `tag2b` } | struct_tags.go:10:3:10:8 | field2 | tag2b |
+| struct { field1 int `tag1a`; field2 int `tag2a` } | struct_tags.go:4:2:4:7 | field1 | tag1a |
+| struct { field1 int `tag1a`; field2 int `tag2a` } | struct_tags.go:5:2:5:7 | field2 | tag2a |
+| struct { field1 int `tag1b`; field2 int `tag2b` } | struct_tags.go:9:2:9:7 | field1 | tag1b |
+| struct { field1 int `tag1b`; field2 int `tag2b` } | struct_tags.go:10:2:10:7 | field2 | tag2b |
diff --git a/go/ql/test/library-tests/semmle/go/Types/struct_tags.go b/go/ql/test/library-tests/semmle/go/Types/struct_tags.go
index ae3efaf8dcbf..c06f8395135a 100644
--- a/go/ql/test/library-tests/semmle/go/Types/struct_tags.go
+++ b/go/ql/test/library-tests/semmle/go/Types/struct_tags.go
@@ -1,11 +1,11 @@
 package main
 
 type S1 struct {
-  field1 int `tag1a`
-  field2 int `tag2a`
+	field1 int `tag1a`
+	field2 int `tag2a`
 }
 
 type S2 struct {
-  field1 int `tag1b`
-  field2 int `tag2b`
+	field1 int `tag1b`
+	field2 int `tag2b`
 }

From 442e58188ba6e144591e4c16a437b5ae74483ed5 Mon Sep 17 00:00:00 2001
From: Chris Smowton <chris@smowton.net>
Date: Mon, 9 Sep 2024 11:42:57 +0100
Subject: [PATCH 215/347] Update stats

---
 go/ql/lib/go.dbscheme.stats | 12212 +++++++++++++++++++++-------------
 1 file changed, 7714 insertions(+), 4498 deletions(-)

diff --git a/go/ql/lib/go.dbscheme.stats b/go/ql/lib/go.dbscheme.stats
index b18e8556fb24..50565d963aad 100644
--- a/go/ql/lib/go.dbscheme.stats
+++ b/go/ql/lib/go.dbscheme.stats
@@ -1,11 +1,15 @@
 <dbstats>
     <typesizes>
         <e>
-            <k>@similarity</k>
+            <k>@duplication</k>
             <v>0</v>
         </e>
         <e>
-            <k>@duplication</k>
+            <k>@externalDataElement</k>
+            <v>0</v>
+        </e>
+        <e>
+            <k>@similarity</k>
             <v>0</v>
         </e>
         <e>
@@ -14,15 +18,11 @@
         </e>
         <e>
             <k>@xmlelement</k>
-            <v>504</v>
+            <v>8655540</v>
         </e>
         <e>
             <k>@xmlattribute</k>
-            <v>408</v>
-        </e>
-        <e>
-            <k>@externalDataElement</k>
-            <v>0</v>
+            <v>3762921</v>
         </e>
         <e>
             <k>@xmlnamespace</k>
@@ -30,667 +30,695 @@
         </e>
         <e>
             <k>@xmlcomment</k>
-            <v>30</v>
+            <v>131455</v>
         </e>
         <e>
             <k>@xmlcharacters</k>
-            <v>869</v>
+            <v>13383839</v>
         </e>
         <e>
             <k>@compilation</k>
-            <v>1</v>
+            <v>31407</v>
         </e>
         <e>
             <k>@diagnostic</k>
-            <v>0</v>
+            <v>233782</v>
         </e>
         <e>
             <k>@file</k>
-            <v>529</v>
+            <v>146783</v>
         </e>
         <e>
             <k>@folder</k>
-            <v>210</v>
+            <v>98591</v>
         </e>
         <e>
             <k>@comment_group</k>
-            <v>12083</v>
+            <v>2493839</v>
         </e>
         <e>
             <k>@slashslashcomment</k>
-            <v>24878</v>
+            <v>2514613</v>
         </e>
         <e>
             <k>@slashstarcomment</k>
-            <v>846</v>
+            <v>77689</v>
+        </e>
+        <e>
+            <k>@location_default</k>
+            <v>37058201</v>
         </e>
         <e>
             <k>@ident</k>
-            <v>237316</v>
+            <v>5500549</v>
         </e>
         <e>
             <k>@ellipsis</k>
-            <v>141</v>
+            <v>42416</v>
         </e>
         <e>
             <k>@intlit</k>
-            <v>7683</v>
-        </e>
-        <e>
-            <k>@floatlit</k>
-            <v>27</v>
+            <v>8029312</v>
         </e>
         <e>
             <k>@charlit</k>
-            <v>838</v>
+            <v>44853</v>
         </e>
         <e>
             <k>@stringlit</k>
-            <v>24892</v>
+            <v>936836</v>
         </e>
         <e>
             <k>@funclit</k>
-            <v>678</v>
+            <v>145208</v>
         </e>
         <e>
             <k>@compositelit</k>
-            <v>2704</v>
+            <v>638762</v>
         </e>
         <e>
             <k>@parenexpr</k>
-            <v>343</v>
+            <v>44180</v>
         </e>
         <e>
             <k>@selectorexpr</k>
-            <v>54353</v>
+            <v>1563876</v>
         </e>
         <e>
             <k>@indexexpr</k>
-            <v>4581</v>
+            <v>1269900</v>
         </e>
         <e>
             <k>@sliceexpr</k>
-            <v>836</v>
+            <v>26235</v>
         </e>
         <e>
             <k>@typeassertexpr</k>
-            <v>2127</v>
+            <v>86701</v>
         </e>
         <e>
             <k>@callorconversionexpr</k>
-            <v>32041</v>
+            <v>1123396</v>
         </e>
         <e>
             <k>@starexpr</k>
-            <v>10360</v>
+            <v>401599</v>
         </e>
         <e>
             <k>@keyvalueexpr</k>
-            <v>5616</v>
+            <v>2321152</v>
         </e>
         <e>
             <k>@arraytypeexpr</k>
-            <v>3465</v>
+            <v>172175</v>
         </e>
         <e>
             <k>@structtypeexpr</k>
-            <v>1207</v>
+            <v>126802</v>
         </e>
         <e>
             <k>@functypeexpr</k>
-            <v>6015</v>
+            <v>302047</v>
         </e>
         <e>
             <k>@interfacetypeexpr</k>
-            <v>509</v>
+            <v>154636</v>
         </e>
         <e>
             <k>@maptypeexpr</k>
-            <v>1013</v>
+            <v>71689</v>
         </e>
         <e>
             <k>@minusexpr</k>
-            <v>270</v>
+            <v>183167</v>
         </e>
         <e>
             <k>@notexpr</k>
-            <v>1190</v>
-        </e>
-        <e>
-            <k>@complementexpr</k>
-            <v>21</v>
+            <v>36971</v>
         </e>
         <e>
             <k>@addressexpr</k>
-            <v>1739</v>
+            <v>112784</v>
         </e>
         <e>
             <k>@arrowexpr</k>
-            <v>92</v>
+            <v>27351</v>
         </e>
         <e>
             <k>@lorexpr</k>
-            <v>612</v>
+            <v>27296</v>
         </e>
         <e>
             <k>@landexpr</k>
-            <v>1234</v>
+            <v>99629</v>
         </e>
         <e>
             <k>@eqlexpr</k>
-            <v>3244</v>
+            <v>91950</v>
         </e>
         <e>
             <k>@neqexpr</k>
-            <v>4103</v>
-        </e>
-        <e>
-            <k>@lssexpr</k>
-            <v>785</v>
-        </e>
-        <e>
-            <k>@leqexpr</k>
-            <v>248</v>
+            <v>326490</v>
         </e>
         <e>
             <k>@gtrexpr</k>
-            <v>619</v>
+            <v>38816</v>
         </e>
         <e>
             <k>@geqexpr</k>
-            <v>270</v>
+            <v>21923</v>
         </e>
         <e>
             <k>@addexpr</k>
-            <v>1272</v>
+            <v>194589</v>
         </e>
         <e>
             <k>@subexpr</k>
-            <v>557</v>
+            <v>222492</v>
         </e>
         <e>
-            <k>@orexpr</k>
-            <v>146</v>
+            <k>@mulexpr</k>
+            <v>32053</v>
         </e>
         <e>
-            <k>@xorexpr</k>
-            <v>14</v>
+            <k>@sendchantypeexpr</k>
+            <v>22312</v>
         </e>
         <e>
-            <k>@mulexpr</k>
-            <v>207</v>
+            <k>@recvchantypeexpr</k>
+            <v>9117</v>
         </e>
         <e>
-            <k>@quoexpr</k>
-            <v>53</v>
+            <k>@sendrcvchantypeexpr</k>
+            <v>25432</v>
         </e>
         <e>
-            <k>@remexpr</k>
-            <v>24</v>
+            <k>@badexpr</k>
+            <v>2</v>
         </e>
         <e>
-            <k>@shlexpr</k>
-            <v>164</v>
+            <k>@floatlit</k>
+            <v>393088</v>
         </e>
         <e>
-            <k>@shrexpr</k>
-            <v>57</v>
+            <k>@imaglit</k>
+            <v>1233</v>
         </e>
         <e>
-            <k>@andexpr</k>
-            <v>235</v>
+            <k>@genericfunctioninstantiationexpr</k>
+            <v>9823</v>
         </e>
         <e>
-            <k>@andnotexpr</k>
-            <v>19</v>
+            <k>@generictypeinstantiationexpr</k>
+            <v>4188</v>
         </e>
         <e>
-            <k>@sendchantypeexpr</k>
-            <v>7</v>
+            <k>@typesetliteralexpr</k>
+            <v>1171</v>
         </e>
         <e>
-            <k>@recvchantypeexpr</k>
-            <v>9</v>
+            <k>@plusexpr</k>
+            <v>370</v>
         </e>
         <e>
-            <k>@sendrcvchantypeexpr</k>
-            <v>101</v>
+            <k>@complementexpr</k>
+            <v>3979</v>
         </e>
         <e>
-            <k>@badexpr</k>
+            <k>@derefexpr</k>
             <v>0</v>
         </e>
         <e>
-            <k>@imaglit</k>
-            <v>0</v>
+            <k>@lssexpr</k>
+            <v>32125</v>
         </e>
         <e>
-            <k>@plusexpr</k>
-            <v>0</v>
+            <k>@leqexpr</k>
+            <v>9262</v>
         </e>
         <e>
-            <k>@derefexpr</k>
-            <v>0</v>
+            <k>@orexpr</k>
+            <v>81746</v>
         </e>
         <e>
-            <k>@field</k>
-            <v>19974</v>
+            <k>@xorexpr</k>
+            <v>1753</v>
         </e>
         <e>
-            <k>@location_default</k>
-            <v>539178</v>
+            <k>@quoexpr</k>
+            <v>61619</v>
         </e>
         <e>
-            <k>@declstmt</k>
-            <v>1454</v>
+            <k>@remexpr</k>
+            <v>2999</v>
         </e>
         <e>
-            <k>@labeledstmt</k>
-            <v>49</v>
+            <k>@shlexpr</k>
+            <v>82494</v>
+        </e>
+        <e>
+            <k>@shrexpr</k>
+            <v>7813</v>
+        </e>
+        <e>
+            <k>@andexpr</k>
+            <v>11860</v>
+        </e>
+        <e>
+            <k>@andnotexpr</k>
+            <v>396</v>
+        </e>
+        <e>
+            <k>@field</k>
+            <v>995459</v>
+        </e>
+        <e>
+            <k>@typeparamdecl</k>
+            <v>9798</v>
+        </e>
+        <e>
+            <k>@declstmt</k>
+            <v>74013</v>
         </e>
         <e>
             <k>@exprstmt</k>
-            <v>7605</v>
+            <v>460278</v>
         </e>
         <e>
             <k>@sendstmt</k>
-            <v>69</v>
+            <v>16794</v>
         </e>
         <e>
             <k>@incstmt</k>
-            <v>614</v>
+            <v>15889</v>
         </e>
         <e>
             <k>@decstmt</k>
-            <v>71</v>
+            <v>9601</v>
         </e>
         <e>
             <k>@gostmt</k>
-            <v>72</v>
+            <v>20539</v>
         </e>
         <e>
             <k>@deferstmt</k>
-            <v>358</v>
+            <v>98332</v>
         </e>
         <e>
             <k>@returnstmt</k>
-            <v>9225</v>
+            <v>355294</v>
         </e>
         <e>
             <k>@breakstmt</k>
-            <v>301</v>
+            <v>14232</v>
         </e>
         <e>
             <k>@continuestmt</k>
-            <v>606</v>
-        </e>
-        <e>
-            <k>@gotostmt</k>
-            <v>8</v>
-        </e>
-        <e>
-            <k>@fallthroughstmt</k>
-            <v>7</v>
+            <v>45187</v>
         </e>
         <e>
             <k>@blockstmt</k>
-            <v>19358</v>
+            <v>539596</v>
         </e>
         <e>
             <k>@ifstmt</k>
-            <v>9728</v>
+            <v>313551</v>
         </e>
         <e>
             <k>@caseclause</k>
-            <v>3476</v>
+            <v>79016</v>
         </e>
         <e>
             <k>@exprswitchstmt</k>
-            <v>378</v>
+            <v>17092</v>
         </e>
         <e>
             <k>@typeswitchstmt</k>
-            <v>400</v>
+            <v>9269</v>
         </e>
         <e>
             <k>@commclause</k>
-            <v>72</v>
+            <v>25912</v>
         </e>
         <e>
             <k>@selectstmt</k>
-            <v>35</v>
+            <v>11996</v>
         </e>
         <e>
             <k>@forstmt</k>
-            <v>654</v>
+            <v>25752</v>
         </e>
         <e>
             <k>@rangestmt</k>
-            <v>2135</v>
+            <v>64694</v>
         </e>
         <e>
             <k>@assignstmt</k>
-            <v>7478</v>
+            <v>641512</v>
         </e>
         <e>
             <k>@definestmt</k>
-            <v>9514</v>
+            <v>433774</v>
         </e>
         <e>
             <k>@addassignstmt</k>
-            <v>223</v>
+            <v>21683</v>
         </e>
         <e>
-            <k>@subassignstmt</k>
-            <v>18</v>
+            <k>@badstmt</k>
+            <v>0</v>
         </e>
         <e>
-            <k>@mulassignstmt</k>
-            <v>5</v>
+            <k>@emptystmt</k>
+            <v>181</v>
         </e>
         <e>
-            <k>@quoassignstmt</k>
-            <v>3</v>
+            <k>@labeledstmt</k>
+            <v>4273</v>
         </e>
         <e>
-            <k>@orassignstmt</k>
-            <v>63</v>
+            <k>@gotostmt</k>
+            <v>4431</v>
         </e>
         <e>
-            <k>@xorassignstmt</k>
-            <v>3</v>
+            <k>@fallthroughstmt</k>
+            <v>11233</v>
         </e>
         <e>
-            <k>@shlassignstmt</k>
-            <v>2</v>
+            <k>@subassignstmt</k>
+            <v>6675</v>
         </e>
         <e>
-            <k>@shrassignstmt</k>
-            <v>3</v>
+            <k>@mulassignstmt</k>
+            <v>470</v>
         </e>
         <e>
-            <k>@andnotassignstmt</k>
-            <v>3</v>
+            <k>@quoassignstmt</k>
+            <v>556</v>
         </e>
         <e>
-            <k>@badstmt</k>
-            <v>0</v>
+            <k>@remassignstmt</k>
+            <v>171</v>
         </e>
         <e>
-            <k>@emptystmt</k>
-            <v>0</v>
+            <k>@andassignstmt</k>
+            <v>279</v>
         </e>
         <e>
-            <k>@remassignstmt</k>
-            <v>0</v>
+            <k>@orassignstmt</k>
+            <v>9913</v>
         </e>
         <e>
-            <k>@andassignstmt</k>
-            <v>0</v>
+            <k>@xorassignstmt</k>
+            <v>2562</v>
+        </e>
+        <e>
+            <k>@shlassignstmt</k>
+            <v>367</v>
+        </e>
+        <e>
+            <k>@shrassignstmt</k>
+            <v>429</v>
+        </e>
+        <e>
+            <k>@andnotassignstmt</k>
+            <v>279</v>
         </e>
         <e>
             <k>@importdecl</k>
-            <v>479</v>
+            <v>83355</v>
         </e>
         <e>
             <k>@constdecl</k>
-            <v>280</v>
+            <v>54489</v>
         </e>
         <e>
             <k>@typedecl</k>
-            <v>1349</v>
+            <v>100497</v>
         </e>
         <e>
             <k>@vardecl</k>
-            <v>1769</v>
+            <v>118650</v>
         </e>
         <e>
             <k>@funcdecl</k>
-            <v>4813</v>
+            <v>283367</v>
         </e>
         <e>
             <k>@baddecl</k>
-            <v>0</v>
+            <v>214</v>
         </e>
         <e>
             <k>@importspec</k>
-            <v>3468</v>
+            <v>247378</v>
         </e>
         <e>
             <k>@valuespec</k>
-            <v>3056</v>
+            <v>152556</v>
         </e>
         <e>
             <k>@typedefspec</k>
-            <v>1349</v>
+            <v>101666</v>
         </e>
         <e>
             <k>@aliasspec</k>
-            <v>16</v>
+            <v>17497</v>
         </e>
         <e>
             <k>@universescope</k>
-            <v>1</v>
+            <v>5401</v>
         </e>
         <e>
             <k>@packagescope</k>
-            <v>346</v>
+            <v>924779</v>
         </e>
         <e>
             <k>@localscope</k>
-            <v>36428</v>
+            <v>919952</v>
         </e>
         <e>
             <k>@pkgobject</k>
-            <v>3468</v>
+            <v>247378</v>
         </e>
         <e>
             <k>@decltypeobject</k>
-            <v>3602</v>
+            <v>13124885</v>
         </e>
         <e>
             <k>@builtintypeobject</k>
-            <v>20</v>
+            <v>118831</v>
         </e>
         <e>
             <k>@declconstobject</k>
-            <v>8857</v>
+            <v>80430386</v>
         </e>
         <e>
             <k>@builtinconstobject</k>
-            <v>4</v>
+            <v>21605</v>
         </e>
         <e>
             <k>@declvarobject</k>
-            <v>51098</v>
+            <v>118985930</v>
         </e>
         <e>
             <k>@declfunctionobject</k>
-            <v>17793</v>
+            <v>93191570</v>
         </e>
         <e>
             <k>@builtinfunctionobject</k>
-            <v>18</v>
+            <v>140437</v>
         </e>
         <e>
             <k>@labelobject</k>
-            <v>49</v>
+            <v>4273</v>
         </e>
         <e>
             <k>@invalidtype</k>
-            <v>1</v>
+            <v>5401</v>
         </e>
         <e>
             <k>@boolexprtype</k>
-            <v>1</v>
+            <v>5401</v>
         </e>
         <e>
             <k>@inttype</k>
-            <v>1</v>
+            <v>5401</v>
         </e>
         <e>
             <k>@int8type</k>
-            <v>1</v>
+            <v>5401</v>
         </e>
         <e>
             <k>@int16type</k>
-            <v>1</v>
+            <v>5401</v>
         </e>
         <e>
             <k>@int32type</k>
-            <v>1</v>
+            <v>5401</v>
         </e>
         <e>
             <k>@int64type</k>
-            <v>1</v>
+            <v>5401</v>
         </e>
         <e>
             <k>@uinttype</k>
-            <v>1</v>
+            <v>5401</v>
         </e>
         <e>
             <k>@uint8type</k>
-            <v>1</v>
+            <v>5401</v>
         </e>
         <e>
             <k>@uint16type</k>
-            <v>1</v>
+            <v>5401</v>
         </e>
         <e>
             <k>@uint32type</k>
-            <v>1</v>
+            <v>5401</v>
         </e>
         <e>
             <k>@uint64type</k>
-            <v>1</v>
+            <v>5401</v>
         </e>
         <e>
             <k>@uintptrtype</k>
-            <v>1</v>
+            <v>5401</v>
         </e>
         <e>
             <k>@float32type</k>
-            <v>1</v>
+            <v>5401</v>
         </e>
         <e>
             <k>@float64type</k>
-            <v>1</v>
+            <v>5401</v>
         </e>
         <e>
             <k>@complex64type</k>
-            <v>1</v>
+            <v>4107</v>
         </e>
         <e>
             <k>@complex128type</k>
-            <v>1</v>
+            <v>5401</v>
         </e>
         <e>
             <k>@stringexprtype</k>
-            <v>1</v>
+            <v>5401</v>
         </e>
         <e>
             <k>@unsafepointertype</k>
-            <v>1</v>
+            <v>5401</v>
         </e>
         <e>
             <k>@boolliteraltype</k>
-            <v>1</v>
+            <v>5401</v>
         </e>
         <e>
             <k>@intliteraltype</k>
-            <v>1</v>
+            <v>5401</v>
         </e>
         <e>
             <k>@runeliteraltype</k>
-            <v>1</v>
+            <v>5401</v>
         </e>
         <e>
             <k>@floatliteraltype</k>
-            <v>1</v>
+            <v>5401</v>
         </e>
         <e>
             <k>@stringliteraltype</k>
-            <v>1</v>
+            <v>5401</v>
         </e>
         <e>
             <k>@nilliteraltype</k>
-            <v>1</v>
+            <v>5401</v>
+        </e>
+        <e>
+            <k>@typeparamtype</k>
+            <v>331358</v>
         </e>
         <e>
             <k>@arraytype</k>
-            <v>293</v>
+            <v>1528173</v>
         </e>
         <e>
             <k>@slicetype</k>
-            <v>637</v>
+            <v>2313692</v>
         </e>
         <e>
             <k>@structtype</k>
-            <v>2409</v>
+            <v>8070007</v>
         </e>
         <e>
             <k>@pointertype</k>
-            <v>1903</v>
+            <v>8158995</v>
         </e>
         <e>
             <k>@interfacetype</k>
-            <v>247</v>
+            <v>1636684</v>
         </e>
         <e>
             <k>@tupletype</k>
-            <v>559</v>
+            <v>69835</v>
         </e>
         <e>
             <k>@signaturetype</k>
-            <v>8010</v>
+            <v>28950823</v>
         </e>
         <e>
             <k>@maptype</k>
-            <v>430</v>
+            <v>866786</v>
         </e>
         <e>
             <k>@sendchantype</k>
-            <v>13</v>
+            <v>32408</v>
         </e>
         <e>
             <k>@recvchantype</k>
-            <v>10</v>
+            <v>48612</v>
         </e>
         <e>
             <k>@sendrcvchantype</k>
-            <v>29</v>
+            <v>101202</v>
         </e>
         <e>
             <k>@namedtype</k>
-            <v>3567</v>
+            <v>12852686</v>
+        </e>
+        <e>
+            <k>@typesetliteraltype</k>
+            <v>59325</v>
+        </e>
+        <e>
+            <k>@typealias</k>
+            <v>660784</v>
         </e>
         <e>
             <k>@complexliteraltype</k>
-            <v>0</v>
+            <v>88</v>
         </e>
         <e>
             <k>@package</k>
-            <v>346</v>
+            <v>924779</v>
         </e>
         <e>
             <k>@modline</k>
-            <v>6</v>
+            <v>191935</v>
         </e>
         <e>
             <k>@modlineblock</k>
-            <v>1</v>
+            <v>22683</v>
         </e>
         <e>
             <k>@modlparen</k>
-            <v>1</v>
+            <v>22683</v>
         </e>
         <e>
             <k>@modrparen</k>
-            <v>1</v>
+            <v>22683</v>
         </e>
         <e>
             <k>@modcommentblock</k>
-            <v>0</v>
+            <v>431</v>
         </e>
         <e>
             <k>@unknownerror</k>
@@ -698,15 +726,15 @@
         </e>
         <e>
             <k>@listerror</k>
-            <v>0</v>
+            <v>22275</v>
         </e>
         <e>
             <k>@parseerror</k>
-            <v>0</v>
+            <v>3428</v>
         </e>
         <e>
             <k>@typeerror</k>
-            <v>0</v>
+            <v>219425</v>
         </e>
     </typesizes>
     <stats>
@@ -738,7 +766,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1</v>
+                                    <v>403</v>
                                 </b>
                             </bs>
                         </hist>
@@ -754,7 +782,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1</v>
+                                    <v>403</v>
                                 </b>
                             </bs>
                         </hist>
@@ -830,7 +858,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1</v>
+                                    <v>403</v>
                                 </b>
                             </bs>
                         </hist>
@@ -846,7 +874,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1</v>
+                                    <v>403</v>
                                 </b>
                             </bs>
                         </hist>
@@ -1383,11 +1411,11 @@
         </relation>
         <relation>
             <name>sourceLocationPrefix</name>
-            <cardinality>1</cardinality>
+            <cardinality>5401</cardinality>
             <columnsizes>
                 <e>
                     <k>prefix</k>
-                    <v>1</v>
+                    <v>5401</v>
                 </e>
             </columnsizes>
             <dependencies/>
@@ -1416,7 +1444,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1</v>
+                                    <v>403</v>
                                 </b>
                             </bs>
                         </hist>
@@ -1470,7 +1498,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1</v>
+                                    <v>403</v>
                                 </b>
                             </bs>
                         </hist>
@@ -1486,7 +1514,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1</v>
+                                    <v>403</v>
                                 </b>
                             </bs>
                         </hist>
@@ -1502,7 +1530,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1</v>
+                                    <v>403</v>
                                 </b>
                             </bs>
                         </hist>
@@ -1518,7 +1546,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1</v>
+                                    <v>403</v>
                                 </b>
                             </bs>
                         </hist>
@@ -1688,27 +1716,27 @@
         </relation>
         <relation>
             <name>xmlElements</name>
-            <cardinality>504</cardinality>
+            <cardinality>8655540</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>504</v>
+                    <v>8655540</v>
                 </e>
                 <e>
                     <k>name</k>
-                    <v>38</v>
+                    <v>160211</v>
                 </e>
                 <e>
                     <k>parentid</k>
-                    <v>199</v>
+                    <v>2961862</v>
                 </e>
                 <e>
                     <k>idx</k>
-                    <v>86</v>
+                    <v>1302233</v>
                 </e>
                 <e>
                     <k>fileid</k>
-                    <v>14</v>
+                    <v>90375</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -1722,7 +1750,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>504</v>
+                                    <v>8655540</v>
                                 </b>
                             </bs>
                         </hist>
@@ -1738,7 +1766,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>504</v>
+                                    <v>8655540</v>
                                 </b>
                             </bs>
                         </hist>
@@ -1754,7 +1782,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>504</v>
+                                    <v>8655540</v>
                                 </b>
                             </bs>
                         </hist>
@@ -1770,7 +1798,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>504</v>
+                                    <v>8655540</v>
                                 </b>
                             </bs>
                         </hist>
@@ -1786,52 +1814,72 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>11</v>
+                                    <v>24647</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>3</v>
+                                    <v>8215</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>4</v>
+                                    <v>8215</v>
                                 </b>
                                 <b>
                                     <a>4</a>
+                                    <b>5</b>
+                                    <v>12323</v>
+                                </b>
+                                <b>
+                                    <a>5</a>
                                     <b>6</b>
-                                    <v>3</v>
+                                    <v>4107</v>
                                 </b>
                                 <b>
-                                    <a>7</a>
-                                    <b>12</b>
-                                    <v>3</v>
+                                    <a>8</a>
+                                    <b>9</b>
+                                    <v>12323</v>
                                 </b>
                                 <b>
-                                    <a>12</a>
+                                    <a>13</a>
                                     <b>14</b>
-                                    <v>2</v>
+                                    <v>8215</v>
                                 </b>
                                 <b>
-                                    <a>14</a>
-                                    <b>16</b>
-                                    <v>3</v>
+                                    <a>18</a>
+                                    <b>22</b>
+                                    <v>12323</v>
                                 </b>
                                 <b>
-                                    <a>16</a>
-                                    <b>22</b>
-                                    <v>3</v>
+                                    <a>22</a>
+                                    <b>30</b>
+                                    <v>12323</v>
                                 </b>
                                 <b>
-                                    <a>27</a>
+                                    <a>30</a>
                                     <b>40</b>
-                                    <v>3</v>
+                                    <v>12323</v>
                                 </b>
                                 <b>
-                                    <a>55</a>
-                                    <b>101</b>
-                                    <v>3</v>
+                                    <a>49</a>
+                                    <b>52</b>
+                                    <v>12323</v>
+                                </b>
+                                <b>
+                                    <a>52</a>
+                                    <b>58</b>
+                                    <v>8215</v>
+                                </b>
+                                <b>
+                                    <a>135</a>
+                                    <b>200</b>
+                                    <v>12323</v>
+                                </b>
+                                <b>
+                                    <a>233</a>
+                                    <b>570</b>
+                                    <v>12323</v>
                                 </b>
                             </bs>
                         </hist>
@@ -1847,47 +1895,57 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>15</v>
+                                    <v>49295</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>4</v>
-                                </b>
-                                <b>
-                                    <a>3</a>
-                                    <b>4</b>
-                                    <v>4</v>
+                                    <v>8215</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>3</v>
+                                    <v>20539</v>
                                 </b>
                                 <b>
                                     <a>5</a>
-                                    <b>6</b>
-                                    <v>1</v>
+                                    <b>11</b>
+                                    <v>8215</v>
                                 </b>
                                 <b>
-                                    <a>6</a>
-                                    <b>7</b>
-                                    <v>3</v>
+                                    <a>11</a>
+                                    <b>12</b>
+                                    <v>8215</v>
                                 </b>
                                 <b>
-                                    <a>7</a>
-                                    <b>18</b>
-                                    <v>3</v>
+                                    <a>13</a>
+                                    <b>19</b>
+                                    <v>12323</v>
                                 </b>
                                 <b>
-                                    <a>18</a>
+                                    <a>19</a>
                                     <b>22</b>
-                                    <v>3</v>
+                                    <v>12323</v>
                                 </b>
                                 <b>
-                                    <a>29</a>
-                                    <b>76</b>
-                                    <v>2</v>
+                                    <a>22</a>
+                                    <b>30</b>
+                                    <v>12323</v>
+                                </b>
+                                <b>
+                                    <a>33</a>
+                                    <b>53</b>
+                                    <v>12323</v>
+                                </b>
+                                <b>
+                                    <a>72</a>
+                                    <b>132</b>
+                                    <v>12323</v>
+                                </b>
+                                <b>
+                                    <a>302</a>
+                                    <b>303</b>
+                                    <v>4107</v>
                                 </b>
                             </bs>
                         </hist>
@@ -1903,52 +1961,52 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>12</v>
+                                    <v>41079</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>4</v>
+                                    <v>28755</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>5</v>
+                                    <v>12323</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>1</v>
+                                    <v>12323</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>6</b>
-                                    <v>3</v>
+                                    <v>12323</v>
                                 </b>
                                 <b>
-                                    <a>6</a>
-                                    <b>9</b>
-                                    <v>3</v>
+                                    <a>7</a>
+                                    <b>10</b>
+                                    <v>12323</v>
                                 </b>
                                 <b>
-                                    <a>10</a>
-                                    <b>11</b>
-                                    <v>2</v>
+                                    <a>11</a>
+                                    <b>14</b>
+                                    <v>12323</v>
                                 </b>
                                 <b>
-                                    <a>13</a>
-                                    <b>15</b>
-                                    <v>3</v>
+                                    <a>14</a>
+                                    <b>16</b>
+                                    <v>12323</v>
                                 </b>
                                 <b>
-                                    <a>15</a>
-                                    <b>17</b>
-                                    <v>3</v>
+                                    <a>33</a>
+                                    <b>50</b>
+                                    <v>12323</v>
                                 </b>
                                 <b>
-                                    <a>17</a>
-                                    <b>41</b>
-                                    <v>2</v>
+                                    <a>212</a>
+                                    <b>213</b>
+                                    <v>4107</v>
                                 </b>
                             </bs>
                         </hist>
@@ -1964,37 +2022,37 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>18</v>
+                                    <v>86267</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>7</v>
+                                    <v>12323</v>
                                 </b>
                                 <b>
-                                    <a>3</a>
-                                    <b>4</b>
-                                    <v>3</v>
+                                    <a>10</a>
+                                    <b>11</b>
+                                    <v>24647</v>
                                 </b>
                                 <b>
-                                    <a>4</a>
-                                    <b>5</b>
-                                    <v>1</v>
+                                    <a>13</a>
+                                    <b>19</b>
+                                    <v>8215</v>
                                 </b>
                                 <b>
-                                    <a>5</a>
-                                    <b>6</b>
-                                    <v>4</v>
+                                    <a>19</a>
+                                    <b>21</b>
+                                    <v>12323</v>
                                 </b>
                                 <b>
-                                    <a>7</a>
-                                    <b>11</b>
-                                    <v>3</v>
+                                    <a>21</a>
+                                    <b>22</b>
+                                    <v>8215</v>
                                 </b>
                                 <b>
-                                    <a>11</a>
-                                    <b>14</b>
-                                    <v>2</v>
+                                    <a>22</a>
+                                    <b>23</b>
+                                    <v>8215</v>
                                 </b>
                             </bs>
                         </hist>
@@ -2010,27 +2068,32 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>116</v>
+                                    <v>1429581</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>37</v>
+                                    <v>788734</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>22</v>
+                                    <v>172535</v>
                                 </b>
                                 <b>
                                     <a>4</a>
-                                    <b>8</b>
-                                    <v>15</v>
+                                    <b>5</b>
+                                    <v>168427</v>
                                 </b>
                                 <b>
-                                    <a>8</a>
-                                    <b>61</b>
-                                    <v>9</v>
+                                    <a>5</a>
+                                    <b>7</b>
+                                    <v>267019</v>
+                                </b>
+                                <b>
+                                    <a>7</a>
+                                    <b>311</b>
+                                    <v>135563</v>
                                 </b>
                             </bs>
                         </hist>
@@ -2046,17 +2109,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>160</v>
+                                    <v>2185452</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>23</v>
+                                    <v>636738</v>
                                 </b>
                                 <b>
                                     <a>3</a>
-                                    <b>8</b>
-                                    <v>16</v>
+                                    <b>10</b>
+                                    <v>139671</v>
                                 </b>
                             </bs>
                         </hist>
@@ -2072,27 +2135,32 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>116</v>
+                                    <v>1429581</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>37</v>
+                                    <v>788734</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>22</v>
+                                    <v>172535</v>
                                 </b>
                                 <b>
                                     <a>4</a>
-                                    <b>8</b>
-                                    <v>15</v>
+                                    <b>5</b>
+                                    <v>168427</v>
                                 </b>
                                 <b>
-                                    <a>8</a>
-                                    <b>61</b>
-                                    <v>9</v>
+                                    <a>5</a>
+                                    <b>7</b>
+                                    <v>267019</v>
+                                </b>
+                                <b>
+                                    <a>7</a>
+                                    <b>311</b>
+                                    <v>135563</v>
                                 </b>
                             </bs>
                         </hist>
@@ -2108,7 +2176,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>199</v>
+                                    <v>2961862</v>
                                 </b>
                             </bs>
                         </hist>
@@ -2124,32 +2192,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>54</v>
+                                    <v>1125589</v>
                                 </b>
                                 <b>
                                     <a>2</a>
-                                    <b>3</b>
-                                    <v>4</v>
-                                </b>
-                                <b>
-                                    <a>3</a>
-                                    <b>4</b>
-                                    <v>11</v>
-                                </b>
-                                <b>
-                                    <a>4</a>
                                     <b>6</b>
-                                    <v>6</v>
+                                    <v>110915</v>
                                 </b>
                                 <b>
                                     <a>6</a>
-                                    <b>21</b>
-                                    <v>7</v>
-                                </b>
-                                <b>
-                                    <a>40</a>
-                                    <b>141</b>
-                                    <v>4</v>
+                                    <b>404</b>
+                                    <v>65727</v>
                                 </b>
                             </bs>
                         </hist>
@@ -2165,32 +2218,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>54</v>
+                                    <v>1125589</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>5</v>
+                                    <v>106807</v>
                                 </b>
                                 <b>
                                     <a>3</a>
-                                    <b>4</b>
-                                    <v>11</v>
-                                </b>
-                                <b>
-                                    <a>4</a>
-                                    <b>5</b>
-                                    <v>6</v>
-                                </b>
-                                <b>
-                                    <a>5</a>
-                                    <b>12</b>
-                                    <v>7</v>
-                                </b>
-                                <b>
-                                    <a>14</a>
                                     <b>26</b>
-                                    <v>3</v>
+                                    <v>69835</v>
                                 </b>
                             </bs>
                         </hist>
@@ -2206,32 +2244,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>54</v>
+                                    <v>1125589</v>
                                 </b>
                                 <b>
                                     <a>2</a>
-                                    <b>3</b>
-                                    <v>4</v>
-                                </b>
-                                <b>
-                                    <a>3</a>
-                                    <b>4</b>
-                                    <v>11</v>
-                                </b>
-                                <b>
-                                    <a>4</a>
                                     <b>6</b>
-                                    <v>6</v>
+                                    <v>110915</v>
                                 </b>
                                 <b>
                                     <a>6</a>
-                                    <b>21</b>
-                                    <v>7</v>
-                                </b>
-                                <b>
-                                    <a>40</a>
-                                    <b>141</b>
-                                    <v>4</v>
+                                    <b>404</b>
+                                    <v>65727</v>
                                 </b>
                             </bs>
                         </hist>
@@ -2247,32 +2270,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>54</v>
+                                    <v>1236505</v>
                                 </b>
                                 <b>
                                     <a>2</a>
-                                    <b>3</b>
-                                    <v>4</v>
-                                </b>
-                                <b>
-                                    <a>3</a>
-                                    <b>4</b>
-                                    <v>11</v>
-                                </b>
-                                <b>
-                                    <a>4</a>
-                                    <b>5</b>
-                                    <v>8</v>
-                                </b>
-                                <b>
-                                    <a>5</a>
-                                    <b>13</b>
-                                    <v>7</v>
-                                </b>
-                                <b>
-                                    <a>13</a>
-                                    <b>15</b>
-                                    <v>2</v>
+                                    <b>23</b>
+                                    <v>65727</v>
                                 </b>
                             </bs>
                         </hist>
@@ -2286,64 +2289,49 @@
                             <budget>12</budget>
                             <bs>
                                 <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>7</a>
-                                    <b>8</b>
-                                    <v>1</v>
+                                    <a>6</a>
+                                    <b>7</b>
+                                    <v>4107</v>
                                 </b>
                                 <b>
                                     <a>8</a>
                                     <b>9</b>
-                                    <v>2</v>
-                                </b>
-                                <b>
-                                    <a>10</a>
-                                    <b>11</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>16</a>
-                                    <b>17</b>
-                                    <v>1</v>
+                                    <v>8215</v>
                                 </b>
                                 <b>
-                                    <a>18</a>
-                                    <b>19</b>
-                                    <v>1</v>
+                                    <a>9</a>
+                                    <b>10</b>
+                                    <v>12323</v>
                                 </b>
                                 <b>
-                                    <a>20</a>
-                                    <b>21</b>
-                                    <v>1</v>
+                                    <a>10</a>
+                                    <b>11</b>
+                                    <v>8215</v>
                                 </b>
                                 <b>
-                                    <a>21</a>
-                                    <b>22</b>
-                                    <v>2</v>
+                                    <a>13</a>
+                                    <b>16</b>
+                                    <v>8215</v>
                                 </b>
                                 <b>
-                                    <a>58</a>
-                                    <b>59</b>
-                                    <v>1</v>
+                                    <a>19</a>
+                                    <b>39</b>
+                                    <v>8215</v>
                                 </b>
                                 <b>
-                                    <a>100</a>
-                                    <b>101</b>
-                                    <v>1</v>
+                                    <a>40</a>
+                                    <b>41</b>
+                                    <v>4107</v>
                                 </b>
                                 <b>
-                                    <a>107</a>
-                                    <b>108</b>
-                                    <v>1</v>
+                                    <a>41</a>
+                                    <b>42</b>
+                                    <v>28755</v>
                                 </b>
                                 <b>
-                                    <a>108</a>
-                                    <b>109</b>
-                                    <v>1</v>
+                                    <a>67</a>
+                                    <b>1560</b>
+                                    <v>8215</v>
                                 </b>
                             </bs>
                         </hist>
@@ -2356,55 +2344,35 @@
                         <hist>
                             <budget>12</budget>
                             <bs>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>3</a>
-                                    <b>4</b>
-                                    <v>2</v>
-                                </b>
-                                <b>
-                                    <a>4</a>
-                                    <b>5</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>5</a>
-                                    <b>6</b>
-                                    <v>2</v>
-                                </b>
                                 <b>
                                     <a>6</a>
                                     <b>7</b>
-                                    <v>2</v>
+                                    <v>8215</v>
                                 </b>
                                 <b>
-                                    <a>8</a>
-                                    <b>9</b>
-                                    <v>2</v>
+                                    <a>7</a>
+                                    <b>8</b>
+                                    <v>12323</v>
                                 </b>
                                 <b>
-                                    <a>11</a>
-                                    <b>12</b>
-                                    <v>1</v>
+                                    <a>8</a>
+                                    <b>9</b>
+                                    <v>20539</v>
                                 </b>
                                 <b>
-                                    <a>16</a>
-                                    <b>17</b>
-                                    <v>1</v>
+                                    <a>9</a>
+                                    <b>15</b>
+                                    <v>8215</v>
                                 </b>
                                 <b>
-                                    <a>17</a>
-                                    <b>18</b>
-                                    <v>1</v>
+                                    <a>15</a>
+                                    <b>16</b>
+                                    <v>36971</v>
                                 </b>
                                 <b>
-                                    <a>19</a>
-                                    <b>20</b>
-                                    <v>1</v>
+                                    <a>31</a>
+                                    <b>32</b>
+                                    <v>4107</v>
                                 </b>
                             </bs>
                         </hist>
@@ -2418,54 +2386,29 @@
                             <budget>12</budget>
                             <bs>
                                 <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>2</v>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>4107</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>6</a>
-                                    <b>7</b>
-                                    <v>2</v>
-                                </b>
-                                <b>
-                                    <a>7</a>
-                                    <b>8</b>
-                                    <v>3</v>
-                                </b>
-                                <b>
-                                    <a>9</a>
-                                    <b>10</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>10</a>
-                                    <b>11</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>20</a>
-                                    <b>21</b>
-                                    <v>1</v>
+                                    <v>32863</v>
                                 </b>
                                 <b>
-                                    <a>23</a>
-                                    <b>24</b>
-                                    <v>1</v>
+                                    <a>5</a>
+                                    <b>6</b>
+                                    <v>8215</v>
                                 </b>
                                 <b>
-                                    <a>47</a>
-                                    <b>48</b>
-                                    <v>1</v>
+                                    <a>13</a>
+                                    <b>14</b>
+                                    <v>36971</v>
                                 </b>
                                 <b>
-                                    <a>49</a>
-                                    <b>50</b>
-                                    <v>1</v>
+                                    <a>38</a>
+                                    <b>522</b>
+                                    <v>8215</v>
                                 </b>
                             </bs>
                         </hist>
@@ -2479,59 +2422,39 @@
                             <budget>12</budget>
                             <bs>
                                 <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>3</a>
-                                    <b>4</b>
-                                    <v>2</v>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>4107</v>
                                 </b>
                                 <b>
-                                    <a>4</a>
-                                    <b>5</b>
-                                    <v>1</v>
+                                    <a>5</a>
+                                    <b>6</b>
+                                    <v>24647</v>
                                 </b>
                                 <b>
-                                    <a>7</a>
+                                    <a>6</a>
                                     <b>8</b>
-                                    <v>3</v>
+                                    <v>8215</v>
                                 </b>
                                 <b>
-                                    <a>8</a>
-                                    <b>9</b>
-                                    <v>1</v>
+                                    <a>11</a>
+                                    <b>13</b>
+                                    <v>8215</v>
                                 </b>
                                 <b>
                                     <a>13</a>
                                     <b>14</b>
-                                    <v>1</v>
+                                    <v>12323</v>
                                 </b>
                                 <b>
                                     <a>14</a>
                                     <b>15</b>
-                                    <v>1</v>
+                                    <v>24647</v>
                                 </b>
                                 <b>
                                     <a>16</a>
-                                    <b>17</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>30</a>
-                                    <b>31</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>34</a>
-                                    <b>35</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>67</a>
-                                    <b>68</b>
-                                    <v>1</v>
+                                    <b>314</b>
+                                    <v>8215</v>
                                 </b>
                             </bs>
                         </hist>
@@ -2541,31 +2464,31 @@
         </relation>
         <relation>
             <name>xmlAttrs</name>
-            <cardinality>408</cardinality>
+            <cardinality>3762921</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>408</v>
+                    <v>3762921</v>
                 </e>
                 <e>
                     <k>elementid</k>
-                    <v>288</v>
+                    <v>2744139</v>
                 </e>
                 <e>
                     <k>name</k>
-                    <v>28</v>
+                    <v>180751</v>
                 </e>
                 <e>
                     <k>value</k>
-                    <v>235</v>
+                    <v>1713032</v>
                 </e>
                 <e>
                     <k>idx</k>
-                    <v>6</v>
+                    <v>20539</v>
                 </e>
                 <e>
                     <k>fileid</k>
-                    <v>14</v>
+                    <v>90375</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -2579,7 +2502,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>408</v>
+                                    <v>3762921</v>
                                 </b>
                             </bs>
                         </hist>
@@ -2595,7 +2518,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>408</v>
+                                    <v>3762921</v>
                                 </b>
                             </bs>
                         </hist>
@@ -2611,7 +2534,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>408</v>
+                                    <v>3762921</v>
                                 </b>
                             </bs>
                         </hist>
@@ -2627,7 +2550,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>408</v>
+                                    <v>3762921</v>
                                 </b>
                             </bs>
                         </hist>
@@ -2643,7 +2566,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>408</v>
+                                    <v>3762921</v>
                                 </b>
                             </bs>
                         </hist>
@@ -2659,22 +2582,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>195</v>
+                                    <v>1963620</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>69</v>
+                                    <v>579226</v>
                                 </b>
                                 <b>
                                     <a>3</a>
-                                    <b>4</b>
-                                    <v>23</v>
-                                </b>
-                                <b>
-                                    <a>6</a>
-                                    <b>7</b>
-                                    <v>1</v>
+                                    <b>6</b>
+                                    <v>201291</v>
                                 </b>
                             </bs>
                         </hist>
@@ -2690,22 +2608,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>195</v>
+                                    <v>1963620</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>69</v>
+                                    <v>579226</v>
                                 </b>
                                 <b>
                                     <a>3</a>
-                                    <b>4</b>
-                                    <v>23</v>
-                                </b>
-                                <b>
-                                    <a>6</a>
-                                    <b>7</b>
-                                    <v>1</v>
+                                    <b>6</b>
+                                    <v>201291</v>
                                 </b>
                             </bs>
                         </hist>
@@ -2721,22 +2634,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>195</v>
+                                    <v>1963620</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>70</v>
+                                    <v>579226</v>
                                 </b>
                                 <b>
                                     <a>3</a>
-                                    <b>4</b>
-                                    <v>22</v>
-                                </b>
-                                <b>
-                                    <a>4</a>
-                                    <b>5</b>
-                                    <v>1</v>
+                                    <b>6</b>
+                                    <v>201291</v>
                                 </b>
                             </bs>
                         </hist>
@@ -2752,22 +2660,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>195</v>
+                                    <v>1963620</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>69</v>
+                                    <v>579226</v>
                                 </b>
                                 <b>
                                     <a>3</a>
-                                    <b>4</b>
-                                    <v>23</v>
-                                </b>
-                                <b>
-                                    <a>6</a>
-                                    <b>7</b>
-                                    <v>1</v>
+                                    <b>6</b>
+                                    <v>201291</v>
                                 </b>
                             </bs>
                         </hist>
@@ -2783,7 +2686,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>288</v>
+                                    <v>2744139</v>
                                 </b>
                             </bs>
                         </hist>
@@ -2799,42 +2702,42 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>12</v>
+                                    <v>65727</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>3</v>
+                                    <v>8215</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>4</v>
+                                    <v>24647</v>
                                 </b>
                                 <b>
-                                    <a>5</a>
-                                    <b>15</b>
-                                    <v>2</v>
+                                    <a>4</a>
+                                    <b>6</b>
+                                    <v>16431</v>
                                 </b>
                                 <b>
-                                    <a>21</a>
-                                    <b>22</b>
-                                    <v>2</v>
+                                    <a>8</a>
+                                    <b>12</b>
+                                    <v>16431</v>
                                 </b>
                                 <b>
-                                    <a>22</a>
-                                    <b>23</b>
-                                    <v>2</v>
+                                    <a>17</a>
+                                    <b>30</b>
+                                    <v>16431</v>
                                 </b>
                                 <b>
-                                    <a>45</a>
-                                    <b>97</b>
-                                    <v>2</v>
+                                    <a>30</a>
+                                    <b>50</b>
+                                    <v>16431</v>
                                 </b>
                                 <b>
-                                    <a>132</a>
-                                    <b>133</b>
-                                    <v>1</v>
+                                    <a>50</a>
+                                    <b>250</b>
+                                    <v>16431</v>
                                 </b>
                             </bs>
                         </hist>
@@ -2850,42 +2753,42 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>12</v>
+                                    <v>65727</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>3</v>
+                                    <v>8215</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>4</v>
+                                    <v>24647</v>
                                 </b>
                                 <b>
-                                    <a>5</a>
-                                    <b>15</b>
-                                    <v>2</v>
+                                    <a>4</a>
+                                    <b>6</b>
+                                    <v>16431</v>
                                 </b>
                                 <b>
-                                    <a>21</a>
-                                    <b>22</b>
-                                    <v>2</v>
+                                    <a>8</a>
+                                    <b>12</b>
+                                    <v>16431</v>
                                 </b>
                                 <b>
-                                    <a>22</a>
-                                    <b>23</b>
-                                    <v>2</v>
+                                    <a>17</a>
+                                    <b>30</b>
+                                    <v>16431</v>
                                 </b>
                                 <b>
-                                    <a>45</a>
-                                    <b>97</b>
-                                    <v>2</v>
+                                    <a>30</a>
+                                    <b>50</b>
+                                    <v>16431</v>
                                 </b>
                                 <b>
-                                    <a>132</a>
-                                    <b>133</b>
-                                    <v>1</v>
+                                    <a>50</a>
+                                    <b>250</b>
+                                    <v>16431</v>
                                 </b>
                             </bs>
                         </hist>
@@ -2901,37 +2804,32 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>16</v>
+                                    <v>94483</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>2</v>
+                                    <v>20539</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>3</v>
-                                </b>
-                                <b>
-                                    <a>11</a>
-                                    <b>12</b>
-                                    <v>1</v>
+                                    <v>20539</v>
                                 </b>
                                 <b>
-                                    <a>15</a>
-                                    <b>16</b>
-                                    <v>2</v>
+                                    <a>4</a>
+                                    <b>5</b>
+                                    <v>12323</v>
                                 </b>
                                 <b>
-                                    <a>21</a>
-                                    <b>36</b>
-                                    <v>2</v>
+                                    <a>5</a>
+                                    <b>14</b>
+                                    <v>16431</v>
                                 </b>
                                 <b>
-                                    <a>41</a>
-                                    <b>75</b>
-                                    <v>2</v>
+                                    <a>30</a>
+                                    <b>178</b>
+                                    <v>16431</v>
                                 </b>
                             </bs>
                         </hist>
@@ -2947,17 +2845,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>19</v>
+                                    <v>135563</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>5</v>
+                                    <v>28755</v>
                                 </b>
                                 <b>
                                     <a>3</a>
-                                    <b>4</b>
-                                    <v>4</v>
+                                    <b>5</b>
+                                    <v>16431</v>
                                 </b>
                             </bs>
                         </hist>
@@ -2973,32 +2871,37 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>18</v>
+                                    <v>102699</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>2</v>
+                                    <v>12323</v>
                                 </b>
                                 <b>
                                     <a>3</a>
-                                    <b>4</b>
-                                    <v>2</v>
+                                    <b>8</b>
+                                    <v>16431</v>
                                 </b>
                                 <b>
-                                    <a>4</a>
-                                    <b>6</b>
-                                    <v>2</v>
+                                    <a>9</a>
+                                    <b>12</b>
+                                    <v>16431</v>
                                 </b>
                                 <b>
-                                    <a>10</a>
-                                    <b>11</b>
-                                    <v>3</v>
+                                    <a>14</a>
+                                    <b>17</b>
+                                    <v>12323</v>
                                 </b>
                                 <b>
-                                    <a>13</a>
-                                    <b>14</b>
-                                    <v>1</v>
+                                    <a>17</a>
+                                    <b>18</b>
+                                    <v>12323</v>
+                                </b>
+                                <b>
+                                    <a>19</a>
+                                    <b>20</b>
+                                    <v>8215</v>
                                 </b>
                             </bs>
                         </hist>
@@ -3014,22 +2917,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>171</v>
+                                    <v>1294017</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>32</v>
+                                    <v>127347</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>5</b>
-                                    <v>18</v>
+                                    <v>139671</v>
                                 </b>
                                 <b>
                                     <a>5</a>
-                                    <b>13</b>
-                                    <v>14</v>
+                                    <b>17</b>
+                                    <v>131455</v>
+                                </b>
+                                <b>
+                                    <a>19</a>
+                                    <b>31</b>
+                                    <v>20539</v>
                                 </b>
                             </bs>
                         </hist>
@@ -3045,22 +2953,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>174</v>
+                                    <v>1298125</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>29</v>
+                                    <v>127347</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>5</b>
-                                    <v>18</v>
+                                    <v>135563</v>
                                 </b>
                                 <b>
                                     <a>5</a>
-                                    <b>13</b>
-                                    <v>14</v>
+                                    <b>17</b>
+                                    <v>131455</v>
+                                </b>
+                                <b>
+                                    <a>19</a>
+                                    <b>31</b>
+                                    <v>20539</v>
                                 </b>
                             </bs>
                         </hist>
@@ -3076,12 +2989,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>230</v>
+                                    <v>1688384</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>4</b>
-                                    <v>5</v>
+                                    <v>24647</v>
                                 </b>
                             </bs>
                         </hist>
@@ -3097,12 +3010,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>224</v>
+                                    <v>1671952</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>4</b>
-                                    <v>11</v>
+                                    <v>41079</v>
                                 </b>
                             </bs>
                         </hist>
@@ -3118,17 +3031,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>193</v>
+                                    <v>1474769</v>
                                 </b>
                                 <b>
                                     <a>2</a>
-                                    <b>3</b>
-                                    <v>32</v>
+                                    <b>6</b>
+                                    <v>127347</v>
                                 </b>
                                 <b>
-                                    <a>3</a>
-                                    <b>7</b>
-                                    <v>10</v>
+                                    <a>9</a>
+                                    <b>20</b>
+                                    <v>110915</v>
                                 </b>
                             </bs>
                         </hist>
@@ -3142,24 +3055,29 @@
                             <budget>12</budget>
                             <bs>
                                 <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>3</v>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>4107</v>
                                 </b>
                                 <b>
-                                    <a>24</a>
-                                    <b>25</b>
-                                    <v>1</v>
+                                    <a>6</a>
+                                    <b>7</b>
+                                    <v>4107</v>
+                                </b>
+                                <b>
+                                    <a>49</a>
+                                    <b>50</b>
+                                    <v>4107</v>
                                 </b>
                                 <b>
-                                    <a>93</a>
-                                    <b>94</b>
-                                    <v>1</v>
+                                    <a>190</a>
+                                    <b>191</b>
+                                    <v>4107</v>
                                 </b>
                                 <b>
-                                    <a>288</a>
-                                    <b>289</b>
-                                    <v>1</v>
+                                    <a>668</a>
+                                    <b>669</b>
+                                    <v>4107</v>
                                 </b>
                             </bs>
                         </hist>
@@ -3173,24 +3091,29 @@
                             <budget>12</budget>
                             <bs>
                                 <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>3</v>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>4107</v>
                                 </b>
                                 <b>
-                                    <a>24</a>
-                                    <b>25</b>
-                                    <v>1</v>
+                                    <a>6</a>
+                                    <b>7</b>
+                                    <v>4107</v>
                                 </b>
                                 <b>
-                                    <a>93</a>
-                                    <b>94</b>
-                                    <v>1</v>
+                                    <a>49</a>
+                                    <b>50</b>
+                                    <v>4107</v>
+                                </b>
+                                <b>
+                                    <a>190</a>
+                                    <b>191</b>
+                                    <v>4107</v>
                                 </b>
                                 <b>
-                                    <a>288</a>
-                                    <b>289</b>
-                                    <v>1</v>
+                                    <a>668</a>
+                                    <b>669</b>
+                                    <v>4107</v>
                                 </b>
                             </bs>
                         </hist>
@@ -3204,24 +3127,29 @@
                             <budget>12</budget>
                             <bs>
                                 <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>3</v>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>4107</v>
                                 </b>
                                 <b>
-                                    <a>8</a>
-                                    <b>9</b>
-                                    <v>1</v>
+                                    <a>4</a>
+                                    <b>5</b>
+                                    <v>4107</v>
                                 </b>
                                 <b>
-                                    <a>14</a>
-                                    <b>15</b>
-                                    <v>1</v>
+                                    <a>9</a>
+                                    <b>10</b>
+                                    <v>4107</v>
                                 </b>
                                 <b>
-                                    <a>16</a>
-                                    <b>17</b>
-                                    <v>1</v>
+                                    <a>21</a>
+                                    <b>22</b>
+                                    <v>4107</v>
+                                </b>
+                                <b>
+                                    <a>25</a>
+                                    <b>26</b>
+                                    <v>4107</v>
                                 </b>
                             </bs>
                         </hist>
@@ -3235,24 +3163,29 @@
                             <budget>12</budget>
                             <bs>
                                 <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>3</v>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>4107</v>
                                 </b>
                                 <b>
-                                    <a>23</a>
-                                    <b>24</b>
-                                    <v>1</v>
+                                    <a>6</a>
+                                    <b>7</b>
+                                    <v>4107</v>
                                 </b>
                                 <b>
-                                    <a>64</a>
-                                    <b>65</b>
-                                    <v>1</v>
+                                    <a>21</a>
+                                    <b>22</b>
+                                    <v>4107</v>
+                                </b>
+                                <b>
+                                    <a>72</a>
+                                    <b>73</b>
+                                    <v>4107</v>
                                 </b>
                                 <b>
-                                    <a>157</a>
-                                    <b>158</b>
-                                    <v>1</v>
+                                    <a>326</a>
+                                    <b>327</b>
+                                    <v>4107</v>
                                 </b>
                             </bs>
                         </hist>
@@ -3266,24 +3199,19 @@
                             <budget>12</budget>
                             <bs>
                                 <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>3</v>
-                                </b>
-                                <b>
-                                    <a>6</a>
-                                    <b>7</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>12</a>
-                                    <b>13</b>
-                                    <v>1</v>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>8215</v>
                                 </b>
                                 <b>
                                     <a>14</a>
                                     <b>15</b>
-                                    <v>1</v>
+                                    <v>4107</v>
+                                </b>
+                                <b>
+                                    <a>22</a>
+                                    <b>23</b>
+                                    <v>8215</v>
                                 </b>
                             </bs>
                         </hist>
@@ -3297,64 +3225,54 @@
                             <budget>12</budget>
                             <bs>
                                 <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>1</v>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>4107</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>1</v>
+                                    <v>8215</v>
                                 </b>
                                 <b>
-                                    <a>10</a>
-                                    <b>11</b>
-                                    <v>2</v>
+                                    <a>9</a>
+                                    <b>10</b>
+                                    <v>4107</v>
                                 </b>
                                 <b>
                                     <a>11</a>
                                     <b>12</b>
-                                    <v>1</v>
+                                    <v>12323</v>
                                 </b>
                                 <b>
                                     <a>12</a>
-                                    <b>13</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>17</a>
-                                    <b>18</b>
-                                    <v>1</v>
+                                    <b>14</b>
+                                    <v>8215</v>
                                 </b>
                                 <b>
                                     <a>18</a>
-                                    <b>19</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>19</a>
-                                    <b>20</b>
-                                    <v>1</v>
+                                    <b>38</b>
+                                    <v>8215</v>
                                 </b>
                                 <b>
-                                    <a>22</a>
-                                    <b>23</b>
-                                    <v>1</v>
+                                    <a>39</a>
+                                    <b>40</b>
+                                    <v>12323</v>
                                 </b>
                                 <b>
-                                    <a>48</a>
-                                    <b>49</b>
-                                    <v>1</v>
+                                    <a>40</a>
+                                    <b>41</b>
+                                    <v>12323</v>
                                 </b>
                                 <b>
-                                    <a>73</a>
-                                    <b>74</b>
-                                    <v>2</v>
+                                    <a>41</a>
+                                    <b>42</b>
+                                    <v>12323</v>
                                 </b>
                                 <b>
-                                    <a>89</a>
-                                    <b>90</b>
-                                    <v>1</v>
+                                    <a>91</a>
+                                    <b>333</b>
+                                    <v>8215</v>
                                 </b>
                             </bs>
                         </hist>
@@ -3368,64 +3286,49 @@
                             <budget>12</budget>
                             <bs>
                                 <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>1</v>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>4107</v>
                                 </b>
                                 <b>
-                                    <a>4</a>
-                                    <b>5</b>
-                                    <v>1</v>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>8215</v>
                                 </b>
                                 <b>
-                                    <a>8</a>
-                                    <b>9</b>
-                                    <v>2</v>
+                                    <a>5</a>
+                                    <b>7</b>
+                                    <v>8215</v>
                                 </b>
                                 <b>
-                                    <a>9</a>
-                                    <b>10</b>
-                                    <v>1</v>
+                                    <a>7</a>
+                                    <b>8</b>
+                                    <v>12323</v>
                                 </b>
                                 <b>
-                                    <a>11</a>
+                                    <a>9</a>
                                     <b>12</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>12</a>
-                                    <b>13</b>
-                                    <v>2</v>
-                                </b>
-                                <b>
-                                    <a>16</a>
-                                    <b>17</b>
-                                    <v>1</v>
+                                    <v>8215</v>
                                 </b>
                                 <b>
                                     <a>17</a>
                                     <b>18</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>18</a>
-                                    <b>19</b>
-                                    <v>1</v>
+                                    <v>4107</v>
                                 </b>
                                 <b>
-                                    <a>42</a>
-                                    <b>43</b>
-                                    <v>1</v>
+                                    <a>25</a>
+                                    <b>26</b>
+                                    <v>12323</v>
                                 </b>
                                 <b>
-                                    <a>63</a>
-                                    <b>64</b>
-                                    <v>1</v>
+                                    <a>26</a>
+                                    <b>27</b>
+                                    <v>24647</v>
                                 </b>
                                 <b>
-                                    <a>67</a>
-                                    <b>68</b>
-                                    <v>1</v>
+                                    <a>58</a>
+                                    <b>303</b>
+                                    <v>8215</v>
                                 </b>
                             </bs>
                         </hist>
@@ -3438,40 +3341,55 @@
                         <hist>
                             <budget>12</budget>
                             <bs>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>2</v>
-                                </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>2</v>
+                                    <v>4107</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>4</v>
+                                    <v>8215</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>6</b>
-                                    <v>1</v>
+                                    <v>4107</v>
                                 </b>
                                 <b>
-                                    <a>6</a>
-                                    <b>7</b>
-                                    <v>2</v>
+                                    <a>8</a>
+                                    <b>9</b>
+                                    <v>8215</v>
                                 </b>
                                 <b>
-                                    <a>7</a>
-                                    <b>8</b>
-                                    <v>2</v>
+                                    <a>9</a>
+                                    <b>10</b>
+                                    <v>12323</v>
                                 </b>
                                 <b>
-                                    <a>23</a>
-                                    <b>24</b>
-                                    <v>1</v>
+                                    <a>10</a>
+                                    <b>11</b>
+                                    <v>4107</v>
+                                </b>
+                                <b>
+                                    <a>11</a>
+                                    <b>12</b>
+                                    <v>12323</v>
+                                </b>
+                                <b>
+                                    <a>12</a>
+                                    <b>13</b>
+                                    <v>24647</v>
+                                </b>
+                                <b>
+                                    <a>13</a>
+                                    <b>17</b>
+                                    <v>8215</v>
+                                </b>
+                                <b>
+                                    <a>20</a>
+                                    <b>21</b>
+                                    <v>4107</v>
                                 </b>
                             </bs>
                         </hist>
@@ -3484,70 +3402,50 @@
                         <hist>
                             <budget>12</budget>
                             <bs>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>1</v>
-                                </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>6</a>
-                                    <b>7</b>
-                                    <v>1</v>
+                                    <v>4107</v>
                                 </b>
                                 <b>
-                                    <a>8</a>
-                                    <b>9</b>
-                                    <v>2</v>
+                                    <a>4</a>
+                                    <b>5</b>
+                                    <v>8215</v>
                                 </b>
                                 <b>
                                     <a>9</a>
                                     <b>10</b>
-                                    <v>1</v>
+                                    <v>4107</v>
                                 </b>
                                 <b>
-                                    <a>10</a>
-                                    <b>11</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>13</a>
-                                    <b>14</b>
-                                    <v>1</v>
+                                    <a>11</a>
+                                    <b>12</b>
+                                    <v>20539</v>
                                 </b>
                                 <b>
-                                    <a>14</a>
-                                    <b>15</b>
-                                    <v>1</v>
+                                    <a>17</a>
+                                    <b>27</b>
+                                    <v>8215</v>
                                 </b>
                                 <b>
-                                    <a>18</a>
-                                    <b>19</b>
-                                    <v>1</v>
+                                    <a>33</a>
+                                    <b>34</b>
+                                    <v>12323</v>
                                 </b>
                                 <b>
-                                    <a>32</a>
-                                    <b>33</b>
-                                    <v>1</v>
+                                    <a>34</a>
+                                    <b>35</b>
+                                    <v>12323</v>
                                 </b>
                                 <b>
-                                    <a>54</a>
-                                    <b>55</b>
-                                    <v>1</v>
+                                    <a>35</a>
+                                    <b>36</b>
+                                    <v>12323</v>
                                 </b>
                                 <b>
                                     <a>60</a>
-                                    <b>61</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>61</a>
-                                    <b>62</b>
-                                    <v>1</v>
+                                    <b>244</b>
+                                    <v>8215</v>
                                 </b>
                             </bs>
                         </hist>
@@ -3560,25 +3458,20 @@
                         <hist>
                             <budget>12</budget>
                             <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>2</v>
-                                </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>6</v>
+                                    <v>32863</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>5</v>
+                                    <v>45187</v>
                                 </b>
                                 <b>
-                                    <a>6</a>
-                                    <b>7</b>
-                                    <v>1</v>
+                                    <a>5</a>
+                                    <b>6</b>
+                                    <v>12323</v>
                                 </b>
                             </bs>
                         </hist>
@@ -3812,23 +3705,23 @@
         </relation>
         <relation>
             <name>xmlComments</name>
-            <cardinality>30</cardinality>
+            <cardinality>131455</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>30</v>
+                    <v>131455</v>
                 </e>
                 <e>
                     <k>text</k>
-                    <v>18</v>
+                    <v>98591</v>
                 </e>
                 <e>
                     <k>parentid</k>
-                    <v>20</v>
+                    <v>115023</v>
                 </e>
                 <e>
                     <k>fileid</k>
-                    <v>10</v>
+                    <v>49295</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -3842,7 +3735,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>30</v>
+                                    <v>131455</v>
                                 </b>
                             </bs>
                         </hist>
@@ -3858,7 +3751,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>30</v>
+                                    <v>131455</v>
                                 </b>
                             </bs>
                         </hist>
@@ -3874,7 +3767,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>30</v>
+                                    <v>131455</v>
                                 </b>
                             </bs>
                         </hist>
@@ -3890,22 +3783,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>13</v>
+                                    <v>86267</v>
                                 </b>
                                 <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>3</v>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>4107</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>7</a>
-                                    <b>8</b>
-                                    <v>1</v>
+                                    <v>8215</v>
                                 </b>
                             </bs>
                         </hist>
@@ -3921,22 +3809,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>14</v>
+                                    <v>86267</v>
                                 </b>
                                 <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>2</v>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>4107</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>7</a>
-                                    <b>8</b>
-                                    <v>1</v>
+                                    <v>8215</v>
                                 </b>
                             </bs>
                         </hist>
@@ -3952,17 +3835,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>15</v>
+                                    <v>86267</v>
                                 </b>
                                 <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>2</v>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>4107</v>
                                 </b>
                                 <b>
-                                    <a>7</a>
-                                    <b>8</b>
-                                    <v>1</v>
+                                    <a>4</a>
+                                    <b>5</b>
+                                    <v>8215</v>
                                 </b>
                             </bs>
                         </hist>
@@ -3978,22 +3861,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>15</v>
+                                    <v>98591</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>3</v>
-                                </b>
-                                <b>
-                                    <a>4</a>
-                                    <b>5</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>5</a>
-                                    <b>6</b>
-                                    <v>1</v>
+                                    <v>16431</v>
                                 </b>
                             </bs>
                         </hist>
@@ -4009,22 +3882,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>15</v>
+                                    <v>98591</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>3</v>
-                                </b>
-                                <b>
-                                    <a>3</a>
-                                    <b>4</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>5</a>
-                                    <b>6</b>
-                                    <v>1</v>
+                                    <v>16431</v>
                                 </b>
                             </bs>
                         </hist>
@@ -4040,7 +3903,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>20</v>
+                                    <v>115023</v>
                                 </b>
                             </bs>
                         </hist>
@@ -4056,27 +3919,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>6</v>
+                                    <v>28755</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>4</a>
-                                    <b>5</b>
-                                    <v>1</v>
+                                    <v>12323</v>
                                 </b>
                                 <b>
-                                    <a>8</a>
-                                    <b>9</b>
-                                    <v>1</v>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>4107</v>
                                 </b>
                                 <b>
-                                    <a>10</a>
-                                    <b>11</b>
-                                    <v>1</v>
+                                    <a>16</a>
+                                    <b>17</b>
+                                    <v>4107</v>
                                 </b>
                             </bs>
                         </hist>
@@ -4092,27 +3950,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>6</v>
+                                    <v>28755</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>4</a>
-                                    <b>5</b>
-                                    <v>1</v>
+                                    <v>12323</v>
                                 </b>
                                 <b>
-                                    <a>5</a>
-                                    <b>6</b>
-                                    <v>1</v>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>4107</v>
                                 </b>
                                 <b>
-                                    <a>9</a>
-                                    <b>10</b>
-                                    <v>1</v>
+                                    <a>16</a>
+                                    <b>17</b>
+                                    <v>4107</v>
                                 </b>
                             </bs>
                         </hist>
@@ -4128,17 +3981,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7</v>
+                                    <v>41079</v>
                                 </b>
                                 <b>
-                                    <a>3</a>
-                                    <b>4</b>
-                                    <v>1</v>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>4107</v>
                                 </b>
                                 <b>
-                                    <a>5</a>
-                                    <b>6</b>
-                                    <v>2</v>
+                                    <a>16</a>
+                                    <b>17</b>
+                                    <v>4107</v>
                                 </b>
                             </bs>
                         </hist>
@@ -4148,31 +4001,31 @@
         </relation>
         <relation>
             <name>xmlChars</name>
-            <cardinality>869</cardinality>
+            <cardinality>13383839</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>869</v>
+                    <v>13383839</v>
                 </e>
                 <e>
                     <k>text</k>
-                    <v>427</v>
+                    <v>5862105</v>
                 </e>
                 <e>
                     <k>parentid</k>
-                    <v>432</v>
+                    <v>6926075</v>
                 </e>
                 <e>
                     <k>idx</k>
-                    <v>87</v>
+                    <v>1281693</v>
                 </e>
                 <e>
                     <k>isCDATA</k>
-                    <v>1</v>
+                    <v>4107</v>
                 </e>
                 <e>
                     <k>fileid</k>
-                    <v>14</v>
+                    <v>94483</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -4186,7 +4039,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>869</v>
+                                    <v>13383839</v>
                                 </b>
                             </bs>
                         </hist>
@@ -4202,7 +4055,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>869</v>
+                                    <v>13383839</v>
                                 </b>
                             </bs>
                         </hist>
@@ -4218,7 +4071,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>869</v>
+                                    <v>13383839</v>
                                 </b>
                             </bs>
                         </hist>
@@ -4234,7 +4087,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>869</v>
+                                    <v>13383839</v>
                                 </b>
                             </bs>
                         </hist>
@@ -4250,7 +4103,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>869</v>
+                                    <v>13383839</v>
                                 </b>
                             </bs>
                         </hist>
@@ -4266,22 +4119,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>339</v>
+                                    <v>5081586</v>
                                 </b>
                                 <b>
                                     <a>2</a>
-                                    <b>3</b>
-                                    <v>53</v>
-                                </b>
-                                <b>
-                                    <a>3</a>
-                                    <b>49</b>
-                                    <v>33</v>
+                                    <b>4</b>
+                                    <v>480635</v>
                                 </b>
                                 <b>
-                                    <a>68</a>
-                                    <b>90</b>
-                                    <v>2</v>
+                                    <a>4</a>
+                                    <b>567</b>
+                                    <v>299883</v>
                                 </b>
                             </bs>
                         </hist>
@@ -4297,22 +4145,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>342</v>
+                                    <v>5098018</v>
                                 </b>
                                 <b>
                                     <a>2</a>
-                                    <b>3</b>
-                                    <v>50</v>
-                                </b>
-                                <b>
-                                    <a>3</a>
-                                    <b>28</b>
-                                    <v>33</v>
+                                    <b>4</b>
+                                    <v>484743</v>
                                 </b>
                                 <b>
-                                    <a>28</a>
-                                    <b>32</b>
-                                    <v>2</v>
+                                    <a>4</a>
+                                    <b>179</b>
+                                    <v>279343</v>
                                 </b>
                             </bs>
                         </hist>
@@ -4328,12 +4171,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>400</v>
+                                    <v>5701893</v>
                                 </b>
                                 <b>
                                     <a>2</a>
-                                    <b>58</b>
-                                    <v>27</v>
+                                    <b>298</b>
+                                    <v>160211</v>
                                 </b>
                             </bs>
                         </hist>
@@ -4349,7 +4192,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>427</v>
+                                    <v>5862105</v>
                                 </b>
                             </bs>
                         </hist>
@@ -4365,17 +4208,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>380</v>
+                                    <v>5710109</v>
                                 </b>
                                 <b>
                                     <a>2</a>
-                                    <b>4</b>
-                                    <v>36</v>
-                                </b>
-                                <b>
-                                    <a>4</a>
-                                    <b>11</b>
-                                    <v>11</v>
+                                    <b>22</b>
+                                    <v>151995</v>
                                 </b>
                             </bs>
                         </hist>
@@ -4391,27 +4229,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>302</v>
+                                    <v>5328066</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>53</v>
+                                    <v>583334</v>
                                 </b>
                                 <b>
                                     <a>3</a>
-                                    <b>4</b>
-                                    <v>28</v>
-                                </b>
-                                <b>
-                                    <a>4</a>
-                                    <b>7</b>
-                                    <v>34</v>
+                                    <b>5</b>
+                                    <v>521715</v>
                                 </b>
                                 <b>
-                                    <a>7</a>
-                                    <b>60</b>
-                                    <v>15</v>
+                                    <a>5</a>
+                                    <b>308</b>
+                                    <v>492959</v>
                                 </b>
                             </bs>
                         </hist>
@@ -4427,22 +4260,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>314</v>
+                                    <v>5664921</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>67</v>
+                                    <v>558686</v>
                                 </b>
                                 <b>
                                     <a>3</a>
-                                    <b>5</b>
-                                    <v>37</v>
+                                    <b>7</b>
+                                    <v>595658</v>
                                 </b>
                                 <b>
-                                    <a>5</a>
-                                    <b>26</b>
-                                    <v>14</v>
+                                    <a>7</a>
+                                    <b>14</b>
+                                    <v>106807</v>
                                 </b>
                             </bs>
                         </hist>
@@ -4458,27 +4291,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>302</v>
+                                    <v>5328066</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>53</v>
+                                    <v>583334</v>
                                 </b>
                                 <b>
                                     <a>3</a>
-                                    <b>4</b>
-                                    <v>28</v>
-                                </b>
-                                <b>
-                                    <a>4</a>
-                                    <b>7</b>
-                                    <v>34</v>
+                                    <b>5</b>
+                                    <v>521715</v>
                                 </b>
                                 <b>
-                                    <a>7</a>
-                                    <b>60</b>
-                                    <v>15</v>
+                                    <a>5</a>
+                                    <b>308</b>
+                                    <v>492959</v>
                                 </b>
                             </bs>
                         </hist>
@@ -4494,7 +4322,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>432</v>
+                                    <v>6926075</v>
                                 </b>
                             </bs>
                         </hist>
@@ -4510,7 +4338,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>432</v>
+                                    <v>6926075</v>
                                 </b>
                             </bs>
                         </hist>
@@ -4526,32 +4354,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>55</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>3</v>
+                                    <v>1105050</v>
                                 </b>
                                 <b>
                                     <a>3</a>
-                                    <b>4</b>
-                                    <v>11</v>
-                                </b>
-                                <b>
-                                    <a>4</a>
-                                    <b>7</b>
-                                    <v>7</v>
-                                </b>
-                                <b>
-                                    <a>8</a>
-                                    <b>28</b>
-                                    <v>7</v>
+                                    <b>6</b>
+                                    <v>110915</v>
                                 </b>
                                 <b>
-                                    <a>41</a>
-                                    <b>408</b>
-                                    <v>4</v>
+                                    <a>6</a>
+                                    <b>1550</b>
+                                    <v>65727</v>
                                 </b>
                             </bs>
                         </hist>
@@ -4567,32 +4380,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>55</v>
+                                    <v>1105050</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>3</v>
+                                    <v>102699</v>
                                 </b>
                                 <b>
                                     <a>3</a>
-                                    <b>4</b>
-                                    <v>12</v>
-                                </b>
-                                <b>
-                                    <a>4</a>
-                                    <b>7</b>
-                                    <v>7</v>
-                                </b>
-                                <b>
-                                    <a>7</a>
-                                    <b>28</b>
-                                    <v>7</v>
-                                </b>
-                                <b>
-                                    <a>44</a>
-                                    <b>251</b>
-                                    <v>3</v>
+                                    <b>923</b>
+                                    <v>73943</v>
                                 </b>
                             </bs>
                         </hist>
@@ -4608,32 +4406,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>55</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>3</v>
+                                    <v>1105050</v>
                                 </b>
                                 <b>
                                     <a>3</a>
-                                    <b>4</b>
-                                    <v>11</v>
-                                </b>
-                                <b>
-                                    <a>4</a>
-                                    <b>7</b>
-                                    <v>7</v>
-                                </b>
-                                <b>
-                                    <a>8</a>
-                                    <b>28</b>
-                                    <v>7</v>
+                                    <b>6</b>
+                                    <v>110915</v>
                                 </b>
                                 <b>
-                                    <a>41</a>
-                                    <b>408</b>
-                                    <v>4</v>
+                                    <a>6</a>
+                                    <b>1550</b>
+                                    <v>65727</v>
                                 </b>
                             </bs>
                         </hist>
@@ -4649,7 +4432,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>87</v>
+                                    <v>1281693</v>
                                 </b>
                             </bs>
                         </hist>
@@ -4665,32 +4448,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>55</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>3</v>
-                                </b>
-                                <b>
-                                    <a>3</a>
-                                    <b>4</b>
-                                    <v>12</v>
+                                    <v>1215965</v>
                                 </b>
                                 <b>
                                     <a>4</a>
-                                    <b>5</b>
-                                    <v>7</v>
-                                </b>
-                                <b>
-                                    <a>5</a>
-                                    <b>12</b>
-                                    <v>7</v>
-                                </b>
-                                <b>
-                                    <a>13</a>
-                                    <b>15</b>
-                                    <v>3</v>
+                                    <b>24</b>
+                                    <v>65727</v>
                                 </b>
                             </bs>
                         </hist>
@@ -4704,9 +4467,9 @@
                             <budget>12</budget>
                             <bs>
                                 <b>
-                                    <a>869</a>
-                                    <b>870</b>
-                                    <v>1</v>
+                                    <a>3258</a>
+                                    <b>3259</b>
+                                    <v>4107</v>
                                 </b>
                             </bs>
                         </hist>
@@ -4720,9 +4483,9 @@
                             <budget>12</budget>
                             <bs>
                                 <b>
-                                    <a>427</a>
-                                    <b>428</b>
-                                    <v>1</v>
+                                    <a>1427</a>
+                                    <b>1428</b>
+                                    <v>4107</v>
                                 </b>
                             </bs>
                         </hist>
@@ -4736,9 +4499,9 @@
                             <budget>12</budget>
                             <bs>
                                 <b>
-                                    <a>432</a>
-                                    <b>433</b>
-                                    <v>1</v>
+                                    <a>1686</a>
+                                    <b>1687</b>
+                                    <v>4107</v>
                                 </b>
                             </bs>
                         </hist>
@@ -4752,9 +4515,9 @@
                             <budget>12</budget>
                             <bs>
                                 <b>
-                                    <a>87</a>
-                                    <b>88</b>
-                                    <v>1</v>
+                                    <a>312</a>
+                                    <b>313</b>
+                                    <v>4107</v>
                                 </b>
                             </bs>
                         </hist>
@@ -4768,9 +4531,9 @@
                             <budget>12</budget>
                             <bs>
                                 <b>
-                                    <a>14</a>
-                                    <b>15</b>
-                                    <v>1</v>
+                                    <a>23</a>
+                                    <b>24</b>
+                                    <v>4107</v>
                                 </b>
                             </bs>
                         </hist>
@@ -4784,69 +4547,54 @@
                             <budget>12</budget>
                             <bs>
                                 <b>
-                                    <a>5</a>
-                                    <b>6</b>
-                                    <v>1</v>
+                                    <a>1</a>
+                                    <b>10</b>
+                                    <v>8215</v>
                                 </b>
                                 <b>
-                                    <a>13</a>
-                                    <b>14</b>
-                                    <v>1</v>
+                                    <a>11</a>
+                                    <b>13</b>
+                                    <v>8215</v>
                                 </b>
                                 <b>
-                                    <a>14</a>
+                                    <a>13</a>
                                     <b>15</b>
-                                    <v>2</v>
+                                    <v>8215</v>
                                 </b>
                                 <b>
-                                    <a>17</a>
-                                    <b>18</b>
-                                    <v>1</v>
+                                    <a>15</a>
+                                    <b>16</b>
+                                    <v>4107</v>
                                 </b>
                                 <b>
-                                    <a>28</a>
-                                    <b>29</b>
-                                    <v>1</v>
+                                    <a>16</a>
+                                    <b>17</b>
+                                    <v>8215</v>
                                 </b>
                                 <b>
-                                    <a>30</a>
-                                    <b>31</b>
-                                    <v>1</v>
+                                    <a>18</a>
+                                    <b>21</b>
+                                    <v>8215</v>
                                 </b>
                                 <b>
-                                    <a>34</a>
-                                    <b>35</b>
-                                    <v>1</v>
+                                    <a>23</a>
+                                    <b>49</b>
+                                    <v>8215</v>
                                 </b>
                                 <b>
-                                    <a>35</a>
-                                    <b>36</b>
-                                    <v>1</v>
+                                    <a>51</a>
+                                    <b>52</b>
+                                    <v>4107</v>
                                 </b>
                                 <b>
-                                    <a>36</a>
-                                    <b>37</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>80</a>
-                                    <b>81</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>177</a>
-                                    <b>178</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>191</a>
-                                    <b>192</b>
-                                    <v>1</v>
+                                    <a>52</a>
+                                    <b>53</b>
+                                    <v>28755</v>
                                 </b>
                                 <b>
-                                    <a>195</a>
-                                    <b>196</b>
-                                    <v>1</v>
+                                    <a>118</a>
+                                    <b>2510</b>
+                                    <v>8215</v>
                                 </b>
                             </bs>
                         </hist>
@@ -4860,69 +4608,54 @@
                             <budget>12</budget>
                             <bs>
                                 <b>
-                                    <a>3</a>
-                                    <b>4</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>7</a>
-                                    <b>8</b>
-                                    <v>2</v>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>4107</v>
                                 </b>
                                 <b>
-                                    <a>9</a>
-                                    <b>10</b>
-                                    <v>1</v>
+                                    <a>4</a>
+                                    <b>5</b>
+                                    <v>16431</v>
                                 </b>
                                 <b>
-                                    <a>13</a>
-                                    <b>14</b>
-                                    <v>1</v>
+                                    <a>5</a>
+                                    <b>6</b>
+                                    <v>4107</v>
                                 </b>
                                 <b>
-                                    <a>15</a>
-                                    <b>16</b>
-                                    <v>1</v>
+                                    <a>6</a>
+                                    <b>7</b>
+                                    <v>12323</v>
                                 </b>
                                 <b>
-                                    <a>18</a>
-                                    <b>19</b>
-                                    <v>1</v>
+                                    <a>7</a>
+                                    <b>8</b>
+                                    <v>4107</v>
                                 </b>
                                 <b>
-                                    <a>24</a>
-                                    <b>25</b>
-                                    <v>1</v>
+                                    <a>8</a>
+                                    <b>9</b>
+                                    <v>8215</v>
                                 </b>
                                 <b>
-                                    <a>25</a>
-                                    <b>26</b>
-                                    <v>1</v>
+                                    <a>23</a>
+                                    <b>24</b>
+                                    <v>4107</v>
                                 </b>
                                 <b>
                                     <a>26</a>
                                     <b>27</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>49</a>
-                                    <b>50</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>100</a>
-                                    <b>101</b>
-                                    <v>1</v>
+                                    <v>28755</v>
                                 </b>
                                 <b>
-                                    <a>105</a>
-                                    <b>106</b>
-                                    <v>1</v>
+                                    <a>27</a>
+                                    <b>37</b>
+                                    <v>8215</v>
                                 </b>
                                 <b>
-                                    <a>118</a>
-                                    <b>119</b>
-                                    <v>1</v>
+                                    <a>1314</a>
+                                    <b>1315</b>
+                                    <v>4107</v>
                                 </b>
                             </bs>
                         </hist>
@@ -4936,64 +4669,44 @@
                             <budget>12</budget>
                             <bs>
                                 <b>
-                                    <a>3</a>
-                                    <b>4</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>7</a>
-                                    <b>8</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>9</a>
-                                    <b>10</b>
-                                    <v>2</v>
-                                </b>
-                                <b>
-                                    <a>10</a>
-                                    <b>11</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>14</a>
-                                    <b>15</b>
-                                    <v>1</v>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>4107</v>
                                 </b>
                                 <b>
-                                    <a>15</a>
-                                    <b>16</b>
-                                    <v>2</v>
+                                    <a>5</a>
+                                    <b>6</b>
+                                    <v>28755</v>
                                 </b>
                                 <b>
-                                    <a>18</a>
-                                    <b>19</b>
-                                    <v>1</v>
+                                    <a>6</a>
+                                    <b>7</b>
+                                    <v>8215</v>
                                 </b>
                                 <b>
-                                    <a>20</a>
-                                    <b>21</b>
-                                    <v>1</v>
+                                    <a>7</a>
+                                    <b>9</b>
+                                    <v>8215</v>
                                 </b>
                                 <b>
-                                    <a>33</a>
-                                    <b>34</b>
-                                    <v>1</v>
+                                    <a>23</a>
+                                    <b>24</b>
+                                    <v>4107</v>
                                 </b>
                                 <b>
-                                    <a>88</a>
-                                    <b>89</b>
-                                    <v>1</v>
+                                    <a>26</a>
+                                    <b>27</b>
+                                    <v>28755</v>
                                 </b>
                                 <b>
-                                    <a>95</a>
-                                    <b>96</b>
-                                    <v>1</v>
+                                    <a>27</a>
+                                    <b>55</b>
+                                    <v>8215</v>
                                 </b>
                                 <b>
-                                    <a>96</a>
-                                    <b>97</b>
-                                    <v>1</v>
+                                    <a>1337</a>
+                                    <b>1338</b>
+                                    <v>4107</v>
                                 </b>
                             </bs>
                         </hist>
@@ -5007,54 +4720,49 @@
                             <budget>12</budget>
                             <bs>
                                 <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>4</a>
-                                    <b>5</b>
-                                    <v>2</v>
+                                    <a>1</a>
+                                    <b>4</b>
+                                    <v>8215</v>
                                 </b>
                                 <b>
-                                    <a>5</a>
-                                    <b>6</b>
-                                    <v>1</v>
+                                    <a>6</a>
+                                    <b>7</b>
+                                    <v>8215</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>8</b>
-                                    <v>3</v>
+                                    <v>20539</v>
                                 </b>
                                 <b>
-                                    <a>9</a>
-                                    <b>10</b>
-                                    <v>1</v>
+                                    <a>8</a>
+                                    <b>9</b>
+                                    <v>8215</v>
                                 </b>
                                 <b>
-                                    <a>13</a>
-                                    <b>14</b>
-                                    <v>1</v>
+                                    <a>11</a>
+                                    <b>12</b>
+                                    <v>4107</v>
                                 </b>
                                 <b>
-                                    <a>15</a>
-                                    <b>16</b>
-                                    <v>2</v>
+                                    <a>12</a>
+                                    <b>13</b>
+                                    <v>8215</v>
                                 </b>
                                 <b>
-                                    <a>32</a>
-                                    <b>33</b>
-                                    <v>1</v>
+                                    <a>13</a>
+                                    <b>14</b>
+                                    <v>8215</v>
                                 </b>
                                 <b>
-                                    <a>35</a>
-                                    <b>36</b>
-                                    <v>1</v>
+                                    <a>14</a>
+                                    <b>15</b>
+                                    <v>24647</v>
                                 </b>
                                 <b>
-                                    <a>65</a>
-                                    <b>66</b>
-                                    <v>1</v>
+                                    <a>310</a>
+                                    <b>311</b>
+                                    <v>4107</v>
                                 </b>
                             </bs>
                         </hist>
@@ -5070,7 +4778,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>14</v>
+                                    <v>94483</v>
                                 </b>
                             </bs>
                         </hist>
@@ -5080,15 +4788,15 @@
         </relation>
         <relation>
             <name>xmllocations</name>
-            <cardinality>1825</cardinality>
+            <cardinality>26028241</cardinality>
             <columnsizes>
                 <e>
                     <k>xmlElement</k>
-                    <v>1825</v>
+                    <v>26028241</v>
                 </e>
                 <e>
                     <k>location</k>
-                    <v>1825</v>
+                    <v>26028241</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -5102,7 +4810,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1825</v>
+                                    <v>26028241</v>
                                 </b>
                             </bs>
                         </hist>
@@ -5118,7 +4826,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1825</v>
+                                    <v>26028241</v>
                                 </b>
                             </bs>
                         </hist>
@@ -5128,15 +4836,15 @@
         </relation>
         <relation>
             <name>compilations</name>
-            <cardinality>1</cardinality>
+            <cardinality>31407</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>1</v>
+                    <v>31407</v>
                 </e>
                 <e>
                     <k>cwd</k>
-                    <v>1</v>
+                    <v>31407</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -5150,7 +4858,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1</v>
+                                    <v>31407</v>
                                 </b>
                             </bs>
                         </hist>
@@ -5166,7 +4874,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1</v>
+                                    <v>31407</v>
                                 </b>
                             </bs>
                         </hist>
@@ -5176,19 +4884,19 @@
         </relation>
         <relation>
             <name>compilation_args</name>
-            <cardinality>3</cardinality>
+            <cardinality>94222</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>1</v>
+                    <v>31407</v>
                 </e>
                 <e>
                     <k>num</k>
-                    <v>3</v>
+                    <v>5234</v>
                 </e>
                 <e>
                     <k>arg</k>
-                    <v>3</v>
+                    <v>5234</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -5202,7 +4910,7 @@
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>1</v>
+                                    <v>31407</v>
                                 </b>
                             </bs>
                         </hist>
@@ -5218,7 +4926,7 @@
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>1</v>
+                                    <v>31407</v>
                                 </b>
                             </bs>
                         </hist>
@@ -5232,9 +4940,9 @@
                             <budget>12</budget>
                             <bs>
                                 <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>3</v>
+                                    <a>18</a>
+                                    <b>19</b>
+                                    <v>5234</v>
                                 </b>
                             </bs>
                         </hist>
@@ -5250,7 +4958,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3</v>
+                                    <v>5234</v>
                                 </b>
                             </bs>
                         </hist>
@@ -5264,9 +4972,9 @@
                             <budget>12</budget>
                             <bs>
                                 <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>3</v>
+                                    <a>18</a>
+                                    <b>19</b>
+                                    <v>5234</v>
                                 </b>
                             </bs>
                         </hist>
@@ -5282,7 +4990,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3</v>
+                                    <v>5234</v>
                                 </b>
                             </bs>
                         </hist>
@@ -5436,23 +5144,23 @@
         </relation>
         <relation>
             <name>diagnostic_for</name>
-            <cardinality>0</cardinality>
+            <cardinality>233782</cardinality>
             <columnsizes>
                 <e>
                     <k>diagnostic</k>
-                    <v>0</v>
+                    <v>233782</v>
                 </e>
                 <e>
                     <k>compilation</k>
-                    <v>0</v>
+                    <v>214</v>
                 </e>
                 <e>
                     <k>file_number</k>
-                    <v>0</v>
+                    <v>56356</v>
                 </e>
                 <e>
                     <k>file_number_diagnostic_number</k>
-                    <v>0</v>
+                    <v>19713</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -5466,7 +5174,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1</v>
+                                    <v>233782</v>
                                 </b>
                             </bs>
                         </hist>
@@ -5482,7 +5190,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1</v>
+                                    <v>233782</v>
                                 </b>
                             </bs>
                         </hist>
@@ -5498,7 +5206,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1</v>
+                                    <v>233782</v>
                                 </b>
                             </bs>
                         </hist>
@@ -5510,7 +5218,13 @@
                     <val>
                         <hist>
                             <budget>12</budget>
-                            <bs/>
+                            <bs>
+                                <b>
+                                    <a>1091</a>
+                                    <b>1092</b>
+                                    <v>214</v>
+                                </b>
+                            </bs>
                         </hist>
                     </val>
                 </dep>
@@ -5520,7 +5234,13 @@
                     <val>
                         <hist>
                             <budget>12</budget>
-                            <bs/>
+                            <bs>
+                                <b>
+                                    <a>263</a>
+                                    <b>264</b>
+                                    <v>214</v>
+                                </b>
+                            </bs>
                         </hist>
                     </val>
                 </dep>
@@ -5530,7 +5250,13 @@
                     <val>
                         <hist>
                             <budget>12</budget>
-                            <bs/>
+                            <bs>
+                                <b>
+                                    <a>92</a>
+                                    <b>93</b>
+                                    <v>214</v>
+                                </b>
+                            </bs>
                         </hist>
                     </val>
                 </dep>
@@ -5540,7 +5266,43 @@
                     <val>
                         <hist>
                             <budget>12</budget>
-                            <bs/>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>26999</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>8142</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>5785</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>6</b>
+                                    <v>4928</v>
+                                </b>
+                                <b>
+                                    <a>6</a>
+                                    <b>11</b>
+                                    <v>4714</v>
+                                </b>
+                                <b>
+                                    <a>11</a>
+                                    <b>18</b>
+                                    <v>4285</v>
+                                </b>
+                                <b>
+                                    <a>18</a>
+                                    <b>93</b>
+                                    <v>1499</v>
+                                </b>
+                            </bs>
                         </hist>
                     </val>
                 </dep>
@@ -5550,7 +5312,13 @@
                     <val>
                         <hist>
                             <budget>12</budget>
-                            <bs/>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>56356</v>
+                                </b>
+                            </bs>
                         </hist>
                     </val>
                 </dep>
@@ -5560,7 +5328,43 @@
                     <val>
                         <hist>
                             <budget>12</budget>
-                            <bs/>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>26999</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>8142</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>5785</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>6</b>
+                                    <v>4928</v>
+                                </b>
+                                <b>
+                                    <a>6</a>
+                                    <b>11</b>
+                                    <v>4714</v>
+                                </b>
+                                <b>
+                                    <a>11</a>
+                                    <b>18</b>
+                                    <v>4285</v>
+                                </b>
+                                <b>
+                                    <a>18</a>
+                                    <b>93</b>
+                                    <v>1499</v>
+                                </b>
+                            </bs>
                         </hist>
                     </val>
                 </dep>
@@ -5570,47 +5374,125 @@
                     <val>
                         <hist>
                             <budget>12</budget>
-                            <bs/>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>file_number_diagnostic_number</src>
-                    <trg>compilation</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs/>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>file_number_diagnostic_number</src>
-                    <trg>file_number</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs/>
-                        </hist>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>6642</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>4714</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>3428</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>10</b>
+                                    <v>1499</v>
+                                </b>
+                                <b>
+                                    <a>10</a>
+                                    <b>33</b>
+                                    <v>1499</v>
+                                </b>
+                                <b>
+                                    <a>33</a>
+                                    <b>100</b>
+                                    <v>1499</v>
+                                </b>
+                                <b>
+                                    <a>137</a>
+                                    <b>264</b>
+                                    <v>428</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>file_number_diagnostic_number</src>
+                    <trg>compilation</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>19713</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>file_number_diagnostic_number</src>
+                    <trg>file_number</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>6642</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>4714</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>3428</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>10</b>
+                                    <v>1499</v>
+                                </b>
+                                <b>
+                                    <a>10</a>
+                                    <b>33</b>
+                                    <v>1499</v>
+                                </b>
+                                <b>
+                                    <a>33</a>
+                                    <b>100</b>
+                                    <v>1499</v>
+                                </b>
+                                <b>
+                                    <a>137</a>
+                                    <b>264</b>
+                                    <v>428</v>
+                                </b>
+                            </bs>
+                        </hist>
                     </val>
                 </dep>
             </dependencies>
         </relation>
         <relation>
             <name>compilation_finished</name>
-            <cardinality>1</cardinality>
+            <cardinality>31407</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>1</v>
+                    <v>31407</v>
                 </e>
                 <e>
                     <k>cpu_seconds</k>
-                    <v>1</v>
+                    <v>1744</v>
                 </e>
                 <e>
                     <k>elapsed_seconds</k>
-                    <v>1</v>
+                    <v>31407</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -5624,7 +5506,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1</v>
+                                    <v>31407</v>
                                 </b>
                             </bs>
                         </hist>
@@ -5640,7 +5522,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1</v>
+                                    <v>31407</v>
                                 </b>
                             </bs>
                         </hist>
@@ -5654,9 +5536,9 @@
                             <budget>12</budget>
                             <bs>
                                 <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>1</v>
+                                    <a>18</a>
+                                    <b>19</b>
+                                    <v>1744</v>
                                 </b>
                             </bs>
                         </hist>
@@ -5670,9 +5552,9 @@
                             <budget>12</budget>
                             <bs>
                                 <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>1</v>
+                                    <a>18</a>
+                                    <b>19</b>
+                                    <v>1744</v>
                                 </b>
                             </bs>
                         </hist>
@@ -5688,7 +5570,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1</v>
+                                    <v>31407</v>
                                 </b>
                             </bs>
                         </hist>
@@ -5704,7 +5586,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1</v>
+                                    <v>31407</v>
                                 </b>
                             </bs>
                         </hist>
@@ -5714,19 +5596,19 @@
         </relation>
         <relation>
             <name>compilation_compiling_files</name>
-            <cardinality>515</cardinality>
+            <cardinality>82070</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>1</v>
+                    <v>214</v>
                 </e>
                 <e>
                     <k>num</k>
-                    <v>515</v>
+                    <v>82070</v>
                 </e>
                 <e>
                     <k>file</k>
-                    <v>515</v>
+                    <v>82070</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -5738,9 +5620,9 @@
                             <budget>12</budget>
                             <bs>
                                 <b>
-                                    <a>515</a>
-                                    <b>516</b>
-                                    <v>1</v>
+                                    <a>383</a>
+                                    <b>384</b>
+                                    <v>214</v>
                                 </b>
                             </bs>
                         </hist>
@@ -5754,9 +5636,9 @@
                             <budget>12</budget>
                             <bs>
                                 <b>
-                                    <a>515</a>
-                                    <b>516</b>
-                                    <v>1</v>
+                                    <a>383</a>
+                                    <b>384</b>
+                                    <v>214</v>
                                 </b>
                             </bs>
                         </hist>
@@ -5772,7 +5654,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>515</v>
+                                    <v>82070</v>
                                 </b>
                             </bs>
                         </hist>
@@ -5788,7 +5670,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>515</v>
+                                    <v>82070</v>
                                 </b>
                             </bs>
                         </hist>
@@ -5804,7 +5686,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>515</v>
+                                    <v>82070</v>
                                 </b>
                             </bs>
                         </hist>
@@ -5820,7 +5702,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>515</v>
+                                    <v>82070</v>
                                 </b>
                             </bs>
                         </hist>
@@ -5830,31 +5712,31 @@
         </relation>
         <relation>
             <name>diagnostics</name>
-            <cardinality>0</cardinality>
+            <cardinality>233782</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>0</v>
+                    <v>233782</v>
                 </e>
                 <e>
                     <k>severity</k>
-                    <v>0</v>
+                    <v>214</v>
                 </e>
                 <e>
                     <k>error_tag</k>
-                    <v>0</v>
+                    <v>642</v>
                 </e>
                 <e>
                     <k>error_message</k>
-                    <v>0</v>
+                    <v>56999</v>
                 </e>
                 <e>
                     <k>full_error_message</k>
-                    <v>0</v>
+                    <v>56999</v>
                 </e>
                 <e>
                     <k>location</k>
-                    <v>0</v>
+                    <v>149140</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -5868,7 +5750,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1</v>
+                                    <v>233782</v>
                                 </b>
                             </bs>
                         </hist>
@@ -5884,7 +5766,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1</v>
+                                    <v>233782</v>
                                 </b>
                             </bs>
                         </hist>
@@ -5900,7 +5782,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1</v>
+                                    <v>233782</v>
                                 </b>
                             </bs>
                         </hist>
@@ -5916,7 +5798,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1</v>
+                                    <v>233782</v>
                                 </b>
                             </bs>
                         </hist>
@@ -5932,7 +5814,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1</v>
+                                    <v>233782</v>
                                 </b>
                             </bs>
                         </hist>
@@ -5944,7 +5826,13 @@
                     <val>
                         <hist>
                             <budget>12</budget>
-                            <bs/>
+                            <bs>
+                                <b>
+                                    <a>1091</a>
+                                    <b>1092</b>
+                                    <v>214</v>
+                                </b>
+                            </bs>
                         </hist>
                     </val>
                 </dep>
@@ -5954,7 +5842,13 @@
                     <val>
                         <hist>
                             <budget>12</budget>
-                            <bs/>
+                            <bs>
+                                <b>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>214</v>
+                                </b>
+                            </bs>
                         </hist>
                     </val>
                 </dep>
@@ -5964,7 +5858,13 @@
                     <val>
                         <hist>
                             <budget>12</budget>
-                            <bs/>
+                            <bs>
+                                <b>
+                                    <a>266</a>
+                                    <b>267</b>
+                                    <v>214</v>
+                                </b>
+                            </bs>
                         </hist>
                     </val>
                 </dep>
@@ -5974,7 +5874,13 @@
                     <val>
                         <hist>
                             <budget>12</budget>
-                            <bs/>
+                            <bs>
+                                <b>
+                                    <a>266</a>
+                                    <b>267</b>
+                                    <v>214</v>
+                                </b>
+                            </bs>
                         </hist>
                     </val>
                 </dep>
@@ -5984,7 +5890,13 @@
                     <val>
                         <hist>
                             <budget>12</budget>
-                            <bs/>
+                            <bs>
+                                <b>
+                                    <a>696</a>
+                                    <b>697</b>
+                                    <v>214</v>
+                                </b>
+                            </bs>
                         </hist>
                     </val>
                 </dep>
@@ -5994,7 +5906,23 @@
                     <val>
                         <hist>
                             <budget>12</budget>
-                            <bs/>
+                            <bs>
+                                <b>
+                                    <a>16</a>
+                                    <b>17</b>
+                                    <v>214</v>
+                                </b>
+                                <b>
+                                    <a>51</a>
+                                    <b>52</b>
+                                    <v>214</v>
+                                </b>
+                                <b>
+                                    <a>1024</a>
+                                    <b>1025</b>
+                                    <v>214</v>
+                                </b>
+                            </bs>
                         </hist>
                     </val>
                 </dep>
@@ -6004,7 +5932,13 @@
                     <val>
                         <hist>
                             <budget>12</budget>
-                            <bs/>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>642</v>
+                                </b>
+                            </bs>
                         </hist>
                     </val>
                 </dep>
@@ -6014,7 +5948,23 @@
                     <val>
                         <hist>
                             <budget>12</budget>
-                            <bs/>
+                            <bs>
+                                <b>
+                                    <a>10</a>
+                                    <b>11</b>
+                                    <v>214</v>
+                                </b>
+                                <b>
+                                    <a>47</a>
+                                    <b>48</b>
+                                    <v>214</v>
+                                </b>
+                                <b>
+                                    <a>210</a>
+                                    <b>211</b>
+                                    <v>214</v>
+                                </b>
+                            </bs>
                         </hist>
                     </val>
                 </dep>
@@ -6024,7 +5974,23 @@
                     <val>
                         <hist>
                             <budget>12</budget>
-                            <bs/>
+                            <bs>
+                                <b>
+                                    <a>10</a>
+                                    <b>11</b>
+                                    <v>214</v>
+                                </b>
+                                <b>
+                                    <a>47</a>
+                                    <b>48</b>
+                                    <v>214</v>
+                                </b>
+                                <b>
+                                    <a>210</a>
+                                    <b>211</b>
+                                    <v>214</v>
+                                </b>
+                            </bs>
                         </hist>
                     </val>
                 </dep>
@@ -6034,7 +6000,23 @@
                     <val>
                         <hist>
                             <budget>12</budget>
-                            <bs/>
+                            <bs>
+                                <b>
+                                    <a>9</a>
+                                    <b>10</b>
+                                    <v>214</v>
+                                </b>
+                                <b>
+                                    <a>39</a>
+                                    <b>40</b>
+                                    <v>214</v>
+                                </b>
+                                <b>
+                                    <a>680</a>
+                                    <b>681</b>
+                                    <v>214</v>
+                                </b>
+                            </bs>
                         </hist>
                     </val>
                 </dep>
@@ -6044,7 +6026,38 @@
                     <val>
                         <hist>
                             <budget>12</budget>
-                            <bs/>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>32142</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>8357</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>6428</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>7</b>
+                                    <v>4928</v>
+                                </b>
+                                <b>
+                                    <a>7</a>
+                                    <b>17</b>
+                                    <v>4285</v>
+                                </b>
+                                <b>
+                                    <a>20</a>
+                                    <b>214</b>
+                                    <v>857</v>
+                                </b>
+                            </bs>
                         </hist>
                     </val>
                 </dep>
@@ -6054,7 +6067,13 @@
                     <val>
                         <hist>
                             <budget>12</budget>
-                            <bs/>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>56999</v>
+                                </b>
+                            </bs>
                         </hist>
                     </val>
                 </dep>
@@ -6064,7 +6083,18 @@
                     <val>
                         <hist>
                             <budget>12</budget>
-                            <bs/>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>56784</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>214</v>
+                                </b>
+                            </bs>
                         </hist>
                     </val>
                 </dep>
@@ -6074,7 +6104,13 @@
                     <val>
                         <hist>
                             <budget>12</budget>
-                            <bs/>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>56999</v>
+                                </b>
+                            </bs>
                         </hist>
                     </val>
                 </dep>
@@ -6084,27 +6120,90 @@
                     <val>
                         <hist>
                             <budget>12</budget>
-                            <bs/>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>full_error_message</src>
-                    <trg>id</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs/>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>full_error_message</src>
-                    <trg>severity</trg>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>39642</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>6214</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>4071</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>8</b>
+                                    <v>4499</v>
+                                </b>
+                                <b>
+                                    <a>8</a>
+                                    <b>214</b>
+                                    <v>2571</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>full_error_message</src>
+                    <trg>id</trg>
                     <val>
                         <hist>
                             <budget>12</budget>
-                            <bs/>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>32142</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>8357</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>6428</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>7</b>
+                                    <v>4928</v>
+                                </b>
+                                <b>
+                                    <a>7</a>
+                                    <b>17</b>
+                                    <v>4285</v>
+                                </b>
+                                <b>
+                                    <a>20</a>
+                                    <b>214</b>
+                                    <v>857</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>full_error_message</src>
+                    <trg>severity</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>56999</v>
+                                </b>
+                            </bs>
                         </hist>
                     </val>
                 </dep>
@@ -6114,7 +6213,18 @@
                     <val>
                         <hist>
                             <budget>12</budget>
-                            <bs/>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>56784</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>214</v>
+                                </b>
+                            </bs>
                         </hist>
                     </val>
                 </dep>
@@ -6124,7 +6234,13 @@
                     <val>
                         <hist>
                             <budget>12</budget>
-                            <bs/>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>56999</v>
+                                </b>
+                            </bs>
                         </hist>
                     </val>
                 </dep>
@@ -6134,7 +6250,33 @@
                     <val>
                         <hist>
                             <budget>12</budget>
-                            <bs/>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>39642</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>6214</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>4071</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>8</b>
+                                    <v>4499</v>
+                                </b>
+                                <b>
+                                    <a>8</a>
+                                    <b>214</b>
+                                    <v>2571</v>
+                                </b>
+                            </bs>
                         </hist>
                     </val>
                 </dep>
@@ -6144,7 +6286,23 @@
                     <val>
                         <hist>
                             <budget>12</budget>
-                            <bs/>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>133069</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>4</b>
+                                    <v>11571</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>93</b>
+                                    <v>4499</v>
+                                </b>
+                            </bs>
                         </hist>
                     </val>
                 </dep>
@@ -6154,7 +6312,13 @@
                     <val>
                         <hist>
                             <budget>12</budget>
-                            <bs/>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>149140</v>
+                                </b>
+                            </bs>
                         </hist>
                     </val>
                 </dep>
@@ -6164,7 +6328,18 @@
                     <val>
                         <hist>
                             <budget>12</budget>
-                            <bs/>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>142283</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>6857</v>
+                                </b>
+                            </bs>
                         </hist>
                     </val>
                 </dep>
@@ -6174,7 +6349,18 @@
                     <val>
                         <hist>
                             <budget>12</budget>
-                            <bs/>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>142069</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>15</b>
+                                    <v>7071</v>
+                                </b>
+                            </bs>
                         </hist>
                     </val>
                 </dep>
@@ -6184,7 +6370,18 @@
                     <val>
                         <hist>
                             <budget>12</budget>
-                            <bs/>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>142069</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>15</b>
+                                    <v>7071</v>
+                                </b>
+                            </bs>
                         </hist>
                     </val>
                 </dep>
@@ -6192,31 +6389,31 @@
         </relation>
         <relation>
             <name>locations_default</name>
-            <cardinality>539178</cardinality>
+            <cardinality>37058201</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>539178</v>
+                    <v>37058201</v>
                 </e>
                 <e>
                     <k>file</k>
-                    <v>529</v>
+                    <v>115023</v>
                 </e>
                 <e>
                     <k>beginLine</k>
-                    <v>10312</v>
+                    <v>6174312</v>
                 </e>
                 <e>
                     <k>beginColumn</k>
-                    <v>211</v>
+                    <v>1026998</v>
                 </e>
                 <e>
                     <k>endLine</k>
-                    <v>10378</v>
+                    <v>7357414</v>
                 </e>
                 <e>
                     <k>endColumn</k>
-                    <v>274</v>
+                    <v>1154345</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -6230,7 +6427,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>539178</v>
+                                    <v>37058201</v>
                                 </b>
                             </bs>
                         </hist>
@@ -6246,7 +6443,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>539178</v>
+                                    <v>37058201</v>
                                 </b>
                             </bs>
                         </hist>
@@ -6262,7 +6459,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>539178</v>
+                                    <v>37058201</v>
                                 </b>
                             </bs>
                         </hist>
@@ -6278,7 +6475,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>539178</v>
+                                    <v>37058201</v>
                                 </b>
                             </bs>
                         </hist>
@@ -6294,7 +6491,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>539178</v>
+                                    <v>37058201</v>
                                 </b>
                             </bs>
                         </hist>
@@ -6308,74 +6505,74 @@
                             <budget>12</budget>
                             <bs>
                                 <b>
-                                    <a>4</a>
-                                    <b>39</b>
-                                    <v>41</v>
+                                    <a>2</a>
+                                    <b>24</b>
+                                    <v>8215</v>
                                 </b>
                                 <b>
-                                    <a>39</a>
-                                    <b>120</b>
-                                    <v>40</v>
+                                    <a>28</a>
+                                    <b>30</b>
+                                    <v>8215</v>
                                 </b>
                                 <b>
-                                    <a>120</a>
-                                    <b>208</b>
-                                    <v>40</v>
+                                    <a>33</a>
+                                    <b>38</b>
+                                    <v>8215</v>
                                 </b>
                                 <b>
-                                    <a>210</a>
-                                    <b>290</b>
-                                    <v>40</v>
+                                    <a>38</a>
+                                    <b>39</b>
+                                    <v>8215</v>
                                 </b>
                                 <b>
-                                    <a>291</a>
-                                    <b>372</b>
-                                    <v>40</v>
+                                    <a>44</a>
+                                    <b>48</b>
+                                    <v>8215</v>
                                 </b>
                                 <b>
-                                    <a>372</a>
-                                    <b>453</b>
-                                    <v>41</v>
+                                    <a>58</a>
+                                    <b>68</b>
+                                    <v>8215</v>
                                 </b>
                                 <b>
-                                    <a>456</a>
-                                    <b>563</b>
-                                    <v>40</v>
+                                    <a>72</a>
+                                    <b>86</b>
+                                    <v>8215</v>
                                 </b>
                                 <b>
-                                    <a>565</a>
-                                    <b>769</b>
-                                    <v>40</v>
+                                    <a>126</a>
+                                    <b>132</b>
+                                    <v>8215</v>
                                 </b>
                                 <b>
-                                    <a>774</a>
-                                    <b>1007</b>
-                                    <v>40</v>
+                                    <a>133</a>
+                                    <b>134</b>
+                                    <v>4107</v>
                                 </b>
                                 <b>
-                                    <a>1012</a>
-                                    <b>1339</b>
-                                    <v>42</v>
+                                    <a>134</a>
+                                    <b>135</b>
+                                    <v>12323</v>
                                 </b>
                                 <b>
-                                    <a>1347</a>
-                                    <b>1700</b>
-                                    <v>40</v>
+                                    <a>135</a>
+                                    <b>136</b>
+                                    <v>12323</v>
                                 </b>
                                 <b>
-                                    <a>1701</a>
-                                    <b>2804</b>
-                                    <v>40</v>
+                                    <a>211</a>
+                                    <b>279</b>
+                                    <v>8215</v>
                                 </b>
                                 <b>
-                                    <a>2873</a>
-                                    <b>6918</b>
-                                    <v>40</v>
+                                    <a>1057</a>
+                                    <b>1261</b>
+                                    <v>8215</v>
                                 </b>
                                 <b>
-                                    <a>8171</a>
-                                    <b>11207</b>
-                                    <v>5</v>
+                                    <a>4417</a>
+                                    <b>4418</b>
+                                    <v>4107</v>
                                 </b>
                             </bs>
                         </hist>
@@ -6389,69 +6586,64 @@
                             <budget>12</budget>
                             <bs>
                                 <b>
-                                    <a>3</a>
-                                    <b>15</b>
-                                    <v>44</v>
-                                </b>
-                                <b>
-                                    <a>15</a>
-                                    <b>27</b>
-                                    <v>42</v>
+                                    <a>2</a>
+                                    <b>11</b>
+                                    <v>8215</v>
                                 </b>
                                 <b>
-                                    <a>27</a>
-                                    <b>46</b>
-                                    <v>40</v>
+                                    <a>12</a>
+                                    <b>14</b>
+                                    <v>8215</v>
                                 </b>
                                 <b>
-                                    <a>46</a>
-                                    <b>63</b>
-                                    <v>43</v>
+                                    <a>14</a>
+                                    <b>16</b>
+                                    <v>8215</v>
                                 </b>
                                 <b>
-                                    <a>63</a>
-                                    <b>78</b>
-                                    <v>40</v>
+                                    <a>16</a>
+                                    <b>17</b>
+                                    <v>4107</v>
                                 </b>
                                 <b>
-                                    <a>78</a>
-                                    <b>94</b>
-                                    <v>41</v>
+                                    <a>17</a>
+                                    <b>18</b>
+                                    <v>8215</v>
                                 </b>
                                 <b>
-                                    <a>95</a>
-                                    <b>120</b>
-                                    <v>40</v>
+                                    <a>20</a>
+                                    <b>21</b>
+                                    <v>8215</v>
                                 </b>
                                 <b>
-                                    <a>120</a>
-                                    <b>152</b>
-                                    <v>41</v>
+                                    <a>21</a>
+                                    <b>24</b>
+                                    <v>8215</v>
                                 </b>
                                 <b>
-                                    <a>152</a>
-                                    <b>188</b>
-                                    <v>40</v>
+                                    <a>28</a>
+                                    <b>34</b>
+                                    <v>8215</v>
                                 </b>
                                 <b>
-                                    <a>189</a>
-                                    <b>247</b>
-                                    <v>41</v>
+                                    <a>34</a>
+                                    <b>35</b>
+                                    <v>32863</v>
                                 </b>
                                 <b>
-                                    <a>249</a>
-                                    <b>325</b>
-                                    <v>40</v>
+                                    <a>40</a>
+                                    <b>109</b>
+                                    <v>8215</v>
                                 </b>
                                 <b>
-                                    <a>336</a>
-                                    <b>544</b>
-                                    <v>40</v>
+                                    <a>168</a>
+                                    <b>228</b>
+                                    <v>8215</v>
                                 </b>
                                 <b>
-                                    <a>554</a>
-                                    <b>10233</b>
-                                    <v>37</v>
+                                    <a>1355</a>
+                                    <b>1356</b>
+                                    <v>4107</v>
                                 </b>
                             </bs>
                         </hist>
@@ -6465,69 +6657,79 @@
                             <budget>12</budget>
                             <bs>
                                 <b>
-                                    <a>3</a>
-                                    <b>16</b>
-                                    <v>40</v>
+                                    <a>2</a>
+                                    <b>18</b>
+                                    <v>8215</v>
                                 </b>
                                 <b>
-                                    <a>16</a>
-                                    <b>34</b>
-                                    <v>40</v>
+                                    <a>19</a>
+                                    <b>20</b>
+                                    <v>8215</v>
                                 </b>
                                 <b>
-                                    <a>34</a>
-                                    <b>44</b>
-                                    <v>40</v>
+                                    <a>21</a>
+                                    <b>22</b>
+                                    <v>8215</v>
                                 </b>
                                 <b>
-                                    <a>45</a>
-                                    <b>51</b>
-                                    <v>44</v>
+                                    <a>22</a>
+                                    <b>23</b>
+                                    <v>8215</v>
                                 </b>
                                 <b>
-                                    <a>51</a>
-                                    <b>58</b>
-                                    <v>41</v>
+                                    <a>23</a>
+                                    <b>24</b>
+                                    <v>8215</v>
                                 </b>
                                 <b>
-                                    <a>58</a>
-                                    <b>63</b>
-                                    <v>47</v>
+                                    <a>25</a>
+                                    <b>27</b>
+                                    <v>8215</v>
                                 </b>
                                 <b>
-                                    <a>63</a>
-                                    <b>68</b>
-                                    <v>44</v>
+                                    <a>32</a>
+                                    <b>59</b>
+                                    <v>8215</v>
                                 </b>
                                 <b>
-                                    <a>68</a>
-                                    <b>73</b>
-                                    <v>43</v>
+                                    <a>60</a>
+                                    <b>65</b>
+                                    <v>8215</v>
                                 </b>
                                 <b>
-                                    <a>73</a>
-                                    <b>80</b>
-                                    <v>47</v>
+                                    <a>65</a>
+                                    <b>67</b>
+                                    <v>8215</v>
                                 </b>
                                 <b>
-                                    <a>80</a>
-                                    <b>86</b>
-                                    <v>43</v>
+                                    <a>67</a>
+                                    <b>68</b>
+                                    <v>4107</v>
                                 </b>
                                 <b>
-                                    <a>86</a>
-                                    <b>98</b>
-                                    <v>42</v>
+                                    <a>68</a>
+                                    <b>69</b>
+                                    <v>8215</v>
                                 </b>
                                 <b>
-                                    <a>98</a>
-                                    <b>115</b>
-                                    <v>42</v>
+                                    <a>69</a>
+                                    <b>70</b>
+                                    <v>4107</v>
+                                </b>
+                                <b>
+                                    <a>70</a>
+                                    <b>71</b>
+                                    <v>8215</v>
+                                </b>
+                                <b>
+                                    <a>80</a>
+                                    <b>93</b>
+                                    <v>8215</v>
                                 </b>
                                 <b>
-                                    <a>115</a>
-                                    <b>157</b>
-                                    <v>16</v>
+                                    <a>101</a>
+                                    <b>132</b>
+                                    <v>8215</v>
                                 </b>
                             </bs>
                         </hist>
@@ -6541,74 +6743,69 @@
                             <budget>12</budget>
                             <bs>
                                 <b>
-                                    <a>3</a>
-                                    <b>16</b>
-                                    <v>41</v>
-                                </b>
-                                <b>
-                                    <a>16</a>
-                                    <b>31</b>
-                                    <v>40</v>
+                                    <a>2</a>
+                                    <b>12</b>
+                                    <v>8215</v>
                                 </b>
                                 <b>
-                                    <a>31</a>
-                                    <b>52</b>
-                                    <v>40</v>
+                                    <a>12</a>
+                                    <b>14</b>
+                                    <v>8215</v>
                                 </b>
                                 <b>
-                                    <a>52</a>
-                                    <b>73</b>
-                                    <v>43</v>
+                                    <a>14</a>
+                                    <b>15</b>
+                                    <v>4107</v>
                                 </b>
                                 <b>
-                                    <a>73</a>
-                                    <b>92</b>
-                                    <v>42</v>
+                                    <a>15</a>
+                                    <b>16</b>
+                                    <v>8215</v>
                                 </b>
                                 <b>
-                                    <a>92</a>
-                                    <b>111</b>
-                                    <v>40</v>
+                                    <a>16</a>
+                                    <b>17</b>
+                                    <v>8215</v>
                                 </b>
                                 <b>
-                                    <a>111</a>
-                                    <b>139</b>
-                                    <v>40</v>
+                                    <a>19</a>
+                                    <b>20</b>
+                                    <v>8215</v>
                                 </b>
                                 <b>
-                                    <a>139</a>
-                                    <b>180</b>
-                                    <v>40</v>
+                                    <a>26</a>
+                                    <b>29</b>
+                                    <v>8215</v>
                                 </b>
                                 <b>
-                                    <a>180</a>
-                                    <b>219</b>
-                                    <v>40</v>
+                                    <a>30</a>
+                                    <b>38</b>
+                                    <v>8215</v>
                                 </b>
                                 <b>
-                                    <a>223</a>
-                                    <b>293</b>
-                                    <v>40</v>
+                                    <a>38</a>
+                                    <b>39</b>
+                                    <v>20539</v>
                                 </b>
                                 <b>
-                                    <a>294</a>
-                                    <b>370</b>
-                                    <v>40</v>
+                                    <a>39</a>
+                                    <b>40</b>
+                                    <v>12323</v>
                                 </b>
                                 <b>
-                                    <a>373</a>
-                                    <b>616</b>
-                                    <v>40</v>
+                                    <a>40</a>
+                                    <b>110</b>
+                                    <v>8215</v>
                                 </b>
                                 <b>
-                                    <a>617</a>
-                                    <b>1835</b>
-                                    <v>40</v>
+                                    <a>202</a>
+                                    <b>266</b>
+                                    <v>8215</v>
                                 </b>
                                 <b>
-                                    <a>2166</a>
-                                    <b>10377</b>
-                                    <v>3</v>
+                                    <a>1676</a>
+                                    <b>1677</b>
+                                    <v>4107</v>
                                 </b>
                             </bs>
                         </hist>
@@ -6622,69 +6819,79 @@
                             <budget>12</budget>
                             <bs>
                                 <b>
-                                    <a>4</a>
-                                    <b>21</b>
-                                    <v>42</v>
+                                    <a>2</a>
+                                    <b>17</b>
+                                    <v>8215</v>
                                 </b>
                                 <b>
-                                    <a>22</a>
-                                    <b>45</b>
-                                    <v>41</v>
+                                    <a>18</a>
+                                    <b>20</b>
+                                    <v>8215</v>
                                 </b>
                                 <b>
-                                    <a>46</a>
-                                    <b>59</b>
-                                    <v>43</v>
+                                    <a>23</a>
+                                    <b>25</b>
+                                    <v>8215</v>
                                 </b>
                                 <b>
-                                    <a>59</a>
-                                    <b>65</b>
-                                    <v>40</v>
+                                    <a>25</a>
+                                    <b>26</b>
+                                    <v>8215</v>
                                 </b>
                                 <b>
-                                    <a>65</a>
-                                    <b>71</b>
-                                    <v>42</v>
+                                    <a>26</a>
+                                    <b>31</b>
+                                    <v>8215</v>
                                 </b>
                                 <b>
-                                    <a>71</a>
-                                    <b>76</b>
-                                    <v>47</v>
+                                    <a>33</a>
+                                    <b>41</b>
+                                    <v>8215</v>
                                 </b>
                                 <b>
-                                    <a>76</a>
-                                    <b>81</b>
-                                    <v>40</v>
+                                    <a>42</a>
+                                    <b>61</b>
+                                    <v>8215</v>
                                 </b>
                                 <b>
-                                    <a>81</a>
-                                    <b>85</b>
-                                    <v>48</v>
+                                    <a>71</a>
+                                    <b>72</b>
+                                    <v>4107</v>
                                 </b>
                                 <b>
                                     <a>85</a>
-                                    <b>91</b>
-                                    <v>41</v>
+                                    <b>86</b>
+                                    <v>8215</v>
                                 </b>
                                 <b>
-                                    <a>91</a>
-                                    <b>97</b>
-                                    <v>42</v>
+                                    <a>86</a>
+                                    <b>87</b>
+                                    <v>4107</v>
                                 </b>
                                 <b>
-                                    <a>97</a>
-                                    <b>105</b>
-                                    <v>41</v>
+                                    <a>88</a>
+                                    <b>89</b>
+                                    <v>8215</v>
                                 </b>
                                 <b>
-                                    <a>105</a>
-                                    <b>119</b>
-                                    <v>42</v>
+                                    <a>89</a>
+                                    <b>91</b>
+                                    <v>8215</v>
                                 </b>
                                 <b>
-                                    <a>119</a>
-                                    <b>166</b>
-                                    <v>20</v>
+                                    <a>91</a>
+                                    <b>92</b>
+                                    <v>8215</v>
+                                </b>
+                                <b>
+                                    <a>92</a>
+                                    <b>102</b>
+                                    <v>8215</v>
+                                </b>
+                                <b>
+                                    <a>125</a>
+                                    <b>149</b>
+                                    <v>8215</v>
                                 </b>
                             </bs>
                         </hist>
@@ -6700,32 +6907,47 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>6869</v>
+                                    <v>1142021</v>
                                 </b>
                                 <b>
                                     <a>2</a>
-                                    <b>7</b>
-                                    <v>843</v>
+                                    <b>3</b>
+                                    <v>1092726</v>
                                 </b>
                                 <b>
-                                    <a>7</a>
-                                    <b>20</b>
-                                    <v>796</v>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>1039322</v>
                                 </b>
                                 <b>
-                                    <a>20</a>
-                                    <b>80</b>
-                                    <v>780</v>
+                                    <a>4</a>
+                                    <b>5</b>
+                                    <v>603874</v>
                                 </b>
                                 <b>
-                                    <a>80</a>
-                                    <b>698</b>
-                                    <v>774</v>
+                                    <a>5</a>
+                                    <b>6</b>
+                                    <v>612090</v>
                                 </b>
                                 <b>
-                                    <a>699</a>
-                                    <b>1775</b>
-                                    <v>250</v>
+                                    <a>6</a>
+                                    <b>7</b>
+                                    <v>390259</v>
+                                </b>
+                                <b>
+                                    <a>7</a>
+                                    <b>9</b>
+                                    <v>546363</v>
+                                </b>
+                                <b>
+                                    <a>9</a>
+                                    <b>21</b>
+                                    <v>484743</v>
+                                </b>
+                                <b>
+                                    <a>21</a>
+                                    <b>179</b>
+                                    <v>262911</v>
                                 </b>
                             </bs>
                         </hist>
@@ -6741,32 +6963,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>6947</v>
+                                    <v>5311634</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>868</v>
+                                    <v>353287</v>
                                 </b>
                                 <b>
                                     <a>3</a>
-                                    <b>6</b>
-                                    <v>899</v>
-                                </b>
-                                <b>
-                                    <a>6</a>
-                                    <b>24</b>
-                                    <v>774</v>
-                                </b>
-                                <b>
-                                    <a>24</a>
-                                    <b>304</b>
-                                    <v>774</v>
+                                    <b>22</b>
+                                    <v>464203</v>
                                 </b>
                                 <b>
-                                    <a>305</a>
-                                    <b>530</b>
-                                    <v>50</v>
+                                    <a>22</a>
+                                    <b>29</b>
+                                    <v>45187</v>
                                 </b>
                             </bs>
                         </hist>
@@ -6782,32 +6994,47 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>6894</v>
+                                    <v>1146129</v>
                                 </b>
                                 <b>
                                     <a>2</a>
+                                    <b>3</b>
+                                    <v>1121481</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>1051646</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
                                     <b>5</b>
-                                    <v>789</v>
+                                    <v>665494</v>
                                 </b>
                                 <b>
                                     <a>5</a>
-                                    <b>11</b>
-                                    <v>780</v>
+                                    <b>6</b>
+                                    <v>624414</v>
                                 </b>
                                 <b>
-                                    <a>11</a>
-                                    <b>30</b>
-                                    <v>796</v>
+                                    <a>6</a>
+                                    <b>7</b>
+                                    <v>402583</v>
                                 </b>
                                 <b>
-                                    <a>30</a>
-                                    <b>72</b>
-                                    <v>779</v>
+                                    <a>7</a>
+                                    <b>8</b>
+                                    <v>517607</v>
                                 </b>
                                 <b>
-                                    <a>72</a>
-                                    <b>115</b>
-                                    <v>274</v>
+                                    <a>8</a>
+                                    <b>17</b>
+                                    <v>497067</v>
+                                </b>
+                                <b>
+                                    <a>17</a>
+                                    <b>57</b>
+                                    <v>147887</v>
                                 </b>
                             </bs>
                         </hist>
@@ -6823,27 +7050,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7630</v>
+                                    <v>2690735</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>1017</v>
+                                    <v>3031698</v>
                                 </b>
                                 <b>
                                     <a>3</a>
-                                    <b>6</b>
-                                    <v>779</v>
-                                </b>
-                                <b>
-                                    <a>6</a>
-                                    <b>21</b>
-                                    <v>792</v>
-                                </b>
-                                <b>
-                                    <a>21</a>
-                                    <b>315</b>
-                                    <v>94</v>
+                                    <b>14</b>
+                                    <v>451879</v>
                                 </b>
                             </bs>
                         </hist>
@@ -6859,32 +7076,47 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>6871</v>
+                                    <v>1630873</v>
                                 </b>
                                 <b>
                                     <a>2</a>
+                                    <b>3</b>
+                                    <v>624414</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>1063970</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
                                     <b>5</b>
-                                    <v>793</v>
+                                    <v>636738</v>
                                 </b>
                                 <b>
                                     <a>5</a>
-                                    <b>12</b>
-                                    <v>789</v>
+                                    <b>6</b>
+                                    <v>644954</v>
                                 </b>
                                 <b>
-                                    <a>12</a>
-                                    <b>33</b>
-                                    <v>778</v>
+                                    <a>6</a>
+                                    <b>7</b>
+                                    <v>480635</v>
                                 </b>
                                 <b>
-                                    <a>33</a>
-                                    <b>81</b>
-                                    <v>781</v>
+                                    <a>7</a>
+                                    <b>9</b>
+                                    <v>464203</v>
                                 </b>
                                 <b>
-                                    <a>81</a>
-                                    <b>127</b>
-                                    <v>300</v>
+                                    <a>9</a>
+                                    <b>19</b>
+                                    <v>476527</v>
+                                </b>
+                                <b>
+                                    <a>19</a>
+                                    <b>65</b>
+                                    <v>151995</v>
                                 </b>
                             </bs>
                         </hist>
@@ -6900,67 +7132,52 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>29</v>
+                                    <v>308099</v>
                                 </b>
                                 <b>
                                     <a>2</a>
-                                    <b>4</b>
-                                    <v>19</v>
-                                </b>
-                                <b>
-                                    <a>4</a>
-                                    <b>9</b>
-                                    <v>16</v>
-                                </b>
-                                <b>
-                                    <a>10</a>
-                                    <b>22</b>
-                                    <v>16</v>
-                                </b>
-                                <b>
-                                    <a>22</a>
-                                    <b>62</b>
-                                    <v>16</v>
+                                    <b>3</b>
+                                    <v>127347</v>
                                 </b>
                                 <b>
-                                    <a>62</a>
-                                    <b>141</b>
-                                    <v>16</v>
+                                    <a>3</a>
+                                    <b>5</b>
+                                    <v>94483</v>
                                 </b>
                                 <b>
-                                    <a>144</a>
-                                    <b>330</b>
-                                    <v>16</v>
+                                    <a>5</a>
+                                    <b>8</b>
+                                    <v>90375</v>
                                 </b>
                                 <b>
-                                    <a>330</a>
-                                    <b>759</b>
-                                    <v>16</v>
+                                    <a>9</a>
+                                    <b>16</b>
+                                    <v>82159</v>
                                 </b>
                                 <b>
-                                    <a>781</a>
-                                    <b>1804</b>
-                                    <v>16</v>
+                                    <a>16</a>
+                                    <b>35</b>
+                                    <v>78051</v>
                                 </b>
                                 <b>
-                                    <a>1846</a>
-                                    <b>3757</b>
-                                    <v>16</v>
+                                    <a>35</a>
+                                    <b>66</b>
+                                    <v>78051</v>
                                 </b>
                                 <b>
-                                    <a>4042</a>
-                                    <b>8613</b>
-                                    <v>16</v>
+                                    <a>72</a>
+                                    <b>105</b>
+                                    <v>78051</v>
                                 </b>
                                 <b>
-                                    <a>8764</a>
-                                    <b>22092</b>
-                                    <v>16</v>
+                                    <a>105</a>
+                                    <b>408</b>
+                                    <v>78051</v>
                                 </b>
                                 <b>
-                                    <a>28067</a>
-                                    <b>55590</b>
-                                    <v>3</v>
+                                    <a>500</a>
+                                    <b>1007</b>
+                                    <v>12323</v>
                                 </b>
                             </bs>
                         </hist>
@@ -6976,62 +7193,47 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>36</v>
+                                    <v>320423</v>
                                 </b>
                                 <b>
                                     <a>2</a>
-                                    <b>4</b>
-                                    <v>14</v>
-                                </b>
-                                <b>
-                                    <a>4</a>
-                                    <b>10</b>
-                                    <v>18</v>
-                                </b>
-                                <b>
-                                    <a>10</a>
-                                    <b>22</b>
-                                    <v>17</v>
-                                </b>
-                                <b>
-                                    <a>22</a>
-                                    <b>48</b>
-                                    <v>17</v>
+                                    <b>3</b>
+                                    <v>151995</v>
                                 </b>
                                 <b>
-                                    <a>49</a>
-                                    <b>96</b>
-                                    <v>17</v>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>53403</v>
                                 </b>
                                 <b>
-                                    <a>96</a>
-                                    <b>180</b>
-                                    <v>16</v>
+                                    <a>4</a>
+                                    <b>5</b>
+                                    <v>90375</v>
                                 </b>
                                 <b>
-                                    <a>180</a>
-                                    <b>292</b>
-                                    <v>16</v>
+                                    <a>5</a>
+                                    <b>6</b>
+                                    <v>98591</v>
                                 </b>
                                 <b>
-                                    <a>297</a>
-                                    <b>382</b>
-                                    <v>16</v>
+                                    <a>6</a>
+                                    <b>9</b>
+                                    <v>82159</v>
                                 </b>
                                 <b>
-                                    <a>383</a>
-                                    <b>430</b>
-                                    <v>16</v>
+                                    <a>9</a>
+                                    <b>13</b>
+                                    <v>69835</v>
                                 </b>
                                 <b>
-                                    <a>431</a>
-                                    <b>463</b>
-                                    <v>16</v>
+                                    <a>13</a>
+                                    <b>17</b>
+                                    <v>78051</v>
                                 </b>
                                 <b>
-                                    <a>463</a>
-                                    <b>530</b>
-                                    <v>12</v>
+                                    <a>17</a>
+                                    <b>29</b>
+                                    <v>82159</v>
                                 </b>
                             </bs>
                         </hist>
@@ -7047,67 +7249,47 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>36</v>
+                                    <v>394367</v>
                                 </b>
                                 <b>
                                     <a>2</a>
-                                    <b>4</b>
-                                    <v>13</v>
-                                </b>
-                                <b>
-                                    <a>4</a>
-                                    <b>9</b>
-                                    <v>16</v>
-                                </b>
-                                <b>
-                                    <a>9</a>
-                                    <b>20</b>
-                                    <v>16</v>
-                                </b>
-                                <b>
-                                    <a>20</a>
-                                    <b>53</b>
-                                    <v>16</v>
-                                </b>
-                                <b>
-                                    <a>55</a>
-                                    <b>103</b>
-                                    <v>16</v>
+                                    <b>3</b>
+                                    <v>143779</v>
                                 </b>
                                 <b>
-                                    <a>107</a>
-                                    <b>209</b>
-                                    <v>16</v>
+                                    <a>3</a>
+                                    <b>5</b>
+                                    <v>86267</v>
                                 </b>
                                 <b>
-                                    <a>221</a>
-                                    <b>412</b>
-                                    <v>16</v>
+                                    <a>5</a>
+                                    <b>14</b>
+                                    <v>78051</v>
                                 </b>
                                 <b>
-                                    <a>422</a>
-                                    <b>682</b>
-                                    <v>16</v>
+                                    <a>14</a>
+                                    <b>32</b>
+                                    <v>82159</v>
                                 </b>
                                 <b>
-                                    <a>706</a>
-                                    <b>975</b>
-                                    <v>16</v>
+                                    <a>32</a>
+                                    <b>58</b>
+                                    <v>78051</v>
                                 </b>
                                 <b>
-                                    <a>977</a>
-                                    <b>1410</b>
-                                    <v>16</v>
+                                    <a>61</a>
+                                    <b>82</b>
+                                    <v>82159</v>
                                 </b>
                                 <b>
-                                    <a>1417</a>
-                                    <b>1983</b>
-                                    <v>16</v>
+                                    <a>83</a>
+                                    <b>623</b>
+                                    <v>78051</v>
                                 </b>
                                 <b>
-                                    <a>2809</a>
-                                    <b>10184</b>
-                                    <v>2</v>
+                                    <a>752</a>
+                                    <b>753</b>
+                                    <v>4107</v>
                                 </b>
                             </bs>
                         </hist>
@@ -7123,62 +7305,47 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>36</v>
+                                    <v>394367</v>
                                 </b>
                                 <b>
                                     <a>2</a>
-                                    <b>4</b>
-                                    <v>13</v>
-                                </b>
-                                <b>
-                                    <a>4</a>
-                                    <b>9</b>
-                                    <v>16</v>
-                                </b>
-                                <b>
-                                    <a>9</a>
-                                    <b>21</b>
-                                    <v>19</v>
-                                </b>
-                                <b>
-                                    <a>24</a>
-                                    <b>55</b>
-                                    <v>16</v>
+                                    <b>3</b>
+                                    <v>143779</v>
                                 </b>
                                 <b>
-                                    <a>58</a>
-                                    <b>128</b>
-                                    <v>16</v>
+                                    <a>3</a>
+                                    <b>5</b>
+                                    <v>86267</v>
                                 </b>
                                 <b>
-                                    <a>131</a>
-                                    <b>226</b>
-                                    <v>16</v>
+                                    <a>5</a>
+                                    <b>14</b>
+                                    <v>78051</v>
                                 </b>
                                 <b>
-                                    <a>231</a>
-                                    <b>453</b>
-                                    <v>16</v>
+                                    <a>14</a>
+                                    <b>31</b>
+                                    <v>78051</v>
                                 </b>
                                 <b>
-                                    <a>480</a>
-                                    <b>769</b>
-                                    <v>16</v>
+                                    <a>31</a>
+                                    <b>56</b>
+                                    <v>78051</v>
                                 </b>
                                 <b>
-                                    <a>783</a>
-                                    <b>1037</b>
-                                    <v>16</v>
+                                    <a>57</a>
+                                    <b>80</b>
+                                    <v>82159</v>
                                 </b>
                                 <b>
-                                    <a>1057</a>
-                                    <b>1521</b>
-                                    <v>16</v>
+                                    <a>81</a>
+                                    <b>412</b>
+                                    <v>78051</v>
                                 </b>
                                 <b>
-                                    <a>1526</a>
-                                    <b>10180</b>
-                                    <v>15</v>
+                                    <a>627</a>
+                                    <b>773</b>
+                                    <v>8215</v>
                                 </b>
                             </bs>
                         </hist>
@@ -7194,62 +7361,42 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>31</v>
+                                    <v>468311</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>16</v>
+                                    <v>94483</v>
                                 </b>
                                 <b>
                                     <a>3</a>
-                                    <b>6</b>
-                                    <v>17</v>
-                                </b>
-                                <b>
-                                    <a>6</a>
-                                    <b>12</b>
-                                    <v>17</v>
-                                </b>
-                                <b>
-                                    <a>12</a>
-                                    <b>21</b>
-                                    <v>16</v>
-                                </b>
-                                <b>
-                                    <a>21</a>
-                                    <b>28</b>
-                                    <v>16</v>
-                                </b>
-                                <b>
-                                    <a>28</a>
-                                    <b>35</b>
-                                    <v>17</v>
+                                    <b>5</b>
+                                    <v>78051</v>
                                 </b>
                                 <b>
-                                    <a>35</a>
-                                    <b>45</b>
-                                    <v>16</v>
+                                    <a>5</a>
+                                    <b>13</b>
+                                    <v>78051</v>
                                 </b>
                                 <b>
-                                    <a>46</a>
-                                    <b>56</b>
-                                    <v>16</v>
+                                    <a>13</a>
+                                    <b>23</b>
+                                    <v>90375</v>
                                 </b>
                                 <b>
-                                    <a>56</a>
-                                    <b>77</b>
-                                    <v>17</v>
+                                    <a>25</a>
+                                    <b>34</b>
+                                    <v>82159</v>
                                 </b>
                                 <b>
-                                    <a>77</a>
-                                    <b>101</b>
-                                    <v>17</v>
+                                    <a>34</a>
+                                    <b>41</b>
+                                    <v>82159</v>
                                 </b>
                                 <b>
-                                    <a>101</a>
-                                    <b>201</b>
-                                    <v>15</v>
+                                    <a>41</a>
+                                    <b>106</b>
+                                    <v>53403</v>
                                 </b>
                             </bs>
                         </hist>
@@ -7265,32 +7412,47 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>6731</v>
+                                    <v>3093318</v>
                                 </b>
                                 <b>
                                     <a>2</a>
+                                    <b>3</b>
+                                    <v>505283</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>796950</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>5</b>
+                                    <v>801058</v>
+                                </b>
+                                <b>
+                                    <a>5</a>
                                     <b>6</b>
-                                    <v>903</v>
+                                    <v>443663</v>
                                 </b>
                                 <b>
                                     <a>6</a>
-                                    <b>16</b>
-                                    <v>817</v>
+                                    <b>7</b>
+                                    <v>303991</v>
                                 </b>
                                 <b>
-                                    <a>16</a>
-                                    <b>58</b>
-                                    <v>785</v>
+                                    <a>7</a>
+                                    <b>8</b>
+                                    <v>579226</v>
                                 </b>
                                 <b>
-                                    <a>58</a>
-                                    <b>457</b>
-                                    <v>779</v>
+                                    <a>8</a>
+                                    <b>21</b>
+                                    <v>562794</v>
                                 </b>
                                 <b>
-                                    <a>458</a>
-                                    <b>1734</b>
-                                    <v>363</v>
+                                    <a>21</a>
+                                    <b>174</b>
+                                    <v>271127</v>
                                 </b>
                             </bs>
                         </hist>
@@ -7306,32 +7468,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>6847</v>
+                                    <v>6318092</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>810</v>
+                                    <v>382043</v>
                                 </b>
                                 <b>
                                     <a>3</a>
-                                    <b>5</b>
-                                    <v>787</v>
-                                </b>
-                                <b>
-                                    <a>5</a>
-                                    <b>14</b>
-                                    <v>802</v>
-                                </b>
-                                <b>
-                                    <a>14</a>
-                                    <b>104</b>
-                                    <v>780</v>
+                                    <b>16</b>
+                                    <v>554578</v>
                                 </b>
                                 <b>
-                                    <a>105</a>
-                                    <b>530</b>
-                                    <v>352</v>
+                                    <a>16</a>
+                                    <b>29</b>
+                                    <v>102699</v>
                                 </b>
                             </bs>
                         </hist>
@@ -7347,27 +7499,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7766</v>
+                                    <v>4962455</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>956</v>
+                                    <v>1934864</v>
                                 </b>
                                 <b>
                                     <a>3</a>
-                                    <b>7</b>
-                                    <v>860</v>
-                                </b>
-                                <b>
-                                    <a>7</a>
-                                    <b>27</b>
-                                    <v>785</v>
-                                </b>
-                                <b>
-                                    <a>27</a>
-                                    <b>31</b>
-                                    <v>11</v>
+                                    <b>8</b>
+                                    <v>460095</v>
                                 </b>
                             </bs>
                         </hist>
@@ -7383,32 +7525,47 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>6749</v>
+                                    <v>3101534</v>
                                 </b>
                                 <b>
                                     <a>2</a>
+                                    <b>3</b>
+                                    <v>521715</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
                                     <b>4</b>
-                                    <v>616</v>
+                                    <v>813382</v>
                                 </b>
                                 <b>
                                     <a>4</a>
-                                    <b>8</b>
-                                    <v>878</v>
+                                    <b>5</b>
+                                    <v>870894</v>
                                 </b>
                                 <b>
-                                    <a>8</a>
-                                    <b>21</b>
-                                    <v>799</v>
+                                    <a>5</a>
+                                    <b>6</b>
+                                    <v>468311</v>
                                 </b>
                                 <b>
-                                    <a>21</a>
-                                    <b>53</b>
-                                    <v>779</v>
+                                    <a>6</a>
+                                    <b>7</b>
+                                    <v>308099</v>
                                 </b>
                                 <b>
-                                    <a>53</a>
-                                    <b>113</b>
-                                    <v>557</v>
+                                    <a>7</a>
+                                    <b>8</b>
+                                    <v>640846</v>
+                                </b>
+                                <b>
+                                    <a>8</a>
+                                    <b>24</b>
+                                    <v>562794</v>
+                                </b>
+                                <b>
+                                    <a>24</a>
+                                    <b>54</b>
+                                    <v>69835</v>
                                 </b>
                             </bs>
                         </hist>
@@ -7424,32 +7581,47 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>6792</v>
+                                    <v>3130290</v>
                                 </b>
                                 <b>
                                     <a>2</a>
+                                    <b>3</b>
+                                    <v>529931</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>796950</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
                                     <b>5</b>
-                                    <v>936</v>
+                                    <v>854462</v>
                                 </b>
                                 <b>
                                     <a>5</a>
-                                    <b>12</b>
-                                    <v>801</v>
+                                    <b>6</b>
+                                    <v>443663</v>
                                 </b>
                                 <b>
-                                    <a>12</a>
-                                    <b>34</b>
-                                    <v>791</v>
+                                    <a>6</a>
+                                    <b>7</b>
+                                    <v>414907</v>
                                 </b>
                                 <b>
-                                    <a>34</a>
-                                    <b>83</b>
-                                    <v>787</v>
+                                    <a>7</a>
+                                    <b>9</b>
+                                    <v>583334</v>
                                 </b>
                                 <b>
-                                    <a>83</a>
-                                    <b>127</b>
-                                    <v>271</v>
+                                    <a>9</a>
+                                    <b>32</b>
+                                    <v>554578</v>
+                                </b>
+                                <b>
+                                    <a>33</a>
+                                    <b>66</b>
+                                    <v>49295</v>
                                 </b>
                             </bs>
                         </hist>
@@ -7465,57 +7637,57 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>33</v>
+                                    <v>262911</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>60</v>
+                                    <v>180751</v>
                                 </b>
                                 <b>
                                     <a>3</a>
-                                    <b>9</b>
-                                    <v>23</v>
+                                    <b>4</b>
+                                    <v>32863</v>
                                 </b>
                                 <b>
-                                    <a>9</a>
-                                    <b>40</b>
-                                    <v>21</v>
+                                    <a>4</a>
+                                    <b>5</b>
+                                    <v>98591</v>
                                 </b>
                                 <b>
-                                    <a>43</a>
-                                    <b>111</b>
-                                    <v>21</v>
+                                    <a>5</a>
+                                    <b>7</b>
+                                    <v>90375</v>
                                 </b>
                                 <b>
-                                    <a>121</a>
-                                    <b>347</b>
-                                    <v>21</v>
+                                    <a>7</a>
+                                    <b>15</b>
+                                    <v>90375</v>
                                 </b>
                                 <b>
-                                    <a>369</a>
-                                    <b>1229</b>
-                                    <v>21</v>
+                                    <a>15</a>
+                                    <b>37</b>
+                                    <v>90375</v>
                                 </b>
                                 <b>
-                                    <a>1267</a>
-                                    <b>3311</b>
-                                    <v>21</v>
+                                    <a>40</a>
+                                    <b>71</b>
+                                    <v>90375</v>
                                 </b>
                                 <b>
-                                    <a>3642</a>
-                                    <b>7560</b>
-                                    <v>21</v>
+                                    <a>71</a>
+                                    <b>101</b>
+                                    <v>90375</v>
                                 </b>
                                 <b>
-                                    <a>7682</a>
-                                    <b>12716</b>
-                                    <v>21</v>
+                                    <a>101</a>
+                                    <b>144</b>
+                                    <v>90375</v>
                                 </b>
                                 <b>
-                                    <a>12740</a>
-                                    <b>20483</b>
-                                    <v>11</v>
+                                    <a>146</a>
+                                    <b>448</b>
+                                    <v>36971</v>
                                 </b>
                             </bs>
                         </hist>
@@ -7531,52 +7703,52 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>94</v>
+                                    <v>312207</v>
                                 </b>
                                 <b>
                                     <a>2</a>
-                                    <b>6</b>
-                                    <v>19</v>
+                                    <b>3</b>
+                                    <v>156103</v>
                                 </b>
                                 <b>
-                                    <a>6</a>
-                                    <b>16</b>
-                                    <v>21</v>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>53403</v>
                                 </b>
                                 <b>
-                                    <a>16</a>
-                                    <b>45</b>
-                                    <v>21</v>
+                                    <a>4</a>
+                                    <b>5</b>
+                                    <v>119131</v>
                                 </b>
                                 <b>
-                                    <a>45</a>
-                                    <b>110</b>
-                                    <v>21</v>
+                                    <a>5</a>
+                                    <b>6</b>
+                                    <v>94483</v>
                                 </b>
                                 <b>
-                                    <a>123</a>
-                                    <b>281</b>
-                                    <v>21</v>
+                                    <a>6</a>
+                                    <b>9</b>
+                                    <v>102699</v>
                                 </b>
                                 <b>
-                                    <a>290</a>
-                                    <b>393</b>
-                                    <v>21</v>
+                                    <a>9</a>
+                                    <b>12</b>
+                                    <v>90375</v>
                                 </b>
                                 <b>
-                                    <a>395</a>
-                                    <b>445</b>
-                                    <v>21</v>
+                                    <a>12</a>
+                                    <b>15</b>
+                                    <v>82159</v>
                                 </b>
                                 <b>
-                                    <a>446</a>
-                                    <b>468</b>
-                                    <v>21</v>
+                                    <a>15</a>
+                                    <b>19</b>
+                                    <v>94483</v>
                                 </b>
                                 <b>
-                                    <a>470</a>
-                                    <b>530</b>
-                                    <v>14</v>
+                                    <a>19</a>
+                                    <b>29</b>
+                                    <v>49295</v>
                                 </b>
                             </bs>
                         </hist>
@@ -7592,52 +7764,47 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>94</v>
+                                    <v>414907</v>
                                 </b>
                                 <b>
                                     <a>2</a>
-                                    <b>6</b>
-                                    <v>19</v>
-                                </b>
-                                <b>
-                                    <a>6</a>
-                                    <b>21</b>
-                                    <v>21</v>
+                                    <b>3</b>
+                                    <v>160211</v>
                                 </b>
                                 <b>
-                                    <a>21</a>
-                                    <b>52</b>
-                                    <v>21</v>
+                                    <a>3</a>
+                                    <b>5</b>
+                                    <v>102699</v>
                                 </b>
                                 <b>
-                                    <a>54</a>
-                                    <b>154</b>
-                                    <v>21</v>
+                                    <a>5</a>
+                                    <b>11</b>
+                                    <v>94483</v>
                                 </b>
                                 <b>
-                                    <a>157</a>
-                                    <b>449</b>
-                                    <v>21</v>
+                                    <a>11</a>
+                                    <b>38</b>
+                                    <v>90375</v>
                                 </b>
                                 <b>
-                                    <a>455</a>
-                                    <b>808</b>
-                                    <v>21</v>
+                                    <a>40</a>
+                                    <b>66</b>
+                                    <v>90375</v>
                                 </b>
                                 <b>
-                                    <a>814</a>
-                                    <b>1132</b>
-                                    <v>21</v>
+                                    <a>67</a>
+                                    <b>86</b>
+                                    <v>90375</v>
                                 </b>
                                 <b>
-                                    <a>1145</a>
-                                    <b>1769</b>
-                                    <v>21</v>
+                                    <a>86</a>
+                                    <b>126</b>
+                                    <v>94483</v>
                                 </b>
                                 <b>
-                                    <a>1792</a>
-                                    <b>2365</b>
-                                    <v>14</v>
+                                    <a>126</a>
+                                    <b>352</b>
+                                    <v>16431</v>
                                 </b>
                             </bs>
                         </hist>
@@ -7653,57 +7820,47 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>39</v>
+                                    <v>460095</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>56</v>
+                                    <v>102699</v>
                                 </b>
                                 <b>
                                     <a>3</a>
-                                    <b>7</b>
-                                    <v>23</v>
+                                    <b>4</b>
+                                    <v>69835</v>
                                 </b>
                                 <b>
-                                    <a>7</a>
-                                    <b>18</b>
-                                    <v>21</v>
-                                </b>
-                                <b>
-                                    <a>18</a>
-                                    <b>27</b>
-                                    <v>24</v>
-                                </b>
-                                <b>
-                                    <a>27</a>
-                                    <b>37</b>
-                                    <v>22</v>
+                                    <a>4</a>
+                                    <b>8</b>
+                                    <v>106807</v>
                                 </b>
                                 <b>
-                                    <a>37</a>
-                                    <b>49</b>
-                                    <v>23</v>
+                                    <a>8</a>
+                                    <b>16</b>
+                                    <v>94483</v>
                                 </b>
                                 <b>
-                                    <a>49</a>
-                                    <b>63</b>
-                                    <v>22</v>
+                                    <a>16</a>
+                                    <b>26</b>
+                                    <v>94483</v>
                                 </b>
                                 <b>
-                                    <a>63</a>
-                                    <b>74</b>
-                                    <v>20</v>
+                                    <a>26</a>
+                                    <b>31</b>
+                                    <v>86267</v>
                                 </b>
                                 <b>
-                                    <a>74</a>
-                                    <b>102</b>
-                                    <v>21</v>
+                                    <a>31</a>
+                                    <b>35</b>
+                                    <v>94483</v>
                                 </b>
                                 <b>
-                                    <a>103</a>
-                                    <b>172</b>
-                                    <v>3</v>
+                                    <a>35</a>
+                                    <b>58</b>
+                                    <v>45187</v>
                                 </b>
                             </bs>
                         </hist>
@@ -7719,52 +7876,47 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>94</v>
+                                    <v>414907</v>
                                 </b>
                                 <b>
                                     <a>2</a>
-                                    <b>6</b>
-                                    <v>19</v>
-                                </b>
-                                <b>
-                                    <a>6</a>
-                                    <b>21</b>
-                                    <v>21</v>
+                                    <b>3</b>
+                                    <v>160211</v>
                                 </b>
                                 <b>
-                                    <a>21</a>
-                                    <b>52</b>
-                                    <v>21</v>
+                                    <a>3</a>
+                                    <b>5</b>
+                                    <v>102699</v>
                                 </b>
                                 <b>
-                                    <a>53</a>
-                                    <b>153</b>
-                                    <v>21</v>
+                                    <a>5</a>
+                                    <b>11</b>
+                                    <v>94483</v>
                                 </b>
                                 <b>
-                                    <a>156</a>
-                                    <b>444</b>
-                                    <v>21</v>
+                                    <a>11</a>
+                                    <b>38</b>
+                                    <v>90375</v>
                                 </b>
                                 <b>
-                                    <a>446</a>
-                                    <b>789</b>
-                                    <v>21</v>
+                                    <a>40</a>
+                                    <b>67</b>
+                                    <v>94483</v>
                                 </b>
                                 <b>
-                                    <a>806</a>
-                                    <b>1121</b>
-                                    <v>21</v>
+                                    <a>68</a>
+                                    <b>87</b>
+                                    <v>90375</v>
                                 </b>
                                 <b>
-                                    <a>1138</a>
-                                    <b>1726</b>
-                                    <v>21</v>
+                                    <a>87</a>
+                                    <b>127</b>
+                                    <v>90375</v>
                                 </b>
                                 <b>
-                                    <a>1787</a>
-                                    <b>2357</b>
-                                    <v>14</v>
+                                    <a>131</a>
+                                    <b>394</b>
+                                    <v>16431</v>
                                 </b>
                             </bs>
                         </hist>
@@ -7774,23 +7926,23 @@
         </relation>
         <relation>
             <name>numlines</name>
-            <cardinality>514</cardinality>
+            <cardinality>81641</cardinality>
             <columnsizes>
                 <e>
                     <k>element_id</k>
-                    <v>514</v>
+                    <v>81641</v>
                 </e>
                 <e>
                     <k>num_lines</k>
-                    <v>309</v>
+                    <v>22071</v>
                 </e>
                 <e>
                     <k>num_code</k>
-                    <v>350</v>
+                    <v>17999</v>
                 </e>
                 <e>
                     <k>num_comment</k>
-                    <v>150</v>
+                    <v>10928</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -7804,7 +7956,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>514</v>
+                                    <v>81641</v>
                                 </b>
                             </bs>
                         </hist>
@@ -7820,7 +7972,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>514</v>
+                                    <v>81641</v>
                                 </b>
                             </bs>
                         </hist>
@@ -7836,7 +7988,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>514</v>
+                                    <v>81641</v>
                                 </b>
                             </bs>
                         </hist>
@@ -7852,22 +8004,47 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>183</v>
+                                    <v>7285</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>74</v>
+                                    <v>3857</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>32</v>
+                                    <v>1285</v>
                                 </b>
                                 <b>
                                     <a>4</a>
+                                    <b>5</b>
+                                    <v>2142</v>
+                                </b>
+                                <b>
+                                    <a>5</a>
+                                    <b>6</b>
+                                    <v>1928</v>
+                                </b>
+                                <b>
+                                    <a>6</a>
                                     <b>7</b>
-                                    <v>20</v>
+                                    <v>1928</v>
+                                </b>
+                                <b>
+                                    <a>7</a>
+                                    <b>9</b>
+                                    <v>1285</v>
+                                </b>
+                                <b>
+                                    <a>9</a>
+                                    <b>11</b>
+                                    <v>1285</v>
+                                </b>
+                                <b>
+                                    <a>11</a>
+                                    <b>12</b>
+                                    <v>1071</v>
                                 </b>
                             </bs>
                         </hist>
@@ -7883,22 +8060,37 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>187</v>
+                                    <v>8357</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>82</v>
+                                    <v>3642</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>23</v>
+                                    <v>2142</v>
                                 </b>
                                 <b>
                                     <a>4</a>
-                                    <b>7</b>
-                                    <v>17</v>
+                                    <b>5</b>
+                                    <v>2357</v>
+                                </b>
+                                <b>
+                                    <a>5</a>
+                                    <b>6</b>
+                                    <v>2785</v>
+                                </b>
+                                <b>
+                                    <a>6</a>
+                                    <b>8</b>
+                                    <v>1928</v>
+                                </b>
+                                <b>
+                                    <a>8</a>
+                                    <b>10</b>
+                                    <v>857</v>
                                 </b>
                             </bs>
                         </hist>
@@ -7914,22 +8106,37 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>188</v>
+                                    <v>8785</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>79</v>
+                                    <v>3857</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>28</v>
+                                    <v>2357</v>
                                 </b>
                                 <b>
                                     <a>4</a>
+                                    <b>5</b>
+                                    <v>2357</v>
+                                </b>
+                                <b>
+                                    <a>5</a>
+                                    <b>6</b>
+                                    <v>1928</v>
+                                </b>
+                                <b>
+                                    <a>6</a>
                                     <b>7</b>
-                                    <v>14</v>
+                                    <v>1285</v>
+                                </b>
+                                <b>
+                                    <a>7</a>
+                                    <b>10</b>
+                                    <v>1499</v>
                                 </b>
                             </bs>
                         </hist>
@@ -7945,22 +8152,37 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>252</v>
+                                    <v>6214</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>65</v>
+                                    <v>4071</v>
                                 </b>
                                 <b>
                                     <a>3</a>
-                                    <b>5</b>
-                                    <v>28</v>
+                                    <b>4</b>
+                                    <v>2142</v>
                                 </b>
                                 <b>
-                                    <a>6</a>
-                                    <b>18</b>
-                                    <v>5</v>
+                                    <a>5</a>
+                                    <b>8</b>
+                                    <v>1285</v>
+                                </b>
+                                <b>
+                                    <a>8</a>
+                                    <b>10</b>
+                                    <v>1285</v>
+                                </b>
+                                <b>
+                                    <a>10</a>
+                                    <b>13</b>
+                                    <v>1499</v>
+                                </b>
+                                <b>
+                                    <a>14</a>
+                                    <b>22</b>
+                                    <v>1499</v>
                                 </b>
                             </bs>
                         </hist>
@@ -7976,17 +8198,42 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>256</v>
+                                    <v>7071</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>67</v>
+                                    <v>3428</v>
                                 </b>
                                 <b>
                                     <a>3</a>
+                                    <b>4</b>
+                                    <v>2142</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>7</b>
+                                    <v>1499</v>
+                                </b>
+                                <b>
+                                    <a>7</a>
+                                    <b>9</b>
+                                    <v>1285</v>
+                                </b>
+                                <b>
+                                    <a>9</a>
+                                    <b>10</b>
+                                    <v>857</v>
+                                </b>
+                                <b>
+                                    <a>10</a>
+                                    <b>15</b>
+                                    <v>1499</v>
+                                </b>
+                                <b>
+                                    <a>17</a>
                                     <b>18</b>
-                                    <v>27</v>
+                                    <v>214</v>
                                 </b>
                             </bs>
                         </hist>
@@ -8002,22 +8249,37 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>259</v>
+                                    <v>7071</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>63</v>
+                                    <v>3428</v>
                                 </b>
                                 <b>
                                     <a>3</a>
+                                    <b>4</b>
+                                    <v>2142</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>6</b>
+                                    <v>857</v>
+                                </b>
+                                <b>
+                                    <a>6</a>
                                     <b>7</b>
-                                    <v>27</v>
+                                    <v>1714</v>
                                 </b>
                                 <b>
-                                    <a>17</a>
-                                    <b>18</b>
-                                    <v>1</v>
+                                    <a>7</a>
+                                    <b>9</b>
+                                    <v>1499</v>
+                                </b>
+                                <b>
+                                    <a>9</a>
+                                    <b>16</b>
+                                    <v>1285</v>
                                 </b>
                             </bs>
                         </hist>
@@ -8033,37 +8295,47 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>65</v>
+                                    <v>3214</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>27</v>
+                                    <v>2142</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>17</v>
+                                    <v>1285</v>
                                 </b>
                                 <b>
                                     <a>4</a>
-                                    <b>5</b>
-                                    <v>7</v>
+                                    <b>7</b>
+                                    <v>642</v>
                                 </b>
                                 <b>
-                                    <a>5</a>
-                                    <b>6</b>
-                                    <v>10</v>
+                                    <a>7</a>
+                                    <b>8</b>
+                                    <v>428</v>
                                 </b>
                                 <b>
-                                    <a>6</a>
-                                    <b>10</b>
-                                    <v>12</v>
+                                    <a>8</a>
+                                    <b>9</b>
+                                    <v>1071</v>
                                 </b>
                                 <b>
-                                    <a>10</a>
-                                    <b>31</b>
-                                    <v>12</v>
+                                    <a>11</a>
+                                    <b>18</b>
+                                    <v>857</v>
+                                </b>
+                                <b>
+                                    <a>18</a>
+                                    <b>28</b>
+                                    <v>857</v>
+                                </b>
+                                <b>
+                                    <a>37</a>
+                                    <b>84</b>
+                                    <v>428</v>
                                 </b>
                             </bs>
                         </hist>
@@ -8079,37 +8351,47 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>65</v>
+                                    <v>3214</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>27</v>
+                                    <v>2357</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>18</v>
+                                    <v>1285</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>7</v>
+                                    <v>214</v>
                                 </b>
                                 <b>
-                                    <a>5</a>
-                                    <b>6</b>
-                                    <v>10</v>
+                                    <a>6</a>
+                                    <b>7</b>
+                                    <v>857</v>
                                 </b>
                                 <b>
-                                    <a>6</a>
-                                    <b>10</b>
-                                    <v>13</v>
+                                    <a>7</a>
+                                    <b>9</b>
+                                    <v>857</v>
                                 </b>
                                 <b>
                                     <a>10</a>
-                                    <b>25</b>
-                                    <v>10</v>
+                                    <b>13</b>
+                                    <v>642</v>
+                                </b>
+                                <b>
+                                    <a>14</a>
+                                    <b>16</b>
+                                    <v>857</v>
+                                </b>
+                                <b>
+                                    <a>22</a>
+                                    <b>39</b>
+                                    <v>642</v>
                                 </b>
                             </bs>
                         </hist>
@@ -8125,37 +8407,47 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>66</v>
+                                    <v>3214</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>27</v>
+                                    <v>2357</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>17</v>
+                                    <v>1285</v>
                                 </b>
                                 <b>
                                     <a>4</a>
-                                    <b>5</b>
-                                    <v>6</v>
-                                </b>
-                                <b>
-                                    <a>5</a>
                                     <b>6</b>
-                                    <v>10</v>
+                                    <v>642</v>
                                 </b>
                                 <b>
                                     <a>6</a>
-                                    <b>9</b>
-                                    <v>12</v>
+                                    <b>8</b>
+                                    <v>642</v>
                                 </b>
                                 <b>
-                                    <a>9</a>
-                                    <b>24</b>
-                                    <v>12</v>
+                                    <a>8</a>
+                                    <b>10</b>
+                                    <v>857</v>
+                                </b>
+                                <b>
+                                    <a>10</a>
+                                    <b>14</b>
+                                    <v>857</v>
+                                </b>
+                                <b>
+                                    <a>14</a>
+                                    <b>26</b>
+                                    <v>857</v>
+                                </b>
+                                <b>
+                                    <a>33</a>
+                                    <b>34</b>
+                                    <v>214</v>
                                 </b>
                             </bs>
                         </hist>
@@ -8165,15 +8457,15 @@
         </relation>
         <relation>
             <name>files</name>
-            <cardinality>529</cardinality>
+            <cardinality>146783</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>529</v>
+                    <v>146783</v>
                 </e>
                 <e>
                     <k>name</k>
-                    <v>529</v>
+                    <v>146783</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -8187,7 +8479,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>529</v>
+                                    <v>146783</v>
                                 </b>
                             </bs>
                         </hist>
@@ -8203,7 +8495,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>529</v>
+                                    <v>146783</v>
                                 </b>
                             </bs>
                         </hist>
@@ -8213,15 +8505,15 @@
         </relation>
         <relation>
             <name>folders</name>
-            <cardinality>210</cardinality>
+            <cardinality>98591</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>210</v>
+                    <v>98591</v>
                 </e>
                 <e>
                     <k>name</k>
-                    <v>210</v>
+                    <v>98591</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -8235,7 +8527,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>210</v>
+                                    <v>98591</v>
                                 </b>
                             </bs>
                         </hist>
@@ -8251,7 +8543,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>210</v>
+                                    <v>98591</v>
                                 </b>
                             </bs>
                         </hist>
@@ -8261,15 +8553,15 @@
         </relation>
         <relation>
             <name>containerparent</name>
-            <cardinality>738</cardinality>
+            <cardinality>243853</cardinality>
             <columnsizes>
                 <e>
                     <k>parent</k>
-                    <v>210</v>
+                    <v>97284</v>
                 </e>
                 <e>
                     <k>child</k>
-                    <v>738</v>
+                    <v>243853</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -8283,32 +8575,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>115</v>
+                                    <v>56142</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>32</v>
+                                    <v>21856</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>12</v>
+                                    <v>6214</v>
                                 </b>
                                 <b>
                                     <a>4</a>
-                                    <b>6</b>
-                                    <v>19</v>
-                                </b>
-                                <b>
-                                    <a>6</a>
-                                    <b>12</b>
-                                    <v>16</v>
+                                    <b>7</b>
+                                    <v>8357</v>
                                 </b>
                                 <b>
-                                    <a>13</a>
-                                    <b>38</b>
-                                    <v>16</v>
+                                    <a>7</a>
+                                    <b>95</b>
+                                    <v>4714</v>
                                 </b>
                             </bs>
                         </hist>
@@ -8324,7 +8611,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>738</v>
+                                    <v>243853</v>
                                 </b>
                             </bs>
                         </hist>
@@ -8334,15 +8621,15 @@
         </relation>
         <relation>
             <name>has_location</name>
-            <cardinality>599339</cardinality>
+            <cardinality>14587326</cardinality>
             <columnsizes>
                 <e>
                     <k>locatable</k>
-                    <v>599339</v>
+                    <v>14587326</v>
                 </e>
                 <e>
                     <k>location</k>
-                    <v>537353</v>
+                    <v>11868805</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -8356,7 +8643,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>599339</v>
+                                    <v>14587326</v>
                                 </b>
                             </bs>
                         </hist>
@@ -8372,17 +8659,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>475682</v>
+                                    <v>9150285</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>61627</v>
-                                </b>
-                                <b>
-                                    <a>3</a>
-                                    <b>75</b>
-                                    <v>44</v>
+                                    <v>2718520</v>
                                 </b>
                             </bs>
                         </hist>
@@ -8392,19 +8674,19 @@
         </relation>
         <relation>
             <name>comment_groups</name>
-            <cardinality>12083</cardinality>
+            <cardinality>2493839</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>12083</v>
+                    <v>2493839</v>
                 </e>
                 <e>
                     <k>parent</k>
-                    <v>509</v>
+                    <v>3187</v>
                 </e>
                 <e>
                     <k>idx</k>
-                    <v>720</v>
+                    <v>846614</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -8418,7 +8700,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>12083</v>
+                                    <v>2493839</v>
                                 </b>
                             </bs>
                         </hist>
@@ -8434,7 +8716,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>12083</v>
+                                    <v>2493839</v>
                                 </b>
                             </bs>
                         </hist>
@@ -8450,67 +8732,52 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>44</v>
+                                    <v>691</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>45</v>
+                                    <v>384</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>32</v>
+                                    <v>230</v>
                                 </b>
                                 <b>
                                     <a>4</a>
-                                    <b>5</b>
-                                    <v>27</v>
-                                </b>
-                                <b>
-                                    <a>5</a>
-                                    <b>7</b>
-                                    <v>38</v>
-                                </b>
-                                <b>
-                                    <a>7</a>
-                                    <b>10</b>
-                                    <v>47</v>
+                                    <b>6</b>
+                                    <v>268</v>
                                 </b>
                                 <b>
-                                    <a>10</a>
-                                    <b>13</b>
-                                    <v>34</v>
+                                    <a>6</a>
+                                    <b>12</b>
+                                    <v>268</v>
                                 </b>
                                 <b>
-                                    <a>13</a>
-                                    <b>17</b>
-                                    <v>47</v>
+                                    <a>12</a>
+                                    <b>18</b>
+                                    <v>230</v>
                                 </b>
                                 <b>
-                                    <a>17</a>
-                                    <b>23</b>
-                                    <v>40</v>
+                                    <a>18</a>
+                                    <b>24</b>
+                                    <v>268</v>
                                 </b>
                                 <b>
-                                    <a>23</a>
-                                    <b>29</b>
-                                    <v>40</v>
+                                    <a>34</a>
+                                    <b>110</b>
+                                    <v>230</v>
                                 </b>
                                 <b>
-                                    <a>29</a>
-                                    <b>38</b>
-                                    <v>39</v>
+                                    <a>256</a>
+                                    <b>257</b>
+                                    <v>460</v>
                                 </b>
                                 <b>
-                                    <a>38</a>
-                                    <b>70</b>
-                                    <v>39</v>
-                                </b>
-                                <b>
-                                    <a>70</a>
-                                    <b>721</b>
-                                    <v>37</v>
+                                    <a>7980</a>
+                                    <b>22048</b>
+                                    <v>153</v>
                                 </b>
                             </bs>
                         </hist>
@@ -8526,67 +8793,52 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>44</v>
+                                    <v>691</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>45</v>
+                                    <v>384</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>32</v>
+                                    <v>230</v>
                                 </b>
                                 <b>
                                     <a>4</a>
-                                    <b>5</b>
-                                    <v>27</v>
-                                </b>
-                                <b>
-                                    <a>5</a>
-                                    <b>7</b>
-                                    <v>38</v>
-                                </b>
-                                <b>
-                                    <a>7</a>
-                                    <b>10</b>
-                                    <v>47</v>
-                                </b>
-                                <b>
-                                    <a>10</a>
-                                    <b>13</b>
-                                    <v>34</v>
+                                    <b>6</b>
+                                    <v>268</v>
                                 </b>
                                 <b>
-                                    <a>13</a>
-                                    <b>17</b>
-                                    <v>47</v>
+                                    <a>6</a>
+                                    <b>12</b>
+                                    <v>268</v>
                                 </b>
                                 <b>
-                                    <a>17</a>
-                                    <b>23</b>
-                                    <v>40</v>
+                                    <a>12</a>
+                                    <b>18</b>
+                                    <v>230</v>
                                 </b>
                                 <b>
-                                    <a>23</a>
-                                    <b>29</b>
-                                    <v>40</v>
+                                    <a>18</a>
+                                    <b>24</b>
+                                    <v>268</v>
                                 </b>
                                 <b>
-                                    <a>29</a>
-                                    <b>38</b>
-                                    <v>39</v>
+                                    <a>34</a>
+                                    <b>110</b>
+                                    <v>230</v>
                                 </b>
                                 <b>
-                                    <a>38</a>
-                                    <b>70</b>
-                                    <v>39</v>
+                                    <a>256</a>
+                                    <b>257</b>
+                                    <v>460</v>
                                 </b>
                                 <b>
-                                    <a>70</a>
-                                    <b>721</b>
-                                    <v>37</v>
+                                    <a>7980</a>
+                                    <b>22048</b>
+                                    <v>153</v>
                                 </b>
                             </bs>
                         </hist>
@@ -8602,37 +8854,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>429</v>
+                                    <v>182133</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>53</v>
+                                    <v>136129</v>
                                 </b>
                                 <b>
                                     <a>3</a>
-                                    <b>8</b>
-                                    <v>66</v>
+                                    <b>4</b>
+                                    <v>221916</v>
                                 </b>
                                 <b>
-                                    <a>8</a>
-                                    <b>16</b>
-                                    <v>57</v>
+                                    <a>4</a>
+                                    <b>5</b>
+                                    <v>296604</v>
                                 </b>
                                 <b>
                                     <a>16</a>
-                                    <b>44</b>
-                                    <v>54</v>
-                                </b>
-                                <b>
-                                    <a>44</a>
-                                    <b>311</b>
-                                    <v>54</v>
-                                </b>
-                                <b>
-                                    <a>323</a>
-                                    <b>510</b>
-                                    <v>7</v>
+                                    <b>84</b>
+                                    <v>9830</v>
                                 </b>
                             </bs>
                         </hist>
@@ -8648,37 +8890,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>429</v>
+                                    <v>182133</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>53</v>
+                                    <v>136129</v>
                                 </b>
                                 <b>
                                     <a>3</a>
-                                    <b>8</b>
-                                    <v>66</v>
+                                    <b>4</b>
+                                    <v>221916</v>
                                 </b>
                                 <b>
-                                    <a>8</a>
-                                    <b>16</b>
-                                    <v>57</v>
+                                    <a>4</a>
+                                    <b>5</b>
+                                    <v>296604</v>
                                 </b>
                                 <b>
                                     <a>16</a>
-                                    <b>44</b>
-                                    <v>54</v>
-                                </b>
-                                <b>
-                                    <a>44</a>
-                                    <b>311</b>
-                                    <v>54</v>
-                                </b>
-                                <b>
-                                    <a>323</a>
-                                    <b>510</b>
-                                    <v>7</v>
+                                    <b>84</b>
+                                    <v>9830</v>
                                 </b>
                             </bs>
                         </hist>
@@ -8688,27 +8920,27 @@
         </relation>
         <relation>
             <name>comments</name>
-            <cardinality>25724</cardinality>
+            <cardinality>2514805</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>25724</v>
+                    <v>2514805</v>
                 </e>
                 <e>
                     <k>kind</k>
-                    <v>2</v>
+                    <v>76</v>
                 </e>
                 <e>
                     <k>parent</k>
-                    <v>12083</v>
+                    <v>2493839</v>
                 </e>
                 <e>
                     <k>idx</k>
-                    <v>156</v>
+                    <v>1728</v>
                 </e>
                 <e>
                     <k>text</k>
-                    <v>20683</v>
+                    <v>541522</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -8722,7 +8954,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>25724</v>
+                                    <v>2514805</v>
                                 </b>
                             </bs>
                         </hist>
@@ -8738,7 +8970,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>25724</v>
+                                    <v>2514805</v>
                                 </b>
                             </bs>
                         </hist>
@@ -8754,7 +8986,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>25724</v>
+                                    <v>2514805</v>
                                 </b>
                             </bs>
                         </hist>
@@ -8770,7 +9002,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>25724</v>
+                                    <v>2514805</v>
                                 </b>
                             </bs>
                         </hist>
@@ -8784,14 +9016,14 @@
                             <budget>12</budget>
                             <bs>
                                 <b>
-                                    <a>846</a>
-                                    <b>847</b>
-                                    <v>1</v>
+                                    <a>5</a>
+                                    <b>6</b>
+                                    <v>38</v>
                                 </b>
                                 <b>
-                                    <a>24878</a>
-                                    <b>24879</b>
-                                    <v>1</v>
+                                    <a>65484</a>
+                                    <b>65485</b>
+                                    <v>38</v>
                                 </b>
                             </bs>
                         </hist>
@@ -8805,14 +9037,14 @@
                             <budget>12</budget>
                             <bs>
                                 <b>
-                                    <a>846</a>
-                                    <b>847</b>
-                                    <v>1</v>
+                                    <a>5</a>
+                                    <b>6</b>
+                                    <v>38</v>
                                 </b>
                                 <b>
-                                    <a>11239</a>
-                                    <b>11240</b>
-                                    <v>1</v>
+                                    <a>64938</a>
+                                    <b>64939</b>
+                                    <v>38</v>
                                 </b>
                             </bs>
                         </hist>
@@ -8826,14 +9058,14 @@
                             <budget>12</budget>
                             <bs>
                                 <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>1</v>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>38</v>
                                 </b>
                                 <b>
-                                    <a>156</a>
-                                    <b>157</b>
-                                    <v>1</v>
+                                    <a>45</a>
+                                    <b>46</b>
+                                    <v>38</v>
                                 </b>
                             </bs>
                         </hist>
@@ -8847,14 +9079,14 @@
                             <budget>12</budget>
                             <bs>
                                 <b>
-                                    <a>690</a>
-                                    <b>691</b>
-                                    <v>1</v>
+                                    <a>5</a>
+                                    <b>6</b>
+                                    <v>38</v>
                                 </b>
                                 <b>
-                                    <a>19993</a>
-                                    <b>19994</b>
-                                    <v>1</v>
+                                    <a>14097</a>
+                                    <b>14098</b>
+                                    <v>38</v>
                                 </b>
                             </bs>
                         </hist>
@@ -8870,27 +9102,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7828</v>
+                                    <v>2484930</v>
                                 </b>
                                 <b>
                                     <a>2</a>
-                                    <b>3</b>
-                                    <v>1787</v>
-                                </b>
-                                <b>
-                                    <a>3</a>
-                                    <b>4</b>
-                                    <v>1289</v>
-                                </b>
-                                <b>
-                                    <a>4</a>
-                                    <b>11</b>
-                                    <v>937</v>
-                                </b>
-                                <b>
-                                    <a>11</a>
-                                    <b>157</b>
-                                    <v>242</v>
+                                    <b>46</b>
+                                    <v>8908</v>
                                 </b>
                             </bs>
                         </hist>
@@ -8906,12 +9123,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>12081</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>2</v>
+                                    <v>2493839</v>
                                 </b>
                             </bs>
                         </hist>
@@ -8927,27 +9139,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7828</v>
+                                    <v>2484930</v>
                                 </b>
                                 <b>
                                     <a>2</a>
-                                    <b>3</b>
-                                    <v>1787</v>
-                                </b>
-                                <b>
-                                    <a>3</a>
-                                    <b>4</b>
-                                    <v>1289</v>
-                                </b>
-                                <b>
-                                    <a>4</a>
-                                    <b>11</b>
-                                    <v>937</v>
-                                </b>
-                                <b>
-                                    <a>11</a>
-                                    <b>157</b>
-                                    <v>242</v>
+                                    <b>46</b>
+                                    <v>8908</v>
                                 </b>
                             </bs>
                         </hist>
@@ -8963,27 +9160,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7828</v>
+                                    <v>2484930</v>
                                 </b>
                                 <b>
                                     <a>2</a>
-                                    <b>3</b>
-                                    <v>1817</v>
-                                </b>
-                                <b>
-                                    <a>3</a>
-                                    <b>4</b>
-                                    <v>1275</v>
-                                </b>
-                                <b>
-                                    <a>4</a>
-                                    <b>10</b>
-                                    <v>937</v>
-                                </b>
-                                <b>
-                                    <a>10</a>
-                                    <b>131</b>
-                                    <v>226</v>
+                                    <b>33</b>
+                                    <v>8908</v>
                                 </b>
                             </bs>
                         </hist>
@@ -8999,57 +9181,32 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>36</v>
+                                    <v>921</v>
                                 </b>
                                 <b>
                                     <a>2</a>
-                                    <b>4</b>
-                                    <v>13</v>
-                                </b>
-                                <b>
-                                    <a>4</a>
-                                    <b>5</b>
-                                    <v>16</v>
+                                    <b>3</b>
+                                    <v>307</v>
                                 </b>
                                 <b>
                                     <a>5</a>
-                                    <b>7</b>
-                                    <v>12</v>
-                                </b>
-                                <b>
-                                    <a>7</a>
-                                    <b>9</b>
-                                    <v>12</v>
-                                </b>
-                                <b>
-                                    <a>9</a>
-                                    <b>11</b>
-                                    <v>6</v>
-                                </b>
-                                <b>
-                                    <a>12</a>
-                                    <b>14</b>
-                                    <v>13</v>
-                                </b>
-                                <b>
-                                    <a>14</a>
-                                    <b>24</b>
-                                    <v>13</v>
+                                    <b>10</b>
+                                    <v>153</v>
                                 </b>
                                 <b>
-                                    <a>26</a>
-                                    <b>52</b>
-                                    <v>12</v>
+                                    <a>11</a>
+                                    <b>20</b>
+                                    <v>153</v>
                                 </b>
                                 <b>
-                                    <a>59</a>
-                                    <b>218</b>
-                                    <v>12</v>
+                                    <a>34</a>
+                                    <b>233</b>
+                                    <v>153</v>
                                 </b>
                                 <b>
-                                    <a>242</a>
-                                    <b>12084</b>
-                                    <v>11</v>
+                                    <a>64943</a>
+                                    <b>64944</b>
+                                    <v>38</v>
                                 </b>
                             </bs>
                         </hist>
@@ -9065,12 +9222,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>154</v>
+                                    <v>1689</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>2</v>
+                                    <v>38</v>
                                 </b>
                             </bs>
                         </hist>
@@ -9086,57 +9243,32 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>36</v>
+                                    <v>921</v>
                                 </b>
                                 <b>
                                     <a>2</a>
-                                    <b>4</b>
-                                    <v>13</v>
-                                </b>
-                                <b>
-                                    <a>4</a>
-                                    <b>5</b>
-                                    <v>16</v>
+                                    <b>3</b>
+                                    <v>307</v>
                                 </b>
                                 <b>
                                     <a>5</a>
-                                    <b>7</b>
-                                    <v>12</v>
-                                </b>
-                                <b>
-                                    <a>7</a>
-                                    <b>9</b>
-                                    <v>12</v>
-                                </b>
-                                <b>
-                                    <a>9</a>
-                                    <b>11</b>
-                                    <v>6</v>
-                                </b>
-                                <b>
-                                    <a>12</a>
-                                    <b>14</b>
-                                    <v>13</v>
-                                </b>
-                                <b>
-                                    <a>14</a>
-                                    <b>24</b>
-                                    <v>13</v>
+                                    <b>10</b>
+                                    <v>153</v>
                                 </b>
                                 <b>
-                                    <a>26</a>
-                                    <b>52</b>
-                                    <v>12</v>
+                                    <a>11</a>
+                                    <b>20</b>
+                                    <v>153</v>
                                 </b>
                                 <b>
-                                    <a>59</a>
-                                    <b>218</b>
-                                    <v>12</v>
+                                    <a>34</a>
+                                    <b>233</b>
+                                    <v>153</v>
                                 </b>
                                 <b>
-                                    <a>242</a>
-                                    <b>12084</b>
-                                    <v>11</v>
+                                    <a>64943</a>
+                                    <b>64944</b>
+                                    <v>38</v>
                                 </b>
                             </bs>
                         </hist>
@@ -9152,52 +9284,32 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>36</v>
+                                    <v>960</v>
                                 </b>
                                 <b>
                                     <a>2</a>
-                                    <b>4</b>
-                                    <v>14</v>
+                                    <b>3</b>
+                                    <v>268</v>
                                 </b>
                                 <b>
                                     <a>4</a>
-                                    <b>5</b>
-                                    <v>18</v>
-                                </b>
-                                <b>
-                                    <a>5</a>
-                                    <b>7</b>
-                                    <v>14</v>
-                                </b>
-                                <b>
-                                    <a>7</a>
-                                    <b>9</b>
-                                    <v>11</v>
-                                </b>
-                                <b>
-                                    <a>9</a>
-                                    <b>12</b>
-                                    <v>14</v>
-                                </b>
-                                <b>
-                                    <a>12</a>
-                                    <b>17</b>
-                                    <v>12</v>
+                                    <b>8</b>
+                                    <v>153</v>
                                 </b>
                                 <b>
-                                    <a>19</a>
-                                    <b>36</b>
-                                    <v>13</v>
+                                    <a>8</a>
+                                    <b>15</b>
+                                    <v>153</v>
                                 </b>
                                 <b>
-                                    <a>39</a>
-                                    <b>128</b>
-                                    <v>12</v>
+                                    <a>29</a>
+                                    <b>188</b>
+                                    <v>153</v>
                                 </b>
                                 <b>
-                                    <a>165</a>
-                                    <b>10500</b>
-                                    <v>12</v>
+                                    <a>13716</a>
+                                    <b>13717</b>
+                                    <v>38</v>
                                 </b>
                             </bs>
                         </hist>
@@ -9213,12 +9325,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>19550</v>
+                                    <v>494827</v>
                                 </b>
                                 <b>
                                     <a>2</a>
-                                    <b>1935</b>
-                                    <v>1133</v>
+                                    <b>12</b>
+                                    <v>40819</v>
+                                </b>
+                                <b>
+                                    <a>12</a>
+                                    <b>45601</b>
+                                    <v>5875</v>
                                 </b>
                             </bs>
                         </hist>
@@ -9234,7 +9351,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>20683</v>
+                                    <v>541522</v>
                                 </b>
                             </bs>
                         </hist>
@@ -9250,12 +9367,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>19575</v>
+                                    <v>494904</v>
                                 </b>
                                 <b>
                                     <a>2</a>
-                                    <b>828</b>
-                                    <v>1108</v>
+                                    <b>12</b>
+                                    <v>40742</v>
+                                </b>
+                                <b>
+                                    <a>12</a>
+                                    <b>45601</b>
+                                    <v>5875</v>
                                 </b>
                             </bs>
                         </hist>
@@ -9271,12 +9393,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>20523</v>
+                                    <v>540255</v>
                                 </b>
                                 <b>
                                     <a>2</a>
-                                    <b>107</b>
-                                    <v>160</v>
+                                    <b>18</b>
+                                    <v>1267</v>
                                 </b>
                             </bs>
                         </hist>
@@ -9286,15 +9408,15 @@
         </relation>
         <relation>
             <name>doc_comments</name>
-            <cardinality>4330</cardinality>
+            <cardinality>273911</cardinality>
             <columnsizes>
                 <e>
                     <k>node</k>
-                    <v>4330</v>
+                    <v>273911</v>
                 </e>
                 <e>
                     <k>comment</k>
-                    <v>4330</v>
+                    <v>273911</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -9308,7 +9430,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4330</v>
+                                    <v>273911</v>
                                 </b>
                             </bs>
                         </hist>
@@ -9324,7 +9446,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4330</v>
+                                    <v>273911</v>
                                 </b>
                             </bs>
                         </hist>
@@ -9334,23 +9456,23 @@
         </relation>
         <relation>
             <name>exprs</name>
-            <cardinality>414037</cardinality>
+            <cardinality>8869156</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>414037</v>
+                    <v>8869156</v>
                 </e>
                 <e>
                     <k>kind</k>
-                    <v>48</v>
+                    <v>14536</v>
                 </e>
                 <e>
                     <k>parent</k>
-                    <v>219324</v>
+                    <v>4516748</v>
                 </e>
                 <e>
                     <k>idx</k>
-                    <v>5163</v>
+                    <v>258019</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -9364,7 +9486,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>414037</v>
+                                    <v>8869156</v>
                                 </b>
                             </bs>
                         </hist>
@@ -9380,7 +9502,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>414037</v>
+                                    <v>8869156</v>
                                 </b>
                             </bs>
                         </hist>
@@ -9396,7 +9518,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>414037</v>
+                                    <v>8869156</v>
                                 </b>
                             </bs>
                         </hist>
@@ -9410,64 +9532,64 @@
                             <budget>12</budget>
                             <bs>
                                 <b>
-                                    <a>7</a>
-                                    <b>20</b>
-                                    <v>4</v>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>1211</v>
                                 </b>
                                 <b>
-                                    <a>21</a>
-                                    <b>54</b>
-                                    <v>4</v>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>1615</v>
                                 </b>
                                 <b>
-                                    <a>57</a>
-                                    <b>142</b>
-                                    <v>4</v>
+                                    <a>5</a>
+                                    <b>10</b>
+                                    <v>1211</v>
                                 </b>
                                 <b>
-                                    <a>146</a>
-                                    <b>236</b>
-                                    <v>4</v>
+                                    <a>11</a>
+                                    <b>13</b>
+                                    <v>1211</v>
                                 </b>
                                 <b>
-                                    <a>248</a>
-                                    <b>344</b>
-                                    <v>4</v>
+                                    <a>13</a>
+                                    <b>16</b>
+                                    <v>1211</v>
                                 </b>
                                 <b>
-                                    <a>509</a>
-                                    <b>620</b>
-                                    <v>4</v>
+                                    <a>17</a>
+                                    <b>36</b>
+                                    <v>1211</v>
                                 </b>
                                 <b>
-                                    <a>678</a>
-                                    <b>839</b>
-                                    <v>4</v>
+                                    <a>37</a>
+                                    <b>44</b>
+                                    <v>1211</v>
                                 </b>
                                 <b>
-                                    <a>1013</a>
-                                    <b>1235</b>
-                                    <v>4</v>
+                                    <a>49</a>
+                                    <b>120</b>
+                                    <v>1211</v>
                                 </b>
                                 <b>
-                                    <a>1272</a>
-                                    <b>2705</b>
-                                    <v>4</v>
+                                    <a>193</a>
+                                    <b>250</b>
+                                    <v>1211</v>
                                 </b>
                                 <b>
-                                    <a>3244</a>
-                                    <b>4582</b>
-                                    <v>4</v>
+                                    <a>322</a>
+                                    <b>516</b>
+                                    <v>1211</v>
                                 </b>
                                 <b>
-                                    <a>5616</a>
-                                    <b>10361</b>
-                                    <v>4</v>
+                                    <a>752</a>
+                                    <b>1581</b>
+                                    <v>1211</v>
                                 </b>
                                 <b>
-                                    <a>24892</a>
-                                    <b>237317</b>
-                                    <v>4</v>
+                                    <a>3202</a>
+                                    <b>12977</b>
+                                    <v>807</v>
                                 </b>
                             </bs>
                         </hist>
@@ -9481,64 +9603,64 @@
                             <budget>12</budget>
                             <bs>
                                 <b>
-                                    <a>7</a>
-                                    <b>20</b>
-                                    <v>4</v>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>1211</v>
                                 </b>
                                 <b>
-                                    <a>21</a>
-                                    <b>54</b>
-                                    <v>4</v>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>1615</v>
                                 </b>
                                 <b>
-                                    <a>57</a>
-                                    <b>142</b>
-                                    <v>4</v>
+                                    <a>5</a>
+                                    <b>10</b>
+                                    <v>1211</v>
                                 </b>
                                 <b>
-                                    <a>144</a>
-                                    <b>207</b>
-                                    <v>4</v>
+                                    <a>11</a>
+                                    <b>13</b>
+                                    <v>1211</v>
                                 </b>
                                 <b>
-                                    <a>233</a>
-                                    <b>324</b>
-                                    <v>4</v>
+                                    <a>13</a>
+                                    <b>16</b>
+                                    <v>1211</v>
                                 </b>
                                 <b>
-                                    <a>509</a>
-                                    <b>613</b>
-                                    <v>4</v>
+                                    <a>17</a>
+                                    <b>36</b>
+                                    <v>1211</v>
                                 </b>
                                 <b>
-                                    <a>676</a>
-                                    <b>790</b>
-                                    <v>4</v>
+                                    <a>37</a>
+                                    <b>39</b>
+                                    <v>1211</v>
                                 </b>
                                 <b>
-                                    <a>1013</a>
-                                    <b>1226</b>
-                                    <v>4</v>
+                                    <a>49</a>
+                                    <b>107</b>
+                                    <v>1211</v>
                                 </b>
                                 <b>
-                                    <a>1239</a>
-                                    <b>1949</b>
-                                    <v>4</v>
+                                    <a>119</a>
+                                    <b>177</b>
+                                    <v>1211</v>
                                 </b>
                                 <b>
-                                    <a>2582</a>
-                                    <b>3985</b>
-                                    <v>4</v>
+                                    <a>245</a>
+                                    <b>323</b>
+                                    <v>1211</v>
                                 </b>
                                 <b>
-                                    <a>4252</a>
-                                    <b>10115</b>
-                                    <v>4</v>
+                                    <a>414</a>
+                                    <b>1535</b>
+                                    <v>1211</v>
                                 </b>
                                 <b>
-                                    <a>14086</a>
-                                    <b>154744</b>
-                                    <v>4</v>
+                                    <a>2864</a>
+                                    <b>8533</b>
+                                    <v>807</v>
                                 </b>
                             </bs>
                         </hist>
@@ -9554,52 +9676,32 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3</v>
+                                    <v>4441</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>8</v>
+                                    <v>4845</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>10</v>
+                                    <v>1615</v>
                                 </b>
                                 <b>
                                     <a>4</a>
-                                    <b>5</b>
-                                    <v>6</v>
-                                </b>
-                                <b>
-                                    <a>5</a>
-                                    <b>7</b>
-                                    <v>4</v>
-                                </b>
-                                <b>
-                                    <a>7</a>
-                                    <b>8</b>
-                                    <v>4</v>
-                                </b>
-                                <b>
-                                    <a>8</a>
-                                    <b>14</b>
-                                    <v>3</v>
-                                </b>
-                                <b>
-                                    <a>15</a>
-                                    <b>22</b>
-                                    <v>4</v>
+                                    <b>11</b>
+                                    <v>1211</v>
                                 </b>
                                 <b>
-                                    <a>23</a>
-                                    <b>34</b>
-                                    <v>4</v>
+                                    <a>11</a>
+                                    <b>13</b>
+                                    <v>1211</v>
                                 </b>
                                 <b>
-                                    <a>1057</a>
-                                    <b>5164</b>
-                                    <v>2</v>
+                                    <a>14</a>
+                                    <b>638</b>
+                                    <v>1211</v>
                                 </b>
                             </bs>
                         </hist>
@@ -9615,22 +9717,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>65804</v>
+                                    <v>1170575</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>133334</v>
+                                    <v>2867283</v>
                                 </b>
                                 <b>
                                     <a>3</a>
-                                    <b>5</b>
-                                    <v>17889</v>
+                                    <b>4</b>
+                                    <v>315760</v>
                                 </b>
                                 <b>
-                                    <a>5</a>
-                                    <b>5144</b>
-                                    <v>2297</v>
+                                    <a>4</a>
+                                    <b>637</b>
+                                    <v>163129</v>
                                 </b>
                             </bs>
                         </hist>
@@ -9646,17 +9748,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>137263</v>
+                                    <v>2711018</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>75813</v>
+                                    <v>1642197</v>
                                 </b>
                                 <b>
                                     <a>3</a>
-                                    <b>7</b>
-                                    <v>6248</v>
+                                    <b>5</b>
+                                    <v>163533</v>
                                 </b>
                             </bs>
                         </hist>
@@ -9672,22 +9774,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>65804</v>
+                                    <v>1170575</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>133334</v>
+                                    <v>2867283</v>
                                 </b>
                                 <b>
                                     <a>3</a>
-                                    <b>5</b>
-                                    <v>17889</v>
+                                    <b>4</b>
+                                    <v>315760</v>
                                 </b>
                                 <b>
-                                    <a>5</a>
-                                    <b>5144</b>
-                                    <v>2297</v>
+                                    <a>4</a>
+                                    <b>637</b>
+                                    <v>163129</v>
                                 </b>
                             </bs>
                         </hist>
@@ -9703,22 +9805,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3910</v>
+                                    <v>249943</v>
                                 </b>
                                 <b>
                                     <a>2</a>
-                                    <b>3</b>
-                                    <v>183</v>
-                                </b>
-                                <b>
-                                    <a>3</a>
-                                    <b>4</b>
-                                    <v>782</v>
-                                </b>
-                                <b>
-                                    <a>4</a>
-                                    <b>180006</b>
-                                    <v>288</v>
+                                    <b>9640</b>
+                                    <v>8075</v>
                                 </b>
                             </bs>
                         </hist>
@@ -9734,17 +9826,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4087</v>
+                                    <v>250347</v>
                                 </b>
                                 <b>
                                     <a>2</a>
-                                    <b>3</b>
-                                    <v>1033</v>
-                                </b>
-                                <b>
-                                    <a>3</a>
-                                    <b>48</b>
-                                    <v>43</v>
+                                    <b>33</b>
+                                    <v>7671</v>
                                 </b>
                             </bs>
                         </hist>
@@ -9760,22 +9847,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3910</v>
+                                    <v>249943</v>
                                 </b>
                                 <b>
                                     <a>2</a>
-                                    <b>3</b>
-                                    <v>183</v>
-                                </b>
-                                <b>
-                                    <a>3</a>
-                                    <b>4</b>
-                                    <v>782</v>
-                                </b>
-                                <b>
-                                    <a>4</a>
-                                    <b>180006</b>
-                                    <v>288</v>
+                                    <b>9640</b>
+                                    <v>8075</v>
                                 </b>
                             </bs>
                         </hist>
@@ -9785,19 +9862,19 @@
         </relation>
         <relation>
             <name>literals</name>
-            <cardinality>270756</cardinality>
+            <cardinality>8555361</cardinality>
             <columnsizes>
                 <e>
                     <k>expr</k>
-                    <v>270756</v>
+                    <v>8555361</v>
                 </e>
                 <e>
                     <k>value</k>
-                    <v>25795</v>
+                    <v>75495</v>
                 </e>
                 <e>
                     <k>raw</k>
-                    <v>27594</v>
+                    <v>77891</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -9811,7 +9888,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>270756</v>
+                                    <v>8555361</v>
                                 </b>
                             </bs>
                         </hist>
@@ -9827,7 +9904,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>270756</v>
+                                    <v>8555361</v>
                                 </b>
                             </bs>
                         </hist>
@@ -9843,37 +9920,42 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>14635</v>
+                                    <v>27811</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>3291</v>
+                                    <v>12538</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>1783</v>
+                                    <v>6753</v>
                                 </b>
                                 <b>
                                     <a>4</a>
-                                    <b>6</b>
-                                    <v>1931</v>
+                                    <b>5</b>
+                                    <v>5276</v>
                                 </b>
                                 <b>
-                                    <a>6</a>
-                                    <b>12</b>
-                                    <v>1968</v>
+                                    <a>5</a>
+                                    <b>8</b>
+                                    <v>6269</v>
                                 </b>
                                 <b>
-                                    <a>12</a>
-                                    <b>139</b>
-                                    <v>1935</v>
+                                    <a>8</a>
+                                    <b>17</b>
+                                    <v>5809</v>
+                                </b>
+                                <b>
+                                    <a>17</a>
+                                    <b>1233</b>
+                                    <v>5663</v>
                                 </b>
                                 <b>
-                                    <a>139</a>
-                                    <b>6840</b>
-                                    <v>252</v>
+                                    <a>1234</a>
+                                    <b>3959</b>
+                                    <v>5373</v>
                                 </b>
                             </bs>
                         </hist>
@@ -9889,12 +9971,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>24051</v>
+                                    <v>73171</v>
                                 </b>
                                 <b>
                                     <a>2</a>
-                                    <b>5</b>
-                                    <v>1744</v>
+                                    <b>4</b>
+                                    <v>2323</v>
                                 </b>
                             </bs>
                         </hist>
@@ -9910,32 +9992,42 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>16038</v>
+                                    <v>29191</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>3521</v>
+                                    <v>13046</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>1869</v>
+                                    <v>6777</v>
                                 </b>
                                 <b>
                                     <a>4</a>
-                                    <b>7</b>
-                                    <v>2553</v>
+                                    <b>5</b>
+                                    <v>5276</v>
                                 </b>
                                 <b>
-                                    <a>7</a>
-                                    <b>18</b>
-                                    <v>2129</v>
+                                    <a>5</a>
+                                    <b>8</b>
+                                    <v>6632</v>
                                 </b>
                                 <b>
-                                    <a>18</a>
-                                    <b>6833</b>
-                                    <v>1484</v>
+                                    <a>8</a>
+                                    <b>17</b>
+                                    <v>5857</v>
+                                </b>
+                                <b>
+                                    <a>17</a>
+                                    <b>1239</b>
+                                    <v>5857</v>
+                                </b>
+                                <b>
+                                    <a>1240</a>
+                                    <b>3937</b>
+                                    <v>5252</v>
                                 </b>
                             </bs>
                         </hist>
@@ -9951,7 +10043,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>27594</v>
+                                    <v>77891</v>
                                 </b>
                             </bs>
                         </hist>
@@ -9961,19 +10053,19 @@
         </relation>
         <relation>
             <name>constvalues</name>
-            <cardinality>43931</cardinality>
+            <cardinality>8093673</cardinality>
             <columnsizes>
                 <e>
                     <k>expr</k>
-                    <v>43931</v>
+                    <v>8093673</v>
                 </e>
                 <e>
                     <k>value</k>
-                    <v>16896</v>
+                    <v>27230</v>
                 </e>
                 <e>
                     <k>exact</k>
-                    <v>16897</v>
+                    <v>27230</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -9987,7 +10079,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>43931</v>
+                                    <v>8093673</v>
                                 </b>
                             </bs>
                         </hist>
@@ -10003,7 +10095,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>43931</v>
+                                    <v>8093673</v>
                                 </b>
                             </bs>
                         </hist>
@@ -10019,17 +10111,37 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>14932</v>
+                                    <v>15539</v>
                                 </b>
                                 <b>
                                     <a>2</a>
-                                    <b>4</b>
-                                    <v>1388</v>
+                                    <b>3</b>
+                                    <v>2420</v>
                                 </b>
                                 <b>
-                                    <a>4</a>
-                                    <b>6766</b>
-                                    <v>576</v>
+                                    <a>3</a>
+                                    <b>6</b>
+                                    <v>2130</v>
+                                </b>
+                                <b>
+                                    <a>6</a>
+                                    <b>1243</b>
+                                    <v>2105</v>
+                                </b>
+                                <b>
+                                    <a>1243</a>
+                                    <b>1281</b>
+                                    <v>2105</v>
+                                </b>
+                                <b>
+                                    <a>1281</a>
+                                    <b>1340</b>
+                                    <v>2057</v>
+                                </b>
+                                <b>
+                                    <a>1340</a>
+                                    <b>3974</b>
+                                    <v>871</v>
                                 </b>
                             </bs>
                         </hist>
@@ -10045,12 +10157,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>16895</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>1</v>
+                                    <v>27230</v>
                                 </b>
                             </bs>
                         </hist>
@@ -10066,17 +10173,37 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>14933</v>
+                                    <v>15539</v>
                                 </b>
                                 <b>
                                     <a>2</a>
-                                    <b>4</b>
-                                    <v>1388</v>
+                                    <b>3</b>
+                                    <v>2420</v>
                                 </b>
                                 <b>
-                                    <a>4</a>
-                                    <b>6766</b>
-                                    <v>576</v>
+                                    <a>3</a>
+                                    <b>6</b>
+                                    <v>2130</v>
+                                </b>
+                                <b>
+                                    <a>6</a>
+                                    <b>1243</b>
+                                    <v>2105</v>
+                                </b>
+                                <b>
+                                    <a>1243</a>
+                                    <b>1281</b>
+                                    <v>2105</v>
+                                </b>
+                                <b>
+                                    <a>1281</a>
+                                    <b>1340</b>
+                                    <v>2057</v>
+                                </b>
+                                <b>
+                                    <a>1340</a>
+                                    <b>3974</b>
+                                    <v>871</v>
                                 </b>
                             </bs>
                         </hist>
@@ -10092,7 +10219,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>16897</v>
+                                    <v>27230</v>
                                 </b>
                             </bs>
                         </hist>
@@ -10102,19 +10229,19 @@
         </relation>
         <relation>
             <name>fields</name>
-            <cardinality>19974</cardinality>
+            <cardinality>995459</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>19974</v>
+                    <v>995459</v>
                 </e>
                 <e>
                     <k>parent</k>
-                    <v>9600</v>
+                    <v>346065</v>
                 </e>
                 <e>
                     <k>idx</k>
-                    <v>57</v>
+                    <v>48913</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -10128,7 +10255,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>19974</v>
+                                    <v>995459</v>
                                 </b>
                             </bs>
                         </hist>
@@ -10144,7 +10271,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>19974</v>
+                                    <v>995459</v>
                                 </b>
                             </bs>
                         </hist>
@@ -10160,27 +10287,32 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4790</v>
+                                    <v>141898</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>2214</v>
+                                    <v>76625</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>1363</v>
+                                    <v>45908</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>653</v>
+                                    <v>32219</v>
                                 </b>
                                 <b>
                                     <a>5</a>
-                                    <b>53</b>
-                                    <v>580</v>
+                                    <b>7</b>
+                                    <v>29548</v>
+                                </b>
+                                <b>
+                                    <a>7</a>
+                                    <b>290</b>
+                                    <v>19865</v>
                                 </b>
                             </bs>
                         </hist>
@@ -10196,27 +10328,32 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4790</v>
+                                    <v>141898</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>2214</v>
+                                    <v>76625</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>1363</v>
+                                    <v>45908</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>653</v>
+                                    <v>32219</v>
                                 </b>
                                 <b>
                                     <a>5</a>
-                                    <b>53</b>
-                                    <v>580</v>
+                                    <b>7</b>
+                                    <v>29548</v>
+                                </b>
+                                <b>
+                                    <a>7</a>
+                                    <b>290</b>
+                                    <v>19865</v>
                                 </b>
                             </bs>
                         </hist>
@@ -10232,47 +10369,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>14</v>
+                                    <v>38729</v>
                                 </b>
                                 <b>
                                     <a>2</a>
-                                    <b>3</b>
-                                    <v>8</v>
-                                </b>
-                                <b>
-                                    <a>3</a>
-                                    <b>6</b>
-                                    <v>5</v>
+                                    <b>4</b>
+                                    <v>1836</v>
                                 </b>
                                 <b>
-                                    <a>6</a>
-                                    <b>11</b>
-                                    <v>5</v>
+                                    <a>4</a>
+                                    <b>12</b>
+                                    <v>3672</v>
                                 </b>
                                 <b>
                                     <a>12</a>
-                                    <b>18</b>
-                                    <v>5</v>
-                                </b>
-                                <b>
-                                    <a>19</a>
-                                    <b>31</b>
-                                    <v>5</v>
-                                </b>
-                                <b>
-                                    <a>46</a>
-                                    <b>105</b>
-                                    <v>5</v>
-                                </b>
-                                <b>
-                                    <a>115</a>
-                                    <b>633</b>
-                                    <v>5</v>
+                                    <b>185</b>
+                                    <v>3672</v>
                                 </b>
                                 <b>
-                                    <a>914</a>
-                                    <b>7063</b>
-                                    <v>5</v>
+                                    <a>269</a>
+                                    <b>1368</b>
+                                    <v>1001</v>
                                 </b>
                             </bs>
                         </hist>
@@ -10288,47 +10405,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>14</v>
+                                    <v>38729</v>
                                 </b>
                                 <b>
                                     <a>2</a>
-                                    <b>3</b>
-                                    <v>8</v>
-                                </b>
-                                <b>
-                                    <a>3</a>
-                                    <b>6</b>
-                                    <v>5</v>
+                                    <b>4</b>
+                                    <v>1836</v>
                                 </b>
                                 <b>
-                                    <a>6</a>
-                                    <b>11</b>
-                                    <v>5</v>
+                                    <a>4</a>
+                                    <b>12</b>
+                                    <v>3672</v>
                                 </b>
                                 <b>
                                     <a>12</a>
-                                    <b>18</b>
-                                    <v>5</v>
-                                </b>
-                                <b>
-                                    <a>19</a>
-                                    <b>31</b>
-                                    <v>5</v>
-                                </b>
-                                <b>
-                                    <a>46</a>
-                                    <b>105</b>
-                                    <v>5</v>
-                                </b>
-                                <b>
-                                    <a>115</a>
-                                    <b>633</b>
-                                    <v>5</v>
+                                    <b>185</b>
+                                    <v>3672</v>
                                 </b>
                                 <b>
-                                    <a>914</a>
-                                    <b>7063</b>
-                                    <v>5</v>
+                                    <a>269</a>
+                                    <b>1368</b>
+                                    <v>1001</v>
                                 </b>
                             </bs>
                         </hist>
@@ -10337,30 +10434,26 @@
             </dependencies>
         </relation>
         <relation>
-            <name>stmts</name>
-            <cardinality>73990</cardinality>
+            <name>typeparamdecls</name>
+            <cardinality>9798</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>73990</v>
-                </e>
-                <e>
-                    <k>kind</k>
-                    <v>33</v>
+                    <v>9798</v>
                 </e>
                 <e>
                     <k>parent</k>
-                    <v>41543</v>
+                    <v>8398</v>
                 </e>
                 <e>
                     <k>idx</k>
-                    <v>81</v>
+                    <v>1399</v>
                 </e>
             </columnsizes>
             <dependencies>
                 <dep>
                     <src>id</src>
-                    <trg>kind</trg>
+                    <trg>parent</trg>
                     <val>
                         <hist>
                             <budget>12</budget>
@@ -10368,7 +10461,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>73990</v>
+                                    <v>9798</v>
                                 </b>
                             </bs>
                         </hist>
@@ -10376,7 +10469,7 @@
                 </dep>
                 <dep>
                     <src>id</src>
-                    <trg>parent</trg>
+                    <trg>idx</trg>
                     <val>
                         <hist>
                             <budget>12</budget>
@@ -10384,15 +10477,15 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>73990</v>
+                                    <v>9798</v>
                                 </b>
                             </bs>
                         </hist>
                     </val>
                 </dep>
                 <dep>
-                    <src>id</src>
-                    <trg>idx</trg>
+                    <src>parent</src>
+                    <trg>id</trg>
                     <val>
                         <hist>
                             <budget>12</budget>
@@ -10400,85 +10493,61 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>73990</v>
+                                    <v>6999</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>1399</v>
                                 </b>
                             </bs>
                         </hist>
                     </val>
                 </dep>
                 <dep>
-                    <src>kind</src>
-                    <trg>id</trg>
+                    <src>parent</src>
+                    <trg>idx</trg>
                     <val>
                         <hist>
                             <budget>12</budget>
                             <bs>
                                 <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>3</a>
-                                    <b>4</b>
-                                    <v>4</v>
-                                </b>
-                                <b>
-                                    <a>5</a>
-                                    <b>9</b>
-                                    <v>3</v>
-                                </b>
-                                <b>
-                                    <a>18</a>
-                                    <b>50</b>
-                                    <v>3</v>
-                                </b>
-                                <b>
-                                    <a>63</a>
-                                    <b>72</b>
-                                    <v>3</v>
-                                </b>
-                                <b>
-                                    <a>72</a>
-                                    <b>224</b>
-                                    <v>3</v>
-                                </b>
-                                <b>
-                                    <a>301</a>
-                                    <b>379</b>
-                                    <v>3</v>
-                                </b>
-                                <b>
-                                    <a>400</a>
-                                    <b>615</b>
-                                    <v>3</v>
-                                </b>
-                                <b>
-                                    <a>654</a>
-                                    <b>2136</b>
-                                    <v>3</v>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>6999</v>
                                 </b>
                                 <b>
-                                    <a>3476</a>
-                                    <b>7606</b>
-                                    <v>3</v>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>1399</v>
                                 </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>idx</src>
+                    <trg>id</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
                                 <b>
-                                    <a>9225</a>
-                                    <b>9729</b>
-                                    <v>3</v>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>699</v>
                                 </b>
                                 <b>
-                                    <a>19358</a>
-                                    <b>19359</b>
-                                    <v>1</v>
+                                    <a>12</a>
+                                    <b>13</b>
+                                    <v>699</v>
                                 </b>
                             </bs>
                         </hist>
                     </val>
                 </dep>
                 <dep>
-                    <src>kind</src>
+                    <src>idx</src>
                     <trg>parent</trg>
                     <val>
                         <hist>
@@ -10487,62 +10556,185 @@
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>1</v>
+                                    <v>699</v>
                                 </b>
                                 <b>
-                                    <a>3</a>
+                                    <a>12</a>
+                                    <b>13</b>
+                                    <v>699</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+            </dependencies>
+        </relation>
+        <relation>
+            <name>stmts</name>
+            <cardinality>1915917</cardinality>
+            <columnsizes>
+                <e>
+                    <k>id</k>
+                    <v>1915917</v>
+                </e>
+                <e>
+                    <k>kind</k>
+                    <v>30538</v>
+                </e>
+                <e>
+                    <k>parent</k>
+                    <v>935456</v>
+                </e>
+                <e>
+                    <k>idx</k>
+                    <v>33753</v>
+                </e>
+            </columnsizes>
+            <dependencies>
+                <dep>
+                    <src>id</src>
+                    <trg>kind</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>1915917</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>id</src>
+                    <trg>parent</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>1915917</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>id</src>
+                    <trg>idx</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>1915917</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>kind</src>
+                    <trg>id</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>1607</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
                                     <b>4</b>
-                                    <v>4</v>
+                                    <v>1607</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>5</b>
+                                    <v>3214</v>
                                 </b>
                                 <b>
                                     <a>5</a>
+                                    <b>6</b>
+                                    <v>1607</v>
+                                </b>
+                                <b>
+                                    <a>6</a>
+                                    <b>7</b>
+                                    <v>1607</v>
+                                </b>
+                                <b>
+                                    <a>7</a>
+                                    <b>8</b>
+                                    <v>1607</v>
+                                </b>
+                                <b>
+                                    <a>8</a>
                                     <b>9</b>
-                                    <v>3</v>
+                                    <v>1607</v>
                                 </b>
                                 <b>
-                                    <a>17</a>
-                                    <b>35</b>
-                                    <v>3</v>
+                                    <a>11</a>
+                                    <b>12</b>
+                                    <v>1607</v>
                                 </b>
                                 <b>
-                                    <a>47</a>
-                                    <b>69</b>
-                                    <v>3</v>
+                                    <a>13</a>
+                                    <b>14</b>
+                                    <v>1607</v>
                                 </b>
                                 <b>
-                                    <a>69</a>
-                                    <b>205</b>
-                                    <v>3</v>
+                                    <a>14</a>
+                                    <b>15</b>
+                                    <v>1607</v>
+                                </b>
+                                <b>
+                                    <a>17</a>
+                                    <b>18</b>
+                                    <v>1607</v>
+                                </b>
+                                <b>
+                                    <a>33</a>
+                                    <b>34</b>
+                                    <v>1607</v>
                                 </b>
                                 <b>
-                                    <a>301</a>
-                                    <b>367</b>
-                                    <v>3</v>
+                                    <a>95</a>
+                                    <b>96</b>
+                                    <v>1607</v>
                                 </b>
                                 <b>
-                                    <a>385</a>
-                                    <b>586</b>
-                                    <v>3</v>
+                                    <a>106</a>
+                                    <b>107</b>
+                                    <v>1607</v>
                                 </b>
                                 <b>
-                                    <a>606</a>
-                                    <b>1154</b>
-                                    <v>3</v>
+                                    <a>177</a>
+                                    <b>178</b>
+                                    <v>1607</v>
                                 </b>
                                 <b>
-                                    <a>1719</a>
-                                    <b>5672</b>
-                                    <v>3</v>
+                                    <a>191</a>
+                                    <b>192</b>
+                                    <v>1607</v>
                                 </b>
                                 <b>
-                                    <a>5912</a>
-                                    <b>9226</b>
-                                    <v>3</v>
+                                    <a>208</a>
+                                    <b>209</b>
+                                    <v>1607</v>
                                 </b>
                                 <b>
-                                    <a>18820</a>
-                                    <b>18821</b>
-                                    <v>1</v>
+                                    <a>289</a>
+                                    <b>290</b>
+                                    <v>1607</v>
                                 </b>
                             </bs>
                         </hist>
@@ -10550,7 +10742,7 @@
                 </dep>
                 <dep>
                     <src>kind</src>
-                    <trg>idx</trg>
+                    <trg>parent</trg>
                     <val>
                         <hist>
                             <budget>12</budget>
@@ -10558,70 +10750,95 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1</v>
+                                    <v>1607</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>5</v>
+                                    <v>1607</v>
                                 </b>
                                 <b>
                                     <a>3</a>
+                                    <b>4</b>
+                                    <v>1607</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
                                     <b>5</b>
-                                    <v>2</v>
+                                    <v>4821</v>
                                 </b>
                                 <b>
                                     <a>5</a>
-                                    <b>8</b>
-                                    <v>3</v>
+                                    <b>6</b>
+                                    <v>1607</v>
                                 </b>
                                 <b>
-                                    <a>8</a>
-                                    <b>9</b>
-                                    <v>3</v>
+                                    <a>6</a>
+                                    <b>7</b>
+                                    <v>1607</v>
                                 </b>
                                 <b>
-                                    <a>9</a>
+                                    <a>7</a>
+                                    <b>8</b>
+                                    <v>1607</v>
+                                </b>
+                                <b>
+                                    <a>12</a>
                                     <b>13</b>
-                                    <v>3</v>
+                                    <v>1607</v>
                                 </b>
                                 <b>
                                     <a>13</a>
-                                    <b>16</b>
-                                    <v>3</v>
+                                    <b>14</b>
+                                    <v>1607</v>
                                 </b>
                                 <b>
-                                    <a>16</a>
-                                    <b>17</b>
-                                    <v>2</v>
+                                    <a>15</a>
+                                    <b>16</b>
+                                    <v>1607</v>
                                 </b>
                                 <b>
                                     <a>17</a>
-                                    <b>27</b>
-                                    <v>3</v>
+                                    <b>18</b>
+                                    <v>1607</v>
                                 </b>
                                 <b>
-                                    <a>27</a>
-                                    <b>33</b>
-                                    <v>3</v>
+                                    <a>75</a>
+                                    <b>76</b>
+                                    <v>1607</v>
                                 </b>
                                 <b>
-                                    <a>44</a>
-                                    <b>47</b>
-                                    <v>3</v>
+                                    <a>88</a>
+                                    <b>89</b>
+                                    <v>1607</v>
                                 </b>
                                 <b>
-                                    <a>55</a>
-                                    <b>82</b>
-                                    <v>2</v>
+                                    <a>92</a>
+                                    <b>93</b>
+                                    <v>1607</v>
+                                </b>
+                                <b>
+                                    <a>106</a>
+                                    <b>107</b>
+                                    <v>1607</v>
+                                </b>
+                                <b>
+                                    <a>154</a>
+                                    <b>155</b>
+                                    <v>1607</v>
+                                </b>
+                                <b>
+                                    <a>274</a>
+                                    <b>275</b>
+                                    <v>1607</v>
                                 </b>
                             </bs>
                         </hist>
                     </val>
                 </dep>
                 <dep>
-                    <src>parent</src>
-                    <trg>id</trg>
+                    <src>kind</src>
+                    <trg>idx</trg>
                     <val>
                         <hist>
                             <budget>12</budget>
@@ -10629,22 +10846,57 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>29362</v>
+                                    <v>3214</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>6137</v>
+                                    <v>1607</v>
                                 </b>
                                 <b>
                                     <a>3</a>
+                                    <b>4</b>
+                                    <v>9643</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
                                     <b>5</b>
-                                    <v>3650</v>
+                                    <v>3214</v>
                                 </b>
                                 <b>
                                     <a>5</a>
-                                    <b>82</b>
-                                    <v>2394</v>
+                                    <b>6</b>
+                                    <v>1607</v>
+                                </b>
+                                <b>
+                                    <a>9</a>
+                                    <b>10</b>
+                                    <v>1607</v>
+                                </b>
+                                <b>
+                                    <a>12</a>
+                                    <b>13</b>
+                                    <v>1607</v>
+                                </b>
+                                <b>
+                                    <a>13</a>
+                                    <b>14</b>
+                                    <v>1607</v>
+                                </b>
+                                <b>
+                                    <a>15</a>
+                                    <b>16</b>
+                                    <v>3214</v>
+                                </b>
+                                <b>
+                                    <a>16</a>
+                                    <b>17</b>
+                                    <v>1607</v>
+                                </b>
+                                <b>
+                                    <a>20</a>
+                                    <b>21</b>
+                                    <v>1607</v>
                                 </b>
                             </bs>
                         </hist>
@@ -10652,7 +10904,7 @@
                 </dep>
                 <dep>
                     <src>parent</src>
-                    <trg>kind</trg>
+                    <trg>id</trg>
                     <val>
                         <hist>
                             <budget>12</budget>
@@ -10660,22 +10912,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>31418</v>
+                                    <v>622030</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>5760</v>
+                                    <v>162338</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>5</b>
-                                    <v>3597</v>
+                                    <v>85187</v>
                                 </b>
                                 <b>
                                     <a>5</a>
-                                    <b>11</b>
-                                    <v>768</v>
+                                    <b>22</b>
+                                    <v>65899</v>
                                 </b>
                             </bs>
                         </hist>
@@ -10683,7 +10935,7 @@
                 </dep>
                 <dep>
                     <src>parent</src>
-                    <trg>idx</trg>
+                    <trg>kind</trg>
                     <val>
                         <hist>
                             <budget>12</budget>
@@ -10691,30 +10943,30 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>29362</v>
+                                    <v>683108</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>6137</v>
+                                    <v>155909</v>
                                 </b>
                                 <b>
                                     <a>3</a>
-                                    <b>5</b>
-                                    <v>3650</v>
+                                    <b>6</b>
+                                    <v>72329</v>
                                 </b>
                                 <b>
-                                    <a>5</a>
-                                    <b>82</b>
-                                    <v>2394</v>
+                                    <a>6</a>
+                                    <b>8</b>
+                                    <v>24109</v>
                                 </b>
                             </bs>
                         </hist>
                     </val>
                 </dep>
                 <dep>
-                    <src>idx</src>
-                    <trg>id</trg>
+                    <src>parent</src>
+                    <trg>idx</trg>
                     <val>
                         <hist>
                             <budget>12</budget>
@@ -10722,52 +10974,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>6</v>
+                                    <v>622030</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>20</v>
-                                </b>
-                                <b>
-                                    <a>5</a>
-                                    <b>6</b>
-                                    <v>3</v>
+                                    <v>162338</v>
                                 </b>
                                 <b>
-                                    <a>7</a>
-                                    <b>8</b>
-                                    <v>11</v>
-                                </b>
-                                <b>
-                                    <a>10</a>
-                                    <b>15</b>
-                                    <v>7</v>
-                                </b>
-                                <b>
-                                    <a>15</a>
-                                    <b>27</b>
-                                    <v>7</v>
-                                </b>
-                                <b>
-                                    <a>27</a>
-                                    <b>70</b>
-                                    <v>7</v>
-                                </b>
-                                <b>
-                                    <a>85</a>
-                                    <b>262</b>
-                                    <v>7</v>
-                                </b>
-                                <b>
-                                    <a>314</a>
-                                    <b>1279</b>
-                                    <v>7</v>
+                                    <a>3</a>
+                                    <b>5</b>
+                                    <v>85187</v>
                                 </b>
                                 <b>
-                                    <a>1720</a>
-                                    <b>24879</b>
-                                    <v>6</v>
+                                    <a>5</a>
+                                    <b>22</b>
+                                    <v>65899</v>
                                 </b>
                             </bs>
                         </hist>
@@ -10775,7 +10997,7 @@
                 </dep>
                 <dep>
                     <src>idx</src>
-                    <trg>kind</trg>
+                    <trg>id</trg>
                     <val>
                         <hist>
                             <budget>12</budget>
@@ -10783,52 +11005,87 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>12</v>
+                                    <v>1607</v>
                                 </b>
                                 <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>22</v>
+                                    <a>6</a>
+                                    <b>7</b>
+                                    <v>4821</v>
                                 </b>
                                 <b>
-                                    <a>3</a>
-                                    <b>5</b>
-                                    <v>7</v>
-                                </b>
-                                <b>
-                                    <a>5</a>
-                                    <b>6</b>
-                                    <v>6</v>
+                                    <a>7</a>
+                                    <b>8</b>
+                                    <v>3214</v>
                                 </b>
                                 <b>
-                                    <a>6</a>
-                                    <b>7</b>
-                                    <v>4</v>
+                                    <a>8</a>
+                                    <b>9</b>
+                                    <v>1607</v>
                                 </b>
                                 <b>
-                                    <a>7</a>
-                                    <b>9</b>
-                                    <v>7</v>
+                                    <a>10</a>
+                                    <b>11</b>
+                                    <v>1607</v>
                                 </b>
                                 <b>
-                                    <a>9</a>
-                                    <b>13</b>
-                                    <v>7</v>
+                                    <a>11</a>
+                                    <b>12</b>
+                                    <v>3214</v>
                                 </b>
                                 <b>
-                                    <a>13</a>
+                                    <a>17</a>
                                     <b>18</b>
-                                    <v>7</v>
+                                    <v>1607</v>
+                                </b>
+                                <b>
+                                    <a>19</a>
+                                    <b>20</b>
+                                    <v>1607</v>
                                 </b>
                                 <b>
                                     <a>20</a>
-                                    <b>28</b>
-                                    <v>6</v>
+                                    <b>21</b>
+                                    <v>1607</v>
+                                </b>
+                                <b>
+                                    <a>25</a>
+                                    <b>26</b>
+                                    <v>1607</v>
                                 </b>
                                 <b>
                                     <a>29</a>
-                                    <b>34</b>
-                                    <v>3</v>
+                                    <b>30</b>
+                                    <v>1607</v>
+                                </b>
+                                <b>
+                                    <a>37</a>
+                                    <b>38</b>
+                                    <v>1607</v>
+                                </b>
+                                <b>
+                                    <a>41</a>
+                                    <b>42</b>
+                                    <v>1607</v>
+                                </b>
+                                <b>
+                                    <a>98</a>
+                                    <b>99</b>
+                                    <v>1607</v>
+                                </b>
+                                <b>
+                                    <a>167</a>
+                                    <b>168</b>
+                                    <v>1607</v>
+                                </b>
+                                <b>
+                                    <a>331</a>
+                                    <b>332</b>
+                                    <v>1607</v>
+                                </b>
+                                <b>
+                                    <a>335</a>
+                                    <b>336</b>
+                                    <v>1607</v>
                                 </b>
                             </bs>
                         </hist>
@@ -10836,7 +11093,7 @@
                 </dep>
                 <dep>
                     <src>idx</src>
-                    <trg>parent</trg>
+                    <trg>kind</trg>
                     <val>
                         <hist>
                             <budget>12</budget>
@@ -10844,52 +11101,163 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>6</v>
+                                    <v>3214</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>20</v>
+                                    <v>1607</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>3214</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>5</b>
+                                    <v>4821</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>6</b>
-                                    <v>3</v>
+                                    <v>4821</v>
+                                </b>
+                                <b>
+                                    <a>6</a>
+                                    <b>7</b>
+                                    <v>1607</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>8</b>
-                                    <v>11</v>
+                                    <v>3214</v>
+                                </b>
+                                <b>
+                                    <a>8</a>
+                                    <b>9</b>
+                                    <v>1607</v>
+                                </b>
+                                <b>
+                                    <a>9</a>
+                                    <b>10</b>
+                                    <v>3214</v>
                                 </b>
                                 <b>
                                     <a>10</a>
+                                    <b>11</b>
+                                    <v>1607</v>
+                                </b>
+                                <b>
+                                    <a>12</a>
+                                    <b>13</b>
+                                    <v>1607</v>
+                                </b>
+                                <b>
+                                    <a>14</a>
                                     <b>15</b>
-                                    <v>7</v>
+                                    <v>1607</v>
                                 </b>
                                 <b>
-                                    <a>15</a>
-                                    <b>27</b>
-                                    <v>7</v>
+                                    <a>16</a>
+                                    <b>17</b>
+                                    <v>1607</v>
                                 </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>idx</src>
+                    <trg>parent</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
                                 <b>
-                                    <a>27</a>
-                                    <b>70</b>
-                                    <v>7</v>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>1607</v>
                                 </b>
                                 <b>
-                                    <a>85</a>
-                                    <b>262</b>
-                                    <v>7</v>
+                                    <a>6</a>
+                                    <b>7</b>
+                                    <v>4821</v>
+                                </b>
+                                <b>
+                                    <a>7</a>
+                                    <b>8</b>
+                                    <v>3214</v>
+                                </b>
+                                <b>
+                                    <a>8</a>
+                                    <b>9</b>
+                                    <v>1607</v>
+                                </b>
+                                <b>
+                                    <a>10</a>
+                                    <b>11</b>
+                                    <v>1607</v>
+                                </b>
+                                <b>
+                                    <a>11</a>
+                                    <b>12</b>
+                                    <v>3214</v>
+                                </b>
+                                <b>
+                                    <a>17</a>
+                                    <b>18</b>
+                                    <v>1607</v>
+                                </b>
+                                <b>
+                                    <a>19</a>
+                                    <b>20</b>
+                                    <v>1607</v>
+                                </b>
+                                <b>
+                                    <a>20</a>
+                                    <b>21</b>
+                                    <v>1607</v>
+                                </b>
+                                <b>
+                                    <a>25</a>
+                                    <b>26</b>
+                                    <v>1607</v>
+                                </b>
+                                <b>
+                                    <a>29</a>
+                                    <b>30</b>
+                                    <v>1607</v>
+                                </b>
+                                <b>
+                                    <a>37</a>
+                                    <b>38</b>
+                                    <v>1607</v>
+                                </b>
+                                <b>
+                                    <a>41</a>
+                                    <b>42</b>
+                                    <v>1607</v>
+                                </b>
+                                <b>
+                                    <a>98</a>
+                                    <b>99</b>
+                                    <v>1607</v>
+                                </b>
+                                <b>
+                                    <a>167</a>
+                                    <b>168</b>
+                                    <v>1607</v>
                                 </b>
                                 <b>
-                                    <a>314</a>
-                                    <b>1279</b>
-                                    <v>7</v>
+                                    <a>331</a>
+                                    <b>332</b>
+                                    <v>1607</v>
                                 </b>
                                 <b>
-                                    <a>1720</a>
-                                    <b>24879</b>
-                                    <v>6</v>
+                                    <a>335</a>
+                                    <b>336</b>
+                                    <v>1607</v>
                                 </b>
                             </bs>
                         </hist>
@@ -10899,23 +11267,23 @@
         </relation>
         <relation>
             <name>decls</name>
-            <cardinality>8690</cardinality>
+            <cardinality>443378</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>8690</v>
+                    <v>443378</v>
                 </e>
                 <e>
                     <k>kind</k>
-                    <v>5</v>
+                    <v>528</v>
                 </e>
                 <e>
                     <k>parent</k>
-                    <v>1951</v>
+                    <v>123356</v>
                 </e>
                 <e>
                     <k>idx</k>
-                    <v>226</v>
+                    <v>59475</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -10929,7 +11297,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>8690</v>
+                                    <v>443378</v>
                                 </b>
                             </bs>
                         </hist>
@@ -10945,7 +11313,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>8690</v>
+                                    <v>443378</v>
                                 </b>
                             </bs>
                         </hist>
@@ -10961,7 +11329,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>8690</v>
+                                    <v>443378</v>
                                 </b>
                             </bs>
                         </hist>
@@ -10975,29 +11343,34 @@
                             <budget>12</budget>
                             <bs>
                                 <b>
-                                    <a>280</a>
-                                    <b>281</b>
-                                    <v>1</v>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>88</v>
+                                </b>
+                                <b>
+                                    <a>45</a>
+                                    <b>46</b>
+                                    <v>88</v>
                                 </b>
                                 <b>
-                                    <a>479</a>
-                                    <b>480</b>
-                                    <v>1</v>
+                                    <a>208</a>
+                                    <b>209</b>
+                                    <v>88</v>
                                 </b>
                                 <b>
-                                    <a>1349</a>
-                                    <b>1350</b>
-                                    <v>1</v>
+                                    <a>421</a>
+                                    <b>422</b>
+                                    <v>88</v>
                                 </b>
                                 <b>
-                                    <a>1769</a>
-                                    <b>1770</b>
-                                    <v>1</v>
+                                    <a>1140</a>
+                                    <b>1141</b>
+                                    <v>88</v>
                                 </b>
                                 <b>
-                                    <a>4813</a>
-                                    <b>4814</b>
-                                    <v>1</v>
+                                    <a>3216</a>
+                                    <b>3217</b>
+                                    <v>88</v>
                                 </b>
                             </bs>
                         </hist>
@@ -11011,29 +11384,34 @@
                             <budget>12</budget>
                             <bs>
                                 <b>
-                                    <a>196</a>
-                                    <b>197</b>
-                                    <v>1</v>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>88</v>
+                                </b>
+                                <b>
+                                    <a>34</a>
+                                    <b>35</b>
+                                    <v>88</v>
                                 </b>
                                 <b>
-                                    <a>336</a>
-                                    <b>337</b>
-                                    <v>1</v>
+                                    <a>100</a>
+                                    <b>101</b>
+                                    <v>88</v>
                                 </b>
                                 <b>
-                                    <a>478</a>
-                                    <b>479</b>
-                                    <v>1</v>
+                                    <a>421</a>
+                                    <b>422</b>
+                                    <v>88</v>
                                 </b>
                                 <b>
-                                    <a>483</a>
-                                    <b>484</b>
-                                    <v>1</v>
+                                    <a>547</a>
+                                    <b>548</b>
+                                    <v>88</v>
                                 </b>
                                 <b>
-                                    <a>1566</a>
-                                    <b>1567</b>
-                                    <v>1</v>
+                                    <a>882</a>
+                                    <b>883</b>
+                                    <v>88</v>
                                 </b>
                             </bs>
                         </hist>
@@ -11047,29 +11425,29 @@
                             <budget>12</budget>
                             <bs>
                                 <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>1</v>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>176</v>
                                 </b>
                                 <b>
-                                    <a>39</a>
-                                    <b>40</b>
-                                    <v>1</v>
+                                    <a>15</a>
+                                    <b>16</b>
+                                    <v>88</v>
                                 </b>
                                 <b>
-                                    <a>105</a>
-                                    <b>106</b>
-                                    <v>1</v>
+                                    <a>26</a>
+                                    <b>27</b>
+                                    <v>88</v>
                                 </b>
                                 <b>
-                                    <a>219</a>
-                                    <b>220</b>
-                                    <v>1</v>
+                                    <a>237</a>
+                                    <b>238</b>
+                                    <v>88</v>
                                 </b>
                                 <b>
-                                    <a>225</a>
-                                    <b>226</b>
-                                    <v>1</v>
+                                    <a>675</a>
+                                    <b>676</b>
+                                    <v>88</v>
                                 </b>
                             </bs>
                         </hist>
@@ -11085,27 +11463,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1460</v>
+                                    <v>80886</v>
                                 </b>
                                 <b>
                                     <a>2</a>
-                                    <b>6</b>
-                                    <v>149</v>
+                                    <b>3</b>
+                                    <v>16476</v>
                                 </b>
                                 <b>
-                                    <a>6</a>
-                                    <b>12</b>
-                                    <v>155</v>
+                                    <a>3</a>
+                                    <b>5</b>
+                                    <v>9956</v>
                                 </b>
                                 <b>
-                                    <a>12</a>
-                                    <b>36</b>
-                                    <v>147</v>
+                                    <a>5</a>
+                                    <b>12</b>
+                                    <v>9956</v>
                                 </b>
                                 <b>
-                                    <a>36</a>
-                                    <b>227</b>
-                                    <v>40</v>
+                                    <a>12</a>
+                                    <b>676</b>
+                                    <v>6079</v>
                                 </b>
                             </bs>
                         </hist>
@@ -11121,27 +11499,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1463</v>
+                                    <v>83089</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>111</v>
+                                    <v>31632</v>
                                 </b>
                                 <b>
                                     <a>3</a>
-                                    <b>4</b>
-                                    <v>185</v>
-                                </b>
-                                <b>
-                                    <a>4</a>
-                                    <b>5</b>
-                                    <v>141</v>
-                                </b>
-                                <b>
-                                    <a>5</a>
                                     <b>6</b>
-                                    <v>51</v>
+                                    <v>8634</v>
                                 </b>
                             </bs>
                         </hist>
@@ -11157,27 +11525,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1460</v>
+                                    <v>80886</v>
                                 </b>
                                 <b>
                                     <a>2</a>
-                                    <b>6</b>
-                                    <v>149</v>
+                                    <b>3</b>
+                                    <v>16476</v>
                                 </b>
                                 <b>
-                                    <a>6</a>
-                                    <b>12</b>
-                                    <v>155</v>
+                                    <a>3</a>
+                                    <b>5</b>
+                                    <v>9956</v>
                                 </b>
                                 <b>
-                                    <a>12</a>
-                                    <b>36</b>
-                                    <v>147</v>
+                                    <a>5</a>
+                                    <b>12</b>
+                                    <v>9956</v>
                                 </b>
                                 <b>
-                                    <a>36</a>
-                                    <b>227</b>
-                                    <v>40</v>
+                                    <a>12</a>
+                                    <b>676</b>
+                                    <v>6079</v>
                                 </b>
                             </bs>
                         </hist>
@@ -11193,57 +11561,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4</v>
+                                    <v>38592</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>30</v>
+                                    <v>13833</v>
                                 </b>
                                 <b>
                                     <a>3</a>
-                                    <b>4</b>
-                                    <v>18</v>
-                                </b>
-                                <b>
-                                    <a>4</a>
-                                    <b>5</b>
-                                    <v>66</v>
-                                </b>
-                                <b>
-                                    <a>5</a>
-                                    <b>6</b>
-                                    <v>2</v>
-                                </b>
-                                <b>
-                                    <a>6</a>
-                                    <b>7</b>
-                                    <v>31</v>
-                                </b>
-                                <b>
-                                    <a>7</a>
-                                    <b>11</b>
-                                    <v>17</v>
-                                </b>
-                                <b>
-                                    <a>11</a>
-                                    <b>31</b>
-                                    <v>17</v>
-                                </b>
-                                <b>
-                                    <a>31</a>
-                                    <b>65</b>
-                                    <v>17</v>
-                                </b>
-                                <b>
-                                    <a>67</a>
-                                    <b>275</b>
-                                    <v>17</v>
+                                    <b>17</b>
+                                    <v>4581</v>
                                 </b>
                                 <b>
-                                    <a>323</a>
-                                    <b>1952</b>
-                                    <v>7</v>
+                                    <a>19</a>
+                                    <b>1401</b>
+                                    <v>2467</v>
                                 </b>
                             </bs>
                         </hist>
@@ -11259,27 +11592,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7</v>
+                                    <v>38592</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>113</v>
+                                    <v>18503</v>
                                 </b>
                                 <b>
                                     <a>3</a>
-                                    <b>4</b>
-                                    <v>69</v>
-                                </b>
-                                <b>
-                                    <a>4</a>
-                                    <b>5</b>
-                                    <v>35</v>
-                                </b>
-                                <b>
-                                    <a>5</a>
-                                    <b>6</b>
-                                    <v>2</v>
+                                    <b>7</b>
+                                    <v>2379</v>
                                 </b>
                             </bs>
                         </hist>
@@ -11295,57 +11618,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4</v>
+                                    <v>38592</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>30</v>
+                                    <v>13833</v>
                                 </b>
                                 <b>
                                     <a>3</a>
-                                    <b>4</b>
-                                    <v>18</v>
+                                    <b>17</b>
+                                    <v>4581</v>
                                 </b>
                                 <b>
-                                    <a>4</a>
-                                    <b>5</b>
-                                    <v>66</v>
-                                </b>
-                                <b>
-                                    <a>5</a>
-                                    <b>6</b>
-                                    <v>2</v>
-                                </b>
-                                <b>
-                                    <a>6</a>
-                                    <b>7</b>
-                                    <v>31</v>
-                                </b>
-                                <b>
-                                    <a>7</a>
-                                    <b>11</b>
-                                    <v>17</v>
-                                </b>
-                                <b>
-                                    <a>11</a>
-                                    <b>31</b>
-                                    <v>17</v>
-                                </b>
-                                <b>
-                                    <a>31</a>
-                                    <b>65</b>
-                                    <v>17</v>
-                                </b>
-                                <b>
-                                    <a>67</a>
-                                    <b>275</b>
-                                    <v>17</v>
-                                </b>
-                                <b>
-                                    <a>323</a>
-                                    <b>1952</b>
-                                    <v>7</v>
+                                    <a>19</a>
+                                    <b>1401</b>
+                                    <v>2467</v>
                                 </b>
                             </bs>
                         </hist>
@@ -11355,23 +11643,23 @@
         </relation>
         <relation>
             <name>specs</name>
-            <cardinality>7889</cardinality>
+            <cardinality>397829</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>7889</v>
+                    <v>397829</v>
                 </e>
                 <e>
                     <k>kind</k>
-                    <v>4</v>
+                    <v>5234</v>
                 </e>
                 <e>
                     <k>parent</k>
-                    <v>3877</v>
+                    <v>193680</v>
                 </e>
                 <e>
                     <k>idx</k>
-                    <v>108</v>
+                    <v>31407</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -11385,7 +11673,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7889</v>
+                                    <v>397829</v>
                                 </b>
                             </bs>
                         </hist>
@@ -11401,7 +11689,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7889</v>
+                                    <v>397829</v>
                                 </b>
                             </bs>
                         </hist>
@@ -11417,7 +11705,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7889</v>
+                                    <v>397829</v>
                                 </b>
                             </bs>
                         </hist>
@@ -11431,24 +11719,19 @@
                             <budget>12</budget>
                             <bs>
                                 <b>
-                                    <a>16</a>
-                                    <b>17</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>1349</a>
-                                    <b>1350</b>
-                                    <v>1</v>
+                                    <a>18</a>
+                                    <b>19</b>
+                                    <v>1744</v>
                                 </b>
                                 <b>
-                                    <a>3056</a>
-                                    <b>3057</b>
-                                    <v>1</v>
+                                    <a>70</a>
+                                    <b>71</b>
+                                    <v>1744</v>
                                 </b>
                                 <b>
-                                    <a>3468</a>
-                                    <b>3469</b>
-                                    <v>1</v>
+                                    <a>140</a>
+                                    <b>141</b>
+                                    <v>1744</v>
                                 </b>
                             </bs>
                         </hist>
@@ -11462,24 +11745,19 @@
                             <budget>12</budget>
                             <bs>
                                 <b>
-                                    <a>16</a>
-                                    <b>17</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>479</a>
-                                    <b>480</b>
-                                    <v>1</v>
+                                    <a>18</a>
+                                    <b>19</b>
+                                    <v>1744</v>
                                 </b>
                                 <b>
-                                    <a>1333</a>
-                                    <b>1334</b>
-                                    <v>1</v>
+                                    <a>23</a>
+                                    <b>24</b>
+                                    <v>1744</v>
                                 </b>
                                 <b>
-                                    <a>2049</a>
-                                    <b>2050</b>
-                                    <v>1</v>
+                                    <a>70</a>
+                                    <b>71</b>
+                                    <v>1744</v>
                                 </b>
                             </bs>
                         </hist>
@@ -11495,22 +11773,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1</v>
+                                    <v>3489</v>
                                 </b>
                                 <b>
-                                    <a>14</a>
-                                    <b>15</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>36</a>
-                                    <b>37</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>108</a>
-                                    <b>109</b>
-                                    <v>1</v>
+                                    <a>18</a>
+                                    <b>19</b>
+                                    <v>1744</v>
                                 </b>
                             </bs>
                         </hist>
@@ -11526,22 +11794,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3206</v>
+                                    <v>157037</v>
                                 </b>
                                 <b>
                                     <a>2</a>
-                                    <b>6</b>
-                                    <v>343</v>
+                                    <b>5</b>
+                                    <v>15703</v>
                                 </b>
                                 <b>
                                     <a>6</a>
-                                    <b>18</b>
-                                    <v>298</v>
+                                    <b>11</b>
+                                    <v>15703</v>
                                 </b>
                                 <b>
-                                    <a>18</a>
-                                    <b>109</b>
-                                    <v>30</v>
+                                    <a>14</a>
+                                    <b>19</b>
+                                    <v>5234</v>
                                 </b>
                             </bs>
                         </hist>
@@ -11557,7 +11825,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3877</v>
+                                    <v>193680</v>
                                 </b>
                             </bs>
                         </hist>
@@ -11573,22 +11841,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3206</v>
+                                    <v>157037</v>
                                 </b>
                                 <b>
                                     <a>2</a>
-                                    <b>6</b>
-                                    <v>343</v>
+                                    <b>5</b>
+                                    <v>15703</v>
                                 </b>
                                 <b>
                                     <a>6</a>
-                                    <b>18</b>
-                                    <v>298</v>
+                                    <b>11</b>
+                                    <v>15703</v>
                                 </b>
                                 <b>
-                                    <a>18</a>
-                                    <b>109</b>
-                                    <v>30</v>
+                                    <a>14</a>
+                                    <b>19</b>
+                                    <v>5234</v>
                                 </b>
                             </bs>
                         </hist>
@@ -11604,32 +11872,47 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>53</v>
+                                    <v>6979</v>
                                 </b>
                                 <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>19</v>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>6979</v>
                                 </b>
                                 <b>
-                                    <a>3</a>
-                                    <b>6</b>
-                                    <v>9</v>
+                                    <a>4</a>
+                                    <b>5</b>
+                                    <v>3489</v>
                                 </b>
                                 <b>
-                                    <a>6</a>
-                                    <b>28</b>
-                                    <v>9</v>
+                                    <a>9</a>
+                                    <b>10</b>
+                                    <v>3489</v>
                                 </b>
                                 <b>
-                                    <a>30</a>
-                                    <b>156</b>
-                                    <v>9</v>
+                                    <a>12</a>
+                                    <b>13</b>
+                                    <v>3489</v>
+                                </b>
+                                <b>
+                                    <a>14</a>
+                                    <b>15</b>
+                                    <v>1744</v>
+                                </b>
+                                <b>
+                                    <a>16</a>
+                                    <b>17</b>
+                                    <v>1744</v>
+                                </b>
+                                <b>
+                                    <a>21</a>
+                                    <b>22</b>
+                                    <v>1744</v>
                                 </b>
                                 <b>
-                                    <a>188</a>
-                                    <b>3878</b>
-                                    <v>9</v>
+                                    <a>111</a>
+                                    <b>112</b>
+                                    <v>1744</v>
                                 </b>
                             </bs>
                         </hist>
@@ -11645,22 +11928,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>72</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>22</v>
+                                    <v>29662</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>13</v>
-                                </b>
-                                <b>
-                                    <a>4</a>
-                                    <b>5</b>
-                                    <v>1</v>
+                                    <v>1744</v>
                                 </b>
                             </bs>
                         </hist>
@@ -11676,32 +11949,47 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>53</v>
+                                    <v>6979</v>
                                 </b>
                                 <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>19</v>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>6979</v>
                                 </b>
                                 <b>
-                                    <a>3</a>
-                                    <b>6</b>
-                                    <v>9</v>
+                                    <a>4</a>
+                                    <b>5</b>
+                                    <v>3489</v>
                                 </b>
                                 <b>
-                                    <a>6</a>
-                                    <b>28</b>
-                                    <v>9</v>
+                                    <a>9</a>
+                                    <b>10</b>
+                                    <v>3489</v>
                                 </b>
                                 <b>
-                                    <a>30</a>
-                                    <b>156</b>
-                                    <v>9</v>
+                                    <a>12</a>
+                                    <b>13</b>
+                                    <v>3489</v>
+                                </b>
+                                <b>
+                                    <a>14</a>
+                                    <b>15</b>
+                                    <v>1744</v>
+                                </b>
+                                <b>
+                                    <a>16</a>
+                                    <b>17</b>
+                                    <v>1744</v>
+                                </b>
+                                <b>
+                                    <a>21</a>
+                                    <b>22</b>
+                                    <v>1744</v>
                                 </b>
                                 <b>
-                                    <a>188</a>
-                                    <b>3878</b>
-                                    <v>9</v>
+                                    <a>111</a>
+                                    <b>112</b>
+                                    <v>1744</v>
                                 </b>
                             </bs>
                         </hist>
@@ -11711,15 +11999,15 @@
         </relation>
         <relation>
             <name>scopes</name>
-            <cardinality>36775</cardinality>
+            <cardinality>1519778</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>36775</v>
+                    <v>1519778</v>
                 </e>
                 <e>
                     <k>kind</k>
-                    <v>3</v>
+                    <v>5234</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -11733,7 +12021,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>36775</v>
+                                    <v>1519778</v>
                                 </b>
                             </bs>
                         </hist>
@@ -11749,17 +12037,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1</v>
+                                    <v>1744</v>
                                 </b>
                                 <b>
-                                    <a>346</a>
-                                    <b>347</b>
-                                    <v>1</v>
+                                    <a>340</a>
+                                    <b>341</b>
+                                    <v>1744</v>
                                 </b>
                                 <b>
-                                    <a>36428</a>
-                                    <b>36429</b>
-                                    <v>1</v>
+                                    <a>530</a>
+                                    <b>531</b>
+                                    <v>1744</v>
                                 </b>
                             </bs>
                         </hist>
@@ -11769,15 +12057,15 @@
         </relation>
         <relation>
             <name>scopenesting</name>
-            <cardinality>36774</cardinality>
+            <cardinality>1518033</cardinality>
             <columnsizes>
                 <e>
                     <k>inner</k>
-                    <v>36774</v>
+                    <v>1518033</v>
                 </e>
                 <e>
                     <k>outer</k>
-                    <v>21713</v>
+                    <v>397829</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -11791,7 +12079,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>36774</v>
+                                    <v>1518033</v>
                                 </b>
                             </bs>
                         </hist>
@@ -11807,22 +12095,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>16964</v>
+                                    <v>280923</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>2474</v>
+                                    <v>71539</v>
                                 </b>
                                 <b>
                                     <a>3</a>
-                                    <b>7</b>
-                                    <v>1759</v>
+                                    <b>5</b>
+                                    <v>34897</v>
                                 </b>
                                 <b>
-                                    <a>7</a>
-                                    <b>347</b>
-                                    <v>516</v>
+                                    <a>5</a>
+                                    <b>531</b>
+                                    <v>10469</v>
                                 </b>
                             </bs>
                         </hist>
@@ -11832,15 +12120,15 @@
         </relation>
         <relation>
             <name>scopenodes</name>
-            <cardinality>36428</cardinality>
+            <cardinality>919952</cardinality>
             <columnsizes>
                 <e>
                     <k>node</k>
-                    <v>36428</v>
+                    <v>919952</v>
                 </e>
                 <e>
                     <k>scope</k>
-                    <v>36428</v>
+                    <v>919952</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -11854,7 +12142,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>36428</v>
+                                    <v>919952</v>
                                 </b>
                             </bs>
                         </hist>
@@ -11870,7 +12158,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>36428</v>
+                                    <v>919952</v>
                                 </b>
                             </bs>
                         </hist>
@@ -11880,19 +12168,19 @@
         </relation>
         <relation>
             <name>objects</name>
-            <cardinality>84909</cardinality>
+            <cardinality>260849313</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>84909</v>
+                    <v>260849313</v>
                 </e>
                 <e>
                     <k>kind</k>
-                    <v>9</v>
+                    <v>32863</v>
                 </e>
                 <e>
                     <k>name</k>
-                    <v>30576</v>
+                    <v>153297959</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -11906,7 +12194,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>84909</v>
+                                    <v>260849313</v>
                                 </b>
                             </bs>
                         </hist>
@@ -11922,7 +12210,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>84909</v>
+                                    <v>260849313</v>
                                 </b>
                             </bs>
                         </hist>
@@ -11938,47 +12226,42 @@
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>18</a>
-                                    <b>19</b>
-                                    <v>1</v>
+                                    <v>4107</v>
                                 </b>
                                 <b>
-                                    <a>20</a>
-                                    <b>21</b>
-                                    <v>1</v>
+                                    <a>22</a>
+                                    <b>23</b>
+                                    <v>4107</v>
                                 </b>
                                 <b>
-                                    <a>49</a>
-                                    <b>50</b>
-                                    <v>1</v>
+                                    <a>26</a>
+                                    <b>27</b>
+                                    <v>4107</v>
                                 </b>
                                 <b>
-                                    <a>3468</a>
-                                    <b>3469</b>
-                                    <v>1</v>
+                                    <a>33</a>
+                                    <b>34</b>
+                                    <v>4107</v>
                                 </b>
                                 <b>
-                                    <a>3602</a>
-                                    <b>3603</b>
-                                    <v>1</v>
+                                    <a>3147</a>
+                                    <b>3148</b>
+                                    <v>4107</v>
                                 </b>
                                 <b>
-                                    <a>8857</a>
-                                    <b>8858</b>
-                                    <v>1</v>
+                                    <a>17646</a>
+                                    <b>17647</b>
+                                    <v>4107</v>
                                 </b>
                                 <b>
-                                    <a>17793</a>
-                                    <b>17794</b>
-                                    <v>1</v>
+                                    <a>19579</a>
+                                    <b>19580</b>
+                                    <v>4107</v>
                                 </b>
                                 <b>
-                                    <a>51098</a>
-                                    <b>51099</b>
-                                    <v>1</v>
+                                    <a>23041</a>
+                                    <b>23042</b>
+                                    <v>4107</v>
                                 </b>
                             </bs>
                         </hist>
@@ -11994,47 +12277,42 @@
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>18</a>
-                                    <b>19</b>
-                                    <v>1</v>
+                                    <v>4107</v>
                                 </b>
                                 <b>
-                                    <a>20</a>
-                                    <b>21</b>
-                                    <v>1</v>
+                                    <a>22</a>
+                                    <b>23</b>
+                                    <v>4107</v>
                                 </b>
                                 <b>
-                                    <a>38</a>
-                                    <b>39</b>
-                                    <v>1</v>
+                                    <a>23</a>
+                                    <b>24</b>
+                                    <v>4107</v>
                                 </b>
                                 <b>
-                                    <a>203</a>
-                                    <b>204</b>
-                                    <v>1</v>
+                                    <a>26</a>
+                                    <b>27</b>
+                                    <v>4107</v>
                                 </b>
                                 <b>
-                                    <a>3004</a>
-                                    <b>3005</b>
-                                    <v>1</v>
+                                    <a>2654</a>
+                                    <b>2655</b>
+                                    <v>4107</v>
                                 </b>
                                 <b>
-                                    <a>8418</a>
-                                    <b>8419</b>
-                                    <v>1</v>
+                                    <a>7829</a>
+                                    <b>7830</b>
+                                    <v>4107</v>
                                 </b>
                                 <b>
-                                    <a>10132</a>
-                                    <b>10133</b>
-                                    <v>1</v>
+                                    <a>10951</a>
+                                    <b>10952</b>
+                                    <v>4107</v>
                                 </b>
                                 <b>
-                                    <a>10913</a>
-                                    <b>10914</b>
-                                    <v>1</v>
+                                    <a>17127</a>
+                                    <b>17128</b>
+                                    <v>4107</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12050,22 +12328,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>25286</v>
+                                    <v>124595415</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>2613</v>
+                                    <v>20954870</v>
                                 </b>
                                 <b>
                                     <a>3</a>
-                                    <b>20</b>
-                                    <v>2304</v>
-                                </b>
-                                <b>
-                                    <a>20</a>
-                                    <b>2222</b>
-                                    <v>373</v>
+                                    <b>1189</b>
+                                    <v>7747674</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12081,12 +12354,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>28809</v>
+                                    <v>148692899</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>6</b>
-                                    <v>1767</v>
+                                    <v>4605059</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12096,15 +12369,15 @@
         </relation>
         <relation>
             <name>objectscopes</name>
-            <cardinality>54774</cardinality>
+            <cardinality>140464590</cardinality>
             <columnsizes>
                 <e>
                     <k>object</k>
-                    <v>54774</v>
+                    <v>140464590</v>
                 </e>
                 <e>
                     <k>scope</k>
-                    <v>13947</v>
+                    <v>1068078</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -12118,7 +12391,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>54774</v>
+                                    <v>140464590</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12134,32 +12407,72 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7112</v>
+                                    <v>73943</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>2972</v>
+                                    <v>57511</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>1274</v>
+                                    <v>69835</v>
                                 </b>
                                 <b>
                                     <a>4</a>
-                                    <b>6</b>
-                                    <v>1264</v>
+                                    <b>7</b>
+                                    <v>86267</v>
                                 </b>
                                 <b>
-                                    <a>6</a>
-                                    <b>15</b>
-                                    <v>1055</v>
+                                    <a>7</a>
+                                    <b>13</b>
+                                    <v>82159</v>
                                 </b>
                                 <b>
-                                    <a>15</a>
-                                    <b>2694</b>
-                                    <v>270</v>
+                                    <a>13</a>
+                                    <b>18</b>
+                                    <v>86267</v>
+                                </b>
+                                <b>
+                                    <a>18</a>
+                                    <b>24</b>
+                                    <v>86267</v>
+                                </b>
+                                <b>
+                                    <a>24</a>
+                                    <b>35</b>
+                                    <v>86267</v>
+                                </b>
+                                <b>
+                                    <a>35</a>
+                                    <b>48</b>
+                                    <v>82159</v>
+                                </b>
+                                <b>
+                                    <a>48</a>
+                                    <b>62</b>
+                                    <v>82159</v>
+                                </b>
+                                <b>
+                                    <a>63</a>
+                                    <b>106</b>
+                                    <v>82159</v>
+                                </b>
+                                <b>
+                                    <a>108</a>
+                                    <b>186</b>
+                                    <v>82159</v>
+                                </b>
+                                <b>
+                                    <a>206</a>
+                                    <b>689</b>
+                                    <v>82159</v>
+                                </b>
+                                <b>
+                                    <a>711</a>
+                                    <b>10035</b>
+                                    <v>28755</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12169,15 +12482,15 @@
         </relation>
         <relation>
             <name>objecttypes</name>
-            <cardinality>84907</cardinality>
+            <cardinality>258988392</cardinality>
             <columnsizes>
                 <e>
                     <k>object</k>
-                    <v>84907</v>
+                    <v>258988392</v>
                 </e>
                 <e>
                     <k>tp</k>
-                    <v>13462</v>
+                    <v>47738981</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -12191,7 +12504,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>84907</v>
+                                    <v>258988392</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12207,32 +12520,32 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7893</v>
+                                    <v>29216043</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>2114</v>
+                                    <v>7813401</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>892</v>
+                                    <v>3039914</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>7</b>
-                                    <v>1190</v>
+                                    <v>3730057</v>
                                 </b>
                                 <b>
                                     <a>7</a>
-                                    <b>25</b>
-                                    <v>1011</v>
+                                    <b>53</b>
+                                    <v>3582169</v>
                                 </b>
                                 <b>
-                                    <a>25</a>
-                                    <b>4267</b>
-                                    <v>362</v>
+                                    <a>53</a>
+                                    <b>13253</b>
+                                    <v>357395</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12242,15 +12555,15 @@
         </relation>
         <relation>
             <name>methodreceivers</name>
-            <cardinality>9873</cardinality>
+            <cardinality>70035448</cardinality>
             <columnsizes>
                 <e>
                     <k>method</k>
-                    <v>9873</v>
+                    <v>70035448</v>
                 </e>
                 <e>
                     <k>receiver</k>
-                    <v>9873</v>
+                    <v>70035448</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -12264,7 +12577,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>9873</v>
+                                    <v>70035448</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12280,7 +12593,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>9873</v>
+                                    <v>70035448</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12290,15 +12603,15 @@
         </relation>
         <relation>
             <name>fieldstructs</name>
-            <cardinality>10934</cardinality>
+            <cardinality>41038845</cardinality>
             <columnsizes>
                 <e>
                     <k>field</k>
-                    <v>10934</v>
+                    <v>41038845</v>
                 </e>
                 <e>
                     <k>struct</k>
-                    <v>2408</v>
+                    <v>8035233</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -12312,7 +12625,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>10934</v>
+                                    <v>41038845</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12328,42 +12641,42 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>260</v>
+                                    <v>936622</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>677</v>
+                                    <v>2033456</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>468</v>
+                                    <v>1425473</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>292</v>
+                                    <v>1031106</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>6</b>
-                                    <v>194</v>
+                                    <v>640846</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>8</b>
-                                    <v>208</v>
+                                    <v>694250</v>
                                 </b>
                                 <b>
                                     <a>8</a>
-                                    <b>13</b>
-                                    <v>199</v>
+                                    <b>12</b>
+                                    <v>681926</v>
                                 </b>
                                 <b>
-                                    <a>13</a>
-                                    <b>65</b>
-                                    <v>110</v>
+                                    <a>12</a>
+                                    <b>80</b>
+                                    <v>591550</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12373,15 +12686,15 @@
         </relation>
         <relation>
             <name>methodhosts</name>
-            <cardinality>838</cardinality>
+            <cardinality>8181678</cardinality>
             <columnsizes>
                 <e>
                     <k>method</k>
-                    <v>699</v>
+                    <v>5569613</v>
                 </e>
                 <e>
                     <k>host</k>
-                    <v>258</v>
+                    <v>1579104</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -12395,17 +12708,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>625</v>
+                                    <v>4430215</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>56</v>
+                                    <v>509500</v>
                                 </b>
                                 <b>
                                     <a>3</a>
-                                    <b>16</b>
-                                    <v>18</v>
+                                    <b>4</b>
+                                    <v>122140</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>5</b>
+                                    <v>439706</v>
+                                </b>
+                                <b>
+                                    <a>5</a>
+                                    <b>28</b>
+                                    <v>68049</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12421,55 +12744,60 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>99</v>
+                                    <v>645600</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>56</v>
+                                    <v>272199</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>37</v>
+                                    <v>158782</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>20</v>
+                                    <v>90733</v>
                                 </b>
                                 <b>
                                     <a>5</a>
-                                    <b>6</b>
-                                    <v>15</v>
+                                    <b>8</b>
+                                    <v>130864</v>
                                 </b>
                                 <b>
-                                    <a>6</a>
+                                    <a>8</a>
                                     <b>11</b>
-                                    <v>21</v>
+                                    <v>123885</v>
                                 </b>
                                 <b>
                                     <a>11</a>
-                                    <b>53</b>
-                                    <v>10</v>
+                                    <b>19</b>
+                                    <v>118650</v>
                                 </b>
-                            </bs>
-                        </hist>
-                    </val>
+                                <b>
+                                    <a>19</a>
+                                    <b>293</b>
+                                    <v>38387</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
                 </dep>
             </dependencies>
         </relation>
         <relation>
             <name>defs</name>
-            <cardinality>40703</cardinality>
+            <cardinality>1417649</cardinality>
             <columnsizes>
                 <e>
                     <k>ident</k>
-                    <v>40703</v>
+                    <v>1417649</v>
                 </e>
                 <e>
                     <k>object</k>
-                    <v>40490</v>
+                    <v>1388768</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -12483,7 +12811,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>40703</v>
+                                    <v>1417649</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12499,12 +12827,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>40383</v>
+                                    <v>1370071</v>
                                 </b>
                                 <b>
                                     <a>2</a>
-                                    <b>15</b>
-                                    <v>107</v>
+                                    <b>7</b>
+                                    <v>18697</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12514,15 +12842,15 @@
         </relation>
         <relation>
             <name>uses</name>
-            <cardinality>195902</cardinality>
+            <cardinality>4531459</cardinality>
             <columnsizes>
                 <e>
                     <k>ident</k>
-                    <v>195902</v>
+                    <v>4531459</v>
                 </e>
                 <e>
                     <k>object</k>
-                    <v>41616</v>
+                    <v>802598</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -12536,7 +12864,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>195902</v>
+                                    <v>4531459</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12552,37 +12880,37 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>15493</v>
+                                    <v>294651</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>9727</v>
+                                    <v>231900</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>5056</v>
+                                    <v>77848</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>2974</v>
+                                    <v>50873</v>
                                 </b>
                                 <b>
                                     <a>5</a>
-                                    <b>7</b>
-                                    <v>3203</v>
+                                    <b>8</b>
+                                    <v>68403</v>
                                 </b>
                                 <b>
-                                    <a>7</a>
-                                    <b>14</b>
-                                    <v>3336</v>
+                                    <a>8</a>
+                                    <b>21</b>
+                                    <v>60890</v>
                                 </b>
                                 <b>
-                                    <a>14</a>
-                                    <b>6833</b>
-                                    <v>1827</v>
+                                    <a>21</a>
+                                    <b>3870</b>
+                                    <v>18031</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12592,15 +12920,15 @@
         </relation>
         <relation>
             <name>types</name>
-            <cardinality>18132</cardinality>
+            <cardinality>64230277</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>18132</v>
+                    <v>64230277</v>
                 </e>
                 <e>
                     <k>kind</k>
-                    <v>37</v>
+                    <v>68049</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -12614,7 +12942,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>18132</v>
+                                    <v>64230277</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12630,27 +12958,32 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>25</v>
+                                    <v>41876</v>
                                 </b>
                                 <b>
-                                    <a>10</a>
-                                    <b>30</b>
-                                    <v>3</v>
+                                    <a>12</a>
+                                    <b>25</b>
+                                    <v>5234</v>
+                                </b>
+                                <b>
+                                    <a>34</a>
+                                    <b>143</b>
+                                    <v>5234</v>
                                 </b>
                                 <b>
-                                    <a>247</a>
-                                    <b>431</b>
-                                    <v>3</v>
+                                    <a>158</a>
+                                    <b>413</b>
+                                    <v>5234</v>
                                 </b>
                                 <b>
-                                    <a>559</a>
-                                    <b>1904</b>
-                                    <v>3</v>
+                                    <a>938</a>
+                                    <b>4626</b>
+                                    <v>5234</v>
                                 </b>
                                 <b>
-                                    <a>2409</a>
-                                    <b>8011</b>
-                                    <v>3</v>
+                                    <a>4676</a>
+                                    <b>16593</b>
+                                    <v>5234</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12660,15 +12993,15 @@
         </relation>
         <relation>
             <name>type_of</name>
-            <cardinality>397965</cardinality>
+            <cardinality>8829217</cardinality>
             <columnsizes>
                 <e>
                     <k>expr</k>
-                    <v>397965</v>
+                    <v>8829217</v>
                 </e>
                 <e>
                     <k>tp</k>
-                    <v>8687</v>
+                    <v>26916</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -12682,7 +13015,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>397965</v>
+                                    <v>8829217</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12698,57 +13031,52 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2019</v>
+                                    <v>4744</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>967</v>
+                                    <v>5567</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>711</v>
+                                    <v>2154</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>388</v>
+                                    <v>2444</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>7</b>
-                                    <v>780</v>
+                                    <v>2420</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>10</b>
-                                    <v>772</v>
+                                    <v>2105</v>
                                 </b>
                                 <b>
                                     <a>10</a>
                                     <b>15</b>
-                                    <v>734</v>
+                                    <v>2033</v>
                                 </b>
                                 <b>
                                     <a>15</a>
-                                    <b>23</b>
-                                    <v>700</v>
-                                </b>
-                                <b>
-                                    <a>23</a>
-                                    <b>43</b>
-                                    <v>652</v>
+                                    <b>26</b>
+                                    <v>2105</v>
                                 </b>
                                 <b>
-                                    <a>43</a>
-                                    <b>143</b>
-                                    <v>652</v>
+                                    <a>26</a>
+                                    <b>90</b>
+                                    <v>2081</v>
                                 </b>
                                 <b>
-                                    <a>143</a>
-                                    <b>46949</b>
-                                    <v>312</v>
+                                    <a>90</a>
+                                    <b>331257</b>
+                                    <v>1258</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12758,15 +13086,15 @@
         </relation>
         <relation>
             <name>typename</name>
-            <cardinality>3567</cardinality>
+            <cardinality>13128374</cardinality>
             <columnsizes>
                 <e>
                     <k>tp</k>
-                    <v>3567</v>
+                    <v>13128374</v>
                 </e>
                 <e>
                     <k>name</k>
-                    <v>2983</v>
+                    <v>10010298</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -12780,7 +13108,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3567</v>
+                                    <v>13128374</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12796,17 +13124,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2660</v>
+                                    <v>8108394</v>
                                 </b>
                                 <b>
                                     <a>2</a>
-                                    <b>4</b>
-                                    <v>267</v>
+                                    <b>3</b>
+                                    <v>1210937</v>
                                 </b>
                                 <b>
-                                    <a>4</a>
-                                    <b>17</b>
-                                    <v>56</v>
+                                    <a>3</a>
+                                    <b>26</b>
+                                    <v>690967</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12816,15 +13144,15 @@
         </relation>
         <relation>
             <name>key_type</name>
-            <cardinality>430</cardinality>
+            <cardinality>866786</cardinality>
             <columnsizes>
                 <e>
                     <k>map</k>
-                    <v>430</v>
+                    <v>866786</v>
                 </e>
                 <e>
                     <k>tp</k>
-                    <v>149</v>
+                    <v>283451</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -12838,7 +13166,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>430</v>
+                                    <v>866786</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12854,27 +13182,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>106</v>
+                                    <v>201291</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>17</v>
+                                    <v>28755</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>6</b>
-                                    <v>12</v>
+                                    <v>24647</v>
                                 </b>
                                 <b>
-                                    <a>6</a>
+                                    <a>9</a>
                                     <b>13</b>
-                                    <v>12</v>
+                                    <v>24647</v>
                                 </b>
                                 <b>
-                                    <a>20</a>
-                                    <b>136</b>
-                                    <v>2</v>
+                                    <a>65</a>
+                                    <b>66</b>
+                                    <v>4107</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12884,15 +13212,15 @@
         </relation>
         <relation>
             <name>element_type</name>
-            <cardinality>1412</cardinality>
+            <cardinality>4132640</cardinality>
             <columnsizes>
                 <e>
                     <k>container</k>
-                    <v>1412</v>
+                    <v>4132640</v>
                 </e>
                 <e>
                     <k>tp</k>
-                    <v>916</v>
+                    <v>2382635</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -12906,7 +13234,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1412</v>
+                                    <v>4132640</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12922,17 +13250,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>773</v>
+                                    <v>2008808</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>94</v>
+                                    <v>250587</v>
                                 </b>
                                 <b>
                                     <a>3</a>
-                                    <b>68</b>
-                                    <v>49</v>
+                                    <b>78</b>
+                                    <v>123239</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12942,15 +13270,15 @@
         </relation>
         <relation>
             <name>base_type</name>
-            <cardinality>1903</cardinality>
+            <cardinality>8158995</cardinality>
             <columnsizes>
                 <e>
                     <k>ptr</k>
-                    <v>1903</v>
+                    <v>8158995</v>
                 </e>
                 <e>
                     <k>tp</k>
-                    <v>1903</v>
+                    <v>8158995</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -12964,7 +13292,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1903</v>
+                                    <v>8158995</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12980,7 +13308,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1903</v>
+                                    <v>8158995</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12990,15 +13318,15 @@
         </relation>
         <relation>
             <name>underlying_type</name>
-            <cardinality>3567</cardinality>
+            <cardinality>12852686</cardinality>
             <columnsizes>
                 <e>
                     <k>named</k>
-                    <v>3567</v>
+                    <v>12852686</v>
                 </e>
                 <e>
                     <k>tp</k>
-                    <v>2755</v>
+                    <v>9731120</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -13012,7 +13340,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3567</v>
+                                    <v>12852686</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13028,12 +13356,75 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2582</v>
+                                    <v>8959889</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>9</b>
+                                    <v>732843</v>
+                                </b>
+                                <b>
+                                    <a>9</a>
+                                    <b>252</b>
+                                    <v>38387</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+            </dependencies>
+        </relation>
+        <relation>
+            <name>alias_rhs</name>
+            <cardinality>660784</cardinality>
+            <columnsizes>
+                <e>
+                    <k>alias</k>
+                    <v>660784</v>
+                </e>
+                <e>
+                    <k>tp</k>
+                    <v>320067</v>
+                </e>
+            </columnsizes>
+            <dependencies>
+                <dep>
+                    <src>alias</src>
+                    <trg>tp</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>660784</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>tp</src>
+                    <trg>alias</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>284886</v>
                                 </b>
                                 <b>
                                     <a>2</a>
-                                    <b>154</b>
-                                    <v>173</v>
+                                    <b>4</b>
+                                    <v>28679</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>348</b>
+                                    <v>6500</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13043,23 +13434,23 @@
         </relation>
         <relation>
             <name>component_types</name>
-            <cardinality>36474</cardinality>
+            <cardinality>130391792</cardinality>
             <columnsizes>
                 <e>
                     <k>parent</k>
-                    <v>11221</v>
+                    <v>37395056</v>
                 </e>
                 <e>
                     <k>index</k>
-                    <v>74</v>
+                    <v>361503</v>
                 </e>
                 <e>
                     <k>name</k>
-                    <v>5540</v>
+                    <v>21435505</v>
                 </e>
                 <e>
                     <k>tp</k>
-                    <v>4295</v>
+                    <v>15006496</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -13073,37 +13464,37 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1198</v>
+                                    <v>4761163</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>3864</v>
+                                    <v>10956016</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>2953</v>
+                                    <v>9378547</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>1446</v>
+                                    <v>5356822</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>6</b>
-                                    <v>780</v>
+                                    <v>3076886</v>
                                 </b>
                                 <b>
                                     <a>6</a>
-                                    <b>13</b>
-                                    <v>860</v>
+                                    <b>11</b>
+                                    <v>2982402</v>
                                 </b>
                                 <b>
-                                    <a>13</a>
-                                    <b>65</b>
-                                    <v>120</v>
+                                    <a>11</a>
+                                    <b>80</b>
+                                    <v>883218</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13119,22 +13510,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>8936</v>
+                                    <v>29495386</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>733</v>
+                                    <v>2230639</v>
                                 </b>
                                 <b>
                                     <a>3</a>
-                                    <b>6</b>
-                                    <v>1008</v>
+                                    <b>5</b>
+                                    <v>2768787</v>
                                 </b>
                                 <b>
-                                    <a>6</a>
-                                    <b>64</b>
-                                    <v>544</v>
+                                    <a>5</a>
+                                    <b>39</b>
+                                    <v>2805758</v>
+                                </b>
+                                <b>
+                                    <a>39</a>
+                                    <b>80</b>
+                                    <v>94483</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13150,32 +13546,32 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2194</v>
+                                    <v>6646732</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>4537</v>
+                                    <v>13724803</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>2475</v>
+                                    <v>9657890</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>1110</v>
+                                    <v>4284636</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>12</b>
-                                    <v>848</v>
+                                    <v>2818082</v>
                                 </b>
                                 <b>
                                     <a>12</a>
-                                    <b>52</b>
-                                    <v>57</v>
+                                    <b>34</b>
+                                    <v>262911</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13191,62 +13587,62 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>15</v>
+                                    <v>65727</v>
                                 </b>
                                 <b>
                                     <a>2</a>
-                                    <b>4</b>
-                                    <v>6</v>
+                                    <b>3</b>
+                                    <v>32863</v>
                                 </b>
                                 <b>
-                                    <a>4</a>
-                                    <b>7</b>
-                                    <v>4</v>
+                                    <a>3</a>
+                                    <b>5</b>
+                                    <v>28755</v>
                                 </b>
                                 <b>
-                                    <a>8</a>
-                                    <b>13</b>
-                                    <v>6</v>
+                                    <a>5</a>
+                                    <b>11</b>
+                                    <v>28755</v>
                                 </b>
                                 <b>
-                                    <a>13</a>
-                                    <b>18</b>
-                                    <v>6</v>
+                                    <a>12</a>
+                                    <b>23</b>
+                                    <v>28755</v>
                                 </b>
                                 <b>
-                                    <a>18</a>
-                                    <b>28</b>
-                                    <v>6</v>
+                                    <a>23</a>
+                                    <b>31</b>
+                                    <v>28755</v>
                                 </b>
                                 <b>
-                                    <a>29</a>
-                                    <b>49</b>
-                                    <v>6</v>
+                                    <a>34</a>
+                                    <b>50</b>
+                                    <v>28755</v>
                                 </b>
                                 <b>
-                                    <a>52</a>
-                                    <b>82</b>
-                                    <v>6</v>
+                                    <a>51</a>
+                                    <b>75</b>
+                                    <v>28755</v>
                                 </b>
                                 <b>
-                                    <a>89</a>
-                                    <b>193</b>
-                                    <v>6</v>
+                                    <a>79</a>
+                                    <b>149</b>
+                                    <v>28755</v>
                                 </b>
                                 <b>
-                                    <a>232</a>
-                                    <b>824</b>
-                                    <v>6</v>
+                                    <a>169</a>
+                                    <b>511</b>
+                                    <v>28755</v>
                                 </b>
                                 <b>
-                                    <a>1505</a>
-                                    <b>6458</b>
-                                    <v>6</v>
+                                    <a>778</a>
+                                    <b>5506</b>
+                                    <v>28755</v>
                                 </b>
                                 <b>
-                                    <a>10274</a>
-                                    <b>10275</b>
-                                    <v>1</v>
+                                    <a>8121</a>
+                                    <b>8122</b>
+                                    <v>4107</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13262,52 +13658,52 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>22</v>
+                                    <v>94483</v>
                                 </b>
                                 <b>
                                     <a>2</a>
-                                    <b>6</b>
-                                    <v>6</v>
+                                    <b>3</b>
+                                    <v>32863</v>
                                 </b>
                                 <b>
-                                    <a>6</a>
-                                    <b>9</b>
-                                    <v>6</v>
+                                    <a>4</a>
+                                    <b>6</b>
+                                    <v>28755</v>
                                 </b>
                                 <b>
-                                    <a>9</a>
-                                    <b>16</b>
-                                    <v>4</v>
+                                    <a>6</a>
+                                    <b>14</b>
+                                    <v>32863</v>
                                 </b>
                                 <b>
-                                    <a>16</a>
-                                    <b>24</b>
-                                    <v>6</v>
+                                    <a>17</a>
+                                    <b>22</b>
+                                    <v>28755</v>
                                 </b>
                                 <b>
-                                    <a>24</a>
-                                    <b>37</b>
-                                    <v>6</v>
+                                    <a>22</a>
+                                    <b>34</b>
+                                    <v>28755</v>
                                 </b>
                                 <b>
-                                    <a>39</a>
-                                    <b>61</b>
-                                    <v>6</v>
+                                    <a>35</a>
+                                    <b>55</b>
+                                    <v>28755</v>
                                 </b>
                                 <b>
-                                    <a>69</a>
-                                    <b>116</b>
-                                    <v>6</v>
+                                    <a>58</a>
+                                    <b>102</b>
+                                    <v>28755</v>
                                 </b>
                                 <b>
-                                    <a>153</a>
-                                    <b>379</b>
-                                    <v>6</v>
+                                    <a>110</a>
+                                    <b>277</b>
+                                    <v>28755</v>
                                 </b>
                                 <b>
-                                    <a>475</a>
-                                    <b>1260</b>
-                                    <v>6</v>
+                                    <a>331</a>
+                                    <b>1018</b>
+                                    <v>28755</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13323,62 +13719,62 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>15</v>
+                                    <v>65727</v>
                                 </b>
                                 <b>
                                     <a>2</a>
-                                    <b>4</b>
-                                    <v>6</v>
+                                    <b>3</b>
+                                    <v>32863</v>
                                 </b>
                                 <b>
-                                    <a>4</a>
-                                    <b>7</b>
-                                    <v>6</v>
+                                    <a>3</a>
+                                    <b>5</b>
+                                    <v>32863</v>
                                 </b>
                                 <b>
-                                    <a>7</a>
-                                    <b>11</b>
-                                    <v>5</v>
+                                    <a>5</a>
+                                    <b>7</b>
+                                    <v>24647</v>
                                 </b>
                                 <b>
-                                    <a>11</a>
-                                    <b>14</b>
-                                    <v>5</v>
+                                    <a>9</a>
+                                    <b>15</b>
+                                    <v>28755</v>
                                 </b>
                                 <b>
                                     <a>15</a>
                                     <b>19</b>
-                                    <v>6</v>
+                                    <v>28755</v>
                                 </b>
                                 <b>
                                     <a>20</a>
-                                    <b>27</b>
-                                    <v>5</v>
+                                    <b>25</b>
+                                    <v>28755</v>
                                 </b>
                                 <b>
-                                    <a>29</a>
-                                    <b>44</b>
-                                    <v>6</v>
+                                    <a>25</a>
+                                    <b>37</b>
+                                    <v>28755</v>
                                 </b>
                                 <b>
-                                    <a>45</a>
-                                    <b>72</b>
-                                    <v>6</v>
+                                    <a>38</a>
+                                    <b>59</b>
+                                    <v>28755</v>
                                 </b>
                                 <b>
-                                    <a>86</a>
-                                    <b>161</b>
-                                    <v>6</v>
+                                    <a>67</a>
+                                    <b>149</b>
+                                    <v>28755</v>
                                 </b>
                                 <b>
-                                    <a>224</a>
-                                    <b>1436</b>
-                                    <v>6</v>
+                                    <a>179</a>
+                                    <b>1225</b>
+                                    <v>28755</v>
                                 </b>
                                 <b>
-                                    <a>1878</a>
-                                    <b>2153</b>
-                                    <v>2</v>
+                                    <a>1559</a>
+                                    <b>1560</b>
+                                    <v>4107</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13394,22 +13790,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3941</v>
+                                    <v>13843935</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>851</v>
+                                    <v>4633815</v>
                                 </b>
                                 <b>
                                     <a>3</a>
-                                    <b>6</b>
-                                    <v>484</v>
+                                    <b>5</b>
+                                    <v>1733572</v>
                                 </b>
                                 <b>
-                                    <a>6</a>
-                                    <b>8917</b>
-                                    <v>264</v>
+                                    <a>5</a>
+                                    <b>7182</b>
+                                    <v>1224181</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13425,22 +13821,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4284</v>
+                                    <v>16793473</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>737</v>
+                                    <v>2998834</v>
                                 </b>
                                 <b>
                                     <a>3</a>
-                                    <b>6</b>
-                                    <v>440</v>
+                                    <b>12</b>
+                                    <v>1618549</v>
                                 </b>
                                 <b>
-                                    <a>6</a>
-                                    <b>28</b>
-                                    <v>79</v>
+                                    <a>12</a>
+                                    <b>31</b>
+                                    <v>24647</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13456,22 +13852,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4599</v>
+                                    <v>18029979</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>518</v>
+                                    <v>2099184</v>
                                 </b>
                                 <b>
                                     <a>3</a>
-                                    <b>21</b>
-                                    <v>416</v>
-                                </b>
-                                <b>
-                                    <a>21</a>
-                                    <b>3014</b>
-                                    <v>7</v>
+                                    <b>2295</b>
+                                    <v>1306341</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13487,32 +13878,32 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2055</v>
+                                    <v>7665514</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>812</v>
+                                    <v>2748247</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>408</v>
+                                    <v>1207749</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>6</b>
-                                    <v>394</v>
+                                    <v>1277585</v>
                                 </b>
                                 <b>
                                     <a>6</a>
-                                    <b>11</b>
-                                    <v>342</v>
+                                    <b>12</b>
+                                    <v>1199533</v>
                                 </b>
                                 <b>
-                                    <a>11</a>
-                                    <b>2187</b>
-                                    <v>284</v>
+                                    <a>12</a>
+                                    <b>2060</b>
+                                    <v>907866</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13528,32 +13919,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2111</v>
+                                    <v>8893803</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>859</v>
+                                    <v>2863270</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>580</v>
+                                    <v>1409041</v>
                                 </b>
                                 <b>
                                     <a>4</a>
-                                    <b>5</b>
-                                    <v>352</v>
-                                </b>
-                                <b>
-                                    <a>5</a>
-                                    <b>10</b>
-                                    <v>328</v>
+                                    <b>6</b>
+                                    <v>1146129</v>
                                 </b>
                                 <b>
-                                    <a>10</a>
-                                    <b>51</b>
-                                    <v>65</v>
+                                    <a>6</a>
+                                    <b>68</b>
+                                    <v>694250</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13569,22 +13955,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2897</v>
+                                    <v>11165523</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>865</v>
+                                    <v>2193668</v>
                                 </b>
                                 <b>
                                     <a>3</a>
-                                    <b>5</b>
-                                    <v>343</v>
+                                    <b>6</b>
+                                    <v>1187209</v>
                                 </b>
                                 <b>
-                                    <a>5</a>
-                                    <b>738</b>
-                                    <v>190</v>
+                                    <a>6</a>
+                                    <b>719</b>
+                                    <v>460095</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13593,38 +13979,26 @@
             </dependencies>
         </relation>
         <relation>
-            <name>array_length</name>
-            <cardinality>293</cardinality>
+            <name>component_tags</name>
+            <cardinality>41038845</cardinality>
             <columnsizes>
                 <e>
-                    <k>tp</k>
-                    <v>293</v>
+                    <k>parent</k>
+                    <v>8035233</v>
                 </e>
                 <e>
-                    <k>len</k>
-                    <v>103</v>
+                    <k>index</k>
+                    <v>324531</v>
+                </e>
+                <e>
+                    <k>tag</k>
+                    <v>747654</v>
                 </e>
             </columnsizes>
             <dependencies>
                 <dep>
-                    <src>tp</src>
-                    <trg>len</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>293</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>len</src>
-                    <trg>tp</trg>
+                    <src>parent</src>
+                    <trg>index</trg>
                     <val>
                         <hist>
                             <budget>12</budget>
@@ -13632,56 +14006,50 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>62</v>
+                                    <v>936622</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>15</v>
+                                    <v>2033456</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>7</v>
+                                    <v>1425473</v>
                                 </b>
                                 <b>
                                     <a>4</a>
-                                    <b>7</b>
-                                    <v>8</v>
+                                    <b>5</b>
+                                    <v>1031106</v>
                                 </b>
                                 <b>
-                                    <a>7</a>
-                                    <b>15</b>
-                                    <v>7</v>
+                                    <a>5</a>
+                                    <b>6</b>
+                                    <v>640846</v>
                                 </b>
                                 <b>
-                                    <a>15</a>
-                                    <b>26</b>
-                                    <v>4</v>
+                                    <a>6</a>
+                                    <b>8</b>
+                                    <v>694250</v>
+                                </b>
+                                <b>
+                                    <a>8</a>
+                                    <b>12</b>
+                                    <v>681926</v>
+                                </b>
+                                <b>
+                                    <a>12</a>
+                                    <b>80</b>
+                                    <v>591550</v>
                                 </b>
                             </bs>
                         </hist>
                     </val>
                 </dep>
-            </dependencies>
-        </relation>
-        <relation>
-            <name>type_objects</name>
-            <cardinality>3567</cardinality>
-            <columnsizes>
-                <e>
-                    <k>tp</k>
-                    <v>3567</v>
-                </e>
-                <e>
-                    <k>object</k>
-                    <v>3567</v>
-                </e>
-            </columnsizes>
-            <dependencies>
                 <dep>
-                    <src>tp</src>
-                    <trg>object</trg>
+                    <src>parent</src>
+                    <trg>tag</trg>
                     <val>
                         <hist>
                             <budget>12</budget>
@@ -13689,15 +14057,20 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3567</v>
+                                    <v>7891453</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>36</b>
+                                    <v>143779</v>
                                 </b>
                             </bs>
                         </hist>
                     </val>
                 </dep>
                 <dep>
-                    <src>object</src>
-                    <trg>tp</trg>
+                    <src>index</src>
+                    <trg>parent</trg>
                     <val>
                         <hist>
                             <budget>12</budget>
@@ -13705,39 +14078,70 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3567</v>
+                                    <v>57511</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>32863</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>5</b>
+                                    <v>24647</v>
+                                </b>
+                                <b>
+                                    <a>6</a>
+                                    <b>11</b>
+                                    <v>24647</v>
+                                </b>
+                                <b>
+                                    <a>12</a>
+                                    <b>22</b>
+                                    <v>24647</v>
+                                </b>
+                                <b>
+                                    <a>22</a>
+                                    <b>25</b>
+                                    <v>24647</v>
+                                </b>
+                                <b>
+                                    <a>26</a>
+                                    <b>36</b>
+                                    <v>24647</v>
+                                </b>
+                                <b>
+                                    <a>39</a>
+                                    <b>55</b>
+                                    <v>24647</v>
+                                </b>
+                                <b>
+                                    <a>58</a>
+                                    <b>93</b>
+                                    <v>24647</v>
+                                </b>
+                                <b>
+                                    <a>105</a>
+                                    <b>220</b>
+                                    <v>24647</v>
+                                </b>
+                                <b>
+                                    <a>252</a>
+                                    <b>887</b>
+                                    <v>24647</v>
+                                </b>
+                                <b>
+                                    <a>1233</a>
+                                    <b>1957</b>
+                                    <v>12323</v>
                                 </b>
                             </bs>
                         </hist>
                     </val>
                 </dep>
-            </dependencies>
-        </relation>
-        <relation>
-            <name>packages</name>
-            <cardinality>346</cardinality>
-            <columnsizes>
-                <e>
-                    <k>id</k>
-                    <v>346</v>
-                </e>
-                <e>
-                    <k>name</k>
-                    <v>281</v>
-                </e>
-                <e>
-                    <k>path</k>
-                    <v>346</v>
-                </e>
-                <e>
-                    <k>scope</k>
-                    <v>346</v>
-                </e>
-            </columnsizes>
-            <dependencies>
                 <dep>
-                    <src>id</src>
-                    <trg>name</trg>
+                    <src>index</src>
+                    <trg>tag</trg>
                     <val>
                         <hist>
                             <budget>12</budget>
@@ -13745,15 +14149,35 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>346</v>
+                                    <v>180751</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>73943</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>7</b>
+                                    <v>24647</v>
+                                </b>
+                                <b>
+                                    <a>9</a>
+                                    <b>15</b>
+                                    <v>24647</v>
+                                </b>
+                                <b>
+                                    <a>15</a>
+                                    <b>29</b>
+                                    <v>20539</v>
                                 </b>
                             </bs>
                         </hist>
                     </val>
                 </dep>
                 <dep>
-                    <src>id</src>
-                    <trg>path</trg>
+                    <src>tag</src>
+                    <trg>parent</trg>
                     <val>
                         <hist>
                             <budget>12</budget>
@@ -13761,15 +14185,25 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>346</v>
+                                    <v>673710</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>4</b>
+                                    <v>61619</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>1931</b>
+                                    <v>12323</v>
                                 </b>
                             </bs>
                         </hist>
                     </val>
                 </dep>
                 <dep>
-                    <src>id</src>
-                    <trg>scope</trg>
+                    <src>tag</src>
+                    <trg>index</trg>
                     <val>
                         <hist>
                             <budget>12</budget>
@@ -13777,15 +14211,40 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>346</v>
+                                    <v>690142</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>80</b>
+                                    <v>57511</v>
                                 </b>
                             </bs>
                         </hist>
                     </val>
                 </dep>
+            </dependencies>
+        </relation>
+        <relation>
+            <name>interface_private_method_ids</name>
+            <cardinality>439555</cardinality>
+            <columnsizes>
+                <e>
+                    <k>interface</k>
+                    <v>156103</v>
+                </e>
+                <e>
+                    <k>index</k>
+                    <v>94483</v>
+                </e>
+                <e>
+                    <k>id</k>
+                    <v>386151</v>
+                </e>
+            </columnsizes>
+            <dependencies>
                 <dep>
-                    <src>name</src>
-                    <trg>id</trg>
+                    <src>interface</src>
+                    <trg>index</trg>
                     <val>
                         <hist>
                             <budget>12</budget>
@@ -13793,25 +14252,45 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>255</v>
+                                    <v>53403</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>23</v>
+                                    <v>53403</v>
                                 </b>
                                 <b>
                                     <a>3</a>
-                                    <b>40</b>
-                                    <v>3</v>
+                                    <b>4</b>
+                                    <v>12323</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>5</b>
+                                    <v>8215</v>
+                                </b>
+                                <b>
+                                    <a>5</a>
+                                    <b>6</b>
+                                    <v>12323</v>
+                                </b>
+                                <b>
+                                    <a>7</a>
+                                    <b>10</b>
+                                    <v>12323</v>
+                                </b>
+                                <b>
+                                    <a>12</a>
+                                    <b>13</b>
+                                    <v>4107</v>
                                 </b>
                             </bs>
                         </hist>
                     </val>
                 </dep>
                 <dep>
-                    <src>name</src>
-                    <trg>path</trg>
+                    <src>interface</src>
+                    <trg>id</trg>
                     <val>
                         <hist>
                             <budget>12</budget>
@@ -13819,25 +14298,45 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>255</v>
+                                    <v>53403</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>23</v>
+                                    <v>53403</v>
                                 </b>
                                 <b>
                                     <a>3</a>
-                                    <b>40</b>
-                                    <v>3</v>
+                                    <b>4</b>
+                                    <v>12323</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>5</b>
+                                    <v>8215</v>
+                                </b>
+                                <b>
+                                    <a>5</a>
+                                    <b>6</b>
+                                    <v>12323</v>
+                                </b>
+                                <b>
+                                    <a>7</a>
+                                    <b>10</b>
+                                    <v>12323</v>
+                                </b>
+                                <b>
+                                    <a>12</a>
+                                    <b>13</b>
+                                    <v>4107</v>
                                 </b>
                             </bs>
                         </hist>
                     </val>
                 </dep>
                 <dep>
-                    <src>name</src>
-                    <trg>scope</trg>
+                    <src>index</src>
+                    <trg>interface</trg>
                     <val>
                         <hist>
                             <budget>12</budget>
@@ -13845,24 +14344,39 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>255</v>
+                                    <v>24647</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>23</v>
+                                    <v>28755</v>
                                 </b>
                                 <b>
                                     <a>3</a>
-                                    <b>40</b>
-                                    <v>3</v>
+                                    <b>4</b>
+                                    <v>16431</v>
+                                </b>
+                                <b>
+                                    <a>5</a>
+                                    <b>10</b>
+                                    <v>8215</v>
+                                </b>
+                                <b>
+                                    <a>10</a>
+                                    <b>14</b>
+                                    <v>8215</v>
+                                </b>
+                                <b>
+                                    <a>18</a>
+                                    <b>21</b>
+                                    <v>8215</v>
                                 </b>
                             </bs>
                         </hist>
                     </val>
                 </dep>
                 <dep>
-                    <src>path</src>
+                    <src>index</src>
                     <trg>id</trg>
                     <val>
                         <hist>
@@ -13871,31 +14385,40 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>346</v>
+                                    <v>32863</v>
                                 </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>path</src>
-                    <trg>name</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
                                 <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>346</v>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>28755</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>8215</v>
+                                </b>
+                                <b>
+                                    <a>5</a>
+                                    <b>10</b>
+                                    <v>8215</v>
+                                </b>
+                                <b>
+                                    <a>10</a>
+                                    <b>14</b>
+                                    <v>8215</v>
+                                </b>
+                                <b>
+                                    <a>18</a>
+                                    <b>21</b>
+                                    <v>8215</v>
                                 </b>
                             </bs>
                         </hist>
                     </val>
                 </dep>
                 <dep>
-                    <src>path</src>
-                    <trg>scope</trg>
+                    <src>id</src>
+                    <trg>interface</trg>
                     <val>
                         <hist>
                             <budget>12</budget>
@@ -13903,15 +14426,25 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>346</v>
+                                    <v>345071</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>28755</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>12323</v>
                                 </b>
                             </bs>
                         </hist>
                     </val>
                 </dep>
                 <dep>
-                    <src>scope</src>
-                    <trg>id</trg>
+                    <src>id</src>
+                    <trg>index</trg>
                     <val>
                         <hist>
                             <budget>12</budget>
@@ -13919,15 +14452,36 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>346</v>
+                                    <v>361503</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>4</b>
+                                    <v>24647</v>
                                 </b>
                             </bs>
                         </hist>
                     </val>
                 </dep>
-                <dep>
-                    <src>scope</src>
-                    <trg>name</trg>
+            </dependencies>
+        </relation>
+        <relation>
+            <name>array_length</name>
+            <cardinality>1528173</cardinality>
+            <columnsizes>
+                <e>
+                    <k>tp</k>
+                    <v>1528173</v>
+                </e>
+                <e>
+                    <k>len</k>
+                    <v>488851</v>
+                </e>
+            </columnsizes>
+            <dependencies>
+                <dep>
+                    <src>tp</src>
+                    <trg>len</trg>
                     <val>
                         <hist>
                             <budget>12</budget>
@@ -13935,15 +14489,15 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>346</v>
+                                    <v>1528173</v>
                                 </b>
                             </bs>
                         </hist>
                     </val>
                 </dep>
                 <dep>
-                    <src>scope</src>
-                    <trg>path</trg>
+                    <src>len</src>
+                    <trg>tp</trg>
                     <val>
                         <hist>
                             <budget>12</budget>
@@ -13951,7 +14505,37 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>346</v>
+                                    <v>258803</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>90375</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>24647</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>5</b>
+                                    <v>24647</v>
+                                </b>
+                                <b>
+                                    <a>5</a>
+                                    <b>7</b>
+                                    <v>41079</v>
+                                </b>
+                                <b>
+                                    <a>8</a>
+                                    <b>15</b>
+                                    <v>36971</v>
+                                </b>
+                                <b>
+                                    <a>16</a>
+                                    <b>28</b>
+                                    <v>12323</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13960,30 +14544,78 @@
             </dependencies>
         </relation>
         <relation>
-            <name>modexprs</name>
-            <cardinality>9</cardinality>
+            <name>type_objects</name>
+            <cardinality>13128374</cardinality>
+            <columnsizes>
+                <e>
+                    <k>tp</k>
+                    <v>13128374</v>
+                </e>
+                <e>
+                    <k>object</k>
+                    <v>13128374</v>
+                </e>
+            </columnsizes>
+            <dependencies>
+                <dep>
+                    <src>tp</src>
+                    <trg>object</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>13128374</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>object</src>
+                    <trg>tp</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>13128374</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+            </dependencies>
+        </relation>
+        <relation>
+            <name>packages</name>
+            <cardinality>924779</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>9</v>
+                    <v>924779</v>
                 </e>
                 <e>
-                    <k>kind</k>
-                    <v>4</v>
+                    <k>name</k>
+                    <v>570571</v>
                 </e>
                 <e>
-                    <k>parent</k>
-                    <v>2</v>
+                    <k>path</k>
+                    <v>924779</v>
                 </e>
                 <e>
-                    <k>idx</k>
-                    <v>6</v>
+                    <k>scope</k>
+                    <v>924779</v>
                 </e>
             </columnsizes>
             <dependencies>
                 <dep>
                     <src>id</src>
-                    <trg>kind</trg>
+                    <trg>name</trg>
                     <val>
                         <hist>
                             <budget>12</budget>
@@ -13991,7 +14623,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>9</v>
+                                    <v>924779</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13999,7 +14631,7 @@
                 </dep>
                 <dep>
                     <src>id</src>
-                    <trg>parent</trg>
+                    <trg>path</trg>
                     <val>
                         <hist>
                             <budget>12</budget>
@@ -14007,7 +14639,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>9</v>
+                                    <v>924779</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14015,7 +14647,7 @@
                 </dep>
                 <dep>
                     <src>id</src>
-                    <trg>idx</trg>
+                    <trg>scope</trg>
                     <val>
                         <hist>
                             <budget>12</budget>
@@ -14023,14 +14655,14 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>9</v>
+                                    <v>924779</v>
                                 </b>
                             </bs>
                         </hist>
                     </val>
                 </dep>
                 <dep>
-                    <src>kind</src>
+                    <src>name</src>
                     <trg>id</trg>
                     <val>
                         <hist>
@@ -14039,20 +14671,25 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3</v>
+                                    <v>479838</v>
                                 </b>
                                 <b>
-                                    <a>6</a>
-                                    <b>7</b>
-                                    <v>1</v>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>57580</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>53</b>
+                                    <v>33152</v>
                                 </b>
                             </bs>
                         </hist>
                     </val>
                 </dep>
                 <dep>
-                    <src>kind</src>
-                    <trg>parent</trg>
+                    <src>name</src>
+                    <trg>path</trg>
                     <val>
                         <hist>
                             <budget>12</budget>
@@ -14060,20 +14697,25 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3</v>
+                                    <v>479838</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>1</v>
+                                    <v>57580</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>53</b>
+                                    <v>33152</v>
                                 </b>
                             </bs>
                         </hist>
                     </val>
                 </dep>
                 <dep>
-                    <src>kind</src>
-                    <trg>idx</trg>
+                    <src>name</src>
+                    <trg>scope</trg>
                     <val>
                         <hist>
                             <budget>12</budget>
@@ -14081,82 +14723,72 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3</v>
+                                    <v>479838</v>
                                 </b>
                                 <b>
-                                    <a>5</a>
-                                    <b>6</b>
-                                    <v>1</v>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>57580</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>53</b>
+                                    <v>33152</v>
                                 </b>
                             </bs>
                         </hist>
                     </val>
                 </dep>
                 <dep>
-                    <src>parent</src>
+                    <src>path</src>
                     <trg>id</trg>
                     <val>
                         <hist>
                             <budget>12</budget>
                             <bs>
                                 <b>
-                                    <a>3</a>
-                                    <b>4</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>6</a>
-                                    <b>7</b>
-                                    <v>1</v>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>924779</v>
                                 </b>
                             </bs>
                         </hist>
                     </val>
                 </dep>
                 <dep>
-                    <src>parent</src>
-                    <trg>kind</trg>
+                    <src>path</src>
+                    <trg>name</trg>
                     <val>
                         <hist>
                             <budget>12</budget>
                             <bs>
                                 <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>3</a>
-                                    <b>4</b>
-                                    <v>1</v>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>924779</v>
                                 </b>
                             </bs>
                         </hist>
                     </val>
                 </dep>
                 <dep>
-                    <src>parent</src>
-                    <trg>idx</trg>
+                    <src>path</src>
+                    <trg>scope</trg>
                     <val>
                         <hist>
                             <budget>12</budget>
                             <bs>
                                 <b>
-                                    <a>3</a>
-                                    <b>4</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>6</a>
-                                    <b>7</b>
-                                    <v>1</v>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>924779</v>
                                 </b>
                             </bs>
                         </hist>
                     </val>
                 </dep>
                 <dep>
-                    <src>idx</src>
+                    <src>scope</src>
                     <trg>id</trg>
                     <val>
                         <hist>
@@ -14165,20 +14797,15 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>3</v>
+                                    <v>924779</v>
                                 </b>
                             </bs>
                         </hist>
                     </val>
                 </dep>
                 <dep>
-                    <src>idx</src>
-                    <trg>kind</trg>
+                    <src>scope</src>
+                    <trg>name</trg>
                     <val>
                         <hist>
                             <budget>12</budget>
@@ -14186,20 +14813,15 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>2</v>
+                                    <v>924779</v>
                                 </b>
                             </bs>
                         </hist>
                     </val>
                 </dep>
                 <dep>
-                    <src>idx</src>
-                    <trg>parent</trg>
+                    <src>scope</src>
+                    <trg>path</trg>
                     <val>
                         <hist>
                             <budget>12</budget>
@@ -14207,12 +14829,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>3</v>
+                                    <v>924779</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14221,26 +14838,30 @@
             </dependencies>
         </relation>
         <relation>
-            <name>modtokens</name>
-            <cardinality>13</cardinality>
+            <name>modexprs</name>
+            <cardinality>259985</cardinality>
             <columnsizes>
                 <e>
-                    <k>token</k>
-                    <v>13</v>
+                    <k>id</k>
+                    <v>259985</v>
+                </e>
+                <e>
+                    <k>kind</k>
+                    <v>6979</v>
                 </e>
                 <e>
                     <k>parent</k>
-                    <v>7</v>
+                    <v>54090</v>
                 </e>
                 <e>
                     <k>idx</k>
-                    <v>2</v>
+                    <v>24428</v>
                 </e>
             </columnsizes>
             <dependencies>
                 <dep>
-                    <src>token</src>
-                    <trg>parent</trg>
+                    <src>id</src>
+                    <trg>kind</trg>
                     <val>
                         <hist>
                             <budget>12</budget>
@@ -14248,15 +14869,15 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>13</v>
+                                    <v>259985</v>
                                 </b>
                             </bs>
                         </hist>
                     </val>
                 </dep>
                 <dep>
-                    <src>token</src>
-                    <trg>idx</trg>
+                    <src>id</src>
+                    <trg>parent</trg>
                     <val>
                         <hist>
                             <budget>12</budget>
@@ -14264,15 +14885,15 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>13</v>
+                                    <v>259985</v>
                                 </b>
                             </bs>
                         </hist>
                     </val>
                 </dep>
                 <dep>
-                    <src>parent</src>
-                    <trg>token</trg>
+                    <src>id</src>
+                    <trg>idx</trg>
                     <val>
                         <hist>
                             <budget>12</budget>
@@ -14280,143 +14901,134 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>6</v>
+                                    <v>259985</v>
                                 </b>
                             </bs>
                         </hist>
                     </val>
                 </dep>
                 <dep>
-                    <src>parent</src>
-                    <trg>idx</trg>
+                    <src>kind</src>
+                    <trg>id</trg>
                     <val>
                         <hist>
                             <budget>12</budget>
                             <bs>
                                 <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>1</v>
+                                    <a>13</a>
+                                    <b>14</b>
+                                    <v>5234</v>
                                 </b>
                                 <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>6</v>
+                                    <a>110</a>
+                                    <b>111</b>
+                                    <v>1744</v>
                                 </b>
                             </bs>
                         </hist>
                     </val>
                 </dep>
                 <dep>
-                    <src>idx</src>
-                    <trg>token</trg>
+                    <src>kind</src>
+                    <trg>parent</trg>
                     <val>
                         <hist>
                             <budget>12</budget>
                             <bs>
                                 <b>
-                                    <a>6</a>
-                                    <b>7</b>
-                                    <v>1</v>
+                                    <a>12</a>
+                                    <b>13</b>
+                                    <v>1744</v>
                                 </b>
                                 <b>
-                                    <a>7</a>
-                                    <b>8</b>
-                                    <v>1</v>
+                                    <a>13</a>
+                                    <b>14</b>
+                                    <v>3489</v>
+                                </b>
+                                <b>
+                                    <a>31</a>
+                                    <b>32</b>
+                                    <v>1744</v>
                                 </b>
                             </bs>
                         </hist>
                     </val>
                 </dep>
                 <dep>
-                    <src>idx</src>
-                    <trg>parent</trg>
+                    <src>kind</src>
+                    <trg>idx</trg>
                     <val>
                         <hist>
                             <budget>12</budget>
                             <bs>
                                 <b>
-                                    <a>6</a>
-                                    <b>7</b>
-                                    <v>1</v>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>1744</v>
                                 </b>
                                 <b>
-                                    <a>7</a>
-                                    <b>8</b>
-                                    <v>1</v>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>1744</v>
+                                </b>
+                                <b>
+                                    <a>5</a>
+                                    <b>6</b>
+                                    <v>1744</v>
+                                </b>
+                                <b>
+                                    <a>13</a>
+                                    <b>14</b>
+                                    <v>1744</v>
                                 </b>
                             </bs>
                         </hist>
                     </val>
                 </dep>
-            </dependencies>
-        </relation>
-        <relation>
-            <name>errors</name>
-            <cardinality>0</cardinality>
-            <columnsizes>
-                <e>
-                    <k>id</k>
-                    <v>0</v>
-                </e>
-                <e>
-                    <k>kind</k>
-                    <v>0</v>
-                </e>
-                <e>
-                    <k>msg</k>
-                    <v>0</v>
-                </e>
-                <e>
-                    <k>rawpos</k>
-                    <v>0</v>
-                </e>
-                <e>
-                    <k>file</k>
-                    <v>0</v>
-                </e>
-                <e>
-                    <k>line</k>
-                    <v>0</v>
-                </e>
-                <e>
-                    <k>col</k>
-                    <v>0</v>
-                </e>
-                <e>
-                    <k>package</k>
-                    <v>0</v>
-                </e>
-                <e>
-                    <k>idx</k>
-                    <v>0</v>
-                </e>
-            </columnsizes>
-            <dependencies>
                 <dep>
-                    <src>id</src>
-                    <trg>kind</trg>
+                    <src>parent</src>
+                    <trg>id</trg>
                     <val>
                         <hist>
                             <budget>12</budget>
                             <bs>
                                 <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>1</v>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>8724</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>19193</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>5</b>
+                                    <v>6979</v>
+                                </b>
+                                <b>
+                                    <a>5</a>
+                                    <b>6</b>
+                                    <v>10469</v>
+                                </b>
+                                <b>
+                                    <a>11</a>
+                                    <b>12</b>
+                                    <v>5234</v>
+                                </b>
+                                <b>
+                                    <a>13</a>
+                                    <b>15</b>
+                                    <v>3489</v>
                                 </b>
                             </bs>
                         </hist>
                     </val>
                 </dep>
                 <dep>
-                    <src>id</src>
-                    <trg>msg</trg>
+                    <src>parent</src>
+                    <trg>kind</trg>
                     <val>
                         <hist>
                             <budget>12</budget>
@@ -14424,31 +15036,66 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1</v>
+                                    <v>10469</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>20938</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>22683</v>
                                 </b>
                             </bs>
                         </hist>
                     </val>
                 </dep>
                 <dep>
-                    <src>id</src>
-                    <trg>rawpos</trg>
+                    <src>parent</src>
+                    <trg>idx</trg>
                     <val>
                         <hist>
                             <budget>12</budget>
                             <bs>
                                 <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>1</v>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>8724</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>19193</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>5</b>
+                                    <v>6979</v>
+                                </b>
+                                <b>
+                                    <a>5</a>
+                                    <b>6</b>
+                                    <v>10469</v>
+                                </b>
+                                <b>
+                                    <a>11</a>
+                                    <b>12</b>
+                                    <v>5234</v>
+                                </b>
+                                <b>
+                                    <a>13</a>
+                                    <b>15</b>
+                                    <v>3489</v>
                                 </b>
                             </bs>
                         </hist>
                     </val>
                 </dep>
                 <dep>
-                    <src>id</src>
-                    <trg>file</trg>
+                    <src>idx</src>
+                    <trg>id</trg>
                     <val>
                         <hist>
                             <budget>12</budget>
@@ -14456,15 +15103,45 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1</v>
+                                    <v>1744</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>3489</v>
+                                </b>
+                                <b>
+                                    <a>5</a>
+                                    <b>6</b>
+                                    <v>10469</v>
+                                </b>
+                                <b>
+                                    <a>11</a>
+                                    <b>12</b>
+                                    <v>1744</v>
+                                </b>
+                                <b>
+                                    <a>15</a>
+                                    <b>16</b>
+                                    <v>1744</v>
+                                </b>
+                                <b>
+                                    <a>26</a>
+                                    <b>27</b>
+                                    <v>1744</v>
+                                </b>
+                                <b>
+                                    <a>31</a>
+                                    <b>32</b>
+                                    <v>3489</v>
                                 </b>
                             </bs>
                         </hist>
                     </val>
                 </dep>
                 <dep>
-                    <src>id</src>
-                    <trg>line</trg>
+                    <src>idx</src>
+                    <trg>kind</trg>
                     <val>
                         <hist>
                             <budget>12</budget>
@@ -14472,15 +15149,25 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1</v>
+                                    <v>13958</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>8724</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>1744</v>
                                 </b>
                             </bs>
                         </hist>
                     </val>
                 </dep>
                 <dep>
-                    <src>id</src>
-                    <trg>col</trg>
+                    <src>idx</src>
+                    <trg>parent</trg>
                     <val>
                         <hist>
                             <budget>12</budget>
@@ -14488,15 +15175,65 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1</v>
+                                    <v>1744</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>3489</v>
+                                </b>
+                                <b>
+                                    <a>5</a>
+                                    <b>6</b>
+                                    <v>10469</v>
+                                </b>
+                                <b>
+                                    <a>11</a>
+                                    <b>12</b>
+                                    <v>1744</v>
+                                </b>
+                                <b>
+                                    <a>15</a>
+                                    <b>16</b>
+                                    <v>1744</v>
+                                </b>
+                                <b>
+                                    <a>26</a>
+                                    <b>27</b>
+                                    <v>1744</v>
+                                </b>
+                                <b>
+                                    <a>31</a>
+                                    <b>32</b>
+                                    <v>3489</v>
                                 </b>
                             </bs>
                         </hist>
                     </val>
                 </dep>
+            </dependencies>
+        </relation>
+        <relation>
+            <name>modtokens</name>
+            <cardinality>410043</cardinality>
+            <columnsizes>
+                <e>
+                    <k>token</k>
+                    <v>164017</v>
+                </e>
+                <e>
+                    <k>parent</k>
+                    <v>214618</v>
+                </e>
+                <e>
+                    <k>idx</k>
+                    <v>5234</v>
+                </e>
+            </columnsizes>
+            <dependencies>
                 <dep>
-                    <src>id</src>
-                    <trg>package</trg>
+                    <src>token</src>
+                    <trg>parent</trg>
                     <val>
                         <hist>
                             <budget>12</budget>
@@ -14504,14 +15241,34 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1</v>
+                                    <v>76774</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>54090</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>5</b>
+                                    <v>13958</v>
+                                </b>
+                                <b>
+                                    <a>5</a>
+                                    <b>9</b>
+                                    <v>13958</v>
+                                </b>
+                                <b>
+                                    <a>15</a>
+                                    <b>19</b>
+                                    <v>5234</v>
                                 </b>
                             </bs>
                         </hist>
                     </val>
                 </dep>
                 <dep>
-                    <src>id</src>
+                    <src>token</src>
                     <trg>idx</trg>
                     <val>
                         <hist>
@@ -14520,664 +15277,3123 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1</v>
+                                    <v>162272</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>1744</v>
                                 </b>
                             </bs>
                         </hist>
                     </val>
                 </dep>
                 <dep>
-                    <src>kind</src>
-                    <trg>id</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs/>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>kind</src>
-                    <trg>msg</trg>
+                    <src>parent</src>
+                    <trg>token</trg>
                     <val>
                         <hist>
                             <budget>12</budget>
-                            <bs/>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>kind</src>
-                    <trg>rawpos</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs/>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>kind</src>
-                    <trg>file</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs/>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>kind</src>
-                    <trg>line</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs/>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>22683</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>188445</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>3489</v>
+                                </b>
+                            </bs>
                         </hist>
                     </val>
                 </dep>
                 <dep>
-                    <src>kind</src>
-                    <trg>col</trg>
+                    <src>parent</src>
+                    <trg>idx</trg>
                     <val>
                         <hist>
                             <budget>12</budget>
-                            <bs/>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>22683</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>188445</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>3489</v>
+                                </b>
+                            </bs>
                         </hist>
                     </val>
                 </dep>
                 <dep>
-                    <src>kind</src>
-                    <trg>package</trg>
+                    <src>idx</src>
+                    <trg>token</trg>
                     <val>
                         <hist>
                             <budget>12</budget>
-                            <bs/>
+                            <bs>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>1744</v>
+                                </b>
+                                <b>
+                                    <a>40</a>
+                                    <b>41</b>
+                                    <v>1744</v>
+                                </b>
+                                <b>
+                                    <a>53</a>
+                                    <b>54</b>
+                                    <v>1744</v>
+                                </b>
+                            </bs>
                         </hist>
                     </val>
                 </dep>
                 <dep>
-                    <src>kind</src>
-                    <trg>idx</trg>
+                    <src>idx</src>
+                    <trg>parent</trg>
                     <val>
                         <hist>
                             <budget>12</budget>
-                            <bs/>
+                            <bs>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>1744</v>
+                                </b>
+                                <b>
+                                    <a>110</a>
+                                    <b>111</b>
+                                    <v>1744</v>
+                                </b>
+                                <b>
+                                    <a>123</a>
+                                    <b>124</b>
+                                    <v>1744</v>
+                                </b>
+                            </bs>
                         </hist>
                     </val>
                 </dep>
+            </dependencies>
+        </relation>
+        <relation>
+            <name>errors</name>
+            <cardinality>232496</cardinality>
+            <columnsizes>
+                <e>
+                    <k>id</k>
+                    <v>232496</v>
+                </e>
+                <e>
+                    <k>kind</k>
+                    <v>642</v>
+                </e>
+                <e>
+                    <k>msg</k>
+                    <v>55713</v>
+                </e>
+                <e>
+                    <k>rawpos</k>
+                    <v>155997</v>
+                </e>
+                <e>
+                    <k>file</k>
+                    <v>56356</v>
+                </e>
+                <e>
+                    <k>line</k>
+                    <v>21856</v>
+                </e>
+                <e>
+                    <k>col</k>
+                    <v>10071</v>
+                </e>
+                <e>
+                    <k>package</k>
+                    <v>16928</v>
+                </e>
+                <e>
+                    <k>idx</k>
+                    <v>89355</v>
+                </e>
+            </columnsizes>
+            <dependencies>
                 <dep>
-                    <src>msg</src>
-                    <trg>id</trg>
+                    <src>id</src>
+                    <trg>kind</trg>
                     <val>
                         <hist>
                             <budget>12</budget>
-                            <bs/>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>232496</v>
+                                </b>
+                            </bs>
                         </hist>
                     </val>
                 </dep>
                 <dep>
-                    <src>msg</src>
-                    <trg>kind</trg>
+                    <src>id</src>
+                    <trg>msg</trg>
                     <val>
                         <hist>
                             <budget>12</budget>
-                            <bs/>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>232496</v>
+                                </b>
+                            </bs>
                         </hist>
                     </val>
                 </dep>
                 <dep>
-                    <src>msg</src>
+                    <src>id</src>
                     <trg>rawpos</trg>
                     <val>
                         <hist>
                             <budget>12</budget>
-                            <bs/>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>232496</v>
+                                </b>
+                            </bs>
                         </hist>
                     </val>
                 </dep>
                 <dep>
-                    <src>msg</src>
+                    <src>id</src>
                     <trg>file</trg>
                     <val>
                         <hist>
                             <budget>12</budget>
-                            <bs/>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>232496</v>
+                                </b>
+                            </bs>
                         </hist>
                     </val>
                 </dep>
                 <dep>
-                    <src>msg</src>
+                    <src>id</src>
                     <trg>line</trg>
                     <val>
                         <hist>
                             <budget>12</budget>
-                            <bs/>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>232496</v>
+                                </b>
+                            </bs>
                         </hist>
                     </val>
                 </dep>
                 <dep>
-                    <src>msg</src>
+                    <src>id</src>
                     <trg>col</trg>
                     <val>
                         <hist>
                             <budget>12</budget>
-                            <bs/>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>232496</v>
+                                </b>
+                            </bs>
                         </hist>
                     </val>
                 </dep>
                 <dep>
-                    <src>msg</src>
+                    <src>id</src>
                     <trg>package</trg>
                     <val>
                         <hist>
                             <budget>12</budget>
-                            <bs/>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>232496</v>
+                                </b>
+                            </bs>
                         </hist>
                     </val>
                 </dep>
                 <dep>
-                    <src>msg</src>
+                    <src>id</src>
                     <trg>idx</trg>
                     <val>
                         <hist>
                             <budget>12</budget>
-                            <bs/>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>232496</v>
+                                </b>
+                            </bs>
                         </hist>
                     </val>
                 </dep>
                 <dep>
-                    <src>rawpos</src>
+                    <src>kind</src>
                     <trg>id</trg>
                     <val>
                         <hist>
                             <budget>12</budget>
-                            <bs/>
+                            <bs>
+                                <b>
+                                    <a>16</a>
+                                    <b>17</b>
+                                    <v>214</v>
+                                </b>
+                                <b>
+                                    <a>45</a>
+                                    <b>46</b>
+                                    <v>214</v>
+                                </b>
+                                <b>
+                                    <a>1024</a>
+                                    <b>1025</b>
+                                    <v>214</v>
+                                </b>
+                            </bs>
                         </hist>
                     </val>
                 </dep>
                 <dep>
-                    <src>rawpos</src>
-                    <trg>kind</trg>
+                    <src>kind</src>
+                    <trg>msg</trg>
                     <val>
                         <hist>
                             <budget>12</budget>
-                            <bs/>
+                            <bs>
+                                <b>
+                                    <a>10</a>
+                                    <b>11</b>
+                                    <v>214</v>
+                                </b>
+                                <b>
+                                    <a>41</a>
+                                    <b>42</b>
+                                    <v>214</v>
+                                </b>
+                                <b>
+                                    <a>210</a>
+                                    <b>211</b>
+                                    <v>214</v>
+                                </b>
+                            </bs>
                         </hist>
                     </val>
                 </dep>
                 <dep>
-                    <src>rawpos</src>
-                    <trg>msg</trg>
+                    <src>kind</src>
+                    <trg>rawpos</trg>
                     <val>
                         <hist>
                             <budget>12</budget>
-                            <bs/>
-                        </hist>
-                    </val>
-                </dep>
+                            <bs>
+                                <b>
+                                    <a>9</a>
+                                    <b>10</b>
+                                    <v>214</v>
+                                </b>
+                                <b>
+                                    <a>39</a>
+                                    <b>40</b>
+                                    <v>214</v>
+                                </b>
+                                <b>
+                                    <a>680</a>
+                                    <b>681</b>
+                                    <v>214</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
                 <dep>
-                    <src>rawpos</src>
+                    <src>kind</src>
                     <trg>file</trg>
                     <val>
                         <hist>
                             <budget>12</budget>
-                            <bs/>
+                            <bs>
+                                <b>
+                                    <a>4</a>
+                                    <b>5</b>
+                                    <v>214</v>
+                                </b>
+                                <b>
+                                    <a>26</a>
+                                    <b>27</b>
+                                    <v>214</v>
+                                </b>
+                                <b>
+                                    <a>262</a>
+                                    <b>263</b>
+                                    <v>214</v>
+                                </b>
+                            </bs>
                         </hist>
                     </val>
                 </dep>
                 <dep>
-                    <src>rawpos</src>
+                    <src>kind</src>
                     <trg>line</trg>
                     <val>
                         <hist>
                             <budget>12</budget>
-                            <bs/>
+                            <bs>
+                                <b>
+                                    <a>6</a>
+                                    <b>7</b>
+                                    <v>214</v>
+                                </b>
+                                <b>
+                                    <a>16</a>
+                                    <b>17</b>
+                                    <v>214</v>
+                                </b>
+                                <b>
+                                    <a>102</a>
+                                    <b>103</b>
+                                    <v>214</v>
+                                </b>
+                            </bs>
                         </hist>
                     </val>
                 </dep>
                 <dep>
-                    <src>rawpos</src>
+                    <src>kind</src>
                     <trg>col</trg>
                     <val>
                         <hist>
                             <budget>12</budget>
-                            <bs/>
+                            <bs>
+                                <b>
+                                    <a>6</a>
+                                    <b>7</b>
+                                    <v>214</v>
+                                </b>
+                                <b>
+                                    <a>8</a>
+                                    <b>9</b>
+                                    <v>214</v>
+                                </b>
+                                <b>
+                                    <a>42</a>
+                                    <b>43</b>
+                                    <v>214</v>
+                                </b>
+                            </bs>
                         </hist>
                     </val>
                 </dep>
                 <dep>
-                    <src>rawpos</src>
+                    <src>kind</src>
                     <trg>package</trg>
                     <val>
                         <hist>
                             <budget>12</budget>
-                            <bs/>
+                            <bs>
+                                <b>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>214</v>
+                                </b>
+                                <b>
+                                    <a>36</a>
+                                    <b>37</b>
+                                    <v>214</v>
+                                </b>
+                                <b>
+                                    <a>45</a>
+                                    <b>46</b>
+                                    <v>214</v>
+                                </b>
+                            </bs>
                         </hist>
                     </val>
                 </dep>
                 <dep>
-                    <src>rawpos</src>
+                    <src>kind</src>
                     <trg>idx</trg>
                     <val>
                         <hist>
                             <budget>12</budget>
-                            <bs/>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>214</v>
+                                </b>
+                                <b>
+                                    <a>13</a>
+                                    <b>14</b>
+                                    <v>214</v>
+                                </b>
+                                <b>
+                                    <a>417</a>
+                                    <b>418</b>
+                                    <v>214</v>
+                                </b>
+                            </bs>
                         </hist>
                     </val>
                 </dep>
                 <dep>
-                    <src>file</src>
+                    <src>msg</src>
                     <trg>id</trg>
                     <val>
                         <hist>
                             <budget>12</budget>
-                            <bs/>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>30856</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>8357</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>6428</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>7</b>
+                                    <v>4928</v>
+                                </b>
+                                <b>
+                                    <a>7</a>
+                                    <b>17</b>
+                                    <v>4285</v>
+                                </b>
+                                <b>
+                                    <a>20</a>
+                                    <b>214</b>
+                                    <v>857</v>
+                                </b>
+                            </bs>
                         </hist>
                     </val>
                 </dep>
                 <dep>
-                    <src>file</src>
+                    <src>msg</src>
                     <trg>kind</trg>
                     <val>
                         <hist>
                             <budget>12</budget>
-                            <bs/>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>55499</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>214</v>
+                                </b>
+                            </bs>
                         </hist>
                     </val>
                 </dep>
                 <dep>
-                    <src>file</src>
-                    <trg>msg</trg>
+                    <src>msg</src>
+                    <trg>rawpos</trg>
                     <val>
                         <hist>
                             <budget>12</budget>
-                            <bs/>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>38142</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>6428</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>4071</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>8</b>
+                                    <v>4499</v>
+                                </b>
+                                <b>
+                                    <a>8</a>
+                                    <b>214</b>
+                                    <v>2571</v>
+                                </b>
+                            </bs>
                         </hist>
                     </val>
                 </dep>
                 <dep>
-                    <src>file</src>
-                    <trg>rawpos</trg>
+                    <src>msg</src>
+                    <trg>file</trg>
                     <val>
                         <hist>
                             <budget>12</budget>
-                            <bs/>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>39642</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>6857</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>5</b>
+                                    <v>4499</v>
+                                </b>
+                                <b>
+                                    <a>5</a>
+                                    <b>17</b>
+                                    <v>4285</v>
+                                </b>
+                                <b>
+                                    <a>20</a>
+                                    <b>214</b>
+                                    <v>428</v>
+                                </b>
+                            </bs>
                         </hist>
                     </val>
                 </dep>
                 <dep>
-                    <src>file</src>
+                    <src>msg</src>
                     <trg>line</trg>
                     <val>
                         <hist>
                             <budget>12</budget>
-                            <bs/>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>42213</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>5999</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>5</b>
+                                    <v>4285</v>
+                                </b>
+                                <b>
+                                    <a>5</a>
+                                    <b>52</b>
+                                    <v>3214</v>
+                                </b>
+                            </bs>
                         </hist>
                     </val>
                 </dep>
                 <dep>
-                    <src>file</src>
+                    <src>msg</src>
                     <trg>col</trg>
                     <val>
                         <hist>
                             <budget>12</budget>
-                            <bs/>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>51856</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>5</b>
+                                    <v>3857</v>
+                                </b>
+                            </bs>
                         </hist>
                     </val>
                 </dep>
                 <dep>
-                    <src>file</src>
+                    <src>msg</src>
                     <trg>package</trg>
                     <val>
                         <hist>
                             <budget>12</budget>
-                            <bs/>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>49499</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>5</b>
+                                    <v>4714</v>
+                                </b>
+                                <b>
+                                    <a>5</a>
+                                    <b>10</b>
+                                    <v>1499</v>
+                                </b>
+                            </bs>
                         </hist>
                     </val>
                 </dep>
                 <dep>
-                    <src>file</src>
+                    <src>msg</src>
                     <trg>idx</trg>
                     <val>
                         <hist>
                             <budget>12</budget>
-                            <bs/>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>line</src>
-                    <trg>id</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs/>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>line</src>
-                    <trg>kind</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs/>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>33213</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>7928</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>5999</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>8</b>
+                                    <v>4285</v>
+                                </b>
+                                <b>
+                                    <a>8</a>
+                                    <b>163</b>
+                                    <v>4285</v>
+                                </b>
+                            </bs>
                         </hist>
                     </val>
                 </dep>
                 <dep>
-                    <src>line</src>
-                    <trg>msg</trg>
+                    <src>rawpos</src>
+                    <trg>id</trg>
                     <val>
                         <hist>
                             <budget>12</budget>
-                            <bs/>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>146355</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>93</b>
+                                    <v>9642</v>
+                                </b>
+                            </bs>
                         </hist>
                     </val>
                 </dep>
                 <dep>
-                    <src>line</src>
-                    <trg>rawpos</trg>
+                    <src>rawpos</src>
+                    <trg>kind</trg>
                     <val>
                         <hist>
                             <budget>12</budget>
-                            <bs/>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>155997</v>
+                                </b>
+                            </bs>
                         </hist>
                     </val>
                 </dep>
                 <dep>
-                    <src>line</src>
-                    <trg>file</trg>
+                    <src>rawpos</src>
+                    <trg>msg</trg>
                     <val>
                         <hist>
                             <budget>12</budget>
-                            <bs/>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>155354</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>8</b>
+                                    <v>642</v>
+                                </b>
+                            </bs>
                         </hist>
                     </val>
                 </dep>
                 <dep>
-                    <src>line</src>
-                    <trg>col</trg>
+                    <src>rawpos</src>
+                    <trg>file</trg>
                     <val>
                         <hist>
                             <budget>12</budget>
-                            <bs/>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>155997</v>
+                                </b>
+                            </bs>
                         </hist>
                     </val>
                 </dep>
                 <dep>
-                    <src>line</src>
-                    <trg>package</trg>
+                    <src>rawpos</src>
+                    <trg>line</trg>
                     <val>
                         <hist>
                             <budget>12</budget>
-                            <bs/>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>155997</v>
+                                </b>
+                            </bs>
                         </hist>
                     </val>
                 </dep>
                 <dep>
-                    <src>line</src>
-                    <trg>idx</trg>
+                    <src>rawpos</src>
+                    <trg>col</trg>
                     <val>
                         <hist>
                             <budget>12</budget>
-                            <bs/>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>155997</v>
+                                </b>
+                            </bs>
                         </hist>
                     </val>
                 </dep>
                 <dep>
-                    <src>col</src>
-                    <trg>id</trg>
+                    <src>rawpos</src>
+                    <trg>package</trg>
                     <val>
                         <hist>
                             <budget>12</budget>
-                            <bs/>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>155783</v>
+                                </b>
+                                <b>
+                                    <a>7</a>
+                                    <b>8</b>
+                                    <v>214</v>
+                                </b>
+                            </bs>
                         </hist>
                     </val>
                 </dep>
                 <dep>
-                    <src>col</src>
-                    <trg>kind</trg>
+                    <src>rawpos</src>
+                    <trg>idx</trg>
                     <val>
                         <hist>
                             <budget>12</budget>
-                            <bs/>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>146569</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>93</b>
+                                    <v>9428</v>
+                                </b>
+                            </bs>
                         </hist>
                     </val>
                 </dep>
                 <dep>
-                    <src>col</src>
-                    <trg>msg</trg>
+                    <src>file</src>
+                    <trg>id</trg>
                     <val>
                         <hist>
                             <budget>12</budget>
-                            <bs/>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>26999</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>8142</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>5785</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>6</b>
+                                    <v>4928</v>
+                                </b>
+                                <b>
+                                    <a>6</a>
+                                    <b>11</b>
+                                    <v>4928</v>
+                                </b>
+                                <b>
+                                    <a>11</a>
+                                    <b>19</b>
+                                    <v>4285</v>
+                                </b>
+                                <b>
+                                    <a>19</a>
+                                    <b>93</b>
+                                    <v>1285</v>
+                                </b>
+                            </bs>
                         </hist>
                     </val>
                 </dep>
                 <dep>
-                    <src>col</src>
-                    <trg>rawpos</trg>
+                    <src>file</src>
+                    <trg>kind</trg>
                     <val>
                         <hist>
                             <budget>12</budget>
-                            <bs/>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>50570</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>5357</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>428</v>
+                                </b>
+                            </bs>
                         </hist>
                     </val>
                 </dep>
                 <dep>
-                    <src>col</src>
-                    <trg>file</trg>
+                    <src>file</src>
+                    <trg>msg</trg>
                     <val>
                         <hist>
                             <budget>12</budget>
-                            <bs/>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>28071</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>9856</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>7071</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>6</b>
+                                    <v>4499</v>
+                                </b>
+                                <b>
+                                    <a>6</a>
+                                    <b>11</b>
+                                    <v>5142</v>
+                                </b>
+                                <b>
+                                    <a>11</a>
+                                    <b>17</b>
+                                    <v>1714</v>
+                                </b>
+                            </bs>
                         </hist>
                     </val>
                 </dep>
                 <dep>
-                    <src>col</src>
-                    <trg>line</trg>
+                    <src>file</src>
+                    <trg>rawpos</trg>
                     <val>
                         <hist>
                             <budget>12</budget>
-                            <bs/>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>28071</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>10071</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>6642</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>6</b>
+                                    <v>4071</v>
+                                </b>
+                                <b>
+                                    <a>6</a>
+                                    <b>11</b>
+                                    <v>4928</v>
+                                </b>
+                                <b>
+                                    <a>11</a>
+                                    <b>18</b>
+                                    <v>2571</v>
+                                </b>
+                            </bs>
                         </hist>
                     </val>
                 </dep>
                 <dep>
-                    <src>col</src>
-                    <trg>package</trg>
+                    <src>file</src>
+                    <trg>line</trg>
                     <val>
                         <hist>
                             <budget>12</budget>
-                            <bs/>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>col</src>
-                    <trg>idx</trg>
-                    <val>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>29999</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>9214</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>5999</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>6</b>
+                                    <v>5142</v>
+                                </b>
+                                <b>
+                                    <a>6</a>
+                                    <b>12</b>
+                                    <v>5142</v>
+                                </b>
+                                <b>
+                                    <a>12</a>
+                                    <b>16</b>
+                                    <v>857</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>file</src>
+                    <trg>col</trg>
+                    <val>
                         <hist>
                             <budget>12</budget>
-                            <bs/>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>43499</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>5785</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>5</b>
+                                    <v>5142</v>
+                                </b>
+                                <b>
+                                    <a>5</a>
+                                    <b>9</b>
+                                    <v>1928</v>
+                                </b>
+                            </bs>
                         </hist>
                     </val>
                 </dep>
                 <dep>
-                    <src>package</src>
+                    <src>file</src>
+                    <trg>package</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>50999</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>4</b>
+                                    <v>4285</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>9</b>
+                                    <v>1071</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>file</src>
+                    <trg>idx</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>28285</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>7499</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>5785</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>5</b>
+                                    <v>2571</v>
+                                </b>
+                                <b>
+                                    <a>5</a>
+                                    <b>8</b>
+                                    <v>4499</v>
+                                </b>
+                                <b>
+                                    <a>8</a>
+                                    <b>13</b>
+                                    <v>4499</v>
+                                </b>
+                                <b>
+                                    <a>13</a>
+                                    <b>93</b>
+                                    <v>3214</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>line</src>
                     <trg>id</trg>
                     <val>
                         <hist>
                             <budget>12</budget>
-                            <bs/>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>6642</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>3642</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>1499</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>5</b>
+                                    <v>1071</v>
+                                </b>
+                                <b>
+                                    <a>5</a>
+                                    <b>6</b>
+                                    <v>1071</v>
+                                </b>
+                                <b>
+                                    <a>6</a>
+                                    <b>7</b>
+                                    <v>2142</v>
+                                </b>
+                                <b>
+                                    <a>7</a>
+                                    <b>13</b>
+                                    <v>1714</v>
+                                </b>
+                                <b>
+                                    <a>14</a>
+                                    <b>31</b>
+                                    <v>1714</v>
+                                </b>
+                                <b>
+                                    <a>31</a>
+                                    <b>50</b>
+                                    <v>1714</v>
+                                </b>
+                                <b>
+                                    <a>53</a>
+                                    <b>208</b>
+                                    <v>642</v>
+                                </b>
+                            </bs>
                         </hist>
                     </val>
                 </dep>
                 <dep>
-                    <src>package</src>
+                    <src>line</src>
                     <trg>kind</trg>
                     <val>
                         <hist>
                             <budget>12</budget>
-                            <bs/>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>17999</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>2999</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>857</v>
+                                </b>
+                            </bs>
                         </hist>
                     </val>
                 </dep>
                 <dep>
-                    <src>package</src>
+                    <src>line</src>
                     <trg>msg</trg>
                     <val>
                         <hist>
                             <budget>12</budget>
-                            <bs/>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>7714</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>3214</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>2571</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>5</b>
+                                    <v>1928</v>
+                                </b>
+                                <b>
+                                    <a>5</a>
+                                    <b>6</b>
+                                    <v>1499</v>
+                                </b>
+                                <b>
+                                    <a>6</a>
+                                    <b>10</b>
+                                    <v>1714</v>
+                                </b>
+                                <b>
+                                    <a>10</a>
+                                    <b>16</b>
+                                    <v>1714</v>
+                                </b>
+                                <b>
+                                    <a>16</a>
+                                    <b>23</b>
+                                    <v>1499</v>
+                                </b>
+                            </bs>
                         </hist>
                     </val>
                 </dep>
                 <dep>
-                    <src>package</src>
+                    <src>line</src>
                     <trg>rawpos</trg>
                     <val>
                         <hist>
                             <budget>12</budget>
-                            <bs/>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>6857</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>3642</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>2142</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>5</b>
+                                    <v>1285</v>
+                                </b>
+                                <b>
+                                    <a>5</a>
+                                    <b>6</b>
+                                    <v>1499</v>
+                                </b>
+                                <b>
+                                    <a>6</a>
+                                    <b>7</b>
+                                    <v>1714</v>
+                                </b>
+                                <b>
+                                    <a>7</a>
+                                    <b>19</b>
+                                    <v>1928</v>
+                                </b>
+                                <b>
+                                    <a>20</a>
+                                    <b>32</b>
+                                    <v>1714</v>
+                                </b>
+                                <b>
+                                    <a>32</a>
+                                    <b>87</b>
+                                    <v>1071</v>
+                                </b>
+                            </bs>
                         </hist>
                     </val>
                 </dep>
                 <dep>
-                    <src>package</src>
+                    <src>line</src>
                     <trg>file</trg>
                     <val>
                         <hist>
                             <budget>12</budget>
-                            <bs/>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>7071</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>4071</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>1928</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>5</b>
+                                    <v>1714</v>
+                                </b>
+                                <b>
+                                    <a>5</a>
+                                    <b>6</b>
+                                    <v>857</v>
+                                </b>
+                                <b>
+                                    <a>6</a>
+                                    <b>7</b>
+                                    <v>1928</v>
+                                </b>
+                                <b>
+                                    <a>7</a>
+                                    <b>18</b>
+                                    <v>1499</v>
+                                </b>
+                                <b>
+                                    <a>18</a>
+                                    <b>27</b>
+                                    <v>1714</v>
+                                </b>
+                                <b>
+                                    <a>29</a>
+                                    <b>86</b>
+                                    <v>1071</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>line</src>
+                    <trg>col</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>10499</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>3857</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>2571</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>5</b>
+                                    <v>2785</v>
+                                </b>
+                                <b>
+                                    <a>5</a>
+                                    <b>9</b>
+                                    <v>1928</v>
+                                </b>
+                                <b>
+                                    <a>10</a>
+                                    <b>11</b>
+                                    <v>214</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>line</src>
+                    <trg>package</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>8142</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>5571</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>2571</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>6</b>
+                                    <v>1714</v>
+                                </b>
+                                <b>
+                                    <a>7</a>
+                                    <b>10</b>
+                                    <v>1928</v>
+                                </b>
+                                <b>
+                                    <a>10</a>
+                                    <b>19</b>
+                                    <v>1714</v>
+                                </b>
+                                <b>
+                                    <a>21</a>
+                                    <b>22</b>
+                                    <v>214</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>line</src>
+                    <trg>idx</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>7071</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>3642</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>1714</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>6</b>
+                                    <v>1928</v>
+                                </b>
+                                <b>
+                                    <a>6</a>
+                                    <b>7</b>
+                                    <v>2142</v>
+                                </b>
+                                <b>
+                                    <a>7</a>
+                                    <b>14</b>
+                                    <v>1714</v>
+                                </b>
+                                <b>
+                                    <a>15</a>
+                                    <b>30</b>
+                                    <v>1714</v>
+                                </b>
+                                <b>
+                                    <a>30</a>
+                                    <b>77</b>
+                                    <v>1714</v>
+                                </b>
+                                <b>
+                                    <a>187</a>
+                                    <b>188</b>
+                                    <v>214</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>col</src>
+                    <trg>id</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>3428</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>2142</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>1071</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>7</b>
+                                    <v>642</v>
+                                </b>
+                                <b>
+                                    <a>7</a>
+                                    <b>10</b>
+                                    <v>857</v>
+                                </b>
+                                <b>
+                                    <a>10</a>
+                                    <b>14</b>
+                                    <v>642</v>
+                                </b>
+                                <b>
+                                    <a>17</a>
+                                    <b>24</b>
+                                    <v>857</v>
+                                </b>
+                                <b>
+                                    <a>107</a>
+                                    <b>768</b>
+                                    <v>428</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>col</src>
+                    <trg>kind</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>8142</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>1928</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>col</src>
+                    <trg>msg</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>4499</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>2357</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>6</b>
+                                    <v>857</v>
+                                </b>
+                                <b>
+                                    <a>6</a>
+                                    <b>9</b>
+                                    <v>857</v>
+                                </b>
+                                <b>
+                                    <a>9</a>
+                                    <b>12</b>
+                                    <v>642</v>
+                                </b>
+                                <b>
+                                    <a>13</a>
+                                    <b>84</b>
+                                    <v>857</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>col</src>
+                    <trg>rawpos</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>3428</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>2571</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>1071</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>8</b>
+                                    <v>857</v>
+                                </b>
+                                <b>
+                                    <a>8</a>
+                                    <b>14</b>
+                                    <v>857</v>
+                                </b>
+                                <b>
+                                    <a>17</a>
+                                    <b>22</b>
+                                    <v>857</v>
+                                </b>
+                                <b>
+                                    <a>100</a>
+                                    <b>436</b>
+                                    <v>428</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>col</src>
+                    <trg>file</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>4714</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>2357</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>7</b>
+                                    <v>857</v>
+                                </b>
+                                <b>
+                                    <a>7</a>
+                                    <b>8</b>
+                                    <v>428</v>
+                                </b>
+                                <b>
+                                    <a>9</a>
+                                    <b>11</b>
+                                    <v>857</v>
+                                </b>
+                                <b>
+                                    <a>15</a>
+                                    <b>223</b>
+                                    <v>857</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>col</src>
+                    <trg>line</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>4285</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>2357</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>857</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>7</b>
+                                    <v>857</v>
+                                </b>
+                                <b>
+                                    <a>7</a>
+                                    <b>12</b>
+                                    <v>642</v>
+                                </b>
+                                <b>
+                                    <a>13</a>
+                                    <b>19</b>
+                                    <v>857</v>
+                                </b>
+                                <b>
+                                    <a>80</a>
+                                    <b>81</b>
+                                    <v>214</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>col</src>
+                    <trg>package</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>5785</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>2142</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>5</b>
+                                    <v>857</v>
+                                </b>
+                                <b>
+                                    <a>8</a>
+                                    <b>13</b>
+                                    <v>857</v>
+                                </b>
+                                <b>
+                                    <a>14</a>
+                                    <b>45</b>
+                                    <v>428</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>col</src>
+                    <trg>idx</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>3642</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>2142</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>1071</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>7</b>
+                                    <v>642</v>
+                                </b>
+                                <b>
+                                    <a>7</a>
+                                    <b>9</b>
+                                    <v>857</v>
+                                </b>
+                                <b>
+                                    <a>9</a>
+                                    <b>14</b>
+                                    <v>857</v>
+                                </b>
+                                <b>
+                                    <a>17</a>
+                                    <b>358</b>
+                                    <v>857</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>package</src>
+                    <trg>id</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>11571</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>1285</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>5</b>
+                                    <v>1285</v>
+                                </b>
+                                <b>
+                                    <a>5</a>
+                                    <b>10</b>
+                                    <v>1285</v>
+                                </b>
+                                <b>
+                                    <a>15</a>
+                                    <b>204</b>
+                                    <v>1285</v>
+                                </b>
+                                <b>
+                                    <a>417</a>
+                                    <b>418</b>
+                                    <v>214</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>package</src>
+                    <trg>kind</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>16285</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>4</b>
+                                    <v>642</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>package</src>
+                    <trg>msg</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>11571</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>1714</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>1285</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>15</b>
+                                    <v>1499</v>
+                                </b>
+                                <b>
+                                    <a>25</a>
+                                    <b>71</b>
+                                    <v>857</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>package</src>
+                    <trg>rawpos</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>11571</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>1285</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>1285</v>
+                                </b>
+                                <b>
+                                    <a>5</a>
+                                    <b>10</b>
+                                    <v>1285</v>
+                                </b>
+                                <b>
+                                    <a>15</a>
+                                    <b>128</b>
+                                    <v>1285</v>
+                                </b>
+                                <b>
+                                    <a>258</a>
+                                    <b>259</b>
+                                    <v>214</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>package</src>
+                    <trg>file</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>14356</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>4</b>
+                                    <v>1285</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>95</b>
+                                    <v>1285</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>package</src>
+                    <trg>line</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>11785</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>1285</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>5</b>
+                                    <v>1285</v>
+                                </b>
+                                <b>
+                                    <a>5</a>
+                                    <b>15</b>
+                                    <v>1285</v>
+                                </b>
+                                <b>
+                                    <a>15</a>
+                                    <b>68</b>
+                                    <v>1285</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>package</src>
+                    <trg>col</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>14142</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>5</b>
+                                    <v>1285</v>
+                                </b>
+                                <b>
+                                    <a>5</a>
+                                    <b>23</b>
+                                    <v>1285</v>
+                                </b>
+                                <b>
+                                    <a>23</a>
+                                    <b>24</b>
+                                    <v>214</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>package</src>
+                    <trg>idx</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>11571</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>1285</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>5</b>
+                                    <v>1285</v>
+                                </b>
+                                <b>
+                                    <a>5</a>
+                                    <b>10</b>
+                                    <v>1285</v>
+                                </b>
+                                <b>
+                                    <a>15</a>
+                                    <b>204</b>
+                                    <v>1285</v>
+                                </b>
+                                <b>
+                                    <a>417</a>
+                                    <b>418</b>
+                                    <v>214</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>idx</src>
+                    <trg>id</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>45856</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>9642</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>8357</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>5</b>
+                                    <v>18428</v>
+                                </b>
+                                <b>
+                                    <a>5</a>
+                                    <b>26</b>
+                                    <v>6857</v>
+                                </b>
+                                <b>
+                                    <a>79</a>
+                                    <b>80</b>
+                                    <v>214</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>idx</src>
+                    <trg>kind</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>86570</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>4</b>
+                                    <v>2785</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>idx</src>
+                    <trg>msg</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>45856</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>11999</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>14356</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>5</b>
+                                    <v>14785</v>
+                                </b>
+                                <b>
+                                    <a>5</a>
+                                    <b>60</b>
+                                    <v>2357</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>idx</src>
+                    <trg>rawpos</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>45856</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>9642</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>8357</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>5</b>
+                                    <v>18428</v>
+                                </b>
+                                <b>
+                                    <a>5</a>
+                                    <b>26</b>
+                                    <v>6857</v>
+                                </b>
+                                <b>
+                                    <a>73</a>
+                                    <b>74</b>
+                                    <v>214</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>idx</src>
+                    <trg>file</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>45856</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>9642</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>8357</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>5</b>
+                                    <v>18428</v>
+                                </b>
+                                <b>
+                                    <a>5</a>
+                                    <b>26</b>
+                                    <v>6857</v>
+                                </b>
+                                <b>
+                                    <a>44</a>
+                                    <b>45</b>
+                                    <v>214</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>idx</src>
+                    <trg>line</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>45856</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>10285</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>10071</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>5</b>
+                                    <v>18214</v>
+                                </b>
+                                <b>
+                                    <a>5</a>
+                                    <b>19</b>
+                                    <v>4928</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>idx</src>
+                    <trg>col</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>66856</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>17999</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>9</b>
+                                    <v>4499</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>idx</src>
+                    <trg>package</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>45856</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>9642</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>8357</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>5</b>
+                                    <v>18428</v>
+                                </b>
+                                <b>
+                                    <a>5</a>
+                                    <b>26</b>
+                                    <v>6857</v>
+                                </b>
+                                <b>
+                                    <a>79</a>
+                                    <b>80</b>
+                                    <v>214</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+            </dependencies>
+        </relation>
+        <relation>
+            <name>has_ellipsis</name>
+            <cardinality>45900</cardinality>
+            <columnsizes>
+                <e>
+                    <k>id</k>
+                    <v>45900</v>
+                </e>
+            </columnsizes>
+            <dependencies/>
+        </relation>
+        <relation>
+            <name>variadic</name>
+            <cardinality>2105580</cardinality>
+            <columnsizes>
+                <e>
+                    <k>id</k>
+                    <v>2105580</v>
+                </e>
+            </columnsizes>
+            <dependencies/>
+        </relation>
+        <relation>
+            <name>typeparam</name>
+            <cardinality>331358</cardinality>
+            <columnsizes>
+                <e>
+                    <k>tp</k>
+                    <v>331358</v>
+                </e>
+                <e>
+                    <k>name</k>
+                    <v>19381</v>
+                </e>
+                <e>
+                    <k>bound</k>
+                    <v>42513</v>
+                </e>
+                <e>
+                    <k>parent</k>
+                    <v>249456</v>
+                </e>
+                <e>
+                    <k>idx</k>
+                    <v>3126</v>
+                </e>
+            </columnsizes>
+            <dependencies>
+                <dep>
+                    <src>tp</src>
+                    <trg>name</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>331358</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>tp</src>
+                    <trg>bound</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>331358</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>tp</src>
+                    <trg>parent</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>331358</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>tp</src>
+                    <trg>idx</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>331358</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>name</src>
+                    <trg>tp</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>6877</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>2500</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>2500</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>6</b>
+                                    <v>1250</v>
+                                </b>
+                                <b>
+                                    <a>6</a>
+                                    <b>9</b>
+                                    <v>1250</v>
+                                </b>
+                                <b>
+                                    <a>10</a>
+                                    <b>12</b>
+                                    <v>1250</v>
+                                </b>
+                                <b>
+                                    <a>27</a>
+                                    <b>34</b>
+                                    <v>1250</v>
+                                </b>
+                                <b>
+                                    <a>69</a>
+                                    <b>74</b>
+                                    <v>1250</v>
+                                </b>
+                                <b>
+                                    <a>109</a>
+                                    <b>145</b>
+                                    <v>1250</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>name</src>
+                    <trg>bound</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>12504</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>1875</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>2500</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>12</b>
+                                    <v>1250</v>
+                                </b>
+                                <b>
+                                    <a>12</a>
+                                    <b>32</b>
+                                    <v>1250</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>name</src>
+                    <trg>parent</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>6877</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>2500</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>2500</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>6</b>
+                                    <v>1250</v>
+                                </b>
+                                <b>
+                                    <a>6</a>
+                                    <b>9</b>
+                                    <v>1250</v>
+                                </b>
+                                <b>
+                                    <a>10</a>
+                                    <b>12</b>
+                                    <v>1250</v>
+                                </b>
+                                <b>
+                                    <a>27</a>
+                                    <b>34</b>
+                                    <v>1250</v>
+                                </b>
+                                <b>
+                                    <a>69</a>
+                                    <b>74</b>
+                                    <v>1250</v>
+                                </b>
+                                <b>
+                                    <a>109</a>
+                                    <b>145</b>
+                                    <v>1250</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>name</src>
+                    <trg>idx</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>14379</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>3126</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>1250</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>5</b>
+                                    <v>625</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>bound</src>
+                    <trg>tp</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>32510</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>4</b>
+                                    <v>3126</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>7</b>
+                                    <v>3751</v>
+                                </b>
+                                <b>
+                                    <a>15</a>
+                                    <b>271</b>
+                                    <v>3126</v>
+                                </b>
+                            </bs>
                         </hist>
                     </val>
                 </dep>
                 <dep>
-                    <src>package</src>
-                    <trg>line</trg>
+                    <src>bound</src>
+                    <trg>name</trg>
                     <val>
                         <hist>
                             <budget>12</budget>
-                            <bs/>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>36887</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>3751</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>18</b>
+                                    <v>1875</v>
+                                </b>
+                            </bs>
                         </hist>
                     </val>
                 </dep>
                 <dep>
-                    <src>package</src>
-                    <trg>col</trg>
+                    <src>bound</src>
+                    <trg>parent</trg>
                     <val>
                         <hist>
                             <budget>12</budget>
-                            <bs/>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>33761</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>4</b>
+                                    <v>1875</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>7</b>
+                                    <v>3751</v>
+                                </b>
+                                <b>
+                                    <a>15</a>
+                                    <b>260</b>
+                                    <v>3126</v>
+                                </b>
+                            </bs>
                         </hist>
                     </val>
                 </dep>
                 <dep>
-                    <src>package</src>
+                    <src>bound</src>
                     <trg>idx</trg>
                     <val>
                         <hist>
                             <budget>12</budget>
-                            <bs/>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>38762</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>6</b>
+                                    <v>3751</v>
+                                </b>
+                            </bs>
                         </hist>
                     </val>
                 </dep>
                 <dep>
-                    <src>idx</src>
-                    <trg>id</trg>
+                    <src>parent</src>
+                    <trg>tp</trg>
                     <val>
                         <hist>
                             <budget>12</budget>
-                            <bs/>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>183185</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>55018</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>6</b>
+                                    <v>11253</v>
+                                </b>
+                            </bs>
                         </hist>
                     </val>
                 </dep>
                 <dep>
-                    <src>idx</src>
-                    <trg>kind</trg>
+                    <src>parent</src>
+                    <trg>name</trg>
                     <val>
                         <hist>
                             <budget>12</budget>
-                            <bs/>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>183185</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>55018</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>6</b>
+                                    <v>11253</v>
+                                </b>
+                            </bs>
                         </hist>
                     </val>
                 </dep>
                 <dep>
-                    <src>idx</src>
-                    <trg>msg</trg>
+                    <src>parent</src>
+                    <trg>bound</trg>
                     <val>
                         <hist>
                             <budget>12</budget>
-                            <bs/>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>187561</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>51892</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>5</b>
+                                    <v>10003</v>
+                                </b>
+                            </bs>
                         </hist>
                     </val>
                 </dep>
                 <dep>
-                    <src>idx</src>
-                    <trg>rawpos</trg>
+                    <src>parent</src>
+                    <trg>idx</trg>
                     <val>
                         <hist>
                             <budget>12</budget>
-                            <bs/>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>183185</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>55018</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>6</b>
+                                    <v>11253</v>
+                                </b>
+                            </bs>
                         </hist>
                     </val>
                 </dep>
                 <dep>
                     <src>idx</src>
-                    <trg>file</trg>
+                    <trg>tp</trg>
                     <val>
                         <hist>
                             <budget>12</budget>
-                            <bs/>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>625</v>
+                                </b>
+                                <b>
+                                    <a>6</a>
+                                    <b>7</b>
+                                    <v>625</v>
+                                </b>
+                                <b>
+                                    <a>18</a>
+                                    <b>19</b>
+                                    <v>625</v>
+                                </b>
+                                <b>
+                                    <a>110</a>
+                                    <b>111</b>
+                                    <v>625</v>
+                                </b>
+                                <b>
+                                    <a>395</a>
+                                    <b>396</b>
+                                    <v>625</v>
+                                </b>
+                            </bs>
                         </hist>
                     </val>
                 </dep>
                 <dep>
                     <src>idx</src>
-                    <trg>line</trg>
+                    <trg>name</trg>
                     <val>
                         <hist>
                             <budget>12</budget>
-                            <bs/>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>625</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>5</b>
+                                    <v>625</v>
+                                </b>
+                                <b>
+                                    <a>6</a>
+                                    <b>7</b>
+                                    <v>625</v>
+                                </b>
+                                <b>
+                                    <a>13</a>
+                                    <b>14</b>
+                                    <v>625</v>
+                                </b>
+                                <b>
+                                    <a>19</a>
+                                    <b>20</b>
+                                    <v>625</v>
+                                </b>
+                            </bs>
                         </hist>
                     </val>
                 </dep>
                 <dep>
                     <src>idx</src>
-                    <trg>col</trg>
+                    <trg>bound</trg>
                     <val>
                         <hist>
                             <budget>12</budget>
-                            <bs/>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>625</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>625</v>
+                                </b>
+                                <b>
+                                    <a>9</a>
+                                    <b>10</b>
+                                    <v>625</v>
+                                </b>
+                                <b>
+                                    <a>11</a>
+                                    <b>12</b>
+                                    <v>625</v>
+                                </b>
+                                <b>
+                                    <a>57</a>
+                                    <b>58</b>
+                                    <v>625</v>
+                                </b>
+                            </bs>
                         </hist>
                     </val>
                 </dep>
                 <dep>
                     <src>idx</src>
-                    <trg>package</trg>
+                    <trg>parent</trg>
                     <val>
                         <hist>
                             <budget>12</budget>
-                            <bs/>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>625</v>
+                                </b>
+                                <b>
+                                    <a>6</a>
+                                    <b>7</b>
+                                    <v>625</v>
+                                </b>
+                                <b>
+                                    <a>18</a>
+                                    <b>19</b>
+                                    <v>625</v>
+                                </b>
+                                <b>
+                                    <a>110</a>
+                                    <b>111</b>
+                                    <v>625</v>
+                                </b>
+                                <b>
+                                    <a>395</a>
+                                    <b>396</b>
+                                    <v>625</v>
+                                </b>
+                            </bs>
                         </hist>
                     </val>
                 </dep>
             </dependencies>
         </relation>
-        <relation>
-            <name>has_ellipsis</name>
-            <cardinality>268</cardinality>
-            <columnsizes>
-                <e>
-                    <k>id</k>
-                    <v>268</v>
-                </e>
-            </columnsizes>
-            <dependencies/>
-        </relation>
     </stats>
 </dbstats>

From fd615fb7a3472dcba905b8ce919070de668fa1a3 Mon Sep 17 00:00:00 2001
From: Chris Smowton <chris@smowton.net>
Date: Mon, 30 Sep 2024 17:25:20 +0100
Subject: [PATCH 216/347] Prevent bad magic

---
 go/ql/lib/semmle/go/Types.qll | 1 +
 1 file changed, 1 insertion(+)

diff --git a/go/ql/lib/semmle/go/Types.qll b/go/ql/lib/semmle/go/Types.qll
index 51e9a9539202..8a9bcf1f91c1 100644
--- a/go/ql/lib/semmle/go/Types.qll
+++ b/go/ql/lib/semmle/go/Types.qll
@@ -69,6 +69,7 @@ class Type extends @type {
    * is contained in the method set of this type and any type restrictions are
    * satisfied.
    */
+  pragma[nomagic]
   predicate implements(InterfaceType i) {
     if i = any(ComparableType comparable).getUnderlyingType()
     then this.implementsComparable()

From 1511927a2b56ea85c6915e324df3d7916f60bd5a Mon Sep 17 00:00:00 2001
From: Chris Smowton <chris@smowton.net>
Date: Mon, 30 Sep 2024 17:43:06 +0100
Subject: [PATCH 217/347] Remove unnecessary table population on upgrade

---
 .../component_tags.ql                                      | 7 -------
 .../upgrade.properties                                     | 1 -
 2 files changed, 8 deletions(-)
 delete mode 100644 go/ql/lib/upgrades/a58b81b1b4c4cccc8ca11731c1db86622f33af57/component_tags.ql

diff --git a/go/ql/lib/upgrades/a58b81b1b4c4cccc8ca11731c1db86622f33af57/component_tags.ql b/go/ql/lib/upgrades/a58b81b1b4c4cccc8ca11731c1db86622f33af57/component_tags.ql
deleted file mode 100644
index 7efd29b4ea53..000000000000
--- a/go/ql/lib/upgrades/a58b81b1b4c4cccc8ca11731c1db86622f33af57/component_tags.ql
+++ /dev/null
@@ -1,7 +0,0 @@
-class StructType extends @structtype {
-  string toString() { result = "struct type" }
-}
-
-from StructType st, int index
-where component_types(st, index, _, _)
-select st, index, ""
diff --git a/go/ql/lib/upgrades/a58b81b1b4c4cccc8ca11731c1db86622f33af57/upgrade.properties b/go/ql/lib/upgrades/a58b81b1b4c4cccc8ca11731c1db86622f33af57/upgrade.properties
index 5eacd9417fc7..68a09f8148c7 100644
--- a/go/ql/lib/upgrades/a58b81b1b4c4cccc8ca11731c1db86622f33af57/upgrade.properties
+++ b/go/ql/lib/upgrades/a58b81b1b4c4cccc8ca11731c1db86622f33af57/upgrade.properties
@@ -1,3 +1,2 @@
 description: Add tables for struct tags and interface method IDs
 compatibility: full
-component_tags.rel: run component_tags.qlo

From d04a0f4b873c5506473d961bb1a0bfdc49ce4f4e Mon Sep 17 00:00:00 2001
From: Chris Smowton <smowton@github.com>
Date: Tue, 31 May 2022 15:18:50 +0100
Subject: [PATCH 218/347] Add note explaining how to regenerate dbscheme

---
 .../go.dbscheme                                                 | 0
 .../old.dbscheme                                                | 2 +-
 .../upgrade.properties                                          | 0
 go/extractor/dbscheme/dbscheme.go                               | 2 +-
 go/ql/lib/go.dbscheme                                           | 2 +-
 .../a58b81b1b4c4cccc8ca11731c1db86622f33af57/go.dbscheme        | 2 +-
 6 files changed, 4 insertions(+), 4 deletions(-)
 rename go/downgrades/{d2066c23fe3de023d76d7e5a52dec6771d308534 => 76243dd9f77adbf125835fb83a510465b2f29a24}/go.dbscheme (100%)
 rename go/downgrades/{d2066c23fe3de023d76d7e5a52dec6771d308534 => 76243dd9f77adbf125835fb83a510465b2f29a24}/old.dbscheme (99%)
 rename go/downgrades/{d2066c23fe3de023d76d7e5a52dec6771d308534 => 76243dd9f77adbf125835fb83a510465b2f29a24}/upgrade.properties (100%)

diff --git a/go/downgrades/d2066c23fe3de023d76d7e5a52dec6771d308534/go.dbscheme b/go/downgrades/76243dd9f77adbf125835fb83a510465b2f29a24/go.dbscheme
similarity index 100%
rename from go/downgrades/d2066c23fe3de023d76d7e5a52dec6771d308534/go.dbscheme
rename to go/downgrades/76243dd9f77adbf125835fb83a510465b2f29a24/go.dbscheme
diff --git a/go/downgrades/d2066c23fe3de023d76d7e5a52dec6771d308534/old.dbscheme b/go/downgrades/76243dd9f77adbf125835fb83a510465b2f29a24/old.dbscheme
similarity index 99%
rename from go/downgrades/d2066c23fe3de023d76d7e5a52dec6771d308534/old.dbscheme
rename to go/downgrades/76243dd9f77adbf125835fb83a510465b2f29a24/old.dbscheme
index d2066c23fe3d..76243dd9f77a 100644
--- a/go/downgrades/d2066c23fe3de023d76d7e5a52dec6771d308534/old.dbscheme
+++ b/go/downgrades/76243dd9f77adbf125835fb83a510465b2f29a24/old.dbscheme
@@ -1,4 +1,4 @@
-/** Auto-generated dbscheme; do not edit. */
+/** Auto-generated dbscheme; do not edit. Run `make gen` in directory `go/` to regenerate. */
 
 
 /** Duplicate code **/
diff --git a/go/downgrades/d2066c23fe3de023d76d7e5a52dec6771d308534/upgrade.properties b/go/downgrades/76243dd9f77adbf125835fb83a510465b2f29a24/upgrade.properties
similarity index 100%
rename from go/downgrades/d2066c23fe3de023d76d7e5a52dec6771d308534/upgrade.properties
rename to go/downgrades/76243dd9f77adbf125835fb83a510465b2f29a24/upgrade.properties
diff --git a/go/extractor/dbscheme/dbscheme.go b/go/extractor/dbscheme/dbscheme.go
index 923fda859dba..550c7920c711 100644
--- a/go/extractor/dbscheme/dbscheme.go
+++ b/go/extractor/dbscheme/dbscheme.go
@@ -410,7 +410,7 @@ func AddDefaultSnippet(snippet string) bool {
 
 // PrintDbScheme prints the schema of this database to the writer `w`
 func PrintDbScheme(w io.Writer) {
-	fmt.Fprintf(w, "/** Auto-generated dbscheme; do not edit. */\n\n")
+	fmt.Fprintf(w, "/** Auto-generated dbscheme; do not edit. Run `make gen` in directory `go/` to regenerate. */\n\n")
 	for _, snippet := range defaultSnippets {
 		fmt.Fprintf(w, "%s\n", snippet)
 	}
diff --git a/go/ql/lib/go.dbscheme b/go/ql/lib/go.dbscheme
index d2066c23fe3d..76243dd9f77a 100644
--- a/go/ql/lib/go.dbscheme
+++ b/go/ql/lib/go.dbscheme
@@ -1,4 +1,4 @@
-/** Auto-generated dbscheme; do not edit. */
+/** Auto-generated dbscheme; do not edit. Run `make gen` in directory `go/` to regenerate. */
 
 
 /** Duplicate code **/
diff --git a/go/ql/lib/upgrades/a58b81b1b4c4cccc8ca11731c1db86622f33af57/go.dbscheme b/go/ql/lib/upgrades/a58b81b1b4c4cccc8ca11731c1db86622f33af57/go.dbscheme
index d2066c23fe3d..76243dd9f77a 100644
--- a/go/ql/lib/upgrades/a58b81b1b4c4cccc8ca11731c1db86622f33af57/go.dbscheme
+++ b/go/ql/lib/upgrades/a58b81b1b4c4cccc8ca11731c1db86622f33af57/go.dbscheme
@@ -1,4 +1,4 @@
-/** Auto-generated dbscheme; do not edit. */
+/** Auto-generated dbscheme; do not edit. Run `make gen` in directory `go/` to regenerate. */
 
 
 /** Duplicate code **/

From 74cba9056b4095fa9ab7839d4bbb8c7ddfa437d1 Mon Sep 17 00:00:00 2001
From: Chris Smowton <chris@smowton.net>
Date: Tue, 1 Oct 2024 14:12:51 +0100
Subject: [PATCH 219/347] Optimise join orders

---
 go/ql/lib/semmle/go/AST.qll    |  1 +
 go/ql/lib/semmle/go/Scopes.qll | 18 +++++++++++++++---
 2 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/go/ql/lib/semmle/go/AST.qll b/go/ql/lib/semmle/go/AST.qll
index 92bf9dc2cb8f..64c6231d1054 100644
--- a/go/ql/lib/semmle/go/AST.qll
+++ b/go/ql/lib/semmle/go/AST.qll
@@ -79,6 +79,7 @@ class AstNode extends @node, Locatable {
   }
 
   /** Gets the innermost function definition to which this AST node belongs, if any. */
+  pragma[nomagic]
   FuncDef getEnclosingFunction() { result = this.getParent().parentInSameFunction*() }
 
   /**
diff --git a/go/ql/lib/semmle/go/Scopes.qll b/go/ql/lib/semmle/go/Scopes.qll
index 82785b00cdc6..52abff8cc6b9 100644
--- a/go/ql/lib/semmle/go/Scopes.qll
+++ b/go/ql/lib/semmle/go/Scopes.qll
@@ -479,6 +479,13 @@ class Function extends ValueEntity, @functionobject {
   ResultVariable getAResult() { result = this.getResult(_) }
 }
 
+pragma[inline_late]
+bindingset[m]
+private Type implementsIncludingInterfaceMethodsCand(Method m, string mname) {
+  result.implements(m.getReceiverType().getUnderlyingType()) and
+  mname = m.getName()
+}
+
 /**
  * A method, that is, a function with a receiver variable, or a function declared in an interface.
  *
@@ -580,9 +587,14 @@ class Method extends Function {
   predicate implementsIncludingInterfaceMethods(Method m) {
     this = m
     or
-    exists(Type t |
-      this = t.getMethod(m.getName()) and
-      t.implements(m.getReceiverType().getUnderlyingType())
+    // Take all methods
+    // Get receiver type then underlying type ==> [method, recvutype]
+    // Map through Type.implements ==> [method, candtype]
+    // Get method name ==> [mname, candtype]
+    // Get corresponding method
+    exists(Type t, string mname |
+      t = implementsIncludingInterfaceMethodsCand(m, mname) and
+      this = t.getMethod(mname)
     )
   }
 

From c1a1edf24e3970e864f92708427b0e423d9e88e8 Mon Sep 17 00:00:00 2001
From: Chris Smowton <chris@smowton.net>
Date: Tue, 1 Oct 2024 14:33:27 +0100
Subject: [PATCH 220/347] Autoformat

---
 go/ql/lib/semmle/go/Scopes.qll | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/go/ql/lib/semmle/go/Scopes.qll b/go/ql/lib/semmle/go/Scopes.qll
index 52abff8cc6b9..277afdb216e3 100644
--- a/go/ql/lib/semmle/go/Scopes.qll
+++ b/go/ql/lib/semmle/go/Scopes.qll
@@ -479,8 +479,8 @@ class Function extends ValueEntity, @functionobject {
   ResultVariable getAResult() { result = this.getResult(_) }
 }
 
-pragma[inline_late]
 bindingset[m]
+pragma[inline_late]
 private Type implementsIncludingInterfaceMethodsCand(Method m, string mname) {
   result.implements(m.getReceiverType().getUnderlyingType()) and
   mname = m.getName()

From 288e0ec565bd0b094868a4e4282613a470c40246 Mon Sep 17 00:00:00 2001
From: Chris Smowton <chris@smowton.net>
Date: Tue, 1 Oct 2024 14:39:32 +0100
Subject: [PATCH 221/347] component_tags -> struct_tags

---
 .../go.dbscheme                                           | 0
 .../old.dbscheme                                          | 2 +-
 .../upgrade.properties                                    | 2 +-
 go/extractor/dbscheme/tables.go                           | 4 ++--
 go/extractor/extractor.go                                 | 2 +-
 go/ql/lib/go.dbscheme                                     | 2 +-
 go/ql/lib/go.dbscheme.stats                               | 2 +-
 go/ql/lib/semmle/go/Types.qll                             | 8 ++++----
 .../a58b81b1b4c4cccc8ca11731c1db86622f33af57/go.dbscheme  | 2 +-
 9 files changed, 12 insertions(+), 12 deletions(-)
 rename go/downgrades/{76243dd9f77adbf125835fb83a510465b2f29a24 => 4bd57e093275e5e892dfb16b55ed4bd76ea662be}/go.dbscheme (100%)
 rename go/downgrades/{76243dd9f77adbf125835fb83a510465b2f29a24 => 4bd57e093275e5e892dfb16b55ed4bd76ea662be}/old.dbscheme (99%)
 rename go/downgrades/{76243dd9f77adbf125835fb83a510465b2f29a24 => 4bd57e093275e5e892dfb16b55ed4bd76ea662be}/upgrade.properties (82%)

diff --git a/go/downgrades/76243dd9f77adbf125835fb83a510465b2f29a24/go.dbscheme b/go/downgrades/4bd57e093275e5e892dfb16b55ed4bd76ea662be/go.dbscheme
similarity index 100%
rename from go/downgrades/76243dd9f77adbf125835fb83a510465b2f29a24/go.dbscheme
rename to go/downgrades/4bd57e093275e5e892dfb16b55ed4bd76ea662be/go.dbscheme
diff --git a/go/downgrades/76243dd9f77adbf125835fb83a510465b2f29a24/old.dbscheme b/go/downgrades/4bd57e093275e5e892dfb16b55ed4bd76ea662be/old.dbscheme
similarity index 99%
rename from go/downgrades/76243dd9f77adbf125835fb83a510465b2f29a24/old.dbscheme
rename to go/downgrades/4bd57e093275e5e892dfb16b55ed4bd76ea662be/old.dbscheme
index 76243dd9f77a..4bd57e093275 100644
--- a/go/downgrades/76243dd9f77adbf125835fb83a510465b2f29a24/old.dbscheme
+++ b/go/downgrades/4bd57e093275e5e892dfb16b55ed4bd76ea662be/old.dbscheme
@@ -208,7 +208,7 @@ underlying_type(unique int named: @namedtype ref, int tp: @type ref);
 component_types(int parent: @compositetype ref, int index: int ref, string name: string ref, int tp: @type ref);
 
 #keyset[parent, index]
-component_tags(int parent: @structtype ref, int index: int ref, string tag: string ref);
+struct_tags(int parent: @structtype ref, int index: int ref, string tag: string ref);
 
 #keyset[interface, index]
 interface_private_method_ids(int interface: @interfacetype ref, int index: int ref, string id: string ref);
diff --git a/go/downgrades/76243dd9f77adbf125835fb83a510465b2f29a24/upgrade.properties b/go/downgrades/4bd57e093275e5e892dfb16b55ed4bd76ea662be/upgrade.properties
similarity index 82%
rename from go/downgrades/76243dd9f77adbf125835fb83a510465b2f29a24/upgrade.properties
rename to go/downgrades/4bd57e093275e5e892dfb16b55ed4bd76ea662be/upgrade.properties
index 976c2c81bfa4..0cda1e3644f8 100644
--- a/go/downgrades/76243dd9f77adbf125835fb83a510465b2f29a24/upgrade.properties
+++ b/go/downgrades/4bd57e093275e5e892dfb16b55ed4bd76ea662be/upgrade.properties
@@ -1,5 +1,5 @@
 description: Remove component-tags and interface-method-id tables
 compatibility: full
 
-component_tags.rel: delete
+struct_tags.rel: delete
 interface_private_method_ids.rel: delete
diff --git a/go/extractor/dbscheme/tables.go b/go/extractor/dbscheme/tables.go
index ec74c7a2c0d7..aa44c6248424 100644
--- a/go/extractor/dbscheme/tables.go
+++ b/go/extractor/dbscheme/tables.go
@@ -1150,8 +1150,8 @@ var ComponentTypesTable = NewTable("component_types",
 	EntityColumn(TypeType, "tp"),
 ).KeySet("parent", "index")
 
-// ComponentTagsTable is the table associating struct types with their component types' tags
-var ComponentTagsTable = NewTable("component_tags",
+// StructTagsTable is the table associating struct types with their component types' tags
+var StructTagsTable = NewTable("struct_tags",
 	EntityColumn(StructType, "parent"),
 	IntColumn("index"),
 	StringColumn("tag"),
diff --git a/go/extractor/extractor.go b/go/extractor/extractor.go
index 8a399eb2b902..c157f7c8f672 100644
--- a/go/extractor/extractor.go
+++ b/go/extractor/extractor.go
@@ -1625,7 +1625,7 @@ func extractType(tw *trap.Writer, tp types.Type) trap.Label {
 				}
 				extractComponentType(tw, lbl, i, name, field.Type())
 				if tp.Tag(i) != "" {
-					dbscheme.ComponentTagsTable.Emit(tw, lbl, i, tp.Tag(i))
+					dbscheme.StructTagsTable.Emit(tw, lbl, i, tp.Tag(i))
 				}
 			}
 		case *types.Pointer:
diff --git a/go/ql/lib/go.dbscheme b/go/ql/lib/go.dbscheme
index 76243dd9f77a..4bd57e093275 100644
--- a/go/ql/lib/go.dbscheme
+++ b/go/ql/lib/go.dbscheme
@@ -208,7 +208,7 @@ underlying_type(unique int named: @namedtype ref, int tp: @type ref);
 component_types(int parent: @compositetype ref, int index: int ref, string name: string ref, int tp: @type ref);
 
 #keyset[parent, index]
-component_tags(int parent: @structtype ref, int index: int ref, string tag: string ref);
+struct_tags(int parent: @structtype ref, int index: int ref, string tag: string ref);
 
 #keyset[interface, index]
 interface_private_method_ids(int interface: @interfacetype ref, int index: int ref, string id: string ref);
diff --git a/go/ql/lib/go.dbscheme.stats b/go/ql/lib/go.dbscheme.stats
index 50565d963aad..a602a143ee0c 100644
--- a/go/ql/lib/go.dbscheme.stats
+++ b/go/ql/lib/go.dbscheme.stats
@@ -13979,7 +13979,7 @@
             </dependencies>
         </relation>
         <relation>
-            <name>component_tags</name>
+            <name>struct_tags</name>
             <cardinality>41038845</cardinality>
             <columnsizes>
                 <e>
diff --git a/go/ql/lib/semmle/go/Types.qll b/go/ql/lib/semmle/go/Types.qll
index 8a9bcf1f91c1..651cda82eb6e 100644
--- a/go/ql/lib/semmle/go/Types.qll
+++ b/go/ql/lib/semmle/go/Types.qll
@@ -467,9 +467,9 @@ class StructType extends @structtype, CompositeType {
   predicate hasOwnFieldWithTag(int i, string name, Type tp, boolean isEmbedded, string tag) {
     this.hasOwnField(i, name, tp, isEmbedded) and
     (
-      component_tags(this, i, tag)
+      struct_tags(this, i, tag)
       or
-      not component_tags(this, i, _) and tag = ""
+      not struct_tags(this, i, _) and tag = ""
     )
   }
 
@@ -594,9 +594,9 @@ class StructType extends @structtype, CompositeType {
         concat(int i, string name, Type tp, string tagToPrint |
           component_types(this, i, name, tp) and
           (
-            tagToPrint = " `" + any(string tag | component_tags(this, i, tag)) + "`"
+            tagToPrint = " `" + any(string tag | struct_tags(this, i, tag)) + "`"
             or
-            tagToPrint = "" and not component_tags(this, i, _)
+            tagToPrint = "" and not struct_tags(this, i, _)
           )
         |
           name + " " + tp.pp() + tagToPrint, "; " order by i
diff --git a/go/ql/lib/upgrades/a58b81b1b4c4cccc8ca11731c1db86622f33af57/go.dbscheme b/go/ql/lib/upgrades/a58b81b1b4c4cccc8ca11731c1db86622f33af57/go.dbscheme
index 76243dd9f77a..4bd57e093275 100644
--- a/go/ql/lib/upgrades/a58b81b1b4c4cccc8ca11731c1db86622f33af57/go.dbscheme
+++ b/go/ql/lib/upgrades/a58b81b1b4c4cccc8ca11731c1db86622f33af57/go.dbscheme
@@ -208,7 +208,7 @@ underlying_type(unique int named: @namedtype ref, int tp: @type ref);
 component_types(int parent: @compositetype ref, int index: int ref, string name: string ref, int tp: @type ref);
 
 #keyset[parent, index]
-component_tags(int parent: @structtype ref, int index: int ref, string tag: string ref);
+struct_tags(int parent: @structtype ref, int index: int ref, string tag: string ref);
 
 #keyset[interface, index]
 interface_private_method_ids(int interface: @interfacetype ref, int index: int ref, string id: string ref);

From 0f95a8d7243715e94c2c09763f0930b76132ab85 Mon Sep 17 00:00:00 2001
From: Chris Smowton <chris@smowton.net>
Date: Tue, 1 Oct 2024 14:46:04 +0100
Subject: [PATCH 222/347] Clarify doc

---
 go/ql/lib/semmle/go/Types.qll | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/go/ql/lib/semmle/go/Types.qll b/go/ql/lib/semmle/go/Types.qll
index 651cda82eb6e..0b5ac334c9b7 100644
--- a/go/ql/lib/semmle/go/Types.qll
+++ b/go/ql/lib/semmle/go/Types.qll
@@ -782,7 +782,7 @@ class InterfaceType extends @interfacetype, CompositeType {
    * different packages defines two distinct types, but they appear identical according to
    * `getMethodType`. If the packages were named `a` and `b`, `getMethodType` would yield
    * `notExported -> int` for both, whereas this method would yield `a.notExported -> int`
-   * and `b.notExported -> int` respectively.
+   * and `b.notExported -> int` respectively, while both yielding `Exported -> int`.
    */
   Type getMethodTypeByQualifiedName(string qname) {
     exists(int i, string name | i >= 0 |

From ab99509a11017df930746f4a74767aaa36508718 Mon Sep 17 00:00:00 2001
From: Chris Smowton <chris@smowton.net>
Date: Tue, 1 Oct 2024 18:46:14 +0100
Subject: [PATCH 223/347] Rework interface for querying private interface
 method ids

---
 .../2024-09-03-tags-and-interface-ids.md      |  2 +-
 go/ql/lib/semmle/go/Types.qll                 | 28 ++++---------------
 .../semmle/go/Types/InterfaceMethodIds.ql     |  6 +++-
 3 files changed, 12 insertions(+), 24 deletions(-)

diff --git a/go/ql/lib/change-notes/2024-09-03-tags-and-interface-ids.md b/go/ql/lib/change-notes/2024-09-03-tags-and-interface-ids.md
index c8c6e88ab4cb..749ae4cde998 100644
--- a/go/ql/lib/change-notes/2024-09-03-tags-and-interface-ids.md
+++ b/go/ql/lib/change-notes/2024-09-03-tags-and-interface-ids.md
@@ -2,4 +2,4 @@
 category: minorAnalysis
 ---
 * Added member predicates `StructTag.hasOwnFieldWithTag` and `Field.getTag`, which enable CodeQL queries to examine struct field tags.
-* Added member predicate `InterfaceType.getMethodTypeByQualifiedName`, which enables CodeQL queries to distinguish interfaces with matching non-exported method names that are declared in different packages, and are therefore incompatible.
+* Added member predicate `InterfaceType.hasPrivateMethodWithQualifiedName`, which enables CodeQL queries to distinguish interfaces with matching non-exported method names that are declared in different packages, and are therefore incompatible.
diff --git a/go/ql/lib/semmle/go/Types.qll b/go/ql/lib/semmle/go/Types.qll
index 0b5ac334c9b7..d71869aa995c 100644
--- a/go/ql/lib/semmle/go/Types.qll
+++ b/go/ql/lib/semmle/go/Types.qll
@@ -769,29 +769,13 @@ class InterfaceType extends @interfacetype, CompositeType {
   }
 
   /**
-   * Gets the type of method `qname` of this interface type.
-   *
-   * This differs from `getMethodType` in that if the method is not exported, the `qname`
-   * will be package-qualified. This means that the set of `qname`s` together with any
-   * embedded types fully distinguishes the interface from any other, whereas the set
-   * of names matched by `getMethodName` may be ambiguous between interfaces with matching
-   * exported methods and unexported methods that have matching names but belong to
-   * different packages.
-   *
-   * For example, `interface { Exported() int; notExported() int }` declared in two
-   * different packages defines two distinct types, but they appear identical according to
-   * `getMethodType`. If the packages were named `a` and `b`, `getMethodType` would yield
-   * `notExported -> int` for both, whereas this method would yield `a.notExported -> int`
-   * and `b.notExported -> int` respectively, while both yielding `Exported -> int`.
+   * Holds if this interface type has a private method `name`,
+   * with qualified name `qname` and type `type`.
    */
-  Type getMethodTypeByQualifiedName(string qname) {
-    exists(int i, string name | i >= 0 |
-      component_types(this, i, name, result) and
-      (
-        interface_private_method_ids(this, i, qname)
-        or
-        name = qname and not interface_private_method_ids(this, i, _)
-      )
+  predicate hasPrivateMethodWithQualifiedName(string name, string qname, Type type) {
+    exists(int i | i >= 0 |
+      component_types(this, i, name, type) and
+      interface_private_method_ids(this, i, qname)
     )
   }
 
diff --git a/go/ql/test/library-tests/semmle/go/Types/InterfaceMethodIds.ql b/go/ql/test/library-tests/semmle/go/Types/InterfaceMethodIds.ql
index b6246cf683a0..356bc85c931b 100644
--- a/go/ql/test/library-tests/semmle/go/Types/InterfaceMethodIds.ql
+++ b/go/ql/test/library-tests/semmle/go/Types/InterfaceMethodIds.ql
@@ -4,5 +4,9 @@ from NamedType nt, InterfaceType it, Type methodType, string id
 where
   nt.getName() = "MixedExportedAndNot" and
   it = nt.getUnderlyingType() and
-  methodType = it.getMethodTypeByQualifiedName(id)
+  (
+    it.hasPrivateMethodWithQualifiedName(_, id, methodType)
+    or
+    it.hasMethod(id, methodType) and not it.hasPrivateMethodWithQualifiedName(id, _, _)
+  )
 select it.pp(), methodType.pp(), id

From 36a031833f9728940141ef745c078b9825c70b15 Mon Sep 17 00:00:00 2001
From: Chris Smowton <chris@smowton.net>
Date: Wed, 2 Oct 2024 15:16:47 +0100
Subject: [PATCH 224/347] Further optimisation

---
 go/ql/lib/semmle/go/Expr.qll                   |  1 +
 go/ql/lib/semmle/go/controlflow/IR.qll         |  3 ++-
 .../go/dataflow/internal/TaintTrackingUtil.qll |  1 +
 .../security/OpenUrlRedirectCustomizations.qll | 18 ++++++++++++------
 4 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/go/ql/lib/semmle/go/Expr.qll b/go/ql/lib/semmle/go/Expr.qll
index b1e1a1697843..ce6c7d4cf1f6 100644
--- a/go/ql/lib/semmle/go/Expr.qll
+++ b/go/ql/lib/semmle/go/Expr.qll
@@ -2098,6 +2098,7 @@ class LabelName extends Name {
  * may be identified as such, so not all type expressions can be determined by
  * a bottom-up analysis. In such cases, `isTypeExprTopDown` below is useful.
  */
+pragma[nomagic]
 private predicate isTypeExprBottomUp(Expr e) {
   e instanceof TypeName
   or
diff --git a/go/ql/lib/semmle/go/controlflow/IR.qll b/go/ql/lib/semmle/go/controlflow/IR.qll
index d337f526cdef..59060e406558 100644
--- a/go/ql/lib/semmle/go/controlflow/IR.qll
+++ b/go/ql/lib/semmle/go/controlflow/IR.qll
@@ -501,10 +501,11 @@ module IR {
     override StructLit lit;
 
     /** Gets the name of the initialized field. */
+    pragma[nomagic]
     string getFieldName() {
       if elt instanceof KeyValueExpr
       then result = elt.(KeyValueExpr).getKey().(Ident).getName()
-      else lit.getStructType().hasOwnField(i, result, _, _)
+      else pragma[only_bind_out](lit.getStructType()).hasOwnField(i, result, _, _)
     }
 
     /** Gets the initialized field. */
diff --git a/go/ql/lib/semmle/go/dataflow/internal/TaintTrackingUtil.qll b/go/ql/lib/semmle/go/dataflow/internal/TaintTrackingUtil.qll
index 1b521d89d98d..281e283890ad 100644
--- a/go/ql/lib/semmle/go/dataflow/internal/TaintTrackingUtil.qll
+++ b/go/ql/lib/semmle/go/dataflow/internal/TaintTrackingUtil.qll
@@ -190,6 +190,7 @@ predicate sliceStep(DataFlow::Node pred, DataFlow::Node succ) {
  */
 abstract class FunctionModel extends Function {
   /** Holds if taint propagates through this function from `input` to `output`. */
+  pragma[nomagic]
   abstract predicate hasTaintFlow(FunctionInput input, FunctionOutput output);
 
   /** Gets an input node for this model for the call `c`. */
diff --git a/go/ql/lib/semmle/go/security/OpenUrlRedirectCustomizations.qll b/go/ql/lib/semmle/go/security/OpenUrlRedirectCustomizations.qll
index 304bc004e038..720f7ba44fd0 100644
--- a/go/ql/lib/semmle/go/security/OpenUrlRedirectCustomizations.qll
+++ b/go/ql/lib/semmle/go/security/OpenUrlRedirectCustomizations.qll
@@ -75,6 +75,15 @@ module OpenUrlRedirect {
     }
   }
 
+  bindingset[var, w]
+  pragma[inline_late]
+  private predicate useIsDominated(
+    SsaWithFields var, Write w, DataFlow::ReadNode sanitizedRead
+  ) {
+    w.dominatesNode(sanitizedRead.asInstruction()) and
+    sanitizedRead = var.getAUse()
+  }
+
   /**
    * An access to a variable that is preceded by an assignment to its `Path` field.
    *
@@ -83,13 +92,10 @@ module OpenUrlRedirect {
    */
   class PathAssignmentBarrier extends Barrier, Read {
     PathAssignmentBarrier() {
-      exists(Write w, Field f, SsaWithFields var |
-        f.getName() = "Path" and
+      exists(Write w, SsaWithFields var |
         hasHostnameSanitizingSubstring(w.getRhs()) and
-        this = var.getAUse()
-      |
-        w.writesField(var.getAUse(), f, _) and
-        w.dominatesNode(insn)
+        w.writesField(var.getAUse(), any(Field f | f.getName() = "Path"), _) and
+        useIsDominated(var, w, this)
       )
     }
   }

From 365ccf4903cc3c9a4ed0ce40b74591a85233c263 Mon Sep 17 00:00:00 2001
From: Chris Smowton <chris@smowton.net>
Date: Wed, 2 Oct 2024 15:27:54 +0100
Subject: [PATCH 225/347] autoformat

---
 .../lib/semmle/go/security/OpenUrlRedirectCustomizations.qll  | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/go/ql/lib/semmle/go/security/OpenUrlRedirectCustomizations.qll b/go/ql/lib/semmle/go/security/OpenUrlRedirectCustomizations.qll
index 720f7ba44fd0..870edeee9621 100644
--- a/go/ql/lib/semmle/go/security/OpenUrlRedirectCustomizations.qll
+++ b/go/ql/lib/semmle/go/security/OpenUrlRedirectCustomizations.qll
@@ -77,9 +77,7 @@ module OpenUrlRedirect {
 
   bindingset[var, w]
   pragma[inline_late]
-  private predicate useIsDominated(
-    SsaWithFields var, Write w, DataFlow::ReadNode sanitizedRead
-  ) {
+  private predicate useIsDominated(SsaWithFields var, Write w, DataFlow::ReadNode sanitizedRead) {
     w.dominatesNode(sanitizedRead.asInstruction()) and
     sanitizedRead = var.getAUse()
   }

From bf5ba33c2efe0904e72e5971bddadecf6e07c7ed Mon Sep 17 00:00:00 2001
From: Chris Smowton <chris@smowton.net>
Date: Wed, 2 Oct 2024 23:16:22 +0100
Subject: [PATCH 226/347] Improve join orders for top 5 perf regressions in QA

---
 go/ql/lib/semmle/go/frameworks/Afero.qll           | 4 ++--
 go/ql/lib/semmle/go/frameworks/GoMicro.qll         | 8 +++++++-
 go/ql/lib/semmle/go/frameworks/Twirp.qll           | 8 +++++++-
 go/ql/src/Security/CWE-798/HardcodedCredentials.ql | 6 +++++-
 4 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/go/ql/lib/semmle/go/frameworks/Afero.qll b/go/ql/lib/semmle/go/frameworks/Afero.qll
index 598036de22bc..c03bf6114334 100644
--- a/go/ql/lib/semmle/go/frameworks/Afero.qll
+++ b/go/ql/lib/semmle/go/frameworks/Afero.qll
@@ -65,7 +65,7 @@ module Afero {
       exists(Function f |
         f.hasQualifiedName(aferoPackage(),
           ["WriteReader", "SafeWriteReader", "WriteFile", "ReadFile", "ReadDir"]) and
-        this = f.getACall() and
+        this = pragma[only_bind_out](f.getACall()) and
         pathArg = 1 and
         not aferoSanitizer(this.getArgument(0))
       )
@@ -73,7 +73,7 @@ module Afero {
       exists(Method m |
         m.hasQualifiedName(aferoPackage(), "Afero",
           ["WriteReader", "SafeWriteReader", "WriteFile", "ReadFile", "ReadDir"]) and
-        this = m.getACall() and
+        this = pragma[only_bind_out](m.getACall()) and
         pathArg = 0 and
         not aferoSanitizer(this.getReceiver())
       )
diff --git a/go/ql/lib/semmle/go/frameworks/GoMicro.qll b/go/ql/lib/semmle/go/frameworks/GoMicro.qll
index 55f5bded6276..116ebee030ea 100644
--- a/go/ql/lib/semmle/go/frameworks/GoMicro.qll
+++ b/go/ql/lib/semmle/go/frameworks/GoMicro.qll
@@ -98,6 +98,12 @@ module GoMicro {
     }
   }
 
+  bindingset[m]
+  pragma[inline_late]
+  private predicate implementsServiceType(Method m) {
+    m.implements(any(ServiceInterfaceType i).getNamedType().getMethod(_))
+  }
+
   /**
    * A service handler.
    */
@@ -106,7 +112,7 @@ module GoMicro {
       exists(DataFlow::CallNode call |
         call.getTarget() instanceof ServiceRegisterHandler and
         this = call.getArgument(1).getType().getMethod(_) and
-        this.implements(any(ServiceInterfaceType i).getNamedType().getMethod(_))
+        implementsServiceType(this)
       )
     }
   }
diff --git a/go/ql/lib/semmle/go/frameworks/Twirp.qll b/go/ql/lib/semmle/go/frameworks/Twirp.qll
index 3efd91eee4d7..7f338816b383 100644
--- a/go/ql/lib/semmle/go/frameworks/Twirp.qll
+++ b/go/ql/lib/semmle/go/frameworks/Twirp.qll
@@ -118,13 +118,19 @@ module Twirp {
     override string getKind() { result = "URL" }
   }
 
+  bindingset[m]
+  pragma[inline_late]
+  private predicate implementsServiceType(Method m) {
+    m.implements(any(ServiceInterfaceType i).getNamedType().getMethod(_))
+  }
+
   /** A service handler. */
   class ServiceHandler extends Method {
     ServiceHandler() {
       exists(DataFlow::CallNode call |
         call.getTarget() instanceof ServerConstructor and
         this = call.getArgument(0).getType().getMethod(_) and
-        this.implements(any(ServiceInterfaceType i).getNamedType().getMethod(_))
+        implementsServiceType(this)
       )
     }
   }
diff --git a/go/ql/src/Security/CWE-798/HardcodedCredentials.ql b/go/ql/src/Security/CWE-798/HardcodedCredentials.ql
index 6dd422413f7f..9f88f8449f7a 100644
--- a/go/ql/src/Security/CWE-798/HardcodedCredentials.ql
+++ b/go/ql/src/Security/CWE-798/HardcodedCredentials.ql
@@ -17,13 +17,17 @@ import go
 import semmle.go.security.HardcodedCredentials
 import semmle.go.security.SensitiveActions
 
+bindingset[write]
+pragma[inline_late]
+private predicate isWriteRhs(Write write, DataFlow::Node rhs) { write.getRhs() = rhs }
+
 /**
  * Holds if `sink` is used in a context that suggests it may hold sensitive data of
  * the given `type`.
  */
 predicate isSensitive(DataFlow::Node sink, SensitiveExpr::Classification type) {
   exists(Write write, string name |
-    write.getRhs() = sink and
+    isWriteRhs(write, sink) and
     name = write.getLhs().getName() and
     // allow obvious test password variables
     not name.regexpMatch(HeuristicNames::notSensitive())

From ed9a6bd8200835267ac4285c4e55af7ef863e7bc Mon Sep 17 00:00:00 2001
From: Chris Smowton <chris@smowton.net>
Date: Thu, 3 Oct 2024 22:17:44 +0100
Subject: [PATCH 227/347] Further join order optimisations

---
 go/ql/lib/semmle/go/Expr.qll                           |  1 +
 go/ql/lib/semmle/go/controlflow/IR.qll                 |  2 +-
 .../semmle/go/dataflow/internal/DataFlowDispatch.qll   |  4 ++--
 .../lib/semmle/go/dataflow/internal/DataFlowNodes.qll  |  1 +
 go/ql/lib/semmle/go/dataflow/internal/DataFlowUtil.qll |  8 +++++---
 .../semmle/go/dataflow/internal/TaintTrackingUtil.qll  | 10 +++++-----
 6 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/go/ql/lib/semmle/go/Expr.qll b/go/ql/lib/semmle/go/Expr.qll
index ce6c7d4cf1f6..4a4ab00f0538 100644
--- a/go/ql/lib/semmle/go/Expr.qll
+++ b/go/ql/lib/semmle/go/Expr.qll
@@ -2137,6 +2137,7 @@ private predicate isTypeExprBottomUp(Expr e) {
  * it may be the latter and so this predicate does not consider the expression to be
  * a type expression.
  */
+pragma[nomagic]
 private predicate isTypeExprTopDown(Expr e) {
   e = any(CompositeLit cl).getTypeExpr()
   or
diff --git a/go/ql/lib/semmle/go/controlflow/IR.qll b/go/ql/lib/semmle/go/controlflow/IR.qll
index 59060e406558..b036ddf6d0f5 100644
--- a/go/ql/lib/semmle/go/controlflow/IR.qll
+++ b/go/ql/lib/semmle/go/controlflow/IR.qll
@@ -1481,7 +1481,7 @@ module IR {
 
     override predicate refersTo(ValueEntity e) {
       this instanceof MkLhs and
-      loc = e.getAReference()
+      pragma[only_bind_out](loc) = e.getAReference()
       or
       exists(WriteResultInstruction wr | this = MkResultWriteTarget(wr) |
         e = wr.getResultVariable()
diff --git a/go/ql/lib/semmle/go/dataflow/internal/DataFlowDispatch.qll b/go/ql/lib/semmle/go/dataflow/internal/DataFlowDispatch.qll
index b045d6dc5522..a06edad0be2c 100644
--- a/go/ql/lib/semmle/go/dataflow/internal/DataFlowDispatch.qll
+++ b/go/ql/lib/semmle/go/dataflow/internal/DataFlowDispatch.qll
@@ -8,9 +8,9 @@ private import DataFlowPrivate
 private predicate isInterfaceCallReceiver(
   DataFlow::CallNode call, DataFlow::Node recv, InterfaceType tp, string m
 ) {
-  call.getReceiver() = recv and
+  pragma[only_bind_out](call).getReceiver() = recv and
   recv.getType().getUnderlyingType() = tp and
-  m = call.getACalleeIncludingExternals().asFunction().getName()
+  m = pragma[only_bind_out](call).getACalleeIncludingExternals().asFunction().getName()
 }
 
 /** Gets a data-flow node that may flow into the receiver value of `call`, which is an interface value. */
diff --git a/go/ql/lib/semmle/go/dataflow/internal/DataFlowNodes.qll b/go/ql/lib/semmle/go/dataflow/internal/DataFlowNodes.qll
index 6b088f44e73a..0aa517b3fdad 100644
--- a/go/ql/lib/semmle/go/dataflow/internal/DataFlowNodes.qll
+++ b/go/ql/lib/semmle/go/dataflow/internal/DataFlowNodes.qll
@@ -525,6 +525,7 @@ module Public {
      * As `getACalleeIncludingExternals`, except excluding external functions (those for which
      * we lack a definition, such as standard library functions).
      */
+    pragma[nomagic]
     FuncDef getACallee() { result = this.getACalleeIncludingExternals().getFuncDef() }
 
     /**
diff --git a/go/ql/lib/semmle/go/dataflow/internal/DataFlowUtil.qll b/go/ql/lib/semmle/go/dataflow/internal/DataFlowUtil.qll
index 9f76e7c7c95b..75ab4dbb2ebd 100644
--- a/go/ql/lib/semmle/go/dataflow/internal/DataFlowUtil.qll
+++ b/go/ql/lib/semmle/go/dataflow/internal/DataFlowUtil.qll
@@ -284,9 +284,11 @@ signature predicate guardChecksSig(Node g, Expr e, boolean branch);
 module BarrierGuard<guardChecksSig/3 guardChecks> {
   /** Gets a node that is safely guarded by the given guard check. */
   Node getABarrierNode() {
-    exists(ControlFlow::ConditionGuardNode guard, SsaWithFields var | result = var.getAUse() |
+    exists(ControlFlow::ConditionGuardNode guard, SsaWithFields var |
+      result = pragma[only_bind_out](var).getAUse()
+    |
       guards(_, guard, _, var) and
-      guard.dominates(result.getBasicBlock())
+      pragma[only_bind_out](guard).dominates(result.getBasicBlock())
     )
   }
 
@@ -353,7 +355,7 @@ module BarrierGuard<guardChecksSig/3 guardChecks> {
   ) {
     exists(FuncDecl fd, Node arg, Node ret |
       fd.getFunction() = f and
-      localFlow(inp.getExitNode(fd), arg) and
+      localFlow(inp.getExitNode(fd), pragma[only_bind_out](arg)) and
       ret = outp.getEntryNode(fd) and
       (
         // Case: a function like "if someBarrierGuard(arg) { return true } else { return false }"
diff --git a/go/ql/lib/semmle/go/dataflow/internal/TaintTrackingUtil.qll b/go/ql/lib/semmle/go/dataflow/internal/TaintTrackingUtil.qll
index 281e283890ad..85f6bb0874f5 100644
--- a/go/ql/lib/semmle/go/dataflow/internal/TaintTrackingUtil.qll
+++ b/go/ql/lib/semmle/go/dataflow/internal/TaintTrackingUtil.qll
@@ -203,8 +203,8 @@ abstract class FunctionModel extends Function {
   predicate taintStepForCall(DataFlow::Node pred, DataFlow::Node succ, DataFlow::CallNode c) {
     c = this.getACall() and
     exists(FunctionInput inp, FunctionOutput outp | this.hasTaintFlow(inp, outp) |
-      pred = inp.getNode(c) and
-      succ = outp.getNode(c)
+      pred = pragma[only_bind_out](inp).getNode(c) and
+      succ = pragma[only_bind_out](outp).getNode(c)
     )
   }
 
@@ -383,9 +383,9 @@ predicate inputIsConstantIfOutputHasProperty(
 ) {
   exists(Function f, FunctionInput inp, FunctionOutput outp, DataFlow::CallNode call |
     functionEnsuresInputIsConstant(f, inp, outp, p) and
-    call = f.getACall() and
-    inputNode = inp.getNode(call) and
-    DataFlow::localFlow(outp.getNode(call), outputNode)
+    call = pragma[only_bind_out](f).getACall() and
+    inputNode = pragma[only_bind_out](inp).getNode(call) and
+    DataFlow::localFlow(pragma[only_bind_out](outp).getNode(call), outputNode)
   )
 }
 

From c79da8b2b51c3f29c4e9113f6f40bfffb97407fe Mon Sep 17 00:00:00 2001
From: Chris Smowton <chris@smowton.net>
Date: Fri, 4 Oct 2024 10:30:36 +0100
Subject: [PATCH 228/347] Avoid pathological case where getExampleMethodName
 picks a very common method name

---
 go/ql/lib/semmle/go/Types.qll | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/go/ql/lib/semmle/go/Types.qll b/go/ql/lib/semmle/go/Types.qll
index d71869aa995c..12236d73dad9 100644
--- a/go/ql/lib/semmle/go/Types.qll
+++ b/go/ql/lib/semmle/go/Types.qll
@@ -1064,10 +1064,19 @@ class ErrorType extends Type {
   ErrorType() { this.implements(Builtin::error().getType().getUnderlyingType()) }
 }
 
+/**
+ * Gets the number of types with method `name`.
+ */
+bindingset[name]
+int numberOfTypesWithMethodName(string name) { result = count(Type t | t.hasMethod(name, _)) }
+
 /**
  * Gets the name of a method in the method set of `i`.
  *
  * This is used to restrict the set of interfaces to consider in the definition of `implements`,
- * so it does not matter which method name is chosen (we use the lexicographically least).
+ * so it does not matter which method name is chosen (we use the most unusual name the interface
+ * require; this is the most discriminating and so shrinks the search space the most).
  */
-private string getExampleMethodName(InterfaceType i) { result = min(string m | i.hasMethod(m, _)) }
+private string getExampleMethodName(InterfaceType i) {
+  result = min(string m | i.hasMethod(m, _) | m order by numberOfTypesWithMethodName(m))
+}

From d401891d3086589c91844b601482eb6eca915078 Mon Sep 17 00:00:00 2001
From: Chris Smowton <chris@smowton.net>
Date: Fri, 4 Oct 2024 11:16:01 +0100
Subject: [PATCH 229/347] copyedit

---
 go/ql/lib/semmle/go/Scopes.qll | 5 -----
 go/ql/lib/semmle/go/Types.qll  | 2 +-
 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/go/ql/lib/semmle/go/Scopes.qll b/go/ql/lib/semmle/go/Scopes.qll
index 277afdb216e3..191534759ea6 100644
--- a/go/ql/lib/semmle/go/Scopes.qll
+++ b/go/ql/lib/semmle/go/Scopes.qll
@@ -587,11 +587,6 @@ class Method extends Function {
   predicate implementsIncludingInterfaceMethods(Method m) {
     this = m
     or
-    // Take all methods
-    // Get receiver type then underlying type ==> [method, recvutype]
-    // Map through Type.implements ==> [method, candtype]
-    // Get method name ==> [mname, candtype]
-    // Get corresponding method
     exists(Type t, string mname |
       t = implementsIncludingInterfaceMethodsCand(m, mname) and
       this = t.getMethod(mname)
diff --git a/go/ql/lib/semmle/go/Types.qll b/go/ql/lib/semmle/go/Types.qll
index 12236d73dad9..4818db2f774d 100644
--- a/go/ql/lib/semmle/go/Types.qll
+++ b/go/ql/lib/semmle/go/Types.qll
@@ -1075,7 +1075,7 @@ int numberOfTypesWithMethodName(string name) { result = count(Type t | t.hasMeth
  *
  * This is used to restrict the set of interfaces to consider in the definition of `implements`,
  * so it does not matter which method name is chosen (we use the most unusual name the interface
- * require; this is the most discriminating and so shrinks the search space the most).
+ * requires; this is the most discriminating and so shrinks the search space the most).
  */
 private string getExampleMethodName(InterfaceType i) {
   result = min(string m | i.hasMethod(m, _) | m order by numberOfTypesWithMethodName(m))

From 629a7a601d1aadada2dbf5a3334ff4fcfb4114ca Mon Sep 17 00:00:00 2001
From: Chris Smowton <chris@smowton.net>
Date: Tue, 8 Oct 2024 15:34:12 +0100
Subject: [PATCH 230/347] Further optimise guardingFunction: remove redundant
 condition, and order guard -> guardFunction case to work backwards from
 interesting return sites, allowing us to go backwards not forwards through
 BasicBlock::dominates

---
 .../go/dataflow/internal/DataFlowUtil.qll     | 31 +++++++++++--------
 1 file changed, 18 insertions(+), 13 deletions(-)

diff --git a/go/ql/lib/semmle/go/dataflow/internal/DataFlowUtil.qll b/go/ql/lib/semmle/go/dataflow/internal/DataFlowUtil.qll
index 75ab4dbb2ebd..68ffe57f5f59 100644
--- a/go/ql/lib/semmle/go/dataflow/internal/DataFlowUtil.qll
+++ b/go/ql/lib/semmle/go/dataflow/internal/DataFlowUtil.qll
@@ -341,6 +341,21 @@ module BarrierGuard<guardChecksSig/3 guardChecks> {
     localFlow(pragma[only_bind_out](outp.getNode(c)), resNode)
   }
 
+  private predicate onlyPossibleReturnSatisfyingProperty(
+    FuncDecl fd, FunctionOutput outp, Node ret, DataFlow::Property p
+  ) {
+    exists(boolean b |
+      onlyPossibleReturnOfBool(fd, outp, ret, b) and
+      p.isBoolean(b)
+    )
+    or
+    onlyPossibleReturnOfNonNil(fd, outp, ret) and
+    p.isNonNil()
+    or
+    onlyPossibleReturnOfNil(fd, outp, ret) and
+    p.isNil()
+  }
+
   /**
    * Holds if whenever `p` holds of output `outp` of function `f`, this node
    * is known to validate the input `inp` of `f`.
@@ -356,23 +371,13 @@ module BarrierGuard<guardChecksSig/3 guardChecks> {
     exists(FuncDecl fd, Node arg, Node ret |
       fd.getFunction() = f and
       localFlow(inp.getExitNode(fd), pragma[only_bind_out](arg)) and
-      ret = outp.getEntryNode(fd) and
       (
         // Case: a function like "if someBarrierGuard(arg) { return true } else { return false }"
         exists(ControlFlow::ConditionGuardNode guard |
-          guards(g, guard, arg) and
-          guard.dominates(ret.getBasicBlock())
+          guards(g, pragma[only_bind_out](guard), arg) and
+          guard.dominates(pragma[only_bind_out](ret).getBasicBlock())
         |
-          exists(boolean b |
-            onlyPossibleReturnOfBool(fd, outp, ret, b) and
-            p.isBoolean(b)
-          )
-          or
-          onlyPossibleReturnOfNonNil(fd, outp, ret) and
-          p.isNonNil()
-          or
-          onlyPossibleReturnOfNil(fd, outp, ret) and
-          p.isNil()
+          onlyPossibleReturnSatisfyingProperty(fd, outp, ret, p)
         )
         or
         // Case: a function like "return someBarrierGuard(arg)"

From 837387aeae62a454f37ace21ed6257045faf0675 Mon Sep 17 00:00:00 2001
From: Chris Smowton <chris@smowton.net>
Date: Tue, 8 Oct 2024 18:51:41 +0100
Subject: [PATCH 231/347] Re-optimise isSensitive routine

---
 go/ql/src/Security/CWE-798/HardcodedCredentials.ql | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/go/ql/src/Security/CWE-798/HardcodedCredentials.ql b/go/ql/src/Security/CWE-798/HardcodedCredentials.ql
index 9f88f8449f7a..37ebbad8f68b 100644
--- a/go/ql/src/Security/CWE-798/HardcodedCredentials.ql
+++ b/go/ql/src/Security/CWE-798/HardcodedCredentials.ql
@@ -17,18 +17,14 @@ import go
 import semmle.go.security.HardcodedCredentials
 import semmle.go.security.SensitiveActions
 
-bindingset[write]
-pragma[inline_late]
-private predicate isWriteRhs(Write write, DataFlow::Node rhs) { write.getRhs() = rhs }
-
 /**
  * Holds if `sink` is used in a context that suggests it may hold sensitive data of
  * the given `type`.
  */
 predicate isSensitive(DataFlow::Node sink, SensitiveExpr::Classification type) {
   exists(Write write, string name |
-    isWriteRhs(write, sink) and
-    name = write.getLhs().getName() and
+    pragma[only_bind_out](write).getRhs() = sink and
+    name = pragma[only_bind_out](write).getLhs().getName() and
     // allow obvious test password variables
     not name.regexpMatch(HeuristicNames::notSensitive())
   |

From c90d0faaf6d49931ce9a8f68d46cdabcf34912ec Mon Sep 17 00:00:00 2001
From: Jeroen Ketema <jketema@github.com>
Date: Tue, 8 Oct 2024 20:34:20 +0200
Subject: [PATCH 232/347] C++: Fix ODR violations in dataflow tests

---
 .../dataflow/dataflow-tests/flowOut.cpp       |  4 ++--
 .../dataflow/dataflow-tests/self-Iterator.cpp |  2 +-
 .../dataflow-tests/true_upon_entry.cpp        | 22 +++++++++----------
 3 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/cpp/ql/test/library-tests/dataflow/dataflow-tests/flowOut.cpp b/cpp/ql/test/library-tests/dataflow/dataflow-tests/flowOut.cpp
index d6a06361524e..a60a20f12e3a 100644
--- a/cpp/ql/test/library-tests/dataflow/dataflow-tests/flowOut.cpp
+++ b/cpp/ql/test/library-tests/dataflow/dataflow-tests/flowOut.cpp
@@ -78,7 +78,7 @@ int* deref(int** p) { // $ ast-def=p ir-def=*p ir-def=**p
   return q;
 }
 
-void test1() {
+void flowout_test1() {
   int x = 0;
   int* p = &x;
   deref(&p)[0] = source();
@@ -95,7 +95,7 @@ void addtaint2(int** p) { // $ ast-def=p ir-def=*p ir-def=**p
   addtaint1(q);
 }
 
-void test2() {
+void flowout_test2() {
   int x = 0;
   int* p = &x;
   addtaint2(&p);
diff --git a/cpp/ql/test/library-tests/dataflow/dataflow-tests/self-Iterator.cpp b/cpp/ql/test/library-tests/dataflow/dataflow-tests/self-Iterator.cpp
index cac7f222c302..3303a250ccc6 100644
--- a/cpp/ql/test/library-tests/dataflow/dataflow-tests/self-Iterator.cpp
+++ b/cpp/ql/test/library-tests/dataflow/dataflow-tests/self-Iterator.cpp
@@ -15,7 +15,7 @@ template<> struct std::iterator_traits<unsigned long>
 };
 
 
-int test() {
+int iterator_test() {
     unsigned long x = source();
     sink(x); // $ ast ir
 }
\ No newline at end of file
diff --git a/cpp/ql/test/library-tests/dataflow/dataflow-tests/true_upon_entry.cpp b/cpp/ql/test/library-tests/dataflow/dataflow-tests/true_upon_entry.cpp
index 923a7c0513d7..cb97ce325d20 100644
--- a/cpp/ql/test/library-tests/dataflow/dataflow-tests/true_upon_entry.cpp
+++ b/cpp/ql/test/library-tests/dataflow/dataflow-tests/true_upon_entry.cpp
@@ -5,7 +5,7 @@ int source();
 void sink(...);
 bool random();
 
-void test1() {
+void on_entry_test1() {
   int x = source();
   for (int i = 0; i < 10; i++) {
     x = 0;
@@ -13,7 +13,7 @@ void test1() {
   sink(x); // $ SPURIOUS: ir
 }
 
-void test2(int iterations) {
+void on_entry_test2(int iterations) {
   int x = source();
   for (int i = 0; i < iterations; i++) {
     x = 0;
@@ -21,7 +21,7 @@ void test2(int iterations) {
   sink(x); // $ ast,ir
 }
 
-void test3() {
+void on_entry_test3() {
   int x = 0;
   for (int i = 0; i < 10; i++) {
     x = source();
@@ -29,7 +29,7 @@ void test3() {
   sink(x); // $ ast,ir
 }
 
-void test4() {
+void on_entry_test4() {
   int x = source();
   for (int i = 0; i < 10; i++) {
     if (random())
@@ -39,7 +39,7 @@ void test4() {
   sink(x); // $ ast,ir
 }
 
-void test5() {
+void on_entry_test5() {
   int x = source();
   for (int i = 0; i < 10; i++) {
     if (random())
@@ -49,7 +49,7 @@ void test5() {
   sink(x); // $ ast,ir
 }
 
-void test6() {
+void on_entry_test6() {
   int y;
   int x = source();
   for (int i = 0; i < 10 && (y = 1); i++) {
@@ -57,7 +57,7 @@ void test6() {
   sink(x); // $ ast,ir
 }
 
-void test7() {
+void on_entry_test7() {
   int y;
   int x = source();
   for (int i = 0; i < 10 && (y = 1); i++) {
@@ -66,7 +66,7 @@ void test7() {
   sink(x); // $ SPURIOUS: ir
 }
 
-void test8() {
+void on_entry_test8() {
   int x = source();
   // It appears to the analysis that the condition can exit after `i < 10`
   // without having assigned to `x`. That is an effect of how the
@@ -78,7 +78,7 @@ void test8() {
   sink(x); // $ SPURIOUS: ast,ir
 }
 
-void test9() {
+void on_entry_test9() {
   int y;
   int x = source();
   for (int i = 0; (y = 1) && i < 10; i++) {
@@ -86,14 +86,14 @@ void test9() {
   sink(x); // $ ast,ir
 }
 
-void test10() {
+void on_entry_test10() {
   int x = source();
   for (int i = 0; (x = 1) && i < 10; i++) {
   }
   sink(x); // no flow
 }
 
-void test10(int b, int d) {
+void on_entry_test10(int b, int d) {
   int i = 0;
   int x = source();
   if (b)

From 723236d15b5aa0b0c863bb56603ee51f7b746cc8 Mon Sep 17 00:00:00 2001
From: Jeroen Ketema <jketema@github.com>
Date: Tue, 8 Oct 2024 15:35:16 +0200
Subject: [PATCH 233/347] C++: Add a skeleton class for requires expressions

---
 .../exprs.ql                                  |   15 +
 .../old.dbscheme                              | 2316 +++++++++++
 .../semmlecode.cpp.dbscheme                   | 2315 +++++++++++
 .../upgrade.properties                        |    3 +
 cpp/ql/lib/cpp.qll                            |    1 +
 cpp/ql/lib/semmle/code/cpp/Concept.qll        |   14 +
 cpp/ql/lib/semmlecode.cpp.dbscheme            |    1 +
 cpp/ql/lib/semmlecode.cpp.dbscheme.stats      | 3428 +++++++++--------
 .../old.dbscheme                              | 2315 +++++++++++
 .../semmlecode.cpp.dbscheme                   | 2316 +++++++++++
 .../upgrade.properties                        |    2 +
 .../library-tests/ir/ir/PrintAST.expected     |   20 +
 .../library-tests/ir/ir/aliased_ir.expected   |   18 +
 cpp/ql/test/library-tests/ir/ir/ir.cpp        |    9 +
 .../test/library-tests/ir/ir/raw_ir.expected  |   17 +
 15 files changed, 11078 insertions(+), 1712 deletions(-)
 create mode 100644 cpp/downgrades/6f5d51e89e762fe4609fd4ac8ee3afb04221e873/exprs.ql
 create mode 100644 cpp/downgrades/6f5d51e89e762fe4609fd4ac8ee3afb04221e873/old.dbscheme
 create mode 100644 cpp/downgrades/6f5d51e89e762fe4609fd4ac8ee3afb04221e873/semmlecode.cpp.dbscheme
 create mode 100644 cpp/downgrades/6f5d51e89e762fe4609fd4ac8ee3afb04221e873/upgrade.properties
 create mode 100644 cpp/ql/lib/semmle/code/cpp/Concept.qll
 create mode 100644 cpp/ql/lib/upgrades/7ff6a6e53dbcff09d1b9b758b594bc6d17366863/old.dbscheme
 create mode 100644 cpp/ql/lib/upgrades/7ff6a6e53dbcff09d1b9b758b594bc6d17366863/semmlecode.cpp.dbscheme
 create mode 100644 cpp/ql/lib/upgrades/7ff6a6e53dbcff09d1b9b758b594bc6d17366863/upgrade.properties

diff --git a/cpp/downgrades/6f5d51e89e762fe4609fd4ac8ee3afb04221e873/exprs.ql b/cpp/downgrades/6f5d51e89e762fe4609fd4ac8ee3afb04221e873/exprs.ql
new file mode 100644
index 000000000000..5c335c836fb8
--- /dev/null
+++ b/cpp/downgrades/6f5d51e89e762fe4609fd4ac8ee3afb04221e873/exprs.ql
@@ -0,0 +1,15 @@
+class Expr extends @expr {
+  string toString() { none() }
+}
+
+class Location extends @location_expr {
+  string toString() { none() }
+}
+
+predicate isExprRequires(Expr expr) { exists(int kind | exprs(expr, kind, _) | kind = 390) }
+
+from Expr expr, int kind, int kind_new, Location location
+where
+  exprs(expr, kind, location) and
+  if isExprRequires(expr) then kind_new = 1 else kind_new = kind
+select expr, kind_new, location
diff --git a/cpp/downgrades/6f5d51e89e762fe4609fd4ac8ee3afb04221e873/old.dbscheme b/cpp/downgrades/6f5d51e89e762fe4609fd4ac8ee3afb04221e873/old.dbscheme
new file mode 100644
index 000000000000..6f5d51e89e76
--- /dev/null
+++ b/cpp/downgrades/6f5d51e89e762fe4609fd4ac8ee3afb04221e873/old.dbscheme
@@ -0,0 +1,2316 @@
+
+/**
+ * An invocation of the compiler. Note that more than one file may be
+ * compiled per invocation. For example, this command compiles three
+ * source files:
+ *
+ *   gcc -c f1.c f2.c f3.c
+ *
+ * The `id` simply identifies the invocation, while `cwd` is the working
+ * directory from which the compiler was invoked.
+ */
+compilations(
+    /**
+     * An invocation of the compiler. Note that more than one file may
+     * be compiled per invocation. For example, this command compiles
+     * three source files:
+     *
+     *   gcc -c f1.c f2.c f3.c
+     */
+    unique int id : @compilation,
+    string cwd : string ref
+);
+
+/**
+ * The arguments that were passed to the extractor for a compiler
+ * invocation. If `id` is for the compiler invocation
+ *
+ *   gcc -c f1.c f2.c f3.c
+ *
+ * then typically there will be rows for
+ *
+ * num | arg
+ * --- | ---
+ * 0   | *path to extractor*
+ * 1   | `--mimic`
+ * 2   | `/usr/bin/gcc`
+ * 3   | `-c`
+ * 4   | f1.c
+ * 5   | f2.c
+ * 6   | f3.c
+ */
+#keyset[id, num]
+compilation_args(
+    int id : @compilation ref,
+    int num : int ref,
+    string arg : string ref
+);
+
+/**
+ * The source files that are compiled by a compiler invocation.
+ * If `id` is for the compiler invocation
+ *
+ *   gcc -c f1.c f2.c f3.c
+ *
+ * then there will be rows for
+ *
+ * num | arg
+ * --- | ---
+ * 0   | f1.c
+ * 1   | f2.c
+ * 2   | f3.c
+ *
+ * Note that even if those files `#include` headers, those headers
+ * do not appear as rows.
+ */
+#keyset[id, num]
+compilation_compiling_files(
+    int id : @compilation ref,
+    int num : int ref,
+    int file : @file ref
+);
+
+/**
+ * The time taken by the extractor for a compiler invocation.
+ *
+ * For each file `num`, there will be rows for
+ *
+ * kind | seconds
+ * ---- | ---
+ * 1    | CPU seconds used by the extractor frontend
+ * 2    | Elapsed seconds during the extractor frontend
+ * 3    | CPU seconds used by the extractor backend
+ * 4    | Elapsed seconds during the extractor backend
+ */
+#keyset[id, num, kind]
+compilation_time(
+    int id : @compilation ref,
+    int num : int ref,
+    /* kind:
+       1 = frontend_cpu_seconds
+       2 = frontend_elapsed_seconds
+       3 = extractor_cpu_seconds
+       4 = extractor_elapsed_seconds
+    */
+    int kind : int ref,
+    float seconds : float ref
+);
+
+/**
+ * An error or warning generated by the extractor.
+ * The diagnostic message `diagnostic` was generated during compiler
+ * invocation `compilation`, and is the `file_number_diagnostic_number`th
+ * message generated while extracting the `file_number`th file of that
+ * invocation.
+ */
+#keyset[compilation, file_number, file_number_diagnostic_number]
+diagnostic_for(
+    int diagnostic : @diagnostic ref,
+    int compilation : @compilation ref,
+    int file_number : int ref,
+    int file_number_diagnostic_number : int ref
+);
+
+/**
+ * If extraction was successful, then `cpu_seconds` and
+ * `elapsed_seconds` are the CPU time and elapsed time (respectively)
+ * that extraction took for compiler invocation `id`.
+ */
+compilation_finished(
+    unique int id : @compilation ref,
+    float cpu_seconds : float ref,
+    float elapsed_seconds : float ref
+);
+
+
+/**
+ * External data, loaded from CSV files during snapshot creation. See
+ * [Tutorial: Incorporating external data](https://help.semmle.com/wiki/display/SD/Tutorial%3A+Incorporating+external+data)
+ * for more information.
+ */
+externalData(
+    int id : @externalDataElement,
+    string path : string ref,
+    int column: int ref,
+    string value : string ref
+);
+
+/**
+ * The source location of the snapshot.
+ */
+sourceLocationPrefix(string prefix : string ref);
+
+/**
+ * Information about packages that provide code used during compilation.
+ * The `id` is just a unique identifier.
+ * The `namespace` is typically the name of the package manager that
+ * provided the package (e.g. "dpkg" or "yum").
+ * The `package_name` is the name of the package, and `version` is its
+ * version (as a string).
+ */
+external_packages(
+    unique int id: @external_package,
+    string namespace : string ref,
+    string package_name : string ref,
+    string version : string ref
+);
+
+/**
+ * Holds if File `fileid` was provided by package `package`.
+ */
+header_to_external_package(
+    int fileid : @file ref,
+    int package : @external_package ref
+);
+
+/*
+ * Version history
+ */
+
+svnentries(
+    unique int id : @svnentry,
+    string revision : string ref,
+    string author : string ref,
+    date revisionDate : date ref,
+    int changeSize : int ref
+)
+
+svnaffectedfiles(
+    int id : @svnentry ref,
+    int file : @file ref,
+    string action : string ref
+)
+
+svnentrymsg(
+    unique int id : @svnentry ref,
+    string message : string ref
+)
+
+svnchurn(
+    int commit : @svnentry ref,
+    int file : @file ref,
+    int addedLines : int ref,
+    int deletedLines : int ref
+)
+
+/*
+ * C++ dbscheme
+ */
+
+extractor_version(
+    string codeql_version: string ref,
+    string frontend_version: string ref
+)
+
+@location = @location_stmt | @location_expr | @location_default ;
+
+/**
+ * The location of an element that is not an expression or a statement.
+ * The location spans column `startcolumn` of line `startline` to
+ * column `endcolumn` of line `endline` in file `file`.
+ * For more information, see
+ * [Locations](https://codeql.github.com/docs/writing-codeql-queries/providing-locations-in-codeql-queries/).
+ */
+locations_default(
+    /** The location of an element that is not an expression or a statement. */
+    unique int id: @location_default,
+    int container: @container ref,
+    int startLine: int ref,
+    int startColumn: int ref,
+    int endLine: int ref,
+    int endColumn: int ref
+);
+
+/**
+ * The location of a statement.
+ * The location spans column `startcolumn` of line `startline` to
+ * column `endcolumn` of line `endline` in file `file`.
+ * For more information, see
+ * [Locations](https://codeql.github.com/docs/writing-codeql-queries/providing-locations-in-codeql-queries/).
+ */
+locations_stmt(
+    /** The location of a statement. */
+    unique int id: @location_stmt,
+    int container: @container ref,
+    int startLine: int ref,
+    int startColumn: int ref,
+    int endLine: int ref,
+    int endColumn: int ref
+);
+
+/**
+ * The location of an expression.
+ * The location spans column `startcolumn` of line `startline` to
+ * column `endcolumn` of line `endline` in file `file`.
+ * For more information, see
+ * [Locations](https://codeql.github.com/docs/writing-codeql-queries/providing-locations-in-codeql-queries/).
+ */
+locations_expr(
+    /** The location of an expression. */
+    unique int id: @location_expr,
+    int container: @container ref,
+    int startLine: int ref,
+    int startColumn: int ref,
+    int endLine: int ref,
+    int endColumn: int ref
+);
+
+/** An element for which line-count information is available. */
+@sourceline = @file | @function | @variable | @enumconstant | @xmllocatable;
+
+numlines(
+    int element_id: @sourceline ref,
+    int num_lines: int ref,
+    int num_code: int ref,
+    int num_comment: int ref
+);
+
+diagnostics(
+    unique int id: @diagnostic,
+    int severity: int ref,
+    string error_tag: string ref,
+    string error_message: string ref,
+    string full_error_message: string ref,
+    int location: @location_default ref
+);
+
+files(
+    unique int id: @file,
+    string name: string ref
+);
+
+folders(
+    unique int id: @folder,
+    string name: string ref
+);
+
+@container = @folder | @file
+
+containerparent(
+    int parent: @container ref,
+    unique int child: @container ref
+);
+
+fileannotations(
+    int id: @file ref,
+    int kind: int ref,
+    string name: string ref,
+    string value: string ref
+);
+
+inmacroexpansion(
+    int id: @element ref,
+    int inv: @macroinvocation ref
+);
+
+affectedbymacroexpansion(
+    int id: @element ref,
+    int inv: @macroinvocation ref
+);
+
+case @macroinvocation.kind of
+  1 = @macro_expansion
+| 2 = @other_macro_reference
+;
+
+macroinvocations(
+    unique int id: @macroinvocation,
+    int macro_id: @ppd_define ref,
+    int location: @location_default ref,
+    int kind: int ref
+);
+
+macroparent(
+    unique int id: @macroinvocation ref,
+    int parent_id: @macroinvocation ref
+);
+
+// a macroinvocation may be part of another location
+// the way to find a constant expression that uses a macro
+// is thus to find a constant expression that has a location
+// to which a macro invocation is bound
+macrolocationbind(
+    int id: @macroinvocation ref,
+    int location: @location ref
+);
+
+#keyset[invocation, argument_index]
+macro_argument_unexpanded(
+    int invocation: @macroinvocation ref,
+    int argument_index: int ref,
+    string text: string ref
+);
+
+#keyset[invocation, argument_index]
+macro_argument_expanded(
+    int invocation: @macroinvocation ref,
+    int argument_index: int ref,
+    string text: string ref
+);
+
+/*
+case @function.kind of
+  1 = @normal_function
+| 2 = @constructor
+| 3 = @destructor
+| 4 = @conversion_function
+| 5 = @operator
+| 6 = @builtin_function     // GCC built-in functions, e.g. __builtin___memcpy_chk
+| 7 = @user_defined_literal
+| 8 = @deduction_guide
+;
+*/
+
+functions(
+    unique int id: @function,
+    string name: string ref,
+    int kind: int ref
+);
+
+function_entry_point(
+    int id: @function ref,
+    unique int entry_point: @stmt ref
+);
+
+function_return_type(
+    int id: @function ref,
+    int return_type: @type ref
+);
+
+/**
+ * If `function` is a coroutine, then this gives the `std::experimental::resumable_traits`
+ * instance associated with it, and the variables representing the `handle` and `promise`
+ * for it.
+ */
+coroutine(
+  unique int function: @function ref,
+  int traits: @type ref
+);
+
+/*
+case @coroutine_placeholder_variable.kind of
+  1 = @handle
+| 2 = @promise
+| 3 = @init_await_resume
+;
+*/
+
+coroutine_placeholder_variable(
+  unique int placeholder_variable: @variable ref,
+  int kind: int ref,
+  int function: @function ref
+)
+
+/** The `new` function used for allocating the coroutine state, if any. */
+coroutine_new(
+  unique int function: @function ref,
+  int new: @function ref
+);
+
+/** The `delete` function used for deallocating the coroutine state, if any. */
+coroutine_delete(
+  unique int function: @function ref,
+  int delete: @function ref
+);
+
+purefunctions(unique int id: @function ref);
+
+function_deleted(unique int id: @function ref);
+
+function_defaulted(unique int id: @function ref);
+
+function_prototyped(unique int id: @function ref)
+
+deduction_guide_for_class(
+    int id: @function ref,
+    int class_template: @usertype ref
+)
+
+member_function_this_type(
+    unique int id: @function ref,
+    int this_type: @type ref
+);
+
+#keyset[id, type_id]
+fun_decls(
+    int id: @fun_decl,
+    int function: @function ref,
+    int type_id: @type ref,
+    string name: string ref,
+    int location: @location_default ref
+);
+fun_def(unique int id: @fun_decl ref);
+fun_specialized(unique int id: @fun_decl ref);
+fun_implicit(unique int id: @fun_decl ref);
+fun_decl_specifiers(
+    int id: @fun_decl ref,
+    string name: string ref
+)
+#keyset[fun_decl, index]
+fun_decl_throws(
+    int fun_decl: @fun_decl ref,
+    int index: int ref,
+    int type_id: @type ref
+);
+/* an empty throw specification is different from none */
+fun_decl_empty_throws(unique int fun_decl: @fun_decl ref);
+fun_decl_noexcept(
+    int fun_decl: @fun_decl ref,
+    int constant: @expr ref
+);
+fun_decl_empty_noexcept(int fun_decl: @fun_decl ref);
+fun_decl_typedef_type(
+    unique int fun_decl: @fun_decl ref,
+    int typedeftype_id: @usertype ref
+);
+
+param_decl_bind(
+    unique int id: @var_decl ref,
+    int index: int ref,
+    int fun_decl: @fun_decl ref
+);
+
+#keyset[id, type_id]
+var_decls(
+    int id: @var_decl,
+    int variable: @variable ref,
+    int type_id: @type ref,
+    string name: string ref,
+    int location: @location_default ref
+);
+var_def(unique int id: @var_decl ref);
+var_decl_specifiers(
+    int id: @var_decl ref,
+    string name: string ref
+)
+is_structured_binding(unique int id: @variable ref);
+
+type_decls(
+    unique int id: @type_decl,
+    int type_id: @type ref,
+    int location: @location_default ref
+);
+type_def(unique int id: @type_decl ref);
+type_decl_top(
+    unique int type_decl: @type_decl ref
+);
+
+namespace_decls(
+    unique int id: @namespace_decl,
+    int namespace_id: @namespace ref,
+    int location: @location_default ref,
+    int bodylocation: @location_default ref
+);
+
+case @using.kind of
+  1 = @using_declaration
+| 2 = @using_directive
+| 3 = @using_enum_declaration
+;
+
+usings(
+    unique int id: @using,
+    int element_id: @element ref,
+    int location: @location_default ref,
+    int kind: int ref
+);
+
+/** The element which contains the `using` declaration. */
+using_container(
+    int parent: @element ref,
+    int child: @using ref
+);
+
+static_asserts(
+    unique int id: @static_assert,
+    int condition : @expr ref,
+    string message : string ref,
+    int location: @location_default ref,
+    int enclosing : @element ref
+);
+
+// each function has an ordered list of parameters
+#keyset[id, type_id]
+#keyset[function, index, type_id]
+params(
+    int id: @parameter,
+    int function: @functionorblock ref,
+    int index: int ref,
+    int type_id: @type ref
+);
+
+overrides(
+    int new: @function ref,
+    int old: @function ref
+);
+
+#keyset[id, type_id]
+membervariables(
+    int id: @membervariable,
+    int type_id: @type ref,
+    string name: string ref
+);
+
+#keyset[id, type_id]
+globalvariables(
+    int id: @globalvariable,
+    int type_id: @type ref,
+    string name: string ref
+);
+
+#keyset[id, type_id]
+localvariables(
+    int id: @localvariable,
+    int type_id: @type ref,
+    string name: string ref
+);
+
+autoderivation(
+    unique int var: @variable ref,
+    int derivation_type: @type ref
+);
+
+orphaned_variables(
+    int var: @localvariable ref,
+    int function: @function ref
+)
+
+enumconstants(
+    unique int id: @enumconstant,
+    int parent: @usertype ref,
+    int index: int ref,
+    int type_id: @type ref,
+    string name: string ref,
+    int location: @location_default ref
+);
+
+@variable = @localscopevariable | @globalvariable | @membervariable;
+
+@localscopevariable = @localvariable | @parameter;
+
+/**
+ * Built-in types are the fundamental types, e.g., integral, floating, and void.
+ */
+case @builtintype.kind of
+   1 = @errortype
+|  2 = @unknowntype
+|  3 = @void
+|  4 = @boolean
+|  5 = @char
+|  6 = @unsigned_char
+|  7 = @signed_char
+|  8 = @short
+|  9 = @unsigned_short
+| 10 = @signed_short
+| 11 = @int
+| 12 = @unsigned_int
+| 13 = @signed_int
+| 14 = @long
+| 15 = @unsigned_long
+| 16 = @signed_long
+| 17 = @long_long
+| 18 = @unsigned_long_long
+| 19 = @signed_long_long
+// ... 20 Microsoft-specific __int8
+// ... 21 Microsoft-specific __int16
+// ... 22 Microsoft-specific __int32
+// ... 23 Microsoft-specific __int64
+| 24 = @float
+| 25 = @double
+| 26 = @long_double
+| 27 = @complex_float         // C99-specific _Complex float
+| 28 = @complex_double        // C99-specific _Complex double
+| 29 = @complex_long_double   // C99-specific _Complex long double
+| 30 = @imaginary_float       // C99-specific _Imaginary float
+| 31 = @imaginary_double      // C99-specific _Imaginary double
+| 32 = @imaginary_long_double // C99-specific _Imaginary long double
+| 33 = @wchar_t               // Microsoft-specific
+| 34 = @decltype_nullptr      // C++11
+| 35 = @int128                // __int128
+| 36 = @unsigned_int128       // unsigned __int128
+| 37 = @signed_int128         // signed __int128
+| 38 = @float128              // __float128
+| 39 = @complex_float128      // _Complex __float128
+| 40 = @decimal32             // _Decimal32
+| 41 = @decimal64             // _Decimal64
+| 42 = @decimal128            // _Decimal128
+| 43 = @char16_t
+| 44 = @char32_t
+| 45 = @std_float32           // _Float32
+| 46 = @float32x              // _Float32x
+| 47 = @std_float64           // _Float64
+| 48 = @float64x              // _Float64x
+| 49 = @std_float128          // _Float128
+// ... 50 _Float128x
+| 51 = @char8_t
+| 52 = @float16               // _Float16
+| 53 = @complex_float16       // _Complex _Float16
+| 54 = @fp16                  // __fp16
+| 55 = @std_bfloat16          // __bf16
+| 56 = @std_float16           // std::float16_t
+| 57 = @complex_std_float32   // _Complex _Float32
+| 58 = @complex_float32x      // _Complex _Float32x
+| 59 = @complex_std_float64   // _Complex _Float64
+| 60 = @complex_float64x      // _Complex _Float64x
+| 61 = @complex_std_float128  // _Complex _Float128
+;
+
+builtintypes(
+    unique int id: @builtintype,
+    string name: string ref,
+    int kind: int ref,
+    int size: int ref,
+    int sign: int ref,
+    int alignment: int ref
+);
+
+/**
+ * Derived types are types that are directly derived from existing types and
+ * point to, refer to, transform type data to return a new type.
+ */
+case @derivedtype.kind of
+   1 = @pointer
+|  2 = @reference
+|  3 = @type_with_specifiers
+|  4 = @array
+|  5 = @gnu_vector
+|  6 = @routineptr
+|  7 = @routinereference
+|  8 = @rvalue_reference // C++11
+// ... 9 type_conforming_to_protocols deprecated
+| 10 = @block
+;
+
+derivedtypes(
+    unique int id: @derivedtype,
+    string name: string ref,
+    int kind: int ref,
+    int type_id: @type ref
+);
+
+pointerishsize(unique int id: @derivedtype ref,
+    int size: int ref,
+    int alignment: int ref);
+
+arraysizes(
+    unique int id: @derivedtype ref,
+    int num_elements: int ref,
+    int bytesize: int ref,
+    int alignment: int ref
+);
+
+typedefbase(
+    unique int id: @usertype ref,
+    int type_id: @type ref
+);
+
+/**
+ * An instance of the C++11 `decltype` operator.  For example:
+ * ```
+ * int a;
+ * decltype(1+a) b;
+ * ```
+ * Here `expr` is `1+a`.
+ *
+ * Sometimes an additional pair of parentheses around the expression
+ * would change the semantics of this decltype, e.g.
+ * ```
+ * struct A { double x; };
+ * const A* a = new A();
+ * decltype( a->x ); // type is double
+ * decltype((a->x)); // type is const double&
+ * ```
+ * (Please consult the C++11 standard for more details).
+ * `parentheses_would_change_meaning` is `true` iff that is the case.
+ */
+#keyset[id, expr]
+decltypes(
+    int id: @decltype,
+    int expr: @expr ref,
+    int base_type: @type ref,
+    boolean parentheses_would_change_meaning: boolean ref
+);
+
+/*
+case @usertype.kind of
+   1 = @struct
+|  2 = @class
+|  3 = @union
+|  4 = @enum
+|  5 = @typedef                       // classic C: typedef typedef type name
+|  6 = @template
+|  7 = @template_parameter
+|  8 = @template_template_parameter
+|  9 = @proxy_class                   // a proxy class associated with a template parameter
+// ... 10 objc_class deprecated
+// ... 11 objc_protocol deprecated
+// ... 12 objc_category deprecated
+| 13 = @scoped_enum
+| 14 = @using_alias                  // a using name = type style typedef
+;
+*/
+
+usertypes(
+    unique int id: @usertype,
+    string name: string ref,
+    int kind: int ref
+);
+
+usertypesize(
+    unique int id: @usertype ref,
+    int size: int ref,
+    int alignment: int ref
+);
+
+usertype_final(unique int id: @usertype ref);
+
+usertype_uuid(
+    unique int id: @usertype ref,
+    string uuid: string ref
+);
+
+mangled_name(
+    unique int id: @declaration ref,
+    int mangled_name : @mangledname,
+    boolean is_complete: boolean ref
+);
+
+is_pod_class(unique int id: @usertype ref);
+is_standard_layout_class(unique int id: @usertype ref);
+
+is_complete(unique int id: @usertype ref);
+
+is_class_template(unique int id: @usertype ref);
+class_instantiation(
+    int to: @usertype ref,
+    int from: @usertype ref
+);
+class_template_argument(
+    int type_id: @usertype ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+class_template_argument_value(
+    int type_id: @usertype ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+
+is_proxy_class_for(
+    unique int id: @usertype ref,
+    unique int templ_param_id: @usertype ref
+);
+
+type_mentions(
+    unique int id: @type_mention,
+    int type_id: @type ref,
+    int location: @location ref,
+    // a_symbol_reference_kind from the frontend.
+    int kind: int ref
+);
+
+is_function_template(unique int id: @function ref);
+function_instantiation(
+    unique int to: @function ref,
+    int from: @function ref
+);
+function_template_argument(
+    int function_id: @function ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+function_template_argument_value(
+    int function_id: @function ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+
+is_variable_template(unique int id: @variable ref);
+variable_instantiation(
+    unique int to: @variable ref,
+    int from: @variable ref
+);
+variable_template_argument(
+    int variable_id: @variable ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+variable_template_argument_value(
+    int variable_id: @variable ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+
+routinetypes(
+    unique int id: @routinetype,
+    int return_type: @type ref
+);
+
+routinetypeargs(
+    int routine: @routinetype ref,
+    int index: int ref,
+    int type_id: @type ref
+);
+
+ptrtomembers(
+    unique int id: @ptrtomember,
+    int type_id: @type ref,
+    int class_id: @type ref
+);
+
+/*
+ specifiers for types, functions, and variables
+
+    "public",
+    "protected",
+    "private",
+
+    "const",
+    "volatile",
+    "static",
+
+    "pure",
+    "virtual",
+    "sealed", // Microsoft
+    "__interface", // Microsoft
+    "inline",
+    "explicit",
+
+    "near", // near far extension
+    "far", // near far extension
+    "__ptr32", // Microsoft
+    "__ptr64", // Microsoft
+    "__sptr", // Microsoft
+    "__uptr", // Microsoft
+    "dllimport", // Microsoft
+    "dllexport", // Microsoft
+    "thread", // Microsoft
+    "naked", // Microsoft
+    "microsoft_inline", // Microsoft
+    "forceinline", // Microsoft
+    "selectany", // Microsoft
+    "nothrow", // Microsoft
+    "novtable", // Microsoft
+    "noreturn", // Microsoft
+    "noinline", // Microsoft
+    "noalias", // Microsoft
+    "restrict", // Microsoft
+*/
+
+specifiers(
+    unique int id: @specifier,
+    unique string str: string ref
+);
+
+typespecifiers(
+    int type_id: @type ref,
+    int spec_id: @specifier ref
+);
+
+funspecifiers(
+    int func_id: @function ref,
+    int spec_id: @specifier ref
+);
+
+varspecifiers(
+    int var_id: @accessible ref,
+    int spec_id: @specifier ref
+);
+
+explicit_specifier_exprs(
+    unique int func_id: @function ref,
+    int constant: @expr ref
+)
+
+attributes(
+    unique int id: @attribute,
+    int kind: int ref,
+    string name: string ref,
+    string name_space: string ref,
+    int location: @location_default ref
+);
+
+case @attribute.kind of
+  0 = @gnuattribute
+| 1 = @stdattribute
+| 2 = @declspec
+| 3 = @msattribute
+| 4 = @alignas
+// ... 5 @objc_propertyattribute deprecated
+;
+
+attribute_args(
+    unique int id: @attribute_arg,
+    int kind: int ref,
+    int attribute: @attribute ref,
+    int index: int ref,
+    int location: @location_default ref
+);
+
+case @attribute_arg.kind of
+  0 = @attribute_arg_empty
+| 1 = @attribute_arg_token
+| 2 = @attribute_arg_constant
+| 3 = @attribute_arg_type
+| 4 = @attribute_arg_constant_expr
+| 5 = @attribute_arg_expr
+;
+
+attribute_arg_value(
+    unique int arg: @attribute_arg ref,
+    string value: string ref
+);
+attribute_arg_type(
+    unique int arg: @attribute_arg ref,
+    int type_id: @type ref
+);
+attribute_arg_constant(
+    unique int arg: @attribute_arg ref,
+    int constant: @expr ref
+)
+attribute_arg_expr(
+    unique int arg: @attribute_arg ref,
+    int expr: @expr ref
+)
+attribute_arg_name(
+    unique int arg: @attribute_arg ref,
+    string name: string ref
+);
+
+typeattributes(
+    int type_id: @type ref,
+    int spec_id: @attribute ref
+);
+
+funcattributes(
+    int func_id: @function ref,
+    int spec_id: @attribute ref
+);
+
+varattributes(
+    int var_id: @accessible ref,
+    int spec_id: @attribute ref
+);
+
+stmtattributes(
+    int stmt_id: @stmt ref,
+    int spec_id: @attribute ref
+);
+
+@type = @builtintype
+      | @derivedtype
+      | @usertype
+      /* TODO | @fixedpointtype */
+      | @routinetype
+      | @ptrtomember
+      | @decltype;
+
+unspecifiedtype(
+    unique int type_id: @type ref,
+    int unspecified_type_id: @type ref
+);
+
+member(
+    int parent: @type ref,
+    int index: int ref,
+    int child: @member ref
+);
+
+@enclosingfunction_child = @usertype | @variable | @namespace
+
+enclosingfunction(
+    unique int child: @enclosingfunction_child ref,
+    int parent: @function ref
+);
+
+derivations(
+    unique int derivation: @derivation,
+    int sub: @type ref,
+    int index: int ref,
+    int super: @type ref,
+    int location: @location_default ref
+);
+
+derspecifiers(
+    int der_id: @derivation ref,
+    int spec_id: @specifier ref
+);
+
+/**
+ * Contains the byte offset of the base class subobject within the derived
+ * class. Only holds for non-virtual base classes, but see table
+ * `virtual_base_offsets` for offsets of virtual base class subobjects.
+ */
+direct_base_offsets(
+    unique int der_id: @derivation ref,
+    int offset: int ref
+);
+
+/**
+ * Contains the byte offset of the virtual base class subobject for class
+ * `super` within a most-derived object of class `sub`. `super` can be either a
+ * direct or indirect base class.
+ */
+#keyset[sub, super]
+virtual_base_offsets(
+    int sub: @usertype ref,
+    int super: @usertype ref,
+    int offset: int ref
+);
+
+frienddecls(
+    unique int id: @frienddecl,
+    int type_id: @type ref,
+    int decl_id: @declaration ref,
+    int location: @location_default ref
+);
+
+@declaredtype = @usertype ;
+
+@declaration = @function
+             | @declaredtype
+             | @variable
+             | @enumconstant
+             | @frienddecl;
+
+@member = @membervariable
+        | @function
+        | @declaredtype
+        | @enumconstant;
+
+@locatable = @diagnostic
+           | @declaration
+           | @ppd_include
+           | @ppd_define
+           | @macroinvocation
+           /*| @funcall*/
+           | @xmllocatable
+           | @attribute
+           | @attribute_arg;
+
+@namedscope = @namespace | @usertype;
+
+@element = @locatable
+         | @file
+         | @folder
+         | @specifier
+         | @type
+         | @expr
+         | @namespace
+         | @initialiser
+         | @stmt
+         | @derivation
+         | @comment
+         | @preprocdirect
+         | @fun_decl
+         | @var_decl
+         | @type_decl
+         | @namespace_decl
+         | @using
+         | @namequalifier
+         | @specialnamequalifyingelement
+         | @static_assert
+         | @type_mention
+         | @lambdacapture;
+
+@exprparent = @element;
+
+comments(
+    unique int id: @comment,
+    string contents: string ref,
+    int location: @location_default ref
+);
+
+commentbinding(
+    int id: @comment ref,
+    int element: @element ref
+);
+
+exprconv(
+    int converted: @expr ref,
+    unique int conversion: @expr ref
+);
+
+compgenerated(unique int id: @element ref);
+
+/**
+ * `destructor_call` destructs the `i`'th entity that should be
+ * destructed following `element`. Note that entities should be
+ * destructed in reverse construction order, so for a given `element`
+ * these should be called from highest to lowest `i`.
+ */
+#keyset[element, destructor_call]
+#keyset[element, i]
+synthetic_destructor_call(
+    int element: @element ref,
+    int i: int ref,
+    int destructor_call: @routineexpr ref
+);
+
+namespaces(
+    unique int id: @namespace,
+    string name: string ref
+);
+
+namespace_inline(
+    unique int id: @namespace ref
+);
+
+namespacembrs(
+    int parentid: @namespace ref,
+    unique int memberid: @namespacembr ref
+);
+
+@namespacembr = @declaration | @namespace;
+
+exprparents(
+    int expr_id: @expr ref,
+    int child_index: int ref,
+    int parent_id: @exprparent ref
+);
+
+expr_isload(unique int expr_id: @expr ref);
+
+@cast = @c_style_cast
+      | @const_cast
+      | @dynamic_cast
+      | @reinterpret_cast
+      | @static_cast
+      ;
+
+/*
+case @conversion.kind of
+  0 = @simple_conversion           // a numeric conversion, qualification conversion, or a reinterpret_cast
+| 1 = @bool_conversion             // conversion to 'bool'
+| 2 = @base_class_conversion       // a derived-to-base conversion
+| 3 = @derived_class_conversion    // a base-to-derived conversion
+| 4 = @pm_base_class_conversion    // a derived-to-base conversion of a pointer to member
+| 5 = @pm_derived_class_conversion // a base-to-derived conversion of a pointer to member
+| 6 = @glvalue_adjust              // an adjustment of the type of a glvalue
+| 7 = @prvalue_adjust              // an adjustment of the type of a prvalue
+;
+*/
+/**
+ * Describes the semantics represented by a cast expression. This is largely
+ * independent of the source syntax of the cast, so it is separate from the
+ * regular expression kind.
+ */
+conversionkinds(
+    unique int expr_id: @cast ref,
+    int kind: int ref
+);
+
+@conversion = @cast
+            | @array_to_pointer
+            | @parexpr
+            | @reference_to
+            | @ref_indirect
+            | @temp_init
+            | @c11_generic
+            ;
+
+/*
+case @funbindexpr.kind of
+  0 = @normal_call  // a normal call
+| 1 = @virtual_call // a virtual call
+| 2 = @adl_call     // a call whose target is only found by ADL
+;
+*/
+iscall(
+    unique int caller: @funbindexpr ref,
+    int kind: int ref
+);
+
+numtemplatearguments(
+    unique int expr_id: @expr ref,
+    int num: int ref
+);
+
+specialnamequalifyingelements(
+    unique int id: @specialnamequalifyingelement,
+    unique string name: string ref
+);
+
+@namequalifiableelement = @expr | @namequalifier;
+@namequalifyingelement = @namespace
+                       | @specialnamequalifyingelement
+                       | @usertype;
+
+namequalifiers(
+    unique int id: @namequalifier,
+    unique int qualifiableelement: @namequalifiableelement ref,
+    int qualifyingelement: @namequalifyingelement ref,
+    int location: @location_default ref
+);
+
+varbind(
+    int expr: @varbindexpr ref,
+    int var: @accessible ref
+);
+
+funbind(
+    int expr: @funbindexpr ref,
+    int fun: @function ref
+);
+
+@any_new_expr = @new_expr
+              | @new_array_expr;
+
+@new_or_delete_expr = @any_new_expr
+                    | @delete_expr
+                    | @delete_array_expr;
+
+@prefix_crement_expr = @preincrexpr | @predecrexpr;
+
+@postfix_crement_expr = @postincrexpr | @postdecrexpr;
+
+@increment_expr = @preincrexpr | @postincrexpr;
+
+@decrement_expr = @predecrexpr | @postdecrexpr;
+
+@crement_expr = @increment_expr | @decrement_expr;
+
+@un_arith_op_expr = @arithnegexpr
+                  | @unaryplusexpr
+                  | @conjugation
+                  | @realpartexpr
+                  | @imagpartexpr
+                  | @crement_expr
+                  ;
+
+@un_bitwise_op_expr = @complementexpr;
+
+@un_log_op_expr = @notexpr;
+
+@un_op_expr = @address_of
+            | @indirect
+            | @un_arith_op_expr
+            | @un_bitwise_op_expr
+            | @builtinaddressof
+            | @vec_fill
+            | @un_log_op_expr
+            | @co_await
+            | @co_yield
+            ;
+
+@bin_log_op_expr = @andlogicalexpr | @orlogicalexpr;
+
+@cmp_op_expr = @eq_op_expr | @rel_op_expr;
+
+@eq_op_expr = @eqexpr | @neexpr;
+
+@rel_op_expr = @gtexpr
+             | @ltexpr
+             | @geexpr
+             | @leexpr
+             | @spaceshipexpr
+             ;
+
+@bin_bitwise_op_expr = @lshiftexpr
+                     | @rshiftexpr
+                     | @andexpr
+                     | @orexpr
+                     | @xorexpr
+                     ;
+
+@p_arith_op_expr = @paddexpr
+                 | @psubexpr
+                 | @pdiffexpr
+                 ;
+
+@bin_arith_op_expr = @addexpr
+                   | @subexpr
+                   | @mulexpr
+                   | @divexpr
+                   | @remexpr
+                   | @jmulexpr
+                   | @jdivexpr
+                   | @fjaddexpr
+                   | @jfaddexpr
+                   | @fjsubexpr
+                   | @jfsubexpr
+                   | @minexpr
+                   | @maxexpr
+                   | @p_arith_op_expr
+                   ;
+
+@bin_op_expr = @bin_arith_op_expr
+             | @bin_bitwise_op_expr
+             | @cmp_op_expr
+             | @bin_log_op_expr
+             ;
+
+@op_expr = @un_op_expr
+         | @bin_op_expr
+         | @assign_expr
+         | @conditionalexpr
+         ;
+
+@assign_arith_expr = @assignaddexpr
+                   | @assignsubexpr
+                   | @assignmulexpr
+                   | @assigndivexpr
+                   | @assignremexpr
+                   ;
+
+@assign_bitwise_expr = @assignandexpr
+                     | @assignorexpr
+                     | @assignxorexpr
+                     | @assignlshiftexpr
+                     | @assignrshiftexpr
+                     ;
+
+@assign_pointer_expr = @assignpaddexpr
+                     | @assignpsubexpr
+                     ;
+
+@assign_op_expr = @assign_arith_expr
+                | @assign_bitwise_expr
+                | @assign_pointer_expr
+                ;
+
+@assign_expr = @assignexpr | @assign_op_expr | @blockassignexpr
+
+/*
+  Binary encoding of the allocator form.
+
+  case @allocator.form of
+    0 = plain
+  | 1 = alignment
+  ;
+*/
+
+/**
+ * The allocator function associated with a `new` or `new[]` expression.
+ * The `form` column specified whether the allocation call contains an alignment
+ * argument.
+ */
+expr_allocator(
+    unique int expr: @any_new_expr ref,
+    int func: @function ref,
+    int form: int ref
+);
+
+/*
+  Binary encoding of the deallocator form.
+
+  case @deallocator.form of
+    0 = plain
+  | 1 = size
+  | 2 = alignment
+  | 4 = destroying_delete
+  ;
+*/
+
+/**
+ * The deallocator function associated with a `delete`, `delete[]`, `new`, or
+ * `new[]` expression. For a `new` or `new[]` expression, the deallocator is the
+ * one used to free memory if the initialization throws an exception.
+ * The `form` column specifies whether the deallocation call contains a size
+ * argument, and alignment argument, or both.
+ */
+expr_deallocator(
+    unique int expr: @new_or_delete_expr ref,
+    int func: @function ref,
+    int form: int ref
+);
+
+/**
+ * Holds if the `@conditionalexpr` is of the two operand form
+ * `guard ? : false`.
+ */
+expr_cond_two_operand(
+    unique int cond: @conditionalexpr ref
+);
+
+/**
+ * The guard of `@conditionalexpr` `guard ? true : false`
+ */
+expr_cond_guard(
+    unique int cond: @conditionalexpr ref,
+    int guard: @expr ref
+);
+
+/**
+ * The expression used when the guard of `@conditionalexpr`
+ * `guard ? true : false` holds. For the two operand form
+ * `guard ?: false` consider using `expr_cond_guard` instead.
+ */
+expr_cond_true(
+    unique int cond: @conditionalexpr ref,
+    int true: @expr ref
+);
+
+/**
+ * The expression used when the guard of `@conditionalexpr`
+ * `guard ? true : false` does not hold.
+ */
+expr_cond_false(
+    unique int cond: @conditionalexpr ref,
+    int false: @expr ref
+);
+
+/** A string representation of the value. */
+values(
+    unique int id: @value,
+    string str: string ref
+);
+
+/** The actual text in the source code for the value, if any. */
+valuetext(
+    unique int id: @value ref,
+    string text: string ref
+);
+
+valuebind(
+    int val: @value ref,
+    unique int expr: @expr ref
+);
+
+fieldoffsets(
+    unique int id: @variable ref,
+    int byteoffset: int ref,
+    int bitoffset: int ref
+);
+
+bitfield(
+    unique int id: @variable ref,
+    int bits: int ref,
+    int declared_bits: int ref
+);
+
+/* TODO
+memberprefix(
+    int member: @expr ref,
+    int prefix: @expr ref
+);
+*/
+
+/*
+   kind(1) = mbrcallexpr
+   kind(2) = mbrptrcallexpr
+   kind(3) = mbrptrmbrcallexpr
+   kind(4) = ptrmbrptrmbrcallexpr
+   kind(5) = mbrreadexpr // x.y
+   kind(6) = mbrptrreadexpr // p->y
+   kind(7) = mbrptrmbrreadexpr // x.*pm
+   kind(8) = mbrptrmbrptrreadexpr // x->*pm
+   kind(9) = staticmbrreadexpr // static x.y
+   kind(10) = staticmbrptrreadexpr // static p->y
+*/
+/* TODO
+memberaccess(
+    int member: @expr ref,
+    int kind: int ref
+);
+*/
+
+initialisers(
+    unique int init: @initialiser,
+    int var: @accessible ref,
+    unique int expr: @expr ref,
+    int location: @location_expr ref
+);
+
+braced_initialisers(
+    int init: @initialiser ref
+);
+
+/**
+ * An ancestor for the expression, for cases in which we cannot
+ * otherwise find the expression's parent.
+ */
+expr_ancestor(
+    int exp: @expr ref,
+    int ancestor: @element ref
+);
+
+exprs(
+    unique int id: @expr,
+    int kind: int ref,
+    int location: @location_expr ref
+);
+
+expr_reuse(
+    int reuse: @expr ref,
+    int original: @expr ref,
+    int value_category: int ref
+)
+
+/*
+  case @value.category of
+    1 = prval
+  | 2 = xval
+  | 3 = lval
+  ;
+*/
+expr_types(
+    int id: @expr ref,
+    int typeid: @type ref,
+    int value_category: int ref
+);
+
+case @expr.kind of
+    1 = @errorexpr
+|   2 = @address_of // & AddressOfExpr
+|   3 = @reference_to // ReferenceToExpr (implicit?)
+|   4 = @indirect // * PointerDereferenceExpr
+|   5 = @ref_indirect // ReferenceDereferenceExpr (implicit?)
+// ...
+|   8 = @array_to_pointer // (???)
+|   9 = @vacuous_destructor_call // VacuousDestructorCall
+// ...
+|  11 = @assume // Microsoft
+|  12 = @parexpr
+|  13 = @arithnegexpr
+|  14 = @unaryplusexpr
+|  15 = @complementexpr
+|  16 = @notexpr
+|  17 = @conjugation // GNU ~ operator
+|  18 = @realpartexpr // GNU __real
+|  19 = @imagpartexpr // GNU __imag
+|  20 = @postincrexpr
+|  21 = @postdecrexpr
+|  22 = @preincrexpr
+|  23 = @predecrexpr
+|  24 = @conditionalexpr
+|  25 = @addexpr
+|  26 = @subexpr
+|  27 = @mulexpr
+|  28 = @divexpr
+|  29 = @remexpr
+|  30 = @jmulexpr // C99 mul imaginary
+|  31 = @jdivexpr // C99 div imaginary
+|  32 = @fjaddexpr // C99 add real + imaginary
+|  33 = @jfaddexpr // C99 add imaginary + real
+|  34 = @fjsubexpr // C99 sub real - imaginary
+|  35 = @jfsubexpr // C99 sub imaginary - real
+|  36 = @paddexpr // pointer add (pointer + int or int + pointer)
+|  37 = @psubexpr // pointer sub (pointer - integer)
+|  38 = @pdiffexpr // difference between two pointers
+|  39 = @lshiftexpr
+|  40 = @rshiftexpr
+|  41 = @andexpr
+|  42 = @orexpr
+|  43 = @xorexpr
+|  44 = @eqexpr
+|  45 = @neexpr
+|  46 = @gtexpr
+|  47 = @ltexpr
+|  48 = @geexpr
+|  49 = @leexpr
+|  50 = @minexpr // GNU minimum
+|  51 = @maxexpr // GNU maximum
+|  52 = @assignexpr
+|  53 = @assignaddexpr
+|  54 = @assignsubexpr
+|  55 = @assignmulexpr
+|  56 = @assigndivexpr
+|  57 = @assignremexpr
+|  58 = @assignlshiftexpr
+|  59 = @assignrshiftexpr
+|  60 = @assignandexpr
+|  61 = @assignorexpr
+|  62 = @assignxorexpr
+|  63 = @assignpaddexpr // assign pointer add
+|  64 = @assignpsubexpr // assign pointer sub
+|  65 = @andlogicalexpr
+|  66 = @orlogicalexpr
+|  67 = @commaexpr
+|  68 = @subscriptexpr // access to member of an array, e.g., a[5]
+// ...  69 @objc_subscriptexpr deprecated
+// ...  70 @cmdaccess deprecated
+// ...
+|  73 = @virtfunptrexpr
+|  74 = @callexpr
+// ...  75 @msgexpr_normal deprecated
+// ...  76 @msgexpr_super deprecated
+// ...  77 @atselectorexpr deprecated
+// ...  78 @atprotocolexpr deprecated
+|  79 = @vastartexpr
+|  80 = @vaargexpr
+|  81 = @vaendexpr
+|  82 = @vacopyexpr
+// ...  83 @atencodeexpr deprecated
+|  84 = @varaccess
+|  85 = @thisaccess
+// ...  86 @objc_box_expr deprecated
+|  87 = @new_expr
+|  88 = @delete_expr
+|  89 = @throw_expr
+|  90 = @condition_decl // a variable declared in a condition, e.g., if(int x = y > 2)
+|  91 = @braced_init_list
+|  92 = @type_id
+|  93 = @runtime_sizeof
+|  94 = @runtime_alignof
+|  95 = @sizeof_pack
+|  96 = @expr_stmt // GNU extension
+|  97 = @routineexpr
+|  98 = @type_operand // used to access a type in certain contexts (haven't found any examples yet....)
+|  99 = @offsetofexpr // offsetof ::= type and field
+| 100 = @hasassignexpr // __has_assign ::= type
+| 101 = @hascopyexpr // __has_copy ::= type
+| 102 = @hasnothrowassign // __has_nothrow_assign ::= type
+| 103 = @hasnothrowconstr // __has_nothrow_constructor ::= type
+| 104 = @hasnothrowcopy // __has_nothrow_copy ::= type
+| 105 = @hastrivialassign // __has_trivial_assign ::= type
+| 106 = @hastrivialconstr // __has_trivial_constructor ::= type
+| 107 = @hastrivialcopy // __has_trivial_copy ::= type
+| 108 = @hasuserdestr // __has_user_destructor ::= type
+| 109 = @hasvirtualdestr // __has_virtual_destructor ::= type
+| 110 = @isabstractexpr // __is_abstract ::= type
+| 111 = @isbaseofexpr // __is_base_of ::= type type
+| 112 = @isclassexpr // __is_class ::= type
+| 113 = @isconvtoexpr // __is_convertible_to ::= type type
+| 114 = @isemptyexpr // __is_empty ::= type
+| 115 = @isenumexpr // __is_enum ::= type
+| 116 = @ispodexpr // __is_pod ::= type
+| 117 = @ispolyexpr // __is_polymorphic ::= type
+| 118 = @isunionexpr // __is_union ::= type
+| 119 = @typescompexpr // GNU __builtin_types_compatible ::= type type
+| 120 = @intaddrexpr // frontend internal builtin, used to implement offsetof
+// ...
+| 122 = @hastrivialdestructor // __has_trivial_destructor ::= type
+| 123 = @literal
+| 124 = @uuidof
+| 127 = @aggregateliteral
+| 128 = @delete_array_expr
+| 129 = @new_array_expr
+// ... 130 @objc_array_literal deprecated
+// ... 131 @objc_dictionary_literal deprecated
+| 132 = @foldexpr
+// ...
+| 200 = @ctordirectinit
+| 201 = @ctorvirtualinit
+| 202 = @ctorfieldinit
+| 203 = @ctordelegatinginit
+| 204 = @dtordirectdestruct
+| 205 = @dtorvirtualdestruct
+| 206 = @dtorfielddestruct
+// ...
+| 210 = @static_cast
+| 211 = @reinterpret_cast
+| 212 = @const_cast
+| 213 = @dynamic_cast
+| 214 = @c_style_cast
+| 215 = @lambdaexpr
+| 216 = @param_ref
+| 217 = @noopexpr
+// ...
+| 294 = @istriviallyconstructibleexpr
+| 295 = @isdestructibleexpr
+| 296 = @isnothrowdestructibleexpr
+| 297 = @istriviallydestructibleexpr
+| 298 = @istriviallyassignableexpr
+| 299 = @isnothrowassignableexpr
+| 300 = @istrivialexpr
+| 301 = @isstandardlayoutexpr
+| 302 = @istriviallycopyableexpr
+| 303 = @isliteraltypeexpr
+| 304 = @hastrivialmoveconstructorexpr
+| 305 = @hastrivialmoveassignexpr
+| 306 = @hasnothrowmoveassignexpr
+| 307 = @isconstructibleexpr
+| 308 = @isnothrowconstructibleexpr
+| 309 = @hasfinalizerexpr
+| 310 = @isdelegateexpr
+| 311 = @isinterfaceclassexpr
+| 312 = @isrefarrayexpr
+| 313 = @isrefclassexpr
+| 314 = @issealedexpr
+| 315 = @issimplevalueclassexpr
+| 316 = @isvalueclassexpr
+| 317 = @isfinalexpr
+| 319 = @noexceptexpr
+| 320 = @builtinshufflevector
+| 321 = @builtinchooseexpr
+| 322 = @builtinaddressof
+| 323 = @vec_fill
+| 324 = @builtinconvertvector
+| 325 = @builtincomplex
+| 326 = @spaceshipexpr
+| 327 = @co_await
+| 328 = @co_yield
+| 329 = @temp_init
+| 330 = @isassignable
+| 331 = @isaggregate
+| 332 = @hasuniqueobjectrepresentations
+| 333 = @builtinbitcast
+| 334 = @builtinshuffle
+| 335 = @blockassignexpr
+| 336 = @issame
+| 337 = @isfunction
+| 338 = @islayoutcompatible
+| 339 = @ispointerinterconvertiblebaseof
+| 340 = @isarray
+| 341 = @arrayrank
+| 342 = @arrayextent
+| 343 = @isarithmetic
+| 344 = @iscompletetype
+| 345 = @iscompound
+| 346 = @isconst
+| 347 = @isfloatingpoint
+| 348 = @isfundamental
+| 349 = @isintegral
+| 350 = @islvaluereference
+| 351 = @ismemberfunctionpointer
+| 352 = @ismemberobjectpointer
+| 353 = @ismemberpointer
+| 354 = @isobject
+| 355 = @ispointer
+| 356 = @isreference
+| 357 = @isrvaluereference
+| 358 = @isscalar
+| 359 = @issigned
+| 360 = @isunsigned
+| 361 = @isvoid
+| 362 = @isvolatile
+| 363 = @reuseexpr
+| 364 = @istriviallycopyassignable
+| 365 = @isassignablenopreconditioncheck
+| 366 = @referencebindstotemporary
+| 367 = @issameas
+| 368 = @builtinhasattribute
+| 369 = @ispointerinterconvertiblewithclass
+| 370 = @builtinispointerinterconvertiblewithclass
+| 371 = @iscorrespondingmember
+| 372 = @builtiniscorrespondingmember
+| 373 = @isboundedarray
+| 374 = @isunboundedarray
+| 375 = @isreferenceable
+| 378 = @isnothrowconvertible
+| 379 = @referenceconstructsfromtemporary
+| 380 = @referenceconvertsfromtemporary
+| 381 = @isconvertible
+| 382 = @isvalidwinrttype
+| 383 = @iswinclass
+| 384 = @iswininterface
+| 385 = @istriviallyequalitycomparable
+| 386 = @isscopedenum
+| 387 = @istriviallyrelocatable
+| 388 = @datasizeof
+| 389 = @c11_generic
+| 390 = @requires_expr
+;
+
+@var_args_expr = @vastartexpr
+               | @vaendexpr
+               | @vaargexpr
+               | @vacopyexpr
+               ;
+
+@builtin_op = @var_args_expr
+            | @noopexpr
+            | @offsetofexpr
+            | @intaddrexpr
+            | @hasassignexpr
+            | @hascopyexpr
+            | @hasnothrowassign
+            | @hasnothrowconstr
+            | @hasnothrowcopy
+            | @hastrivialassign
+            | @hastrivialconstr
+            | @hastrivialcopy
+            | @hastrivialdestructor
+            | @hasuserdestr
+            | @hasvirtualdestr
+            | @isabstractexpr
+            | @isbaseofexpr
+            | @isclassexpr
+            | @isconvtoexpr
+            | @isemptyexpr
+            | @isenumexpr
+            | @ispodexpr
+            | @ispolyexpr
+            | @isunionexpr
+            | @typescompexpr
+            | @builtinshufflevector
+            | @builtinconvertvector
+            | @builtinaddressof
+            | @istriviallyconstructibleexpr
+            | @isdestructibleexpr
+            | @isnothrowdestructibleexpr
+            | @istriviallydestructibleexpr
+            | @istriviallyassignableexpr
+            | @isnothrowassignableexpr
+            | @istrivialexpr
+            | @isstandardlayoutexpr
+            | @istriviallycopyableexpr
+            | @isliteraltypeexpr
+            | @hastrivialmoveconstructorexpr
+            | @hastrivialmoveassignexpr
+            | @hasnothrowmoveassignexpr
+            | @isconstructibleexpr
+            | @isnothrowconstructibleexpr
+            | @hasfinalizerexpr
+            | @isdelegateexpr
+            | @isinterfaceclassexpr
+            | @isrefarrayexpr
+            | @isrefclassexpr
+            | @issealedexpr
+            | @issimplevalueclassexpr
+            | @isvalueclassexpr
+            | @isfinalexpr
+            | @builtinchooseexpr
+            | @builtincomplex
+            | @isassignable
+            | @isaggregate
+            | @hasuniqueobjectrepresentations
+            | @builtinbitcast
+            | @builtinshuffle
+            | @issame
+            | @isfunction
+            | @islayoutcompatible
+            | @ispointerinterconvertiblebaseof
+            | @isarray
+            | @arrayrank
+            | @arrayextent
+            | @isarithmetic
+            | @iscompletetype
+            | @iscompound
+            | @isconst
+            | @isfloatingpoint
+            | @isfundamental
+            | @isintegral
+            | @islvaluereference
+            | @ismemberfunctionpointer
+            | @ismemberobjectpointer
+            | @ismemberpointer
+            | @isobject
+            | @ispointer
+            | @isreference
+            | @isrvaluereference
+            | @isscalar
+            | @issigned
+            | @isunsigned
+            | @isvoid
+            | @isvolatile
+            | @istriviallycopyassignable
+            | @isassignablenopreconditioncheck
+            | @referencebindstotemporary
+            | @issameas
+            | @builtinhasattribute
+            | @ispointerinterconvertiblewithclass
+            | @builtinispointerinterconvertiblewithclass
+            | @iscorrespondingmember
+            | @builtiniscorrespondingmember
+            | @isboundedarray
+            | @isunboundedarray
+            | @isreferenceable
+            | @isnothrowconvertible
+            | @referenceconstructsfromtemporary
+            | @referenceconvertsfromtemporary
+            | @isconvertible
+            | @isvalidwinrttype
+            | @iswinclass
+            | @iswininterface
+            | @istriviallyequalitycomparable
+            | @isscopedenum
+            | @istriviallyrelocatable
+            ;
+
+new_allocated_type(
+    unique int expr: @new_expr ref,
+    int type_id: @type ref
+);
+
+new_array_allocated_type(
+    unique int expr: @new_array_expr ref,
+    int type_id: @type ref
+);
+
+/**
+ * The field being initialized by an initializer expression within an aggregate
+ * initializer for a class/struct/union. Position is used to sort repeated initializers.
+ */
+#keyset[aggregate, position]
+aggregate_field_init(
+    int aggregate: @aggregateliteral ref,
+    int initializer: @expr ref,
+    int field: @membervariable ref,
+    int position: int ref
+);
+
+/**
+ * The index of the element being initialized by an initializer expression
+ * within an aggregate initializer for an array. Position is used to sort repeated initializers.
+ */
+#keyset[aggregate, position]
+aggregate_array_init(
+    int aggregate: @aggregateliteral ref,
+    int initializer: @expr ref,
+    int element_index: int ref,
+    int position: int ref
+);
+
+@ctorinit = @ctordirectinit
+          | @ctorvirtualinit
+          | @ctorfieldinit
+          | @ctordelegatinginit;
+@dtordestruct = @dtordirectdestruct
+              | @dtorvirtualdestruct
+              | @dtorfielddestruct;
+
+
+condition_decl_bind(
+    unique int expr: @condition_decl ref,
+    unique int decl: @declaration ref
+);
+
+typeid_bind(
+    unique int expr: @type_id ref,
+    int type_id: @type ref
+);
+
+uuidof_bind(
+    unique int expr: @uuidof ref,
+    int type_id: @type ref
+);
+
+@runtime_sizeof_or_alignof = @runtime_sizeof | @runtime_alignof | @datasizeof;
+
+sizeof_bind(
+    unique int expr: @runtime_sizeof_or_alignof ref,
+    int type_id: @type ref
+);
+
+code_block(
+    unique int block: @literal ref,
+    unique int routine: @function ref
+);
+
+lambdas(
+    unique int expr: @lambdaexpr ref,
+    string default_capture: string ref,
+    boolean has_explicit_return_type: boolean ref
+);
+
+lambda_capture(
+    unique int id: @lambdacapture,
+    int lambda: @lambdaexpr ref,
+    int index: int ref,
+    int field: @membervariable ref,
+    boolean captured_by_reference: boolean ref,
+    boolean is_implicit: boolean ref,
+    int location: @location_default ref
+);
+
+@funbindexpr = @routineexpr
+             | @new_expr
+             | @delete_expr
+             | @delete_array_expr
+             | @ctordirectinit
+             | @ctorvirtualinit
+             | @ctordelegatinginit
+             | @dtordirectdestruct
+             | @dtorvirtualdestruct;
+
+@varbindexpr = @varaccess | @ctorfieldinit | @dtorfielddestruct;
+@addressable = @function | @variable ;
+@accessible = @addressable | @enumconstant ;
+
+@access = @varaccess | @routineexpr ;
+
+fold(
+    int expr: @foldexpr ref,
+    string operator: string ref,
+    boolean is_left_fold: boolean ref
+);
+
+stmts(
+    unique int id: @stmt,
+    int kind: int ref,
+    int location: @location_stmt ref
+);
+
+case @stmt.kind of
+    1 = @stmt_expr
+|   2 = @stmt_if
+|   3 = @stmt_while
+|   4 = @stmt_goto
+|   5 = @stmt_label
+|   6 = @stmt_return
+|   7 = @stmt_block
+|   8 = @stmt_end_test_while // do { ... } while ( ... )
+|   9 = @stmt_for
+|  10 = @stmt_switch_case
+|  11 = @stmt_switch
+|  13 = @stmt_asm // "asm" statement or the body of an asm function
+|  15 = @stmt_try_block
+|  16 = @stmt_microsoft_try // Microsoft
+|  17 = @stmt_decl
+|  18 = @stmt_set_vla_size // C99
+|  19 = @stmt_vla_decl // C99
+|  25 = @stmt_assigned_goto // GNU
+|  26 = @stmt_empty
+|  27 = @stmt_continue
+|  28 = @stmt_break
+|  29 = @stmt_range_based_for // C++11
+// ...  30 @stmt_at_autoreleasepool_block deprecated
+// ...  31 @stmt_objc_for_in deprecated
+// ...  32 @stmt_at_synchronized deprecated
+|  33 = @stmt_handler
+// ...  34 @stmt_finally_end deprecated
+|  35 = @stmt_constexpr_if
+|  37 = @stmt_co_return
+;
+
+type_vla(
+    int type_id: @type ref,
+    int decl: @stmt_vla_decl ref
+);
+
+variable_vla(
+    int var: @variable ref,
+    int decl: @stmt_vla_decl ref
+);
+
+if_initialization(
+    unique int if_stmt: @stmt_if ref,
+    int init_id: @stmt ref
+);
+
+if_then(
+    unique int if_stmt: @stmt_if ref,
+    int then_id: @stmt ref
+);
+
+if_else(
+    unique int if_stmt: @stmt_if ref,
+    int else_id: @stmt ref
+);
+
+constexpr_if_initialization(
+    unique int constexpr_if_stmt: @stmt_constexpr_if ref,
+    int init_id: @stmt ref
+);
+
+constexpr_if_then(
+    unique int constexpr_if_stmt: @stmt_constexpr_if ref,
+    int then_id: @stmt ref
+);
+
+constexpr_if_else(
+    unique int constexpr_if_stmt: @stmt_constexpr_if ref,
+    int else_id: @stmt ref
+);
+
+while_body(
+    unique int while_stmt: @stmt_while ref,
+    int body_id: @stmt ref
+);
+
+do_body(
+    unique int do_stmt: @stmt_end_test_while ref,
+    int body_id: @stmt ref
+);
+
+switch_initialization(
+    unique int switch_stmt: @stmt_switch ref,
+    int init_id: @stmt ref
+);
+
+#keyset[switch_stmt, index]
+switch_case(
+    int switch_stmt: @stmt_switch ref,
+    int index: int ref,
+    int case_id: @stmt_switch_case ref
+);
+
+switch_body(
+    unique int switch_stmt: @stmt_switch ref,
+    int body_id: @stmt ref
+);
+
+@stmt_for_or_range_based_for = @stmt_for
+                             | @stmt_range_based_for;
+
+for_initialization(
+    unique int for_stmt: @stmt_for_or_range_based_for ref,
+    int init_id: @stmt ref
+);
+
+for_condition(
+    unique int for_stmt: @stmt_for ref,
+    int condition_id: @expr ref
+);
+
+for_update(
+    unique int for_stmt: @stmt_for ref,
+    int update_id: @expr ref
+);
+
+for_body(
+    unique int for_stmt: @stmt_for ref,
+    int body_id: @stmt ref
+);
+
+@stmtparent = @stmt | @expr_stmt ;
+stmtparents(
+    unique int id: @stmt ref,
+    int index: int ref,
+    int parent: @stmtparent ref
+);
+
+ishandler(unique int block: @stmt_block ref);
+
+@cfgnode = @stmt | @expr | @function | @initialiser ;
+
+stmt_decl_bind(
+    int stmt: @stmt_decl ref,
+    int num: int ref,
+    int decl: @declaration ref
+);
+
+stmt_decl_entry_bind(
+    int stmt: @stmt_decl ref,
+    int num: int ref,
+    int decl_entry: @element ref
+);
+
+@functionorblock = @function | @stmt_block;
+
+blockscope(
+    unique int block: @stmt_block ref,
+    int enclosing: @functionorblock ref
+);
+
+@jump = @stmt_goto | @stmt_break | @stmt_continue;
+
+@jumporlabel = @jump | @stmt_label | @literal;
+
+jumpinfo(
+    unique int id: @jumporlabel ref,
+    string str: string ref,
+    int target: @stmt ref
+);
+
+preprocdirects(
+    unique int id: @preprocdirect,
+    int kind: int ref,
+    int location: @location_default ref
+);
+case @preprocdirect.kind of
+   0 = @ppd_if
+|  1 = @ppd_ifdef
+|  2 = @ppd_ifndef
+|  3 = @ppd_elif
+|  4 = @ppd_else
+|  5 = @ppd_endif
+|  6 = @ppd_plain_include
+|  7 = @ppd_define
+|  8 = @ppd_undef
+|  9 = @ppd_line
+| 10 = @ppd_error
+| 11 = @ppd_pragma
+| 12 = @ppd_objc_import
+| 13 = @ppd_include_next
+| 18 = @ppd_warning
+;
+
+@ppd_include = @ppd_plain_include | @ppd_objc_import | @ppd_include_next;
+
+@ppd_branch = @ppd_if | @ppd_ifdef | @ppd_ifndef | @ppd_elif;
+
+preprocpair(
+    int begin : @ppd_branch ref,
+    int elseelifend : @preprocdirect ref
+);
+
+preproctrue(int branch : @ppd_branch ref);
+preprocfalse(int branch : @ppd_branch ref);
+
+preproctext(
+    unique int id: @preprocdirect ref,
+    string head: string ref,
+    string body: string ref
+);
+
+includes(
+    unique int id: @ppd_include ref,
+    int included: @file ref
+);
+
+link_targets(
+    int id: @link_target,
+    int binary: @file ref
+);
+
+link_parent(
+    int element : @element ref,
+    int link_target : @link_target ref
+);
+
+/* XML Files */
+
+xmlEncoding(unique int id: @file ref, string encoding: string ref);
+
+xmlDTDs(
+    unique int id: @xmldtd,
+    string root: string ref,
+    string publicId: string ref,
+    string systemId: string ref,
+    int fileid: @file ref
+);
+
+xmlElements(
+    unique int id: @xmlelement,
+    string name: string ref,
+    int parentid: @xmlparent ref,
+    int idx: int ref,
+    int fileid: @file ref
+);
+
+xmlAttrs(
+    unique int id: @xmlattribute,
+    int elementid: @xmlelement ref,
+    string name: string ref,
+    string value: string ref,
+    int idx: int ref,
+    int fileid: @file ref
+);
+
+xmlNs(
+    int id: @xmlnamespace,
+    string prefixName: string ref,
+    string URI: string ref,
+    int fileid: @file ref
+);
+
+xmlHasNs(
+    int elementId: @xmlnamespaceable ref,
+    int nsId: @xmlnamespace ref,
+    int fileid: @file ref
+);
+
+xmlComments(
+    unique int id: @xmlcomment,
+    string text: string ref,
+    int parentid: @xmlparent ref,
+    int fileid: @file ref
+);
+
+xmlChars(
+    unique int id: @xmlcharacters,
+    string text: string ref,
+    int parentid: @xmlparent ref,
+    int idx: int ref,
+    int isCDATA: int ref,
+    int fileid: @file ref
+);
+
+@xmlparent = @file | @xmlelement;
+@xmlnamespaceable = @xmlelement | @xmlattribute;
+
+xmllocations(
+    int xmlElement: @xmllocatable ref,
+    int location: @location_default ref
+);
+
+@xmllocatable = @xmlcharacters
+              | @xmlelement
+              | @xmlcomment
+              | @xmlattribute
+              | @xmldtd
+              | @file
+              | @xmlnamespace;
diff --git a/cpp/downgrades/6f5d51e89e762fe4609fd4ac8ee3afb04221e873/semmlecode.cpp.dbscheme b/cpp/downgrades/6f5d51e89e762fe4609fd4ac8ee3afb04221e873/semmlecode.cpp.dbscheme
new file mode 100644
index 000000000000..7ff6a6e53dbc
--- /dev/null
+++ b/cpp/downgrades/6f5d51e89e762fe4609fd4ac8ee3afb04221e873/semmlecode.cpp.dbscheme
@@ -0,0 +1,2315 @@
+
+/**
+ * An invocation of the compiler. Note that more than one file may be
+ * compiled per invocation. For example, this command compiles three
+ * source files:
+ *
+ *   gcc -c f1.c f2.c f3.c
+ *
+ * The `id` simply identifies the invocation, while `cwd` is the working
+ * directory from which the compiler was invoked.
+ */
+compilations(
+    /**
+     * An invocation of the compiler. Note that more than one file may
+     * be compiled per invocation. For example, this command compiles
+     * three source files:
+     *
+     *   gcc -c f1.c f2.c f3.c
+     */
+    unique int id : @compilation,
+    string cwd : string ref
+);
+
+/**
+ * The arguments that were passed to the extractor for a compiler
+ * invocation. If `id` is for the compiler invocation
+ *
+ *   gcc -c f1.c f2.c f3.c
+ *
+ * then typically there will be rows for
+ *
+ * num | arg
+ * --- | ---
+ * 0   | *path to extractor*
+ * 1   | `--mimic`
+ * 2   | `/usr/bin/gcc`
+ * 3   | `-c`
+ * 4   | f1.c
+ * 5   | f2.c
+ * 6   | f3.c
+ */
+#keyset[id, num]
+compilation_args(
+    int id : @compilation ref,
+    int num : int ref,
+    string arg : string ref
+);
+
+/**
+ * The source files that are compiled by a compiler invocation.
+ * If `id` is for the compiler invocation
+ *
+ *   gcc -c f1.c f2.c f3.c
+ *
+ * then there will be rows for
+ *
+ * num | arg
+ * --- | ---
+ * 0   | f1.c
+ * 1   | f2.c
+ * 2   | f3.c
+ *
+ * Note that even if those files `#include` headers, those headers
+ * do not appear as rows.
+ */
+#keyset[id, num]
+compilation_compiling_files(
+    int id : @compilation ref,
+    int num : int ref,
+    int file : @file ref
+);
+
+/**
+ * The time taken by the extractor for a compiler invocation.
+ *
+ * For each file `num`, there will be rows for
+ *
+ * kind | seconds
+ * ---- | ---
+ * 1    | CPU seconds used by the extractor frontend
+ * 2    | Elapsed seconds during the extractor frontend
+ * 3    | CPU seconds used by the extractor backend
+ * 4    | Elapsed seconds during the extractor backend
+ */
+#keyset[id, num, kind]
+compilation_time(
+    int id : @compilation ref,
+    int num : int ref,
+    /* kind:
+       1 = frontend_cpu_seconds
+       2 = frontend_elapsed_seconds
+       3 = extractor_cpu_seconds
+       4 = extractor_elapsed_seconds
+    */
+    int kind : int ref,
+    float seconds : float ref
+);
+
+/**
+ * An error or warning generated by the extractor.
+ * The diagnostic message `diagnostic` was generated during compiler
+ * invocation `compilation`, and is the `file_number_diagnostic_number`th
+ * message generated while extracting the `file_number`th file of that
+ * invocation.
+ */
+#keyset[compilation, file_number, file_number_diagnostic_number]
+diagnostic_for(
+    int diagnostic : @diagnostic ref,
+    int compilation : @compilation ref,
+    int file_number : int ref,
+    int file_number_diagnostic_number : int ref
+);
+
+/**
+ * If extraction was successful, then `cpu_seconds` and
+ * `elapsed_seconds` are the CPU time and elapsed time (respectively)
+ * that extraction took for compiler invocation `id`.
+ */
+compilation_finished(
+    unique int id : @compilation ref,
+    float cpu_seconds : float ref,
+    float elapsed_seconds : float ref
+);
+
+
+/**
+ * External data, loaded from CSV files during snapshot creation. See
+ * [Tutorial: Incorporating external data](https://help.semmle.com/wiki/display/SD/Tutorial%3A+Incorporating+external+data)
+ * for more information.
+ */
+externalData(
+    int id : @externalDataElement,
+    string path : string ref,
+    int column: int ref,
+    string value : string ref
+);
+
+/**
+ * The source location of the snapshot.
+ */
+sourceLocationPrefix(string prefix : string ref);
+
+/**
+ * Information about packages that provide code used during compilation.
+ * The `id` is just a unique identifier.
+ * The `namespace` is typically the name of the package manager that
+ * provided the package (e.g. "dpkg" or "yum").
+ * The `package_name` is the name of the package, and `version` is its
+ * version (as a string).
+ */
+external_packages(
+    unique int id: @external_package,
+    string namespace : string ref,
+    string package_name : string ref,
+    string version : string ref
+);
+
+/**
+ * Holds if File `fileid` was provided by package `package`.
+ */
+header_to_external_package(
+    int fileid : @file ref,
+    int package : @external_package ref
+);
+
+/*
+ * Version history
+ */
+
+svnentries(
+    unique int id : @svnentry,
+    string revision : string ref,
+    string author : string ref,
+    date revisionDate : date ref,
+    int changeSize : int ref
+)
+
+svnaffectedfiles(
+    int id : @svnentry ref,
+    int file : @file ref,
+    string action : string ref
+)
+
+svnentrymsg(
+    unique int id : @svnentry ref,
+    string message : string ref
+)
+
+svnchurn(
+    int commit : @svnentry ref,
+    int file : @file ref,
+    int addedLines : int ref,
+    int deletedLines : int ref
+)
+
+/*
+ * C++ dbscheme
+ */
+
+extractor_version(
+    string codeql_version: string ref,
+    string frontend_version: string ref
+)
+
+@location = @location_stmt | @location_expr | @location_default ;
+
+/**
+ * The location of an element that is not an expression or a statement.
+ * The location spans column `startcolumn` of line `startline` to
+ * column `endcolumn` of line `endline` in file `file`.
+ * For more information, see
+ * [Locations](https://codeql.github.com/docs/writing-codeql-queries/providing-locations-in-codeql-queries/).
+ */
+locations_default(
+    /** The location of an element that is not an expression or a statement. */
+    unique int id: @location_default,
+    int container: @container ref,
+    int startLine: int ref,
+    int startColumn: int ref,
+    int endLine: int ref,
+    int endColumn: int ref
+);
+
+/**
+ * The location of a statement.
+ * The location spans column `startcolumn` of line `startline` to
+ * column `endcolumn` of line `endline` in file `file`.
+ * For more information, see
+ * [Locations](https://codeql.github.com/docs/writing-codeql-queries/providing-locations-in-codeql-queries/).
+ */
+locations_stmt(
+    /** The location of a statement. */
+    unique int id: @location_stmt,
+    int container: @container ref,
+    int startLine: int ref,
+    int startColumn: int ref,
+    int endLine: int ref,
+    int endColumn: int ref
+);
+
+/**
+ * The location of an expression.
+ * The location spans column `startcolumn` of line `startline` to
+ * column `endcolumn` of line `endline` in file `file`.
+ * For more information, see
+ * [Locations](https://codeql.github.com/docs/writing-codeql-queries/providing-locations-in-codeql-queries/).
+ */
+locations_expr(
+    /** The location of an expression. */
+    unique int id: @location_expr,
+    int container: @container ref,
+    int startLine: int ref,
+    int startColumn: int ref,
+    int endLine: int ref,
+    int endColumn: int ref
+);
+
+/** An element for which line-count information is available. */
+@sourceline = @file | @function | @variable | @enumconstant | @xmllocatable;
+
+numlines(
+    int element_id: @sourceline ref,
+    int num_lines: int ref,
+    int num_code: int ref,
+    int num_comment: int ref
+);
+
+diagnostics(
+    unique int id: @diagnostic,
+    int severity: int ref,
+    string error_tag: string ref,
+    string error_message: string ref,
+    string full_error_message: string ref,
+    int location: @location_default ref
+);
+
+files(
+    unique int id: @file,
+    string name: string ref
+);
+
+folders(
+    unique int id: @folder,
+    string name: string ref
+);
+
+@container = @folder | @file
+
+containerparent(
+    int parent: @container ref,
+    unique int child: @container ref
+);
+
+fileannotations(
+    int id: @file ref,
+    int kind: int ref,
+    string name: string ref,
+    string value: string ref
+);
+
+inmacroexpansion(
+    int id: @element ref,
+    int inv: @macroinvocation ref
+);
+
+affectedbymacroexpansion(
+    int id: @element ref,
+    int inv: @macroinvocation ref
+);
+
+case @macroinvocation.kind of
+  1 = @macro_expansion
+| 2 = @other_macro_reference
+;
+
+macroinvocations(
+    unique int id: @macroinvocation,
+    int macro_id: @ppd_define ref,
+    int location: @location_default ref,
+    int kind: int ref
+);
+
+macroparent(
+    unique int id: @macroinvocation ref,
+    int parent_id: @macroinvocation ref
+);
+
+// a macroinvocation may be part of another location
+// the way to find a constant expression that uses a macro
+// is thus to find a constant expression that has a location
+// to which a macro invocation is bound
+macrolocationbind(
+    int id: @macroinvocation ref,
+    int location: @location ref
+);
+
+#keyset[invocation, argument_index]
+macro_argument_unexpanded(
+    int invocation: @macroinvocation ref,
+    int argument_index: int ref,
+    string text: string ref
+);
+
+#keyset[invocation, argument_index]
+macro_argument_expanded(
+    int invocation: @macroinvocation ref,
+    int argument_index: int ref,
+    string text: string ref
+);
+
+/*
+case @function.kind of
+  1 = @normal_function
+| 2 = @constructor
+| 3 = @destructor
+| 4 = @conversion_function
+| 5 = @operator
+| 6 = @builtin_function     // GCC built-in functions, e.g. __builtin___memcpy_chk
+| 7 = @user_defined_literal
+| 8 = @deduction_guide
+;
+*/
+
+functions(
+    unique int id: @function,
+    string name: string ref,
+    int kind: int ref
+);
+
+function_entry_point(
+    int id: @function ref,
+    unique int entry_point: @stmt ref
+);
+
+function_return_type(
+    int id: @function ref,
+    int return_type: @type ref
+);
+
+/**
+ * If `function` is a coroutine, then this gives the `std::experimental::resumable_traits`
+ * instance associated with it, and the variables representing the `handle` and `promise`
+ * for it.
+ */
+coroutine(
+  unique int function: @function ref,
+  int traits: @type ref
+);
+
+/*
+case @coroutine_placeholder_variable.kind of
+  1 = @handle
+| 2 = @promise
+| 3 = @init_await_resume
+;
+*/
+
+coroutine_placeholder_variable(
+  unique int placeholder_variable: @variable ref,
+  int kind: int ref,
+  int function: @function ref
+)
+
+/** The `new` function used for allocating the coroutine state, if any. */
+coroutine_new(
+  unique int function: @function ref,
+  int new: @function ref
+);
+
+/** The `delete` function used for deallocating the coroutine state, if any. */
+coroutine_delete(
+  unique int function: @function ref,
+  int delete: @function ref
+);
+
+purefunctions(unique int id: @function ref);
+
+function_deleted(unique int id: @function ref);
+
+function_defaulted(unique int id: @function ref);
+
+function_prototyped(unique int id: @function ref)
+
+deduction_guide_for_class(
+    int id: @function ref,
+    int class_template: @usertype ref
+)
+
+member_function_this_type(
+    unique int id: @function ref,
+    int this_type: @type ref
+);
+
+#keyset[id, type_id]
+fun_decls(
+    int id: @fun_decl,
+    int function: @function ref,
+    int type_id: @type ref,
+    string name: string ref,
+    int location: @location_default ref
+);
+fun_def(unique int id: @fun_decl ref);
+fun_specialized(unique int id: @fun_decl ref);
+fun_implicit(unique int id: @fun_decl ref);
+fun_decl_specifiers(
+    int id: @fun_decl ref,
+    string name: string ref
+)
+#keyset[fun_decl, index]
+fun_decl_throws(
+    int fun_decl: @fun_decl ref,
+    int index: int ref,
+    int type_id: @type ref
+);
+/* an empty throw specification is different from none */
+fun_decl_empty_throws(unique int fun_decl: @fun_decl ref);
+fun_decl_noexcept(
+    int fun_decl: @fun_decl ref,
+    int constant: @expr ref
+);
+fun_decl_empty_noexcept(int fun_decl: @fun_decl ref);
+fun_decl_typedef_type(
+    unique int fun_decl: @fun_decl ref,
+    int typedeftype_id: @usertype ref
+);
+
+param_decl_bind(
+    unique int id: @var_decl ref,
+    int index: int ref,
+    int fun_decl: @fun_decl ref
+);
+
+#keyset[id, type_id]
+var_decls(
+    int id: @var_decl,
+    int variable: @variable ref,
+    int type_id: @type ref,
+    string name: string ref,
+    int location: @location_default ref
+);
+var_def(unique int id: @var_decl ref);
+var_decl_specifiers(
+    int id: @var_decl ref,
+    string name: string ref
+)
+is_structured_binding(unique int id: @variable ref);
+
+type_decls(
+    unique int id: @type_decl,
+    int type_id: @type ref,
+    int location: @location_default ref
+);
+type_def(unique int id: @type_decl ref);
+type_decl_top(
+    unique int type_decl: @type_decl ref
+);
+
+namespace_decls(
+    unique int id: @namespace_decl,
+    int namespace_id: @namespace ref,
+    int location: @location_default ref,
+    int bodylocation: @location_default ref
+);
+
+case @using.kind of
+  1 = @using_declaration
+| 2 = @using_directive
+| 3 = @using_enum_declaration
+;
+
+usings(
+    unique int id: @using,
+    int element_id: @element ref,
+    int location: @location_default ref,
+    int kind: int ref
+);
+
+/** The element which contains the `using` declaration. */
+using_container(
+    int parent: @element ref,
+    int child: @using ref
+);
+
+static_asserts(
+    unique int id: @static_assert,
+    int condition : @expr ref,
+    string message : string ref,
+    int location: @location_default ref,
+    int enclosing : @element ref
+);
+
+// each function has an ordered list of parameters
+#keyset[id, type_id]
+#keyset[function, index, type_id]
+params(
+    int id: @parameter,
+    int function: @functionorblock ref,
+    int index: int ref,
+    int type_id: @type ref
+);
+
+overrides(
+    int new: @function ref,
+    int old: @function ref
+);
+
+#keyset[id, type_id]
+membervariables(
+    int id: @membervariable,
+    int type_id: @type ref,
+    string name: string ref
+);
+
+#keyset[id, type_id]
+globalvariables(
+    int id: @globalvariable,
+    int type_id: @type ref,
+    string name: string ref
+);
+
+#keyset[id, type_id]
+localvariables(
+    int id: @localvariable,
+    int type_id: @type ref,
+    string name: string ref
+);
+
+autoderivation(
+    unique int var: @variable ref,
+    int derivation_type: @type ref
+);
+
+orphaned_variables(
+    int var: @localvariable ref,
+    int function: @function ref
+)
+
+enumconstants(
+    unique int id: @enumconstant,
+    int parent: @usertype ref,
+    int index: int ref,
+    int type_id: @type ref,
+    string name: string ref,
+    int location: @location_default ref
+);
+
+@variable = @localscopevariable | @globalvariable | @membervariable;
+
+@localscopevariable = @localvariable | @parameter;
+
+/**
+ * Built-in types are the fundamental types, e.g., integral, floating, and void.
+ */
+case @builtintype.kind of
+   1 = @errortype
+|  2 = @unknowntype
+|  3 = @void
+|  4 = @boolean
+|  5 = @char
+|  6 = @unsigned_char
+|  7 = @signed_char
+|  8 = @short
+|  9 = @unsigned_short
+| 10 = @signed_short
+| 11 = @int
+| 12 = @unsigned_int
+| 13 = @signed_int
+| 14 = @long
+| 15 = @unsigned_long
+| 16 = @signed_long
+| 17 = @long_long
+| 18 = @unsigned_long_long
+| 19 = @signed_long_long
+// ... 20 Microsoft-specific __int8
+// ... 21 Microsoft-specific __int16
+// ... 22 Microsoft-specific __int32
+// ... 23 Microsoft-specific __int64
+| 24 = @float
+| 25 = @double
+| 26 = @long_double
+| 27 = @complex_float         // C99-specific _Complex float
+| 28 = @complex_double        // C99-specific _Complex double
+| 29 = @complex_long_double   // C99-specific _Complex long double
+| 30 = @imaginary_float       // C99-specific _Imaginary float
+| 31 = @imaginary_double      // C99-specific _Imaginary double
+| 32 = @imaginary_long_double // C99-specific _Imaginary long double
+| 33 = @wchar_t               // Microsoft-specific
+| 34 = @decltype_nullptr      // C++11
+| 35 = @int128                // __int128
+| 36 = @unsigned_int128       // unsigned __int128
+| 37 = @signed_int128         // signed __int128
+| 38 = @float128              // __float128
+| 39 = @complex_float128      // _Complex __float128
+| 40 = @decimal32             // _Decimal32
+| 41 = @decimal64             // _Decimal64
+| 42 = @decimal128            // _Decimal128
+| 43 = @char16_t
+| 44 = @char32_t
+| 45 = @std_float32           // _Float32
+| 46 = @float32x              // _Float32x
+| 47 = @std_float64           // _Float64
+| 48 = @float64x              // _Float64x
+| 49 = @std_float128          // _Float128
+// ... 50 _Float128x
+| 51 = @char8_t
+| 52 = @float16               // _Float16
+| 53 = @complex_float16       // _Complex _Float16
+| 54 = @fp16                  // __fp16
+| 55 = @std_bfloat16          // __bf16
+| 56 = @std_float16           // std::float16_t
+| 57 = @complex_std_float32   // _Complex _Float32
+| 58 = @complex_float32x      // _Complex _Float32x
+| 59 = @complex_std_float64   // _Complex _Float64
+| 60 = @complex_float64x      // _Complex _Float64x
+| 61 = @complex_std_float128  // _Complex _Float128
+;
+
+builtintypes(
+    unique int id: @builtintype,
+    string name: string ref,
+    int kind: int ref,
+    int size: int ref,
+    int sign: int ref,
+    int alignment: int ref
+);
+
+/**
+ * Derived types are types that are directly derived from existing types and
+ * point to, refer to, transform type data to return a new type.
+ */
+case @derivedtype.kind of
+   1 = @pointer
+|  2 = @reference
+|  3 = @type_with_specifiers
+|  4 = @array
+|  5 = @gnu_vector
+|  6 = @routineptr
+|  7 = @routinereference
+|  8 = @rvalue_reference // C++11
+// ... 9 type_conforming_to_protocols deprecated
+| 10 = @block
+;
+
+derivedtypes(
+    unique int id: @derivedtype,
+    string name: string ref,
+    int kind: int ref,
+    int type_id: @type ref
+);
+
+pointerishsize(unique int id: @derivedtype ref,
+    int size: int ref,
+    int alignment: int ref);
+
+arraysizes(
+    unique int id: @derivedtype ref,
+    int num_elements: int ref,
+    int bytesize: int ref,
+    int alignment: int ref
+);
+
+typedefbase(
+    unique int id: @usertype ref,
+    int type_id: @type ref
+);
+
+/**
+ * An instance of the C++11 `decltype` operator.  For example:
+ * ```
+ * int a;
+ * decltype(1+a) b;
+ * ```
+ * Here `expr` is `1+a`.
+ *
+ * Sometimes an additional pair of parentheses around the expression
+ * would change the semantics of this decltype, e.g.
+ * ```
+ * struct A { double x; };
+ * const A* a = new A();
+ * decltype( a->x ); // type is double
+ * decltype((a->x)); // type is const double&
+ * ```
+ * (Please consult the C++11 standard for more details).
+ * `parentheses_would_change_meaning` is `true` iff that is the case.
+ */
+#keyset[id, expr]
+decltypes(
+    int id: @decltype,
+    int expr: @expr ref,
+    int base_type: @type ref,
+    boolean parentheses_would_change_meaning: boolean ref
+);
+
+/*
+case @usertype.kind of
+   1 = @struct
+|  2 = @class
+|  3 = @union
+|  4 = @enum
+|  5 = @typedef                       // classic C: typedef typedef type name
+|  6 = @template
+|  7 = @template_parameter
+|  8 = @template_template_parameter
+|  9 = @proxy_class                   // a proxy class associated with a template parameter
+// ... 10 objc_class deprecated
+// ... 11 objc_protocol deprecated
+// ... 12 objc_category deprecated
+| 13 = @scoped_enum
+| 14 = @using_alias                  // a using name = type style typedef
+;
+*/
+
+usertypes(
+    unique int id: @usertype,
+    string name: string ref,
+    int kind: int ref
+);
+
+usertypesize(
+    unique int id: @usertype ref,
+    int size: int ref,
+    int alignment: int ref
+);
+
+usertype_final(unique int id: @usertype ref);
+
+usertype_uuid(
+    unique int id: @usertype ref,
+    string uuid: string ref
+);
+
+mangled_name(
+    unique int id: @declaration ref,
+    int mangled_name : @mangledname,
+    boolean is_complete: boolean ref
+);
+
+is_pod_class(unique int id: @usertype ref);
+is_standard_layout_class(unique int id: @usertype ref);
+
+is_complete(unique int id: @usertype ref);
+
+is_class_template(unique int id: @usertype ref);
+class_instantiation(
+    int to: @usertype ref,
+    int from: @usertype ref
+);
+class_template_argument(
+    int type_id: @usertype ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+class_template_argument_value(
+    int type_id: @usertype ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+
+is_proxy_class_for(
+    unique int id: @usertype ref,
+    unique int templ_param_id: @usertype ref
+);
+
+type_mentions(
+    unique int id: @type_mention,
+    int type_id: @type ref,
+    int location: @location ref,
+    // a_symbol_reference_kind from the frontend.
+    int kind: int ref
+);
+
+is_function_template(unique int id: @function ref);
+function_instantiation(
+    unique int to: @function ref,
+    int from: @function ref
+);
+function_template_argument(
+    int function_id: @function ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+function_template_argument_value(
+    int function_id: @function ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+
+is_variable_template(unique int id: @variable ref);
+variable_instantiation(
+    unique int to: @variable ref,
+    int from: @variable ref
+);
+variable_template_argument(
+    int variable_id: @variable ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+variable_template_argument_value(
+    int variable_id: @variable ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+
+routinetypes(
+    unique int id: @routinetype,
+    int return_type: @type ref
+);
+
+routinetypeargs(
+    int routine: @routinetype ref,
+    int index: int ref,
+    int type_id: @type ref
+);
+
+ptrtomembers(
+    unique int id: @ptrtomember,
+    int type_id: @type ref,
+    int class_id: @type ref
+);
+
+/*
+ specifiers for types, functions, and variables
+
+    "public",
+    "protected",
+    "private",
+
+    "const",
+    "volatile",
+    "static",
+
+    "pure",
+    "virtual",
+    "sealed", // Microsoft
+    "__interface", // Microsoft
+    "inline",
+    "explicit",
+
+    "near", // near far extension
+    "far", // near far extension
+    "__ptr32", // Microsoft
+    "__ptr64", // Microsoft
+    "__sptr", // Microsoft
+    "__uptr", // Microsoft
+    "dllimport", // Microsoft
+    "dllexport", // Microsoft
+    "thread", // Microsoft
+    "naked", // Microsoft
+    "microsoft_inline", // Microsoft
+    "forceinline", // Microsoft
+    "selectany", // Microsoft
+    "nothrow", // Microsoft
+    "novtable", // Microsoft
+    "noreturn", // Microsoft
+    "noinline", // Microsoft
+    "noalias", // Microsoft
+    "restrict", // Microsoft
+*/
+
+specifiers(
+    unique int id: @specifier,
+    unique string str: string ref
+);
+
+typespecifiers(
+    int type_id: @type ref,
+    int spec_id: @specifier ref
+);
+
+funspecifiers(
+    int func_id: @function ref,
+    int spec_id: @specifier ref
+);
+
+varspecifiers(
+    int var_id: @accessible ref,
+    int spec_id: @specifier ref
+);
+
+explicit_specifier_exprs(
+    unique int func_id: @function ref,
+    int constant: @expr ref
+)
+
+attributes(
+    unique int id: @attribute,
+    int kind: int ref,
+    string name: string ref,
+    string name_space: string ref,
+    int location: @location_default ref
+);
+
+case @attribute.kind of
+  0 = @gnuattribute
+| 1 = @stdattribute
+| 2 = @declspec
+| 3 = @msattribute
+| 4 = @alignas
+// ... 5 @objc_propertyattribute deprecated
+;
+
+attribute_args(
+    unique int id: @attribute_arg,
+    int kind: int ref,
+    int attribute: @attribute ref,
+    int index: int ref,
+    int location: @location_default ref
+);
+
+case @attribute_arg.kind of
+  0 = @attribute_arg_empty
+| 1 = @attribute_arg_token
+| 2 = @attribute_arg_constant
+| 3 = @attribute_arg_type
+| 4 = @attribute_arg_constant_expr
+| 5 = @attribute_arg_expr
+;
+
+attribute_arg_value(
+    unique int arg: @attribute_arg ref,
+    string value: string ref
+);
+attribute_arg_type(
+    unique int arg: @attribute_arg ref,
+    int type_id: @type ref
+);
+attribute_arg_constant(
+    unique int arg: @attribute_arg ref,
+    int constant: @expr ref
+)
+attribute_arg_expr(
+    unique int arg: @attribute_arg ref,
+    int expr: @expr ref
+)
+attribute_arg_name(
+    unique int arg: @attribute_arg ref,
+    string name: string ref
+);
+
+typeattributes(
+    int type_id: @type ref,
+    int spec_id: @attribute ref
+);
+
+funcattributes(
+    int func_id: @function ref,
+    int spec_id: @attribute ref
+);
+
+varattributes(
+    int var_id: @accessible ref,
+    int spec_id: @attribute ref
+);
+
+stmtattributes(
+    int stmt_id: @stmt ref,
+    int spec_id: @attribute ref
+);
+
+@type = @builtintype
+      | @derivedtype
+      | @usertype
+      /* TODO | @fixedpointtype */
+      | @routinetype
+      | @ptrtomember
+      | @decltype;
+
+unspecifiedtype(
+    unique int type_id: @type ref,
+    int unspecified_type_id: @type ref
+);
+
+member(
+    int parent: @type ref,
+    int index: int ref,
+    int child: @member ref
+);
+
+@enclosingfunction_child = @usertype | @variable | @namespace
+
+enclosingfunction(
+    unique int child: @enclosingfunction_child ref,
+    int parent: @function ref
+);
+
+derivations(
+    unique int derivation: @derivation,
+    int sub: @type ref,
+    int index: int ref,
+    int super: @type ref,
+    int location: @location_default ref
+);
+
+derspecifiers(
+    int der_id: @derivation ref,
+    int spec_id: @specifier ref
+);
+
+/**
+ * Contains the byte offset of the base class subobject within the derived
+ * class. Only holds for non-virtual base classes, but see table
+ * `virtual_base_offsets` for offsets of virtual base class subobjects.
+ */
+direct_base_offsets(
+    unique int der_id: @derivation ref,
+    int offset: int ref
+);
+
+/**
+ * Contains the byte offset of the virtual base class subobject for class
+ * `super` within a most-derived object of class `sub`. `super` can be either a
+ * direct or indirect base class.
+ */
+#keyset[sub, super]
+virtual_base_offsets(
+    int sub: @usertype ref,
+    int super: @usertype ref,
+    int offset: int ref
+);
+
+frienddecls(
+    unique int id: @frienddecl,
+    int type_id: @type ref,
+    int decl_id: @declaration ref,
+    int location: @location_default ref
+);
+
+@declaredtype = @usertype ;
+
+@declaration = @function
+             | @declaredtype
+             | @variable
+             | @enumconstant
+             | @frienddecl;
+
+@member = @membervariable
+        | @function
+        | @declaredtype
+        | @enumconstant;
+
+@locatable = @diagnostic
+           | @declaration
+           | @ppd_include
+           | @ppd_define
+           | @macroinvocation
+           /*| @funcall*/
+           | @xmllocatable
+           | @attribute
+           | @attribute_arg;
+
+@namedscope = @namespace | @usertype;
+
+@element = @locatable
+         | @file
+         | @folder
+         | @specifier
+         | @type
+         | @expr
+         | @namespace
+         | @initialiser
+         | @stmt
+         | @derivation
+         | @comment
+         | @preprocdirect
+         | @fun_decl
+         | @var_decl
+         | @type_decl
+         | @namespace_decl
+         | @using
+         | @namequalifier
+         | @specialnamequalifyingelement
+         | @static_assert
+         | @type_mention
+         | @lambdacapture;
+
+@exprparent = @element;
+
+comments(
+    unique int id: @comment,
+    string contents: string ref,
+    int location: @location_default ref
+);
+
+commentbinding(
+    int id: @comment ref,
+    int element: @element ref
+);
+
+exprconv(
+    int converted: @expr ref,
+    unique int conversion: @expr ref
+);
+
+compgenerated(unique int id: @element ref);
+
+/**
+ * `destructor_call` destructs the `i`'th entity that should be
+ * destructed following `element`. Note that entities should be
+ * destructed in reverse construction order, so for a given `element`
+ * these should be called from highest to lowest `i`.
+ */
+#keyset[element, destructor_call]
+#keyset[element, i]
+synthetic_destructor_call(
+    int element: @element ref,
+    int i: int ref,
+    int destructor_call: @routineexpr ref
+);
+
+namespaces(
+    unique int id: @namespace,
+    string name: string ref
+);
+
+namespace_inline(
+    unique int id: @namespace ref
+);
+
+namespacembrs(
+    int parentid: @namespace ref,
+    unique int memberid: @namespacembr ref
+);
+
+@namespacembr = @declaration | @namespace;
+
+exprparents(
+    int expr_id: @expr ref,
+    int child_index: int ref,
+    int parent_id: @exprparent ref
+);
+
+expr_isload(unique int expr_id: @expr ref);
+
+@cast = @c_style_cast
+      | @const_cast
+      | @dynamic_cast
+      | @reinterpret_cast
+      | @static_cast
+      ;
+
+/*
+case @conversion.kind of
+  0 = @simple_conversion           // a numeric conversion, qualification conversion, or a reinterpret_cast
+| 1 = @bool_conversion             // conversion to 'bool'
+| 2 = @base_class_conversion       // a derived-to-base conversion
+| 3 = @derived_class_conversion    // a base-to-derived conversion
+| 4 = @pm_base_class_conversion    // a derived-to-base conversion of a pointer to member
+| 5 = @pm_derived_class_conversion // a base-to-derived conversion of a pointer to member
+| 6 = @glvalue_adjust              // an adjustment of the type of a glvalue
+| 7 = @prvalue_adjust              // an adjustment of the type of a prvalue
+;
+*/
+/**
+ * Describes the semantics represented by a cast expression. This is largely
+ * independent of the source syntax of the cast, so it is separate from the
+ * regular expression kind.
+ */
+conversionkinds(
+    unique int expr_id: @cast ref,
+    int kind: int ref
+);
+
+@conversion = @cast
+            | @array_to_pointer
+            | @parexpr
+            | @reference_to
+            | @ref_indirect
+            | @temp_init
+            | @c11_generic
+            ;
+
+/*
+case @funbindexpr.kind of
+  0 = @normal_call  // a normal call
+| 1 = @virtual_call // a virtual call
+| 2 = @adl_call     // a call whose target is only found by ADL
+;
+*/
+iscall(
+    unique int caller: @funbindexpr ref,
+    int kind: int ref
+);
+
+numtemplatearguments(
+    unique int expr_id: @expr ref,
+    int num: int ref
+);
+
+specialnamequalifyingelements(
+    unique int id: @specialnamequalifyingelement,
+    unique string name: string ref
+);
+
+@namequalifiableelement = @expr | @namequalifier;
+@namequalifyingelement = @namespace
+                       | @specialnamequalifyingelement
+                       | @usertype;
+
+namequalifiers(
+    unique int id: @namequalifier,
+    unique int qualifiableelement: @namequalifiableelement ref,
+    int qualifyingelement: @namequalifyingelement ref,
+    int location: @location_default ref
+);
+
+varbind(
+    int expr: @varbindexpr ref,
+    int var: @accessible ref
+);
+
+funbind(
+    int expr: @funbindexpr ref,
+    int fun: @function ref
+);
+
+@any_new_expr = @new_expr
+              | @new_array_expr;
+
+@new_or_delete_expr = @any_new_expr
+                    | @delete_expr
+                    | @delete_array_expr;
+
+@prefix_crement_expr = @preincrexpr | @predecrexpr;
+
+@postfix_crement_expr = @postincrexpr | @postdecrexpr;
+
+@increment_expr = @preincrexpr | @postincrexpr;
+
+@decrement_expr = @predecrexpr | @postdecrexpr;
+
+@crement_expr = @increment_expr | @decrement_expr;
+
+@un_arith_op_expr = @arithnegexpr
+                  | @unaryplusexpr
+                  | @conjugation
+                  | @realpartexpr
+                  | @imagpartexpr
+                  | @crement_expr
+                  ;
+
+@un_bitwise_op_expr = @complementexpr;
+
+@un_log_op_expr = @notexpr;
+
+@un_op_expr = @address_of
+            | @indirect
+            | @un_arith_op_expr
+            | @un_bitwise_op_expr
+            | @builtinaddressof
+            | @vec_fill
+            | @un_log_op_expr
+            | @co_await
+            | @co_yield
+            ;
+
+@bin_log_op_expr = @andlogicalexpr | @orlogicalexpr;
+
+@cmp_op_expr = @eq_op_expr | @rel_op_expr;
+
+@eq_op_expr = @eqexpr | @neexpr;
+
+@rel_op_expr = @gtexpr
+             | @ltexpr
+             | @geexpr
+             | @leexpr
+             | @spaceshipexpr
+             ;
+
+@bin_bitwise_op_expr = @lshiftexpr
+                     | @rshiftexpr
+                     | @andexpr
+                     | @orexpr
+                     | @xorexpr
+                     ;
+
+@p_arith_op_expr = @paddexpr
+                 | @psubexpr
+                 | @pdiffexpr
+                 ;
+
+@bin_arith_op_expr = @addexpr
+                   | @subexpr
+                   | @mulexpr
+                   | @divexpr
+                   | @remexpr
+                   | @jmulexpr
+                   | @jdivexpr
+                   | @fjaddexpr
+                   | @jfaddexpr
+                   | @fjsubexpr
+                   | @jfsubexpr
+                   | @minexpr
+                   | @maxexpr
+                   | @p_arith_op_expr
+                   ;
+
+@bin_op_expr = @bin_arith_op_expr
+             | @bin_bitwise_op_expr
+             | @cmp_op_expr
+             | @bin_log_op_expr
+             ;
+
+@op_expr = @un_op_expr
+         | @bin_op_expr
+         | @assign_expr
+         | @conditionalexpr
+         ;
+
+@assign_arith_expr = @assignaddexpr
+                   | @assignsubexpr
+                   | @assignmulexpr
+                   | @assigndivexpr
+                   | @assignremexpr
+                   ;
+
+@assign_bitwise_expr = @assignandexpr
+                     | @assignorexpr
+                     | @assignxorexpr
+                     | @assignlshiftexpr
+                     | @assignrshiftexpr
+                     ;
+
+@assign_pointer_expr = @assignpaddexpr
+                     | @assignpsubexpr
+                     ;
+
+@assign_op_expr = @assign_arith_expr
+                | @assign_bitwise_expr
+                | @assign_pointer_expr
+                ;
+
+@assign_expr = @assignexpr | @assign_op_expr | @blockassignexpr
+
+/*
+  Binary encoding of the allocator form.
+
+  case @allocator.form of
+    0 = plain
+  | 1 = alignment
+  ;
+*/
+
+/**
+ * The allocator function associated with a `new` or `new[]` expression.
+ * The `form` column specified whether the allocation call contains an alignment
+ * argument.
+ */
+expr_allocator(
+    unique int expr: @any_new_expr ref,
+    int func: @function ref,
+    int form: int ref
+);
+
+/*
+  Binary encoding of the deallocator form.
+
+  case @deallocator.form of
+    0 = plain
+  | 1 = size
+  | 2 = alignment
+  | 4 = destroying_delete
+  ;
+*/
+
+/**
+ * The deallocator function associated with a `delete`, `delete[]`, `new`, or
+ * `new[]` expression. For a `new` or `new[]` expression, the deallocator is the
+ * one used to free memory if the initialization throws an exception.
+ * The `form` column specifies whether the deallocation call contains a size
+ * argument, and alignment argument, or both.
+ */
+expr_deallocator(
+    unique int expr: @new_or_delete_expr ref,
+    int func: @function ref,
+    int form: int ref
+);
+
+/**
+ * Holds if the `@conditionalexpr` is of the two operand form
+ * `guard ? : false`.
+ */
+expr_cond_two_operand(
+    unique int cond: @conditionalexpr ref
+);
+
+/**
+ * The guard of `@conditionalexpr` `guard ? true : false`
+ */
+expr_cond_guard(
+    unique int cond: @conditionalexpr ref,
+    int guard: @expr ref
+);
+
+/**
+ * The expression used when the guard of `@conditionalexpr`
+ * `guard ? true : false` holds. For the two operand form
+ * `guard ?: false` consider using `expr_cond_guard` instead.
+ */
+expr_cond_true(
+    unique int cond: @conditionalexpr ref,
+    int true: @expr ref
+);
+
+/**
+ * The expression used when the guard of `@conditionalexpr`
+ * `guard ? true : false` does not hold.
+ */
+expr_cond_false(
+    unique int cond: @conditionalexpr ref,
+    int false: @expr ref
+);
+
+/** A string representation of the value. */
+values(
+    unique int id: @value,
+    string str: string ref
+);
+
+/** The actual text in the source code for the value, if any. */
+valuetext(
+    unique int id: @value ref,
+    string text: string ref
+);
+
+valuebind(
+    int val: @value ref,
+    unique int expr: @expr ref
+);
+
+fieldoffsets(
+    unique int id: @variable ref,
+    int byteoffset: int ref,
+    int bitoffset: int ref
+);
+
+bitfield(
+    unique int id: @variable ref,
+    int bits: int ref,
+    int declared_bits: int ref
+);
+
+/* TODO
+memberprefix(
+    int member: @expr ref,
+    int prefix: @expr ref
+);
+*/
+
+/*
+   kind(1) = mbrcallexpr
+   kind(2) = mbrptrcallexpr
+   kind(3) = mbrptrmbrcallexpr
+   kind(4) = ptrmbrptrmbrcallexpr
+   kind(5) = mbrreadexpr // x.y
+   kind(6) = mbrptrreadexpr // p->y
+   kind(7) = mbrptrmbrreadexpr // x.*pm
+   kind(8) = mbrptrmbrptrreadexpr // x->*pm
+   kind(9) = staticmbrreadexpr // static x.y
+   kind(10) = staticmbrptrreadexpr // static p->y
+*/
+/* TODO
+memberaccess(
+    int member: @expr ref,
+    int kind: int ref
+);
+*/
+
+initialisers(
+    unique int init: @initialiser,
+    int var: @accessible ref,
+    unique int expr: @expr ref,
+    int location: @location_expr ref
+);
+
+braced_initialisers(
+    int init: @initialiser ref
+);
+
+/**
+ * An ancestor for the expression, for cases in which we cannot
+ * otherwise find the expression's parent.
+ */
+expr_ancestor(
+    int exp: @expr ref,
+    int ancestor: @element ref
+);
+
+exprs(
+    unique int id: @expr,
+    int kind: int ref,
+    int location: @location_expr ref
+);
+
+expr_reuse(
+    int reuse: @expr ref,
+    int original: @expr ref,
+    int value_category: int ref
+)
+
+/*
+  case @value.category of
+    1 = prval
+  | 2 = xval
+  | 3 = lval
+  ;
+*/
+expr_types(
+    int id: @expr ref,
+    int typeid: @type ref,
+    int value_category: int ref
+);
+
+case @expr.kind of
+    1 = @errorexpr
+|   2 = @address_of // & AddressOfExpr
+|   3 = @reference_to // ReferenceToExpr (implicit?)
+|   4 = @indirect // * PointerDereferenceExpr
+|   5 = @ref_indirect // ReferenceDereferenceExpr (implicit?)
+// ...
+|   8 = @array_to_pointer // (???)
+|   9 = @vacuous_destructor_call // VacuousDestructorCall
+// ...
+|  11 = @assume // Microsoft
+|  12 = @parexpr
+|  13 = @arithnegexpr
+|  14 = @unaryplusexpr
+|  15 = @complementexpr
+|  16 = @notexpr
+|  17 = @conjugation // GNU ~ operator
+|  18 = @realpartexpr // GNU __real
+|  19 = @imagpartexpr // GNU __imag
+|  20 = @postincrexpr
+|  21 = @postdecrexpr
+|  22 = @preincrexpr
+|  23 = @predecrexpr
+|  24 = @conditionalexpr
+|  25 = @addexpr
+|  26 = @subexpr
+|  27 = @mulexpr
+|  28 = @divexpr
+|  29 = @remexpr
+|  30 = @jmulexpr // C99 mul imaginary
+|  31 = @jdivexpr // C99 div imaginary
+|  32 = @fjaddexpr // C99 add real + imaginary
+|  33 = @jfaddexpr // C99 add imaginary + real
+|  34 = @fjsubexpr // C99 sub real - imaginary
+|  35 = @jfsubexpr // C99 sub imaginary - real
+|  36 = @paddexpr // pointer add (pointer + int or int + pointer)
+|  37 = @psubexpr // pointer sub (pointer - integer)
+|  38 = @pdiffexpr // difference between two pointers
+|  39 = @lshiftexpr
+|  40 = @rshiftexpr
+|  41 = @andexpr
+|  42 = @orexpr
+|  43 = @xorexpr
+|  44 = @eqexpr
+|  45 = @neexpr
+|  46 = @gtexpr
+|  47 = @ltexpr
+|  48 = @geexpr
+|  49 = @leexpr
+|  50 = @minexpr // GNU minimum
+|  51 = @maxexpr // GNU maximum
+|  52 = @assignexpr
+|  53 = @assignaddexpr
+|  54 = @assignsubexpr
+|  55 = @assignmulexpr
+|  56 = @assigndivexpr
+|  57 = @assignremexpr
+|  58 = @assignlshiftexpr
+|  59 = @assignrshiftexpr
+|  60 = @assignandexpr
+|  61 = @assignorexpr
+|  62 = @assignxorexpr
+|  63 = @assignpaddexpr // assign pointer add
+|  64 = @assignpsubexpr // assign pointer sub
+|  65 = @andlogicalexpr
+|  66 = @orlogicalexpr
+|  67 = @commaexpr
+|  68 = @subscriptexpr // access to member of an array, e.g., a[5]
+// ...  69 @objc_subscriptexpr deprecated
+// ...  70 @cmdaccess deprecated
+// ...
+|  73 = @virtfunptrexpr
+|  74 = @callexpr
+// ...  75 @msgexpr_normal deprecated
+// ...  76 @msgexpr_super deprecated
+// ...  77 @atselectorexpr deprecated
+// ...  78 @atprotocolexpr deprecated
+|  79 = @vastartexpr
+|  80 = @vaargexpr
+|  81 = @vaendexpr
+|  82 = @vacopyexpr
+// ...  83 @atencodeexpr deprecated
+|  84 = @varaccess
+|  85 = @thisaccess
+// ...  86 @objc_box_expr deprecated
+|  87 = @new_expr
+|  88 = @delete_expr
+|  89 = @throw_expr
+|  90 = @condition_decl // a variable declared in a condition, e.g., if(int x = y > 2)
+|  91 = @braced_init_list
+|  92 = @type_id
+|  93 = @runtime_sizeof
+|  94 = @runtime_alignof
+|  95 = @sizeof_pack
+|  96 = @expr_stmt // GNU extension
+|  97 = @routineexpr
+|  98 = @type_operand // used to access a type in certain contexts (haven't found any examples yet....)
+|  99 = @offsetofexpr // offsetof ::= type and field
+| 100 = @hasassignexpr // __has_assign ::= type
+| 101 = @hascopyexpr // __has_copy ::= type
+| 102 = @hasnothrowassign // __has_nothrow_assign ::= type
+| 103 = @hasnothrowconstr // __has_nothrow_constructor ::= type
+| 104 = @hasnothrowcopy // __has_nothrow_copy ::= type
+| 105 = @hastrivialassign // __has_trivial_assign ::= type
+| 106 = @hastrivialconstr // __has_trivial_constructor ::= type
+| 107 = @hastrivialcopy // __has_trivial_copy ::= type
+| 108 = @hasuserdestr // __has_user_destructor ::= type
+| 109 = @hasvirtualdestr // __has_virtual_destructor ::= type
+| 110 = @isabstractexpr // __is_abstract ::= type
+| 111 = @isbaseofexpr // __is_base_of ::= type type
+| 112 = @isclassexpr // __is_class ::= type
+| 113 = @isconvtoexpr // __is_convertible_to ::= type type
+| 114 = @isemptyexpr // __is_empty ::= type
+| 115 = @isenumexpr // __is_enum ::= type
+| 116 = @ispodexpr // __is_pod ::= type
+| 117 = @ispolyexpr // __is_polymorphic ::= type
+| 118 = @isunionexpr // __is_union ::= type
+| 119 = @typescompexpr // GNU __builtin_types_compatible ::= type type
+| 120 = @intaddrexpr // frontend internal builtin, used to implement offsetof
+// ...
+| 122 = @hastrivialdestructor // __has_trivial_destructor ::= type
+| 123 = @literal
+| 124 = @uuidof
+| 127 = @aggregateliteral
+| 128 = @delete_array_expr
+| 129 = @new_array_expr
+// ... 130 @objc_array_literal deprecated
+// ... 131 @objc_dictionary_literal deprecated
+| 132 = @foldexpr
+// ...
+| 200 = @ctordirectinit
+| 201 = @ctorvirtualinit
+| 202 = @ctorfieldinit
+| 203 = @ctordelegatinginit
+| 204 = @dtordirectdestruct
+| 205 = @dtorvirtualdestruct
+| 206 = @dtorfielddestruct
+// ...
+| 210 = @static_cast
+| 211 = @reinterpret_cast
+| 212 = @const_cast
+| 213 = @dynamic_cast
+| 214 = @c_style_cast
+| 215 = @lambdaexpr
+| 216 = @param_ref
+| 217 = @noopexpr
+// ...
+| 294 = @istriviallyconstructibleexpr
+| 295 = @isdestructibleexpr
+| 296 = @isnothrowdestructibleexpr
+| 297 = @istriviallydestructibleexpr
+| 298 = @istriviallyassignableexpr
+| 299 = @isnothrowassignableexpr
+| 300 = @istrivialexpr
+| 301 = @isstandardlayoutexpr
+| 302 = @istriviallycopyableexpr
+| 303 = @isliteraltypeexpr
+| 304 = @hastrivialmoveconstructorexpr
+| 305 = @hastrivialmoveassignexpr
+| 306 = @hasnothrowmoveassignexpr
+| 307 = @isconstructibleexpr
+| 308 = @isnothrowconstructibleexpr
+| 309 = @hasfinalizerexpr
+| 310 = @isdelegateexpr
+| 311 = @isinterfaceclassexpr
+| 312 = @isrefarrayexpr
+| 313 = @isrefclassexpr
+| 314 = @issealedexpr
+| 315 = @issimplevalueclassexpr
+| 316 = @isvalueclassexpr
+| 317 = @isfinalexpr
+| 319 = @noexceptexpr
+| 320 = @builtinshufflevector
+| 321 = @builtinchooseexpr
+| 322 = @builtinaddressof
+| 323 = @vec_fill
+| 324 = @builtinconvertvector
+| 325 = @builtincomplex
+| 326 = @spaceshipexpr
+| 327 = @co_await
+| 328 = @co_yield
+| 329 = @temp_init
+| 330 = @isassignable
+| 331 = @isaggregate
+| 332 = @hasuniqueobjectrepresentations
+| 333 = @builtinbitcast
+| 334 = @builtinshuffle
+| 335 = @blockassignexpr
+| 336 = @issame
+| 337 = @isfunction
+| 338 = @islayoutcompatible
+| 339 = @ispointerinterconvertiblebaseof
+| 340 = @isarray
+| 341 = @arrayrank
+| 342 = @arrayextent
+| 343 = @isarithmetic
+| 344 = @iscompletetype
+| 345 = @iscompound
+| 346 = @isconst
+| 347 = @isfloatingpoint
+| 348 = @isfundamental
+| 349 = @isintegral
+| 350 = @islvaluereference
+| 351 = @ismemberfunctionpointer
+| 352 = @ismemberobjectpointer
+| 353 = @ismemberpointer
+| 354 = @isobject
+| 355 = @ispointer
+| 356 = @isreference
+| 357 = @isrvaluereference
+| 358 = @isscalar
+| 359 = @issigned
+| 360 = @isunsigned
+| 361 = @isvoid
+| 362 = @isvolatile
+| 363 = @reuseexpr
+| 364 = @istriviallycopyassignable
+| 365 = @isassignablenopreconditioncheck
+| 366 = @referencebindstotemporary
+| 367 = @issameas
+| 368 = @builtinhasattribute
+| 369 = @ispointerinterconvertiblewithclass
+| 370 = @builtinispointerinterconvertiblewithclass
+| 371 = @iscorrespondingmember
+| 372 = @builtiniscorrespondingmember
+| 373 = @isboundedarray
+| 374 = @isunboundedarray
+| 375 = @isreferenceable
+| 378 = @isnothrowconvertible
+| 379 = @referenceconstructsfromtemporary
+| 380 = @referenceconvertsfromtemporary
+| 381 = @isconvertible
+| 382 = @isvalidwinrttype
+| 383 = @iswinclass
+| 384 = @iswininterface
+| 385 = @istriviallyequalitycomparable
+| 386 = @isscopedenum
+| 387 = @istriviallyrelocatable
+| 388 = @datasizeof
+| 389 = @c11_generic
+;
+
+@var_args_expr = @vastartexpr
+               | @vaendexpr
+               | @vaargexpr
+               | @vacopyexpr
+               ;
+
+@builtin_op = @var_args_expr
+            | @noopexpr
+            | @offsetofexpr
+            | @intaddrexpr
+            | @hasassignexpr
+            | @hascopyexpr
+            | @hasnothrowassign
+            | @hasnothrowconstr
+            | @hasnothrowcopy
+            | @hastrivialassign
+            | @hastrivialconstr
+            | @hastrivialcopy
+            | @hastrivialdestructor
+            | @hasuserdestr
+            | @hasvirtualdestr
+            | @isabstractexpr
+            | @isbaseofexpr
+            | @isclassexpr
+            | @isconvtoexpr
+            | @isemptyexpr
+            | @isenumexpr
+            | @ispodexpr
+            | @ispolyexpr
+            | @isunionexpr
+            | @typescompexpr
+            | @builtinshufflevector
+            | @builtinconvertvector
+            | @builtinaddressof
+            | @istriviallyconstructibleexpr
+            | @isdestructibleexpr
+            | @isnothrowdestructibleexpr
+            | @istriviallydestructibleexpr
+            | @istriviallyassignableexpr
+            | @isnothrowassignableexpr
+            | @istrivialexpr
+            | @isstandardlayoutexpr
+            | @istriviallycopyableexpr
+            | @isliteraltypeexpr
+            | @hastrivialmoveconstructorexpr
+            | @hastrivialmoveassignexpr
+            | @hasnothrowmoveassignexpr
+            | @isconstructibleexpr
+            | @isnothrowconstructibleexpr
+            | @hasfinalizerexpr
+            | @isdelegateexpr
+            | @isinterfaceclassexpr
+            | @isrefarrayexpr
+            | @isrefclassexpr
+            | @issealedexpr
+            | @issimplevalueclassexpr
+            | @isvalueclassexpr
+            | @isfinalexpr
+            | @builtinchooseexpr
+            | @builtincomplex
+            | @isassignable
+            | @isaggregate
+            | @hasuniqueobjectrepresentations
+            | @builtinbitcast
+            | @builtinshuffle
+            | @issame
+            | @isfunction
+            | @islayoutcompatible
+            | @ispointerinterconvertiblebaseof
+            | @isarray
+            | @arrayrank
+            | @arrayextent
+            | @isarithmetic
+            | @iscompletetype
+            | @iscompound
+            | @isconst
+            | @isfloatingpoint
+            | @isfundamental
+            | @isintegral
+            | @islvaluereference
+            | @ismemberfunctionpointer
+            | @ismemberobjectpointer
+            | @ismemberpointer
+            | @isobject
+            | @ispointer
+            | @isreference
+            | @isrvaluereference
+            | @isscalar
+            | @issigned
+            | @isunsigned
+            | @isvoid
+            | @isvolatile
+            | @istriviallycopyassignable
+            | @isassignablenopreconditioncheck
+            | @referencebindstotemporary
+            | @issameas
+            | @builtinhasattribute
+            | @ispointerinterconvertiblewithclass
+            | @builtinispointerinterconvertiblewithclass
+            | @iscorrespondingmember
+            | @builtiniscorrespondingmember
+            | @isboundedarray
+            | @isunboundedarray
+            | @isreferenceable
+            | @isnothrowconvertible
+            | @referenceconstructsfromtemporary
+            | @referenceconvertsfromtemporary
+            | @isconvertible
+            | @isvalidwinrttype
+            | @iswinclass
+            | @iswininterface
+            | @istriviallyequalitycomparable
+            | @isscopedenum
+            | @istriviallyrelocatable
+            ;
+
+new_allocated_type(
+    unique int expr: @new_expr ref,
+    int type_id: @type ref
+);
+
+new_array_allocated_type(
+    unique int expr: @new_array_expr ref,
+    int type_id: @type ref
+);
+
+/**
+ * The field being initialized by an initializer expression within an aggregate
+ * initializer for a class/struct/union. Position is used to sort repeated initializers.
+ */
+#keyset[aggregate, position]
+aggregate_field_init(
+    int aggregate: @aggregateliteral ref,
+    int initializer: @expr ref,
+    int field: @membervariable ref,
+    int position: int ref
+);
+
+/**
+ * The index of the element being initialized by an initializer expression
+ * within an aggregate initializer for an array. Position is used to sort repeated initializers.
+ */
+#keyset[aggregate, position]
+aggregate_array_init(
+    int aggregate: @aggregateliteral ref,
+    int initializer: @expr ref,
+    int element_index: int ref,
+    int position: int ref
+);
+
+@ctorinit = @ctordirectinit
+          | @ctorvirtualinit
+          | @ctorfieldinit
+          | @ctordelegatinginit;
+@dtordestruct = @dtordirectdestruct
+              | @dtorvirtualdestruct
+              | @dtorfielddestruct;
+
+
+condition_decl_bind(
+    unique int expr: @condition_decl ref,
+    unique int decl: @declaration ref
+);
+
+typeid_bind(
+    unique int expr: @type_id ref,
+    int type_id: @type ref
+);
+
+uuidof_bind(
+    unique int expr: @uuidof ref,
+    int type_id: @type ref
+);
+
+@runtime_sizeof_or_alignof = @runtime_sizeof | @runtime_alignof | @datasizeof;
+
+sizeof_bind(
+    unique int expr: @runtime_sizeof_or_alignof ref,
+    int type_id: @type ref
+);
+
+code_block(
+    unique int block: @literal ref,
+    unique int routine: @function ref
+);
+
+lambdas(
+    unique int expr: @lambdaexpr ref,
+    string default_capture: string ref,
+    boolean has_explicit_return_type: boolean ref
+);
+
+lambda_capture(
+    unique int id: @lambdacapture,
+    int lambda: @lambdaexpr ref,
+    int index: int ref,
+    int field: @membervariable ref,
+    boolean captured_by_reference: boolean ref,
+    boolean is_implicit: boolean ref,
+    int location: @location_default ref
+);
+
+@funbindexpr = @routineexpr
+             | @new_expr
+             | @delete_expr
+             | @delete_array_expr
+             | @ctordirectinit
+             | @ctorvirtualinit
+             | @ctordelegatinginit
+             | @dtordirectdestruct
+             | @dtorvirtualdestruct;
+
+@varbindexpr = @varaccess | @ctorfieldinit | @dtorfielddestruct;
+@addressable = @function | @variable ;
+@accessible = @addressable | @enumconstant ;
+
+@access = @varaccess | @routineexpr ;
+
+fold(
+    int expr: @foldexpr ref,
+    string operator: string ref,
+    boolean is_left_fold: boolean ref
+);
+
+stmts(
+    unique int id: @stmt,
+    int kind: int ref,
+    int location: @location_stmt ref
+);
+
+case @stmt.kind of
+    1 = @stmt_expr
+|   2 = @stmt_if
+|   3 = @stmt_while
+|   4 = @stmt_goto
+|   5 = @stmt_label
+|   6 = @stmt_return
+|   7 = @stmt_block
+|   8 = @stmt_end_test_while // do { ... } while ( ... )
+|   9 = @stmt_for
+|  10 = @stmt_switch_case
+|  11 = @stmt_switch
+|  13 = @stmt_asm // "asm" statement or the body of an asm function
+|  15 = @stmt_try_block
+|  16 = @stmt_microsoft_try // Microsoft
+|  17 = @stmt_decl
+|  18 = @stmt_set_vla_size // C99
+|  19 = @stmt_vla_decl // C99
+|  25 = @stmt_assigned_goto // GNU
+|  26 = @stmt_empty
+|  27 = @stmt_continue
+|  28 = @stmt_break
+|  29 = @stmt_range_based_for // C++11
+// ...  30 @stmt_at_autoreleasepool_block deprecated
+// ...  31 @stmt_objc_for_in deprecated
+// ...  32 @stmt_at_synchronized deprecated
+|  33 = @stmt_handler
+// ...  34 @stmt_finally_end deprecated
+|  35 = @stmt_constexpr_if
+|  37 = @stmt_co_return
+;
+
+type_vla(
+    int type_id: @type ref,
+    int decl: @stmt_vla_decl ref
+);
+
+variable_vla(
+    int var: @variable ref,
+    int decl: @stmt_vla_decl ref
+);
+
+if_initialization(
+    unique int if_stmt: @stmt_if ref,
+    int init_id: @stmt ref
+);
+
+if_then(
+    unique int if_stmt: @stmt_if ref,
+    int then_id: @stmt ref
+);
+
+if_else(
+    unique int if_stmt: @stmt_if ref,
+    int else_id: @stmt ref
+);
+
+constexpr_if_initialization(
+    unique int constexpr_if_stmt: @stmt_constexpr_if ref,
+    int init_id: @stmt ref
+);
+
+constexpr_if_then(
+    unique int constexpr_if_stmt: @stmt_constexpr_if ref,
+    int then_id: @stmt ref
+);
+
+constexpr_if_else(
+    unique int constexpr_if_stmt: @stmt_constexpr_if ref,
+    int else_id: @stmt ref
+);
+
+while_body(
+    unique int while_stmt: @stmt_while ref,
+    int body_id: @stmt ref
+);
+
+do_body(
+    unique int do_stmt: @stmt_end_test_while ref,
+    int body_id: @stmt ref
+);
+
+switch_initialization(
+    unique int switch_stmt: @stmt_switch ref,
+    int init_id: @stmt ref
+);
+
+#keyset[switch_stmt, index]
+switch_case(
+    int switch_stmt: @stmt_switch ref,
+    int index: int ref,
+    int case_id: @stmt_switch_case ref
+);
+
+switch_body(
+    unique int switch_stmt: @stmt_switch ref,
+    int body_id: @stmt ref
+);
+
+@stmt_for_or_range_based_for = @stmt_for
+                             | @stmt_range_based_for;
+
+for_initialization(
+    unique int for_stmt: @stmt_for_or_range_based_for ref,
+    int init_id: @stmt ref
+);
+
+for_condition(
+    unique int for_stmt: @stmt_for ref,
+    int condition_id: @expr ref
+);
+
+for_update(
+    unique int for_stmt: @stmt_for ref,
+    int update_id: @expr ref
+);
+
+for_body(
+    unique int for_stmt: @stmt_for ref,
+    int body_id: @stmt ref
+);
+
+@stmtparent = @stmt | @expr_stmt ;
+stmtparents(
+    unique int id: @stmt ref,
+    int index: int ref,
+    int parent: @stmtparent ref
+);
+
+ishandler(unique int block: @stmt_block ref);
+
+@cfgnode = @stmt | @expr | @function | @initialiser ;
+
+stmt_decl_bind(
+    int stmt: @stmt_decl ref,
+    int num: int ref,
+    int decl: @declaration ref
+);
+
+stmt_decl_entry_bind(
+    int stmt: @stmt_decl ref,
+    int num: int ref,
+    int decl_entry: @element ref
+);
+
+@functionorblock = @function | @stmt_block;
+
+blockscope(
+    unique int block: @stmt_block ref,
+    int enclosing: @functionorblock ref
+);
+
+@jump = @stmt_goto | @stmt_break | @stmt_continue;
+
+@jumporlabel = @jump | @stmt_label | @literal;
+
+jumpinfo(
+    unique int id: @jumporlabel ref,
+    string str: string ref,
+    int target: @stmt ref
+);
+
+preprocdirects(
+    unique int id: @preprocdirect,
+    int kind: int ref,
+    int location: @location_default ref
+);
+case @preprocdirect.kind of
+   0 = @ppd_if
+|  1 = @ppd_ifdef
+|  2 = @ppd_ifndef
+|  3 = @ppd_elif
+|  4 = @ppd_else
+|  5 = @ppd_endif
+|  6 = @ppd_plain_include
+|  7 = @ppd_define
+|  8 = @ppd_undef
+|  9 = @ppd_line
+| 10 = @ppd_error
+| 11 = @ppd_pragma
+| 12 = @ppd_objc_import
+| 13 = @ppd_include_next
+| 18 = @ppd_warning
+;
+
+@ppd_include = @ppd_plain_include | @ppd_objc_import | @ppd_include_next;
+
+@ppd_branch = @ppd_if | @ppd_ifdef | @ppd_ifndef | @ppd_elif;
+
+preprocpair(
+    int begin : @ppd_branch ref,
+    int elseelifend : @preprocdirect ref
+);
+
+preproctrue(int branch : @ppd_branch ref);
+preprocfalse(int branch : @ppd_branch ref);
+
+preproctext(
+    unique int id: @preprocdirect ref,
+    string head: string ref,
+    string body: string ref
+);
+
+includes(
+    unique int id: @ppd_include ref,
+    int included: @file ref
+);
+
+link_targets(
+    int id: @link_target,
+    int binary: @file ref
+);
+
+link_parent(
+    int element : @element ref,
+    int link_target : @link_target ref
+);
+
+/* XML Files */
+
+xmlEncoding(unique int id: @file ref, string encoding: string ref);
+
+xmlDTDs(
+    unique int id: @xmldtd,
+    string root: string ref,
+    string publicId: string ref,
+    string systemId: string ref,
+    int fileid: @file ref
+);
+
+xmlElements(
+    unique int id: @xmlelement,
+    string name: string ref,
+    int parentid: @xmlparent ref,
+    int idx: int ref,
+    int fileid: @file ref
+);
+
+xmlAttrs(
+    unique int id: @xmlattribute,
+    int elementid: @xmlelement ref,
+    string name: string ref,
+    string value: string ref,
+    int idx: int ref,
+    int fileid: @file ref
+);
+
+xmlNs(
+    int id: @xmlnamespace,
+    string prefixName: string ref,
+    string URI: string ref,
+    int fileid: @file ref
+);
+
+xmlHasNs(
+    int elementId: @xmlnamespaceable ref,
+    int nsId: @xmlnamespace ref,
+    int fileid: @file ref
+);
+
+xmlComments(
+    unique int id: @xmlcomment,
+    string text: string ref,
+    int parentid: @xmlparent ref,
+    int fileid: @file ref
+);
+
+xmlChars(
+    unique int id: @xmlcharacters,
+    string text: string ref,
+    int parentid: @xmlparent ref,
+    int idx: int ref,
+    int isCDATA: int ref,
+    int fileid: @file ref
+);
+
+@xmlparent = @file | @xmlelement;
+@xmlnamespaceable = @xmlelement | @xmlattribute;
+
+xmllocations(
+    int xmlElement: @xmllocatable ref,
+    int location: @location_default ref
+);
+
+@xmllocatable = @xmlcharacters
+              | @xmlelement
+              | @xmlcomment
+              | @xmlattribute
+              | @xmldtd
+              | @file
+              | @xmlnamespace;
diff --git a/cpp/downgrades/6f5d51e89e762fe4609fd4ac8ee3afb04221e873/upgrade.properties b/cpp/downgrades/6f5d51e89e762fe4609fd4ac8ee3afb04221e873/upgrade.properties
new file mode 100644
index 000000000000..89fbcd9b239e
--- /dev/null
+++ b/cpp/downgrades/6f5d51e89e762fe4609fd4ac8ee3afb04221e873/upgrade.properties
@@ -0,0 +1,3 @@
+description: Add requires expr
+compatibility: partial
+exprs.rel: run exprs.qlo
diff --git a/cpp/ql/lib/cpp.qll b/cpp/ql/lib/cpp.qll
index 0a29f7b86bac..5162248c4b85 100644
--- a/cpp/ql/lib/cpp.qll
+++ b/cpp/ql/lib/cpp.qll
@@ -17,6 +17,7 @@ import semmle.code.cpp.File
 import semmle.code.cpp.Linkage
 import semmle.code.cpp.Location
 import semmle.code.cpp.Compilation
+import semmle.code.cpp.Concept
 import semmle.code.cpp.Element
 import semmle.code.cpp.Namespace
 import semmle.code.cpp.Specifier
diff --git a/cpp/ql/lib/semmle/code/cpp/Concept.qll b/cpp/ql/lib/semmle/code/cpp/Concept.qll
new file mode 100644
index 000000000000..fed4c0937cfa
--- /dev/null
+++ b/cpp/ql/lib/semmle/code/cpp/Concept.qll
@@ -0,0 +1,14 @@
+/**
+ * Provides classes for working with C++ concepts.
+ */
+
+import semmle.code.cpp.exprs.Expr
+
+/**
+ * A C/C++ requires expression.
+ */
+class RequiresExpr extends Expr, @requires_expr {
+  override string toString() { result = "requires ..." }
+
+  override string getAPrimaryQlClass() { result = "RequiresExpr" }
+}
diff --git a/cpp/ql/lib/semmlecode.cpp.dbscheme b/cpp/ql/lib/semmlecode.cpp.dbscheme
index 7ff6a6e53dbc..6f5d51e89e76 100644
--- a/cpp/ql/lib/semmlecode.cpp.dbscheme
+++ b/cpp/ql/lib/semmlecode.cpp.dbscheme
@@ -1790,6 +1790,7 @@ case @expr.kind of
 | 387 = @istriviallyrelocatable
 | 388 = @datasizeof
 | 389 = @c11_generic
+| 390 = @requires_expr
 ;
 
 @var_args_expr = @vastartexpr
diff --git a/cpp/ql/lib/semmlecode.cpp.dbscheme.stats b/cpp/ql/lib/semmlecode.cpp.dbscheme.stats
index 07045b0bd67a..20534e223c94 100644
--- a/cpp/ql/lib/semmlecode.cpp.dbscheme.stats
+++ b/cpp/ql/lib/semmlecode.cpp.dbscheme.stats
@@ -18,15 +18,15 @@
         </e>
         <e>
             <k>@location_default</k>
-            <v>29765023</v>
+            <v>29768202</v>
         </e>
         <e>
             <k>@location_stmt</k>
-            <v>3819884</v>
+            <v>3819867</v>
         </e>
         <e>
             <k>@location_expr</k>
-            <v>13187951</v>
+            <v>13187892</v>
         </e>
         <e>
             <k>@diagnostic</k>
@@ -34,43 +34,43 @@
         </e>
         <e>
             <k>@file</k>
-            <v>123252</v>
+            <v>123267</v>
         </e>
         <e>
             <k>@folder</k>
-            <v>16340</v>
+            <v>16342</v>
         </e>
         <e>
             <k>@macro_expansion</k>
-            <v>33257908</v>
+            <v>33257556</v>
         </e>
         <e>
             <k>@other_macro_reference</k>
-            <v>859032</v>
+            <v>859138</v>
         </e>
         <e>
             <k>@function</k>
-            <v>4179381</v>
+            <v>4179893</v>
         </e>
         <e>
             <k>@fun_decl</k>
-            <v>4543537</v>
+            <v>4544093</v>
         </e>
         <e>
             <k>@var_decl</k>
-            <v>8039427</v>
+            <v>8040412</v>
         </e>
         <e>
             <k>@type_decl</k>
-            <v>3283466</v>
+            <v>3283868</v>
         </e>
         <e>
             <k>@namespace_decl</k>
-            <v>311638</v>
+            <v>311636</v>
         </e>
         <e>
             <k>@using_declaration</k>
-            <v>363221</v>
+            <v>363266</v>
         </e>
         <e>
             <k>@using_directive</k>
@@ -82,15 +82,15 @@
         </e>
         <e>
             <k>@static_assert</k>
-            <v>134702</v>
+            <v>134701</v>
         </e>
         <e>
             <k>@parameter</k>
-            <v>6190639</v>
+            <v>6191397</v>
         </e>
         <e>
             <k>@membervariable</k>
-            <v>1054697</v>
+            <v>1054692</v>
         </e>
         <e>
             <k>@globalvariable</k>
@@ -102,7 +102,7 @@
         </e>
         <e>
             <k>@enumconstant</k>
-            <v>241670</v>
+            <v>241669</v>
         </e>
         <e>
             <k>@errortype</k>
@@ -330,23 +330,23 @@
         </e>
         <e>
             <k>@pointer</k>
-            <v>568175</v>
+            <v>568245</v>
         </e>
         <e>
             <k>@type_with_specifiers</k>
-            <v>852029</v>
+            <v>852134</v>
         </e>
         <e>
             <k>@array</k>
-            <v>110180</v>
+            <v>110193</v>
         </e>
         <e>
             <k>@routineptr</k>
-            <v>625429</v>
+            <v>625426</v>
         </e>
         <e>
             <k>@reference</k>
-            <v>1276410</v>
+            <v>1276567</v>
         </e>
         <e>
             <k>@gnu_vector</k>
@@ -358,7 +358,7 @@
         </e>
         <e>
             <k>@rvalue_reference</k>
-            <v>333342</v>
+            <v>333382</v>
         </e>
         <e>
             <k>@block</k>
@@ -366,43 +366,43 @@
         </e>
         <e>
             <k>@decltype</k>
-            <v>27078</v>
+            <v>27081</v>
         </e>
         <e>
             <k>@usertype</k>
-            <v>5234965</v>
+            <v>5235606</v>
         </e>
         <e>
             <k>@mangledname</k>
-            <v>6061784</v>
+            <v>6062526</v>
         </e>
         <e>
             <k>@type_mention</k>
-            <v>4029136</v>
+            <v>4029118</v>
         </e>
         <e>
             <k>@routinetype</k>
-            <v>538824</v>
+            <v>538891</v>
         </e>
         <e>
             <k>@ptrtomember</k>
-            <v>37816</v>
+            <v>37820</v>
         </e>
         <e>
             <k>@specifier</k>
-            <v>24743</v>
+            <v>24746</v>
         </e>
         <e>
             <k>@gnuattribute</k>
-            <v>553702</v>
+            <v>553770</v>
         </e>
         <e>
             <k>@stdattribute</k>
-            <v>253563</v>
+            <v>253562</v>
         </e>
         <e>
             <k>@declspec</k>
-            <v>239153</v>
+            <v>239152</v>
         </e>
         <e>
             <k>@msattribute</k>
@@ -410,15 +410,15 @@
         </e>
         <e>
             <k>@alignas</k>
-            <v>4668</v>
+            <v>4669</v>
         </e>
         <e>
             <k>@attribute_arg_token</k>
-            <v>25210</v>
+            <v>25213</v>
         </e>
         <e>
             <k>@attribute_arg_constant_expr</k>
-            <v>318402</v>
+            <v>318441</v>
         </e>
         <e>
             <k>@attribute_arg_empty</k>
@@ -438,19 +438,19 @@
         </e>
         <e>
             <k>@derivation</k>
-            <v>391568</v>
+            <v>391566</v>
         </e>
         <e>
             <k>@frienddecl</k>
-            <v>707052</v>
+            <v>707049</v>
         </e>
         <e>
             <k>@comment</k>
-            <v>8266137</v>
+            <v>8266100</v>
         </e>
         <e>
             <k>@namespace</k>
-            <v>12138</v>
+            <v>12139</v>
         </e>
         <e>
             <k>@specialnamequalifyingelement</k>
@@ -458,15 +458,15 @@
         </e>
         <e>
             <k>@namequalifier</k>
-            <v>1513800</v>
+            <v>1513793</v>
         </e>
         <e>
             <k>@value</k>
-            <v>10776699</v>
+            <v>10776651</v>
         </e>
         <e>
             <k>@initialiser</k>
-            <v>1710781</v>
+            <v>1710773</v>
         </e>
         <e>
             <k>@address_of</k>
@@ -474,15 +474,15 @@
         </e>
         <e>
             <k>@indirect</k>
-            <v>292646</v>
+            <v>292644</v>
         </e>
         <e>
             <k>@array_to_pointer</k>
-            <v>1430838</v>
+            <v>1430832</v>
         </e>
         <e>
             <k>@parexpr</k>
-            <v>3587479</v>
+            <v>3587464</v>
         </e>
         <e>
             <k>@arithnegexpr</k>
@@ -498,7 +498,7 @@
         </e>
         <e>
             <k>@notexpr</k>
-            <v>276425</v>
+            <v>276424</v>
         </e>
         <e>
             <k>@postincrexpr</k>
@@ -518,19 +518,19 @@
         </e>
         <e>
             <k>@conditionalexpr</k>
-            <v>657237</v>
+            <v>657235</v>
         </e>
         <e>
             <k>@addexpr</k>
-            <v>398394</v>
+            <v>398392</v>
         </e>
         <e>
             <k>@subexpr</k>
-            <v>340758</v>
+            <v>340757</v>
         </e>
         <e>
             <k>@mulexpr</k>
-            <v>306356</v>
+            <v>306355</v>
         </e>
         <e>
             <k>@divexpr</k>
@@ -542,7 +542,7 @@
         </e>
         <e>
             <k>@paddexpr</k>
-            <v>86662</v>
+            <v>86661</v>
         </e>
         <e>
             <k>@psubexpr</k>
@@ -554,51 +554,51 @@
         </e>
         <e>
             <k>@lshiftexpr</k>
-            <v>566303</v>
+            <v>566300</v>
         </e>
         <e>
             <k>@rshiftexpr</k>
-            <v>140840</v>
+            <v>140839</v>
         </e>
         <e>
             <k>@andexpr</k>
-            <v>489056</v>
+            <v>489054</v>
         </e>
         <e>
             <k>@orexpr</k>
-            <v>145465</v>
+            <v>145464</v>
         </e>
         <e>
             <k>@xorexpr</k>
-            <v>54175</v>
+            <v>54174</v>
         </e>
         <e>
             <k>@eqexpr</k>
-            <v>470650</v>
+            <v>470648</v>
         </e>
         <e>
             <k>@neexpr</k>
-            <v>301667</v>
+            <v>301666</v>
         </e>
         <e>
             <k>@gtexpr</k>
-            <v>104111</v>
+            <v>104123</v>
         </e>
         <e>
             <k>@ltexpr</k>
-            <v>101776</v>
+            <v>101789</v>
         </e>
         <e>
             <k>@geexpr</k>
-            <v>59249</v>
+            <v>59248</v>
         </e>
         <e>
             <k>@leexpr</k>
-            <v>212526</v>
+            <v>212525</v>
         </e>
         <e>
             <k>@assignexpr</k>
-            <v>936957</v>
+            <v>936952</v>
         </e>
         <e>
             <k>@assignaddexpr</k>
@@ -614,7 +614,7 @@
         </e>
         <e>
             <k>@assigndivexpr</k>
-            <v>4994</v>
+            <v>4993</v>
         </e>
         <e>
             <k>@assignremexpr</k>
@@ -638,7 +638,7 @@
         </e>
         <e>
             <k>@assignxorexpr</k>
-            <v>21844</v>
+            <v>21843</v>
         </e>
         <e>
             <k>@assignpaddexpr</k>
@@ -650,15 +650,15 @@
         </e>
         <e>
             <k>@andlogicalexpr</k>
-            <v>249952</v>
+            <v>249951</v>
         </e>
         <e>
             <k>@orlogicalexpr</k>
-            <v>866110</v>
+            <v>866116</v>
         </e>
         <e>
             <k>@commaexpr</k>
-            <v>122841</v>
+            <v>122840</v>
         </e>
         <e>
             <k>@subscriptexpr</k>
@@ -666,7 +666,7 @@
         </e>
         <e>
             <k>@callexpr</k>
-            <v>316534</v>
+            <v>316533</v>
         </e>
         <e>
             <k>@vastartexpr</k>
@@ -686,11 +686,11 @@
         </e>
         <e>
             <k>@varaccess</k>
-            <v>6029127</v>
+            <v>6029100</v>
         </e>
         <e>
             <k>@runtime_sizeof</k>
-            <v>295836</v>
+            <v>295835</v>
         </e>
         <e>
             <k>@runtime_alignof</k>
@@ -698,27 +698,27 @@
         </e>
         <e>
             <k>@expr_stmt</k>
-            <v>94387</v>
+            <v>94386</v>
         </e>
         <e>
             <k>@routineexpr</k>
-            <v>3186314</v>
+            <v>3186299</v>
         </e>
         <e>
             <k>@type_operand</k>
-            <v>1128756</v>
+            <v>1128764</v>
         </e>
         <e>
             <k>@offsetofexpr</k>
-            <v>19993</v>
+            <v>19992</v>
         </e>
         <e>
             <k>@typescompexpr</k>
-            <v>563777</v>
+            <v>563781</v>
         </e>
         <e>
             <k>@literal</k>
-            <v>4406923</v>
+            <v>4406841</v>
         </e>
         <e>
             <k>@aggregateliteral</k>
@@ -730,7 +730,7 @@
         </e>
         <e>
             <k>@temp_init</k>
-            <v>794460</v>
+            <v>794456</v>
         </e>
         <e>
             <k>@errorexpr</k>
@@ -738,11 +738,11 @@
         </e>
         <e>
             <k>@reference_to</k>
-            <v>1572195</v>
+            <v>1572188</v>
         </e>
         <e>
             <k>@ref_indirect</k>
-            <v>1901648</v>
+            <v>1901640</v>
         </e>
         <e>
             <k>@vacuous_destructor_call</k>
@@ -802,7 +802,7 @@
         </e>
         <e>
             <k>@thisaccess</k>
-            <v>1116784</v>
+            <v>1116779</v>
         </e>
         <e>
             <k>@new_expr</k>
@@ -830,7 +830,7 @@
         </e>
         <e>
             <k>@sizeof_pack</k>
-            <v>5602</v>
+            <v>5603</v>
         </e>
         <e>
             <k>@hasassignexpr</k>
@@ -942,7 +942,7 @@
         </e>
         <e>
             <k>@ctorfieldinit</k>
-            <v>190976</v>
+            <v>190975</v>
         </e>
         <e>
             <k>@ctordelegatinginit</k>
@@ -962,7 +962,7 @@
         </e>
         <e>
             <k>@static_cast</k>
-            <v>215649</v>
+            <v>215647</v>
         </e>
         <e>
             <k>@reinterpret_cast</k>
@@ -978,11 +978,11 @@
         </e>
         <e>
             <k>@lambdaexpr</k>
-            <v>21475</v>
+            <v>21478</v>
         </e>
         <e>
             <k>@param_ref</k>
-            <v>235619</v>
+            <v>235618</v>
         </e>
         <e>
             <k>@noopexpr</k>
@@ -1022,7 +1022,7 @@
         </e>
         <e>
             <k>@istriviallycopyableexpr</k>
-            <v>3734</v>
+            <v>3735</v>
         </e>
         <e>
             <k>@isliteraltypeexpr</k>
@@ -1086,7 +1086,7 @@
         </e>
         <e>
             <k>@noexceptexpr</k>
-            <v>24641</v>
+            <v>24640</v>
         </e>
         <e>
             <k>@builtinshufflevector</k>
@@ -1258,7 +1258,7 @@
         </e>
         <e>
             <k>@reuseexpr</k>
-            <v>373719</v>
+            <v>373717</v>
         </e>
         <e>
             <k>@istriviallycopyassignable</k>
@@ -1356,25 +1356,29 @@
             <k>@c11_generic</k>
             <v>8</v>
         </e>
+        <e>
+            <k>@requires_expr</k>
+            <v>1</v>
+        </e>
         <e>
             <k>@lambdacapture</k>
-            <v>28011</v>
+            <v>28015</v>
         </e>
         <e>
             <k>@stmt_expr</k>
-            <v>1486025</v>
+            <v>1486018</v>
         </e>
         <e>
             <k>@stmt_if</k>
-            <v>725914</v>
+            <v>725911</v>
         </e>
         <e>
             <k>@stmt_while</k>
-            <v>29317</v>
+            <v>29316</v>
         </e>
         <e>
             <k>@stmt_goto</k>
-            <v>110691</v>
+            <v>110690</v>
         </e>
         <e>
             <k>@stmt_label</k>
@@ -1382,15 +1386,15 @@
         </e>
         <e>
             <k>@stmt_return</k>
-            <v>1280145</v>
+            <v>1280140</v>
         </e>
         <e>
             <k>@stmt_block</k>
-            <v>1419271</v>
+            <v>1419265</v>
         </e>
         <e>
             <k>@stmt_end_test_while</k>
-            <v>148874</v>
+            <v>148873</v>
         </e>
         <e>
             <k>@stmt_for</k>
@@ -1398,7 +1402,7 @@
         </e>
         <e>
             <k>@stmt_switch_case</k>
-            <v>207501</v>
+            <v>207500</v>
         </e>
         <e>
             <k>@stmt_switch</k>
@@ -1410,7 +1414,7 @@
         </e>
         <e>
             <k>@stmt_decl</k>
-            <v>593124</v>
+            <v>593118</v>
         </e>
         <e>
             <k>@stmt_empty</k>
@@ -1446,15 +1450,15 @@
         </e>
         <e>
             <k>@stmt_range_based_for</k>
-            <v>8403</v>
+            <v>8404</v>
         </e>
         <e>
             <k>@stmt_handler</k>
-            <v>62676</v>
+            <v>62675</v>
         </e>
         <e>
             <k>@stmt_constexpr_if</k>
-            <v>52998</v>
+            <v>52997</v>
         </e>
         <e>
             <k>@stmt_co_return</k>
@@ -1462,39 +1466,39 @@
         </e>
         <e>
             <k>@ppd_if</k>
-            <v>667151</v>
+            <v>667232</v>
         </e>
         <e>
             <k>@ppd_ifdef</k>
-            <v>263312</v>
+            <v>263344</v>
         </e>
         <e>
             <k>@ppd_ifndef</k>
-            <v>266580</v>
+            <v>266612</v>
         </e>
         <e>
             <k>@ppd_elif</k>
-            <v>25210</v>
+            <v>25213</v>
         </e>
         <e>
             <k>@ppd_else</k>
-            <v>209155</v>
+            <v>209181</v>
         </e>
         <e>
             <k>@ppd_endif</k>
-            <v>1197043</v>
+            <v>1197190</v>
         </e>
         <e>
             <k>@ppd_plain_include</k>
-            <v>311399</v>
+            <v>311437</v>
         </e>
         <e>
             <k>@ppd_define</k>
-            <v>2291924</v>
+            <v>2291914</v>
         </e>
         <e>
             <k>@ppd_undef</k>
-            <v>258643</v>
+            <v>258675</v>
         </e>
         <e>
             <k>@ppd_include_next</k>
@@ -1510,7 +1514,7 @@
         </e>
         <e>
             <k>@ppd_pragma</k>
-            <v>296710</v>
+            <v>296709</v>
         </e>
         <e>
             <k>@ppd_objc_import</k>
@@ -1600,7 +1604,7 @@
         </relation>
         <relation>
             <name>compilation_args</name>
-            <cardinality>652551</cardinality>
+            <cardinality>652548</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
@@ -2148,7 +2152,7 @@
                 </e>
                 <e>
                     <k>seconds</k>
-                    <v>9149</v>
+                    <v>9348</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -2237,39 +2241,39 @@
                                     <v>239</v>
                                 </b>
                                 <b>
-                                    <a>5</a>
-                                    <b>8</b>
-                                    <v>159</v>
+                                    <a>6</a>
+                                    <b>7</b>
+                                    <v>119</v>
                                 </b>
                                 <b>
                                     <a>8</a>
-                                    <b>10</b>
-                                    <v>119</v>
+                                    <b>9</b>
+                                    <v>79</v>
                                 </b>
                                 <b>
-                                    <a>10</a>
+                                    <a>9</a>
                                     <b>11</b>
                                     <v>159</v>
                                 </b>
                                 <b>
                                     <a>11</a>
-                                    <b>15</b>
+                                    <b>13</b>
                                     <v>159</v>
                                 </b>
                                 <b>
-                                    <a>17</a>
-                                    <b>19</b>
+                                    <a>14</a>
+                                    <b>17</b>
                                     <v>159</v>
                                 </b>
                                 <b>
-                                    <a>20</a>
-                                    <b>44</b>
+                                    <a>18</a>
+                                    <b>22</b>
                                     <v>159</v>
                                 </b>
                                 <b>
-                                    <a>50</a>
-                                    <b>92</b>
-                                    <v>79</v>
+                                    <a>25</a>
+                                    <b>91</b>
+                                    <v>159</v>
                                 </b>
                             </bs>
                         </hist>
@@ -2337,37 +2341,37 @@
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>1478</v>
+                                    <v>1358</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>279</v>
+                                    <v>399</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>6</b>
-                                    <v>239</v>
+                                    <v>279</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>7</b>
-                                    <v>479</v>
+                                    <v>319</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>8</b>
-                                    <v>39</v>
+                                    <v>159</v>
                                 </b>
                                 <b>
                                     <a>8</a>
                                     <b>9</b>
-                                    <v>279</v>
+                                    <v>239</v>
                                 </b>
                                 <b>
                                     <a>9</a>
-                                    <b>24</b>
-                                    <v>239</v>
+                                    <b>23</b>
+                                    <v>279</v>
                                 </b>
                                 <b>
                                     <a>25</a>
@@ -2420,21 +2424,16 @@
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>39</v>
-                                </b>
-                                <b>
-                                    <a>4</a>
-                                    <b>5</b>
-                                    <v>39</v>
+                                    <v>79</v>
                                 </b>
                                 <b>
-                                    <a>124</a>
-                                    <b>125</b>
+                                    <a>138</a>
+                                    <b>139</b>
                                     <v>39</v>
                                 </b>
                                 <b>
-                                    <a>129</a>
-                                    <b>130</b>
+                                    <a>144</a>
+                                    <b>145</b>
                                     <v>39</v>
                                 </b>
                             </bs>
@@ -2451,27 +2450,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4394</v>
+                                    <v>4434</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>1757</v>
+                                    <v>2437</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>1518</v>
+                                    <v>1158</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>998</v>
+                                    <v>679</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>46</b>
-                                    <v>479</v>
+                                    <v>639</v>
                                 </b>
                             </bs>
                         </hist>
@@ -2492,27 +2491,27 @@
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>1478</v>
+                                    <v>2037</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>1478</v>
+                                    <v>998</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>799</v>
+                                    <v>918</v>
                                 </b>
                                 <b>
                                     <a>5</a>
-                                    <b>6</b>
-                                    <v>559</v>
+                                    <b>7</b>
+                                    <v>759</v>
                                 </b>
                                 <b>
-                                    <a>6</a>
-                                    <b>75</b>
-                                    <v>719</v>
+                                    <a>7</a>
+                                    <b>74</b>
+                                    <v>519</v>
                                 </b>
                             </bs>
                         </hist>
@@ -2528,12 +2527,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7910</v>
+                                    <v>7191</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>1238</v>
+                                    <v>2157</v>
                                 </b>
                             </bs>
                         </hist>
@@ -2877,7 +2876,7 @@
                 </e>
                 <e>
                     <k>cpu_seconds</k>
-                    <v>7100</v>
+                    <v>7145</v>
                 </e>
                 <e>
                     <k>elapsed_seconds</k>
@@ -2927,22 +2926,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5655</v>
+                                    <v>5757</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>857</v>
+                                    <v>903</v>
                                 </b>
                                 <b>
                                     <a>3</a>
-                                    <b>7</b>
-                                    <v>553</v>
-                                </b>
-                                <b>
-                                    <a>11</a>
-                                    <b>13</b>
-                                    <v>33</v>
+                                    <b>20</b>
+                                    <v>485</v>
                                 </b>
                             </bs>
                         </hist>
@@ -2958,12 +2952,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>6400</v>
+                                    <v>6524</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>699</v>
+                                    <v>620</v>
                                 </b>
                             </bs>
                         </hist>
@@ -2982,8 +2976,8 @@
                                     <v>33</v>
                                 </b>
                                 <b>
-                                    <a>4</a>
-                                    <b>5</b>
+                                    <a>6</a>
+                                    <b>7</b>
                                     <v>11</v>
                                 </b>
                                 <b>
@@ -2991,10 +2985,15 @@
                                     <b>9</b>
                                     <v>11</v>
                                 </b>
+                                <b>
+                                    <a>10</a>
+                                    <b>11</b>
+                                    <v>11</v>
+                                </b>
                                 <b>
                                     <a>13</a>
                                     <b>14</b>
-                                    <v>22</v>
+                                    <v>11</v>
                                 </b>
                                 <b>
                                     <a>51</a>
@@ -3002,23 +3001,23 @@
                                     <v>11</v>
                                 </b>
                                 <b>
-                                    <a>159</a>
-                                    <b>160</b>
+                                    <a>164</a>
+                                    <b>165</b>
                                     <v>11</v>
                                 </b>
                                 <b>
-                                    <a>177</a>
-                                    <b>178</b>
+                                    <a>171</a>
+                                    <b>172</b>
                                     <v>11</v>
                                 </b>
                                 <b>
-                                    <a>185</a>
-                                    <b>186</b>
+                                    <a>191</a>
+                                    <b>192</b>
                                     <v>11</v>
                                 </b>
                                 <b>
-                                    <a>247</a>
-                                    <b>248</b>
+                                    <a>243</a>
+                                    <b>244</b>
                                     <v>11</v>
                                 </b>
                             </bs>
@@ -3038,8 +3037,8 @@
                                     <v>33</v>
                                 </b>
                                 <b>
-                                    <a>4</a>
-                                    <b>5</b>
+                                    <a>6</a>
+                                    <b>7</b>
                                     <v>11</v>
                                 </b>
                                 <b>
@@ -3048,8 +3047,8 @@
                                     <v>11</v>
                                 </b>
                                 <b>
-                                    <a>12</a>
-                                    <b>13</b>
+                                    <a>10</a>
+                                    <b>11</b>
                                     <v>11</v>
                                 </b>
                                 <b>
@@ -3063,23 +3062,23 @@
                                     <v>11</v>
                                 </b>
                                 <b>
-                                    <a>112</a>
-                                    <b>113</b>
+                                    <a>121</a>
+                                    <b>122</b>
                                     <v>11</v>
                                 </b>
                                 <b>
-                                    <a>124</a>
-                                    <b>125</b>
+                                    <a>123</a>
+                                    <b>124</b>
                                     <v>11</v>
                                 </b>
                                 <b>
-                                    <a>145</a>
-                                    <b>146</b>
+                                    <a>138</a>
+                                    <b>139</b>
                                     <v>11</v>
                                 </b>
                                 <b>
-                                    <a>218</a>
-                                    <b>219</b>
+                                    <a>214</a>
+                                    <b>215</b>
                                     <v>11</v>
                                 </b>
                             </bs>
@@ -4852,31 +4851,31 @@
         </relation>
         <relation>
             <name>locations_default</name>
-            <cardinality>29765023</cardinality>
+            <cardinality>29768202</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>29765023</v>
+                    <v>29768202</v>
                 </e>
                 <e>
                     <k>container</k>
-                    <v>123252</v>
+                    <v>123267</v>
                 </e>
                 <e>
                     <k>startLine</k>
-                    <v>2095293</v>
+                    <v>2095549</v>
                 </e>
                 <e>
                     <k>startColumn</k>
-                    <v>36882</v>
+                    <v>36886</v>
                 </e>
                 <e>
                     <k>endLine</k>
-                    <v>2099495</v>
+                    <v>2099752</v>
                 </e>
                 <e>
                     <k>endColumn</k>
-                    <v>48087</v>
+                    <v>48093</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -4890,7 +4889,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>29765023</v>
+                                    <v>29768202</v>
                                 </b>
                             </bs>
                         </hist>
@@ -4906,7 +4905,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>29765023</v>
+                                    <v>29768202</v>
                                 </b>
                             </bs>
                         </hist>
@@ -4922,7 +4921,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>29765023</v>
+                                    <v>29768202</v>
                                 </b>
                             </bs>
                         </hist>
@@ -4938,7 +4937,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>29765023</v>
+                                    <v>29768202</v>
                                 </b>
                             </bs>
                         </hist>
@@ -4954,7 +4953,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>29765023</v>
+                                    <v>29768202</v>
                                 </b>
                             </bs>
                         </hist>
@@ -4970,67 +4969,67 @@
                                 <b>
                                     <a>1</a>
                                     <b>11</b>
-                                    <v>9804</v>
+                                    <v>9805</v>
                                 </b>
                                 <b>
                                     <a>11</a>
                                     <b>18</b>
-                                    <v>10271</v>
+                                    <v>10272</v>
                                 </b>
                                 <b>
                                     <a>18</a>
                                     <b>30</b>
-                                    <v>9337</v>
+                                    <v>9338</v>
                                 </b>
                                 <b>
                                     <a>30</a>
                                     <b>42</b>
-                                    <v>9804</v>
+                                    <v>9805</v>
                                 </b>
                                 <b>
                                     <a>43</a>
                                     <b>61</b>
-                                    <v>9804</v>
+                                    <v>9805</v>
                                 </b>
                                 <b>
                                     <a>61</a>
                                     <b>79</b>
-                                    <v>9337</v>
+                                    <v>9338</v>
                                 </b>
                                 <b>
                                     <a>80</a>
                                     <b>106</b>
-                                    <v>9804</v>
+                                    <v>9805</v>
                                 </b>
                                 <b>
                                     <a>108</a>
                                     <b>149</b>
-                                    <v>9337</v>
+                                    <v>9338</v>
                                 </b>
                                 <b>
                                     <a>149</a>
                                     <b>199</b>
-                                    <v>9337</v>
+                                    <v>9338</v>
                                 </b>
                                 <b>
                                     <a>206</a>
                                     <b>291</b>
-                                    <v>9337</v>
+                                    <v>9338</v>
                                 </b>
                                 <b>
                                     <a>304</a>
                                     <b>469</b>
-                                    <v>9337</v>
+                                    <v>9338</v>
                                 </b>
                                 <b>
                                     <a>482</a>
                                     <b>850</b>
-                                    <v>9337</v>
+                                    <v>9338</v>
                                 </b>
                                 <b>
                                     <a>936</a>
                                     <b>2380</b>
-                                    <v>8403</v>
+                                    <v>8404</v>
                                 </b>
                             </bs>
                         </hist>
@@ -5046,67 +5045,67 @@
                                 <b>
                                     <a>1</a>
                                     <b>8</b>
-                                    <v>9337</v>
+                                    <v>9338</v>
                                 </b>
                                 <b>
                                     <a>8</a>
                                     <b>13</b>
-                                    <v>9337</v>
+                                    <v>9338</v>
                                 </b>
                                 <b>
                                     <a>13</a>
                                     <b>20</b>
-                                    <v>9804</v>
+                                    <v>9805</v>
                                 </b>
                                 <b>
                                     <a>20</a>
                                     <b>32</b>
-                                    <v>9337</v>
+                                    <v>9338</v>
                                 </b>
                                 <b>
                                     <a>32</a>
                                     <b>43</b>
-                                    <v>9804</v>
+                                    <v>9805</v>
                                 </b>
                                 <b>
                                     <a>44</a>
                                     <b>61</b>
-                                    <v>9337</v>
+                                    <v>9338</v>
                                 </b>
                                 <b>
                                     <a>62</a>
                                     <b>72</b>
-                                    <v>9337</v>
+                                    <v>9338</v>
                                 </b>
                                 <b>
                                     <a>73</a>
                                     <b>93</b>
-                                    <v>9337</v>
+                                    <v>9338</v>
                                 </b>
                                 <b>
                                     <a>97</a>
                                     <b>128</b>
-                                    <v>9337</v>
+                                    <v>9338</v>
                                 </b>
                                 <b>
                                     <a>128</a>
                                     <b>180</b>
-                                    <v>9337</v>
+                                    <v>9338</v>
                                 </b>
                                 <b>
                                     <a>180</a>
                                     <b>267</b>
-                                    <v>9337</v>
+                                    <v>9338</v>
                                 </b>
                                 <b>
                                     <a>277</a>
                                     <b>414</b>
-                                    <v>9337</v>
+                                    <v>9338</v>
                                 </b>
                                 <b>
                                     <a>439</a>
                                     <b>1465</b>
-                                    <v>9337</v>
+                                    <v>9338</v>
                                 </b>
                                 <b>
                                     <a>1557</a>
@@ -5127,67 +5126,67 @@
                                 <b>
                                     <a>1</a>
                                     <b>4</b>
-                                    <v>8870</v>
+                                    <v>8871</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>7936</v>
+                                    <v>7937</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>6</b>
-                                    <v>7469</v>
+                                    <v>7470</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>8</b>
-                                    <v>11204</v>
+                                    <v>11206</v>
                                 </b>
                                 <b>
                                     <a>8</a>
                                     <b>10</b>
-                                    <v>9337</v>
+                                    <v>9338</v>
                                 </b>
                                 <b>
                                     <a>10</a>
                                     <b>15</b>
-                                    <v>10737</v>
+                                    <v>10739</v>
                                 </b>
                                 <b>
                                     <a>15</a>
                                     <b>23</b>
-                                    <v>9804</v>
+                                    <v>9805</v>
                                 </b>
                                 <b>
                                     <a>23</a>
                                     <b>28</b>
-                                    <v>11204</v>
+                                    <v>11206</v>
                                 </b>
                                 <b>
                                     <a>28</a>
                                     <b>34</b>
-                                    <v>9804</v>
+                                    <v>9805</v>
                                 </b>
                                 <b>
                                     <a>34</a>
                                     <b>44</b>
-                                    <v>9337</v>
+                                    <v>9338</v>
                                 </b>
                                 <b>
                                     <a>44</a>
                                     <b>55</b>
-                                    <v>9337</v>
+                                    <v>9338</v>
                                 </b>
                                 <b>
                                     <a>55</a>
                                     <b>66</b>
-                                    <v>9804</v>
+                                    <v>9805</v>
                                 </b>
                                 <b>
                                     <a>66</a>
                                     <b>77</b>
-                                    <v>8403</v>
+                                    <v>8404</v>
                                 </b>
                             </bs>
                         </hist>
@@ -5203,67 +5202,67 @@
                                 <b>
                                     <a>1</a>
                                     <b>8</b>
-                                    <v>9337</v>
+                                    <v>9338</v>
                                 </b>
                                 <b>
                                     <a>8</a>
                                     <b>13</b>
-                                    <v>9337</v>
+                                    <v>9338</v>
                                 </b>
                                 <b>
                                     <a>13</a>
                                     <b>20</b>
-                                    <v>9804</v>
+                                    <v>9805</v>
                                 </b>
                                 <b>
                                     <a>20</a>
                                     <b>32</b>
-                                    <v>9337</v>
+                                    <v>9338</v>
                                 </b>
                                 <b>
                                     <a>32</a>
                                     <b>43</b>
-                                    <v>9804</v>
+                                    <v>9805</v>
                                 </b>
                                 <b>
                                     <a>43</a>
                                     <b>60</b>
-                                    <v>9337</v>
+                                    <v>9338</v>
                                 </b>
                                 <b>
                                     <a>61</a>
                                     <b>71</b>
-                                    <v>9337</v>
+                                    <v>9338</v>
                                 </b>
                                 <b>
                                     <a>72</a>
                                     <b>93</b>
-                                    <v>9337</v>
+                                    <v>9338</v>
                                 </b>
                                 <b>
                                     <a>94</a>
                                     <b>127</b>
-                                    <v>9337</v>
+                                    <v>9338</v>
                                 </b>
                                 <b>
                                     <a>128</a>
                                     <b>179</b>
-                                    <v>9337</v>
+                                    <v>9338</v>
                                 </b>
                                 <b>
                                     <a>180</a>
                                     <b>268</b>
-                                    <v>9337</v>
+                                    <v>9338</v>
                                 </b>
                                 <b>
                                     <a>278</a>
                                     <b>413</b>
-                                    <v>9337</v>
+                                    <v>9338</v>
                                 </b>
                                 <b>
                                     <a>437</a>
                                     <b>1465</b>
-                                    <v>9337</v>
+                                    <v>9338</v>
                                 </b>
                                 <b>
                                     <a>1554</a>
@@ -5284,67 +5283,67 @@
                                 <b>
                                     <a>1</a>
                                     <b>9</b>
-                                    <v>9804</v>
+                                    <v>9805</v>
                                 </b>
                                 <b>
                                     <a>9</a>
                                     <b>13</b>
-                                    <v>9337</v>
+                                    <v>9338</v>
                                 </b>
                                 <b>
                                     <a>13</a>
                                     <b>18</b>
-                                    <v>9337</v>
+                                    <v>9338</v>
                                 </b>
                                 <b>
                                     <a>18</a>
                                     <b>26</b>
-                                    <v>10271</v>
+                                    <v>10272</v>
                                 </b>
                                 <b>
                                     <a>27</a>
                                     <b>33</b>
-                                    <v>9337</v>
+                                    <v>9338</v>
                                 </b>
                                 <b>
                                     <a>33</a>
                                     <b>39</b>
-                                    <v>9337</v>
+                                    <v>9338</v>
                                 </b>
                                 <b>
                                     <a>39</a>
                                     <b>47</b>
-                                    <v>10271</v>
+                                    <v>10272</v>
                                 </b>
                                 <b>
                                     <a>47</a>
                                     <b>53</b>
-                                    <v>9337</v>
+                                    <v>9338</v>
                                 </b>
                                 <b>
                                     <a>53</a>
                                     <b>60</b>
-                                    <v>10271</v>
+                                    <v>10272</v>
                                 </b>
                                 <b>
                                     <a>60</a>
                                     <b>66</b>
-                                    <v>9337</v>
+                                    <v>9338</v>
                                 </b>
                                 <b>
                                     <a>66</a>
                                     <b>74</b>
-                                    <v>9804</v>
+                                    <v>9805</v>
                                 </b>
                                 <b>
                                     <a>74</a>
                                     <b>78</b>
-                                    <v>9804</v>
+                                    <v>9805</v>
                                 </b>
                                 <b>
                                     <a>78</a>
                                     <b>90</b>
-                                    <v>7002</v>
+                                    <v>7003</v>
                                 </b>
                             </bs>
                         </hist>
@@ -5360,52 +5359,52 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>583115</v>
+                                    <v>583186</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>314200</v>
+                                    <v>314239</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>195616</v>
+                                    <v>195640</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>6</b>
-                                    <v>162002</v>
+                                    <v>162022</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>10</b>
-                                    <v>183011</v>
+                                    <v>183033</v>
                                 </b>
                                 <b>
                                     <a>10</a>
                                     <b>16</b>
-                                    <v>162936</v>
+                                    <v>162956</v>
                                 </b>
                                 <b>
                                     <a>16</a>
                                     <b>25</b>
-                                    <v>169005</v>
+                                    <v>169026</v>
                                 </b>
                                 <b>
                                     <a>25</a>
                                     <b>46</b>
-                                    <v>161068</v>
+                                    <v>161088</v>
                                 </b>
                                 <b>
                                     <a>46</a>
                                     <b>169</b>
-                                    <v>157333</v>
+                                    <v>157353</v>
                                 </b>
                                 <b>
                                     <a>169</a>
                                     <b>265</b>
-                                    <v>7002</v>
+                                    <v>7003</v>
                                 </b>
                             </bs>
                         </hist>
@@ -5421,42 +5420,42 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>871171</v>
+                                    <v>871278</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>273583</v>
+                                    <v>273616</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>5</b>
-                                    <v>193749</v>
+                                    <v>193773</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>8</b>
-                                    <v>173674</v>
+                                    <v>173695</v>
                                 </b>
                                 <b>
                                     <a>8</a>
                                     <b>13</b>
-                                    <v>188146</v>
+                                    <v>188169</v>
                                 </b>
                                 <b>
                                     <a>13</a>
                                     <b>20</b>
-                                    <v>161068</v>
+                                    <v>161088</v>
                                 </b>
                                 <b>
                                     <a>20</a>
                                     <b>51</b>
-                                    <v>159668</v>
+                                    <v>159687</v>
                                 </b>
                                 <b>
                                     <a>51</a>
                                     <b>265</b>
-                                    <v>74231</v>
+                                    <v>74240</v>
                                 </b>
                             </bs>
                         </hist>
@@ -5472,47 +5471,47 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>612060</v>
+                                    <v>612135</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>313266</v>
+                                    <v>313305</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>198417</v>
+                                    <v>198442</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>6</b>
-                                    <v>183011</v>
+                                    <v>183033</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>9</b>
-                                    <v>173207</v>
+                                    <v>173228</v>
                                 </b>
                                 <b>
                                     <a>9</a>
                                     <b>13</b>
-                                    <v>163402</v>
+                                    <v>163423</v>
                                 </b>
                                 <b>
                                     <a>13</a>
                                     <b>19</b>
-                                    <v>174607</v>
+                                    <v>174629</v>
                                 </b>
                                 <b>
                                     <a>19</a>
                                     <b>29</b>
-                                    <v>164803</v>
+                                    <v>164823</v>
                                 </b>
                                 <b>
                                     <a>29</a>
                                     <b>52</b>
-                                    <v>112514</v>
+                                    <v>112528</v>
                                 </b>
                             </bs>
                         </hist>
@@ -5528,22 +5527,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1531786</v>
+                                    <v>1531974</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>348748</v>
+                                    <v>348791</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>5</b>
-                                    <v>162002</v>
+                                    <v>162022</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>16</b>
-                                    <v>52755</v>
+                                    <v>52762</v>
                                 </b>
                             </bs>
                         </hist>
@@ -5559,47 +5558,47 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>587783</v>
+                                    <v>587855</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>316068</v>
+                                    <v>316106</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>197484</v>
+                                    <v>197508</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>6</b>
-                                    <v>168538</v>
+                                    <v>168559</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>9</b>
-                                    <v>158267</v>
+                                    <v>158286</v>
                                 </b>
                                 <b>
                                     <a>9</a>
                                     <b>14</b>
-                                    <v>170872</v>
+                                    <v>170893</v>
                                 </b>
                                 <b>
                                     <a>14</a>
                                     <b>21</b>
-                                    <v>175074</v>
+                                    <v>175096</v>
                                 </b>
                                 <b>
                                     <a>21</a>
                                     <b>32</b>
-                                    <v>162469</v>
+                                    <v>162489</v>
                                 </b>
                                 <b>
                                     <a>32</a>
                                     <b>63</b>
-                                    <v>157800</v>
+                                    <v>157819</v>
                                 </b>
                                 <b>
                                     <a>64</a>
@@ -6015,52 +6014,52 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>593386</v>
+                                    <v>593459</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>306263</v>
+                                    <v>306301</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>198417</v>
+                                    <v>198442</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>6</b>
-                                    <v>159668</v>
+                                    <v>159687</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>10</b>
-                                    <v>182544</v>
+                                    <v>182566</v>
                                 </b>
                                 <b>
                                     <a>10</a>
                                     <b>16</b>
-                                    <v>162002</v>
+                                    <v>162022</v>
                                 </b>
                                 <b>
                                     <a>16</a>
                                     <b>25</b>
-                                    <v>171339</v>
+                                    <v>171360</v>
                                 </b>
                                 <b>
                                     <a>25</a>
                                     <b>46</b>
-                                    <v>158734</v>
+                                    <v>158753</v>
                                 </b>
                                 <b>
                                     <a>46</a>
                                     <b>161</b>
-                                    <v>158267</v>
+                                    <v>158286</v>
                                 </b>
                                 <b>
                                     <a>162</a>
                                     <b>265</b>
-                                    <v>8870</v>
+                                    <v>8871</v>
                                 </b>
                             </bs>
                         </hist>
@@ -6076,47 +6075,47 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>886577</v>
+                                    <v>886686</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>260044</v>
+                                    <v>260076</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>125120</v>
+                                    <v>125135</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>6</b>
-                                    <v>140993</v>
+                                    <v>141010</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>10</b>
-                                    <v>184878</v>
+                                    <v>184901</v>
                                 </b>
                                 <b>
                                     <a>10</a>
                                     <b>15</b>
-                                    <v>168538</v>
+                                    <v>168559</v>
                                 </b>
                                 <b>
                                     <a>15</a>
                                     <b>26</b>
-                                    <v>163402</v>
+                                    <v>163423</v>
                                 </b>
                                 <b>
                                     <a>26</a>
                                     <b>120</b>
-                                    <v>158267</v>
+                                    <v>158286</v>
                                 </b>
                                 <b>
                                     <a>121</a>
                                     <b>265</b>
-                                    <v>11671</v>
+                                    <v>11673</v>
                                 </b>
                             </bs>
                         </hist>
@@ -6132,22 +6131,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1529452</v>
+                                    <v>1529639</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>341745</v>
+                                    <v>341787</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>5</b>
-                                    <v>170872</v>
+                                    <v>170893</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>10</b>
-                                    <v>57424</v>
+                                    <v>57431</v>
                                 </b>
                             </bs>
                         </hist>
@@ -6163,47 +6162,47 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>623265</v>
+                                    <v>623342</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>303462</v>
+                                    <v>303499</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>201685</v>
+                                    <v>201710</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>6</b>
-                                    <v>183945</v>
+                                    <v>183967</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>9</b>
-                                    <v>169939</v>
+                                    <v>169959</v>
                                 </b>
                                 <b>
                                     <a>9</a>
                                     <b>13</b>
-                                    <v>166671</v>
+                                    <v>166691</v>
                                 </b>
                                 <b>
                                     <a>13</a>
                                     <b>19</b>
-                                    <v>175074</v>
+                                    <v>175096</v>
                                 </b>
                                 <b>
                                     <a>19</a>
                                     <b>29</b>
-                                    <v>161068</v>
+                                    <v>161088</v>
                                 </b>
                                 <b>
                                     <a>29</a>
                                     <b>52</b>
-                                    <v>114382</v>
+                                    <v>114396</v>
                                 </b>
                             </bs>
                         </hist>
@@ -6219,52 +6218,52 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>599922</v>
+                                    <v>599995</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>306263</v>
+                                    <v>306301</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>197017</v>
+                                    <v>197041</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>6</b>
-                                    <v>169005</v>
+                                    <v>169026</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>9</b>
-                                    <v>156400</v>
+                                    <v>156419</v>
                                 </b>
                                 <b>
                                     <a>9</a>
                                     <b>14</b>
-                                    <v>169005</v>
+                                    <v>169026</v>
                                 </b>
                                 <b>
                                     <a>14</a>
                                     <b>21</b>
-                                    <v>177875</v>
+                                    <v>177897</v>
                                 </b>
                                 <b>
                                     <a>21</a>
                                     <b>32</b>
-                                    <v>162002</v>
+                                    <v>162022</v>
                                 </b>
                                 <b>
                                     <a>32</a>
                                     <b>60</b>
-                                    <v>158267</v>
+                                    <v>158286</v>
                                 </b>
                                 <b>
                                     <a>60</a>
                                     <b>65</b>
-                                    <v>3734</v>
+                                    <v>3735</v>
                                 </b>
                             </bs>
                         </hist>
@@ -6280,62 +6279,62 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5135</v>
+                                    <v>5136</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>8</b>
-                                    <v>3734</v>
+                                    <v>3735</v>
                                 </b>
                                 <b>
                                     <a>9</a>
                                     <b>186</b>
-                                    <v>3734</v>
+                                    <v>3735</v>
                                 </b>
                                 <b>
                                     <a>193</a>
                                     <b>288</b>
-                                    <v>3734</v>
+                                    <v>3735</v>
                                 </b>
                                 <b>
                                     <a>294</a>
                                     <b>495</b>
-                                    <v>3734</v>
+                                    <v>3735</v>
                                 </b>
                                 <b>
                                     <a>503</a>
-                                    <b>555</b>
-                                    <v>3734</v>
+                                    <b>554</b>
+                                    <v>3735</v>
                                 </b>
                                 <b>
                                     <a>561</a>
                                     <b>633</b>
-                                    <v>3734</v>
+                                    <v>3735</v>
                                 </b>
                                 <b>
                                     <a>640</a>
                                     <b>758</b>
-                                    <v>3734</v>
+                                    <v>3735</v>
                                 </b>
                                 <b>
                                     <a>758</a>
                                     <b>869</b>
-                                    <v>3734</v>
+                                    <v>3735</v>
                                 </b>
                                 <b>
                                     <a>875</a>
                                     <b>1074</b>
-                                    <v>3734</v>
+                                    <v>3735</v>
                                 </b>
                                 <b>
                                     <a>1074</a>
                                     <b>1281</b>
-                                    <v>3734</v>
+                                    <v>3735</v>
                                 </b>
                                 <b>
                                     <a>1289</a>
                                     <b>1590</b>
-                                    <v>3734</v>
+                                    <v>3735</v>
                                 </b>
                                 <b>
                                     <a>1685</a>
@@ -6356,62 +6355,62 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5602</v>
+                                    <v>5603</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>5</b>
-                                    <v>3734</v>
+                                    <v>3735</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>65</b>
-                                    <v>3734</v>
+                                    <v>3735</v>
                                 </b>
                                 <b>
                                     <a>70</a>
                                     <b>100</b>
-                                    <v>3734</v>
+                                    <v>3735</v>
                                 </b>
                                 <b>
                                     <a>100</a>
                                     <b>111</b>
-                                    <v>3734</v>
+                                    <v>3735</v>
                                 </b>
                                 <b>
                                     <a>112</a>
                                     <b>122</b>
-                                    <v>4201</v>
+                                    <v>4202</v>
                                 </b>
                                 <b>
                                     <a>122</a>
                                     <b>140</b>
-                                    <v>3734</v>
+                                    <v>3735</v>
                                 </b>
                                 <b>
                                     <a>143</a>
                                     <b>153</b>
-                                    <v>3734</v>
+                                    <v>3735</v>
                                 </b>
                                 <b>
                                     <a>153</a>
                                     <b>161</b>
-                                    <v>4201</v>
+                                    <v>4202</v>
                                 </b>
                                 <b>
                                     <a>161</a>
                                     <b>173</b>
-                                    <v>4201</v>
+                                    <v>4202</v>
                                 </b>
                                 <b>
                                     <a>173</a>
                                     <b>178</b>
-                                    <v>3734</v>
+                                    <v>3735</v>
                                 </b>
                                 <b>
                                     <a>188</a>
                                     <b>265</b>
-                                    <v>3734</v>
+                                    <v>3735</v>
                                 </b>
                             </bs>
                         </hist>
@@ -6427,62 +6426,62 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5602</v>
+                                    <v>5603</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>8</b>
-                                    <v>3734</v>
+                                    <v>3735</v>
                                 </b>
                                 <b>
                                     <a>9</a>
                                     <b>105</b>
-                                    <v>3734</v>
+                                    <v>3735</v>
                                 </b>
                                 <b>
                                     <a>155</a>
                                     <b>241</b>
-                                    <v>3734</v>
+                                    <v>3735</v>
                                 </b>
                                 <b>
                                     <a>253</a>
                                     <b>336</b>
-                                    <v>3734</v>
+                                    <v>3735</v>
                                 </b>
                                 <b>
                                     <a>340</a>
                                     <b>426</b>
-                                    <v>3734</v>
+                                    <v>3735</v>
                                 </b>
                                 <b>
                                     <a>434</a>
                                     <b>488</b>
-                                    <v>3734</v>
+                                    <v>3735</v>
                                 </b>
                                 <b>
                                     <a>489</a>
                                     <b>572</b>
-                                    <v>3734</v>
+                                    <v>3735</v>
                                 </b>
                                 <b>
                                     <a>573</a>
                                     <b>623</b>
-                                    <v>3734</v>
+                                    <v>3735</v>
                                 </b>
                                 <b>
                                     <a>626</a>
                                     <b>696</b>
-                                    <v>4201</v>
+                                    <v>4202</v>
                                 </b>
                                 <b>
                                     <a>701</a>
                                     <b>813</b>
-                                    <v>3734</v>
+                                    <v>3735</v>
                                 </b>
                                 <b>
                                     <a>818</a>
                                     <b>1095</b>
-                                    <v>3734</v>
+                                    <v>3735</v>
                                 </b>
                                 <b>
                                     <a>1172</a>
@@ -6508,32 +6507,32 @@
                                 <b>
                                     <a>2</a>
                                     <b>4</b>
-                                    <v>3734</v>
+                                    <v>3735</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>8</b>
-                                    <v>4201</v>
+                                    <v>4202</v>
                                 </b>
                                 <b>
                                     <a>8</a>
                                     <b>15</b>
-                                    <v>3734</v>
+                                    <v>3735</v>
                                 </b>
                                 <b>
                                     <a>15</a>
                                     <b>23</b>
-                                    <v>3734</v>
+                                    <v>3735</v>
                                 </b>
                                 <b>
                                     <a>23</a>
                                     <b>29</b>
-                                    <v>3734</v>
+                                    <v>3735</v>
                                 </b>
                                 <b>
                                     <a>29</a>
                                     <b>35</b>
-                                    <v>4201</v>
+                                    <v>4202</v>
                                 </b>
                                 <b>
                                     <a>35</a>
@@ -6553,12 +6552,12 @@
                                 <b>
                                     <a>44</a>
                                     <b>46</b>
-                                    <v>3734</v>
+                                    <v>3735</v>
                                 </b>
                                 <b>
                                     <a>46</a>
                                     <b>49</b>
-                                    <v>3734</v>
+                                    <v>3735</v>
                                 </b>
                                 <b>
                                     <a>49</a>
@@ -6579,62 +6578,62 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5602</v>
+                                    <v>5603</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>8</b>
-                                    <v>3734</v>
+                                    <v>3735</v>
                                 </b>
                                 <b>
                                     <a>9</a>
                                     <b>156</b>
-                                    <v>3734</v>
+                                    <v>3735</v>
                                 </b>
                                 <b>
                                     <a>159</a>
                                     <b>240</b>
-                                    <v>3734</v>
+                                    <v>3735</v>
                                 </b>
                                 <b>
                                     <a>251</a>
                                     <b>335</b>
-                                    <v>3734</v>
+                                    <v>3735</v>
                                 </b>
                                 <b>
                                     <a>342</a>
                                     <b>430</b>
-                                    <v>3734</v>
+                                    <v>3735</v>
                                 </b>
                                 <b>
                                     <a>432</a>
                                     <b>490</b>
-                                    <v>3734</v>
+                                    <v>3735</v>
                                 </b>
                                 <b>
                                     <a>490</a>
                                     <b>573</b>
-                                    <v>3734</v>
+                                    <v>3735</v>
                                 </b>
                                 <b>
                                     <a>574</a>
                                     <b>622</b>
-                                    <v>3734</v>
+                                    <v>3735</v>
                                 </b>
                                 <b>
                                     <a>626</a>
                                     <b>698</b>
-                                    <v>3734</v>
+                                    <v>3735</v>
                                 </b>
                                 <b>
                                     <a>700</a>
                                     <b>798</b>
-                                    <v>3734</v>
+                                    <v>3735</v>
                                 </b>
                                 <b>
                                     <a>811</a>
                                     <b>987</b>
-                                    <v>3734</v>
+                                    <v>3735</v>
                                 </b>
                                 <b>
                                     <a>1096</a>
@@ -6649,11 +6648,11 @@
         </relation>
         <relation>
             <name>locations_stmt</name>
-            <cardinality>3819884</cardinality>
+            <cardinality>3819867</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>3819884</v>
+                    <v>3819867</v>
                 </e>
                 <e>
                     <k>container</k>
@@ -6661,7 +6660,7 @@
                 </e>
                 <e>
                     <k>startLine</k>
-                    <v>200172</v>
+                    <v>200171</v>
                 </e>
                 <e>
                     <k>startColumn</k>
@@ -6669,7 +6668,7 @@
                 </e>
                 <e>
                     <k>endLine</k>
-                    <v>194428</v>
+                    <v>194427</v>
                 </e>
                 <e>
                     <k>endColumn</k>
@@ -6687,7 +6686,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3819884</v>
+                                    <v>3819867</v>
                                 </b>
                             </bs>
                         </hist>
@@ -6703,7 +6702,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3819884</v>
+                                    <v>3819867</v>
                                 </b>
                             </bs>
                         </hist>
@@ -6719,7 +6718,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3819884</v>
+                                    <v>3819867</v>
                                 </b>
                             </bs>
                         </hist>
@@ -6735,7 +6734,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3819884</v>
+                                    <v>3819867</v>
                                 </b>
                             </bs>
                         </hist>
@@ -6751,7 +6750,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3819884</v>
+                                    <v>3819867</v>
                                 </b>
                             </bs>
                         </hist>
@@ -7167,7 +7166,7 @@
                                 <b>
                                     <a>4</a>
                                     <b>6</b>
-                                    <v>14473</v>
+                                    <v>14472</v>
                                 </b>
                                 <b>
                                     <a>6</a>
@@ -7273,7 +7272,7 @@
                                 <b>
                                     <a>29</a>
                                     <b>36</b>
-                                    <v>16017</v>
+                                    <v>16016</v>
                                 </b>
                                 <b>
                                     <a>36</a>
@@ -7466,7 +7465,7 @@
                                 <b>
                                     <a>6</a>
                                     <b>8</b>
-                                    <v>14720</v>
+                                    <v>14719</v>
                                 </b>
                                 <b>
                                     <a>8</a>
@@ -7927,7 +7926,7 @@
                                 <b>
                                     <a>15</a>
                                     <b>21</b>
-                                    <v>16120</v>
+                                    <v>16119</v>
                                 </b>
                                 <b>
                                     <a>21</a>
@@ -7942,7 +7941,7 @@
                                 <b>
                                     <a>34</a>
                                     <b>42</b>
-                                    <v>15770</v>
+                                    <v>15769</v>
                                 </b>
                                 <b>
                                     <a>42</a>
@@ -8631,11 +8630,11 @@
         </relation>
         <relation>
             <name>locations_expr</name>
-            <cardinality>13187951</cardinality>
+            <cardinality>13187892</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>13187951</v>
+                    <v>13187892</v>
                 </e>
                 <e>
                     <k>container</k>
@@ -8643,7 +8642,7 @@
                 </e>
                 <e>
                     <k>startLine</k>
-                    <v>192225</v>
+                    <v>192224</v>
                 </e>
                 <e>
                     <k>startColumn</k>
@@ -8651,7 +8650,7 @@
                 </e>
                 <e>
                     <k>endLine</k>
-                    <v>192204</v>
+                    <v>192203</v>
                 </e>
                 <e>
                     <k>endColumn</k>
@@ -8669,7 +8668,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>13187951</v>
+                                    <v>13187892</v>
                                 </b>
                             </bs>
                         </hist>
@@ -8685,7 +8684,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>13187951</v>
+                                    <v>13187892</v>
                                 </b>
                             </bs>
                         </hist>
@@ -8701,7 +8700,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>13187951</v>
+                                    <v>13187892</v>
                                 </b>
                             </bs>
                         </hist>
@@ -8717,7 +8716,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>13187951</v>
+                                    <v>13187892</v>
                                 </b>
                             </bs>
                         </hist>
@@ -8733,7 +8732,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>13187951</v>
+                                    <v>13187892</v>
                                 </b>
                             </bs>
                         </hist>
@@ -9225,7 +9224,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>23552</v>
+                                    <v>23551</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -9306,7 +9305,7 @@
                                 <b>
                                     <a>7</a>
                                     <b>11</b>
-                                    <v>16717</v>
+                                    <v>16716</v>
                                 </b>
                                 <b>
                                     <a>11</a>
@@ -9448,7 +9447,7 @@
                                 <b>
                                     <a>43</a>
                                     <b>47</b>
-                                    <v>14720</v>
+                                    <v>14719</v>
                                 </b>
                                 <b>
                                     <a>47</a>
@@ -9458,7 +9457,7 @@
                                 <b>
                                     <a>52</a>
                                     <b>65</b>
-                                    <v>14473</v>
+                                    <v>14472</v>
                                 </b>
                                 <b>
                                     <a>65</a>
@@ -9940,7 +9939,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>23552</v>
+                                    <v>23551</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -10563,23 +10562,23 @@
         </relation>
         <relation>
             <name>numlines</name>
-            <cardinality>1383789</cardinality>
+            <cardinality>1383959</cardinality>
             <columnsizes>
                 <e>
                     <k>element_id</k>
-                    <v>1376786</v>
+                    <v>1376955</v>
                 </e>
                 <e>
                     <k>num_lines</k>
-                    <v>101776</v>
+                    <v>101789</v>
                 </e>
                 <e>
                     <k>num_code</k>
-                    <v>84969</v>
+                    <v>84979</v>
                 </e>
                 <e>
                     <k>num_comment</k>
-                    <v>59758</v>
+                    <v>59766</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -10593,12 +10592,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1369783</v>
+                                    <v>1369951</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>7002</v>
+                                    <v>7003</v>
                                 </b>
                             </bs>
                         </hist>
@@ -10614,7 +10613,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1370717</v>
+                                    <v>1370885</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -10635,7 +10634,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1376786</v>
+                                    <v>1376955</v>
                                 </b>
                             </bs>
                         </hist>
@@ -10651,22 +10650,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>68162</v>
+                                    <v>68170</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>12138</v>
+                                    <v>12139</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>7469</v>
+                                    <v>7470</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>21</b>
-                                    <v>7936</v>
+                                    <v>7937</v>
                                 </b>
                                 <b>
                                     <a>29</a>
@@ -10687,22 +10686,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>70496</v>
+                                    <v>70505</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>12138</v>
+                                    <v>12139</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>8403</v>
+                                    <v>8404</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>6</b>
-                                    <v>9337</v>
+                                    <v>9338</v>
                                 </b>
                                 <b>
                                     <a>6</a>
@@ -10723,17 +10722,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>69562</v>
+                                    <v>69571</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>14939</v>
+                                    <v>14941</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>10737</v>
+                                    <v>10739</v>
                                 </b>
                                 <b>
                                     <a>4</a>
@@ -10754,12 +10753,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>52755</v>
+                                    <v>52762</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>14472</v>
+                                    <v>14474</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -10774,7 +10773,7 @@
                                 <b>
                                     <a>44</a>
                                     <b>922</b>
-                                    <v>4668</v>
+                                    <v>4669</v>
                                 </b>
                             </bs>
                         </hist>
@@ -10790,12 +10789,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>52755</v>
+                                    <v>52762</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>16807</v>
+                                    <v>16809</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -10826,22 +10825,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>53222</v>
+                                    <v>53229</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>15873</v>
+                                    <v>15875</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>5</b>
-                                    <v>7469</v>
+                                    <v>7470</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>7</b>
-                                    <v>5135</v>
+                                    <v>5136</v>
                                 </b>
                                 <b>
                                     <a>7</a>
@@ -10862,27 +10861,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>34548</v>
+                                    <v>34552</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>9337</v>
+                                    <v>9338</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>4201</v>
+                                    <v>4202</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>6</b>
-                                    <v>4668</v>
+                                    <v>4669</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>11</b>
-                                    <v>5135</v>
+                                    <v>5136</v>
                                 </b>
                                 <b>
                                     <a>17</a>
@@ -10903,27 +10902,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>34548</v>
+                                    <v>34552</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>9337</v>
+                                    <v>9338</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>4201</v>
+                                    <v>4202</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>6</b>
-                                    <v>4668</v>
+                                    <v>4669</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>8</b>
-                                    <v>4668</v>
+                                    <v>4669</v>
                                 </b>
                                 <b>
                                     <a>10</a>
@@ -10944,27 +10943,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>34548</v>
+                                    <v>34552</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>9337</v>
+                                    <v>9338</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>4201</v>
+                                    <v>4202</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>6</b>
-                                    <v>4668</v>
+                                    <v>4669</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>10</b>
-                                    <v>4668</v>
+                                    <v>4669</v>
                                 </b>
                                 <b>
                                     <a>10</a>
@@ -11611,15 +11610,15 @@
         </relation>
         <relation>
             <name>files</name>
-            <cardinality>123252</cardinality>
+            <cardinality>123267</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>123252</v>
+                    <v>123267</v>
                 </e>
                 <e>
                     <k>name</k>
-                    <v>123252</v>
+                    <v>123267</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -11633,7 +11632,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>123252</v>
+                                    <v>123267</v>
                                 </b>
                             </bs>
                         </hist>
@@ -11649,7 +11648,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>123252</v>
+                                    <v>123267</v>
                                 </b>
                             </bs>
                         </hist>
@@ -11659,15 +11658,15 @@
         </relation>
         <relation>
             <name>folders</name>
-            <cardinality>16340</cardinality>
+            <cardinality>16342</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>16340</v>
+                    <v>16342</v>
                 </e>
                 <e>
                     <k>name</k>
-                    <v>16340</v>
+                    <v>16342</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -11681,7 +11680,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>16340</v>
+                                    <v>16342</v>
                                 </b>
                             </bs>
                         </hist>
@@ -11697,7 +11696,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>16340</v>
+                                    <v>16342</v>
                                 </b>
                             </bs>
                         </hist>
@@ -11707,15 +11706,15 @@
         </relation>
         <relation>
             <name>containerparent</name>
-            <cardinality>138659</cardinality>
+            <cardinality>138676</cardinality>
             <columnsizes>
                 <e>
                     <k>parent</k>
-                    <v>16340</v>
+                    <v>16342</v>
                 </e>
                 <e>
                     <k>child</k>
-                    <v>138659</v>
+                    <v>138676</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -11729,7 +11728,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7469</v>
+                                    <v>7470</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -11770,7 +11769,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>138659</v>
+                                    <v>138676</v>
                                 </b>
                             </bs>
                         </hist>
@@ -11780,7 +11779,7 @@
         </relation>
         <relation>
             <name>fileannotations</name>
-            <cardinality>5129447</cardinality>
+            <cardinality>5129404</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
@@ -11792,7 +11791,7 @@
                 </e>
                 <e>
                     <k>name</k>
-                    <v>54773</v>
+                    <v>54772</v>
                 </e>
                 <e>
                     <k>value</k>
@@ -11815,7 +11814,7 @@
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>4730</v>
+                                    <v>4729</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12066,7 +12065,7 @@
                                 <b>
                                     <a>20</a>
                                     <b>34</b>
-                                    <v>4222</v>
+                                    <v>4221</v>
                                 </b>
                                 <b>
                                     <a>34</a>
@@ -12102,7 +12101,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>54773</v>
+                                    <v>54772</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12326,12 +12325,12 @@
                                 <b>
                                     <a>39</a>
                                     <b>48</b>
-                                    <v>3612</v>
+                                    <v>3646</v>
                                 </b>
                                 <b>
                                     <a>48</a>
                                     <b>74</b>
-                                    <v>3567</v>
+                                    <v>3533</v>
                                 </b>
                                 <b>
                                     <a>74</a>
@@ -12356,15 +12355,15 @@
         </relation>
         <relation>
             <name>inmacroexpansion</name>
-            <cardinality>109779137</cardinality>
+            <cardinality>109779097</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>18027366</v>
+                    <v>18027697</v>
                 </e>
                 <e>
                     <k>inv</k>
-                    <v>2700175</v>
+                    <v>2700160</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -12378,37 +12377,37 @@
                                 <b>
                                     <a>1</a>
                                     <b>3</b>
-                                    <v>1581965</v>
+                                    <v>1582361</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>5</b>
-                                    <v>1077798</v>
+                                    <v>1077794</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>6</b>
-                                    <v>1184883</v>
+                                    <v>1184878</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>7</b>
-                                    <v>4819923</v>
+                                    <v>4819904</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>8</b>
-                                    <v>6385959</v>
+                                    <v>6385933</v>
                                 </b>
                                 <b>
                                     <a>8</a>
                                     <b>9</b>
-                                    <v>2605253</v>
+                                    <v>2605242</v>
                                 </b>
                                 <b>
                                     <a>9</a>
                                     <b>21</b>
-                                    <v>371583</v>
+                                    <v>371581</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12424,7 +12423,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>378428</v>
+                                    <v>378424</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -12434,22 +12433,22 @@
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>351515</v>
+                                    <v>351513</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>7</b>
-                                    <v>200660</v>
+                                    <v>200658</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>8</b>
-                                    <v>207152</v>
+                                    <v>207151</v>
                                 </b>
                                 <b>
                                     <a>8</a>
                                     <b>9</b>
-                                    <v>241888</v>
+                                    <v>241887</v>
                                 </b>
                                 <b>
                                     <a>9</a>
@@ -12459,17 +12458,17 @@
                                 <b>
                                     <a>10</a>
                                     <b>11</b>
-                                    <v>325486</v>
+                                    <v>325485</v>
                                 </b>
                                 <b>
                                     <a>11</a>
                                     <b>337</b>
-                                    <v>224849</v>
+                                    <v>224845</v>
                                 </b>
                                 <b>
                                     <a>339</a>
                                     <b>423</b>
-                                    <v>206353</v>
+                                    <v>206352</v>
                                 </b>
                                 <b>
                                     <a>423</a>
@@ -12484,15 +12483,15 @@
         </relation>
         <relation>
             <name>affectedbymacroexpansion</name>
-            <cardinality>35689082</cardinality>
+            <cardinality>35689256</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>5156745</v>
+                    <v>5156949</v>
                 </e>
                 <e>
                     <k>inv</k>
-                    <v>2784776</v>
+                    <v>2784762</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -12506,32 +12505,32 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2815933</v>
+                                    <v>2816079</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>560132</v>
+                                    <v>560184</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>264906</v>
+                                    <v>264908</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>565794</v>
+                                    <v>565803</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>12</b>
-                                    <v>391903</v>
+                                    <v>391901</v>
                                 </b>
                                 <b>
                                     <a>12</a>
                                     <b>50</b>
-                                    <v>407401</v>
+                                    <v>407399</v>
                                 </b>
                                 <b>
                                     <a>50</a>
@@ -12552,32 +12551,32 @@
                                 <b>
                                     <a>1</a>
                                     <b>4</b>
-                                    <v>229120</v>
+                                    <v>229116</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>7</b>
-                                    <v>231788</v>
+                                    <v>231720</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>9</b>
-                                    <v>220478</v>
+                                    <v>220491</v>
                                 </b>
                                 <b>
                                     <a>9</a>
                                     <b>12</b>
-                                    <v>251087</v>
+                                    <v>251120</v>
                                 </b>
                                 <b>
                                     <a>12</a>
                                     <b>13</b>
-                                    <v>333978</v>
+                                    <v>333985</v>
                                 </b>
                                 <b>
                                     <a>13</a>
                                     <b>14</b>
-                                    <v>165588</v>
+                                    <v>165593</v>
                                 </b>
                                 <b>
                                     <a>14</a>
@@ -12587,7 +12586,7 @@
                                 <b>
                                     <a>15</a>
                                     <b>16</b>
-                                    <v>121843</v>
+                                    <v>121842</v>
                                 </b>
                                 <b>
                                     <a>16</a>
@@ -12597,7 +12596,7 @@
                                 <b>
                                     <a>17</a>
                                     <b>18</b>
-                                    <v>146940</v>
+                                    <v>146942</v>
                                 </b>
                                 <b>
                                     <a>18</a>
@@ -12607,7 +12606,7 @@
                                 <b>
                                     <a>20</a>
                                     <b>25</b>
-                                    <v>208979</v>
+                                    <v>208978</v>
                                 </b>
                                 <b>
                                     <a>25</a>
@@ -12622,19 +12621,19 @@
         </relation>
         <relation>
             <name>macroinvocations</name>
-            <cardinality>33491157</cardinality>
+            <cardinality>33490802</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>33491157</v>
+                    <v>33490802</v>
                 </e>
                 <e>
                     <k>macro_id</k>
-                    <v>79484</v>
+                    <v>79483</v>
                 </e>
                 <e>
                     <k>location</k>
-                    <v>760390</v>
+                    <v>760382</v>
                 </e>
                 <e>
                     <k>kind</k>
@@ -12652,7 +12651,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>33491157</v>
+                                    <v>33490802</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12668,7 +12667,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>33491157</v>
+                                    <v>33490802</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12684,7 +12683,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>33491157</v>
+                                    <v>33490802</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12766,7 +12765,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>42468</v>
+                                    <v>42467</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -12781,7 +12780,7 @@
                                 <b>
                                     <a>4</a>
                                     <b>6</b>
-                                    <v>6841</v>
+                                    <v>6840</v>
                                 </b>
                                 <b>
                                     <a>6</a>
@@ -12812,7 +12811,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>73749</v>
+                                    <v>73748</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -12833,22 +12832,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>281226</v>
+                                    <v>281223</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>169659</v>
+                                    <v>169657</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>70735</v>
+                                    <v>70734</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>60327</v>
+                                    <v>60326</v>
                                 </b>
                                 <b>
                                     <a>5</a>
@@ -12884,12 +12883,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>714219</v>
+                                    <v>714211</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>350</b>
-                                    <v>46171</v>
+                                    <v>46170</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12905,7 +12904,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>760390</v>
+                                    <v>760382</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12978,15 +12977,15 @@
         </relation>
         <relation>
             <name>macroparent</name>
-            <cardinality>29950856</cardinality>
+            <cardinality>29950538</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>29950856</v>
+                    <v>29950538</v>
                 </e>
                 <e>
                     <k>parent_id</k>
-                    <v>23287102</v>
+                    <v>23286856</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -13000,7 +12999,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>29950856</v>
+                                    <v>29950538</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13016,17 +13015,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>17992872</v>
+                                    <v>17992681</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>4459570</v>
+                                    <v>4459523</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>88</b>
-                                    <v>834659</v>
+                                    <v>834650</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13036,15 +13035,15 @@
         </relation>
         <relation>
             <name>macrolocationbind</name>
-            <cardinality>4043799</cardinality>
+            <cardinality>4043781</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>2831150</v>
+                    <v>2831137</v>
                 </e>
                 <e>
                     <k>location</k>
-                    <v>2021069</v>
+                    <v>2021060</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -13058,22 +13057,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2229922</v>
+                                    <v>2229912</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>341125</v>
+                                    <v>341123</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>7</b>
-                                    <v>230525</v>
+                                    <v>230524</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>57</b>
-                                    <v>29577</v>
+                                    <v>29576</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13089,12 +13088,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1611024</v>
+                                    <v>1611017</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>177682</v>
+                                    <v>177681</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -13104,7 +13103,7 @@
                                 <b>
                                     <a>8</a>
                                     <b>723</b>
-                                    <v>75493</v>
+                                    <v>75492</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13114,11 +13113,11 @@
         </relation>
         <relation>
             <name>macro_argument_unexpanded</name>
-            <cardinality>84549814</cardinality>
+            <cardinality>84548918</cardinality>
             <columnsizes>
                 <e>
                     <k>invocation</k>
-                    <v>26214874</v>
+                    <v>26214596</v>
                 </e>
                 <e>
                     <k>argument_index</k>
@@ -13126,7 +13125,7 @@
                 </e>
                 <e>
                     <k>text</k>
-                    <v>318310</v>
+                    <v>318306</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -13140,22 +13139,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7432497</v>
+                                    <v>7432418</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>10674075</v>
+                                    <v>10673962</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>6139354</v>
+                                    <v>6139289</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>67</b>
-                                    <v>1968946</v>
+                                    <v>1968925</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13171,22 +13170,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7502657</v>
+                                    <v>7502578</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>10820626</v>
+                                    <v>10820511</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>5973025</v>
+                                    <v>5972962</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>67</b>
-                                    <v>1918564</v>
+                                    <v>1918544</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13254,12 +13253,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>35074</v>
+                                    <v>35073</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>61264</v>
+                                    <v>61263</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -13269,12 +13268,12 @@
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>45087</v>
+                                    <v>45086</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>7</b>
-                                    <v>23932</v>
+                                    <v>23931</v>
                                 </b>
                                 <b>
                                     <a>7</a>
@@ -13289,7 +13288,7 @@
                                 <b>
                                     <a>16</a>
                                     <b>23</b>
-                                    <v>24982</v>
+                                    <v>24981</v>
                                 </b>
                                 <b>
                                     <a>23</a>
@@ -13320,7 +13319,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>230201</v>
+                                    <v>230198</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -13330,7 +13329,7 @@
                                 <b>
                                     <a>3</a>
                                     <b>9</b>
-                                    <v>10284</v>
+                                    <v>10283</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13340,11 +13339,11 @@
         </relation>
         <relation>
             <name>macro_argument_expanded</name>
-            <cardinality>84549814</cardinality>
+            <cardinality>84548918</cardinality>
             <columnsizes>
                 <e>
                     <k>invocation</k>
-                    <v>26214874</v>
+                    <v>26214596</v>
                 </e>
                 <e>
                     <k>argument_index</k>
@@ -13352,7 +13351,7 @@
                 </e>
                 <e>
                     <k>text</k>
-                    <v>192902</v>
+                    <v>192900</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -13366,22 +13365,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7432497</v>
+                                    <v>7432418</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>10674075</v>
+                                    <v>10673962</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>6139354</v>
+                                    <v>6139289</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>67</b>
-                                    <v>1968946</v>
+                                    <v>1968925</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13397,22 +13396,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>10688841</v>
+                                    <v>10688727</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>9201903</v>
+                                    <v>9201805</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>5208300</v>
+                                    <v>5208245</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>9</b>
-                                    <v>1115829</v>
+                                    <v>1115817</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13551,7 +13550,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>97625</v>
+                                    <v>97624</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -13571,15 +13570,15 @@
         </relation>
         <relation>
             <name>functions</name>
-            <cardinality>4179381</cardinality>
+            <cardinality>4179893</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>4179381</v>
+                    <v>4179893</v>
                 </e>
                 <e>
                     <k>name</k>
-                    <v>1895474</v>
+                    <v>1895706</v>
                 </e>
                 <e>
                     <k>kind</k>
@@ -13597,7 +13596,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4179381</v>
+                                    <v>4179893</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13613,7 +13612,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4179381</v>
+                                    <v>4179893</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13629,22 +13628,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1498172</v>
+                                    <v>1498355</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>153131</v>
+                                    <v>153150</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>5</b>
-                                    <v>142860</v>
+                                    <v>142878</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>952</b>
-                                    <v>101309</v>
+                                    <v>101322</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13660,7 +13659,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1895007</v>
+                                    <v>1895240</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -13762,15 +13761,15 @@
         </relation>
         <relation>
             <name>function_entry_point</name>
-            <cardinality>1151757</cardinality>
+            <cardinality>1151752</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>1141953</v>
+                    <v>1141948</v>
                 </e>
                 <e>
                     <k>entry_point</k>
-                    <v>1151757</v>
+                    <v>1151752</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -13784,7 +13783,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1132149</v>
+                                    <v>1132144</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -13805,7 +13804,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1151757</v>
+                                    <v>1151752</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13815,15 +13814,15 @@
         </relation>
         <relation>
             <name>function_return_type</name>
-            <cardinality>4184517</cardinality>
+            <cardinality>4185029</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>4179381</v>
+                    <v>4179893</v>
                 </e>
                 <e>
                     <k>return_type</k>
-                    <v>817948</v>
+                    <v>818048</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -13837,12 +13836,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4174246</v>
+                                    <v>4174757</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>5135</v>
+                                    <v>5136</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13858,22 +13857,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>506082</v>
+                                    <v>506144</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>211490</v>
+                                    <v>211516</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>7</b>
-                                    <v>66294</v>
+                                    <v>66303</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>2231</b>
-                                    <v>34081</v>
+                                    <v>34085</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14153,44 +14152,44 @@
         </relation>
         <relation>
             <name>purefunctions</name>
-            <cardinality>100952</cardinality>
+            <cardinality>100951</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>100952</v>
+                    <v>100951</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>function_deleted</name>
-            <cardinality>96174</cardinality>
+            <cardinality>96186</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>96174</v>
+                    <v>96186</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>function_defaulted</name>
-            <cardinality>73764</cardinality>
+            <cardinality>73773</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>73764</v>
+                    <v>73773</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>function_prototyped</name>
-            <cardinality>4087409</cardinality>
+            <cardinality>4087910</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>4087409</v>
+                    <v>4087910</v>
                 </e>
             </columnsizes>
             <dependencies/>
@@ -14270,11 +14269,11 @@
         </relation>
         <relation>
             <name>member_function_this_type</name>
-            <cardinality>536525</cardinality>
+            <cardinality>536522</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>536525</v>
+                    <v>536522</v>
                 </e>
                 <e>
                     <k>this_type</k>
@@ -14292,7 +14291,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>536525</v>
+                                    <v>536522</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14343,27 +14342,27 @@
         </relation>
         <relation>
             <name>fun_decls</name>
-            <cardinality>4548672</cardinality>
+            <cardinality>4549229</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>4543537</v>
+                    <v>4544093</v>
                 </e>
                 <e>
                     <k>function</k>
-                    <v>4035587</v>
+                    <v>4036081</v>
                 </e>
                 <e>
                     <k>type_id</k>
-                    <v>816548</v>
+                    <v>816648</v>
                 </e>
                 <e>
                     <k>name</k>
-                    <v>1797899</v>
+                    <v>1798120</v>
                 </e>
                 <e>
                     <k>location</k>
-                    <v>3370770</v>
+                    <v>3371183</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -14377,7 +14376,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4543537</v>
+                                    <v>4544093</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14393,12 +14392,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4538401</v>
+                                    <v>4538957</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>5135</v>
+                                    <v>5136</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14414,7 +14413,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4543537</v>
+                                    <v>4544093</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14430,7 +14429,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4543537</v>
+                                    <v>4544093</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14446,17 +14445,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3606537</v>
+                                    <v>3606979</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>356218</v>
+                                    <v>356262</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>7</b>
-                                    <v>72831</v>
+                                    <v>72839</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14472,12 +14471,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3995903</v>
+                                    <v>3996393</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>39683</v>
+                                    <v>39688</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14493,7 +14492,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4035587</v>
+                                    <v>4036081</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14509,17 +14508,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3663028</v>
+                                    <v>3663477</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>311866</v>
+                                    <v>311904</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>6</b>
-                                    <v>60692</v>
+                                    <v>60699</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14535,22 +14534,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>431383</v>
+                                    <v>431436</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>274050</v>
+                                    <v>274083</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>6</b>
-                                    <v>63493</v>
+                                    <v>63501</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>2476</b>
-                                    <v>47620</v>
+                                    <v>47626</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14566,22 +14565,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>515419</v>
+                                    <v>515482</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>203086</v>
+                                    <v>203111</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>7</b>
-                                    <v>63026</v>
+                                    <v>63034</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>2192</b>
-                                    <v>35014</v>
+                                    <v>35019</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14597,17 +14596,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>690027</v>
+                                    <v>690112</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>4</b>
-                                    <v>67228</v>
+                                    <v>67236</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>773</b>
-                                    <v>59291</v>
+                                    <v>59299</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14623,22 +14622,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>595253</v>
+                                    <v>595326</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>121385</v>
+                                    <v>121399</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>7</b>
-                                    <v>63493</v>
+                                    <v>63501</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>1959</b>
-                                    <v>36415</v>
+                                    <v>36419</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14654,27 +14653,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1228323</v>
+                                    <v>1228474</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>267047</v>
+                                    <v>267079</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>77966</v>
+                                    <v>77976</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>7</b>
-                                    <v>146128</v>
+                                    <v>146146</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>986</b>
-                                    <v>78433</v>
+                                    <v>78443</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14690,22 +14689,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1407600</v>
+                                    <v>1407772</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>152198</v>
+                                    <v>152216</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>5</b>
-                                    <v>136791</v>
+                                    <v>136808</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>936</b>
-                                    <v>101309</v>
+                                    <v>101322</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14721,17 +14720,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1579406</v>
+                                    <v>1579600</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>4</b>
-                                    <v>134924</v>
+                                    <v>134940</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>562</b>
-                                    <v>83568</v>
+                                    <v>83579</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14747,27 +14746,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1236260</v>
+                                    <v>1236411</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>293191</v>
+                                    <v>293227</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>78900</v>
+                                    <v>78909</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>8</b>
-                                    <v>137258</v>
+                                    <v>137275</v>
                                 </b>
                                 <b>
                                     <a>8</a>
                                     <b>542</b>
-                                    <v>52288</v>
+                                    <v>52295</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14783,17 +14782,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2966464</v>
+                                    <v>2966828</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>4</b>
-                                    <v>277785</v>
+                                    <v>277819</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>55</b>
-                                    <v>126520</v>
+                                    <v>126536</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14809,17 +14808,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3033693</v>
+                                    <v>3034065</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>7</b>
-                                    <v>244170</v>
+                                    <v>244200</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>55</b>
-                                    <v>92906</v>
+                                    <v>92917</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14835,12 +14834,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3207367</v>
+                                    <v>3207760</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>18</b>
-                                    <v>163402</v>
+                                    <v>163423</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14856,12 +14855,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3232578</v>
+                                    <v>3232974</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>13</b>
-                                    <v>138192</v>
+                                    <v>138209</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14871,22 +14870,22 @@
         </relation>
         <relation>
             <name>fun_def</name>
-            <cardinality>1888938</cardinality>
+            <cardinality>1889170</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>1888938</v>
+                    <v>1889170</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>fun_specialized</name>
-            <cardinality>26144</cardinality>
+            <cardinality>26147</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>26144</v>
+                    <v>26147</v>
                 </e>
             </columnsizes>
             <dependencies/>
@@ -14904,11 +14903,11 @@
         </relation>
         <relation>
             <name>fun_decl_specifiers</name>
-            <cardinality>2906705</cardinality>
+            <cardinality>2907062</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>1689587</v>
+                    <v>1689793</v>
                 </e>
                 <e>
                     <k>name</k>
@@ -14926,17 +14925,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>491142</v>
+                                    <v>491202</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>1179769</v>
+                                    <v>1179914</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>18674</v>
+                                    <v>18676</v>
                                 </b>
                             </bs>
                         </hist>
@@ -15108,22 +15107,22 @@
         </relation>
         <relation>
             <name>fun_decl_empty_throws</name>
-            <cardinality>1472027</cardinality>
+            <cardinality>1472207</cardinality>
             <columnsizes>
                 <e>
                     <k>fun_decl</k>
-                    <v>1472027</v>
+                    <v>1472207</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>fun_decl_noexcept</name>
-            <cardinality>61667</cardinality>
+            <cardinality>61666</cardinality>
             <columnsizes>
                 <e>
                     <k>fun_decl</k>
-                    <v>61667</v>
+                    <v>61666</v>
                 </e>
                 <e>
                     <k>constant</k>
@@ -15141,7 +15140,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>61667</v>
+                                    <v>61666</v>
                                 </b>
                             </bs>
                         </hist>
@@ -15172,11 +15171,11 @@
         </relation>
         <relation>
             <name>fun_decl_empty_noexcept</name>
-            <cardinality>863234</cardinality>
+            <cardinality>863340</cardinality>
             <columnsizes>
                 <e>
                     <k>fun_decl</k>
-                    <v>863234</v>
+                    <v>863340</v>
                 </e>
             </columnsizes>
             <dependencies/>
@@ -15281,19 +15280,19 @@
         </relation>
         <relation>
             <name>param_decl_bind</name>
-            <cardinality>6995048</cardinality>
+            <cardinality>6995905</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>6995048</v>
+                    <v>6995905</v>
                 </e>
                 <e>
                     <k>index</k>
-                    <v>7936</v>
+                    <v>7937</v>
                 </e>
                 <e>
                     <k>fun_decl</k>
-                    <v>3835301</v>
+                    <v>3835771</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -15307,7 +15306,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>6995048</v>
+                                    <v>6995905</v>
                                 </b>
                             </bs>
                         </hist>
@@ -15323,7 +15322,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>6995048</v>
+                                    <v>6995905</v>
                                 </b>
                             </bs>
                         </hist>
@@ -15501,22 +15500,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1973908</v>
+                                    <v>1974150</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>1061652</v>
+                                    <v>1061782</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>502814</v>
+                                    <v>502875</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>8</b>
-                                    <v>290857</v>
+                                    <v>290892</v>
                                 </b>
                                 <b>
                                     <a>8</a>
@@ -15537,22 +15536,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1973908</v>
+                                    <v>1974150</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>1061652</v>
+                                    <v>1061782</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>502814</v>
+                                    <v>502875</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>8</b>
-                                    <v>290857</v>
+                                    <v>290892</v>
                                 </b>
                                 <b>
                                     <a>8</a>
@@ -15567,27 +15566,27 @@
         </relation>
         <relation>
             <name>var_decls</name>
-            <cardinality>8110391</cardinality>
+            <cardinality>8111384</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>8039427</v>
+                    <v>8040412</v>
                 </e>
                 <e>
                     <k>variable</k>
-                    <v>7027262</v>
+                    <v>7028123</v>
                 </e>
                 <e>
                     <k>type_id</k>
-                    <v>2043471</v>
+                    <v>2043721</v>
                 </e>
                 <e>
                     <k>name</k>
-                    <v>667617</v>
+                    <v>667699</v>
                 </e>
                 <e>
                     <k>location</k>
-                    <v>5311998</v>
+                    <v>5312648</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -15601,7 +15600,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>8039427</v>
+                                    <v>8040412</v>
                                 </b>
                             </bs>
                         </hist>
@@ -15617,12 +15616,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7971265</v>
+                                    <v>7972241</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>68162</v>
+                                    <v>68170</v>
                                 </b>
                             </bs>
                         </hist>
@@ -15638,7 +15637,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>8039427</v>
+                                    <v>8040412</v>
                                 </b>
                             </bs>
                         </hist>
@@ -15654,7 +15653,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>8036626</v>
+                                    <v>8037610</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -15675,17 +15674,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>6175232</v>
+                                    <v>6175989</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>698431</v>
+                                    <v>698516</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>7</b>
-                                    <v>153598</v>
+                                    <v>153617</v>
                                 </b>
                             </bs>
                         </hist>
@@ -15701,12 +15700,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>6855922</v>
+                                    <v>6856762</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>4</b>
-                                    <v>171339</v>
+                                    <v>171360</v>
                                 </b>
                             </bs>
                         </hist>
@@ -15722,12 +15721,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>6911946</v>
+                                    <v>6912793</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>115315</v>
+                                    <v>115329</v>
                                 </b>
                             </bs>
                         </hist>
@@ -15743,12 +15742,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>6481963</v>
+                                    <v>6482757</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>542964</v>
+                                    <v>543031</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -15769,27 +15768,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1165763</v>
+                                    <v>1165906</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>477136</v>
+                                    <v>477195</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>94773</v>
+                                    <v>94785</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>7</b>
-                                    <v>184878</v>
+                                    <v>184901</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>762</b>
-                                    <v>120918</v>
+                                    <v>120933</v>
                                 </b>
                             </bs>
                         </hist>
@@ -15805,22 +15804,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1299287</v>
+                                    <v>1299446</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>452392</v>
+                                    <v>452448</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>6</b>
-                                    <v>155933</v>
+                                    <v>155952</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>724</b>
-                                    <v>135857</v>
+                                    <v>135874</v>
                                 </b>
                             </bs>
                         </hist>
@@ -15836,17 +15835,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1539256</v>
+                                    <v>1539444</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>383296</v>
+                                    <v>383343</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>128</b>
-                                    <v>120918</v>
+                                    <v>120933</v>
                                 </b>
                             </bs>
                         </hist>
@@ -15862,22 +15861,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1365582</v>
+                                    <v>1365749</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>404305</v>
+                                    <v>404355</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>7</b>
-                                    <v>173207</v>
+                                    <v>173228</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>592</b>
-                                    <v>100376</v>
+                                    <v>100388</v>
                                 </b>
                             </bs>
                         </hist>
@@ -15893,37 +15892,37 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>341278</v>
+                                    <v>341320</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>86837</v>
+                                    <v>86847</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>48554</v>
+                                    <v>48559</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>6</b>
-                                    <v>51822</v>
+                                    <v>51828</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>12</b>
-                                    <v>52288</v>
+                                    <v>52295</v>
                                 </b>
                                 <b>
                                     <a>12</a>
                                     <b>33</b>
-                                    <v>50421</v>
+                                    <v>50427</v>
                                 </b>
                                 <b>
                                     <a>34</a>
                                     <b>2384</b>
-                                    <v>36415</v>
+                                    <v>36419</v>
                                 </b>
                             </bs>
                         </hist>
@@ -15939,37 +15938,37 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>368823</v>
+                                    <v>368869</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>77966</v>
+                                    <v>77976</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>45285</v>
+                                    <v>45291</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>6</b>
-                                    <v>49487</v>
+                                    <v>49493</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>14</b>
-                                    <v>53222</v>
+                                    <v>53229</v>
                                 </b>
                                 <b>
                                     <a>14</a>
                                     <b>56</b>
-                                    <v>50888</v>
+                                    <v>50894</v>
                                 </b>
                                 <b>
                                     <a>56</a>
                                     <b>2301</b>
-                                    <v>21942</v>
+                                    <v>21945</v>
                                 </b>
                             </bs>
                         </hist>
@@ -15985,27 +15984,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>457061</v>
+                                    <v>457117</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>93840</v>
+                                    <v>93851</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>5</b>
-                                    <v>46686</v>
+                                    <v>46692</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>19</b>
-                                    <v>50888</v>
+                                    <v>50894</v>
                                 </b>
                                 <b>
                                     <a>19</a>
                                     <b>1182</b>
-                                    <v>19141</v>
+                                    <v>19143</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16021,32 +16020,32 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>379094</v>
+                                    <v>379141</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>90571</v>
+                                    <v>90583</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>5</b>
-                                    <v>59758</v>
+                                    <v>59766</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>9</b>
-                                    <v>51355</v>
+                                    <v>51361</v>
                                 </b>
                                 <b>
                                     <a>9</a>
                                     <b>21</b>
-                                    <v>50421</v>
+                                    <v>50427</v>
                                 </b>
                                 <b>
                                     <a>21</a>
                                     <b>1010</b>
-                                    <v>36415</v>
+                                    <v>36419</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16062,17 +16061,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4496383</v>
+                                    <v>4496934</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>531760</v>
+                                    <v>531825</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>896</b>
-                                    <v>283854</v>
+                                    <v>283889</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16088,17 +16087,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4885749</v>
+                                    <v>4886348</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>17</b>
-                                    <v>415510</v>
+                                    <v>415561</v>
                                 </b>
                                 <b>
                                     <a>17</a>
                                     <b>892</b>
-                                    <v>10737</v>
+                                    <v>10739</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16114,12 +16113,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4961848</v>
+                                    <v>4962456</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>759</b>
-                                    <v>350149</v>
+                                    <v>350192</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16135,12 +16134,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5302660</v>
+                                    <v>5303310</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>6</b>
-                                    <v>9337</v>
+                                    <v>9338</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16150,22 +16149,22 @@
         </relation>
         <relation>
             <name>var_def</name>
-            <cardinality>3994969</cardinality>
+            <cardinality>3995459</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>3994969</v>
+                    <v>3995459</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>var_decl_specifiers</name>
-            <cardinality>378628</cardinality>
+            <cardinality>378674</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>378628</v>
+                    <v>378674</v>
                 </e>
                 <e>
                     <k>name</k>
@@ -16183,7 +16182,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>378628</v>
+                                    <v>378674</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16235,19 +16234,19 @@
         </relation>
         <relation>
             <name>type_decls</name>
-            <cardinality>3283466</cardinality>
+            <cardinality>3283868</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>3283466</v>
+                    <v>3283868</v>
                 </e>
                 <e>
                     <k>type_id</k>
-                    <v>3233045</v>
+                    <v>3233441</v>
                 </e>
                 <e>
                     <k>location</k>
-                    <v>3166283</v>
+                    <v>3166671</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -16261,7 +16260,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3283466</v>
+                                    <v>3283868</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16277,7 +16276,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3283466</v>
+                                    <v>3283868</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16293,12 +16292,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3191493</v>
+                                    <v>3191884</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>5</b>
-                                    <v>41551</v>
+                                    <v>41556</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16314,12 +16313,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3191493</v>
+                                    <v>3191884</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>5</b>
-                                    <v>41551</v>
+                                    <v>41556</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16335,12 +16334,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3113994</v>
+                                    <v>3114375</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>20</b>
-                                    <v>52288</v>
+                                    <v>52295</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16356,12 +16355,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3113994</v>
+                                    <v>3114375</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>20</b>
-                                    <v>52288</v>
+                                    <v>52295</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16371,33 +16370,33 @@
         </relation>
         <relation>
             <name>type_def</name>
-            <cardinality>2641993</cardinality>
+            <cardinality>2642316</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>2641993</v>
+                    <v>2642316</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>type_decl_top</name>
-            <cardinality>743717</cardinality>
+            <cardinality>743808</cardinality>
             <columnsizes>
                 <e>
                     <k>type_decl</k>
-                    <v>743717</v>
+                    <v>743808</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>namespace_decls</name>
-            <cardinality>311638</cardinality>
+            <cardinality>311636</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>311638</v>
+                    <v>311636</v>
                 </e>
                 <e>
                     <k>namespace_id</k>
@@ -16405,11 +16404,11 @@
                 </e>
                 <e>
                     <k>location</k>
-                    <v>311638</v>
+                    <v>311636</v>
                 </e>
                 <e>
                     <k>bodylocation</k>
-                    <v>311638</v>
+                    <v>311636</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -16423,7 +16422,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>311638</v>
+                                    <v>311636</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16439,7 +16438,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>311638</v>
+                                    <v>311636</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16455,7 +16454,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>311638</v>
+                                    <v>311636</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16669,7 +16668,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>311638</v>
+                                    <v>311636</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16685,7 +16684,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>311638</v>
+                                    <v>311636</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16701,7 +16700,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>311638</v>
+                                    <v>311636</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16717,7 +16716,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>311638</v>
+                                    <v>311636</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16733,7 +16732,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>311638</v>
+                                    <v>311636</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16749,7 +16748,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>311638</v>
+                                    <v>311636</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16759,19 +16758,19 @@
         </relation>
         <relation>
             <name>usings</name>
-            <cardinality>369757</cardinality>
+            <cardinality>369802</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>369757</v>
+                    <v>369802</v>
                 </e>
                 <e>
                     <k>element_id</k>
-                    <v>315601</v>
+                    <v>315639</v>
                 </e>
                 <e>
                     <k>location</k>
-                    <v>247905</v>
+                    <v>247936</v>
                 </e>
                 <e>
                     <k>kind</k>
@@ -16789,7 +16788,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>369757</v>
+                                    <v>369802</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16805,7 +16804,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>369757</v>
+                                    <v>369802</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16821,7 +16820,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>369757</v>
+                                    <v>369802</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16837,12 +16836,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>263312</v>
+                                    <v>263344</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>50888</v>
+                                    <v>50894</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -16863,12 +16862,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>263312</v>
+                                    <v>263344</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>50888</v>
+                                    <v>50894</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -16889,7 +16888,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>315601</v>
+                                    <v>315639</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16905,17 +16904,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>202619</v>
+                                    <v>202644</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>4</b>
-                                    <v>10737</v>
+                                    <v>10739</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>31280</v>
+                                    <v>31283</v>
                                 </b>
                                 <b>
                                     <a>5</a>
@@ -16936,17 +16935,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>202619</v>
+                                    <v>202644</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>4</b>
-                                    <v>10737</v>
+                                    <v>10739</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>31280</v>
+                                    <v>31283</v>
                                 </b>
                                 <b>
                                     <a>5</a>
@@ -16967,7 +16966,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>247905</v>
+                                    <v>247936</v>
                                 </b>
                             </bs>
                         </hist>
@@ -17040,7 +17039,7 @@
         </relation>
         <relation>
             <name>using_container</name>
-            <cardinality>466802</cardinality>
+            <cardinality>466798</cardinality>
             <columnsizes>
                 <e>
                     <k>parent</k>
@@ -17048,7 +17047,7 @@
                 </e>
                 <e>
                     <k>child</k>
-                    <v>295992</v>
+                    <v>295989</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -17118,12 +17117,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>218314</v>
+                                    <v>218311</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>51725</v>
+                                    <v>51724</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -17143,15 +17142,15 @@
         </relation>
         <relation>
             <name>static_asserts</name>
-            <cardinality>134702</cardinality>
+            <cardinality>134701</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>134702</v>
+                    <v>134701</v>
                 </e>
                 <e>
                     <k>condition</k>
-                    <v>134702</v>
+                    <v>134701</v>
                 </e>
                 <e>
                     <k>message</k>
@@ -17177,7 +17176,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>134702</v>
+                                    <v>134701</v>
                                 </b>
                             </bs>
                         </hist>
@@ -17193,7 +17192,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>134702</v>
+                                    <v>134701</v>
                                 </b>
                             </bs>
                         </hist>
@@ -17209,7 +17208,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>134702</v>
+                                    <v>134701</v>
                                 </b>
                             </bs>
                         </hist>
@@ -17225,7 +17224,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>134702</v>
+                                    <v>134701</v>
                                 </b>
                             </bs>
                         </hist>
@@ -17241,7 +17240,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>134702</v>
+                                    <v>134701</v>
                                 </b>
                             </bs>
                         </hist>
@@ -17257,7 +17256,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>134702</v>
+                                    <v>134701</v>
                                 </b>
                             </bs>
                         </hist>
@@ -17273,7 +17272,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>134702</v>
+                                    <v>134701</v>
                                 </b>
                             </bs>
                         </hist>
@@ -17289,7 +17288,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>134702</v>
+                                    <v>134701</v>
                                 </b>
                             </bs>
                         </hist>
@@ -17751,23 +17750,23 @@
         </relation>
         <relation>
             <name>params</name>
-            <cardinality>6354509</cardinality>
+            <cardinality>6355287</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>6190639</v>
+                    <v>6191397</v>
                 </e>
                 <e>
                     <k>function</k>
-                    <v>3491688</v>
+                    <v>3492116</v>
                 </e>
                 <e>
                     <k>index</k>
-                    <v>7936</v>
+                    <v>7937</v>
                 </e>
                 <e>
                     <k>type_id</k>
-                    <v>1846453</v>
+                    <v>1846680</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -17781,7 +17780,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>6190639</v>
+                                    <v>6191397</v>
                                 </b>
                             </bs>
                         </hist>
@@ -17797,7 +17796,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>6190639</v>
+                                    <v>6191397</v>
                                 </b>
                             </bs>
                         </hist>
@@ -17813,12 +17812,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>6066919</v>
+                                    <v>6067663</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>4</b>
-                                    <v>123719</v>
+                                    <v>123734</v>
                                 </b>
                             </bs>
                         </hist>
@@ -17834,22 +17833,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1867462</v>
+                                    <v>1867691</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>952872</v>
+                                    <v>952989</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>429983</v>
+                                    <v>430035</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>18</b>
-                                    <v>241369</v>
+                                    <v>241399</v>
                                 </b>
                             </bs>
                         </hist>
@@ -17865,22 +17864,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1867462</v>
+                                    <v>1867691</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>952872</v>
+                                    <v>952989</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>429983</v>
+                                    <v>430035</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>18</b>
-                                    <v>241369</v>
+                                    <v>241399</v>
                                 </b>
                             </bs>
                         </hist>
@@ -17896,22 +17895,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2165790</v>
+                                    <v>2166055</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>826819</v>
+                                    <v>826920</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>346414</v>
+                                    <v>346456</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>12</b>
-                                    <v>152665</v>
+                                    <v>152683</v>
                                 </b>
                             </bs>
                         </hist>
@@ -18165,22 +18164,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1183971</v>
+                                    <v>1184116</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>406173</v>
+                                    <v>406222</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>7</b>
-                                    <v>154065</v>
+                                    <v>154084</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>518</b>
-                                    <v>102243</v>
+                                    <v>102256</v>
                                 </b>
                             </bs>
                         </hist>
@@ -18196,22 +18195,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1404798</v>
+                                    <v>1404971</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>212423</v>
+                                    <v>212449</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>7</b>
-                                    <v>147529</v>
+                                    <v>147547</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>502</b>
-                                    <v>81701</v>
+                                    <v>81711</v>
                                 </b>
                             </bs>
                         </hist>
@@ -18227,17 +18226,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1420205</v>
+                                    <v>1420379</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>347348</v>
+                                    <v>347390</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>13</b>
-                                    <v>78900</v>
+                                    <v>78909</v>
                                 </b>
                             </bs>
                         </hist>
@@ -18330,19 +18329,19 @@
         </relation>
         <relation>
             <name>membervariables</name>
-            <cardinality>1056495</cardinality>
+            <cardinality>1056490</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>1054697</v>
+                    <v>1054692</v>
                 </e>
                 <e>
                     <k>type_id</k>
-                    <v>327727</v>
+                    <v>327726</v>
                 </e>
                 <e>
                     <k>name</k>
-                    <v>451619</v>
+                    <v>451617</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -18356,7 +18355,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1052979</v>
+                                    <v>1052974</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -18377,7 +18376,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1054697</v>
+                                    <v>1054692</v>
                                 </b>
                             </bs>
                         </hist>
@@ -18393,7 +18392,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>243029</v>
+                                    <v>243027</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -18424,7 +18423,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>255254</v>
+                                    <v>255253</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -18455,7 +18454,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>295326</v>
+                                    <v>295325</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -18486,12 +18485,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>367839</v>
+                                    <v>367837</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>51738</v>
+                                    <v>51737</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -18506,7 +18505,7 @@
         </relation>
         <relation>
             <name>globalvariables</name>
-            <cardinality>301284</cardinality>
+            <cardinality>301286</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
@@ -18532,12 +18531,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>301268</v>
+                                    <v>301266</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>8</v>
+                                    <v>10</v>
                                 </b>
                             </bs>
                         </hist>
@@ -18574,12 +18573,12 @@
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>160</v>
+                                    <v>159</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>7</b>
-                                    <v>116</v>
+                                    <v>117</v>
                                 </b>
                                 <b>
                                     <a>7</a>
@@ -18868,11 +18867,11 @@
         </relation>
         <relation>
             <name>autoderivation</name>
-            <cardinality>147961</cardinality>
+            <cardinality>147960</cardinality>
             <columnsizes>
                 <e>
                     <k>var</k>
-                    <v>147961</v>
+                    <v>147960</v>
                 </e>
                 <e>
                     <k>derivation_type</k>
@@ -18890,7 +18889,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>147961</v>
+                                    <v>147960</v>
                                 </b>
                             </bs>
                         </hist>
@@ -18989,11 +18988,11 @@
         </relation>
         <relation>
             <name>enumconstants</name>
-            <cardinality>241670</cardinality>
+            <cardinality>241669</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>241670</v>
+                    <v>241669</v>
                 </e>
                 <e>
                     <k>parent</k>
@@ -19009,11 +19008,11 @@
                 </e>
                 <e>
                     <k>name</k>
-                    <v>241391</v>
+                    <v>241389</v>
                 </e>
                 <e>
                     <k>location</k>
-                    <v>221574</v>
+                    <v>221573</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -19027,7 +19026,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>241670</v>
+                                    <v>241669</v>
                                 </b>
                             </bs>
                         </hist>
@@ -19043,7 +19042,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>241670</v>
+                                    <v>241669</v>
                                 </b>
                             </bs>
                         </hist>
@@ -19059,7 +19058,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>241670</v>
+                                    <v>241669</v>
                                 </b>
                             </bs>
                         </hist>
@@ -19075,7 +19074,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>241670</v>
+                                    <v>241669</v>
                                 </b>
                             </bs>
                         </hist>
@@ -19091,7 +19090,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>241670</v>
+                                    <v>241669</v>
                                 </b>
                             </bs>
                         </hist>
@@ -19331,7 +19330,7 @@
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>5833</v>
+                                    <v>5832</v>
                                 </b>
                                 <b>
                                     <a>4</a>
@@ -19702,7 +19701,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>241111</v>
+                                    <v>241110</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -19723,7 +19722,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>241111</v>
+                                    <v>241110</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -19744,7 +19743,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>241391</v>
+                                    <v>241389</v>
                                 </b>
                             </bs>
                         </hist>
@@ -19760,7 +19759,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>241391</v>
+                                    <v>241389</v>
                                 </b>
                             </bs>
                         </hist>
@@ -19776,7 +19775,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>241111</v>
+                                    <v>241110</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -19797,7 +19796,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>220815</v>
+                                    <v>220814</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -19818,7 +19817,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>221574</v>
+                                    <v>221573</v>
                                 </b>
                             </bs>
                         </hist>
@@ -19834,7 +19833,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>220815</v>
+                                    <v>220814</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -19855,7 +19854,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>221574</v>
+                                    <v>221573</v>
                                 </b>
                             </bs>
                         </hist>
@@ -19871,7 +19870,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>220815</v>
+                                    <v>220814</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -19886,19 +19885,19 @@
         </relation>
         <relation>
             <name>builtintypes</name>
-            <cardinality>26144</cardinality>
+            <cardinality>26147</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>26144</v>
+                    <v>26147</v>
                 </e>
                 <e>
                     <k>name</k>
-                    <v>26144</v>
+                    <v>26147</v>
                 </e>
                 <e>
                     <k>kind</k>
-                    <v>26144</v>
+                    <v>26147</v>
                 </e>
                 <e>
                     <k>size</k>
@@ -19924,7 +19923,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>26144</v>
+                                    <v>26147</v>
                                 </b>
                             </bs>
                         </hist>
@@ -19940,7 +19939,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>26144</v>
+                                    <v>26147</v>
                                 </b>
                             </bs>
                         </hist>
@@ -19956,7 +19955,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>26144</v>
+                                    <v>26147</v>
                                 </b>
                             </bs>
                         </hist>
@@ -19972,7 +19971,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>26144</v>
+                                    <v>26147</v>
                                 </b>
                             </bs>
                         </hist>
@@ -19988,7 +19987,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>26144</v>
+                                    <v>26147</v>
                                 </b>
                             </bs>
                         </hist>
@@ -20004,7 +20003,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>26144</v>
+                                    <v>26147</v>
                                 </b>
                             </bs>
                         </hist>
@@ -20020,7 +20019,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>26144</v>
+                                    <v>26147</v>
                                 </b>
                             </bs>
                         </hist>
@@ -20036,7 +20035,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>26144</v>
+                                    <v>26147</v>
                                 </b>
                             </bs>
                         </hist>
@@ -20052,7 +20051,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>26144</v>
+                                    <v>26147</v>
                                 </b>
                             </bs>
                         </hist>
@@ -20068,7 +20067,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>26144</v>
+                                    <v>26147</v>
                                 </b>
                             </bs>
                         </hist>
@@ -20084,7 +20083,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>26144</v>
+                                    <v>26147</v>
                                 </b>
                             </bs>
                         </hist>
@@ -20100,7 +20099,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>26144</v>
+                                    <v>26147</v>
                                 </b>
                             </bs>
                         </hist>
@@ -20116,7 +20115,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>26144</v>
+                                    <v>26147</v>
                                 </b>
                             </bs>
                         </hist>
@@ -20132,7 +20131,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>26144</v>
+                                    <v>26147</v>
                                 </b>
                             </bs>
                         </hist>
@@ -20148,7 +20147,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>26144</v>
+                                    <v>26147</v>
                                 </b>
                             </bs>
                         </hist>
@@ -20593,15 +20592,15 @@
         </relation>
         <relation>
             <name>derivedtypes</name>
-            <cardinality>3669564</cardinality>
+            <cardinality>3670014</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>3669564</v>
+                    <v>3670014</v>
                 </e>
                 <e>
                     <k>name</k>
-                    <v>1552795</v>
+                    <v>1552985</v>
                 </e>
                 <e>
                     <k>kind</k>
@@ -20609,7 +20608,7 @@
                 </e>
                 <e>
                     <k>type_id</k>
-                    <v>2362807</v>
+                    <v>2363096</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -20623,7 +20622,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3669564</v>
+                                    <v>3670014</v>
                                 </b>
                             </bs>
                         </hist>
@@ -20639,7 +20638,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3669564</v>
+                                    <v>3670014</v>
                                 </b>
                             </bs>
                         </hist>
@@ -20655,7 +20654,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3669564</v>
+                                    <v>3670014</v>
                                 </b>
                             </bs>
                         </hist>
@@ -20671,17 +20670,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1324031</v>
+                                    <v>1324193</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>4</b>
-                                    <v>120451</v>
+                                    <v>120466</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>1153</b>
-                                    <v>108312</v>
+                                    <v>108326</v>
                                 </b>
                             </bs>
                         </hist>
@@ -20697,7 +20696,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1551861</v>
+                                    <v>1552051</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -20718,17 +20717,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1324031</v>
+                                    <v>1324193</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>4</b>
-                                    <v>120451</v>
+                                    <v>120466</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>1135</b>
-                                    <v>108312</v>
+                                    <v>108326</v>
                                 </b>
                             </bs>
                         </hist>
@@ -20867,22 +20866,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1515446</v>
+                                    <v>1515631</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>546232</v>
+                                    <v>546299</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>218493</v>
+                                    <v>218519</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>72</b>
-                                    <v>82635</v>
+                                    <v>82645</v>
                                 </b>
                             </bs>
                         </hist>
@@ -20898,22 +20897,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1526650</v>
+                                    <v>1526837</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>538763</v>
+                                    <v>538829</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>215691</v>
+                                    <v>215718</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>72</b>
-                                    <v>81701</v>
+                                    <v>81711</v>
                                 </b>
                             </bs>
                         </hist>
@@ -20929,22 +20928,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1519647</v>
+                                    <v>1519834</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>549967</v>
+                                    <v>550035</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>217559</v>
+                                    <v>217586</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>6</b>
-                                    <v>75632</v>
+                                    <v>75641</v>
                                 </b>
                             </bs>
                         </hist>
@@ -20954,11 +20953,11 @@
         </relation>
         <relation>
             <name>pointerishsize</name>
-            <cardinality>2707354</cardinality>
+            <cardinality>2707685</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>2707354</v>
+                    <v>2707685</v>
                 </e>
                 <e>
                     <k>size</k>
@@ -20980,7 +20979,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2707354</v>
+                                    <v>2707685</v>
                                 </b>
                             </bs>
                         </hist>
@@ -20996,7 +20995,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2707354</v>
+                                    <v>2707685</v>
                                 </b>
                             </bs>
                         </hist>
@@ -21070,19 +21069,19 @@
         </relation>
         <relation>
             <name>arraysizes</name>
-            <cardinality>88237</cardinality>
+            <cardinality>88248</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>88237</v>
+                    <v>88248</v>
                 </e>
                 <e>
                     <k>num_elements</k>
-                    <v>31746</v>
+                    <v>31750</v>
                 </e>
                 <e>
                     <k>bytesize</k>
-                    <v>33147</v>
+                    <v>33151</v>
                 </e>
                 <e>
                     <k>alignment</k>
@@ -21100,7 +21099,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>88237</v>
+                                    <v>88248</v>
                                 </b>
                             </bs>
                         </hist>
@@ -21116,7 +21115,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>88237</v>
+                                    <v>88248</v>
                                 </b>
                             </bs>
                         </hist>
@@ -21132,7 +21131,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>88237</v>
+                                    <v>88248</v>
                                 </b>
                             </bs>
                         </hist>
@@ -21153,7 +21152,7 @@
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>23810</v>
+                                    <v>23813</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -21184,7 +21183,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>26611</v>
+                                    <v>26614</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -21210,7 +21209,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>26611</v>
+                                    <v>26614</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -21241,7 +21240,7 @@
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>23810</v>
+                                    <v>23813</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -21272,12 +21271,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>27545</v>
+                                    <v>27548</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>3734</v>
+                                    <v>3735</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -21298,12 +21297,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>27545</v>
+                                    <v>27548</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>4668</v>
+                                    <v>4669</v>
                                 </b>
                                 <b>
                                     <a>4</a>
@@ -21406,15 +21405,15 @@
         </relation>
         <relation>
             <name>typedefbase</name>
-            <cardinality>1686117</cardinality>
+            <cardinality>1686099</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>1686117</v>
+                    <v>1686099</v>
                 </e>
                 <e>
                     <k>type_id</k>
-                    <v>793489</v>
+                    <v>793481</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -21428,7 +21427,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1686117</v>
+                                    <v>1686099</v>
                                 </b>
                             </bs>
                         </hist>
@@ -21444,12 +21443,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>617406</v>
+                                    <v>617400</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>83254</v>
+                                    <v>83253</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -21755,19 +21754,19 @@
         </relation>
         <relation>
             <name>usertypes</name>
-            <cardinality>5234965</cardinality>
+            <cardinality>5235606</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>5234965</v>
+                    <v>5235606</v>
                 </e>
                 <e>
                     <k>name</k>
-                    <v>1352509</v>
+                    <v>1352675</v>
                 </e>
                 <e>
                     <k>kind</k>
-                    <v>5135</v>
+                    <v>5136</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -21781,7 +21780,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5234965</v>
+                                    <v>5235606</v>
                                 </b>
                             </bs>
                         </hist>
@@ -21797,7 +21796,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5234965</v>
+                                    <v>5235606</v>
                                 </b>
                             </bs>
                         </hist>
@@ -21813,27 +21812,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>983686</v>
+                                    <v>983806</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>153598</v>
+                                    <v>153617</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>7</b>
-                                    <v>104577</v>
+                                    <v>104590</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>61</b>
-                                    <v>101776</v>
+                                    <v>101789</v>
                                 </b>
                                 <b>
                                     <a>65</a>
                                     <b>874</b>
-                                    <v>8870</v>
+                                    <v>8871</v>
                                 </b>
                             </bs>
                         </hist>
@@ -21849,17 +21848,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1211983</v>
+                                    <v>1212131</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>125120</v>
+                                    <v>125135</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>7</b>
-                                    <v>15406</v>
+                                    <v>15408</v>
                                 </b>
                             </bs>
                         </hist>
@@ -22001,15 +22000,15 @@
         </relation>
         <relation>
             <name>usertypesize</name>
-            <cardinality>1707327</cardinality>
+            <cardinality>1707537</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>1707327</v>
+                    <v>1707537</v>
                 </e>
                 <e>
                     <k>size</k>
-                    <v>13539</v>
+                    <v>13540</v>
                 </e>
                 <e>
                     <k>alignment</k>
@@ -22027,7 +22026,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1707327</v>
+                                    <v>1707537</v>
                                 </b>
                             </bs>
                         </hist>
@@ -22043,7 +22042,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1707327</v>
+                                    <v>1707537</v>
                                 </b>
                             </bs>
                         </hist>
@@ -22064,7 +22063,7 @@
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>4201</v>
+                                    <v>4202</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -22115,7 +22114,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>10271</v>
+                                    <v>10272</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -22218,11 +22217,11 @@
         </relation>
         <relation>
             <name>usertype_uuid</name>
-            <cardinality>36652</cardinality>
+            <cardinality>36651</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>36652</v>
+                    <v>36651</v>
                 </e>
                 <e>
                     <k>uuid</k>
@@ -22240,7 +22239,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>36652</v>
+                                    <v>36651</v>
                                 </b>
                             </bs>
                         </hist>
@@ -22271,15 +22270,15 @@
         </relation>
         <relation>
             <name>mangled_name</name>
-            <cardinality>9020312</cardinality>
+            <cardinality>9021417</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>9020312</v>
+                    <v>9021417</v>
                 </e>
                 <e>
                     <k>mangled_name</k>
-                    <v>6061784</v>
+                    <v>6062526</v>
                 </e>
                 <e>
                     <k>is_complete</k>
@@ -22297,7 +22296,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>9020312</v>
+                                    <v>9021417</v>
                                 </b>
                             </bs>
                         </hist>
@@ -22313,7 +22312,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>9020312</v>
+                                    <v>9021417</v>
                                 </b>
                             </bs>
                         </hist>
@@ -22329,12 +22328,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5789134</v>
+                                    <v>5789844</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>874</b>
-                                    <v>272649</v>
+                                    <v>272682</v>
                                 </b>
                             </bs>
                         </hist>
@@ -22350,7 +22349,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>6061784</v>
+                                    <v>6062526</v>
                                 </b>
                             </bs>
                         </hist>
@@ -22392,59 +22391,59 @@
         </relation>
         <relation>
             <name>is_pod_class</name>
-            <cardinality>534705</cardinality>
+            <cardinality>534710</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>534705</v>
+                    <v>534710</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>is_standard_layout_class</name>
-            <cardinality>1254935</cardinality>
+            <cardinality>1255088</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>1254935</v>
+                    <v>1255088</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>is_complete</name>
-            <cardinality>1646635</cardinality>
+            <cardinality>1646837</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>1646635</v>
+                    <v>1646837</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>is_class_template</name>
-            <cardinality>398236</cardinality>
+            <cardinality>398285</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>398236</v>
+                    <v>398285</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>class_instantiation</name>
-            <cardinality>1089664</cardinality>
+            <cardinality>1089798</cardinality>
             <columnsizes>
                 <e>
                     <k>to</k>
-                    <v>1089664</v>
+                    <v>1089798</v>
                 </e>
                 <e>
                     <k>from</k>
-                    <v>168538</v>
+                    <v>168559</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -22458,7 +22457,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1089664</v>
+                                    <v>1089798</v>
                                 </b>
                             </bs>
                         </hist>
@@ -22474,42 +22473,42 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>59758</v>
+                                    <v>59766</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>29412</v>
+                                    <v>29416</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>15873</v>
+                                    <v>15875</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>13072</v>
+                                    <v>13073</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>6</b>
-                                    <v>9804</v>
+                                    <v>9805</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>10</b>
-                                    <v>12605</v>
+                                    <v>12606</v>
                                 </b>
                                 <b>
                                     <a>10</a>
                                     <b>16</b>
-                                    <v>13072</v>
+                                    <v>13073</v>
                                 </b>
                                 <b>
                                     <a>16</a>
                                     <b>70</b>
-                                    <v>13539</v>
+                                    <v>13540</v>
                                 </b>
                                 <b>
                                     <a>70</a>
@@ -22524,11 +22523,11 @@
         </relation>
         <relation>
             <name>class_template_argument</name>
-            <cardinality>2882763</cardinality>
+            <cardinality>2882732</cardinality>
             <columnsizes>
                 <e>
                     <k>type_id</k>
-                    <v>1315517</v>
+                    <v>1315503</v>
                 </e>
                 <e>
                     <k>index</k>
@@ -22536,7 +22535,7 @@
                 </e>
                 <e>
                     <k>arg_type</k>
-                    <v>840394</v>
+                    <v>840385</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -22550,22 +22549,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>540959</v>
+                                    <v>540953</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>399239</v>
+                                    <v>399235</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>231397</v>
+                                    <v>231395</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>7</b>
-                                    <v>120315</v>
+                                    <v>120314</v>
                                 </b>
                                 <b>
                                     <a>7</a>
@@ -22586,22 +22585,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>567611</v>
+                                    <v>567605</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>410483</v>
+                                    <v>410478</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>244842</v>
+                                    <v>244840</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>113</b>
-                                    <v>92579</v>
+                                    <v>92578</v>
                                 </b>
                             </bs>
                         </hist>
@@ -22709,17 +22708,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>523348</v>
+                                    <v>523343</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>174344</v>
+                                    <v>174342</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>51341</v>
+                                    <v>51340</v>
                                 </b>
                                 <b>
                                     <a>4</a>
@@ -22745,12 +22744,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>746494</v>
+                                    <v>746486</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>77836</v>
+                                    <v>77835</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -22765,11 +22764,11 @@
         </relation>
         <relation>
             <name>class_template_argument_value</name>
-            <cardinality>495344</cardinality>
+            <cardinality>495405</cardinality>
             <columnsizes>
                 <e>
                     <k>type_id</k>
-                    <v>304863</v>
+                    <v>304900</v>
                 </e>
                 <e>
                     <k>index</k>
@@ -22777,7 +22776,7 @@
                 </e>
                 <e>
                     <k>arg_value</k>
-                    <v>495344</v>
+                    <v>495405</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -22791,12 +22790,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>249773</v>
+                                    <v>249803</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>53222</v>
+                                    <v>53229</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -22817,22 +22816,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>189547</v>
+                                    <v>189570</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>81234</v>
+                                    <v>81244</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>12138</v>
+                                    <v>12139</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>9</b>
-                                    <v>21942</v>
+                                    <v>21945</v>
                                 </b>
                             </bs>
                         </hist>
@@ -22910,7 +22909,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>495344</v>
+                                    <v>495405</v>
                                 </b>
                             </bs>
                         </hist>
@@ -22926,7 +22925,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>495344</v>
+                                    <v>495405</v>
                                 </b>
                             </bs>
                         </hist>
@@ -22936,15 +22935,15 @@
         </relation>
         <relation>
             <name>is_proxy_class_for</name>
-            <cardinality>63026</cardinality>
+            <cardinality>63034</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>63026</v>
+                    <v>63034</v>
                 </e>
                 <e>
                     <k>templ_param_id</k>
-                    <v>63026</v>
+                    <v>63034</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -22958,7 +22957,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>63026</v>
+                                    <v>63034</v>
                                 </b>
                             </bs>
                         </hist>
@@ -22974,7 +22973,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>63026</v>
+                                    <v>63034</v>
                                 </b>
                             </bs>
                         </hist>
@@ -22984,19 +22983,19 @@
         </relation>
         <relation>
             <name>type_mentions</name>
-            <cardinality>4029136</cardinality>
+            <cardinality>4029118</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>4029136</v>
+                    <v>4029118</v>
                 </e>
                 <e>
                     <k>type_id</k>
-                    <v>198202</v>
+                    <v>198201</v>
                 </e>
                 <e>
                     <k>location</k>
-                    <v>3995616</v>
+                    <v>3995598</v>
                 </e>
                 <e>
                     <k>kind</k>
@@ -23014,7 +23013,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4029136</v>
+                                    <v>4029118</v>
                                 </b>
                             </bs>
                         </hist>
@@ -23030,7 +23029,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4029136</v>
+                                    <v>4029118</v>
                                 </b>
                             </bs>
                         </hist>
@@ -23046,7 +23045,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4029136</v>
+                                    <v>4029118</v>
                                 </b>
                             </bs>
                         </hist>
@@ -23062,7 +23061,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>97603</v>
+                                    <v>97602</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -23087,7 +23086,7 @@
                                 <b>
                                     <a>7</a>
                                     <b>12</b>
-                                    <v>15861</v>
+                                    <v>15860</v>
                                 </b>
                                 <b>
                                     <a>12</a>
@@ -23113,7 +23112,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>97603</v>
+                                    <v>97602</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -23138,7 +23137,7 @@
                                 <b>
                                     <a>7</a>
                                     <b>12</b>
-                                    <v>15861</v>
+                                    <v>15860</v>
                                 </b>
                                 <b>
                                     <a>12</a>
@@ -23164,7 +23163,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>198202</v>
+                                    <v>198201</v>
                                 </b>
                             </bs>
                         </hist>
@@ -23180,7 +23179,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3962096</v>
+                                    <v>3962078</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -23201,7 +23200,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3962096</v>
+                                    <v>3962078</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -23222,7 +23221,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3995616</v>
+                                    <v>3995598</v>
                                 </b>
                             </bs>
                         </hist>
@@ -23280,26 +23279,26 @@
         </relation>
         <relation>
             <name>is_function_template</name>
-            <cardinality>1402931</cardinality>
+            <cardinality>1403103</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>1402931</v>
+                    <v>1403103</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>function_instantiation</name>
-            <cardinality>894823</cardinality>
+            <cardinality>894819</cardinality>
             <columnsizes>
                 <e>
                     <k>to</k>
-                    <v>894823</v>
+                    <v>894819</v>
                 </e>
                 <e>
                     <k>from</k>
-                    <v>144434</v>
+                    <v>144433</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -23313,7 +23312,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>894823</v>
+                                    <v>894819</v>
                                 </b>
                             </bs>
                         </hist>
@@ -23359,11 +23358,11 @@
         </relation>
         <relation>
             <name>function_template_argument</name>
-            <cardinality>2313492</cardinality>
+            <cardinality>2313481</cardinality>
             <columnsizes>
                 <e>
                     <k>function_id</k>
-                    <v>1321577</v>
+                    <v>1321571</v>
                 </e>
                 <e>
                     <k>index</k>
@@ -23371,7 +23370,7 @@
                 </e>
                 <e>
                     <k>arg_type</k>
-                    <v>301235</v>
+                    <v>301234</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -23385,22 +23384,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>674410</v>
+                                    <v>674407</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>390488</v>
+                                    <v>390486</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>186796</v>
+                                    <v>186795</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>15</b>
-                                    <v>69883</v>
+                                    <v>69882</v>
                                 </b>
                             </bs>
                         </hist>
@@ -23416,22 +23415,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>691828</v>
+                                    <v>691825</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>400277</v>
+                                    <v>400275</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>166869</v>
+                                    <v>166868</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>9</b>
-                                    <v>62602</v>
+                                    <v>62601</v>
                                 </b>
                             </bs>
                         </hist>
@@ -23569,7 +23568,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>184531</v>
+                                    <v>184530</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -23610,7 +23609,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>271728</v>
+                                    <v>271727</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -23630,11 +23629,11 @@
         </relation>
         <relation>
             <name>function_template_argument_value</name>
-            <cardinality>358995</cardinality>
+            <cardinality>358993</cardinality>
             <columnsizes>
                 <e>
                     <k>function_id</k>
-                    <v>192753</v>
+                    <v>192752</v>
                 </e>
                 <e>
                     <k>index</k>
@@ -23642,7 +23641,7 @@
                 </e>
                 <e>
                     <k>arg_value</k>
-                    <v>356382</v>
+                    <v>356381</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -23656,7 +23655,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>183486</v>
+                                    <v>183485</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -23677,7 +23676,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>176136</v>
+                                    <v>176135</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -23815,7 +23814,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>353770</v>
+                                    <v>353768</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -23836,7 +23835,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>356382</v>
+                                    <v>356381</v>
                                 </b>
                             </bs>
                         </hist>
@@ -23857,11 +23856,11 @@
         </relation>
         <relation>
             <name>variable_instantiation</name>
-            <cardinality>204308</cardinality>
+            <cardinality>204307</cardinality>
             <columnsizes>
                 <e>
                     <k>to</k>
-                    <v>204308</v>
+                    <v>204307</v>
                 </e>
                 <e>
                     <k>from</k>
@@ -23879,7 +23878,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>204308</v>
+                                    <v>204307</v>
                                 </b>
                             </bs>
                         </hist>
@@ -23940,11 +23939,11 @@
         </relation>
         <relation>
             <name>variable_template_argument</name>
-            <cardinality>383990</cardinality>
+            <cardinality>383988</cardinality>
             <columnsizes>
                 <e>
                     <k>variable_id</k>
-                    <v>195640</v>
+                    <v>195639</v>
                 </e>
                 <e>
                     <k>index</k>
@@ -23952,7 +23951,7 @@
                 </e>
                 <e>
                     <k>arg_type</k>
-                    <v>187562</v>
+                    <v>187561</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -23981,7 +23980,7 @@
                                 <b>
                                     <a>4</a>
                                     <b>17</b>
-                                    <v>10442</v>
+                                    <v>10441</v>
                                 </b>
                             </bs>
                         </hist>
@@ -24145,7 +24144,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>145597</v>
+                                    <v>145596</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -24176,7 +24175,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>170224</v>
+                                    <v>170223</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -24357,15 +24356,15 @@
         </relation>
         <relation>
             <name>routinetypes</name>
-            <cardinality>538824</cardinality>
+            <cardinality>538891</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>538824</v>
+                    <v>538891</v>
                 </e>
                 <e>
                     <k>return_type</k>
-                    <v>280751</v>
+                    <v>280750</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -24379,7 +24378,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>538824</v>
+                                    <v>538891</v>
                                 </b>
                             </bs>
                         </hist>
@@ -24395,12 +24394,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>244521</v>
+                                    <v>244450</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>20971</v>
+                                    <v>21041</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -24415,19 +24414,19 @@
         </relation>
         <relation>
             <name>routinetypeargs</name>
-            <cardinality>983219</cardinality>
+            <cardinality>983339</cardinality>
             <columnsizes>
                 <e>
                     <k>routine</k>
-                    <v>423447</v>
+                    <v>423499</v>
                 </e>
                 <e>
                     <k>index</k>
-                    <v>7936</v>
+                    <v>7937</v>
                 </e>
                 <e>
                     <k>type_id</k>
-                    <v>226896</v>
+                    <v>226924</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -24441,27 +24440,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>152665</v>
+                                    <v>152683</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>133990</v>
+                                    <v>134006</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>63493</v>
+                                    <v>63501</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>45752</v>
+                                    <v>45758</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>18</b>
-                                    <v>27545</v>
+                                    <v>27548</v>
                                 </b>
                             </bs>
                         </hist>
@@ -24477,27 +24476,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>182544</v>
+                                    <v>182566</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>133523</v>
+                                    <v>133539</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>58825</v>
+                                    <v>58832</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>33614</v>
+                                    <v>33618</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>11</b>
-                                    <v>14939</v>
+                                    <v>14941</v>
                                 </b>
                             </bs>
                         </hist>
@@ -24655,27 +24654,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>146595</v>
+                                    <v>146613</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>30813</v>
+                                    <v>30816</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>5</b>
-                                    <v>16807</v>
+                                    <v>16809</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>12</b>
-                                    <v>18207</v>
+                                    <v>18209</v>
                                 </b>
                                 <b>
                                     <a>12</a>
                                     <b>110</b>
-                                    <v>14472</v>
+                                    <v>14474</v>
                                 </b>
                             </bs>
                         </hist>
@@ -24691,22 +24690,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>172740</v>
+                                    <v>172761</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>30813</v>
+                                    <v>30816</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>6</b>
-                                    <v>18674</v>
+                                    <v>18676</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>14</b>
-                                    <v>4668</v>
+                                    <v>4669</v>
                                 </b>
                             </bs>
                         </hist>
@@ -24716,19 +24715,19 @@
         </relation>
         <relation>
             <name>ptrtomembers</name>
-            <cardinality>37816</cardinality>
+            <cardinality>37820</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>37816</v>
+                    <v>37820</v>
                 </e>
                 <e>
                     <k>type_id</k>
-                    <v>37816</v>
+                    <v>37820</v>
                 </e>
                 <e>
                     <k>class_id</k>
-                    <v>15406</v>
+                    <v>15408</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -24742,7 +24741,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>37816</v>
+                                    <v>37820</v>
                                 </b>
                             </bs>
                         </hist>
@@ -24758,7 +24757,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>37816</v>
+                                    <v>37820</v>
                                 </b>
                             </bs>
                         </hist>
@@ -24774,7 +24773,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>37816</v>
+                                    <v>37820</v>
                                 </b>
                             </bs>
                         </hist>
@@ -24790,7 +24789,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>37816</v>
+                                    <v>37820</v>
                                 </b>
                             </bs>
                         </hist>
@@ -24806,7 +24805,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>13539</v>
+                                    <v>13540</v>
                                 </b>
                                 <b>
                                     <a>8</a>
@@ -24832,7 +24831,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>13539</v>
+                                    <v>13540</v>
                                 </b>
                                 <b>
                                     <a>8</a>
@@ -24852,15 +24851,15 @@
         </relation>
         <relation>
             <name>specifiers</name>
-            <cardinality>24743</cardinality>
+            <cardinality>24746</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>24743</v>
+                    <v>24746</v>
                 </e>
                 <e>
                     <k>str</k>
-                    <v>24743</v>
+                    <v>24746</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -24874,7 +24873,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>24743</v>
+                                    <v>24746</v>
                                 </b>
                             </bs>
                         </hist>
@@ -24890,7 +24889,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>24743</v>
+                                    <v>24746</v>
                                 </b>
                             </bs>
                         </hist>
@@ -24900,15 +24899,15 @@
         </relation>
         <relation>
             <name>typespecifiers</name>
-            <cardinality>1133083</cardinality>
+            <cardinality>1133221</cardinality>
             <columnsizes>
                 <e>
                     <k>type_id</k>
-                    <v>1114875</v>
+                    <v>1115011</v>
                 </e>
                 <e>
                     <k>spec_id</k>
-                    <v>3734</v>
+                    <v>3735</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -24922,12 +24921,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1096667</v>
+                                    <v>1096801</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>18207</v>
+                                    <v>18209</v>
                                 </b>
                             </bs>
                         </hist>
@@ -24988,15 +24987,15 @@
         </relation>
         <relation>
             <name>funspecifiers</name>
-            <cardinality>10304659</cardinality>
+            <cardinality>10305922</cardinality>
             <columnsizes>
                 <e>
                     <k>func_id</k>
-                    <v>4068267</v>
+                    <v>4068766</v>
                 </e>
                 <e>
                     <k>spec_id</k>
-                    <v>8403</v>
+                    <v>8404</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -25010,27 +25009,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1357645</v>
+                                    <v>1357811</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>641006</v>
+                                    <v>641085</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>985086</v>
+                                    <v>985207</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>780132</v>
+                                    <v>780228</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>8</b>
-                                    <v>304396</v>
+                                    <v>304433</v>
                                 </b>
                             </bs>
                         </hist>
@@ -25141,15 +25140,15 @@
         </relation>
         <relation>
             <name>varspecifiers</name>
-            <cardinality>2246090</cardinality>
+            <cardinality>2246366</cardinality>
             <columnsizes>
                 <e>
                     <k>var_id</k>
-                    <v>1225055</v>
+                    <v>1225205</v>
                 </e>
                 <e>
                     <k>spec_id</k>
-                    <v>3734</v>
+                    <v>3735</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -25163,22 +25162,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>730177</v>
+                                    <v>730267</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>202619</v>
+                                    <v>202644</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>58358</v>
+                                    <v>58365</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>233899</v>
+                                    <v>233928</v>
                                 </b>
                             </bs>
                         </hist>
@@ -25287,11 +25286,11 @@
         </relation>
         <relation>
             <name>attributes</name>
-            <cardinality>561639</cardinality>
+            <cardinality>561708</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>561639</v>
+                    <v>561708</v>
                 </e>
                 <e>
                     <k>kind</k>
@@ -25299,7 +25298,7 @@
                 </e>
                 <e>
                     <k>name</k>
-                    <v>11204</v>
+                    <v>11206</v>
                 </e>
                 <e>
                     <k>name_space</k>
@@ -25307,7 +25306,7 @@
                 </e>
                 <e>
                     <k>location</k>
-                    <v>481338</v>
+                    <v>481397</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -25321,7 +25320,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>561639</v>
+                                    <v>561708</v>
                                 </b>
                             </bs>
                         </hist>
@@ -25337,7 +25336,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>561639</v>
+                                    <v>561708</v>
                                 </b>
                             </bs>
                         </hist>
@@ -25353,7 +25352,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>561639</v>
+                                    <v>561708</v>
                                 </b>
                             </bs>
                         </hist>
@@ -25369,7 +25368,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>561639</v>
+                                    <v>561708</v>
                                 </b>
                             </bs>
                         </hist>
@@ -25560,7 +25559,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>10271</v>
+                                    <v>10272</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -25581,7 +25580,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>11204</v>
+                                    <v>11206</v>
                                 </b>
                             </bs>
                         </hist>
@@ -25752,17 +25751,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>431850</v>
+                                    <v>431903</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>20075</v>
+                                    <v>20077</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>7</b>
-                                    <v>29412</v>
+                                    <v>29416</v>
                                 </b>
                             </bs>
                         </hist>
@@ -25778,7 +25777,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>481338</v>
+                                    <v>481397</v>
                                 </b>
                             </bs>
                         </hist>
@@ -25794,17 +25793,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>433251</v>
+                                    <v>433304</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>19608</v>
+                                    <v>19610</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>28478</v>
+                                    <v>28482</v>
                                 </b>
                             </bs>
                         </hist>
@@ -25820,7 +25819,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>481338</v>
+                                    <v>481397</v>
                                 </b>
                             </bs>
                         </hist>
@@ -25830,11 +25829,11 @@
         </relation>
         <relation>
             <name>attribute_args</name>
-            <cardinality>344080</cardinality>
+            <cardinality>344122</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>344080</v>
+                    <v>344122</v>
                 </e>
                 <e>
                     <k>kind</k>
@@ -25842,7 +25841,7 @@
                 </e>
                 <e>
                     <k>attribute</k>
-                    <v>262845</v>
+                    <v>262877</v>
                 </e>
                 <e>
                     <k>index</k>
@@ -25850,7 +25849,7 @@
                 </e>
                 <e>
                     <k>location</k>
-                    <v>327739</v>
+                    <v>327779</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -25864,7 +25863,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>344080</v>
+                                    <v>344122</v>
                                 </b>
                             </bs>
                         </hist>
@@ -25880,7 +25879,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>344080</v>
+                                    <v>344122</v>
                                 </b>
                             </bs>
                         </hist>
@@ -25896,7 +25895,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>344080</v>
+                                    <v>344122</v>
                                 </b>
                             </bs>
                         </hist>
@@ -25912,7 +25911,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>344080</v>
+                                    <v>344122</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26027,17 +26026,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>197484</v>
+                                    <v>197508</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>49487</v>
+                                    <v>49493</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>15873</v>
+                                    <v>15875</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26053,12 +26052,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>252574</v>
+                                    <v>252605</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>10271</v>
+                                    <v>10272</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26074,17 +26073,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>197484</v>
+                                    <v>197508</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>49487</v>
+                                    <v>49493</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>15873</v>
+                                    <v>15875</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26100,17 +26099,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>197484</v>
+                                    <v>197508</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>49487</v>
+                                    <v>49493</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>15873</v>
+                                    <v>15875</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26225,12 +26224,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>313733</v>
+                                    <v>313772</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>7</b>
-                                    <v>14005</v>
+                                    <v>14007</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26246,12 +26245,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>315134</v>
+                                    <v>315172</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>12605</v>
+                                    <v>12606</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26267,12 +26266,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>313733</v>
+                                    <v>313772</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>7</b>
-                                    <v>14005</v>
+                                    <v>14007</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26288,7 +26287,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>327739</v>
+                                    <v>327779</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26298,15 +26297,15 @@
         </relation>
         <relation>
             <name>attribute_arg_value</name>
-            <cardinality>25210</cardinality>
+            <cardinality>25213</cardinality>
             <columnsizes>
                 <e>
                     <k>arg</k>
-                    <v>25210</v>
+                    <v>25213</v>
                 </e>
                 <e>
                     <k>value</k>
-                    <v>15873</v>
+                    <v>15875</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -26320,7 +26319,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>25210</v>
+                                    <v>25213</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26336,7 +26335,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>14472</v>
+                                    <v>14474</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -26399,15 +26398,15 @@
         </relation>
         <relation>
             <name>attribute_arg_constant</name>
-            <cardinality>318402</cardinality>
+            <cardinality>318441</cardinality>
             <columnsizes>
                 <e>
                     <k>arg</k>
-                    <v>318402</v>
+                    <v>318441</v>
                 </e>
                 <e>
                     <k>constant</k>
-                    <v>318402</v>
+                    <v>318441</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -26421,7 +26420,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>318402</v>
+                                    <v>318441</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26437,7 +26436,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>318402</v>
+                                    <v>318441</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26548,15 +26547,15 @@
         </relation>
         <relation>
             <name>typeattributes</name>
-            <cardinality>60997</cardinality>
+            <cardinality>61863</cardinality>
             <columnsizes>
                 <e>
                     <k>type_id</k>
-                    <v>37617</v>
+                    <v>61469</v>
                 </e>
                 <e>
                     <k>spec_id</k>
-                    <v>60572</v>
+                    <v>19701</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -26570,17 +26569,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>14636</v>
+                                    <v>61075</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>22580</v>
-                                </b>
-                                <b>
-                                    <a>3</a>
-                                    <b>4</b>
-                                    <v>400</v>
+                                    <v>394</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26596,12 +26590,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>60477</v>
+                                    <v>16254</v>
                                 </b>
                                 <b>
                                     <a>2</a>
-                                    <b>26</b>
-                                    <v>95</v>
+                                    <b>5</b>
+                                    <v>1576</v>
+                                </b>
+                                <b>
+                                    <a>5</a>
+                                    <b>23</b>
+                                    <v>1379</v>
+                                </b>
+                                <b>
+                                    <a>57</a>
+                                    <b>58</b>
+                                    <v>492</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26611,15 +26615,15 @@
         </relation>
         <relation>
             <name>funcattributes</name>
-            <cardinality>630268</cardinality>
+            <cardinality>630345</cardinality>
             <columnsizes>
                 <e>
                     <k>func_id</k>
-                    <v>443522</v>
+                    <v>443576</v>
                 </e>
                 <e>
                     <k>spec_id</k>
-                    <v>524757</v>
+                    <v>524821</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -26633,17 +26637,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>338477</v>
+                                    <v>338519</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>64427</v>
+                                    <v>64435</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>6</b>
-                                    <v>39683</v>
+                                    <v>39688</v>
                                 </b>
                                 <b>
                                     <a>6</a>
@@ -26664,12 +26668,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>506082</v>
+                                    <v>506144</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>17</b>
-                                    <v>18674</v>
+                                    <v>18676</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26805,15 +26809,15 @@
         </relation>
         <relation>
             <name>unspecifiedtype</name>
-            <cardinality>9489045</cardinality>
+            <cardinality>9490208</cardinality>
             <columnsizes>
                 <e>
                     <k>type_id</k>
-                    <v>9489045</v>
+                    <v>9490208</v>
                 </e>
                 <e>
                     <k>unspecified_type_id</k>
-                    <v>6491300</v>
+                    <v>6492096</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -26827,7 +26831,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>9489045</v>
+                                    <v>9490208</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26843,17 +26847,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4559877</v>
+                                    <v>4560436</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>1715731</v>
+                                    <v>1715941</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>145</b>
-                                    <v>215691</v>
+                                    <v>215718</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26863,19 +26867,19 @@
         </relation>
         <relation>
             <name>member</name>
-            <cardinality>3881054</cardinality>
+            <cardinality>3881530</cardinality>
             <columnsizes>
                 <e>
                     <k>parent</k>
-                    <v>545766</v>
+                    <v>545832</v>
                 </e>
                 <e>
                     <k>index</k>
-                    <v>92906</v>
+                    <v>92917</v>
                 </e>
                 <e>
                     <k>child</k>
-                    <v>3809624</v>
+                    <v>3810090</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -26889,47 +26893,47 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>129788</v>
+                                    <v>129804</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>64894</v>
+                                    <v>64902</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>73297</v>
+                                    <v>73306</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>75165</v>
+                                    <v>75174</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>6</b>
-                                    <v>40617</v>
+                                    <v>40622</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>8</b>
-                                    <v>46686</v>
+                                    <v>46692</v>
                                 </b>
                                 <b>
                                     <a>8</a>
                                     <b>14</b>
-                                    <v>45752</v>
+                                    <v>45758</v>
                                 </b>
                                 <b>
                                     <a>14</a>
                                     <b>30</b>
-                                    <v>41551</v>
+                                    <v>41556</v>
                                 </b>
                                 <b>
                                     <a>30</a>
                                     <b>200</b>
-                                    <v>28011</v>
+                                    <v>28015</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26945,52 +26949,52 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>129788</v>
+                                    <v>129804</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>64894</v>
+                                    <v>64902</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>73297</v>
+                                    <v>73306</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>76099</v>
+                                    <v>76108</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>6</b>
-                                    <v>39683</v>
+                                    <v>39688</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>7</b>
-                                    <v>24277</v>
+                                    <v>24279</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>9</b>
-                                    <v>42017</v>
+                                    <v>42023</v>
                                 </b>
                                 <b>
                                     <a>9</a>
                                     <b>17</b>
-                                    <v>43885</v>
+                                    <v>43890</v>
                                 </b>
                                 <b>
                                     <a>17</a>
                                     <b>41</b>
-                                    <v>41551</v>
+                                    <v>41556</v>
                                 </b>
                                 <b>
                                     <a>41</a>
                                     <b>200</b>
-                                    <v>10271</v>
+                                    <v>10272</v>
                                 </b>
                             </bs>
                         </hist>
@@ -27006,57 +27010,57 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>26144</v>
+                                    <v>26147</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>7002</v>
+                                    <v>7003</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>3734</v>
+                                    <v>3735</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>7936</v>
+                                    <v>7937</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>6</b>
-                                    <v>5602</v>
+                                    <v>5603</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>7</b>
-                                    <v>5602</v>
+                                    <v>5603</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>9</b>
-                                    <v>7469</v>
+                                    <v>7470</v>
                                 </b>
                                 <b>
                                     <a>9</a>
                                     <b>16</b>
-                                    <v>7002</v>
+                                    <v>7003</v>
                                 </b>
                                 <b>
                                     <a>16</a>
                                     <b>52</b>
-                                    <v>7002</v>
+                                    <v>7003</v>
                                 </b>
                                 <b>
                                     <a>52</a>
                                     <b>107</b>
-                                    <v>7002</v>
+                                    <v>7003</v>
                                 </b>
                                 <b>
                                     <a>108</a>
                                     <b>577</b>
-                                    <v>7002</v>
+                                    <v>7003</v>
                                 </b>
                                 <b>
                                     <a>737</a>
@@ -27077,57 +27081,57 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>26144</v>
+                                    <v>26147</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>7002</v>
+                                    <v>7003</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>3734</v>
+                                    <v>3735</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>7936</v>
+                                    <v>7937</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>6</b>
-                                    <v>5602</v>
+                                    <v>5603</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>7</b>
-                                    <v>5602</v>
+                                    <v>5603</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>9</b>
-                                    <v>7469</v>
+                                    <v>7470</v>
                                 </b>
                                 <b>
                                     <a>9</a>
                                     <b>16</b>
-                                    <v>7002</v>
+                                    <v>7003</v>
                                 </b>
                                 <b>
                                     <a>16</a>
                                     <b>52</b>
-                                    <v>7002</v>
+                                    <v>7003</v>
                                 </b>
                                 <b>
                                     <a>52</a>
                                     <b>107</b>
-                                    <v>7002</v>
+                                    <v>7003</v>
                                 </b>
                                 <b>
                                     <a>108</a>
                                     <b>577</b>
-                                    <v>7002</v>
+                                    <v>7003</v>
                                 </b>
                                 <b>
                                     <a>738</a>
@@ -27148,7 +27152,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3809624</v>
+                                    <v>3810090</v>
                                 </b>
                             </bs>
                         </hist>
@@ -27164,12 +27168,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3738193</v>
+                                    <v>3738651</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>71430</v>
+                                    <v>71439</v>
                                 </b>
                             </bs>
                         </hist>
@@ -27179,15 +27183,15 @@
         </relation>
         <relation>
             <name>enclosingfunction</name>
-            <cardinality>118329</cardinality>
+            <cardinality>118327</cardinality>
             <columnsizes>
                 <e>
                     <k>child</k>
-                    <v>118329</v>
+                    <v>118327</v>
                 </e>
                 <e>
                     <k>parent</k>
-                    <v>67665</v>
+                    <v>67664</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -27201,7 +27205,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>118329</v>
+                                    <v>118327</v>
                                 </b>
                             </bs>
                         </hist>
@@ -27232,7 +27236,7 @@
                                 <b>
                                     <a>4</a>
                                     <b>45</b>
-                                    <v>4888</v>
+                                    <v>4887</v>
                                 </b>
                             </bs>
                         </hist>
@@ -27242,15 +27246,15 @@
         </relation>
         <relation>
             <name>derivations</name>
-            <cardinality>391568</cardinality>
+            <cardinality>391566</cardinality>
             <columnsizes>
                 <e>
                     <k>derivation</k>
-                    <v>391568</v>
+                    <v>391566</v>
                 </e>
                 <e>
                     <k>sub</k>
-                    <v>371293</v>
+                    <v>371291</v>
                 </e>
                 <e>
                     <k>index</k>
@@ -27258,7 +27262,7 @@
                 </e>
                 <e>
                     <k>super</k>
-                    <v>202751</v>
+                    <v>202750</v>
                 </e>
                 <e>
                     <k>location</k>
@@ -27276,7 +27280,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>391568</v>
+                                    <v>391566</v>
                                 </b>
                             </bs>
                         </hist>
@@ -27292,7 +27296,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>391568</v>
+                                    <v>391566</v>
                                 </b>
                             </bs>
                         </hist>
@@ -27308,7 +27312,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>391568</v>
+                                    <v>391566</v>
                                 </b>
                             </bs>
                         </hist>
@@ -27324,7 +27328,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>391568</v>
+                                    <v>391566</v>
                                 </b>
                             </bs>
                         </hist>
@@ -27340,7 +27344,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>356313</v>
+                                    <v>356311</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -27361,7 +27365,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>356313</v>
+                                    <v>356311</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -27382,7 +27386,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>356313</v>
+                                    <v>356311</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -27403,7 +27407,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>356313</v>
+                                    <v>356311</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -27553,7 +27557,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>195366</v>
+                                    <v>195365</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -27574,7 +27578,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>195366</v>
+                                    <v>195365</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -27595,7 +27599,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>202298</v>
+                                    <v>202297</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -27616,7 +27620,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>199093</v>
+                                    <v>199092</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -27642,7 +27646,7 @@
                                 <b>
                                     <a>2</a>
                                     <b>5</b>
-                                    <v>3205</v>
+                                    <v>3204</v>
                                 </b>
                                 <b>
                                     <a>5</a>
@@ -27678,7 +27682,7 @@
                                 <b>
                                     <a>2</a>
                                     <b>5</b>
-                                    <v>3205</v>
+                                    <v>3204</v>
                                 </b>
                                 <b>
                                     <a>5</a>
@@ -27750,11 +27754,11 @@
         </relation>
         <relation>
             <name>derspecifiers</name>
-            <cardinality>393449</cardinality>
+            <cardinality>393447</cardinality>
             <columnsizes>
                 <e>
                     <k>der_id</k>
-                    <v>391184</v>
+                    <v>391183</v>
                 </e>
                 <e>
                     <k>spec_id</k>
@@ -27772,7 +27776,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>388920</v>
+                                    <v>388918</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -27818,11 +27822,11 @@
         </relation>
         <relation>
             <name>direct_base_offsets</name>
-            <cardinality>362618</cardinality>
+            <cardinality>362617</cardinality>
             <columnsizes>
                 <e>
                     <k>der_id</k>
-                    <v>362618</v>
+                    <v>362617</v>
                 </e>
                 <e>
                     <k>offset</k>
@@ -27840,7 +27844,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>362618</v>
+                                    <v>362617</v>
                                 </b>
                             </bs>
                         </hist>
@@ -28182,11 +28186,11 @@
         </relation>
         <relation>
             <name>frienddecls</name>
-            <cardinality>707052</cardinality>
+            <cardinality>707049</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>707052</v>
+                    <v>707049</v>
                 </e>
                 <e>
                     <k>type_id</k>
@@ -28212,7 +28216,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>707052</v>
+                                    <v>707049</v>
                                 </b>
                             </bs>
                         </hist>
@@ -28228,7 +28232,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>707052</v>
+                                    <v>707049</v>
                                 </b>
                             </bs>
                         </hist>
@@ -28244,7 +28248,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>707052</v>
+                                    <v>707049</v>
                                 </b>
                             </bs>
                         </hist>
@@ -28295,7 +28299,7 @@
                                 <b>
                                     <a>37</a>
                                     <b>55</b>
-                                    <v>3205</v>
+                                    <v>3204</v>
                                 </b>
                                 <b>
                                     <a>55</a>
@@ -28351,7 +28355,7 @@
                                 <b>
                                     <a>37</a>
                                     <b>55</b>
-                                    <v>3205</v>
+                                    <v>3204</v>
                                 </b>
                                 <b>
                                     <a>55</a>
@@ -28563,19 +28567,19 @@
         </relation>
         <relation>
             <name>comments</name>
-            <cardinality>8266137</cardinality>
+            <cardinality>8266100</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>8266137</v>
+                    <v>8266100</v>
                 </e>
                 <e>
                     <k>contents</k>
-                    <v>3147578</v>
+                    <v>3147564</v>
                 </e>
                 <e>
                     <k>location</k>
-                    <v>8266137</v>
+                    <v>8266100</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -28589,7 +28593,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>8266137</v>
+                                    <v>8266100</v>
                                 </b>
                             </bs>
                         </hist>
@@ -28605,7 +28609,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>8266137</v>
+                                    <v>8266100</v>
                                 </b>
                             </bs>
                         </hist>
@@ -28621,12 +28625,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2879337</v>
+                                    <v>2879324</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>7</b>
-                                    <v>236620</v>
+                                    <v>236618</v>
                                 </b>
                                 <b>
                                     <a>7</a>
@@ -28647,12 +28651,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2879337</v>
+                                    <v>2879324</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>7</b>
-                                    <v>236620</v>
+                                    <v>236618</v>
                                 </b>
                                 <b>
                                     <a>7</a>
@@ -28673,7 +28677,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>8266137</v>
+                                    <v>8266100</v>
                                 </b>
                             </bs>
                         </hist>
@@ -28689,7 +28693,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>8266137</v>
+                                    <v>8266100</v>
                                 </b>
                             </bs>
                         </hist>
@@ -28699,15 +28703,15 @@
         </relation>
         <relation>
             <name>commentbinding</name>
-            <cardinality>3091117</cardinality>
+            <cardinality>3091496</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>2445442</v>
+                    <v>2445742</v>
                 </e>
                 <e>
                     <k>element</k>
-                    <v>3014551</v>
+                    <v>3014921</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -28721,12 +28725,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2368409</v>
+                                    <v>2368699</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>97</b>
-                                    <v>77032</v>
+                                    <v>77042</v>
                                 </b>
                             </bs>
                         </hist>
@@ -28742,12 +28746,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2937985</v>
+                                    <v>2938345</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>76565</v>
+                                    <v>76575</v>
                                 </b>
                             </bs>
                         </hist>
@@ -28757,15 +28761,15 @@
         </relation>
         <relation>
             <name>exprconv</name>
-            <cardinality>7033022</cardinality>
+            <cardinality>7032992</cardinality>
             <columnsizes>
                 <e>
                     <k>converted</k>
-                    <v>7033022</v>
+                    <v>7032992</v>
                 </e>
                 <e>
                     <k>conversion</k>
-                    <v>7033022</v>
+                    <v>7032992</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -28779,7 +28783,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7033022</v>
+                                    <v>7032992</v>
                                 </b>
                             </bs>
                         </hist>
@@ -28795,7 +28799,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7033022</v>
+                                    <v>7032992</v>
                                 </b>
                             </bs>
                         </hist>
@@ -28805,22 +28809,22 @@
         </relation>
         <relation>
             <name>compgenerated</name>
-            <cardinality>7908075</cardinality>
+            <cardinality>7908039</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>7908075</v>
+                    <v>7908039</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>synthetic_destructor_call</name>
-            <cardinality>512503</cardinality>
+            <cardinality>512501</cardinality>
             <columnsizes>
                 <e>
                     <k>element</k>
-                    <v>325805</v>
+                    <v>325803</v>
                 </e>
                 <e>
                     <k>i</k>
@@ -28828,7 +28832,7 @@
                 </e>
                 <e>
                     <k>destructor_call</k>
-                    <v>512503</v>
+                    <v>512501</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -28842,7 +28846,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>227848</v>
+                                    <v>227847</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -28857,7 +28861,7 @@
                                 <b>
                                     <a>4</a>
                                     <b>8</b>
-                                    <v>24622</v>
+                                    <v>24621</v>
                                 </b>
                                 <b>
                                     <a>8</a>
@@ -28878,7 +28882,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>227848</v>
+                                    <v>227847</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -28893,7 +28897,7 @@
                                 <b>
                                     <a>4</a>
                                     <b>8</b>
-                                    <v>24622</v>
+                                    <v>24621</v>
                                 </b>
                                 <b>
                                     <a>8</a>
@@ -29126,7 +29130,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>512503</v>
+                                    <v>512501</v>
                                 </b>
                             </bs>
                         </hist>
@@ -29142,7 +29146,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>512503</v>
+                                    <v>512501</v>
                                 </b>
                             </bs>
                         </hist>
@@ -29152,15 +29156,15 @@
         </relation>
         <relation>
             <name>namespaces</name>
-            <cardinality>12138</cardinality>
+            <cardinality>12139</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>12138</v>
+                    <v>12139</v>
                 </e>
                 <e>
                     <k>name</k>
-                    <v>9804</v>
+                    <v>9805</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -29174,7 +29178,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>12138</v>
+                                    <v>12139</v>
                                 </b>
                             </bs>
                         </hist>
@@ -29190,7 +29194,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>8403</v>
+                                    <v>8404</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -29221,15 +29225,15 @@
         </relation>
         <relation>
             <name>namespacembrs</name>
-            <cardinality>2388018</cardinality>
+            <cardinality>2388310</cardinality>
             <columnsizes>
                 <e>
                     <k>parentid</k>
-                    <v>10271</v>
+                    <v>10272</v>
                 </e>
                 <e>
                     <k>memberid</k>
-                    <v>2388018</v>
+                    <v>2388310</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -29304,7 +29308,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2388018</v>
+                                    <v>2388310</v>
                                 </b>
                             </bs>
                         </hist>
@@ -29314,11 +29318,11 @@
         </relation>
         <relation>
             <name>exprparents</name>
-            <cardinality>14206517</cardinality>
+            <cardinality>14206453</cardinality>
             <columnsizes>
                 <e>
                     <k>expr_id</k>
-                    <v>14206517</v>
+                    <v>14206453</v>
                 </e>
                 <e>
                     <k>child_index</k>
@@ -29326,7 +29330,7 @@
                 </e>
                 <e>
                     <k>parent_id</k>
-                    <v>9453690</v>
+                    <v>9453648</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -29340,7 +29344,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>14206517</v>
+                                    <v>14206453</v>
                                 </b>
                             </bs>
                         </hist>
@@ -29356,7 +29360,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>14206517</v>
+                                    <v>14206453</v>
                                 </b>
                             </bs>
                         </hist>
@@ -29474,17 +29478,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5409361</v>
+                                    <v>5409337</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>3706591</v>
+                                    <v>3706574</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>712</b>
-                                    <v>337737</v>
+                                    <v>337736</v>
                                 </b>
                             </bs>
                         </hist>
@@ -29500,17 +29504,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5409361</v>
+                                    <v>5409337</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>3706591</v>
+                                    <v>3706574</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>712</b>
-                                    <v>337737</v>
+                                    <v>337736</v>
                                 </b>
                             </bs>
                         </hist>
@@ -29520,11 +29524,11 @@
         </relation>
         <relation>
             <name>expr_isload</name>
-            <cardinality>5096886</cardinality>
+            <cardinality>5096863</cardinality>
             <columnsizes>
                 <e>
                     <k>expr_id</k>
-                    <v>5096886</v>
+                    <v>5096863</v>
                 </e>
             </columnsizes>
             <dependencies/>
@@ -29604,11 +29608,11 @@
         </relation>
         <relation>
             <name>iscall</name>
-            <cardinality>3218003</cardinality>
+            <cardinality>3217989</cardinality>
             <columnsizes>
                 <e>
                     <k>caller</k>
-                    <v>3218003</v>
+                    <v>3217989</v>
                 </e>
                 <e>
                     <k>kind</k>
@@ -29626,7 +29630,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3218003</v>
+                                    <v>3217989</v>
                                 </b>
                             </bs>
                         </hist>
@@ -29662,11 +29666,11 @@
         </relation>
         <relation>
             <name>numtemplatearguments</name>
-            <cardinality>393832</cardinality>
+            <cardinality>393830</cardinality>
             <columnsizes>
                 <e>
                     <k>expr_id</k>
-                    <v>393832</v>
+                    <v>393830</v>
                 </e>
                 <e>
                     <k>num</k>
@@ -29684,7 +29688,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>393832</v>
+                                    <v>393830</v>
                                 </b>
                             </bs>
                         </hist>
@@ -29788,23 +29792,23 @@
         </relation>
         <relation>
             <name>namequalifiers</name>
-            <cardinality>1513800</cardinality>
+            <cardinality>1513793</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>1513800</v>
+                    <v>1513793</v>
                 </e>
                 <e>
                     <k>qualifiableelement</k>
-                    <v>1513800</v>
+                    <v>1513793</v>
                 </e>
                 <e>
                     <k>qualifyingelement</k>
-                    <v>97519</v>
+                    <v>97518</v>
                 </e>
                 <e>
                     <k>location</k>
-                    <v>304298</v>
+                    <v>304297</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -29818,7 +29822,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1513800</v>
+                                    <v>1513793</v>
                                 </b>
                             </bs>
                         </hist>
@@ -29834,7 +29838,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1513800</v>
+                                    <v>1513793</v>
                                 </b>
                             </bs>
                         </hist>
@@ -29850,7 +29854,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1513800</v>
+                                    <v>1513793</v>
                                 </b>
                             </bs>
                         </hist>
@@ -29866,7 +29870,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1513800</v>
+                                    <v>1513793</v>
                                 </b>
                             </bs>
                         </hist>
@@ -29882,7 +29886,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1513800</v>
+                                    <v>1513793</v>
                                 </b>
                             </bs>
                         </hist>
@@ -29898,7 +29902,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1513800</v>
+                                    <v>1513793</v>
                                 </b>
                             </bs>
                         </hist>
@@ -30017,7 +30021,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>100559</v>
+                                    <v>100558</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -30058,7 +30062,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>100559</v>
+                                    <v>100558</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -30099,7 +30103,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>137074</v>
+                                    <v>137073</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -30124,15 +30128,15 @@
         </relation>
         <relation>
             <name>varbind</name>
-            <cardinality>6029127</cardinality>
+            <cardinality>6029100</cardinality>
             <columnsizes>
                 <e>
                     <k>expr</k>
-                    <v>6029127</v>
+                    <v>6029100</v>
                 </e>
                 <e>
                     <k>var</k>
-                    <v>768530</v>
+                    <v>768527</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -30146,7 +30150,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>6029127</v>
+                                    <v>6029100</v>
                                 </b>
                             </bs>
                         </hist>
@@ -30167,12 +30171,12 @@
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>137874</v>
+                                    <v>137873</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>106293</v>
+                                    <v>106292</v>
                                 </b>
                                 <b>
                                     <a>4</a>
@@ -30202,7 +30206,7 @@
                                 <b>
                                     <a>13</a>
                                     <b>28</b>
-                                    <v>58880</v>
+                                    <v>58879</v>
                                 </b>
                                 <b>
                                     <a>28</a>
@@ -30217,15 +30221,15 @@
         </relation>
         <relation>
             <name>funbind</name>
-            <cardinality>3224501</cardinality>
+            <cardinality>3224486</cardinality>
             <columnsizes>
                 <e>
                     <k>expr</k>
-                    <v>3218288</v>
+                    <v>3218274</v>
                 </e>
                 <e>
                     <k>fun</k>
-                    <v>511344</v>
+                    <v>511323</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -30239,7 +30243,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3212076</v>
+                                    <v>3212061</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -30260,12 +30264,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>315090</v>
+                                    <v>315050</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>77893</v>
+                                    <v>77912</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -30421,11 +30425,11 @@
         </relation>
         <relation>
             <name>expr_deallocator</name>
-            <cardinality>54694</cardinality>
+            <cardinality>54693</cardinality>
             <columnsizes>
                 <e>
                     <k>expr</k>
-                    <v>54694</v>
+                    <v>54693</v>
                 </e>
                 <e>
                     <k>func</k>
@@ -30447,7 +30451,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>54694</v>
+                                    <v>54693</v>
                                 </b>
                             </bs>
                         </hist>
@@ -30463,7 +30467,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>54694</v>
+                                    <v>54693</v>
                                 </b>
                             </bs>
                         </hist>
@@ -30568,15 +30572,15 @@
         </relation>
         <relation>
             <name>expr_cond_guard</name>
-            <cardinality>657237</cardinality>
+            <cardinality>657235</cardinality>
             <columnsizes>
                 <e>
                     <k>cond</k>
-                    <v>657237</v>
+                    <v>657235</v>
                 </e>
                 <e>
                     <k>guard</k>
-                    <v>657237</v>
+                    <v>657235</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -30590,7 +30594,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>657237</v>
+                                    <v>657235</v>
                                 </b>
                             </bs>
                         </hist>
@@ -30606,7 +30610,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>657237</v>
+                                    <v>657235</v>
                                 </b>
                             </bs>
                         </hist>
@@ -30616,15 +30620,15 @@
         </relation>
         <relation>
             <name>expr_cond_true</name>
-            <cardinality>657235</cardinality>
+            <cardinality>657232</cardinality>
             <columnsizes>
                 <e>
                     <k>cond</k>
-                    <v>657235</v>
+                    <v>657232</v>
                 </e>
                 <e>
                     <k>true</k>
-                    <v>657235</v>
+                    <v>657232</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -30638,7 +30642,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>657235</v>
+                                    <v>657232</v>
                                 </b>
                             </bs>
                         </hist>
@@ -30654,7 +30658,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>657235</v>
+                                    <v>657232</v>
                                 </b>
                             </bs>
                         </hist>
@@ -30664,15 +30668,15 @@
         </relation>
         <relation>
             <name>expr_cond_false</name>
-            <cardinality>657237</cardinality>
+            <cardinality>657235</cardinality>
             <columnsizes>
                 <e>
                     <k>cond</k>
-                    <v>657237</v>
+                    <v>657235</v>
                 </e>
                 <e>
                     <k>false</k>
-                    <v>657237</v>
+                    <v>657235</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -30686,7 +30690,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>657237</v>
+                                    <v>657235</v>
                                 </b>
                             </bs>
                         </hist>
@@ -30702,7 +30706,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>657237</v>
+                                    <v>657235</v>
                                 </b>
                             </bs>
                         </hist>
@@ -30712,11 +30716,11 @@
         </relation>
         <relation>
             <name>values</name>
-            <cardinality>10776699</cardinality>
+            <cardinality>10776651</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>10776699</v>
+                    <v>10776651</v>
                 </e>
                 <e>
                     <k>str</k>
@@ -30734,7 +30738,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>10776699</v>
+                                    <v>10776651</v>
                                 </b>
                             </bs>
                         </hist>
@@ -30750,7 +30754,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>59545</v>
+                                    <v>59544</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -30780,11 +30784,11 @@
         </relation>
         <relation>
             <name>valuetext</name>
-            <cardinality>4757348</cardinality>
+            <cardinality>4757344</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>4757348</v>
+                    <v>4757344</v>
                 </e>
                 <e>
                     <k>text</k>
@@ -30802,7 +30806,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4757348</v>
+                                    <v>4757344</v>
                                 </b>
                             </bs>
                         </hist>
@@ -30843,15 +30847,15 @@
         </relation>
         <relation>
             <name>valuebind</name>
-            <cardinality>11210920</cardinality>
+            <cardinality>11210870</cardinality>
             <columnsizes>
                 <e>
                     <k>val</k>
-                    <v>10776699</v>
+                    <v>10776651</v>
                 </e>
                 <e>
                     <k>expr</k>
-                    <v>11210920</v>
+                    <v>11210870</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -30865,12 +30869,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>10365022</v>
+                                    <v>10364976</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>7</b>
-                                    <v>411677</v>
+                                    <v>411675</v>
                                 </b>
                             </bs>
                         </hist>
@@ -30886,7 +30890,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>11210920</v>
+                                    <v>11210870</v>
                                 </b>
                             </bs>
                         </hist>
@@ -30896,11 +30900,11 @@
         </relation>
         <relation>
             <name>fieldoffsets</name>
-            <cardinality>1054697</cardinality>
+            <cardinality>1054692</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>1054697</v>
+                    <v>1054692</v>
                 </e>
                 <e>
                     <k>byteoffset</k>
@@ -30922,7 +30926,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1054697</v>
+                                    <v>1054692</v>
                                 </b>
                             </bs>
                         </hist>
@@ -30938,7 +30942,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1054697</v>
+                                    <v>1054692</v>
                                 </b>
                             </bs>
                         </hist>
@@ -31283,23 +31287,23 @@
         </relation>
         <relation>
             <name>initialisers</name>
-            <cardinality>1710781</cardinality>
+            <cardinality>1710773</cardinality>
             <columnsizes>
                 <e>
                     <k>init</k>
-                    <v>1710781</v>
+                    <v>1710773</v>
                 </e>
                 <e>
                     <k>var</k>
-                    <v>719764</v>
+                    <v>719761</v>
                 </e>
                 <e>
                     <k>expr</k>
-                    <v>1710781</v>
+                    <v>1710773</v>
                 </e>
                 <e>
                     <k>location</k>
-                    <v>394651</v>
+                    <v>394649</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -31313,7 +31317,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1710781</v>
+                                    <v>1710773</v>
                                 </b>
                             </bs>
                         </hist>
@@ -31329,7 +31333,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1710781</v>
+                                    <v>1710773</v>
                                 </b>
                             </bs>
                         </hist>
@@ -31345,7 +31349,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1710781</v>
+                                    <v>1710773</v>
                                 </b>
                             </bs>
                         </hist>
@@ -31361,7 +31365,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>633988</v>
+                                    <v>633986</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -31387,7 +31391,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>633988</v>
+                                    <v>633986</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -31413,7 +31417,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>719758</v>
+                                    <v>719754</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -31434,7 +31438,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1710781</v>
+                                    <v>1710773</v>
                                 </b>
                             </bs>
                         </hist>
@@ -31450,7 +31454,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1710781</v>
+                                    <v>1710773</v>
                                 </b>
                             </bs>
                         </hist>
@@ -31466,7 +31470,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1710781</v>
+                                    <v>1710773</v>
                                 </b>
                             </bs>
                         </hist>
@@ -31482,7 +31486,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>321715</v>
+                                    <v>321714</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -31513,7 +31517,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>344607</v>
+                                    <v>344605</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -31539,7 +31543,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>321715</v>
+                                    <v>321714</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -31575,15 +31579,15 @@
         </relation>
         <relation>
             <name>expr_ancestor</name>
-            <cardinality>516626</cardinality>
+            <cardinality>516623</cardinality>
             <columnsizes>
                 <e>
                     <k>exp</k>
-                    <v>516626</v>
+                    <v>516623</v>
                 </e>
                 <e>
                     <k>ancestor</k>
-                    <v>308516</v>
+                    <v>308515</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -31597,7 +31601,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>516626</v>
+                                    <v>516623</v>
                                 </b>
                             </bs>
                         </hist>
@@ -31613,7 +31617,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>203568</v>
+                                    <v>203567</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -31628,7 +31632,7 @@
                                 <b>
                                     <a>4</a>
                                     <b>7</b>
-                                    <v>25154</v>
+                                    <v>25153</v>
                                 </b>
                                 <b>
                                     <a>7</a>
@@ -31643,11 +31647,11 @@
         </relation>
         <relation>
             <name>exprs</name>
-            <cardinality>18387506</cardinality>
+            <cardinality>18387424</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>18387506</v>
+                    <v>18387424</v>
                 </e>
                 <e>
                     <k>kind</k>
@@ -31655,7 +31659,7 @@
                 </e>
                 <e>
                     <k>location</k>
-                    <v>8488094</v>
+                    <v>8488154</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -31669,7 +31673,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>18387506</v>
+                                    <v>18387424</v>
                                 </b>
                             </bs>
                         </hist>
@@ -31685,7 +31689,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>18387506</v>
+                                    <v>18387424</v>
                                 </b>
                             </bs>
                         </hist>
@@ -31863,22 +31867,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7145154</v>
+                                    <v>7145204</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>663031</v>
+                                    <v>663036</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>18</b>
-                                    <v>638103</v>
+                                    <v>638107</v>
                                 </b>
                                 <b>
                                     <a>18</a>
                                     <b>71656</b>
-                                    <v>41805</v>
+                                    <v>41806</v>
                                 </b>
                             </bs>
                         </hist>
@@ -31894,17 +31898,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7251222</v>
+                                    <v>7251273</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>618242</v>
+                                    <v>618246</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>32</b>
-                                    <v>618630</v>
+                                    <v>618634</v>
                                 </b>
                             </bs>
                         </hist>
@@ -31914,15 +31918,15 @@
         </relation>
         <relation>
             <name>expr_reuse</name>
-            <cardinality>373719</cardinality>
+            <cardinality>373717</cardinality>
             <columnsizes>
                 <e>
                     <k>reuse</k>
-                    <v>373719</v>
+                    <v>373717</v>
                 </e>
                 <e>
                     <k>original</k>
-                    <v>373700</v>
+                    <v>373698</v>
                 </e>
                 <e>
                     <k>value_category</k>
@@ -31940,7 +31944,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>373719</v>
+                                    <v>373717</v>
                                 </b>
                             </bs>
                         </hist>
@@ -31956,7 +31960,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>373719</v>
+                                    <v>373717</v>
                                 </b>
                             </bs>
                         </hist>
@@ -31972,7 +31976,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>373681</v>
+                                    <v>373679</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -31993,7 +31997,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>373700</v>
+                                    <v>373698</v>
                                 </b>
                             </bs>
                         </hist>
@@ -32045,15 +32049,15 @@
         </relation>
         <relation>
             <name>expr_types</name>
-            <cardinality>18451524</cardinality>
+            <cardinality>18451442</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>18319863</v>
+                    <v>18319782</v>
                 </e>
                 <e>
                     <k>typeid</k>
-                    <v>1214606</v>
+                    <v>1214616</v>
                 </e>
                 <e>
                     <k>value_category</k>
@@ -32071,12 +32075,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>18188202</v>
+                                    <v>18188122</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>131661</v>
+                                    <v>131659</v>
                                 </b>
                             </bs>
                         </hist>
@@ -32092,7 +32096,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>18319863</v>
+                                    <v>18319782</v>
                                 </b>
                             </bs>
                         </hist>
@@ -32108,42 +32112,42 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>438558</v>
+                                    <v>438565</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>249335</v>
+                                    <v>249332</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>102807</v>
+                                    <v>102839</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>81888</v>
+                                    <v>81865</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>8</b>
-                                    <v>109275</v>
+                                    <v>109274</v>
                                 </b>
                                 <b>
                                     <a>8</a>
                                     <b>14</b>
-                                    <v>96485</v>
+                                    <v>96495</v>
                                 </b>
                                 <b>
                                     <a>14</a>
                                     <b>41</b>
-                                    <v>91665</v>
+                                    <v>91664</v>
                                 </b>
                                 <b>
                                     <a>41</a>
                                     <b>125325</b>
-                                    <v>44590</v>
+                                    <v>44578</v>
                                 </b>
                             </bs>
                         </hist>
@@ -32159,12 +32163,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1050219</v>
+                                    <v>1050230</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>154193</v>
+                                    <v>154192</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -32193,8 +32197,8 @@
                                     <v>11</v>
                                 </b>
                                 <b>
-                                    <a>1239479</a>
-                                    <b>1239480</b>
+                                    <a>1239489</a>
+                                    <b>1239490</b>
                                     <v>11</v>
                                 </b>
                             </bs>
@@ -32219,8 +32223,8 @@
                                     <v>11</v>
                                 </b>
                                 <b>
-                                    <a>90427</a>
-                                    <b>90428</b>
+                                    <a>90429</a>
+                                    <b>90430</b>
                                     <v>11</v>
                                 </b>
                             </bs>
@@ -32274,7 +32278,7 @@
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>14736</v>
+                                    <v>14735</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -33483,7 +33487,7 @@
                 </e>
                 <e>
                     <k>type_id</k>
-                    <v>20104</v>
+                    <v>20103</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -33528,11 +33532,11 @@
         </relation>
         <relation>
             <name>sizeof_bind</name>
-            <cardinality>199184</cardinality>
+            <cardinality>199183</cardinality>
             <columnsizes>
                 <e>
                     <k>expr</k>
-                    <v>199184</v>
+                    <v>199183</v>
                 </e>
                 <e>
                     <k>type_id</k>
@@ -33550,7 +33554,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>199184</v>
+                                    <v>199183</v>
                                 </b>
                             </bs>
                         </hist>
@@ -33659,11 +33663,11 @@
         </relation>
         <relation>
             <name>lambdas</name>
-            <cardinality>21475</cardinality>
+            <cardinality>21478</cardinality>
             <columnsizes>
                 <e>
                     <k>expr</k>
-                    <v>21475</v>
+                    <v>21478</v>
                 </e>
                 <e>
                     <k>default_capture</k>
@@ -33685,7 +33689,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>21475</v>
+                                    <v>21478</v>
                                 </b>
                             </bs>
                         </hist>
@@ -33701,7 +33705,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>21475</v>
+                                    <v>21478</v>
                                 </b>
                             </bs>
                         </hist>
@@ -33775,15 +33779,15 @@
         </relation>
         <relation>
             <name>lambda_capture</name>
-            <cardinality>28011</cardinality>
+            <cardinality>28015</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>28011</v>
+                    <v>28015</v>
                 </e>
                 <e>
                     <k>lambda</k>
-                    <v>20542</v>
+                    <v>20544</v>
                 </e>
                 <e>
                     <k>index</k>
@@ -33791,7 +33795,7 @@
                 </e>
                 <e>
                     <k>field</k>
-                    <v>28011</v>
+                    <v>28015</v>
                 </e>
                 <e>
                     <k>captured_by_reference</k>
@@ -33817,7 +33821,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>28011</v>
+                                    <v>28015</v>
                                 </b>
                             </bs>
                         </hist>
@@ -33833,7 +33837,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>28011</v>
+                                    <v>28015</v>
                                 </b>
                             </bs>
                         </hist>
@@ -33849,7 +33853,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>28011</v>
+                                    <v>28015</v>
                                 </b>
                             </bs>
                         </hist>
@@ -33865,7 +33869,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>28011</v>
+                                    <v>28015</v>
                                 </b>
                             </bs>
                         </hist>
@@ -33881,7 +33885,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>28011</v>
+                                    <v>28015</v>
                                 </b>
                             </bs>
                         </hist>
@@ -33897,7 +33901,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>28011</v>
+                                    <v>28015</v>
                                 </b>
                             </bs>
                         </hist>
@@ -33913,12 +33917,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>13072</v>
+                                    <v>13073</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>7469</v>
+                                    <v>7470</v>
                                 </b>
                             </bs>
                         </hist>
@@ -33934,12 +33938,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>13072</v>
+                                    <v>13073</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>7469</v>
+                                    <v>7470</v>
                                 </b>
                             </bs>
                         </hist>
@@ -33955,12 +33959,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>13072</v>
+                                    <v>13073</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>7469</v>
+                                    <v>7470</v>
                                 </b>
                             </bs>
                         </hist>
@@ -33976,7 +33980,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>20542</v>
+                                    <v>20544</v>
                                 </b>
                             </bs>
                         </hist>
@@ -33992,7 +33996,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>20542</v>
+                                    <v>20544</v>
                                 </b>
                             </bs>
                         </hist>
@@ -34008,12 +34012,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>13072</v>
+                                    <v>13073</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>7469</v>
+                                    <v>7470</v>
                                 </b>
                             </bs>
                         </hist>
@@ -34145,7 +34149,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>28011</v>
+                                    <v>28015</v>
                                 </b>
                             </bs>
                         </hist>
@@ -34161,7 +34165,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>28011</v>
+                                    <v>28015</v>
                                 </b>
                             </bs>
                         </hist>
@@ -34177,7 +34181,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>28011</v>
+                                    <v>28015</v>
                                 </b>
                             </bs>
                         </hist>
@@ -34193,7 +34197,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>28011</v>
+                                    <v>28015</v>
                                 </b>
                             </bs>
                         </hist>
@@ -34209,7 +34213,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>28011</v>
+                                    <v>28015</v>
                                 </b>
                             </bs>
                         </hist>
@@ -34225,7 +34229,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>28011</v>
+                                    <v>28015</v>
                                 </b>
                             </bs>
                         </hist>
@@ -34654,11 +34658,11 @@
         </relation>
         <relation>
             <name>stmts</name>
-            <cardinality>4630345</cardinality>
+            <cardinality>4630324</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>4630345</v>
+                    <v>4630324</v>
                 </e>
                 <e>
                     <k>kind</k>
@@ -34666,7 +34670,7 @@
                 </e>
                 <e>
                     <k>location</k>
-                    <v>2171742</v>
+                    <v>2171732</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -34680,7 +34684,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4630345</v>
+                                    <v>4630324</v>
                                 </b>
                             </bs>
                         </hist>
@@ -34696,7 +34700,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4630345</v>
+                                    <v>4630324</v>
                                 </b>
                             </bs>
                         </hist>
@@ -34924,12 +34928,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1725789</v>
+                                    <v>1725781</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>178302</v>
+                                    <v>178301</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -34955,7 +34959,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2117857</v>
+                                    <v>2117848</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -35114,15 +35118,15 @@
         </relation>
         <relation>
             <name>if_then</name>
-            <cardinality>725914</cardinality>
+            <cardinality>725911</cardinality>
             <columnsizes>
                 <e>
                     <k>if_stmt</k>
-                    <v>725914</v>
+                    <v>725911</v>
                 </e>
                 <e>
                     <k>then_id</k>
-                    <v>725914</v>
+                    <v>725911</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -35136,7 +35140,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>725914</v>
+                                    <v>725911</v>
                                 </b>
                             </bs>
                         </hist>
@@ -35152,7 +35156,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>725914</v>
+                                    <v>725911</v>
                                 </b>
                             </bs>
                         </hist>
@@ -35162,15 +35166,15 @@
         </relation>
         <relation>
             <name>if_else</name>
-            <cardinality>184669</cardinality>
+            <cardinality>184668</cardinality>
             <columnsizes>
                 <e>
                     <k>if_stmt</k>
-                    <v>184669</v>
+                    <v>184668</v>
                 </e>
                 <e>
                     <k>else_id</k>
-                    <v>184669</v>
+                    <v>184668</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -35184,7 +35188,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>184669</v>
+                                    <v>184668</v>
                                 </b>
                             </bs>
                         </hist>
@@ -35200,7 +35204,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>184669</v>
+                                    <v>184668</v>
                                 </b>
                             </bs>
                         </hist>
@@ -35258,15 +35262,15 @@
         </relation>
         <relation>
             <name>constexpr_if_then</name>
-            <cardinality>52998</cardinality>
+            <cardinality>52997</cardinality>
             <columnsizes>
                 <e>
                     <k>constexpr_if_stmt</k>
-                    <v>52998</v>
+                    <v>52997</v>
                 </e>
                 <e>
                     <k>then_id</k>
-                    <v>52998</v>
+                    <v>52997</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -35280,7 +35284,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>52998</v>
+                                    <v>52997</v>
                                 </b>
                             </bs>
                         </hist>
@@ -35296,7 +35300,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>52998</v>
+                                    <v>52997</v>
                                 </b>
                             </bs>
                         </hist>
@@ -35354,15 +35358,15 @@
         </relation>
         <relation>
             <name>while_body</name>
-            <cardinality>29317</cardinality>
+            <cardinality>29316</cardinality>
             <columnsizes>
                 <e>
                     <k>while_stmt</k>
-                    <v>29317</v>
+                    <v>29316</v>
                 </e>
                 <e>
                     <k>body_id</k>
-                    <v>29317</v>
+                    <v>29316</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -35376,7 +35380,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>29317</v>
+                                    <v>29316</v>
                                 </b>
                             </bs>
                         </hist>
@@ -35392,7 +35396,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>29317</v>
+                                    <v>29316</v>
                                 </b>
                             </bs>
                         </hist>
@@ -35402,15 +35406,15 @@
         </relation>
         <relation>
             <name>do_body</name>
-            <cardinality>148874</cardinality>
+            <cardinality>148873</cardinality>
             <columnsizes>
                 <e>
                     <k>do_stmt</k>
-                    <v>148874</v>
+                    <v>148873</v>
                 </e>
                 <e>
                     <k>body_id</k>
-                    <v>148874</v>
+                    <v>148873</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -35424,7 +35428,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>148874</v>
+                                    <v>148873</v>
                                 </b>
                             </bs>
                         </hist>
@@ -35440,7 +35444,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>148874</v>
+                                    <v>148873</v>
                                 </b>
                             </bs>
                         </hist>
@@ -35498,7 +35502,7 @@
         </relation>
         <relation>
             <name>switch_case</name>
-            <cardinality>207501</cardinality>
+            <cardinality>207500</cardinality>
             <columnsizes>
                 <e>
                     <k>switch_stmt</k>
@@ -35510,7 +35514,7 @@
                 </e>
                 <e>
                     <k>case_id</k>
-                    <v>207501</v>
+                    <v>207500</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -35738,7 +35742,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>207501</v>
+                                    <v>207500</v>
                                 </b>
                             </bs>
                         </hist>
@@ -35754,7 +35758,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>207501</v>
+                                    <v>207500</v>
                                 </b>
                             </bs>
                         </hist>
@@ -36004,11 +36008,11 @@
         </relation>
         <relation>
             <name>stmtparents</name>
-            <cardinality>4053474</cardinality>
+            <cardinality>4053456</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>4053474</v>
+                    <v>4053456</v>
                 </e>
                 <e>
                     <k>index</k>
@@ -36016,7 +36020,7 @@
                 </e>
                 <e>
                     <k>parent</k>
-                    <v>1719861</v>
+                    <v>1719854</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -36030,7 +36034,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4053474</v>
+                                    <v>4053456</v>
                                 </b>
                             </bs>
                         </hist>
@@ -36046,7 +36050,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4053474</v>
+                                    <v>4053456</v>
                                 </b>
                             </bs>
                         </hist>
@@ -36184,17 +36188,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>987702</v>
+                                    <v>987697</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>372623</v>
+                                    <v>372621</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>105638</v>
+                                    <v>105637</v>
                                 </b>
                                 <b>
                                     <a>4</a>
@@ -36225,17 +36229,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>987702</v>
+                                    <v>987697</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>372623</v>
+                                    <v>372621</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>105638</v>
+                                    <v>105637</v>
                                 </b>
                                 <b>
                                     <a>4</a>
@@ -36260,11 +36264,11 @@
         </relation>
         <relation>
             <name>ishandler</name>
-            <cardinality>62676</cardinality>
+            <cardinality>62675</cardinality>
             <columnsizes>
                 <e>
                     <k>block</k>
-                    <v>62676</v>
+                    <v>62675</v>
                 </e>
             </columnsizes>
             <dependencies/>
@@ -36297,7 +36301,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>520372</v>
+                                    <v>520373</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -36318,7 +36322,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>520372</v>
+                                    <v>520373</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -36578,7 +36582,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>520372</v>
+                                    <v>520373</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -36599,7 +36603,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>520372</v>
+                                    <v>520373</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -36833,15 +36837,15 @@
         </relation>
         <relation>
             <name>blockscope</name>
-            <cardinality>1410868</cardinality>
+            <cardinality>1410861</cardinality>
             <columnsizes>
                 <e>
                     <k>block</k>
-                    <v>1410868</v>
+                    <v>1410861</v>
                 </e>
                 <e>
                     <k>enclosing</k>
-                    <v>1295552</v>
+                    <v>1295546</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -36855,7 +36859,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1410868</v>
+                                    <v>1410861</v>
                                 </b>
                             </bs>
                         </hist>
@@ -36871,12 +36875,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1230191</v>
+                                    <v>1230185</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>13</b>
-                                    <v>65361</v>
+                                    <v>65360</v>
                                 </b>
                             </bs>
                         </hist>
@@ -36886,15 +36890,15 @@
         </relation>
         <relation>
             <name>jumpinfo</name>
-            <cardinality>254457</cardinality>
+            <cardinality>254455</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>254457</v>
+                    <v>254455</v>
                 </e>
                 <e>
                     <k>str</k>
-                    <v>21191</v>
+                    <v>21190</v>
                 </e>
                 <e>
                     <k>target</k>
@@ -36912,7 +36916,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>254457</v>
+                                    <v>254455</v>
                                 </b>
                             </bs>
                         </hist>
@@ -36928,7 +36932,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>254457</v>
+                                    <v>254455</v>
                                 </b>
                             </bs>
                         </hist>
@@ -37072,19 +37076,19 @@
         </relation>
         <relation>
             <name>preprocdirects</name>
-            <cardinality>4190586</cardinality>
+            <cardinality>4191099</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>4190586</v>
+                    <v>4191099</v>
                 </e>
                 <e>
                     <k>kind</k>
-                    <v>5135</v>
+                    <v>5136</v>
                 </e>
                 <e>
                     <k>location</k>
-                    <v>4149969</v>
+                    <v>4150477</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -37098,7 +37102,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4190586</v>
+                                    <v>4191099</v>
                                 </b>
                             </bs>
                         </hist>
@@ -37114,7 +37118,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4190586</v>
+                                    <v>4191099</v>
                                 </b>
                             </bs>
                         </hist>
@@ -37262,7 +37266,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4149502</v>
+                                    <v>4150010</v>
                                 </b>
                                 <b>
                                     <a>88</a>
@@ -37283,7 +37287,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4149969</v>
+                                    <v>4150477</v>
                                 </b>
                             </bs>
                         </hist>
@@ -37293,15 +37297,15 @@
         </relation>
         <relation>
             <name>preprocpair</name>
-            <cardinality>1431410</cardinality>
+            <cardinality>1431585</cardinality>
             <columnsizes>
                 <e>
                     <k>begin</k>
-                    <v>1197043</v>
+                    <v>1197190</v>
                 </e>
                 <e>
                     <k>elseelifend</k>
-                    <v>1431410</v>
+                    <v>1431585</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -37315,17 +37319,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>978550</v>
+                                    <v>978670</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>208222</v>
+                                    <v>208247</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>11</b>
-                                    <v>10271</v>
+                                    <v>10272</v>
                                 </b>
                             </bs>
                         </hist>
@@ -37341,7 +37345,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1431410</v>
+                                    <v>1431585</v>
                                 </b>
                             </bs>
                         </hist>
@@ -37351,41 +37355,41 @@
         </relation>
         <relation>
             <name>preproctrue</name>
-            <cardinality>767060</cardinality>
+            <cardinality>767154</cardinality>
             <columnsizes>
                 <e>
                     <k>branch</k>
-                    <v>767060</v>
+                    <v>767154</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>preprocfalse</name>
-            <cardinality>331474</cardinality>
+            <cardinality>331515</cardinality>
             <columnsizes>
                 <e>
                     <k>branch</k>
-                    <v>331474</v>
+                    <v>331515</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>preproctext</name>
-            <cardinality>3367747</cardinality>
+            <cardinality>3367732</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>3367747</v>
+                    <v>3367732</v>
                 </e>
                 <e>
                     <k>head</k>
-                    <v>2440673</v>
+                    <v>2440662</v>
                 </e>
                 <e>
                     <k>body</k>
-                    <v>1426418</v>
+                    <v>1426412</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -37399,7 +37403,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3367747</v>
+                                    <v>3367732</v>
                                 </b>
                             </bs>
                         </hist>
@@ -37415,7 +37419,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3367747</v>
+                                    <v>3367732</v>
                                 </b>
                             </bs>
                         </hist>
@@ -37431,12 +37435,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2301873</v>
+                                    <v>2301863</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>740</b>
-                                    <v>138800</v>
+                                    <v>138799</v>
                                 </b>
                             </bs>
                         </hist>
@@ -37452,7 +37456,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2381962</v>
+                                    <v>2381951</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -37473,12 +37477,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1291263</v>
+                                    <v>1291258</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>6</b>
-                                    <v>106981</v>
+                                    <v>106980</v>
                                 </b>
                                 <b>
                                     <a>6</a>
@@ -37499,7 +37503,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1294120</v>
+                                    <v>1294114</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -37519,15 +37523,15 @@
         </relation>
         <relation>
             <name>includes</name>
-            <cardinality>313266</cardinality>
+            <cardinality>313305</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>313266</v>
+                    <v>313305</v>
                 </e>
                 <e>
                     <k>included</k>
-                    <v>117183</v>
+                    <v>117197</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -37541,7 +37545,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>313266</v>
+                                    <v>313305</v>
                                 </b>
                             </bs>
                         </hist>
@@ -37557,27 +37561,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>61159</v>
+                                    <v>61166</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>21942</v>
+                                    <v>21945</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>12605</v>
+                                    <v>12606</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>6</b>
-                                    <v>10271</v>
+                                    <v>10272</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>14</b>
-                                    <v>8870</v>
+                                    <v>8871</v>
                                 </b>
                                 <b>
                                     <a>14</a>
@@ -37640,11 +37644,11 @@
         </relation>
         <relation>
             <name>link_parent</name>
-            <cardinality>28676866</cardinality>
+            <cardinality>28676738</cardinality>
             <columnsizes>
                 <e>
                     <k>element</k>
-                    <v>3584451</v>
+                    <v>3584435</v>
                 </e>
                 <e>
                     <k>link_target</k>
@@ -37662,7 +37666,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>432954</v>
+                                    <v>432952</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -37672,7 +37676,7 @@
                                 <b>
                                     <a>9</a>
                                     <b>10</b>
-                                    <v>3131152</v>
+                                    <v>3131138</v>
                                 </b>
                             </bs>
                         </hist>
diff --git a/cpp/ql/lib/upgrades/7ff6a6e53dbcff09d1b9b758b594bc6d17366863/old.dbscheme b/cpp/ql/lib/upgrades/7ff6a6e53dbcff09d1b9b758b594bc6d17366863/old.dbscheme
new file mode 100644
index 000000000000..7ff6a6e53dbc
--- /dev/null
+++ b/cpp/ql/lib/upgrades/7ff6a6e53dbcff09d1b9b758b594bc6d17366863/old.dbscheme
@@ -0,0 +1,2315 @@
+
+/**
+ * An invocation of the compiler. Note that more than one file may be
+ * compiled per invocation. For example, this command compiles three
+ * source files:
+ *
+ *   gcc -c f1.c f2.c f3.c
+ *
+ * The `id` simply identifies the invocation, while `cwd` is the working
+ * directory from which the compiler was invoked.
+ */
+compilations(
+    /**
+     * An invocation of the compiler. Note that more than one file may
+     * be compiled per invocation. For example, this command compiles
+     * three source files:
+     *
+     *   gcc -c f1.c f2.c f3.c
+     */
+    unique int id : @compilation,
+    string cwd : string ref
+);
+
+/**
+ * The arguments that were passed to the extractor for a compiler
+ * invocation. If `id` is for the compiler invocation
+ *
+ *   gcc -c f1.c f2.c f3.c
+ *
+ * then typically there will be rows for
+ *
+ * num | arg
+ * --- | ---
+ * 0   | *path to extractor*
+ * 1   | `--mimic`
+ * 2   | `/usr/bin/gcc`
+ * 3   | `-c`
+ * 4   | f1.c
+ * 5   | f2.c
+ * 6   | f3.c
+ */
+#keyset[id, num]
+compilation_args(
+    int id : @compilation ref,
+    int num : int ref,
+    string arg : string ref
+);
+
+/**
+ * The source files that are compiled by a compiler invocation.
+ * If `id` is for the compiler invocation
+ *
+ *   gcc -c f1.c f2.c f3.c
+ *
+ * then there will be rows for
+ *
+ * num | arg
+ * --- | ---
+ * 0   | f1.c
+ * 1   | f2.c
+ * 2   | f3.c
+ *
+ * Note that even if those files `#include` headers, those headers
+ * do not appear as rows.
+ */
+#keyset[id, num]
+compilation_compiling_files(
+    int id : @compilation ref,
+    int num : int ref,
+    int file : @file ref
+);
+
+/**
+ * The time taken by the extractor for a compiler invocation.
+ *
+ * For each file `num`, there will be rows for
+ *
+ * kind | seconds
+ * ---- | ---
+ * 1    | CPU seconds used by the extractor frontend
+ * 2    | Elapsed seconds during the extractor frontend
+ * 3    | CPU seconds used by the extractor backend
+ * 4    | Elapsed seconds during the extractor backend
+ */
+#keyset[id, num, kind]
+compilation_time(
+    int id : @compilation ref,
+    int num : int ref,
+    /* kind:
+       1 = frontend_cpu_seconds
+       2 = frontend_elapsed_seconds
+       3 = extractor_cpu_seconds
+       4 = extractor_elapsed_seconds
+    */
+    int kind : int ref,
+    float seconds : float ref
+);
+
+/**
+ * An error or warning generated by the extractor.
+ * The diagnostic message `diagnostic` was generated during compiler
+ * invocation `compilation`, and is the `file_number_diagnostic_number`th
+ * message generated while extracting the `file_number`th file of that
+ * invocation.
+ */
+#keyset[compilation, file_number, file_number_diagnostic_number]
+diagnostic_for(
+    int diagnostic : @diagnostic ref,
+    int compilation : @compilation ref,
+    int file_number : int ref,
+    int file_number_diagnostic_number : int ref
+);
+
+/**
+ * If extraction was successful, then `cpu_seconds` and
+ * `elapsed_seconds` are the CPU time and elapsed time (respectively)
+ * that extraction took for compiler invocation `id`.
+ */
+compilation_finished(
+    unique int id : @compilation ref,
+    float cpu_seconds : float ref,
+    float elapsed_seconds : float ref
+);
+
+
+/**
+ * External data, loaded from CSV files during snapshot creation. See
+ * [Tutorial: Incorporating external data](https://help.semmle.com/wiki/display/SD/Tutorial%3A+Incorporating+external+data)
+ * for more information.
+ */
+externalData(
+    int id : @externalDataElement,
+    string path : string ref,
+    int column: int ref,
+    string value : string ref
+);
+
+/**
+ * The source location of the snapshot.
+ */
+sourceLocationPrefix(string prefix : string ref);
+
+/**
+ * Information about packages that provide code used during compilation.
+ * The `id` is just a unique identifier.
+ * The `namespace` is typically the name of the package manager that
+ * provided the package (e.g. "dpkg" or "yum").
+ * The `package_name` is the name of the package, and `version` is its
+ * version (as a string).
+ */
+external_packages(
+    unique int id: @external_package,
+    string namespace : string ref,
+    string package_name : string ref,
+    string version : string ref
+);
+
+/**
+ * Holds if File `fileid` was provided by package `package`.
+ */
+header_to_external_package(
+    int fileid : @file ref,
+    int package : @external_package ref
+);
+
+/*
+ * Version history
+ */
+
+svnentries(
+    unique int id : @svnentry,
+    string revision : string ref,
+    string author : string ref,
+    date revisionDate : date ref,
+    int changeSize : int ref
+)
+
+svnaffectedfiles(
+    int id : @svnentry ref,
+    int file : @file ref,
+    string action : string ref
+)
+
+svnentrymsg(
+    unique int id : @svnentry ref,
+    string message : string ref
+)
+
+svnchurn(
+    int commit : @svnentry ref,
+    int file : @file ref,
+    int addedLines : int ref,
+    int deletedLines : int ref
+)
+
+/*
+ * C++ dbscheme
+ */
+
+extractor_version(
+    string codeql_version: string ref,
+    string frontend_version: string ref
+)
+
+@location = @location_stmt | @location_expr | @location_default ;
+
+/**
+ * The location of an element that is not an expression or a statement.
+ * The location spans column `startcolumn` of line `startline` to
+ * column `endcolumn` of line `endline` in file `file`.
+ * For more information, see
+ * [Locations](https://codeql.github.com/docs/writing-codeql-queries/providing-locations-in-codeql-queries/).
+ */
+locations_default(
+    /** The location of an element that is not an expression or a statement. */
+    unique int id: @location_default,
+    int container: @container ref,
+    int startLine: int ref,
+    int startColumn: int ref,
+    int endLine: int ref,
+    int endColumn: int ref
+);
+
+/**
+ * The location of a statement.
+ * The location spans column `startcolumn` of line `startline` to
+ * column `endcolumn` of line `endline` in file `file`.
+ * For more information, see
+ * [Locations](https://codeql.github.com/docs/writing-codeql-queries/providing-locations-in-codeql-queries/).
+ */
+locations_stmt(
+    /** The location of a statement. */
+    unique int id: @location_stmt,
+    int container: @container ref,
+    int startLine: int ref,
+    int startColumn: int ref,
+    int endLine: int ref,
+    int endColumn: int ref
+);
+
+/**
+ * The location of an expression.
+ * The location spans column `startcolumn` of line `startline` to
+ * column `endcolumn` of line `endline` in file `file`.
+ * For more information, see
+ * [Locations](https://codeql.github.com/docs/writing-codeql-queries/providing-locations-in-codeql-queries/).
+ */
+locations_expr(
+    /** The location of an expression. */
+    unique int id: @location_expr,
+    int container: @container ref,
+    int startLine: int ref,
+    int startColumn: int ref,
+    int endLine: int ref,
+    int endColumn: int ref
+);
+
+/** An element for which line-count information is available. */
+@sourceline = @file | @function | @variable | @enumconstant | @xmllocatable;
+
+numlines(
+    int element_id: @sourceline ref,
+    int num_lines: int ref,
+    int num_code: int ref,
+    int num_comment: int ref
+);
+
+diagnostics(
+    unique int id: @diagnostic,
+    int severity: int ref,
+    string error_tag: string ref,
+    string error_message: string ref,
+    string full_error_message: string ref,
+    int location: @location_default ref
+);
+
+files(
+    unique int id: @file,
+    string name: string ref
+);
+
+folders(
+    unique int id: @folder,
+    string name: string ref
+);
+
+@container = @folder | @file
+
+containerparent(
+    int parent: @container ref,
+    unique int child: @container ref
+);
+
+fileannotations(
+    int id: @file ref,
+    int kind: int ref,
+    string name: string ref,
+    string value: string ref
+);
+
+inmacroexpansion(
+    int id: @element ref,
+    int inv: @macroinvocation ref
+);
+
+affectedbymacroexpansion(
+    int id: @element ref,
+    int inv: @macroinvocation ref
+);
+
+case @macroinvocation.kind of
+  1 = @macro_expansion
+| 2 = @other_macro_reference
+;
+
+macroinvocations(
+    unique int id: @macroinvocation,
+    int macro_id: @ppd_define ref,
+    int location: @location_default ref,
+    int kind: int ref
+);
+
+macroparent(
+    unique int id: @macroinvocation ref,
+    int parent_id: @macroinvocation ref
+);
+
+// a macroinvocation may be part of another location
+// the way to find a constant expression that uses a macro
+// is thus to find a constant expression that has a location
+// to which a macro invocation is bound
+macrolocationbind(
+    int id: @macroinvocation ref,
+    int location: @location ref
+);
+
+#keyset[invocation, argument_index]
+macro_argument_unexpanded(
+    int invocation: @macroinvocation ref,
+    int argument_index: int ref,
+    string text: string ref
+);
+
+#keyset[invocation, argument_index]
+macro_argument_expanded(
+    int invocation: @macroinvocation ref,
+    int argument_index: int ref,
+    string text: string ref
+);
+
+/*
+case @function.kind of
+  1 = @normal_function
+| 2 = @constructor
+| 3 = @destructor
+| 4 = @conversion_function
+| 5 = @operator
+| 6 = @builtin_function     // GCC built-in functions, e.g. __builtin___memcpy_chk
+| 7 = @user_defined_literal
+| 8 = @deduction_guide
+;
+*/
+
+functions(
+    unique int id: @function,
+    string name: string ref,
+    int kind: int ref
+);
+
+function_entry_point(
+    int id: @function ref,
+    unique int entry_point: @stmt ref
+);
+
+function_return_type(
+    int id: @function ref,
+    int return_type: @type ref
+);
+
+/**
+ * If `function` is a coroutine, then this gives the `std::experimental::resumable_traits`
+ * instance associated with it, and the variables representing the `handle` and `promise`
+ * for it.
+ */
+coroutine(
+  unique int function: @function ref,
+  int traits: @type ref
+);
+
+/*
+case @coroutine_placeholder_variable.kind of
+  1 = @handle
+| 2 = @promise
+| 3 = @init_await_resume
+;
+*/
+
+coroutine_placeholder_variable(
+  unique int placeholder_variable: @variable ref,
+  int kind: int ref,
+  int function: @function ref
+)
+
+/** The `new` function used for allocating the coroutine state, if any. */
+coroutine_new(
+  unique int function: @function ref,
+  int new: @function ref
+);
+
+/** The `delete` function used for deallocating the coroutine state, if any. */
+coroutine_delete(
+  unique int function: @function ref,
+  int delete: @function ref
+);
+
+purefunctions(unique int id: @function ref);
+
+function_deleted(unique int id: @function ref);
+
+function_defaulted(unique int id: @function ref);
+
+function_prototyped(unique int id: @function ref)
+
+deduction_guide_for_class(
+    int id: @function ref,
+    int class_template: @usertype ref
+)
+
+member_function_this_type(
+    unique int id: @function ref,
+    int this_type: @type ref
+);
+
+#keyset[id, type_id]
+fun_decls(
+    int id: @fun_decl,
+    int function: @function ref,
+    int type_id: @type ref,
+    string name: string ref,
+    int location: @location_default ref
+);
+fun_def(unique int id: @fun_decl ref);
+fun_specialized(unique int id: @fun_decl ref);
+fun_implicit(unique int id: @fun_decl ref);
+fun_decl_specifiers(
+    int id: @fun_decl ref,
+    string name: string ref
+)
+#keyset[fun_decl, index]
+fun_decl_throws(
+    int fun_decl: @fun_decl ref,
+    int index: int ref,
+    int type_id: @type ref
+);
+/* an empty throw specification is different from none */
+fun_decl_empty_throws(unique int fun_decl: @fun_decl ref);
+fun_decl_noexcept(
+    int fun_decl: @fun_decl ref,
+    int constant: @expr ref
+);
+fun_decl_empty_noexcept(int fun_decl: @fun_decl ref);
+fun_decl_typedef_type(
+    unique int fun_decl: @fun_decl ref,
+    int typedeftype_id: @usertype ref
+);
+
+param_decl_bind(
+    unique int id: @var_decl ref,
+    int index: int ref,
+    int fun_decl: @fun_decl ref
+);
+
+#keyset[id, type_id]
+var_decls(
+    int id: @var_decl,
+    int variable: @variable ref,
+    int type_id: @type ref,
+    string name: string ref,
+    int location: @location_default ref
+);
+var_def(unique int id: @var_decl ref);
+var_decl_specifiers(
+    int id: @var_decl ref,
+    string name: string ref
+)
+is_structured_binding(unique int id: @variable ref);
+
+type_decls(
+    unique int id: @type_decl,
+    int type_id: @type ref,
+    int location: @location_default ref
+);
+type_def(unique int id: @type_decl ref);
+type_decl_top(
+    unique int type_decl: @type_decl ref
+);
+
+namespace_decls(
+    unique int id: @namespace_decl,
+    int namespace_id: @namespace ref,
+    int location: @location_default ref,
+    int bodylocation: @location_default ref
+);
+
+case @using.kind of
+  1 = @using_declaration
+| 2 = @using_directive
+| 3 = @using_enum_declaration
+;
+
+usings(
+    unique int id: @using,
+    int element_id: @element ref,
+    int location: @location_default ref,
+    int kind: int ref
+);
+
+/** The element which contains the `using` declaration. */
+using_container(
+    int parent: @element ref,
+    int child: @using ref
+);
+
+static_asserts(
+    unique int id: @static_assert,
+    int condition : @expr ref,
+    string message : string ref,
+    int location: @location_default ref,
+    int enclosing : @element ref
+);
+
+// each function has an ordered list of parameters
+#keyset[id, type_id]
+#keyset[function, index, type_id]
+params(
+    int id: @parameter,
+    int function: @functionorblock ref,
+    int index: int ref,
+    int type_id: @type ref
+);
+
+overrides(
+    int new: @function ref,
+    int old: @function ref
+);
+
+#keyset[id, type_id]
+membervariables(
+    int id: @membervariable,
+    int type_id: @type ref,
+    string name: string ref
+);
+
+#keyset[id, type_id]
+globalvariables(
+    int id: @globalvariable,
+    int type_id: @type ref,
+    string name: string ref
+);
+
+#keyset[id, type_id]
+localvariables(
+    int id: @localvariable,
+    int type_id: @type ref,
+    string name: string ref
+);
+
+autoderivation(
+    unique int var: @variable ref,
+    int derivation_type: @type ref
+);
+
+orphaned_variables(
+    int var: @localvariable ref,
+    int function: @function ref
+)
+
+enumconstants(
+    unique int id: @enumconstant,
+    int parent: @usertype ref,
+    int index: int ref,
+    int type_id: @type ref,
+    string name: string ref,
+    int location: @location_default ref
+);
+
+@variable = @localscopevariable | @globalvariable | @membervariable;
+
+@localscopevariable = @localvariable | @parameter;
+
+/**
+ * Built-in types are the fundamental types, e.g., integral, floating, and void.
+ */
+case @builtintype.kind of
+   1 = @errortype
+|  2 = @unknowntype
+|  3 = @void
+|  4 = @boolean
+|  5 = @char
+|  6 = @unsigned_char
+|  7 = @signed_char
+|  8 = @short
+|  9 = @unsigned_short
+| 10 = @signed_short
+| 11 = @int
+| 12 = @unsigned_int
+| 13 = @signed_int
+| 14 = @long
+| 15 = @unsigned_long
+| 16 = @signed_long
+| 17 = @long_long
+| 18 = @unsigned_long_long
+| 19 = @signed_long_long
+// ... 20 Microsoft-specific __int8
+// ... 21 Microsoft-specific __int16
+// ... 22 Microsoft-specific __int32
+// ... 23 Microsoft-specific __int64
+| 24 = @float
+| 25 = @double
+| 26 = @long_double
+| 27 = @complex_float         // C99-specific _Complex float
+| 28 = @complex_double        // C99-specific _Complex double
+| 29 = @complex_long_double   // C99-specific _Complex long double
+| 30 = @imaginary_float       // C99-specific _Imaginary float
+| 31 = @imaginary_double      // C99-specific _Imaginary double
+| 32 = @imaginary_long_double // C99-specific _Imaginary long double
+| 33 = @wchar_t               // Microsoft-specific
+| 34 = @decltype_nullptr      // C++11
+| 35 = @int128                // __int128
+| 36 = @unsigned_int128       // unsigned __int128
+| 37 = @signed_int128         // signed __int128
+| 38 = @float128              // __float128
+| 39 = @complex_float128      // _Complex __float128
+| 40 = @decimal32             // _Decimal32
+| 41 = @decimal64             // _Decimal64
+| 42 = @decimal128            // _Decimal128
+| 43 = @char16_t
+| 44 = @char32_t
+| 45 = @std_float32           // _Float32
+| 46 = @float32x              // _Float32x
+| 47 = @std_float64           // _Float64
+| 48 = @float64x              // _Float64x
+| 49 = @std_float128          // _Float128
+// ... 50 _Float128x
+| 51 = @char8_t
+| 52 = @float16               // _Float16
+| 53 = @complex_float16       // _Complex _Float16
+| 54 = @fp16                  // __fp16
+| 55 = @std_bfloat16          // __bf16
+| 56 = @std_float16           // std::float16_t
+| 57 = @complex_std_float32   // _Complex _Float32
+| 58 = @complex_float32x      // _Complex _Float32x
+| 59 = @complex_std_float64   // _Complex _Float64
+| 60 = @complex_float64x      // _Complex _Float64x
+| 61 = @complex_std_float128  // _Complex _Float128
+;
+
+builtintypes(
+    unique int id: @builtintype,
+    string name: string ref,
+    int kind: int ref,
+    int size: int ref,
+    int sign: int ref,
+    int alignment: int ref
+);
+
+/**
+ * Derived types are types that are directly derived from existing types and
+ * point to, refer to, transform type data to return a new type.
+ */
+case @derivedtype.kind of
+   1 = @pointer
+|  2 = @reference
+|  3 = @type_with_specifiers
+|  4 = @array
+|  5 = @gnu_vector
+|  6 = @routineptr
+|  7 = @routinereference
+|  8 = @rvalue_reference // C++11
+// ... 9 type_conforming_to_protocols deprecated
+| 10 = @block
+;
+
+derivedtypes(
+    unique int id: @derivedtype,
+    string name: string ref,
+    int kind: int ref,
+    int type_id: @type ref
+);
+
+pointerishsize(unique int id: @derivedtype ref,
+    int size: int ref,
+    int alignment: int ref);
+
+arraysizes(
+    unique int id: @derivedtype ref,
+    int num_elements: int ref,
+    int bytesize: int ref,
+    int alignment: int ref
+);
+
+typedefbase(
+    unique int id: @usertype ref,
+    int type_id: @type ref
+);
+
+/**
+ * An instance of the C++11 `decltype` operator.  For example:
+ * ```
+ * int a;
+ * decltype(1+a) b;
+ * ```
+ * Here `expr` is `1+a`.
+ *
+ * Sometimes an additional pair of parentheses around the expression
+ * would change the semantics of this decltype, e.g.
+ * ```
+ * struct A { double x; };
+ * const A* a = new A();
+ * decltype( a->x ); // type is double
+ * decltype((a->x)); // type is const double&
+ * ```
+ * (Please consult the C++11 standard for more details).
+ * `parentheses_would_change_meaning` is `true` iff that is the case.
+ */
+#keyset[id, expr]
+decltypes(
+    int id: @decltype,
+    int expr: @expr ref,
+    int base_type: @type ref,
+    boolean parentheses_would_change_meaning: boolean ref
+);
+
+/*
+case @usertype.kind of
+   1 = @struct
+|  2 = @class
+|  3 = @union
+|  4 = @enum
+|  5 = @typedef                       // classic C: typedef typedef type name
+|  6 = @template
+|  7 = @template_parameter
+|  8 = @template_template_parameter
+|  9 = @proxy_class                   // a proxy class associated with a template parameter
+// ... 10 objc_class deprecated
+// ... 11 objc_protocol deprecated
+// ... 12 objc_category deprecated
+| 13 = @scoped_enum
+| 14 = @using_alias                  // a using name = type style typedef
+;
+*/
+
+usertypes(
+    unique int id: @usertype,
+    string name: string ref,
+    int kind: int ref
+);
+
+usertypesize(
+    unique int id: @usertype ref,
+    int size: int ref,
+    int alignment: int ref
+);
+
+usertype_final(unique int id: @usertype ref);
+
+usertype_uuid(
+    unique int id: @usertype ref,
+    string uuid: string ref
+);
+
+mangled_name(
+    unique int id: @declaration ref,
+    int mangled_name : @mangledname,
+    boolean is_complete: boolean ref
+);
+
+is_pod_class(unique int id: @usertype ref);
+is_standard_layout_class(unique int id: @usertype ref);
+
+is_complete(unique int id: @usertype ref);
+
+is_class_template(unique int id: @usertype ref);
+class_instantiation(
+    int to: @usertype ref,
+    int from: @usertype ref
+);
+class_template_argument(
+    int type_id: @usertype ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+class_template_argument_value(
+    int type_id: @usertype ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+
+is_proxy_class_for(
+    unique int id: @usertype ref,
+    unique int templ_param_id: @usertype ref
+);
+
+type_mentions(
+    unique int id: @type_mention,
+    int type_id: @type ref,
+    int location: @location ref,
+    // a_symbol_reference_kind from the frontend.
+    int kind: int ref
+);
+
+is_function_template(unique int id: @function ref);
+function_instantiation(
+    unique int to: @function ref,
+    int from: @function ref
+);
+function_template_argument(
+    int function_id: @function ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+function_template_argument_value(
+    int function_id: @function ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+
+is_variable_template(unique int id: @variable ref);
+variable_instantiation(
+    unique int to: @variable ref,
+    int from: @variable ref
+);
+variable_template_argument(
+    int variable_id: @variable ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+variable_template_argument_value(
+    int variable_id: @variable ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+
+routinetypes(
+    unique int id: @routinetype,
+    int return_type: @type ref
+);
+
+routinetypeargs(
+    int routine: @routinetype ref,
+    int index: int ref,
+    int type_id: @type ref
+);
+
+ptrtomembers(
+    unique int id: @ptrtomember,
+    int type_id: @type ref,
+    int class_id: @type ref
+);
+
+/*
+ specifiers for types, functions, and variables
+
+    "public",
+    "protected",
+    "private",
+
+    "const",
+    "volatile",
+    "static",
+
+    "pure",
+    "virtual",
+    "sealed", // Microsoft
+    "__interface", // Microsoft
+    "inline",
+    "explicit",
+
+    "near", // near far extension
+    "far", // near far extension
+    "__ptr32", // Microsoft
+    "__ptr64", // Microsoft
+    "__sptr", // Microsoft
+    "__uptr", // Microsoft
+    "dllimport", // Microsoft
+    "dllexport", // Microsoft
+    "thread", // Microsoft
+    "naked", // Microsoft
+    "microsoft_inline", // Microsoft
+    "forceinline", // Microsoft
+    "selectany", // Microsoft
+    "nothrow", // Microsoft
+    "novtable", // Microsoft
+    "noreturn", // Microsoft
+    "noinline", // Microsoft
+    "noalias", // Microsoft
+    "restrict", // Microsoft
+*/
+
+specifiers(
+    unique int id: @specifier,
+    unique string str: string ref
+);
+
+typespecifiers(
+    int type_id: @type ref,
+    int spec_id: @specifier ref
+);
+
+funspecifiers(
+    int func_id: @function ref,
+    int spec_id: @specifier ref
+);
+
+varspecifiers(
+    int var_id: @accessible ref,
+    int spec_id: @specifier ref
+);
+
+explicit_specifier_exprs(
+    unique int func_id: @function ref,
+    int constant: @expr ref
+)
+
+attributes(
+    unique int id: @attribute,
+    int kind: int ref,
+    string name: string ref,
+    string name_space: string ref,
+    int location: @location_default ref
+);
+
+case @attribute.kind of
+  0 = @gnuattribute
+| 1 = @stdattribute
+| 2 = @declspec
+| 3 = @msattribute
+| 4 = @alignas
+// ... 5 @objc_propertyattribute deprecated
+;
+
+attribute_args(
+    unique int id: @attribute_arg,
+    int kind: int ref,
+    int attribute: @attribute ref,
+    int index: int ref,
+    int location: @location_default ref
+);
+
+case @attribute_arg.kind of
+  0 = @attribute_arg_empty
+| 1 = @attribute_arg_token
+| 2 = @attribute_arg_constant
+| 3 = @attribute_arg_type
+| 4 = @attribute_arg_constant_expr
+| 5 = @attribute_arg_expr
+;
+
+attribute_arg_value(
+    unique int arg: @attribute_arg ref,
+    string value: string ref
+);
+attribute_arg_type(
+    unique int arg: @attribute_arg ref,
+    int type_id: @type ref
+);
+attribute_arg_constant(
+    unique int arg: @attribute_arg ref,
+    int constant: @expr ref
+)
+attribute_arg_expr(
+    unique int arg: @attribute_arg ref,
+    int expr: @expr ref
+)
+attribute_arg_name(
+    unique int arg: @attribute_arg ref,
+    string name: string ref
+);
+
+typeattributes(
+    int type_id: @type ref,
+    int spec_id: @attribute ref
+);
+
+funcattributes(
+    int func_id: @function ref,
+    int spec_id: @attribute ref
+);
+
+varattributes(
+    int var_id: @accessible ref,
+    int spec_id: @attribute ref
+);
+
+stmtattributes(
+    int stmt_id: @stmt ref,
+    int spec_id: @attribute ref
+);
+
+@type = @builtintype
+      | @derivedtype
+      | @usertype
+      /* TODO | @fixedpointtype */
+      | @routinetype
+      | @ptrtomember
+      | @decltype;
+
+unspecifiedtype(
+    unique int type_id: @type ref,
+    int unspecified_type_id: @type ref
+);
+
+member(
+    int parent: @type ref,
+    int index: int ref,
+    int child: @member ref
+);
+
+@enclosingfunction_child = @usertype | @variable | @namespace
+
+enclosingfunction(
+    unique int child: @enclosingfunction_child ref,
+    int parent: @function ref
+);
+
+derivations(
+    unique int derivation: @derivation,
+    int sub: @type ref,
+    int index: int ref,
+    int super: @type ref,
+    int location: @location_default ref
+);
+
+derspecifiers(
+    int der_id: @derivation ref,
+    int spec_id: @specifier ref
+);
+
+/**
+ * Contains the byte offset of the base class subobject within the derived
+ * class. Only holds for non-virtual base classes, but see table
+ * `virtual_base_offsets` for offsets of virtual base class subobjects.
+ */
+direct_base_offsets(
+    unique int der_id: @derivation ref,
+    int offset: int ref
+);
+
+/**
+ * Contains the byte offset of the virtual base class subobject for class
+ * `super` within a most-derived object of class `sub`. `super` can be either a
+ * direct or indirect base class.
+ */
+#keyset[sub, super]
+virtual_base_offsets(
+    int sub: @usertype ref,
+    int super: @usertype ref,
+    int offset: int ref
+);
+
+frienddecls(
+    unique int id: @frienddecl,
+    int type_id: @type ref,
+    int decl_id: @declaration ref,
+    int location: @location_default ref
+);
+
+@declaredtype = @usertype ;
+
+@declaration = @function
+             | @declaredtype
+             | @variable
+             | @enumconstant
+             | @frienddecl;
+
+@member = @membervariable
+        | @function
+        | @declaredtype
+        | @enumconstant;
+
+@locatable = @diagnostic
+           | @declaration
+           | @ppd_include
+           | @ppd_define
+           | @macroinvocation
+           /*| @funcall*/
+           | @xmllocatable
+           | @attribute
+           | @attribute_arg;
+
+@namedscope = @namespace | @usertype;
+
+@element = @locatable
+         | @file
+         | @folder
+         | @specifier
+         | @type
+         | @expr
+         | @namespace
+         | @initialiser
+         | @stmt
+         | @derivation
+         | @comment
+         | @preprocdirect
+         | @fun_decl
+         | @var_decl
+         | @type_decl
+         | @namespace_decl
+         | @using
+         | @namequalifier
+         | @specialnamequalifyingelement
+         | @static_assert
+         | @type_mention
+         | @lambdacapture;
+
+@exprparent = @element;
+
+comments(
+    unique int id: @comment,
+    string contents: string ref,
+    int location: @location_default ref
+);
+
+commentbinding(
+    int id: @comment ref,
+    int element: @element ref
+);
+
+exprconv(
+    int converted: @expr ref,
+    unique int conversion: @expr ref
+);
+
+compgenerated(unique int id: @element ref);
+
+/**
+ * `destructor_call` destructs the `i`'th entity that should be
+ * destructed following `element`. Note that entities should be
+ * destructed in reverse construction order, so for a given `element`
+ * these should be called from highest to lowest `i`.
+ */
+#keyset[element, destructor_call]
+#keyset[element, i]
+synthetic_destructor_call(
+    int element: @element ref,
+    int i: int ref,
+    int destructor_call: @routineexpr ref
+);
+
+namespaces(
+    unique int id: @namespace,
+    string name: string ref
+);
+
+namespace_inline(
+    unique int id: @namespace ref
+);
+
+namespacembrs(
+    int parentid: @namespace ref,
+    unique int memberid: @namespacembr ref
+);
+
+@namespacembr = @declaration | @namespace;
+
+exprparents(
+    int expr_id: @expr ref,
+    int child_index: int ref,
+    int parent_id: @exprparent ref
+);
+
+expr_isload(unique int expr_id: @expr ref);
+
+@cast = @c_style_cast
+      | @const_cast
+      | @dynamic_cast
+      | @reinterpret_cast
+      | @static_cast
+      ;
+
+/*
+case @conversion.kind of
+  0 = @simple_conversion           // a numeric conversion, qualification conversion, or a reinterpret_cast
+| 1 = @bool_conversion             // conversion to 'bool'
+| 2 = @base_class_conversion       // a derived-to-base conversion
+| 3 = @derived_class_conversion    // a base-to-derived conversion
+| 4 = @pm_base_class_conversion    // a derived-to-base conversion of a pointer to member
+| 5 = @pm_derived_class_conversion // a base-to-derived conversion of a pointer to member
+| 6 = @glvalue_adjust              // an adjustment of the type of a glvalue
+| 7 = @prvalue_adjust              // an adjustment of the type of a prvalue
+;
+*/
+/**
+ * Describes the semantics represented by a cast expression. This is largely
+ * independent of the source syntax of the cast, so it is separate from the
+ * regular expression kind.
+ */
+conversionkinds(
+    unique int expr_id: @cast ref,
+    int kind: int ref
+);
+
+@conversion = @cast
+            | @array_to_pointer
+            | @parexpr
+            | @reference_to
+            | @ref_indirect
+            | @temp_init
+            | @c11_generic
+            ;
+
+/*
+case @funbindexpr.kind of
+  0 = @normal_call  // a normal call
+| 1 = @virtual_call // a virtual call
+| 2 = @adl_call     // a call whose target is only found by ADL
+;
+*/
+iscall(
+    unique int caller: @funbindexpr ref,
+    int kind: int ref
+);
+
+numtemplatearguments(
+    unique int expr_id: @expr ref,
+    int num: int ref
+);
+
+specialnamequalifyingelements(
+    unique int id: @specialnamequalifyingelement,
+    unique string name: string ref
+);
+
+@namequalifiableelement = @expr | @namequalifier;
+@namequalifyingelement = @namespace
+                       | @specialnamequalifyingelement
+                       | @usertype;
+
+namequalifiers(
+    unique int id: @namequalifier,
+    unique int qualifiableelement: @namequalifiableelement ref,
+    int qualifyingelement: @namequalifyingelement ref,
+    int location: @location_default ref
+);
+
+varbind(
+    int expr: @varbindexpr ref,
+    int var: @accessible ref
+);
+
+funbind(
+    int expr: @funbindexpr ref,
+    int fun: @function ref
+);
+
+@any_new_expr = @new_expr
+              | @new_array_expr;
+
+@new_or_delete_expr = @any_new_expr
+                    | @delete_expr
+                    | @delete_array_expr;
+
+@prefix_crement_expr = @preincrexpr | @predecrexpr;
+
+@postfix_crement_expr = @postincrexpr | @postdecrexpr;
+
+@increment_expr = @preincrexpr | @postincrexpr;
+
+@decrement_expr = @predecrexpr | @postdecrexpr;
+
+@crement_expr = @increment_expr | @decrement_expr;
+
+@un_arith_op_expr = @arithnegexpr
+                  | @unaryplusexpr
+                  | @conjugation
+                  | @realpartexpr
+                  | @imagpartexpr
+                  | @crement_expr
+                  ;
+
+@un_bitwise_op_expr = @complementexpr;
+
+@un_log_op_expr = @notexpr;
+
+@un_op_expr = @address_of
+            | @indirect
+            | @un_arith_op_expr
+            | @un_bitwise_op_expr
+            | @builtinaddressof
+            | @vec_fill
+            | @un_log_op_expr
+            | @co_await
+            | @co_yield
+            ;
+
+@bin_log_op_expr = @andlogicalexpr | @orlogicalexpr;
+
+@cmp_op_expr = @eq_op_expr | @rel_op_expr;
+
+@eq_op_expr = @eqexpr | @neexpr;
+
+@rel_op_expr = @gtexpr
+             | @ltexpr
+             | @geexpr
+             | @leexpr
+             | @spaceshipexpr
+             ;
+
+@bin_bitwise_op_expr = @lshiftexpr
+                     | @rshiftexpr
+                     | @andexpr
+                     | @orexpr
+                     | @xorexpr
+                     ;
+
+@p_arith_op_expr = @paddexpr
+                 | @psubexpr
+                 | @pdiffexpr
+                 ;
+
+@bin_arith_op_expr = @addexpr
+                   | @subexpr
+                   | @mulexpr
+                   | @divexpr
+                   | @remexpr
+                   | @jmulexpr
+                   | @jdivexpr
+                   | @fjaddexpr
+                   | @jfaddexpr
+                   | @fjsubexpr
+                   | @jfsubexpr
+                   | @minexpr
+                   | @maxexpr
+                   | @p_arith_op_expr
+                   ;
+
+@bin_op_expr = @bin_arith_op_expr
+             | @bin_bitwise_op_expr
+             | @cmp_op_expr
+             | @bin_log_op_expr
+             ;
+
+@op_expr = @un_op_expr
+         | @bin_op_expr
+         | @assign_expr
+         | @conditionalexpr
+         ;
+
+@assign_arith_expr = @assignaddexpr
+                   | @assignsubexpr
+                   | @assignmulexpr
+                   | @assigndivexpr
+                   | @assignremexpr
+                   ;
+
+@assign_bitwise_expr = @assignandexpr
+                     | @assignorexpr
+                     | @assignxorexpr
+                     | @assignlshiftexpr
+                     | @assignrshiftexpr
+                     ;
+
+@assign_pointer_expr = @assignpaddexpr
+                     | @assignpsubexpr
+                     ;
+
+@assign_op_expr = @assign_arith_expr
+                | @assign_bitwise_expr
+                | @assign_pointer_expr
+                ;
+
+@assign_expr = @assignexpr | @assign_op_expr | @blockassignexpr
+
+/*
+  Binary encoding of the allocator form.
+
+  case @allocator.form of
+    0 = plain
+  | 1 = alignment
+  ;
+*/
+
+/**
+ * The allocator function associated with a `new` or `new[]` expression.
+ * The `form` column specified whether the allocation call contains an alignment
+ * argument.
+ */
+expr_allocator(
+    unique int expr: @any_new_expr ref,
+    int func: @function ref,
+    int form: int ref
+);
+
+/*
+  Binary encoding of the deallocator form.
+
+  case @deallocator.form of
+    0 = plain
+  | 1 = size
+  | 2 = alignment
+  | 4 = destroying_delete
+  ;
+*/
+
+/**
+ * The deallocator function associated with a `delete`, `delete[]`, `new`, or
+ * `new[]` expression. For a `new` or `new[]` expression, the deallocator is the
+ * one used to free memory if the initialization throws an exception.
+ * The `form` column specifies whether the deallocation call contains a size
+ * argument, and alignment argument, or both.
+ */
+expr_deallocator(
+    unique int expr: @new_or_delete_expr ref,
+    int func: @function ref,
+    int form: int ref
+);
+
+/**
+ * Holds if the `@conditionalexpr` is of the two operand form
+ * `guard ? : false`.
+ */
+expr_cond_two_operand(
+    unique int cond: @conditionalexpr ref
+);
+
+/**
+ * The guard of `@conditionalexpr` `guard ? true : false`
+ */
+expr_cond_guard(
+    unique int cond: @conditionalexpr ref,
+    int guard: @expr ref
+);
+
+/**
+ * The expression used when the guard of `@conditionalexpr`
+ * `guard ? true : false` holds. For the two operand form
+ * `guard ?: false` consider using `expr_cond_guard` instead.
+ */
+expr_cond_true(
+    unique int cond: @conditionalexpr ref,
+    int true: @expr ref
+);
+
+/**
+ * The expression used when the guard of `@conditionalexpr`
+ * `guard ? true : false` does not hold.
+ */
+expr_cond_false(
+    unique int cond: @conditionalexpr ref,
+    int false: @expr ref
+);
+
+/** A string representation of the value. */
+values(
+    unique int id: @value,
+    string str: string ref
+);
+
+/** The actual text in the source code for the value, if any. */
+valuetext(
+    unique int id: @value ref,
+    string text: string ref
+);
+
+valuebind(
+    int val: @value ref,
+    unique int expr: @expr ref
+);
+
+fieldoffsets(
+    unique int id: @variable ref,
+    int byteoffset: int ref,
+    int bitoffset: int ref
+);
+
+bitfield(
+    unique int id: @variable ref,
+    int bits: int ref,
+    int declared_bits: int ref
+);
+
+/* TODO
+memberprefix(
+    int member: @expr ref,
+    int prefix: @expr ref
+);
+*/
+
+/*
+   kind(1) = mbrcallexpr
+   kind(2) = mbrptrcallexpr
+   kind(3) = mbrptrmbrcallexpr
+   kind(4) = ptrmbrptrmbrcallexpr
+   kind(5) = mbrreadexpr // x.y
+   kind(6) = mbrptrreadexpr // p->y
+   kind(7) = mbrptrmbrreadexpr // x.*pm
+   kind(8) = mbrptrmbrptrreadexpr // x->*pm
+   kind(9) = staticmbrreadexpr // static x.y
+   kind(10) = staticmbrptrreadexpr // static p->y
+*/
+/* TODO
+memberaccess(
+    int member: @expr ref,
+    int kind: int ref
+);
+*/
+
+initialisers(
+    unique int init: @initialiser,
+    int var: @accessible ref,
+    unique int expr: @expr ref,
+    int location: @location_expr ref
+);
+
+braced_initialisers(
+    int init: @initialiser ref
+);
+
+/**
+ * An ancestor for the expression, for cases in which we cannot
+ * otherwise find the expression's parent.
+ */
+expr_ancestor(
+    int exp: @expr ref,
+    int ancestor: @element ref
+);
+
+exprs(
+    unique int id: @expr,
+    int kind: int ref,
+    int location: @location_expr ref
+);
+
+expr_reuse(
+    int reuse: @expr ref,
+    int original: @expr ref,
+    int value_category: int ref
+)
+
+/*
+  case @value.category of
+    1 = prval
+  | 2 = xval
+  | 3 = lval
+  ;
+*/
+expr_types(
+    int id: @expr ref,
+    int typeid: @type ref,
+    int value_category: int ref
+);
+
+case @expr.kind of
+    1 = @errorexpr
+|   2 = @address_of // & AddressOfExpr
+|   3 = @reference_to // ReferenceToExpr (implicit?)
+|   4 = @indirect // * PointerDereferenceExpr
+|   5 = @ref_indirect // ReferenceDereferenceExpr (implicit?)
+// ...
+|   8 = @array_to_pointer // (???)
+|   9 = @vacuous_destructor_call // VacuousDestructorCall
+// ...
+|  11 = @assume // Microsoft
+|  12 = @parexpr
+|  13 = @arithnegexpr
+|  14 = @unaryplusexpr
+|  15 = @complementexpr
+|  16 = @notexpr
+|  17 = @conjugation // GNU ~ operator
+|  18 = @realpartexpr // GNU __real
+|  19 = @imagpartexpr // GNU __imag
+|  20 = @postincrexpr
+|  21 = @postdecrexpr
+|  22 = @preincrexpr
+|  23 = @predecrexpr
+|  24 = @conditionalexpr
+|  25 = @addexpr
+|  26 = @subexpr
+|  27 = @mulexpr
+|  28 = @divexpr
+|  29 = @remexpr
+|  30 = @jmulexpr // C99 mul imaginary
+|  31 = @jdivexpr // C99 div imaginary
+|  32 = @fjaddexpr // C99 add real + imaginary
+|  33 = @jfaddexpr // C99 add imaginary + real
+|  34 = @fjsubexpr // C99 sub real - imaginary
+|  35 = @jfsubexpr // C99 sub imaginary - real
+|  36 = @paddexpr // pointer add (pointer + int or int + pointer)
+|  37 = @psubexpr // pointer sub (pointer - integer)
+|  38 = @pdiffexpr // difference between two pointers
+|  39 = @lshiftexpr
+|  40 = @rshiftexpr
+|  41 = @andexpr
+|  42 = @orexpr
+|  43 = @xorexpr
+|  44 = @eqexpr
+|  45 = @neexpr
+|  46 = @gtexpr
+|  47 = @ltexpr
+|  48 = @geexpr
+|  49 = @leexpr
+|  50 = @minexpr // GNU minimum
+|  51 = @maxexpr // GNU maximum
+|  52 = @assignexpr
+|  53 = @assignaddexpr
+|  54 = @assignsubexpr
+|  55 = @assignmulexpr
+|  56 = @assigndivexpr
+|  57 = @assignremexpr
+|  58 = @assignlshiftexpr
+|  59 = @assignrshiftexpr
+|  60 = @assignandexpr
+|  61 = @assignorexpr
+|  62 = @assignxorexpr
+|  63 = @assignpaddexpr // assign pointer add
+|  64 = @assignpsubexpr // assign pointer sub
+|  65 = @andlogicalexpr
+|  66 = @orlogicalexpr
+|  67 = @commaexpr
+|  68 = @subscriptexpr // access to member of an array, e.g., a[5]
+// ...  69 @objc_subscriptexpr deprecated
+// ...  70 @cmdaccess deprecated
+// ...
+|  73 = @virtfunptrexpr
+|  74 = @callexpr
+// ...  75 @msgexpr_normal deprecated
+// ...  76 @msgexpr_super deprecated
+// ...  77 @atselectorexpr deprecated
+// ...  78 @atprotocolexpr deprecated
+|  79 = @vastartexpr
+|  80 = @vaargexpr
+|  81 = @vaendexpr
+|  82 = @vacopyexpr
+// ...  83 @atencodeexpr deprecated
+|  84 = @varaccess
+|  85 = @thisaccess
+// ...  86 @objc_box_expr deprecated
+|  87 = @new_expr
+|  88 = @delete_expr
+|  89 = @throw_expr
+|  90 = @condition_decl // a variable declared in a condition, e.g., if(int x = y > 2)
+|  91 = @braced_init_list
+|  92 = @type_id
+|  93 = @runtime_sizeof
+|  94 = @runtime_alignof
+|  95 = @sizeof_pack
+|  96 = @expr_stmt // GNU extension
+|  97 = @routineexpr
+|  98 = @type_operand // used to access a type in certain contexts (haven't found any examples yet....)
+|  99 = @offsetofexpr // offsetof ::= type and field
+| 100 = @hasassignexpr // __has_assign ::= type
+| 101 = @hascopyexpr // __has_copy ::= type
+| 102 = @hasnothrowassign // __has_nothrow_assign ::= type
+| 103 = @hasnothrowconstr // __has_nothrow_constructor ::= type
+| 104 = @hasnothrowcopy // __has_nothrow_copy ::= type
+| 105 = @hastrivialassign // __has_trivial_assign ::= type
+| 106 = @hastrivialconstr // __has_trivial_constructor ::= type
+| 107 = @hastrivialcopy // __has_trivial_copy ::= type
+| 108 = @hasuserdestr // __has_user_destructor ::= type
+| 109 = @hasvirtualdestr // __has_virtual_destructor ::= type
+| 110 = @isabstractexpr // __is_abstract ::= type
+| 111 = @isbaseofexpr // __is_base_of ::= type type
+| 112 = @isclassexpr // __is_class ::= type
+| 113 = @isconvtoexpr // __is_convertible_to ::= type type
+| 114 = @isemptyexpr // __is_empty ::= type
+| 115 = @isenumexpr // __is_enum ::= type
+| 116 = @ispodexpr // __is_pod ::= type
+| 117 = @ispolyexpr // __is_polymorphic ::= type
+| 118 = @isunionexpr // __is_union ::= type
+| 119 = @typescompexpr // GNU __builtin_types_compatible ::= type type
+| 120 = @intaddrexpr // frontend internal builtin, used to implement offsetof
+// ...
+| 122 = @hastrivialdestructor // __has_trivial_destructor ::= type
+| 123 = @literal
+| 124 = @uuidof
+| 127 = @aggregateliteral
+| 128 = @delete_array_expr
+| 129 = @new_array_expr
+// ... 130 @objc_array_literal deprecated
+// ... 131 @objc_dictionary_literal deprecated
+| 132 = @foldexpr
+// ...
+| 200 = @ctordirectinit
+| 201 = @ctorvirtualinit
+| 202 = @ctorfieldinit
+| 203 = @ctordelegatinginit
+| 204 = @dtordirectdestruct
+| 205 = @dtorvirtualdestruct
+| 206 = @dtorfielddestruct
+// ...
+| 210 = @static_cast
+| 211 = @reinterpret_cast
+| 212 = @const_cast
+| 213 = @dynamic_cast
+| 214 = @c_style_cast
+| 215 = @lambdaexpr
+| 216 = @param_ref
+| 217 = @noopexpr
+// ...
+| 294 = @istriviallyconstructibleexpr
+| 295 = @isdestructibleexpr
+| 296 = @isnothrowdestructibleexpr
+| 297 = @istriviallydestructibleexpr
+| 298 = @istriviallyassignableexpr
+| 299 = @isnothrowassignableexpr
+| 300 = @istrivialexpr
+| 301 = @isstandardlayoutexpr
+| 302 = @istriviallycopyableexpr
+| 303 = @isliteraltypeexpr
+| 304 = @hastrivialmoveconstructorexpr
+| 305 = @hastrivialmoveassignexpr
+| 306 = @hasnothrowmoveassignexpr
+| 307 = @isconstructibleexpr
+| 308 = @isnothrowconstructibleexpr
+| 309 = @hasfinalizerexpr
+| 310 = @isdelegateexpr
+| 311 = @isinterfaceclassexpr
+| 312 = @isrefarrayexpr
+| 313 = @isrefclassexpr
+| 314 = @issealedexpr
+| 315 = @issimplevalueclassexpr
+| 316 = @isvalueclassexpr
+| 317 = @isfinalexpr
+| 319 = @noexceptexpr
+| 320 = @builtinshufflevector
+| 321 = @builtinchooseexpr
+| 322 = @builtinaddressof
+| 323 = @vec_fill
+| 324 = @builtinconvertvector
+| 325 = @builtincomplex
+| 326 = @spaceshipexpr
+| 327 = @co_await
+| 328 = @co_yield
+| 329 = @temp_init
+| 330 = @isassignable
+| 331 = @isaggregate
+| 332 = @hasuniqueobjectrepresentations
+| 333 = @builtinbitcast
+| 334 = @builtinshuffle
+| 335 = @blockassignexpr
+| 336 = @issame
+| 337 = @isfunction
+| 338 = @islayoutcompatible
+| 339 = @ispointerinterconvertiblebaseof
+| 340 = @isarray
+| 341 = @arrayrank
+| 342 = @arrayextent
+| 343 = @isarithmetic
+| 344 = @iscompletetype
+| 345 = @iscompound
+| 346 = @isconst
+| 347 = @isfloatingpoint
+| 348 = @isfundamental
+| 349 = @isintegral
+| 350 = @islvaluereference
+| 351 = @ismemberfunctionpointer
+| 352 = @ismemberobjectpointer
+| 353 = @ismemberpointer
+| 354 = @isobject
+| 355 = @ispointer
+| 356 = @isreference
+| 357 = @isrvaluereference
+| 358 = @isscalar
+| 359 = @issigned
+| 360 = @isunsigned
+| 361 = @isvoid
+| 362 = @isvolatile
+| 363 = @reuseexpr
+| 364 = @istriviallycopyassignable
+| 365 = @isassignablenopreconditioncheck
+| 366 = @referencebindstotemporary
+| 367 = @issameas
+| 368 = @builtinhasattribute
+| 369 = @ispointerinterconvertiblewithclass
+| 370 = @builtinispointerinterconvertiblewithclass
+| 371 = @iscorrespondingmember
+| 372 = @builtiniscorrespondingmember
+| 373 = @isboundedarray
+| 374 = @isunboundedarray
+| 375 = @isreferenceable
+| 378 = @isnothrowconvertible
+| 379 = @referenceconstructsfromtemporary
+| 380 = @referenceconvertsfromtemporary
+| 381 = @isconvertible
+| 382 = @isvalidwinrttype
+| 383 = @iswinclass
+| 384 = @iswininterface
+| 385 = @istriviallyequalitycomparable
+| 386 = @isscopedenum
+| 387 = @istriviallyrelocatable
+| 388 = @datasizeof
+| 389 = @c11_generic
+;
+
+@var_args_expr = @vastartexpr
+               | @vaendexpr
+               | @vaargexpr
+               | @vacopyexpr
+               ;
+
+@builtin_op = @var_args_expr
+            | @noopexpr
+            | @offsetofexpr
+            | @intaddrexpr
+            | @hasassignexpr
+            | @hascopyexpr
+            | @hasnothrowassign
+            | @hasnothrowconstr
+            | @hasnothrowcopy
+            | @hastrivialassign
+            | @hastrivialconstr
+            | @hastrivialcopy
+            | @hastrivialdestructor
+            | @hasuserdestr
+            | @hasvirtualdestr
+            | @isabstractexpr
+            | @isbaseofexpr
+            | @isclassexpr
+            | @isconvtoexpr
+            | @isemptyexpr
+            | @isenumexpr
+            | @ispodexpr
+            | @ispolyexpr
+            | @isunionexpr
+            | @typescompexpr
+            | @builtinshufflevector
+            | @builtinconvertvector
+            | @builtinaddressof
+            | @istriviallyconstructibleexpr
+            | @isdestructibleexpr
+            | @isnothrowdestructibleexpr
+            | @istriviallydestructibleexpr
+            | @istriviallyassignableexpr
+            | @isnothrowassignableexpr
+            | @istrivialexpr
+            | @isstandardlayoutexpr
+            | @istriviallycopyableexpr
+            | @isliteraltypeexpr
+            | @hastrivialmoveconstructorexpr
+            | @hastrivialmoveassignexpr
+            | @hasnothrowmoveassignexpr
+            | @isconstructibleexpr
+            | @isnothrowconstructibleexpr
+            | @hasfinalizerexpr
+            | @isdelegateexpr
+            | @isinterfaceclassexpr
+            | @isrefarrayexpr
+            | @isrefclassexpr
+            | @issealedexpr
+            | @issimplevalueclassexpr
+            | @isvalueclassexpr
+            | @isfinalexpr
+            | @builtinchooseexpr
+            | @builtincomplex
+            | @isassignable
+            | @isaggregate
+            | @hasuniqueobjectrepresentations
+            | @builtinbitcast
+            | @builtinshuffle
+            | @issame
+            | @isfunction
+            | @islayoutcompatible
+            | @ispointerinterconvertiblebaseof
+            | @isarray
+            | @arrayrank
+            | @arrayextent
+            | @isarithmetic
+            | @iscompletetype
+            | @iscompound
+            | @isconst
+            | @isfloatingpoint
+            | @isfundamental
+            | @isintegral
+            | @islvaluereference
+            | @ismemberfunctionpointer
+            | @ismemberobjectpointer
+            | @ismemberpointer
+            | @isobject
+            | @ispointer
+            | @isreference
+            | @isrvaluereference
+            | @isscalar
+            | @issigned
+            | @isunsigned
+            | @isvoid
+            | @isvolatile
+            | @istriviallycopyassignable
+            | @isassignablenopreconditioncheck
+            | @referencebindstotemporary
+            | @issameas
+            | @builtinhasattribute
+            | @ispointerinterconvertiblewithclass
+            | @builtinispointerinterconvertiblewithclass
+            | @iscorrespondingmember
+            | @builtiniscorrespondingmember
+            | @isboundedarray
+            | @isunboundedarray
+            | @isreferenceable
+            | @isnothrowconvertible
+            | @referenceconstructsfromtemporary
+            | @referenceconvertsfromtemporary
+            | @isconvertible
+            | @isvalidwinrttype
+            | @iswinclass
+            | @iswininterface
+            | @istriviallyequalitycomparable
+            | @isscopedenum
+            | @istriviallyrelocatable
+            ;
+
+new_allocated_type(
+    unique int expr: @new_expr ref,
+    int type_id: @type ref
+);
+
+new_array_allocated_type(
+    unique int expr: @new_array_expr ref,
+    int type_id: @type ref
+);
+
+/**
+ * The field being initialized by an initializer expression within an aggregate
+ * initializer for a class/struct/union. Position is used to sort repeated initializers.
+ */
+#keyset[aggregate, position]
+aggregate_field_init(
+    int aggregate: @aggregateliteral ref,
+    int initializer: @expr ref,
+    int field: @membervariable ref,
+    int position: int ref
+);
+
+/**
+ * The index of the element being initialized by an initializer expression
+ * within an aggregate initializer for an array. Position is used to sort repeated initializers.
+ */
+#keyset[aggregate, position]
+aggregate_array_init(
+    int aggregate: @aggregateliteral ref,
+    int initializer: @expr ref,
+    int element_index: int ref,
+    int position: int ref
+);
+
+@ctorinit = @ctordirectinit
+          | @ctorvirtualinit
+          | @ctorfieldinit
+          | @ctordelegatinginit;
+@dtordestruct = @dtordirectdestruct
+              | @dtorvirtualdestruct
+              | @dtorfielddestruct;
+
+
+condition_decl_bind(
+    unique int expr: @condition_decl ref,
+    unique int decl: @declaration ref
+);
+
+typeid_bind(
+    unique int expr: @type_id ref,
+    int type_id: @type ref
+);
+
+uuidof_bind(
+    unique int expr: @uuidof ref,
+    int type_id: @type ref
+);
+
+@runtime_sizeof_or_alignof = @runtime_sizeof | @runtime_alignof | @datasizeof;
+
+sizeof_bind(
+    unique int expr: @runtime_sizeof_or_alignof ref,
+    int type_id: @type ref
+);
+
+code_block(
+    unique int block: @literal ref,
+    unique int routine: @function ref
+);
+
+lambdas(
+    unique int expr: @lambdaexpr ref,
+    string default_capture: string ref,
+    boolean has_explicit_return_type: boolean ref
+);
+
+lambda_capture(
+    unique int id: @lambdacapture,
+    int lambda: @lambdaexpr ref,
+    int index: int ref,
+    int field: @membervariable ref,
+    boolean captured_by_reference: boolean ref,
+    boolean is_implicit: boolean ref,
+    int location: @location_default ref
+);
+
+@funbindexpr = @routineexpr
+             | @new_expr
+             | @delete_expr
+             | @delete_array_expr
+             | @ctordirectinit
+             | @ctorvirtualinit
+             | @ctordelegatinginit
+             | @dtordirectdestruct
+             | @dtorvirtualdestruct;
+
+@varbindexpr = @varaccess | @ctorfieldinit | @dtorfielddestruct;
+@addressable = @function | @variable ;
+@accessible = @addressable | @enumconstant ;
+
+@access = @varaccess | @routineexpr ;
+
+fold(
+    int expr: @foldexpr ref,
+    string operator: string ref,
+    boolean is_left_fold: boolean ref
+);
+
+stmts(
+    unique int id: @stmt,
+    int kind: int ref,
+    int location: @location_stmt ref
+);
+
+case @stmt.kind of
+    1 = @stmt_expr
+|   2 = @stmt_if
+|   3 = @stmt_while
+|   4 = @stmt_goto
+|   5 = @stmt_label
+|   6 = @stmt_return
+|   7 = @stmt_block
+|   8 = @stmt_end_test_while // do { ... } while ( ... )
+|   9 = @stmt_for
+|  10 = @stmt_switch_case
+|  11 = @stmt_switch
+|  13 = @stmt_asm // "asm" statement or the body of an asm function
+|  15 = @stmt_try_block
+|  16 = @stmt_microsoft_try // Microsoft
+|  17 = @stmt_decl
+|  18 = @stmt_set_vla_size // C99
+|  19 = @stmt_vla_decl // C99
+|  25 = @stmt_assigned_goto // GNU
+|  26 = @stmt_empty
+|  27 = @stmt_continue
+|  28 = @stmt_break
+|  29 = @stmt_range_based_for // C++11
+// ...  30 @stmt_at_autoreleasepool_block deprecated
+// ...  31 @stmt_objc_for_in deprecated
+// ...  32 @stmt_at_synchronized deprecated
+|  33 = @stmt_handler
+// ...  34 @stmt_finally_end deprecated
+|  35 = @stmt_constexpr_if
+|  37 = @stmt_co_return
+;
+
+type_vla(
+    int type_id: @type ref,
+    int decl: @stmt_vla_decl ref
+);
+
+variable_vla(
+    int var: @variable ref,
+    int decl: @stmt_vla_decl ref
+);
+
+if_initialization(
+    unique int if_stmt: @stmt_if ref,
+    int init_id: @stmt ref
+);
+
+if_then(
+    unique int if_stmt: @stmt_if ref,
+    int then_id: @stmt ref
+);
+
+if_else(
+    unique int if_stmt: @stmt_if ref,
+    int else_id: @stmt ref
+);
+
+constexpr_if_initialization(
+    unique int constexpr_if_stmt: @stmt_constexpr_if ref,
+    int init_id: @stmt ref
+);
+
+constexpr_if_then(
+    unique int constexpr_if_stmt: @stmt_constexpr_if ref,
+    int then_id: @stmt ref
+);
+
+constexpr_if_else(
+    unique int constexpr_if_stmt: @stmt_constexpr_if ref,
+    int else_id: @stmt ref
+);
+
+while_body(
+    unique int while_stmt: @stmt_while ref,
+    int body_id: @stmt ref
+);
+
+do_body(
+    unique int do_stmt: @stmt_end_test_while ref,
+    int body_id: @stmt ref
+);
+
+switch_initialization(
+    unique int switch_stmt: @stmt_switch ref,
+    int init_id: @stmt ref
+);
+
+#keyset[switch_stmt, index]
+switch_case(
+    int switch_stmt: @stmt_switch ref,
+    int index: int ref,
+    int case_id: @stmt_switch_case ref
+);
+
+switch_body(
+    unique int switch_stmt: @stmt_switch ref,
+    int body_id: @stmt ref
+);
+
+@stmt_for_or_range_based_for = @stmt_for
+                             | @stmt_range_based_for;
+
+for_initialization(
+    unique int for_stmt: @stmt_for_or_range_based_for ref,
+    int init_id: @stmt ref
+);
+
+for_condition(
+    unique int for_stmt: @stmt_for ref,
+    int condition_id: @expr ref
+);
+
+for_update(
+    unique int for_stmt: @stmt_for ref,
+    int update_id: @expr ref
+);
+
+for_body(
+    unique int for_stmt: @stmt_for ref,
+    int body_id: @stmt ref
+);
+
+@stmtparent = @stmt | @expr_stmt ;
+stmtparents(
+    unique int id: @stmt ref,
+    int index: int ref,
+    int parent: @stmtparent ref
+);
+
+ishandler(unique int block: @stmt_block ref);
+
+@cfgnode = @stmt | @expr | @function | @initialiser ;
+
+stmt_decl_bind(
+    int stmt: @stmt_decl ref,
+    int num: int ref,
+    int decl: @declaration ref
+);
+
+stmt_decl_entry_bind(
+    int stmt: @stmt_decl ref,
+    int num: int ref,
+    int decl_entry: @element ref
+);
+
+@functionorblock = @function | @stmt_block;
+
+blockscope(
+    unique int block: @stmt_block ref,
+    int enclosing: @functionorblock ref
+);
+
+@jump = @stmt_goto | @stmt_break | @stmt_continue;
+
+@jumporlabel = @jump | @stmt_label | @literal;
+
+jumpinfo(
+    unique int id: @jumporlabel ref,
+    string str: string ref,
+    int target: @stmt ref
+);
+
+preprocdirects(
+    unique int id: @preprocdirect,
+    int kind: int ref,
+    int location: @location_default ref
+);
+case @preprocdirect.kind of
+   0 = @ppd_if
+|  1 = @ppd_ifdef
+|  2 = @ppd_ifndef
+|  3 = @ppd_elif
+|  4 = @ppd_else
+|  5 = @ppd_endif
+|  6 = @ppd_plain_include
+|  7 = @ppd_define
+|  8 = @ppd_undef
+|  9 = @ppd_line
+| 10 = @ppd_error
+| 11 = @ppd_pragma
+| 12 = @ppd_objc_import
+| 13 = @ppd_include_next
+| 18 = @ppd_warning
+;
+
+@ppd_include = @ppd_plain_include | @ppd_objc_import | @ppd_include_next;
+
+@ppd_branch = @ppd_if | @ppd_ifdef | @ppd_ifndef | @ppd_elif;
+
+preprocpair(
+    int begin : @ppd_branch ref,
+    int elseelifend : @preprocdirect ref
+);
+
+preproctrue(int branch : @ppd_branch ref);
+preprocfalse(int branch : @ppd_branch ref);
+
+preproctext(
+    unique int id: @preprocdirect ref,
+    string head: string ref,
+    string body: string ref
+);
+
+includes(
+    unique int id: @ppd_include ref,
+    int included: @file ref
+);
+
+link_targets(
+    int id: @link_target,
+    int binary: @file ref
+);
+
+link_parent(
+    int element : @element ref,
+    int link_target : @link_target ref
+);
+
+/* XML Files */
+
+xmlEncoding(unique int id: @file ref, string encoding: string ref);
+
+xmlDTDs(
+    unique int id: @xmldtd,
+    string root: string ref,
+    string publicId: string ref,
+    string systemId: string ref,
+    int fileid: @file ref
+);
+
+xmlElements(
+    unique int id: @xmlelement,
+    string name: string ref,
+    int parentid: @xmlparent ref,
+    int idx: int ref,
+    int fileid: @file ref
+);
+
+xmlAttrs(
+    unique int id: @xmlattribute,
+    int elementid: @xmlelement ref,
+    string name: string ref,
+    string value: string ref,
+    int idx: int ref,
+    int fileid: @file ref
+);
+
+xmlNs(
+    int id: @xmlnamespace,
+    string prefixName: string ref,
+    string URI: string ref,
+    int fileid: @file ref
+);
+
+xmlHasNs(
+    int elementId: @xmlnamespaceable ref,
+    int nsId: @xmlnamespace ref,
+    int fileid: @file ref
+);
+
+xmlComments(
+    unique int id: @xmlcomment,
+    string text: string ref,
+    int parentid: @xmlparent ref,
+    int fileid: @file ref
+);
+
+xmlChars(
+    unique int id: @xmlcharacters,
+    string text: string ref,
+    int parentid: @xmlparent ref,
+    int idx: int ref,
+    int isCDATA: int ref,
+    int fileid: @file ref
+);
+
+@xmlparent = @file | @xmlelement;
+@xmlnamespaceable = @xmlelement | @xmlattribute;
+
+xmllocations(
+    int xmlElement: @xmllocatable ref,
+    int location: @location_default ref
+);
+
+@xmllocatable = @xmlcharacters
+              | @xmlelement
+              | @xmlcomment
+              | @xmlattribute
+              | @xmldtd
+              | @file
+              | @xmlnamespace;
diff --git a/cpp/ql/lib/upgrades/7ff6a6e53dbcff09d1b9b758b594bc6d17366863/semmlecode.cpp.dbscheme b/cpp/ql/lib/upgrades/7ff6a6e53dbcff09d1b9b758b594bc6d17366863/semmlecode.cpp.dbscheme
new file mode 100644
index 000000000000..6f5d51e89e76
--- /dev/null
+++ b/cpp/ql/lib/upgrades/7ff6a6e53dbcff09d1b9b758b594bc6d17366863/semmlecode.cpp.dbscheme
@@ -0,0 +1,2316 @@
+
+/**
+ * An invocation of the compiler. Note that more than one file may be
+ * compiled per invocation. For example, this command compiles three
+ * source files:
+ *
+ *   gcc -c f1.c f2.c f3.c
+ *
+ * The `id` simply identifies the invocation, while `cwd` is the working
+ * directory from which the compiler was invoked.
+ */
+compilations(
+    /**
+     * An invocation of the compiler. Note that more than one file may
+     * be compiled per invocation. For example, this command compiles
+     * three source files:
+     *
+     *   gcc -c f1.c f2.c f3.c
+     */
+    unique int id : @compilation,
+    string cwd : string ref
+);
+
+/**
+ * The arguments that were passed to the extractor for a compiler
+ * invocation. If `id` is for the compiler invocation
+ *
+ *   gcc -c f1.c f2.c f3.c
+ *
+ * then typically there will be rows for
+ *
+ * num | arg
+ * --- | ---
+ * 0   | *path to extractor*
+ * 1   | `--mimic`
+ * 2   | `/usr/bin/gcc`
+ * 3   | `-c`
+ * 4   | f1.c
+ * 5   | f2.c
+ * 6   | f3.c
+ */
+#keyset[id, num]
+compilation_args(
+    int id : @compilation ref,
+    int num : int ref,
+    string arg : string ref
+);
+
+/**
+ * The source files that are compiled by a compiler invocation.
+ * If `id` is for the compiler invocation
+ *
+ *   gcc -c f1.c f2.c f3.c
+ *
+ * then there will be rows for
+ *
+ * num | arg
+ * --- | ---
+ * 0   | f1.c
+ * 1   | f2.c
+ * 2   | f3.c
+ *
+ * Note that even if those files `#include` headers, those headers
+ * do not appear as rows.
+ */
+#keyset[id, num]
+compilation_compiling_files(
+    int id : @compilation ref,
+    int num : int ref,
+    int file : @file ref
+);
+
+/**
+ * The time taken by the extractor for a compiler invocation.
+ *
+ * For each file `num`, there will be rows for
+ *
+ * kind | seconds
+ * ---- | ---
+ * 1    | CPU seconds used by the extractor frontend
+ * 2    | Elapsed seconds during the extractor frontend
+ * 3    | CPU seconds used by the extractor backend
+ * 4    | Elapsed seconds during the extractor backend
+ */
+#keyset[id, num, kind]
+compilation_time(
+    int id : @compilation ref,
+    int num : int ref,
+    /* kind:
+       1 = frontend_cpu_seconds
+       2 = frontend_elapsed_seconds
+       3 = extractor_cpu_seconds
+       4 = extractor_elapsed_seconds
+    */
+    int kind : int ref,
+    float seconds : float ref
+);
+
+/**
+ * An error or warning generated by the extractor.
+ * The diagnostic message `diagnostic` was generated during compiler
+ * invocation `compilation`, and is the `file_number_diagnostic_number`th
+ * message generated while extracting the `file_number`th file of that
+ * invocation.
+ */
+#keyset[compilation, file_number, file_number_diagnostic_number]
+diagnostic_for(
+    int diagnostic : @diagnostic ref,
+    int compilation : @compilation ref,
+    int file_number : int ref,
+    int file_number_diagnostic_number : int ref
+);
+
+/**
+ * If extraction was successful, then `cpu_seconds` and
+ * `elapsed_seconds` are the CPU time and elapsed time (respectively)
+ * that extraction took for compiler invocation `id`.
+ */
+compilation_finished(
+    unique int id : @compilation ref,
+    float cpu_seconds : float ref,
+    float elapsed_seconds : float ref
+);
+
+
+/**
+ * External data, loaded from CSV files during snapshot creation. See
+ * [Tutorial: Incorporating external data](https://help.semmle.com/wiki/display/SD/Tutorial%3A+Incorporating+external+data)
+ * for more information.
+ */
+externalData(
+    int id : @externalDataElement,
+    string path : string ref,
+    int column: int ref,
+    string value : string ref
+);
+
+/**
+ * The source location of the snapshot.
+ */
+sourceLocationPrefix(string prefix : string ref);
+
+/**
+ * Information about packages that provide code used during compilation.
+ * The `id` is just a unique identifier.
+ * The `namespace` is typically the name of the package manager that
+ * provided the package (e.g. "dpkg" or "yum").
+ * The `package_name` is the name of the package, and `version` is its
+ * version (as a string).
+ */
+external_packages(
+    unique int id: @external_package,
+    string namespace : string ref,
+    string package_name : string ref,
+    string version : string ref
+);
+
+/**
+ * Holds if File `fileid` was provided by package `package`.
+ */
+header_to_external_package(
+    int fileid : @file ref,
+    int package : @external_package ref
+);
+
+/*
+ * Version history
+ */
+
+svnentries(
+    unique int id : @svnentry,
+    string revision : string ref,
+    string author : string ref,
+    date revisionDate : date ref,
+    int changeSize : int ref
+)
+
+svnaffectedfiles(
+    int id : @svnentry ref,
+    int file : @file ref,
+    string action : string ref
+)
+
+svnentrymsg(
+    unique int id : @svnentry ref,
+    string message : string ref
+)
+
+svnchurn(
+    int commit : @svnentry ref,
+    int file : @file ref,
+    int addedLines : int ref,
+    int deletedLines : int ref
+)
+
+/*
+ * C++ dbscheme
+ */
+
+extractor_version(
+    string codeql_version: string ref,
+    string frontend_version: string ref
+)
+
+@location = @location_stmt | @location_expr | @location_default ;
+
+/**
+ * The location of an element that is not an expression or a statement.
+ * The location spans column `startcolumn` of line `startline` to
+ * column `endcolumn` of line `endline` in file `file`.
+ * For more information, see
+ * [Locations](https://codeql.github.com/docs/writing-codeql-queries/providing-locations-in-codeql-queries/).
+ */
+locations_default(
+    /** The location of an element that is not an expression or a statement. */
+    unique int id: @location_default,
+    int container: @container ref,
+    int startLine: int ref,
+    int startColumn: int ref,
+    int endLine: int ref,
+    int endColumn: int ref
+);
+
+/**
+ * The location of a statement.
+ * The location spans column `startcolumn` of line `startline` to
+ * column `endcolumn` of line `endline` in file `file`.
+ * For more information, see
+ * [Locations](https://codeql.github.com/docs/writing-codeql-queries/providing-locations-in-codeql-queries/).
+ */
+locations_stmt(
+    /** The location of a statement. */
+    unique int id: @location_stmt,
+    int container: @container ref,
+    int startLine: int ref,
+    int startColumn: int ref,
+    int endLine: int ref,
+    int endColumn: int ref
+);
+
+/**
+ * The location of an expression.
+ * The location spans column `startcolumn` of line `startline` to
+ * column `endcolumn` of line `endline` in file `file`.
+ * For more information, see
+ * [Locations](https://codeql.github.com/docs/writing-codeql-queries/providing-locations-in-codeql-queries/).
+ */
+locations_expr(
+    /** The location of an expression. */
+    unique int id: @location_expr,
+    int container: @container ref,
+    int startLine: int ref,
+    int startColumn: int ref,
+    int endLine: int ref,
+    int endColumn: int ref
+);
+
+/** An element for which line-count information is available. */
+@sourceline = @file | @function | @variable | @enumconstant | @xmllocatable;
+
+numlines(
+    int element_id: @sourceline ref,
+    int num_lines: int ref,
+    int num_code: int ref,
+    int num_comment: int ref
+);
+
+diagnostics(
+    unique int id: @diagnostic,
+    int severity: int ref,
+    string error_tag: string ref,
+    string error_message: string ref,
+    string full_error_message: string ref,
+    int location: @location_default ref
+);
+
+files(
+    unique int id: @file,
+    string name: string ref
+);
+
+folders(
+    unique int id: @folder,
+    string name: string ref
+);
+
+@container = @folder | @file
+
+containerparent(
+    int parent: @container ref,
+    unique int child: @container ref
+);
+
+fileannotations(
+    int id: @file ref,
+    int kind: int ref,
+    string name: string ref,
+    string value: string ref
+);
+
+inmacroexpansion(
+    int id: @element ref,
+    int inv: @macroinvocation ref
+);
+
+affectedbymacroexpansion(
+    int id: @element ref,
+    int inv: @macroinvocation ref
+);
+
+case @macroinvocation.kind of
+  1 = @macro_expansion
+| 2 = @other_macro_reference
+;
+
+macroinvocations(
+    unique int id: @macroinvocation,
+    int macro_id: @ppd_define ref,
+    int location: @location_default ref,
+    int kind: int ref
+);
+
+macroparent(
+    unique int id: @macroinvocation ref,
+    int parent_id: @macroinvocation ref
+);
+
+// a macroinvocation may be part of another location
+// the way to find a constant expression that uses a macro
+// is thus to find a constant expression that has a location
+// to which a macro invocation is bound
+macrolocationbind(
+    int id: @macroinvocation ref,
+    int location: @location ref
+);
+
+#keyset[invocation, argument_index]
+macro_argument_unexpanded(
+    int invocation: @macroinvocation ref,
+    int argument_index: int ref,
+    string text: string ref
+);
+
+#keyset[invocation, argument_index]
+macro_argument_expanded(
+    int invocation: @macroinvocation ref,
+    int argument_index: int ref,
+    string text: string ref
+);
+
+/*
+case @function.kind of
+  1 = @normal_function
+| 2 = @constructor
+| 3 = @destructor
+| 4 = @conversion_function
+| 5 = @operator
+| 6 = @builtin_function     // GCC built-in functions, e.g. __builtin___memcpy_chk
+| 7 = @user_defined_literal
+| 8 = @deduction_guide
+;
+*/
+
+functions(
+    unique int id: @function,
+    string name: string ref,
+    int kind: int ref
+);
+
+function_entry_point(
+    int id: @function ref,
+    unique int entry_point: @stmt ref
+);
+
+function_return_type(
+    int id: @function ref,
+    int return_type: @type ref
+);
+
+/**
+ * If `function` is a coroutine, then this gives the `std::experimental::resumable_traits`
+ * instance associated with it, and the variables representing the `handle` and `promise`
+ * for it.
+ */
+coroutine(
+  unique int function: @function ref,
+  int traits: @type ref
+);
+
+/*
+case @coroutine_placeholder_variable.kind of
+  1 = @handle
+| 2 = @promise
+| 3 = @init_await_resume
+;
+*/
+
+coroutine_placeholder_variable(
+  unique int placeholder_variable: @variable ref,
+  int kind: int ref,
+  int function: @function ref
+)
+
+/** The `new` function used for allocating the coroutine state, if any. */
+coroutine_new(
+  unique int function: @function ref,
+  int new: @function ref
+);
+
+/** The `delete` function used for deallocating the coroutine state, if any. */
+coroutine_delete(
+  unique int function: @function ref,
+  int delete: @function ref
+);
+
+purefunctions(unique int id: @function ref);
+
+function_deleted(unique int id: @function ref);
+
+function_defaulted(unique int id: @function ref);
+
+function_prototyped(unique int id: @function ref)
+
+deduction_guide_for_class(
+    int id: @function ref,
+    int class_template: @usertype ref
+)
+
+member_function_this_type(
+    unique int id: @function ref,
+    int this_type: @type ref
+);
+
+#keyset[id, type_id]
+fun_decls(
+    int id: @fun_decl,
+    int function: @function ref,
+    int type_id: @type ref,
+    string name: string ref,
+    int location: @location_default ref
+);
+fun_def(unique int id: @fun_decl ref);
+fun_specialized(unique int id: @fun_decl ref);
+fun_implicit(unique int id: @fun_decl ref);
+fun_decl_specifiers(
+    int id: @fun_decl ref,
+    string name: string ref
+)
+#keyset[fun_decl, index]
+fun_decl_throws(
+    int fun_decl: @fun_decl ref,
+    int index: int ref,
+    int type_id: @type ref
+);
+/* an empty throw specification is different from none */
+fun_decl_empty_throws(unique int fun_decl: @fun_decl ref);
+fun_decl_noexcept(
+    int fun_decl: @fun_decl ref,
+    int constant: @expr ref
+);
+fun_decl_empty_noexcept(int fun_decl: @fun_decl ref);
+fun_decl_typedef_type(
+    unique int fun_decl: @fun_decl ref,
+    int typedeftype_id: @usertype ref
+);
+
+param_decl_bind(
+    unique int id: @var_decl ref,
+    int index: int ref,
+    int fun_decl: @fun_decl ref
+);
+
+#keyset[id, type_id]
+var_decls(
+    int id: @var_decl,
+    int variable: @variable ref,
+    int type_id: @type ref,
+    string name: string ref,
+    int location: @location_default ref
+);
+var_def(unique int id: @var_decl ref);
+var_decl_specifiers(
+    int id: @var_decl ref,
+    string name: string ref
+)
+is_structured_binding(unique int id: @variable ref);
+
+type_decls(
+    unique int id: @type_decl,
+    int type_id: @type ref,
+    int location: @location_default ref
+);
+type_def(unique int id: @type_decl ref);
+type_decl_top(
+    unique int type_decl: @type_decl ref
+);
+
+namespace_decls(
+    unique int id: @namespace_decl,
+    int namespace_id: @namespace ref,
+    int location: @location_default ref,
+    int bodylocation: @location_default ref
+);
+
+case @using.kind of
+  1 = @using_declaration
+| 2 = @using_directive
+| 3 = @using_enum_declaration
+;
+
+usings(
+    unique int id: @using,
+    int element_id: @element ref,
+    int location: @location_default ref,
+    int kind: int ref
+);
+
+/** The element which contains the `using` declaration. */
+using_container(
+    int parent: @element ref,
+    int child: @using ref
+);
+
+static_asserts(
+    unique int id: @static_assert,
+    int condition : @expr ref,
+    string message : string ref,
+    int location: @location_default ref,
+    int enclosing : @element ref
+);
+
+// each function has an ordered list of parameters
+#keyset[id, type_id]
+#keyset[function, index, type_id]
+params(
+    int id: @parameter,
+    int function: @functionorblock ref,
+    int index: int ref,
+    int type_id: @type ref
+);
+
+overrides(
+    int new: @function ref,
+    int old: @function ref
+);
+
+#keyset[id, type_id]
+membervariables(
+    int id: @membervariable,
+    int type_id: @type ref,
+    string name: string ref
+);
+
+#keyset[id, type_id]
+globalvariables(
+    int id: @globalvariable,
+    int type_id: @type ref,
+    string name: string ref
+);
+
+#keyset[id, type_id]
+localvariables(
+    int id: @localvariable,
+    int type_id: @type ref,
+    string name: string ref
+);
+
+autoderivation(
+    unique int var: @variable ref,
+    int derivation_type: @type ref
+);
+
+orphaned_variables(
+    int var: @localvariable ref,
+    int function: @function ref
+)
+
+enumconstants(
+    unique int id: @enumconstant,
+    int parent: @usertype ref,
+    int index: int ref,
+    int type_id: @type ref,
+    string name: string ref,
+    int location: @location_default ref
+);
+
+@variable = @localscopevariable | @globalvariable | @membervariable;
+
+@localscopevariable = @localvariable | @parameter;
+
+/**
+ * Built-in types are the fundamental types, e.g., integral, floating, and void.
+ */
+case @builtintype.kind of
+   1 = @errortype
+|  2 = @unknowntype
+|  3 = @void
+|  4 = @boolean
+|  5 = @char
+|  6 = @unsigned_char
+|  7 = @signed_char
+|  8 = @short
+|  9 = @unsigned_short
+| 10 = @signed_short
+| 11 = @int
+| 12 = @unsigned_int
+| 13 = @signed_int
+| 14 = @long
+| 15 = @unsigned_long
+| 16 = @signed_long
+| 17 = @long_long
+| 18 = @unsigned_long_long
+| 19 = @signed_long_long
+// ... 20 Microsoft-specific __int8
+// ... 21 Microsoft-specific __int16
+// ... 22 Microsoft-specific __int32
+// ... 23 Microsoft-specific __int64
+| 24 = @float
+| 25 = @double
+| 26 = @long_double
+| 27 = @complex_float         // C99-specific _Complex float
+| 28 = @complex_double        // C99-specific _Complex double
+| 29 = @complex_long_double   // C99-specific _Complex long double
+| 30 = @imaginary_float       // C99-specific _Imaginary float
+| 31 = @imaginary_double      // C99-specific _Imaginary double
+| 32 = @imaginary_long_double // C99-specific _Imaginary long double
+| 33 = @wchar_t               // Microsoft-specific
+| 34 = @decltype_nullptr      // C++11
+| 35 = @int128                // __int128
+| 36 = @unsigned_int128       // unsigned __int128
+| 37 = @signed_int128         // signed __int128
+| 38 = @float128              // __float128
+| 39 = @complex_float128      // _Complex __float128
+| 40 = @decimal32             // _Decimal32
+| 41 = @decimal64             // _Decimal64
+| 42 = @decimal128            // _Decimal128
+| 43 = @char16_t
+| 44 = @char32_t
+| 45 = @std_float32           // _Float32
+| 46 = @float32x              // _Float32x
+| 47 = @std_float64           // _Float64
+| 48 = @float64x              // _Float64x
+| 49 = @std_float128          // _Float128
+// ... 50 _Float128x
+| 51 = @char8_t
+| 52 = @float16               // _Float16
+| 53 = @complex_float16       // _Complex _Float16
+| 54 = @fp16                  // __fp16
+| 55 = @std_bfloat16          // __bf16
+| 56 = @std_float16           // std::float16_t
+| 57 = @complex_std_float32   // _Complex _Float32
+| 58 = @complex_float32x      // _Complex _Float32x
+| 59 = @complex_std_float64   // _Complex _Float64
+| 60 = @complex_float64x      // _Complex _Float64x
+| 61 = @complex_std_float128  // _Complex _Float128
+;
+
+builtintypes(
+    unique int id: @builtintype,
+    string name: string ref,
+    int kind: int ref,
+    int size: int ref,
+    int sign: int ref,
+    int alignment: int ref
+);
+
+/**
+ * Derived types are types that are directly derived from existing types and
+ * point to, refer to, transform type data to return a new type.
+ */
+case @derivedtype.kind of
+   1 = @pointer
+|  2 = @reference
+|  3 = @type_with_specifiers
+|  4 = @array
+|  5 = @gnu_vector
+|  6 = @routineptr
+|  7 = @routinereference
+|  8 = @rvalue_reference // C++11
+// ... 9 type_conforming_to_protocols deprecated
+| 10 = @block
+;
+
+derivedtypes(
+    unique int id: @derivedtype,
+    string name: string ref,
+    int kind: int ref,
+    int type_id: @type ref
+);
+
+pointerishsize(unique int id: @derivedtype ref,
+    int size: int ref,
+    int alignment: int ref);
+
+arraysizes(
+    unique int id: @derivedtype ref,
+    int num_elements: int ref,
+    int bytesize: int ref,
+    int alignment: int ref
+);
+
+typedefbase(
+    unique int id: @usertype ref,
+    int type_id: @type ref
+);
+
+/**
+ * An instance of the C++11 `decltype` operator.  For example:
+ * ```
+ * int a;
+ * decltype(1+a) b;
+ * ```
+ * Here `expr` is `1+a`.
+ *
+ * Sometimes an additional pair of parentheses around the expression
+ * would change the semantics of this decltype, e.g.
+ * ```
+ * struct A { double x; };
+ * const A* a = new A();
+ * decltype( a->x ); // type is double
+ * decltype((a->x)); // type is const double&
+ * ```
+ * (Please consult the C++11 standard for more details).
+ * `parentheses_would_change_meaning` is `true` iff that is the case.
+ */
+#keyset[id, expr]
+decltypes(
+    int id: @decltype,
+    int expr: @expr ref,
+    int base_type: @type ref,
+    boolean parentheses_would_change_meaning: boolean ref
+);
+
+/*
+case @usertype.kind of
+   1 = @struct
+|  2 = @class
+|  3 = @union
+|  4 = @enum
+|  5 = @typedef                       // classic C: typedef typedef type name
+|  6 = @template
+|  7 = @template_parameter
+|  8 = @template_template_parameter
+|  9 = @proxy_class                   // a proxy class associated with a template parameter
+// ... 10 objc_class deprecated
+// ... 11 objc_protocol deprecated
+// ... 12 objc_category deprecated
+| 13 = @scoped_enum
+| 14 = @using_alias                  // a using name = type style typedef
+;
+*/
+
+usertypes(
+    unique int id: @usertype,
+    string name: string ref,
+    int kind: int ref
+);
+
+usertypesize(
+    unique int id: @usertype ref,
+    int size: int ref,
+    int alignment: int ref
+);
+
+usertype_final(unique int id: @usertype ref);
+
+usertype_uuid(
+    unique int id: @usertype ref,
+    string uuid: string ref
+);
+
+mangled_name(
+    unique int id: @declaration ref,
+    int mangled_name : @mangledname,
+    boolean is_complete: boolean ref
+);
+
+is_pod_class(unique int id: @usertype ref);
+is_standard_layout_class(unique int id: @usertype ref);
+
+is_complete(unique int id: @usertype ref);
+
+is_class_template(unique int id: @usertype ref);
+class_instantiation(
+    int to: @usertype ref,
+    int from: @usertype ref
+);
+class_template_argument(
+    int type_id: @usertype ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+class_template_argument_value(
+    int type_id: @usertype ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+
+is_proxy_class_for(
+    unique int id: @usertype ref,
+    unique int templ_param_id: @usertype ref
+);
+
+type_mentions(
+    unique int id: @type_mention,
+    int type_id: @type ref,
+    int location: @location ref,
+    // a_symbol_reference_kind from the frontend.
+    int kind: int ref
+);
+
+is_function_template(unique int id: @function ref);
+function_instantiation(
+    unique int to: @function ref,
+    int from: @function ref
+);
+function_template_argument(
+    int function_id: @function ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+function_template_argument_value(
+    int function_id: @function ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+
+is_variable_template(unique int id: @variable ref);
+variable_instantiation(
+    unique int to: @variable ref,
+    int from: @variable ref
+);
+variable_template_argument(
+    int variable_id: @variable ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+variable_template_argument_value(
+    int variable_id: @variable ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+
+routinetypes(
+    unique int id: @routinetype,
+    int return_type: @type ref
+);
+
+routinetypeargs(
+    int routine: @routinetype ref,
+    int index: int ref,
+    int type_id: @type ref
+);
+
+ptrtomembers(
+    unique int id: @ptrtomember,
+    int type_id: @type ref,
+    int class_id: @type ref
+);
+
+/*
+ specifiers for types, functions, and variables
+
+    "public",
+    "protected",
+    "private",
+
+    "const",
+    "volatile",
+    "static",
+
+    "pure",
+    "virtual",
+    "sealed", // Microsoft
+    "__interface", // Microsoft
+    "inline",
+    "explicit",
+
+    "near", // near far extension
+    "far", // near far extension
+    "__ptr32", // Microsoft
+    "__ptr64", // Microsoft
+    "__sptr", // Microsoft
+    "__uptr", // Microsoft
+    "dllimport", // Microsoft
+    "dllexport", // Microsoft
+    "thread", // Microsoft
+    "naked", // Microsoft
+    "microsoft_inline", // Microsoft
+    "forceinline", // Microsoft
+    "selectany", // Microsoft
+    "nothrow", // Microsoft
+    "novtable", // Microsoft
+    "noreturn", // Microsoft
+    "noinline", // Microsoft
+    "noalias", // Microsoft
+    "restrict", // Microsoft
+*/
+
+specifiers(
+    unique int id: @specifier,
+    unique string str: string ref
+);
+
+typespecifiers(
+    int type_id: @type ref,
+    int spec_id: @specifier ref
+);
+
+funspecifiers(
+    int func_id: @function ref,
+    int spec_id: @specifier ref
+);
+
+varspecifiers(
+    int var_id: @accessible ref,
+    int spec_id: @specifier ref
+);
+
+explicit_specifier_exprs(
+    unique int func_id: @function ref,
+    int constant: @expr ref
+)
+
+attributes(
+    unique int id: @attribute,
+    int kind: int ref,
+    string name: string ref,
+    string name_space: string ref,
+    int location: @location_default ref
+);
+
+case @attribute.kind of
+  0 = @gnuattribute
+| 1 = @stdattribute
+| 2 = @declspec
+| 3 = @msattribute
+| 4 = @alignas
+// ... 5 @objc_propertyattribute deprecated
+;
+
+attribute_args(
+    unique int id: @attribute_arg,
+    int kind: int ref,
+    int attribute: @attribute ref,
+    int index: int ref,
+    int location: @location_default ref
+);
+
+case @attribute_arg.kind of
+  0 = @attribute_arg_empty
+| 1 = @attribute_arg_token
+| 2 = @attribute_arg_constant
+| 3 = @attribute_arg_type
+| 4 = @attribute_arg_constant_expr
+| 5 = @attribute_arg_expr
+;
+
+attribute_arg_value(
+    unique int arg: @attribute_arg ref,
+    string value: string ref
+);
+attribute_arg_type(
+    unique int arg: @attribute_arg ref,
+    int type_id: @type ref
+);
+attribute_arg_constant(
+    unique int arg: @attribute_arg ref,
+    int constant: @expr ref
+)
+attribute_arg_expr(
+    unique int arg: @attribute_arg ref,
+    int expr: @expr ref
+)
+attribute_arg_name(
+    unique int arg: @attribute_arg ref,
+    string name: string ref
+);
+
+typeattributes(
+    int type_id: @type ref,
+    int spec_id: @attribute ref
+);
+
+funcattributes(
+    int func_id: @function ref,
+    int spec_id: @attribute ref
+);
+
+varattributes(
+    int var_id: @accessible ref,
+    int spec_id: @attribute ref
+);
+
+stmtattributes(
+    int stmt_id: @stmt ref,
+    int spec_id: @attribute ref
+);
+
+@type = @builtintype
+      | @derivedtype
+      | @usertype
+      /* TODO | @fixedpointtype */
+      | @routinetype
+      | @ptrtomember
+      | @decltype;
+
+unspecifiedtype(
+    unique int type_id: @type ref,
+    int unspecified_type_id: @type ref
+);
+
+member(
+    int parent: @type ref,
+    int index: int ref,
+    int child: @member ref
+);
+
+@enclosingfunction_child = @usertype | @variable | @namespace
+
+enclosingfunction(
+    unique int child: @enclosingfunction_child ref,
+    int parent: @function ref
+);
+
+derivations(
+    unique int derivation: @derivation,
+    int sub: @type ref,
+    int index: int ref,
+    int super: @type ref,
+    int location: @location_default ref
+);
+
+derspecifiers(
+    int der_id: @derivation ref,
+    int spec_id: @specifier ref
+);
+
+/**
+ * Contains the byte offset of the base class subobject within the derived
+ * class. Only holds for non-virtual base classes, but see table
+ * `virtual_base_offsets` for offsets of virtual base class subobjects.
+ */
+direct_base_offsets(
+    unique int der_id: @derivation ref,
+    int offset: int ref
+);
+
+/**
+ * Contains the byte offset of the virtual base class subobject for class
+ * `super` within a most-derived object of class `sub`. `super` can be either a
+ * direct or indirect base class.
+ */
+#keyset[sub, super]
+virtual_base_offsets(
+    int sub: @usertype ref,
+    int super: @usertype ref,
+    int offset: int ref
+);
+
+frienddecls(
+    unique int id: @frienddecl,
+    int type_id: @type ref,
+    int decl_id: @declaration ref,
+    int location: @location_default ref
+);
+
+@declaredtype = @usertype ;
+
+@declaration = @function
+             | @declaredtype
+             | @variable
+             | @enumconstant
+             | @frienddecl;
+
+@member = @membervariable
+        | @function
+        | @declaredtype
+        | @enumconstant;
+
+@locatable = @diagnostic
+           | @declaration
+           | @ppd_include
+           | @ppd_define
+           | @macroinvocation
+           /*| @funcall*/
+           | @xmllocatable
+           | @attribute
+           | @attribute_arg;
+
+@namedscope = @namespace | @usertype;
+
+@element = @locatable
+         | @file
+         | @folder
+         | @specifier
+         | @type
+         | @expr
+         | @namespace
+         | @initialiser
+         | @stmt
+         | @derivation
+         | @comment
+         | @preprocdirect
+         | @fun_decl
+         | @var_decl
+         | @type_decl
+         | @namespace_decl
+         | @using
+         | @namequalifier
+         | @specialnamequalifyingelement
+         | @static_assert
+         | @type_mention
+         | @lambdacapture;
+
+@exprparent = @element;
+
+comments(
+    unique int id: @comment,
+    string contents: string ref,
+    int location: @location_default ref
+);
+
+commentbinding(
+    int id: @comment ref,
+    int element: @element ref
+);
+
+exprconv(
+    int converted: @expr ref,
+    unique int conversion: @expr ref
+);
+
+compgenerated(unique int id: @element ref);
+
+/**
+ * `destructor_call` destructs the `i`'th entity that should be
+ * destructed following `element`. Note that entities should be
+ * destructed in reverse construction order, so for a given `element`
+ * these should be called from highest to lowest `i`.
+ */
+#keyset[element, destructor_call]
+#keyset[element, i]
+synthetic_destructor_call(
+    int element: @element ref,
+    int i: int ref,
+    int destructor_call: @routineexpr ref
+);
+
+namespaces(
+    unique int id: @namespace,
+    string name: string ref
+);
+
+namespace_inline(
+    unique int id: @namespace ref
+);
+
+namespacembrs(
+    int parentid: @namespace ref,
+    unique int memberid: @namespacembr ref
+);
+
+@namespacembr = @declaration | @namespace;
+
+exprparents(
+    int expr_id: @expr ref,
+    int child_index: int ref,
+    int parent_id: @exprparent ref
+);
+
+expr_isload(unique int expr_id: @expr ref);
+
+@cast = @c_style_cast
+      | @const_cast
+      | @dynamic_cast
+      | @reinterpret_cast
+      | @static_cast
+      ;
+
+/*
+case @conversion.kind of
+  0 = @simple_conversion           // a numeric conversion, qualification conversion, or a reinterpret_cast
+| 1 = @bool_conversion             // conversion to 'bool'
+| 2 = @base_class_conversion       // a derived-to-base conversion
+| 3 = @derived_class_conversion    // a base-to-derived conversion
+| 4 = @pm_base_class_conversion    // a derived-to-base conversion of a pointer to member
+| 5 = @pm_derived_class_conversion // a base-to-derived conversion of a pointer to member
+| 6 = @glvalue_adjust              // an adjustment of the type of a glvalue
+| 7 = @prvalue_adjust              // an adjustment of the type of a prvalue
+;
+*/
+/**
+ * Describes the semantics represented by a cast expression. This is largely
+ * independent of the source syntax of the cast, so it is separate from the
+ * regular expression kind.
+ */
+conversionkinds(
+    unique int expr_id: @cast ref,
+    int kind: int ref
+);
+
+@conversion = @cast
+            | @array_to_pointer
+            | @parexpr
+            | @reference_to
+            | @ref_indirect
+            | @temp_init
+            | @c11_generic
+            ;
+
+/*
+case @funbindexpr.kind of
+  0 = @normal_call  // a normal call
+| 1 = @virtual_call // a virtual call
+| 2 = @adl_call     // a call whose target is only found by ADL
+;
+*/
+iscall(
+    unique int caller: @funbindexpr ref,
+    int kind: int ref
+);
+
+numtemplatearguments(
+    unique int expr_id: @expr ref,
+    int num: int ref
+);
+
+specialnamequalifyingelements(
+    unique int id: @specialnamequalifyingelement,
+    unique string name: string ref
+);
+
+@namequalifiableelement = @expr | @namequalifier;
+@namequalifyingelement = @namespace
+                       | @specialnamequalifyingelement
+                       | @usertype;
+
+namequalifiers(
+    unique int id: @namequalifier,
+    unique int qualifiableelement: @namequalifiableelement ref,
+    int qualifyingelement: @namequalifyingelement ref,
+    int location: @location_default ref
+);
+
+varbind(
+    int expr: @varbindexpr ref,
+    int var: @accessible ref
+);
+
+funbind(
+    int expr: @funbindexpr ref,
+    int fun: @function ref
+);
+
+@any_new_expr = @new_expr
+              | @new_array_expr;
+
+@new_or_delete_expr = @any_new_expr
+                    | @delete_expr
+                    | @delete_array_expr;
+
+@prefix_crement_expr = @preincrexpr | @predecrexpr;
+
+@postfix_crement_expr = @postincrexpr | @postdecrexpr;
+
+@increment_expr = @preincrexpr | @postincrexpr;
+
+@decrement_expr = @predecrexpr | @postdecrexpr;
+
+@crement_expr = @increment_expr | @decrement_expr;
+
+@un_arith_op_expr = @arithnegexpr
+                  | @unaryplusexpr
+                  | @conjugation
+                  | @realpartexpr
+                  | @imagpartexpr
+                  | @crement_expr
+                  ;
+
+@un_bitwise_op_expr = @complementexpr;
+
+@un_log_op_expr = @notexpr;
+
+@un_op_expr = @address_of
+            | @indirect
+            | @un_arith_op_expr
+            | @un_bitwise_op_expr
+            | @builtinaddressof
+            | @vec_fill
+            | @un_log_op_expr
+            | @co_await
+            | @co_yield
+            ;
+
+@bin_log_op_expr = @andlogicalexpr | @orlogicalexpr;
+
+@cmp_op_expr = @eq_op_expr | @rel_op_expr;
+
+@eq_op_expr = @eqexpr | @neexpr;
+
+@rel_op_expr = @gtexpr
+             | @ltexpr
+             | @geexpr
+             | @leexpr
+             | @spaceshipexpr
+             ;
+
+@bin_bitwise_op_expr = @lshiftexpr
+                     | @rshiftexpr
+                     | @andexpr
+                     | @orexpr
+                     | @xorexpr
+                     ;
+
+@p_arith_op_expr = @paddexpr
+                 | @psubexpr
+                 | @pdiffexpr
+                 ;
+
+@bin_arith_op_expr = @addexpr
+                   | @subexpr
+                   | @mulexpr
+                   | @divexpr
+                   | @remexpr
+                   | @jmulexpr
+                   | @jdivexpr
+                   | @fjaddexpr
+                   | @jfaddexpr
+                   | @fjsubexpr
+                   | @jfsubexpr
+                   | @minexpr
+                   | @maxexpr
+                   | @p_arith_op_expr
+                   ;
+
+@bin_op_expr = @bin_arith_op_expr
+             | @bin_bitwise_op_expr
+             | @cmp_op_expr
+             | @bin_log_op_expr
+             ;
+
+@op_expr = @un_op_expr
+         | @bin_op_expr
+         | @assign_expr
+         | @conditionalexpr
+         ;
+
+@assign_arith_expr = @assignaddexpr
+                   | @assignsubexpr
+                   | @assignmulexpr
+                   | @assigndivexpr
+                   | @assignremexpr
+                   ;
+
+@assign_bitwise_expr = @assignandexpr
+                     | @assignorexpr
+                     | @assignxorexpr
+                     | @assignlshiftexpr
+                     | @assignrshiftexpr
+                     ;
+
+@assign_pointer_expr = @assignpaddexpr
+                     | @assignpsubexpr
+                     ;
+
+@assign_op_expr = @assign_arith_expr
+                | @assign_bitwise_expr
+                | @assign_pointer_expr
+                ;
+
+@assign_expr = @assignexpr | @assign_op_expr | @blockassignexpr
+
+/*
+  Binary encoding of the allocator form.
+
+  case @allocator.form of
+    0 = plain
+  | 1 = alignment
+  ;
+*/
+
+/**
+ * The allocator function associated with a `new` or `new[]` expression.
+ * The `form` column specified whether the allocation call contains an alignment
+ * argument.
+ */
+expr_allocator(
+    unique int expr: @any_new_expr ref,
+    int func: @function ref,
+    int form: int ref
+);
+
+/*
+  Binary encoding of the deallocator form.
+
+  case @deallocator.form of
+    0 = plain
+  | 1 = size
+  | 2 = alignment
+  | 4 = destroying_delete
+  ;
+*/
+
+/**
+ * The deallocator function associated with a `delete`, `delete[]`, `new`, or
+ * `new[]` expression. For a `new` or `new[]` expression, the deallocator is the
+ * one used to free memory if the initialization throws an exception.
+ * The `form` column specifies whether the deallocation call contains a size
+ * argument, and alignment argument, or both.
+ */
+expr_deallocator(
+    unique int expr: @new_or_delete_expr ref,
+    int func: @function ref,
+    int form: int ref
+);
+
+/**
+ * Holds if the `@conditionalexpr` is of the two operand form
+ * `guard ? : false`.
+ */
+expr_cond_two_operand(
+    unique int cond: @conditionalexpr ref
+);
+
+/**
+ * The guard of `@conditionalexpr` `guard ? true : false`
+ */
+expr_cond_guard(
+    unique int cond: @conditionalexpr ref,
+    int guard: @expr ref
+);
+
+/**
+ * The expression used when the guard of `@conditionalexpr`
+ * `guard ? true : false` holds. For the two operand form
+ * `guard ?: false` consider using `expr_cond_guard` instead.
+ */
+expr_cond_true(
+    unique int cond: @conditionalexpr ref,
+    int true: @expr ref
+);
+
+/**
+ * The expression used when the guard of `@conditionalexpr`
+ * `guard ? true : false` does not hold.
+ */
+expr_cond_false(
+    unique int cond: @conditionalexpr ref,
+    int false: @expr ref
+);
+
+/** A string representation of the value. */
+values(
+    unique int id: @value,
+    string str: string ref
+);
+
+/** The actual text in the source code for the value, if any. */
+valuetext(
+    unique int id: @value ref,
+    string text: string ref
+);
+
+valuebind(
+    int val: @value ref,
+    unique int expr: @expr ref
+);
+
+fieldoffsets(
+    unique int id: @variable ref,
+    int byteoffset: int ref,
+    int bitoffset: int ref
+);
+
+bitfield(
+    unique int id: @variable ref,
+    int bits: int ref,
+    int declared_bits: int ref
+);
+
+/* TODO
+memberprefix(
+    int member: @expr ref,
+    int prefix: @expr ref
+);
+*/
+
+/*
+   kind(1) = mbrcallexpr
+   kind(2) = mbrptrcallexpr
+   kind(3) = mbrptrmbrcallexpr
+   kind(4) = ptrmbrptrmbrcallexpr
+   kind(5) = mbrreadexpr // x.y
+   kind(6) = mbrptrreadexpr // p->y
+   kind(7) = mbrptrmbrreadexpr // x.*pm
+   kind(8) = mbrptrmbrptrreadexpr // x->*pm
+   kind(9) = staticmbrreadexpr // static x.y
+   kind(10) = staticmbrptrreadexpr // static p->y
+*/
+/* TODO
+memberaccess(
+    int member: @expr ref,
+    int kind: int ref
+);
+*/
+
+initialisers(
+    unique int init: @initialiser,
+    int var: @accessible ref,
+    unique int expr: @expr ref,
+    int location: @location_expr ref
+);
+
+braced_initialisers(
+    int init: @initialiser ref
+);
+
+/**
+ * An ancestor for the expression, for cases in which we cannot
+ * otherwise find the expression's parent.
+ */
+expr_ancestor(
+    int exp: @expr ref,
+    int ancestor: @element ref
+);
+
+exprs(
+    unique int id: @expr,
+    int kind: int ref,
+    int location: @location_expr ref
+);
+
+expr_reuse(
+    int reuse: @expr ref,
+    int original: @expr ref,
+    int value_category: int ref
+)
+
+/*
+  case @value.category of
+    1 = prval
+  | 2 = xval
+  | 3 = lval
+  ;
+*/
+expr_types(
+    int id: @expr ref,
+    int typeid: @type ref,
+    int value_category: int ref
+);
+
+case @expr.kind of
+    1 = @errorexpr
+|   2 = @address_of // & AddressOfExpr
+|   3 = @reference_to // ReferenceToExpr (implicit?)
+|   4 = @indirect // * PointerDereferenceExpr
+|   5 = @ref_indirect // ReferenceDereferenceExpr (implicit?)
+// ...
+|   8 = @array_to_pointer // (???)
+|   9 = @vacuous_destructor_call // VacuousDestructorCall
+// ...
+|  11 = @assume // Microsoft
+|  12 = @parexpr
+|  13 = @arithnegexpr
+|  14 = @unaryplusexpr
+|  15 = @complementexpr
+|  16 = @notexpr
+|  17 = @conjugation // GNU ~ operator
+|  18 = @realpartexpr // GNU __real
+|  19 = @imagpartexpr // GNU __imag
+|  20 = @postincrexpr
+|  21 = @postdecrexpr
+|  22 = @preincrexpr
+|  23 = @predecrexpr
+|  24 = @conditionalexpr
+|  25 = @addexpr
+|  26 = @subexpr
+|  27 = @mulexpr
+|  28 = @divexpr
+|  29 = @remexpr
+|  30 = @jmulexpr // C99 mul imaginary
+|  31 = @jdivexpr // C99 div imaginary
+|  32 = @fjaddexpr // C99 add real + imaginary
+|  33 = @jfaddexpr // C99 add imaginary + real
+|  34 = @fjsubexpr // C99 sub real - imaginary
+|  35 = @jfsubexpr // C99 sub imaginary - real
+|  36 = @paddexpr // pointer add (pointer + int or int + pointer)
+|  37 = @psubexpr // pointer sub (pointer - integer)
+|  38 = @pdiffexpr // difference between two pointers
+|  39 = @lshiftexpr
+|  40 = @rshiftexpr
+|  41 = @andexpr
+|  42 = @orexpr
+|  43 = @xorexpr
+|  44 = @eqexpr
+|  45 = @neexpr
+|  46 = @gtexpr
+|  47 = @ltexpr
+|  48 = @geexpr
+|  49 = @leexpr
+|  50 = @minexpr // GNU minimum
+|  51 = @maxexpr // GNU maximum
+|  52 = @assignexpr
+|  53 = @assignaddexpr
+|  54 = @assignsubexpr
+|  55 = @assignmulexpr
+|  56 = @assigndivexpr
+|  57 = @assignremexpr
+|  58 = @assignlshiftexpr
+|  59 = @assignrshiftexpr
+|  60 = @assignandexpr
+|  61 = @assignorexpr
+|  62 = @assignxorexpr
+|  63 = @assignpaddexpr // assign pointer add
+|  64 = @assignpsubexpr // assign pointer sub
+|  65 = @andlogicalexpr
+|  66 = @orlogicalexpr
+|  67 = @commaexpr
+|  68 = @subscriptexpr // access to member of an array, e.g., a[5]
+// ...  69 @objc_subscriptexpr deprecated
+// ...  70 @cmdaccess deprecated
+// ...
+|  73 = @virtfunptrexpr
+|  74 = @callexpr
+// ...  75 @msgexpr_normal deprecated
+// ...  76 @msgexpr_super deprecated
+// ...  77 @atselectorexpr deprecated
+// ...  78 @atprotocolexpr deprecated
+|  79 = @vastartexpr
+|  80 = @vaargexpr
+|  81 = @vaendexpr
+|  82 = @vacopyexpr
+// ...  83 @atencodeexpr deprecated
+|  84 = @varaccess
+|  85 = @thisaccess
+// ...  86 @objc_box_expr deprecated
+|  87 = @new_expr
+|  88 = @delete_expr
+|  89 = @throw_expr
+|  90 = @condition_decl // a variable declared in a condition, e.g., if(int x = y > 2)
+|  91 = @braced_init_list
+|  92 = @type_id
+|  93 = @runtime_sizeof
+|  94 = @runtime_alignof
+|  95 = @sizeof_pack
+|  96 = @expr_stmt // GNU extension
+|  97 = @routineexpr
+|  98 = @type_operand // used to access a type in certain contexts (haven't found any examples yet....)
+|  99 = @offsetofexpr // offsetof ::= type and field
+| 100 = @hasassignexpr // __has_assign ::= type
+| 101 = @hascopyexpr // __has_copy ::= type
+| 102 = @hasnothrowassign // __has_nothrow_assign ::= type
+| 103 = @hasnothrowconstr // __has_nothrow_constructor ::= type
+| 104 = @hasnothrowcopy // __has_nothrow_copy ::= type
+| 105 = @hastrivialassign // __has_trivial_assign ::= type
+| 106 = @hastrivialconstr // __has_trivial_constructor ::= type
+| 107 = @hastrivialcopy // __has_trivial_copy ::= type
+| 108 = @hasuserdestr // __has_user_destructor ::= type
+| 109 = @hasvirtualdestr // __has_virtual_destructor ::= type
+| 110 = @isabstractexpr // __is_abstract ::= type
+| 111 = @isbaseofexpr // __is_base_of ::= type type
+| 112 = @isclassexpr // __is_class ::= type
+| 113 = @isconvtoexpr // __is_convertible_to ::= type type
+| 114 = @isemptyexpr // __is_empty ::= type
+| 115 = @isenumexpr // __is_enum ::= type
+| 116 = @ispodexpr // __is_pod ::= type
+| 117 = @ispolyexpr // __is_polymorphic ::= type
+| 118 = @isunionexpr // __is_union ::= type
+| 119 = @typescompexpr // GNU __builtin_types_compatible ::= type type
+| 120 = @intaddrexpr // frontend internal builtin, used to implement offsetof
+// ...
+| 122 = @hastrivialdestructor // __has_trivial_destructor ::= type
+| 123 = @literal
+| 124 = @uuidof
+| 127 = @aggregateliteral
+| 128 = @delete_array_expr
+| 129 = @new_array_expr
+// ... 130 @objc_array_literal deprecated
+// ... 131 @objc_dictionary_literal deprecated
+| 132 = @foldexpr
+// ...
+| 200 = @ctordirectinit
+| 201 = @ctorvirtualinit
+| 202 = @ctorfieldinit
+| 203 = @ctordelegatinginit
+| 204 = @dtordirectdestruct
+| 205 = @dtorvirtualdestruct
+| 206 = @dtorfielddestruct
+// ...
+| 210 = @static_cast
+| 211 = @reinterpret_cast
+| 212 = @const_cast
+| 213 = @dynamic_cast
+| 214 = @c_style_cast
+| 215 = @lambdaexpr
+| 216 = @param_ref
+| 217 = @noopexpr
+// ...
+| 294 = @istriviallyconstructibleexpr
+| 295 = @isdestructibleexpr
+| 296 = @isnothrowdestructibleexpr
+| 297 = @istriviallydestructibleexpr
+| 298 = @istriviallyassignableexpr
+| 299 = @isnothrowassignableexpr
+| 300 = @istrivialexpr
+| 301 = @isstandardlayoutexpr
+| 302 = @istriviallycopyableexpr
+| 303 = @isliteraltypeexpr
+| 304 = @hastrivialmoveconstructorexpr
+| 305 = @hastrivialmoveassignexpr
+| 306 = @hasnothrowmoveassignexpr
+| 307 = @isconstructibleexpr
+| 308 = @isnothrowconstructibleexpr
+| 309 = @hasfinalizerexpr
+| 310 = @isdelegateexpr
+| 311 = @isinterfaceclassexpr
+| 312 = @isrefarrayexpr
+| 313 = @isrefclassexpr
+| 314 = @issealedexpr
+| 315 = @issimplevalueclassexpr
+| 316 = @isvalueclassexpr
+| 317 = @isfinalexpr
+| 319 = @noexceptexpr
+| 320 = @builtinshufflevector
+| 321 = @builtinchooseexpr
+| 322 = @builtinaddressof
+| 323 = @vec_fill
+| 324 = @builtinconvertvector
+| 325 = @builtincomplex
+| 326 = @spaceshipexpr
+| 327 = @co_await
+| 328 = @co_yield
+| 329 = @temp_init
+| 330 = @isassignable
+| 331 = @isaggregate
+| 332 = @hasuniqueobjectrepresentations
+| 333 = @builtinbitcast
+| 334 = @builtinshuffle
+| 335 = @blockassignexpr
+| 336 = @issame
+| 337 = @isfunction
+| 338 = @islayoutcompatible
+| 339 = @ispointerinterconvertiblebaseof
+| 340 = @isarray
+| 341 = @arrayrank
+| 342 = @arrayextent
+| 343 = @isarithmetic
+| 344 = @iscompletetype
+| 345 = @iscompound
+| 346 = @isconst
+| 347 = @isfloatingpoint
+| 348 = @isfundamental
+| 349 = @isintegral
+| 350 = @islvaluereference
+| 351 = @ismemberfunctionpointer
+| 352 = @ismemberobjectpointer
+| 353 = @ismemberpointer
+| 354 = @isobject
+| 355 = @ispointer
+| 356 = @isreference
+| 357 = @isrvaluereference
+| 358 = @isscalar
+| 359 = @issigned
+| 360 = @isunsigned
+| 361 = @isvoid
+| 362 = @isvolatile
+| 363 = @reuseexpr
+| 364 = @istriviallycopyassignable
+| 365 = @isassignablenopreconditioncheck
+| 366 = @referencebindstotemporary
+| 367 = @issameas
+| 368 = @builtinhasattribute
+| 369 = @ispointerinterconvertiblewithclass
+| 370 = @builtinispointerinterconvertiblewithclass
+| 371 = @iscorrespondingmember
+| 372 = @builtiniscorrespondingmember
+| 373 = @isboundedarray
+| 374 = @isunboundedarray
+| 375 = @isreferenceable
+| 378 = @isnothrowconvertible
+| 379 = @referenceconstructsfromtemporary
+| 380 = @referenceconvertsfromtemporary
+| 381 = @isconvertible
+| 382 = @isvalidwinrttype
+| 383 = @iswinclass
+| 384 = @iswininterface
+| 385 = @istriviallyequalitycomparable
+| 386 = @isscopedenum
+| 387 = @istriviallyrelocatable
+| 388 = @datasizeof
+| 389 = @c11_generic
+| 390 = @requires_expr
+;
+
+@var_args_expr = @vastartexpr
+               | @vaendexpr
+               | @vaargexpr
+               | @vacopyexpr
+               ;
+
+@builtin_op = @var_args_expr
+            | @noopexpr
+            | @offsetofexpr
+            | @intaddrexpr
+            | @hasassignexpr
+            | @hascopyexpr
+            | @hasnothrowassign
+            | @hasnothrowconstr
+            | @hasnothrowcopy
+            | @hastrivialassign
+            | @hastrivialconstr
+            | @hastrivialcopy
+            | @hastrivialdestructor
+            | @hasuserdestr
+            | @hasvirtualdestr
+            | @isabstractexpr
+            | @isbaseofexpr
+            | @isclassexpr
+            | @isconvtoexpr
+            | @isemptyexpr
+            | @isenumexpr
+            | @ispodexpr
+            | @ispolyexpr
+            | @isunionexpr
+            | @typescompexpr
+            | @builtinshufflevector
+            | @builtinconvertvector
+            | @builtinaddressof
+            | @istriviallyconstructibleexpr
+            | @isdestructibleexpr
+            | @isnothrowdestructibleexpr
+            | @istriviallydestructibleexpr
+            | @istriviallyassignableexpr
+            | @isnothrowassignableexpr
+            | @istrivialexpr
+            | @isstandardlayoutexpr
+            | @istriviallycopyableexpr
+            | @isliteraltypeexpr
+            | @hastrivialmoveconstructorexpr
+            | @hastrivialmoveassignexpr
+            | @hasnothrowmoveassignexpr
+            | @isconstructibleexpr
+            | @isnothrowconstructibleexpr
+            | @hasfinalizerexpr
+            | @isdelegateexpr
+            | @isinterfaceclassexpr
+            | @isrefarrayexpr
+            | @isrefclassexpr
+            | @issealedexpr
+            | @issimplevalueclassexpr
+            | @isvalueclassexpr
+            | @isfinalexpr
+            | @builtinchooseexpr
+            | @builtincomplex
+            | @isassignable
+            | @isaggregate
+            | @hasuniqueobjectrepresentations
+            | @builtinbitcast
+            | @builtinshuffle
+            | @issame
+            | @isfunction
+            | @islayoutcompatible
+            | @ispointerinterconvertiblebaseof
+            | @isarray
+            | @arrayrank
+            | @arrayextent
+            | @isarithmetic
+            | @iscompletetype
+            | @iscompound
+            | @isconst
+            | @isfloatingpoint
+            | @isfundamental
+            | @isintegral
+            | @islvaluereference
+            | @ismemberfunctionpointer
+            | @ismemberobjectpointer
+            | @ismemberpointer
+            | @isobject
+            | @ispointer
+            | @isreference
+            | @isrvaluereference
+            | @isscalar
+            | @issigned
+            | @isunsigned
+            | @isvoid
+            | @isvolatile
+            | @istriviallycopyassignable
+            | @isassignablenopreconditioncheck
+            | @referencebindstotemporary
+            | @issameas
+            | @builtinhasattribute
+            | @ispointerinterconvertiblewithclass
+            | @builtinispointerinterconvertiblewithclass
+            | @iscorrespondingmember
+            | @builtiniscorrespondingmember
+            | @isboundedarray
+            | @isunboundedarray
+            | @isreferenceable
+            | @isnothrowconvertible
+            | @referenceconstructsfromtemporary
+            | @referenceconvertsfromtemporary
+            | @isconvertible
+            | @isvalidwinrttype
+            | @iswinclass
+            | @iswininterface
+            | @istriviallyequalitycomparable
+            | @isscopedenum
+            | @istriviallyrelocatable
+            ;
+
+new_allocated_type(
+    unique int expr: @new_expr ref,
+    int type_id: @type ref
+);
+
+new_array_allocated_type(
+    unique int expr: @new_array_expr ref,
+    int type_id: @type ref
+);
+
+/**
+ * The field being initialized by an initializer expression within an aggregate
+ * initializer for a class/struct/union. Position is used to sort repeated initializers.
+ */
+#keyset[aggregate, position]
+aggregate_field_init(
+    int aggregate: @aggregateliteral ref,
+    int initializer: @expr ref,
+    int field: @membervariable ref,
+    int position: int ref
+);
+
+/**
+ * The index of the element being initialized by an initializer expression
+ * within an aggregate initializer for an array. Position is used to sort repeated initializers.
+ */
+#keyset[aggregate, position]
+aggregate_array_init(
+    int aggregate: @aggregateliteral ref,
+    int initializer: @expr ref,
+    int element_index: int ref,
+    int position: int ref
+);
+
+@ctorinit = @ctordirectinit
+          | @ctorvirtualinit
+          | @ctorfieldinit
+          | @ctordelegatinginit;
+@dtordestruct = @dtordirectdestruct
+              | @dtorvirtualdestruct
+              | @dtorfielddestruct;
+
+
+condition_decl_bind(
+    unique int expr: @condition_decl ref,
+    unique int decl: @declaration ref
+);
+
+typeid_bind(
+    unique int expr: @type_id ref,
+    int type_id: @type ref
+);
+
+uuidof_bind(
+    unique int expr: @uuidof ref,
+    int type_id: @type ref
+);
+
+@runtime_sizeof_or_alignof = @runtime_sizeof | @runtime_alignof | @datasizeof;
+
+sizeof_bind(
+    unique int expr: @runtime_sizeof_or_alignof ref,
+    int type_id: @type ref
+);
+
+code_block(
+    unique int block: @literal ref,
+    unique int routine: @function ref
+);
+
+lambdas(
+    unique int expr: @lambdaexpr ref,
+    string default_capture: string ref,
+    boolean has_explicit_return_type: boolean ref
+);
+
+lambda_capture(
+    unique int id: @lambdacapture,
+    int lambda: @lambdaexpr ref,
+    int index: int ref,
+    int field: @membervariable ref,
+    boolean captured_by_reference: boolean ref,
+    boolean is_implicit: boolean ref,
+    int location: @location_default ref
+);
+
+@funbindexpr = @routineexpr
+             | @new_expr
+             | @delete_expr
+             | @delete_array_expr
+             | @ctordirectinit
+             | @ctorvirtualinit
+             | @ctordelegatinginit
+             | @dtordirectdestruct
+             | @dtorvirtualdestruct;
+
+@varbindexpr = @varaccess | @ctorfieldinit | @dtorfielddestruct;
+@addressable = @function | @variable ;
+@accessible = @addressable | @enumconstant ;
+
+@access = @varaccess | @routineexpr ;
+
+fold(
+    int expr: @foldexpr ref,
+    string operator: string ref,
+    boolean is_left_fold: boolean ref
+);
+
+stmts(
+    unique int id: @stmt,
+    int kind: int ref,
+    int location: @location_stmt ref
+);
+
+case @stmt.kind of
+    1 = @stmt_expr
+|   2 = @stmt_if
+|   3 = @stmt_while
+|   4 = @stmt_goto
+|   5 = @stmt_label
+|   6 = @stmt_return
+|   7 = @stmt_block
+|   8 = @stmt_end_test_while // do { ... } while ( ... )
+|   9 = @stmt_for
+|  10 = @stmt_switch_case
+|  11 = @stmt_switch
+|  13 = @stmt_asm // "asm" statement or the body of an asm function
+|  15 = @stmt_try_block
+|  16 = @stmt_microsoft_try // Microsoft
+|  17 = @stmt_decl
+|  18 = @stmt_set_vla_size // C99
+|  19 = @stmt_vla_decl // C99
+|  25 = @stmt_assigned_goto // GNU
+|  26 = @stmt_empty
+|  27 = @stmt_continue
+|  28 = @stmt_break
+|  29 = @stmt_range_based_for // C++11
+// ...  30 @stmt_at_autoreleasepool_block deprecated
+// ...  31 @stmt_objc_for_in deprecated
+// ...  32 @stmt_at_synchronized deprecated
+|  33 = @stmt_handler
+// ...  34 @stmt_finally_end deprecated
+|  35 = @stmt_constexpr_if
+|  37 = @stmt_co_return
+;
+
+type_vla(
+    int type_id: @type ref,
+    int decl: @stmt_vla_decl ref
+);
+
+variable_vla(
+    int var: @variable ref,
+    int decl: @stmt_vla_decl ref
+);
+
+if_initialization(
+    unique int if_stmt: @stmt_if ref,
+    int init_id: @stmt ref
+);
+
+if_then(
+    unique int if_stmt: @stmt_if ref,
+    int then_id: @stmt ref
+);
+
+if_else(
+    unique int if_stmt: @stmt_if ref,
+    int else_id: @stmt ref
+);
+
+constexpr_if_initialization(
+    unique int constexpr_if_stmt: @stmt_constexpr_if ref,
+    int init_id: @stmt ref
+);
+
+constexpr_if_then(
+    unique int constexpr_if_stmt: @stmt_constexpr_if ref,
+    int then_id: @stmt ref
+);
+
+constexpr_if_else(
+    unique int constexpr_if_stmt: @stmt_constexpr_if ref,
+    int else_id: @stmt ref
+);
+
+while_body(
+    unique int while_stmt: @stmt_while ref,
+    int body_id: @stmt ref
+);
+
+do_body(
+    unique int do_stmt: @stmt_end_test_while ref,
+    int body_id: @stmt ref
+);
+
+switch_initialization(
+    unique int switch_stmt: @stmt_switch ref,
+    int init_id: @stmt ref
+);
+
+#keyset[switch_stmt, index]
+switch_case(
+    int switch_stmt: @stmt_switch ref,
+    int index: int ref,
+    int case_id: @stmt_switch_case ref
+);
+
+switch_body(
+    unique int switch_stmt: @stmt_switch ref,
+    int body_id: @stmt ref
+);
+
+@stmt_for_or_range_based_for = @stmt_for
+                             | @stmt_range_based_for;
+
+for_initialization(
+    unique int for_stmt: @stmt_for_or_range_based_for ref,
+    int init_id: @stmt ref
+);
+
+for_condition(
+    unique int for_stmt: @stmt_for ref,
+    int condition_id: @expr ref
+);
+
+for_update(
+    unique int for_stmt: @stmt_for ref,
+    int update_id: @expr ref
+);
+
+for_body(
+    unique int for_stmt: @stmt_for ref,
+    int body_id: @stmt ref
+);
+
+@stmtparent = @stmt | @expr_stmt ;
+stmtparents(
+    unique int id: @stmt ref,
+    int index: int ref,
+    int parent: @stmtparent ref
+);
+
+ishandler(unique int block: @stmt_block ref);
+
+@cfgnode = @stmt | @expr | @function | @initialiser ;
+
+stmt_decl_bind(
+    int stmt: @stmt_decl ref,
+    int num: int ref,
+    int decl: @declaration ref
+);
+
+stmt_decl_entry_bind(
+    int stmt: @stmt_decl ref,
+    int num: int ref,
+    int decl_entry: @element ref
+);
+
+@functionorblock = @function | @stmt_block;
+
+blockscope(
+    unique int block: @stmt_block ref,
+    int enclosing: @functionorblock ref
+);
+
+@jump = @stmt_goto | @stmt_break | @stmt_continue;
+
+@jumporlabel = @jump | @stmt_label | @literal;
+
+jumpinfo(
+    unique int id: @jumporlabel ref,
+    string str: string ref,
+    int target: @stmt ref
+);
+
+preprocdirects(
+    unique int id: @preprocdirect,
+    int kind: int ref,
+    int location: @location_default ref
+);
+case @preprocdirect.kind of
+   0 = @ppd_if
+|  1 = @ppd_ifdef
+|  2 = @ppd_ifndef
+|  3 = @ppd_elif
+|  4 = @ppd_else
+|  5 = @ppd_endif
+|  6 = @ppd_plain_include
+|  7 = @ppd_define
+|  8 = @ppd_undef
+|  9 = @ppd_line
+| 10 = @ppd_error
+| 11 = @ppd_pragma
+| 12 = @ppd_objc_import
+| 13 = @ppd_include_next
+| 18 = @ppd_warning
+;
+
+@ppd_include = @ppd_plain_include | @ppd_objc_import | @ppd_include_next;
+
+@ppd_branch = @ppd_if | @ppd_ifdef | @ppd_ifndef | @ppd_elif;
+
+preprocpair(
+    int begin : @ppd_branch ref,
+    int elseelifend : @preprocdirect ref
+);
+
+preproctrue(int branch : @ppd_branch ref);
+preprocfalse(int branch : @ppd_branch ref);
+
+preproctext(
+    unique int id: @preprocdirect ref,
+    string head: string ref,
+    string body: string ref
+);
+
+includes(
+    unique int id: @ppd_include ref,
+    int included: @file ref
+);
+
+link_targets(
+    int id: @link_target,
+    int binary: @file ref
+);
+
+link_parent(
+    int element : @element ref,
+    int link_target : @link_target ref
+);
+
+/* XML Files */
+
+xmlEncoding(unique int id: @file ref, string encoding: string ref);
+
+xmlDTDs(
+    unique int id: @xmldtd,
+    string root: string ref,
+    string publicId: string ref,
+    string systemId: string ref,
+    int fileid: @file ref
+);
+
+xmlElements(
+    unique int id: @xmlelement,
+    string name: string ref,
+    int parentid: @xmlparent ref,
+    int idx: int ref,
+    int fileid: @file ref
+);
+
+xmlAttrs(
+    unique int id: @xmlattribute,
+    int elementid: @xmlelement ref,
+    string name: string ref,
+    string value: string ref,
+    int idx: int ref,
+    int fileid: @file ref
+);
+
+xmlNs(
+    int id: @xmlnamespace,
+    string prefixName: string ref,
+    string URI: string ref,
+    int fileid: @file ref
+);
+
+xmlHasNs(
+    int elementId: @xmlnamespaceable ref,
+    int nsId: @xmlnamespace ref,
+    int fileid: @file ref
+);
+
+xmlComments(
+    unique int id: @xmlcomment,
+    string text: string ref,
+    int parentid: @xmlparent ref,
+    int fileid: @file ref
+);
+
+xmlChars(
+    unique int id: @xmlcharacters,
+    string text: string ref,
+    int parentid: @xmlparent ref,
+    int idx: int ref,
+    int isCDATA: int ref,
+    int fileid: @file ref
+);
+
+@xmlparent = @file | @xmlelement;
+@xmlnamespaceable = @xmlelement | @xmlattribute;
+
+xmllocations(
+    int xmlElement: @xmllocatable ref,
+    int location: @location_default ref
+);
+
+@xmllocatable = @xmlcharacters
+              | @xmlelement
+              | @xmlcomment
+              | @xmlattribute
+              | @xmldtd
+              | @file
+              | @xmlnamespace;
diff --git a/cpp/ql/lib/upgrades/7ff6a6e53dbcff09d1b9b758b594bc6d17366863/upgrade.properties b/cpp/ql/lib/upgrades/7ff6a6e53dbcff09d1b9b758b594bc6d17366863/upgrade.properties
new file mode 100644
index 000000000000..dddc448b8e13
--- /dev/null
+++ b/cpp/ql/lib/upgrades/7ff6a6e53dbcff09d1b9b758b594bc6d17366863/upgrade.properties
@@ -0,0 +1,2 @@
+description: Add requires expressions
+compatibility: full
diff --git a/cpp/ql/test/library-tests/ir/ir/PrintAST.expected b/cpp/ql/test/library-tests/ir/ir/PrintAST.expected
index 986ce6dd158a..1e0ef80c269b 100644
--- a/cpp/ql/test/library-tests/ir/ir/PrintAST.expected
+++ b/cpp/ql/test/library-tests/ir/ir/PrintAST.expected
@@ -23564,6 +23564,26 @@ ir.cpp:
 # 2686|           Value = [CStyleCast] 0
 # 2686|           ValueCategory = prvalue
 # 2687|     getStmt(1): [ReturnStmt] return ...
+# 2691| [TopLevelFunction] int concepts::requires_use()
+# 2691|   <params>: 
+# 2691|   getEntryPoint(): [BlockStmt] { ... }
+# 2692|     getStmt(0): [DeclStmt] declaration
+# 2692|       getDeclarationEntry(0): [VariableDeclarationEntry] definition of y
+# 2692|           Type = [IntType] int
+# 2692|         getVariable().getInitializer(): [Initializer] initializer for y
+#-----|           getExpr(): [RequiresExpr] requires ...
+#-----|               Type = [BoolType] bool
+#-----|               Value = [RequiresExpr] 1
+#-----|               ValueCategory = prvalue
+#-----|           getExpr().getFullyConverted(): [CStyleCast] (int)...
+#-----|               Conversion = [IntegralConversion] integral conversion
+#-----|               Type = [IntType] int
+#-----|               Value = [CStyleCast] 1
+#-----|               ValueCategory = prvalue
+# 2693|     getStmt(1): [ReturnStmt] return ...
+# 2693|       getExpr(): [VariableAccess] y
+# 2693|           Type = [IntType] int
+# 2693|           ValueCategory = prvalue(load)
 many-defs-per-use.cpp:
 #   34| [TopLevelFunction] void many_defs_per_use()
 #   34|   <params>: 
diff --git a/cpp/ql/test/library-tests/ir/ir/aliased_ir.expected b/cpp/ql/test/library-tests/ir/ir/aliased_ir.expected
index 57c806278672..9fcaf04382d3 100644
--- a/cpp/ql/test/library-tests/ir/ir/aliased_ir.expected
+++ b/cpp/ql/test/library-tests/ir/ir/aliased_ir.expected
@@ -19099,6 +19099,24 @@ ir.cpp:
 # 2684|   Block 8
 # 2684|     v2684_14(void) = Unreached : 
 
+# 2691| int concepts::requires_use()
+# 2691|   Block 0
+# 2691|     v2691_1(void)       = EnterFunction            : 
+# 2691|     m2691_2(unknown)    = AliasedDefinition        : 
+# 2691|     m2691_3(unknown)    = InitializeNonLocal       : 
+# 2691|     m2691_4(unknown)    = Chi                      : total:m2691_2, partial:m2691_3
+# 2692|     r2692_1(glval<int>) = VariableAddress[y]       : 
+#-----|     r0_1(int)           = Constant[1]              : 
+#-----|     m0_2(int)           = Store[y]                 : &:r2692_1, r0_1
+# 2693|     r2693_1(glval<int>) = VariableAddress[#return] : 
+# 2693|     r2693_2(glval<int>) = VariableAddress[y]       : 
+# 2693|     r2693_3(int)        = Load[y]                  : &:r2693_2, m0_2
+# 2693|     m2693_4(int)        = Store[#return]           : &:r2693_1, r2693_3
+# 2691|     r2691_5(glval<int>) = VariableAddress[#return] : 
+# 2691|     v2691_6(void)       = ReturnValue              : &:r2691_5, m2693_4
+# 2691|     v2691_7(void)       = AliasedUse               : m2691_3
+# 2691|     v2691_8(void)       = ExitFunction             : 
+
 many-defs-per-use.cpp:
 #   34| void many_defs_per_use()
 #   34|   Block 0
diff --git a/cpp/ql/test/library-tests/ir/ir/ir.cpp b/cpp/ql/test/library-tests/ir/ir/ir.cpp
index f8e163685373..105cdbf3ae65 100644
--- a/cpp/ql/test/library-tests/ir/ir/ir.cpp
+++ b/cpp/ql/test/library-tests/ir/ir/ir.cpp
@@ -2686,4 +2686,13 @@ void test(bool b)
   twice_call_use(b ? "" : "");
 }
 
+namespace concepts {
+
+int requires_use() {
+  int y = requires { sizeof(int) > 0; };
+  return y;
+}
+
+}
+
 // semmle-extractor-options: -std=c++20 --clang
diff --git a/cpp/ql/test/library-tests/ir/ir/raw_ir.expected b/cpp/ql/test/library-tests/ir/ir/raw_ir.expected
index a2d605daef17..ff4f47f3c22f 100644
--- a/cpp/ql/test/library-tests/ir/ir/raw_ir.expected
+++ b/cpp/ql/test/library-tests/ir/ir/raw_ir.expected
@@ -17422,6 +17422,23 @@ ir.cpp:
 # 2684|     v2684_7(void) = AliasedUse   : ~m?
 # 2684|     v2684_8(void) = ExitFunction : 
 
+# 2691| int concepts::requires_use()
+# 2691|   Block 0
+# 2691|     v2691_1(void)       = EnterFunction            : 
+# 2691|     mu2691_2(unknown)   = AliasedDefinition        : 
+# 2691|     mu2691_3(unknown)   = InitializeNonLocal       : 
+# 2692|     r2692_1(glval<int>) = VariableAddress[y]       : 
+#-----|     r0_1(int)           = Constant[1]              : 
+#-----|     mu0_2(int)          = Store[y]                 : &:r2692_1, r0_1
+# 2693|     r2693_1(glval<int>) = VariableAddress[#return] : 
+# 2693|     r2693_2(glval<int>) = VariableAddress[y]       : 
+# 2693|     r2693_3(int)        = Load[y]                  : &:r2693_2, ~m?
+# 2693|     mu2693_4(int)       = Store[#return]           : &:r2693_1, r2693_3
+# 2691|     r2691_4(glval<int>) = VariableAddress[#return] : 
+# 2691|     v2691_5(void)       = ReturnValue              : &:r2691_4, ~m?
+# 2691|     v2691_6(void)       = AliasedUse               : ~m?
+# 2691|     v2691_7(void)       = ExitFunction             : 
+
 many-defs-per-use.cpp:
 #   34| void many_defs_per_use()
 #   34|   Block 0

From 9952997b48e908e0225e18e8bfe083a9f9fa7c58 Mon Sep 17 00:00:00 2001
From: Tom Hvitved <hvitved@github.com>
Date: Wed, 9 Oct 2024 10:16:34 +0200
Subject: [PATCH 234/347] Shared: Add `DenseRank` library

---
 shared/util/codeql/util/DenseRank.qll | 128 ++++++++++++++++++++++++++
 1 file changed, 128 insertions(+)
 create mode 100644 shared/util/codeql/util/DenseRank.qll

diff --git a/shared/util/codeql/util/DenseRank.qll b/shared/util/codeql/util/DenseRank.qll
new file mode 100644
index 000000000000..4a01160ff1b8
--- /dev/null
+++ b/shared/util/codeql/util/DenseRank.qll
@@ -0,0 +1,128 @@
+/** Provides modules for computing dense `rank`s. */
+
+/** Provides the input to `DenseRank`. */
+signature module DenseRankInputSig {
+  /** An element that is ranked. */
+  bindingset[this]
+  class Ranked;
+
+  /** Gets the rank of `r`. */
+  int getRank(Ranked r);
+}
+
+/**
+ * Provides the `denseRank` predicate for computing dense `rank`s. For example,
+ * if we have
+ *
+ * ```ql
+ * query predicate names(string name) {
+ *   name = ["Alice", "Bob", "Charles", "Charlie", "David"]
+ * }
+ *
+ * int rankByFirstLetter(string name) {
+ *   name = rank[result](string n | names(n) | n order by n.charAt(0))
+ * }
+ * ```
+ *
+ * then `rankByFirstLetter` computes the following relation
+ *
+ * ```
+ * Alice    1
+ * Bob      2
+ * Charles  3
+ * Charlie  3
+ * David    5
+ * ```
+ *
+ * Note that `"David"` has rank 5 instead of 4. If we want a dense ranking instead,
+ * we can do
+ *
+ * ```ql
+ * module M implements DenseRankInputSig {
+ *   class Ranked = string;
+ *
+ *   predicate getRank = rankByFirstLetter/1;
+ * }
+ *
+ * predicate denseRank = DenseRank<M>::denseRank/1;
+ * ```
+ */
+module DenseRank<DenseRankInputSig Input> {
+  private import Input
+
+  private int rankRank(Ranked r, int rnk) {
+    rnk = getRank(r) and
+    rnk = rank[result](int rnk0 | rnk0 = getRank(_) | rnk0)
+  }
+
+  /** Gets the dense rank of `r`. */
+  int denseRank(Ranked r) { result = rankRank(r, getRank(r)) }
+}
+
+/** Provides the input to `DenseRank2`. */
+signature module DenseRankInputSig2 {
+  /** A ranking context. */
+  bindingset[this]
+  class C;
+
+  /** An element that is ranked. */
+  bindingset[this]
+  class Ranked;
+
+  /** Gets the rank of `r` in the context provided by `c`. */
+  int getRank(C c, Ranked r);
+}
+
+/** Same as `DenseRank`, but allows for a context consisting of one element. */
+module DenseRank2<DenseRankInputSig2 Input> {
+  private import Input
+
+  private int rank0(C c, Ranked r, int rnk) {
+    rnk = getRank(c, r) and
+    rnk = rank[result](int rnk0 | rnk0 = getRank(c, _) | rnk0)
+  }
+
+  /** Gets the dense rank of `r` in the context provided by `c`. */
+  int denseRank(C c, Ranked r) {
+    exists(int rnk |
+      result = rank0(c, r, rnk) and
+      rnk = getRank(c, r)
+    )
+  }
+}
+
+/** Provides the input to `DenseRank3`. */
+signature module DenseRankInputSig3 {
+  /** A ranking context. */
+  bindingset[this]
+  class C1;
+
+  /** A ranking context. */
+  bindingset[this]
+  class C2;
+
+  /** An element that is ranked. */
+  bindingset[this]
+  class Ranked;
+
+  /** Gets the rank of `r` in the context provided by `c1` and `c2`. */
+  int getRank(C1 c1, C2 c2, Ranked r);
+}
+
+/** Same as `DenseRank`, but allows for a context consisting of two elements. */
+module DenseRank3<DenseRankInputSig3 Input> {
+  private import Input
+
+  private int rank0(C1 c1, C2 c2, Ranked r, int rnk) {
+    rnk = getRank(c1, c2, r) and
+    rnk = rank[result](int rnk0 | rnk0 = getRank(c1, c2, _) | rnk0)
+  }
+
+  /** Gets the dense rank of `r` in the context provided by `c1` and `c2`. */
+  int denseRank(C1 c1, C2 c2, Ranked r) {
+    exists(int rnk |
+      result = rank0(c1, c2, r, rnk) and
+      rnk = getRank(c1, c2, r)
+    )
+  }
+}

From a3a0c2b26936472146314d769c14e336e3d0aa1e Mon Sep 17 00:00:00 2001
From: Tom Hvitved <hvitved@github.com>
Date: Tue, 8 Oct 2024 15:11:23 +0200
Subject: [PATCH 235/347] Rust: Add more variable tests

---
 .../test/library-tests/variables/Cfg.expected | 218 +++++++++++-------
 .../variables/variables.expected              |  19 ++
 .../test/library-tests/variables/variables.rs |  20 ++
 3 files changed, 174 insertions(+), 83 deletions(-)

diff --git a/rust/ql/test/library-tests/variables/Cfg.expected b/rust/ql/test/library-tests/variables/Cfg.expected
index 55b09cf6ace7..628a738db7e7 100644
--- a/rust/ql/test/library-tests/variables/Cfg.expected
+++ b/rust/ql/test/library-tests/variables/Cfg.expected
@@ -602,90 +602,142 @@ edges
 | variables.rs:354:5:354:16 | CallExpr | variables.rs:351:17:355:1 | BlockExpr |  |
 | variables.rs:354:5:354:17 | ExprStmt | variables.rs:354:5:354:13 | PathExpr |  |
 | variables.rs:354:15:354:15 | x | variables.rs:354:5:354:16 | CallExpr |  |
-| variables.rs:357:1:383:1 | enter main | variables.rs:358:5:358:25 | ExprStmt |  |
-| variables.rs:357:1:383:1 | exit main (normal) | variables.rs:357:1:383:1 | exit main |  |
-| variables.rs:357:11:383:1 | BlockExpr | variables.rs:357:1:383:1 | exit main (normal) |  |
-| variables.rs:358:5:358:22 | PathExpr | variables.rs:358:5:358:24 | CallExpr |  |
-| variables.rs:358:5:358:24 | CallExpr | variables.rs:359:5:359:23 | ExprStmt |  |
-| variables.rs:358:5:358:25 | ExprStmt | variables.rs:358:5:358:22 | PathExpr |  |
-| variables.rs:359:5:359:20 | PathExpr | variables.rs:359:5:359:22 | CallExpr |  |
-| variables.rs:359:5:359:22 | CallExpr | variables.rs:360:5:360:23 | ExprStmt |  |
-| variables.rs:359:5:359:23 | ExprStmt | variables.rs:359:5:359:20 | PathExpr |  |
-| variables.rs:360:5:360:20 | PathExpr | variables.rs:360:5:360:22 | CallExpr |  |
-| variables.rs:360:5:360:22 | CallExpr | variables.rs:361:5:361:23 | ExprStmt |  |
-| variables.rs:360:5:360:23 | ExprStmt | variables.rs:360:5:360:20 | PathExpr |  |
-| variables.rs:361:5:361:20 | PathExpr | variables.rs:361:5:361:22 | CallExpr |  |
-| variables.rs:361:5:361:22 | CallExpr | variables.rs:362:5:362:19 | ExprStmt |  |
-| variables.rs:361:5:361:23 | ExprStmt | variables.rs:361:5:361:20 | PathExpr |  |
-| variables.rs:362:5:362:16 | PathExpr | variables.rs:362:5:362:18 | CallExpr |  |
-| variables.rs:362:5:362:18 | CallExpr | variables.rs:363:5:363:19 | ExprStmt |  |
-| variables.rs:362:5:362:19 | ExprStmt | variables.rs:362:5:362:16 | PathExpr |  |
-| variables.rs:363:5:363:16 | PathExpr | variables.rs:363:5:363:18 | CallExpr |  |
-| variables.rs:363:5:363:18 | CallExpr | variables.rs:364:5:364:19 | ExprStmt |  |
-| variables.rs:363:5:363:19 | ExprStmt | variables.rs:363:5:363:16 | PathExpr |  |
-| variables.rs:364:5:364:16 | PathExpr | variables.rs:364:5:364:18 | CallExpr |  |
-| variables.rs:364:5:364:18 | CallExpr | variables.rs:365:5:365:19 | ExprStmt |  |
-| variables.rs:364:5:364:19 | ExprStmt | variables.rs:364:5:364:16 | PathExpr |  |
-| variables.rs:365:5:365:16 | PathExpr | variables.rs:365:5:365:18 | CallExpr |  |
-| variables.rs:365:5:365:18 | CallExpr | variables.rs:366:5:366:21 | ExprStmt |  |
-| variables.rs:365:5:365:19 | ExprStmt | variables.rs:365:5:365:16 | PathExpr |  |
-| variables.rs:366:5:366:18 | PathExpr | variables.rs:366:5:366:20 | CallExpr |  |
-| variables.rs:366:5:366:20 | CallExpr | variables.rs:367:5:367:21 | ExprStmt |  |
-| variables.rs:366:5:366:21 | ExprStmt | variables.rs:366:5:366:18 | PathExpr |  |
-| variables.rs:367:5:367:18 | PathExpr | variables.rs:367:5:367:20 | CallExpr |  |
-| variables.rs:367:5:367:20 | CallExpr | variables.rs:368:5:368:21 | ExprStmt |  |
-| variables.rs:367:5:367:21 | ExprStmt | variables.rs:367:5:367:18 | PathExpr |  |
-| variables.rs:368:5:368:18 | PathExpr | variables.rs:368:5:368:20 | CallExpr |  |
-| variables.rs:368:5:368:20 | CallExpr | variables.rs:369:5:369:21 | ExprStmt |  |
-| variables.rs:368:5:368:21 | ExprStmt | variables.rs:368:5:368:18 | PathExpr |  |
-| variables.rs:369:5:369:18 | PathExpr | variables.rs:369:5:369:20 | CallExpr |  |
-| variables.rs:369:5:369:20 | CallExpr | variables.rs:370:5:370:21 | ExprStmt |  |
-| variables.rs:369:5:369:21 | ExprStmt | variables.rs:369:5:369:18 | PathExpr |  |
-| variables.rs:370:5:370:18 | PathExpr | variables.rs:370:5:370:20 | CallExpr |  |
-| variables.rs:370:5:370:20 | CallExpr | variables.rs:371:5:371:21 | ExprStmt |  |
-| variables.rs:370:5:370:21 | ExprStmt | variables.rs:370:5:370:18 | PathExpr |  |
-| variables.rs:371:5:371:18 | PathExpr | variables.rs:371:5:371:20 | CallExpr |  |
-| variables.rs:371:5:371:20 | CallExpr | variables.rs:372:5:372:21 | ExprStmt |  |
-| variables.rs:371:5:371:21 | ExprStmt | variables.rs:371:5:371:18 | PathExpr |  |
-| variables.rs:372:5:372:18 | PathExpr | variables.rs:372:5:372:20 | CallExpr |  |
-| variables.rs:372:5:372:20 | CallExpr | variables.rs:373:5:373:21 | ExprStmt |  |
-| variables.rs:372:5:372:21 | ExprStmt | variables.rs:372:5:372:18 | PathExpr |  |
-| variables.rs:373:5:373:18 | PathExpr | variables.rs:373:5:373:20 | CallExpr |  |
-| variables.rs:373:5:373:20 | CallExpr | variables.rs:374:5:374:21 | ExprStmt |  |
-| variables.rs:373:5:373:21 | ExprStmt | variables.rs:373:5:373:18 | PathExpr |  |
-| variables.rs:374:5:374:18 | PathExpr | variables.rs:374:5:374:20 | CallExpr |  |
-| variables.rs:374:5:374:20 | CallExpr | variables.rs:375:5:375:36 | ExprStmt |  |
-| variables.rs:374:5:374:21 | ExprStmt | variables.rs:374:5:374:18 | PathExpr |  |
-| variables.rs:375:5:375:18 | PathExpr | variables.rs:375:20:375:22 | "a" |  |
-| variables.rs:375:5:375:35 | CallExpr | variables.rs:376:5:376:37 | ExprStmt |  |
-| variables.rs:375:5:375:36 | ExprStmt | variables.rs:375:5:375:18 | PathExpr |  |
-| variables.rs:375:20:375:22 | "a" | variables.rs:375:26:375:28 | "b" |  |
-| variables.rs:375:25:375:34 | TupleExpr | variables.rs:375:5:375:35 | CallExpr |  |
-| variables.rs:375:26:375:28 | "b" | variables.rs:375:31:375:33 | "c" |  |
-| variables.rs:375:31:375:33 | "c" | variables.rs:375:25:375:34 | TupleExpr |  |
-| variables.rs:376:5:376:18 | PathExpr | variables.rs:376:20:376:31 | PathExpr |  |
-| variables.rs:376:5:376:36 | CallExpr | variables.rs:377:5:377:26 | ExprStmt |  |
-| variables.rs:376:5:376:37 | ExprStmt | variables.rs:376:5:376:18 | PathExpr |  |
-| variables.rs:376:20:376:31 | PathExpr | variables.rs:376:33:376:34 | 45 |  |
-| variables.rs:376:20:376:35 | CallExpr | variables.rs:376:5:376:36 | CallExpr |  |
-| variables.rs:376:33:376:34 | 45 | variables.rs:376:20:376:35 | CallExpr |  |
-| variables.rs:377:5:377:23 | PathExpr | variables.rs:377:5:377:25 | CallExpr |  |
-| variables.rs:377:5:377:25 | CallExpr | variables.rs:378:5:378:23 | ExprStmt |  |
-| variables.rs:377:5:377:26 | ExprStmt | variables.rs:377:5:377:23 | PathExpr |  |
+| variables.rs:357:1:363:1 | enter alias | variables.rs:358:5:358:18 | LetStmt |  |
+| variables.rs:357:1:363:1 | exit alias (normal) | variables.rs:357:1:363:1 | exit alias |  |
+| variables.rs:357:12:363:1 | BlockExpr | variables.rs:357:1:363:1 | exit alias (normal) |  |
+| variables.rs:358:5:358:18 | LetStmt | variables.rs:358:17:358:17 | 1 |  |
+| variables.rs:358:9:358:13 | x | variables.rs:359:5:360:15 | LetStmt | match, no-match |
+| variables.rs:358:17:358:17 | 1 | variables.rs:358:9:358:13 | x |  |
+| variables.rs:359:5:360:15 | LetStmt | variables.rs:360:14:360:14 | x |  |
+| variables.rs:359:9:359:9 | y | variables.rs:361:5:361:11 | ExprStmt | match, no-match |
+| variables.rs:360:9:360:14 | RefExpr | variables.rs:359:9:359:9 | y |  |
+| variables.rs:360:14:360:14 | x | variables.rs:360:9:360:14 | RefExpr |  |
+| variables.rs:361:5:361:6 | * ... | variables.rs:361:10:361:10 | 2 |  |
+| variables.rs:361:5:361:10 | ... = ... | variables.rs:362:5:362:17 | ExprStmt |  |
+| variables.rs:361:5:361:11 | ExprStmt | variables.rs:361:6:361:6 | y |  |
+| variables.rs:361:6:361:6 | y | variables.rs:361:5:361:6 | * ... |  |
+| variables.rs:361:10:361:10 | 2 | variables.rs:361:5:361:10 | ... = ... |  |
+| variables.rs:362:5:362:13 | PathExpr | variables.rs:362:15:362:15 | x |  |
+| variables.rs:362:5:362:16 | CallExpr | variables.rs:357:12:363:1 | BlockExpr |  |
+| variables.rs:362:5:362:17 | ExprStmt | variables.rs:362:5:362:13 | PathExpr |  |
+| variables.rs:362:15:362:15 | x | variables.rs:362:5:362:16 | CallExpr |  |
+| variables.rs:365:1:373:1 | enter capture | variables.rs:366:5:366:19 | LetStmt |  |
+| variables.rs:365:1:373:1 | exit capture (normal) | variables.rs:365:1:373:1 | exit capture |  |
+| variables.rs:365:14:373:1 | BlockExpr | variables.rs:365:1:373:1 | exit capture (normal) |  |
+| variables.rs:366:5:366:19 | LetStmt | variables.rs:366:17:366:18 | 10 |  |
+| variables.rs:366:9:366:13 | x | variables.rs:367:5:370:6 | LetStmt | match, no-match |
+| variables.rs:366:17:366:18 | 10 | variables.rs:366:9:366:13 | x |  |
+| variables.rs:367:5:370:6 | LetStmt | variables.rs:367:19:370:5 | ClosureExpr |  |
+| variables.rs:367:9:367:15 | cap | variables.rs:371:5:371:10 | ExprStmt | match, no-match |
+| variables.rs:367:19:370:5 | ClosureExpr | variables.rs:367:9:367:15 | cap |  |
+| variables.rs:367:19:370:5 | enter ClosureExpr | variables.rs:368:9:368:21 | ExprStmt |  |
+| variables.rs:367:19:370:5 | exit ClosureExpr (normal) | variables.rs:367:19:370:5 | exit ClosureExpr |  |
+| variables.rs:367:22:370:5 | BlockExpr | variables.rs:367:19:370:5 | exit ClosureExpr (normal) |  |
+| variables.rs:368:9:368:17 | PathExpr | variables.rs:368:19:368:19 | PathExpr |  |
+| variables.rs:368:9:368:20 | CallExpr | variables.rs:369:9:369:15 | ExprStmt |  |
+| variables.rs:368:9:368:21 | ExprStmt | variables.rs:368:9:368:17 | PathExpr |  |
+| variables.rs:368:19:368:19 | PathExpr | variables.rs:368:9:368:20 | CallExpr |  |
+| variables.rs:369:9:369:9 | PathExpr | variables.rs:369:14:369:14 | 1 |  |
+| variables.rs:369:9:369:14 | ... += ... | variables.rs:367:22:370:5 | BlockExpr |  |
+| variables.rs:369:9:369:15 | ExprStmt | variables.rs:369:9:369:9 | PathExpr |  |
+| variables.rs:369:14:369:14 | 1 | variables.rs:369:9:369:14 | ... += ... |  |
+| variables.rs:371:5:371:7 | cap | variables.rs:371:5:371:9 | CallExpr |  |
+| variables.rs:371:5:371:9 | CallExpr | variables.rs:372:5:372:17 | ExprStmt |  |
+| variables.rs:371:5:371:10 | ExprStmt | variables.rs:371:5:371:7 | cap |  |
+| variables.rs:372:5:372:13 | PathExpr | variables.rs:372:15:372:15 | x |  |
+| variables.rs:372:5:372:16 | CallExpr | variables.rs:365:14:373:1 | BlockExpr |  |
+| variables.rs:372:5:372:17 | ExprStmt | variables.rs:372:5:372:13 | PathExpr |  |
+| variables.rs:372:15:372:15 | x | variables.rs:372:5:372:16 | CallExpr |  |
+| variables.rs:375:1:403:1 | enter main | variables.rs:376:5:376:25 | ExprStmt |  |
+| variables.rs:375:1:403:1 | exit main (normal) | variables.rs:375:1:403:1 | exit main |  |
+| variables.rs:375:11:403:1 | BlockExpr | variables.rs:375:1:403:1 | exit main (normal) |  |
+| variables.rs:376:5:376:22 | PathExpr | variables.rs:376:5:376:24 | CallExpr |  |
+| variables.rs:376:5:376:24 | CallExpr | variables.rs:377:5:377:23 | ExprStmt |  |
+| variables.rs:376:5:376:25 | ExprStmt | variables.rs:376:5:376:22 | PathExpr |  |
+| variables.rs:377:5:377:20 | PathExpr | variables.rs:377:5:377:22 | CallExpr |  |
+| variables.rs:377:5:377:22 | CallExpr | variables.rs:378:5:378:23 | ExprStmt |  |
+| variables.rs:377:5:377:23 | ExprStmt | variables.rs:377:5:377:20 | PathExpr |  |
 | variables.rs:378:5:378:20 | PathExpr | variables.rs:378:5:378:22 | CallExpr |  |
-| variables.rs:378:5:378:22 | CallExpr | variables.rs:379:5:379:19 | ExprStmt |  |
+| variables.rs:378:5:378:22 | CallExpr | variables.rs:379:5:379:23 | ExprStmt |  |
 | variables.rs:378:5:378:23 | ExprStmt | variables.rs:378:5:378:20 | PathExpr |  |
-| variables.rs:379:5:379:16 | PathExpr | variables.rs:379:5:379:18 | CallExpr |  |
-| variables.rs:379:5:379:18 | CallExpr | variables.rs:380:5:380:17 | ExprStmt |  |
-| variables.rs:379:5:379:19 | ExprStmt | variables.rs:379:5:379:16 | PathExpr |  |
-| variables.rs:380:5:380:14 | PathExpr | variables.rs:380:5:380:16 | CallExpr |  |
-| variables.rs:380:5:380:16 | CallExpr | variables.rs:381:5:381:13 | ExprStmt |  |
-| variables.rs:380:5:380:17 | ExprStmt | variables.rs:380:5:380:14 | PathExpr |  |
-| variables.rs:381:5:381:10 | PathExpr | variables.rs:381:5:381:12 | CallExpr |  |
-| variables.rs:381:5:381:12 | CallExpr | variables.rs:382:5:382:17 | ExprStmt |  |
-| variables.rs:381:5:381:13 | ExprStmt | variables.rs:381:5:381:10 | PathExpr |  |
-| variables.rs:382:5:382:14 | PathExpr | variables.rs:382:5:382:16 | CallExpr |  |
-| variables.rs:382:5:382:16 | CallExpr | variables.rs:357:11:383:1 | BlockExpr |  |
-| variables.rs:382:5:382:17 | ExprStmt | variables.rs:382:5:382:14 | PathExpr |  |
+| variables.rs:379:5:379:20 | PathExpr | variables.rs:379:5:379:22 | CallExpr |  |
+| variables.rs:379:5:379:22 | CallExpr | variables.rs:380:5:380:19 | ExprStmt |  |
+| variables.rs:379:5:379:23 | ExprStmt | variables.rs:379:5:379:20 | PathExpr |  |
+| variables.rs:380:5:380:16 | PathExpr | variables.rs:380:5:380:18 | CallExpr |  |
+| variables.rs:380:5:380:18 | CallExpr | variables.rs:381:5:381:19 | ExprStmt |  |
+| variables.rs:380:5:380:19 | ExprStmt | variables.rs:380:5:380:16 | PathExpr |  |
+| variables.rs:381:5:381:16 | PathExpr | variables.rs:381:5:381:18 | CallExpr |  |
+| variables.rs:381:5:381:18 | CallExpr | variables.rs:382:5:382:19 | ExprStmt |  |
+| variables.rs:381:5:381:19 | ExprStmt | variables.rs:381:5:381:16 | PathExpr |  |
+| variables.rs:382:5:382:16 | PathExpr | variables.rs:382:5:382:18 | CallExpr |  |
+| variables.rs:382:5:382:18 | CallExpr | variables.rs:383:5:383:19 | ExprStmt |  |
+| variables.rs:382:5:382:19 | ExprStmt | variables.rs:382:5:382:16 | PathExpr |  |
+| variables.rs:383:5:383:16 | PathExpr | variables.rs:383:5:383:18 | CallExpr |  |
+| variables.rs:383:5:383:18 | CallExpr | variables.rs:384:5:384:21 | ExprStmt |  |
+| variables.rs:383:5:383:19 | ExprStmt | variables.rs:383:5:383:16 | PathExpr |  |
+| variables.rs:384:5:384:18 | PathExpr | variables.rs:384:5:384:20 | CallExpr |  |
+| variables.rs:384:5:384:20 | CallExpr | variables.rs:385:5:385:21 | ExprStmt |  |
+| variables.rs:384:5:384:21 | ExprStmt | variables.rs:384:5:384:18 | PathExpr |  |
+| variables.rs:385:5:385:18 | PathExpr | variables.rs:385:5:385:20 | CallExpr |  |
+| variables.rs:385:5:385:20 | CallExpr | variables.rs:386:5:386:21 | ExprStmt |  |
+| variables.rs:385:5:385:21 | ExprStmt | variables.rs:385:5:385:18 | PathExpr |  |
+| variables.rs:386:5:386:18 | PathExpr | variables.rs:386:5:386:20 | CallExpr |  |
+| variables.rs:386:5:386:20 | CallExpr | variables.rs:387:5:387:21 | ExprStmt |  |
+| variables.rs:386:5:386:21 | ExprStmt | variables.rs:386:5:386:18 | PathExpr |  |
+| variables.rs:387:5:387:18 | PathExpr | variables.rs:387:5:387:20 | CallExpr |  |
+| variables.rs:387:5:387:20 | CallExpr | variables.rs:388:5:388:21 | ExprStmt |  |
+| variables.rs:387:5:387:21 | ExprStmt | variables.rs:387:5:387:18 | PathExpr |  |
+| variables.rs:388:5:388:18 | PathExpr | variables.rs:388:5:388:20 | CallExpr |  |
+| variables.rs:388:5:388:20 | CallExpr | variables.rs:389:5:389:21 | ExprStmt |  |
+| variables.rs:388:5:388:21 | ExprStmt | variables.rs:388:5:388:18 | PathExpr |  |
+| variables.rs:389:5:389:18 | PathExpr | variables.rs:389:5:389:20 | CallExpr |  |
+| variables.rs:389:5:389:20 | CallExpr | variables.rs:390:5:390:21 | ExprStmt |  |
+| variables.rs:389:5:389:21 | ExprStmt | variables.rs:389:5:389:18 | PathExpr |  |
+| variables.rs:390:5:390:18 | PathExpr | variables.rs:390:5:390:20 | CallExpr |  |
+| variables.rs:390:5:390:20 | CallExpr | variables.rs:391:5:391:21 | ExprStmt |  |
+| variables.rs:390:5:390:21 | ExprStmt | variables.rs:390:5:390:18 | PathExpr |  |
+| variables.rs:391:5:391:18 | PathExpr | variables.rs:391:5:391:20 | CallExpr |  |
+| variables.rs:391:5:391:20 | CallExpr | variables.rs:392:5:392:21 | ExprStmt |  |
+| variables.rs:391:5:391:21 | ExprStmt | variables.rs:391:5:391:18 | PathExpr |  |
+| variables.rs:392:5:392:18 | PathExpr | variables.rs:392:5:392:20 | CallExpr |  |
+| variables.rs:392:5:392:20 | CallExpr | variables.rs:393:5:393:36 | ExprStmt |  |
+| variables.rs:392:5:392:21 | ExprStmt | variables.rs:392:5:392:18 | PathExpr |  |
+| variables.rs:393:5:393:18 | PathExpr | variables.rs:393:20:393:22 | "a" |  |
+| variables.rs:393:5:393:35 | CallExpr | variables.rs:394:5:394:37 | ExprStmt |  |
+| variables.rs:393:5:393:36 | ExprStmt | variables.rs:393:5:393:18 | PathExpr |  |
+| variables.rs:393:20:393:22 | "a" | variables.rs:393:26:393:28 | "b" |  |
+| variables.rs:393:25:393:34 | TupleExpr | variables.rs:393:5:393:35 | CallExpr |  |
+| variables.rs:393:26:393:28 | "b" | variables.rs:393:31:393:33 | "c" |  |
+| variables.rs:393:31:393:33 | "c" | variables.rs:393:25:393:34 | TupleExpr |  |
+| variables.rs:394:5:394:18 | PathExpr | variables.rs:394:20:394:31 | PathExpr |  |
+| variables.rs:394:5:394:36 | CallExpr | variables.rs:395:5:395:26 | ExprStmt |  |
+| variables.rs:394:5:394:37 | ExprStmt | variables.rs:394:5:394:18 | PathExpr |  |
+| variables.rs:394:20:394:31 | PathExpr | variables.rs:394:33:394:34 | 45 |  |
+| variables.rs:394:20:394:35 | CallExpr | variables.rs:394:5:394:36 | CallExpr |  |
+| variables.rs:394:33:394:34 | 45 | variables.rs:394:20:394:35 | CallExpr |  |
+| variables.rs:395:5:395:23 | PathExpr | variables.rs:395:5:395:25 | CallExpr |  |
+| variables.rs:395:5:395:25 | CallExpr | variables.rs:396:5:396:23 | ExprStmt |  |
+| variables.rs:395:5:395:26 | ExprStmt | variables.rs:395:5:395:23 | PathExpr |  |
+| variables.rs:396:5:396:20 | PathExpr | variables.rs:396:5:396:22 | CallExpr |  |
+| variables.rs:396:5:396:22 | CallExpr | variables.rs:397:5:397:19 | ExprStmt |  |
+| variables.rs:396:5:396:23 | ExprStmt | variables.rs:396:5:396:20 | PathExpr |  |
+| variables.rs:397:5:397:16 | PathExpr | variables.rs:397:5:397:18 | CallExpr |  |
+| variables.rs:397:5:397:18 | CallExpr | variables.rs:398:5:398:17 | ExprStmt |  |
+| variables.rs:397:5:397:19 | ExprStmt | variables.rs:397:5:397:16 | PathExpr |  |
+| variables.rs:398:5:398:14 | PathExpr | variables.rs:398:5:398:16 | CallExpr |  |
+| variables.rs:398:5:398:16 | CallExpr | variables.rs:399:5:399:13 | ExprStmt |  |
+| variables.rs:398:5:398:17 | ExprStmt | variables.rs:398:5:398:14 | PathExpr |  |
+| variables.rs:399:5:399:10 | PathExpr | variables.rs:399:5:399:12 | CallExpr |  |
+| variables.rs:399:5:399:12 | CallExpr | variables.rs:400:5:400:17 | ExprStmt |  |
+| variables.rs:399:5:399:13 | ExprStmt | variables.rs:399:5:399:10 | PathExpr |  |
+| variables.rs:400:5:400:14 | PathExpr | variables.rs:400:5:400:16 | CallExpr |  |
+| variables.rs:400:5:400:16 | CallExpr | variables.rs:401:5:401:12 | ExprStmt |  |
+| variables.rs:400:5:400:17 | ExprStmt | variables.rs:400:5:400:14 | PathExpr |  |
+| variables.rs:401:5:401:9 | PathExpr | variables.rs:401:5:401:11 | CallExpr |  |
+| variables.rs:401:5:401:11 | CallExpr | variables.rs:402:5:402:14 | ExprStmt |  |
+| variables.rs:401:5:401:12 | ExprStmt | variables.rs:401:5:401:9 | PathExpr |  |
+| variables.rs:402:5:402:11 | PathExpr | variables.rs:402:5:402:13 | CallExpr |  |
+| variables.rs:402:5:402:13 | CallExpr | variables.rs:375:11:403:1 | BlockExpr |  |
+| variables.rs:402:5:402:14 | ExprStmt | variables.rs:402:5:402:11 | PathExpr |  |
 breakTarget
 continueTarget
diff --git a/rust/ql/test/library-tests/variables/variables.expected b/rust/ql/test/library-tests/variables/variables.expected
index ccc1cd6072be..8258f0ce6b97 100644
--- a/rust/ql/test/library-tests/variables/variables.expected
+++ b/rust/ql/test/library-tests/variables/variables.expected
@@ -1,4 +1,6 @@
 testFailures
+| variables.rs:368:23:368:40 | Comment | Missing result:read_access=x |
+| variables.rs:369:17:369:29 | Comment | Missing result:access=x |
 failures
 variable
 | variables.rs:3:14:3:14 | s |
@@ -72,6 +74,10 @@ variable
 | variables.rs:339:9:339:13 | ref_i |
 | variables.rs:345:17:345:17 | x |
 | variables.rs:352:13:352:13 | x |
+| variables.rs:358:13:358:13 | x |
+| variables.rs:359:9:359:9 | y |
+| variables.rs:366:13:366:13 | x |
+| variables.rs:367:13:367:15 | cap |
 variableAccess
 | variables.rs:13:15:13:16 | x1 | variables.rs:12:9:12:10 | x1 |
 | variables.rs:18:15:18:16 | x2 | variables.rs:17:13:17:14 | x2 |
@@ -167,6 +173,11 @@ variableAccess
 | variables.rs:348:10:348:10 | x | variables.rs:345:17:345:17 | x |
 | variables.rs:353:23:353:23 | x | variables.rs:352:13:352:13 | x |
 | variables.rs:354:15:354:15 | x | variables.rs:352:13:352:13 | x |
+| variables.rs:360:14:360:14 | x | variables.rs:358:13:358:13 | x |
+| variables.rs:361:6:361:6 | y | variables.rs:359:9:359:9 | y |
+| variables.rs:362:15:362:15 | x | variables.rs:358:13:358:13 | x |
+| variables.rs:371:5:371:7 | cap | variables.rs:367:13:367:15 | cap |
+| variables.rs:372:15:372:15 | x | variables.rs:366:13:366:13 | x |
 variableWriteAccess
 | variables.rs:19:5:19:6 | x2 | variables.rs:17:13:17:14 | x2 |
 | variables.rs:277:9:277:10 | c2 | variables.rs:270:13:270:14 | c2 |
@@ -259,6 +270,10 @@ variableReadAccess
 | variables.rs:347:10:347:10 | x | variables.rs:345:17:345:17 | x |
 | variables.rs:348:10:348:10 | x | variables.rs:345:17:345:17 | x |
 | variables.rs:354:15:354:15 | x | variables.rs:352:13:352:13 | x |
+| variables.rs:361:6:361:6 | y | variables.rs:359:9:359:9 | y |
+| variables.rs:362:15:362:15 | x | variables.rs:358:13:358:13 | x |
+| variables.rs:371:5:371:7 | cap | variables.rs:367:13:367:15 | cap |
+| variables.rs:372:15:372:15 | x | variables.rs:366:13:366:13 | x |
 variableInitializer
 | variables.rs:12:9:12:10 | x1 | variables.rs:12:14:12:16 | "a" |
 | variables.rs:17:13:17:14 | x2 | variables.rs:17:18:17:18 | 4 |
@@ -288,3 +303,7 @@ variableInitializer
 | variables.rs:338:13:338:13 | i | variables.rs:338:17:338:17 | 1 |
 | variables.rs:339:9:339:13 | ref_i | variables.rs:340:9:340:14 | RefExpr |
 | variables.rs:352:13:352:13 | x | variables.rs:352:17:352:17 | 2 |
+| variables.rs:358:13:358:13 | x | variables.rs:358:17:358:17 | 1 |
+| variables.rs:359:9:359:9 | y | variables.rs:360:9:360:14 | RefExpr |
+| variables.rs:366:13:366:13 | x | variables.rs:366:17:366:18 | 10 |
+| variables.rs:367:13:367:15 | cap | variables.rs:367:19:370:5 | ClosureExpr |
diff --git a/rust/ql/test/library-tests/variables/variables.rs b/rust/ql/test/library-tests/variables/variables.rs
index 52c5288a6b32..bf3491dff613 100644
--- a/rust/ql/test/library-tests/variables/variables.rs
+++ b/rust/ql/test/library-tests/variables/variables.rs
@@ -354,6 +354,24 @@ fn mutate_arg() {
     print_i64(x); // $ read_access=x
 }
 
+fn alias() {
+    let mut x = 1; // x
+    let y = // y
+        &mut x; // $ access=x
+    *y = 2; // $ read_access=y
+    print_i64(x); // $ read_access=x
+}
+
+fn capture() {
+    let mut x = 10; // x
+    let mut cap = || {
+        print_i64(x); // $ read_access=x
+        x += 1; // $ access=x
+    };
+    cap(); // $ read_access=cap
+    print_i64(x); // $ read_access=x
+}
+
 fn main() {
     immutable_variable();
     mutable_variable();
@@ -380,4 +398,6 @@ fn main() {
     add_assign();
     mutate();
     mutate_arg();
+    alias();
+    capture();
 }

From 5afd2d5bf0d63286e46126a31dbfbd02c45e5551 Mon Sep 17 00:00:00 2001
From: Tom Hvitved <hvitved@github.com>
Date: Tue, 8 Oct 2024 16:19:03 +0200
Subject: [PATCH 236/347] Rust: Account for captured variables

---
 .../rust/elements/internal/VariableImpl.qll   | 43 ++++++++++++++-----
 .../library-tests/controlflow/Cfg.expected    | 34 +++++++--------
 .../test/library-tests/variables/Cfg.expected |  8 ++--
 .../variables/variables.expected              | 10 ++++-
 .../test/library-tests/variables/variables.ql |  4 ++
 5 files changed, 65 insertions(+), 34 deletions(-)

diff --git a/rust/ql/lib/codeql/rust/elements/internal/VariableImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/VariableImpl.qll
index b9e9bb7cb48a..99cdeba4e1b2 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/VariableImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/VariableImpl.qll
@@ -1,6 +1,7 @@
 private import rust
 private import codeql.rust.elements.internal.generated.ParentChild
 private import codeql.rust.elements.internal.PathExprImpl::Impl as PathExprImpl
+private import codeql.util.DenseRank
 
 module Impl {
   /**
@@ -119,6 +120,9 @@ module Impl {
         result = let.getInitializer()
       )
     }
+
+    /** Holds if this variable is captured. */
+    predicate isCaptured() { this.getAnAccess().isCapture() }
   }
 
   /** A path expression that may access a local variable. */
@@ -251,7 +255,7 @@ module Impl {
       // Use the location of the inner scope as the location of the access, instead of the
       // actual access location. This allows us to collapse multiple accesses in inner
       // scopes to a single entity
-      scope.getLocation().hasLocationInfo(_, startline, startcolumn, endline, endcolumn)
+      inner.getLocation().hasLocationInfo(_, startline, startcolumn, endline, endcolumn)
     )
   }
 
@@ -334,18 +338,30 @@ module Impl {
     }
   }
 
+  private module DenseRankInput implements DenseRankInputSig3 {
+    class C1 = VariableScope;
+
+    class C2 = string;
+
+    class Ranked = VariableOrAccessCand;
+
+    int getRank(VariableScope scope, string name, VariableOrAccessCand v) {
+      v =
+        rank[result](VariableOrAccessCand v0, int startline, int startcolumn, int endline,
+          int endcolumn |
+          v0.rankBy(name, scope, startline, startcolumn, endline, endcolumn)
+        |
+          v0 order by startline, startcolumn, endline, endcolumn
+        )
+    }
+  }
+
   /**
    * Gets the rank of `v` amongst all other declarations or access candidates
    * to a variable named `name` in the variable scope `scope`.
    */
   private int rankVariableOrAccess(VariableScope scope, string name, VariableOrAccessCand v) {
-    v =
-      rank[result + 1](VariableOrAccessCand v0, int startline, int startcolumn, int endline,
-        int endcolumn |
-        v0.rankBy(name, scope, startline, startcolumn, endline, endcolumn)
-      |
-        v0 order by startline, startcolumn, endline, endcolumn
-      )
+    result = DenseRank3<DenseRankInput>::denseRank(scope, name, v) - 1
   }
 
   /**
@@ -379,16 +395,21 @@ module Impl {
     )
   }
 
+  private import codeql.rust.controlflow.internal.Scope
+
   /** A variable access. */
   class VariableAccess extends PathExprImpl::PathExpr instanceof VariableAccessCand {
     private string name;
     private Variable v;
 
-    VariableAccess() { variableAccess(_, name, v, this) }
+    VariableAccess() { variableAccess(name, v, this) }
 
     /** Gets the variable being accessed. */
     Variable getVariable() { result = v }
 
+    /** Holds if this access is a capture. */
+    predicate isCapture() { scopeOfAst(this) != scopeOfAst(v.getPat()) }
+
     override string toString() { result = name }
 
     override string getAPrimaryQlClass() { result = "VariableAccess" }
@@ -426,10 +447,10 @@ module Impl {
       MkVariable(AstNode definingNode, string name) { variableDecl(definingNode, _, name) }
 
     cached
-    predicate variableAccess(VariableScope scope, string name, Variable v, VariableAccessCand cand) {
+    predicate variableAccess(string name, Variable v, VariableAccessCand cand) {
       v =
         min(Variable v0, int nestLevel |
-          variableReachesCand(scope, name, v0, cand, nestLevel)
+          variableReachesCand(_, name, v0, cand, nestLevel)
         |
           v0 order by nestLevel
         )
diff --git a/rust/ql/test/library-tests/controlflow/Cfg.expected b/rust/ql/test/library-tests/controlflow/Cfg.expected
index 61b71f15118d..036dca8af5a3 100644
--- a/rust/ql/test/library-tests/controlflow/Cfg.expected
+++ b/rust/ql/test/library-tests/controlflow/Cfg.expected
@@ -20,32 +20,32 @@ edges
 | test.rs:10:9:22:9 | ExprStmt | test.rs:11:13:11:24 | ExprStmt |  |
 | test.rs:10:9:22:9 | LoopExpr | test.rs:23:9:23:20 | ExprStmt |  |
 | test.rs:10:14:22:9 | BlockExpr | test.rs:11:13:11:24 | ExprStmt |  |
-| test.rs:11:13:11:13 | PathExpr | test.rs:11:17:11:20 | PathExpr |  |
+| test.rs:11:13:11:13 | i | test.rs:11:17:11:20 | PathExpr |  |
 | test.rs:11:13:11:23 | ... = ... | test.rs:12:13:14:13 | ExprStmt |  |
-| test.rs:11:13:11:24 | ExprStmt | test.rs:11:13:11:13 | PathExpr |  |
-| test.rs:11:17:11:20 | PathExpr | test.rs:11:22:11:22 | PathExpr |  |
+| test.rs:11:13:11:24 | ExprStmt | test.rs:11:13:11:13 | i |  |
+| test.rs:11:17:11:20 | PathExpr | test.rs:11:22:11:22 | i |  |
 | test.rs:11:17:11:23 | CallExpr | test.rs:11:13:11:23 | ... = ... |  |
-| test.rs:11:22:11:22 | PathExpr | test.rs:11:17:11:23 | CallExpr |  |
-| test.rs:12:13:14:13 | ExprStmt | test.rs:12:16:12:16 | PathExpr |  |
+| test.rs:11:22:11:22 | i | test.rs:11:17:11:23 | CallExpr |  |
+| test.rs:12:13:14:13 | ExprStmt | test.rs:12:16:12:16 | i |  |
 | test.rs:12:13:14:13 | IfExpr | test.rs:15:13:17:13 | ExprStmt |  |
-| test.rs:12:16:12:16 | PathExpr | test.rs:12:20:12:24 | 10000 |  |
+| test.rs:12:16:12:16 | i | test.rs:12:20:12:24 | 10000 |  |
 | test.rs:12:16:12:24 | ... > ... | test.rs:12:13:14:13 | IfExpr | false |
 | test.rs:12:16:12:24 | ... > ... | test.rs:13:17:13:29 | ExprStmt | true |
 | test.rs:12:20:12:24 | 10000 | test.rs:12:16:12:24 | ... > ... |  |
 | test.rs:13:17:13:28 | ReturnExpr | test.rs:8:5:24:5 | exit test_break_and_continue (normal) | return |
 | test.rs:13:17:13:29 | ExprStmt | test.rs:13:24:13:28 | false |  |
 | test.rs:13:24:13:28 | false | test.rs:13:17:13:28 | ReturnExpr |  |
-| test.rs:15:13:17:13 | ExprStmt | test.rs:15:16:15:16 | PathExpr |  |
+| test.rs:15:13:17:13 | ExprStmt | test.rs:15:16:15:16 | i |  |
 | test.rs:15:13:17:13 | IfExpr | test.rs:18:13:20:13 | ExprStmt |  |
-| test.rs:15:16:15:16 | PathExpr | test.rs:15:21:15:21 | 1 |  |
+| test.rs:15:16:15:16 | i | test.rs:15:21:15:21 | 1 |  |
 | test.rs:15:16:15:21 | ... == ... | test.rs:15:13:17:13 | IfExpr | false |
 | test.rs:15:16:15:21 | ... == ... | test.rs:16:17:16:22 | ExprStmt | true |
 | test.rs:15:21:15:21 | 1 | test.rs:15:16:15:21 | ... == ... |  |
 | test.rs:16:17:16:21 | BreakExpr | test.rs:10:9:22:9 | LoopExpr | break |
 | test.rs:16:17:16:22 | ExprStmt | test.rs:16:17:16:21 | BreakExpr |  |
-| test.rs:18:13:20:13 | ExprStmt | test.rs:18:16:18:16 | PathExpr |  |
-| test.rs:18:13:20:13 | IfExpr | test.rs:21:13:21:13 | PathExpr |  |
-| test.rs:18:16:18:16 | PathExpr | test.rs:18:20:18:20 | 2 |  |
+| test.rs:18:13:20:13 | ExprStmt | test.rs:18:16:18:16 | i |  |
+| test.rs:18:13:20:13 | IfExpr | test.rs:21:13:21:13 | i |  |
+| test.rs:18:16:18:16 | i | test.rs:18:20:18:20 | 2 |  |
 | test.rs:18:16:18:20 | ... % ... | test.rs:18:25:18:25 | 0 |  |
 | test.rs:18:16:18:25 | ... != ... | test.rs:18:13:20:13 | IfExpr | false |
 | test.rs:18:16:18:25 | ... != ... | test.rs:19:17:19:25 | ExprStmt | true |
@@ -53,9 +53,9 @@ edges
 | test.rs:18:25:18:25 | 0 | test.rs:18:16:18:25 | ... != ... |  |
 | test.rs:19:17:19:24 | ContinueExpr | test.rs:11:13:11:24 | ExprStmt | continue |
 | test.rs:19:17:19:25 | ExprStmt | test.rs:19:17:19:24 | ContinueExpr |  |
-| test.rs:21:13:21:13 | PathExpr | test.rs:21:17:21:17 | PathExpr |  |
+| test.rs:21:13:21:13 | i | test.rs:21:17:21:17 | i |  |
 | test.rs:21:13:21:21 | ... = ... | test.rs:10:14:22:9 | BlockExpr |  |
-| test.rs:21:17:21:17 | PathExpr | test.rs:21:21:21:21 | 2 |  |
+| test.rs:21:17:21:17 | i | test.rs:21:21:21:21 | 2 |  |
 | test.rs:21:17:21:21 | ... / ... | test.rs:21:13:21:21 | ... = ... |  |
 | test.rs:21:21:21:21 | 2 | test.rs:21:17:21:21 | ... / ... |  |
 | test.rs:23:9:23:19 | ReturnExpr | test.rs:8:5:24:5 | exit test_break_and_continue (normal) | return |
@@ -134,9 +134,9 @@ edges
 | test.rs:72:21:72:21 | 0 | test.rs:72:17:72:21 | ... > ... |  |
 | test.rs:73:17:73:21 | BreakExpr | test.rs:70:9:76:9 | WhileExpr | break |
 | test.rs:73:17:73:22 | ExprStmt | test.rs:73:17:73:21 | BreakExpr |  |
-| test.rs:75:13:75:13 | PathExpr | test.rs:75:17:75:21 | false |  |
+| test.rs:75:13:75:13 | b | test.rs:75:17:75:21 | false |  |
 | test.rs:75:13:75:21 | ... = ... | test.rs:70:17:76:9 | BlockExpr |  |
-| test.rs:75:13:75:22 | ExprStmt | test.rs:75:13:75:13 | PathExpr |  |
+| test.rs:75:13:75:22 | ExprStmt | test.rs:75:13:75:13 | b |  |
 | test.rs:75:17:75:21 | false | test.rs:75:13:75:21 | ... = ... |  |
 | test.rs:79:5:86:5 | enter test_while_let | test.rs:80:9:80:29 | LetStmt |  |
 | test.rs:79:5:86:5 | exit test_while_let (normal) | test.rs:79:5:86:5 | exit test_while_let |  |
@@ -230,13 +230,13 @@ edges
 | test.rs:122:28:124:9 | BlockExpr | test.rs:122:9:124:9 | IfExpr |  |
 | test.rs:123:13:123:13 | n | test.rs:122:28:124:9 | BlockExpr |  |
 | test.rs:125:9:125:9 | 0 | test.rs:121:43:126:5 | BlockExpr |  |
-| test.rs:128:5:134:5 | enter test_nested_if | test.rs:129:16:129:16 | PathExpr |  |
+| test.rs:128:5:134:5 | enter test_nested_if | test.rs:129:16:129:16 | a |  |
 | test.rs:128:5:134:5 | exit test_nested_if (normal) | test.rs:128:5:134:5 | exit test_nested_if |  |
 | test.rs:128:38:134:5 | BlockExpr | test.rs:128:5:134:5 | exit test_nested_if (normal) |  |
 | test.rs:129:9:133:9 | IfExpr | test.rs:128:38:134:5 | BlockExpr |  |
 | test.rs:129:13:129:48 | [boolean(false)] IfExpr | test.rs:132:13:132:13 | 0 | false |
 | test.rs:129:13:129:48 | [boolean(true)] IfExpr | test.rs:130:13:130:13 | 1 | true |
-| test.rs:129:16:129:16 | PathExpr | test.rs:129:20:129:20 | 0 |  |
+| test.rs:129:16:129:16 | a | test.rs:129:20:129:20 | 0 |  |
 | test.rs:129:16:129:20 | ... < ... | test.rs:129:24:129:24 | a | true |
 | test.rs:129:16:129:20 | ... < ... | test.rs:129:41:129:41 | a | false |
 | test.rs:129:20:129:20 | 0 | test.rs:129:16:129:20 | ... < ... |  |
diff --git a/rust/ql/test/library-tests/variables/Cfg.expected b/rust/ql/test/library-tests/variables/Cfg.expected
index 628a738db7e7..89e7aaec297e 100644
--- a/rust/ql/test/library-tests/variables/Cfg.expected
+++ b/rust/ql/test/library-tests/variables/Cfg.expected
@@ -633,13 +633,13 @@ edges
 | variables.rs:367:19:370:5 | enter ClosureExpr | variables.rs:368:9:368:21 | ExprStmt |  |
 | variables.rs:367:19:370:5 | exit ClosureExpr (normal) | variables.rs:367:19:370:5 | exit ClosureExpr |  |
 | variables.rs:367:22:370:5 | BlockExpr | variables.rs:367:19:370:5 | exit ClosureExpr (normal) |  |
-| variables.rs:368:9:368:17 | PathExpr | variables.rs:368:19:368:19 | PathExpr |  |
+| variables.rs:368:9:368:17 | PathExpr | variables.rs:368:19:368:19 | x |  |
 | variables.rs:368:9:368:20 | CallExpr | variables.rs:369:9:369:15 | ExprStmt |  |
 | variables.rs:368:9:368:21 | ExprStmt | variables.rs:368:9:368:17 | PathExpr |  |
-| variables.rs:368:19:368:19 | PathExpr | variables.rs:368:9:368:20 | CallExpr |  |
-| variables.rs:369:9:369:9 | PathExpr | variables.rs:369:14:369:14 | 1 |  |
+| variables.rs:368:19:368:19 | x | variables.rs:368:9:368:20 | CallExpr |  |
+| variables.rs:369:9:369:9 | x | variables.rs:369:14:369:14 | 1 |  |
 | variables.rs:369:9:369:14 | ... += ... | variables.rs:367:22:370:5 | BlockExpr |  |
-| variables.rs:369:9:369:15 | ExprStmt | variables.rs:369:9:369:9 | PathExpr |  |
+| variables.rs:369:9:369:15 | ExprStmt | variables.rs:369:9:369:9 | x |  |
 | variables.rs:369:14:369:14 | 1 | variables.rs:369:9:369:14 | ... += ... |  |
 | variables.rs:371:5:371:7 | cap | variables.rs:371:5:371:9 | CallExpr |  |
 | variables.rs:371:5:371:9 | CallExpr | variables.rs:372:5:372:17 | ExprStmt |  |
diff --git a/rust/ql/test/library-tests/variables/variables.expected b/rust/ql/test/library-tests/variables/variables.expected
index 8258f0ce6b97..09430b5497c0 100644
--- a/rust/ql/test/library-tests/variables/variables.expected
+++ b/rust/ql/test/library-tests/variables/variables.expected
@@ -1,6 +1,4 @@
 testFailures
-| variables.rs:368:23:368:40 | Comment | Missing result:read_access=x |
-| variables.rs:369:17:369:29 | Comment | Missing result:access=x |
 failures
 variable
 | variables.rs:3:14:3:14 | s |
@@ -176,6 +174,8 @@ variableAccess
 | variables.rs:360:14:360:14 | x | variables.rs:358:13:358:13 | x |
 | variables.rs:361:6:361:6 | y | variables.rs:359:9:359:9 | y |
 | variables.rs:362:15:362:15 | x | variables.rs:358:13:358:13 | x |
+| variables.rs:368:19:368:19 | x | variables.rs:366:13:366:13 | x |
+| variables.rs:369:9:369:9 | x | variables.rs:366:13:366:13 | x |
 | variables.rs:371:5:371:7 | cap | variables.rs:367:13:367:15 | cap |
 | variables.rs:372:15:372:15 | x | variables.rs:366:13:366:13 | x |
 variableWriteAccess
@@ -272,6 +272,7 @@ variableReadAccess
 | variables.rs:354:15:354:15 | x | variables.rs:352:13:352:13 | x |
 | variables.rs:361:6:361:6 | y | variables.rs:359:9:359:9 | y |
 | variables.rs:362:15:362:15 | x | variables.rs:358:13:358:13 | x |
+| variables.rs:368:19:368:19 | x | variables.rs:366:13:366:13 | x |
 | variables.rs:371:5:371:7 | cap | variables.rs:367:13:367:15 | cap |
 | variables.rs:372:15:372:15 | x | variables.rs:366:13:366:13 | x |
 variableInitializer
@@ -307,3 +308,8 @@ variableInitializer
 | variables.rs:359:9:359:9 | y | variables.rs:360:9:360:14 | RefExpr |
 | variables.rs:366:13:366:13 | x | variables.rs:366:17:366:18 | 10 |
 | variables.rs:367:13:367:15 | cap | variables.rs:367:19:370:5 | ClosureExpr |
+capturedVariable
+| variables.rs:366:13:366:13 | x |
+capturedAccess
+| variables.rs:368:19:368:19 | x |
+| variables.rs:369:9:369:9 | x |
diff --git a/rust/ql/test/library-tests/variables/variables.ql b/rust/ql/test/library-tests/variables/variables.ql
index 9657c361fd59..23eab9774457 100644
--- a/rust/ql/test/library-tests/variables/variables.ql
+++ b/rust/ql/test/library-tests/variables/variables.ql
@@ -11,6 +11,10 @@ query predicate variableReadAccess(VariableReadAccess va, Variable v) { v = va.g
 
 query predicate variableInitializer(Variable v, Expr e) { e = v.getInitializer() }
 
+query predicate capturedVariable(Variable v) { v.isCaptured() }
+
+query predicate capturedAccess(VariableAccess va) { va.isCapture() }
+
 module VariableAccessTest implements TestSig {
   string getARelevantTag() { result = ["", "write_", "read_"] + "access" }
 

From 41218fb89fb510e8b7e614a809bd28b1138808f4 Mon Sep 17 00:00:00 2001
From: Geoffrey White <40627776+geoffw0@users.noreply.github.com>
Date: Tue, 8 Oct 2024 17:33:21 +0100
Subject: [PATCH 237/347] Rust: Test spacing / variable names.

---
 .../unusedentities/UnusedVariable.expected    | 12 ++---
 .../test/query-tests/unusedentities/main.rs   | 44 +++++++++++++++----
 2 files changed, 42 insertions(+), 14 deletions(-)

diff --git a/rust/ql/test/query-tests/unusedentities/UnusedVariable.expected b/rust/ql/test/query-tests/unusedentities/UnusedVariable.expected
index fd4b8d3d2b46..ccf6117f2966 100644
--- a/rust/ql/test/query-tests/unusedentities/UnusedVariable.expected
+++ b/rust/ql/test/query-tests/unusedentities/UnusedVariable.expected
@@ -5,9 +5,9 @@
 | main.rs:164:9:164:9 | x | Variable is not used. |
 | main.rs:169:9:169:9 | x | Variable is not used. |
 | main.rs:174:9:174:9 | x | Variable is not used. |
-| main.rs:195:17:195:17 | a | Variable is not used. |
-| main.rs:203:20:203:22 | val | Variable is not used. |
-| main.rs:216:14:216:16 | val | Variable is not used. |
-| main.rs:218:9:218:12 | None | Variable is not used. |
-| main.rs:227:9:227:12 | None | Variable is not used. |
-| main.rs:233:24:233:26 | val | Variable is not used. |
+| main.rs:202:17:202:17 | a | Variable is not used. |
+| main.rs:210:20:210:22 | val | Variable is not used. |
+| main.rs:223:14:223:16 | val | Variable is not used. |
+| main.rs:225:9:225:12 | None | Variable is not used. |
+| main.rs:234:9:234:12 | None | Variable is not used. |
+| main.rs:248:24:248:26 | val | Variable is not used. |
diff --git a/rust/ql/test/query-tests/unusedentities/main.rs b/rust/ql/test/query-tests/unusedentities/main.rs
index a34219f8a7ab..be9fdaed2e4f 100644
--- a/rust/ql/test/query-tests/unusedentities/main.rs
+++ b/rust/ql/test/query-tests/unusedentities/main.rs
@@ -167,12 +167,12 @@ fn loops() {
     for _ in 1..10 {}
 
     for x // SPURIOUS: unused variable [macros not yet supported]
-    in 1..10 {    
+    in 1..10 {
         println!("x is {}", x);
     }
 
     for x // SPURIOUS: unused variable [macros not yet supported]
-    in 1..10 {   
+    in 1..10 {
         assert!(x != 11);
     }
 }
@@ -189,7 +189,14 @@ enum YesOrNo {
     No,
 }
 
-fn if_lets() {
+
+
+
+
+
+
+
+fn if_lets_matches() {
     let mut total: i64 = 0;
 
     if let Some(a) = Some(10) { // BAD: unused variable
@@ -228,18 +235,39 @@ fn if_lets() {
         }
     }
 
-    let e = MyOption::Some(80);
-    match e {
+
+
+
+
+
+
+
+
+    let f = MyOption::Some(90);
+    match f {
         MyOption::Some(val) => { // BAD: unused variable
         }
         MyOption::None => {}
     }
 
-    let f = YesOrNo::Yes;
-    match f {
+
+
+
+
+
+
+
+    let h = YesOrNo::Yes;
+    match h {
         YesOrNo::Yes => {}
         YesOrNo::No => {}
     }
+
+
+
+
+
+
 }
 
 fn main() {
@@ -249,7 +277,7 @@ fn main() {
     arrays();
     statics();
     loops();
-    if_lets();
+    if_lets_matches();
 
     println!("lets use result {}", parameters(1, 2, 3));
 }

From 11016e193c7733478bf0dab44ea4ffe4cadc1037 Mon Sep 17 00:00:00 2001
From: Tom Hvitved <hvitved@github.com>
Date: Tue, 8 Oct 2024 14:57:19 +0200
Subject: [PATCH 238/347] Rust: PrintAst improvements

---
 rust/ql/lib/codeql/rust/printast/PrintAst.qll |  73 ++++-----
 .../lib/codeql/rust/printast/PrintAstNode.qll | 138 ++++++++----------
 .../ide-contextual-queries/printAst.ql        |  19 +--
 3 files changed, 101 insertions(+), 129 deletions(-)

diff --git a/rust/ql/lib/codeql/rust/printast/PrintAst.qll b/rust/ql/lib/codeql/rust/printast/PrintAst.qll
index b485efe8022b..7b4e4fea68a8 100644
--- a/rust/ql/lib/codeql/rust/printast/PrintAst.qll
+++ b/rust/ql/lib/codeql/rust/printast/PrintAst.qll
@@ -2,48 +2,51 @@
  * Provides queries to pretty-print a Rust AST as a graph.
  */
 
-import PrintAstNode
+import codeql.rust.printast.PrintAstNode
 
-cached
-private int getOrder(PrintAstNode node) {
-  node =
-    rank[result](PrintAstNode n, Location loc |
-      loc = n.getLocation()
-    |
-      n
-      order by
-        loc.getFile().getAbsolutePath(), loc.getStartLine(), loc.getStartColumn(), loc.getEndLine(),
-        loc.getEndColumn()
-    )
-}
+module PrintAst<shouldPrintSig/1 shouldPrint> {
+  import PrintAstNode<shouldPrint/1>
+
+  pragma[nomagic]
+  private predicate orderBy(
+    PrintAstNode n, string filepath, int startline, int startcolumn, int endline, int endcolumn
+  ) {
+    n.getLocation().hasLocationInfo(filepath, startline, startcolumn, endline, endcolumn)
+  }
 
-/** Holds if `node` belongs to the output tree, and its property `key` has the given `value`. */
-query predicate nodes(PrintAstNode node, string key, string value) {
-  node.shouldBePrinted() and
-  (
+  private int getOrder(PrintAstNode node) {
+    node =
+      rank[result](PrintAstNode n, string filepath, int startline, int startcolumn, int endline,
+        int endcolumn |
+        orderBy(n, filepath, startline, startcolumn, endline, endcolumn)
+      |
+        n order by filepath, startline, startcolumn, endline, endcolumn
+      )
+  }
+
+  /** Holds if `node` belongs to the output tree, and its property `key` has the given `value`. */
+  query predicate nodes(PrintAstNode node, string key, string value) {
     key = "semmle.label" and value = node.toString()
     or
     key = "semmle.order" and value = getOrder(node).toString()
     or
     value = node.getProperty(key)
-  )
-}
+  }
 
-/**
- * Holds if `target` is a child of `source` in the AST, and property `key` of the edge has the
- * given `value`.
- */
-query predicate edges(PrintAstNode source, PrintAstNode target, string key, string value) {
-  source.shouldBePrinted() and
-  target.shouldBePrinted() and
-  exists(int index, string accessor | source.hasChild(target, index, accessor) |
-    key = "semmle.label" and value = accessor
-    or
-    key = "semmle.order" and value = index.toString()
-  )
-}
+  /**
+   * Holds if `target` is a child of `source` in the AST, and property `key` of the edge has the
+   * given `value`.
+   */
+  query predicate edges(PrintAstNode source, PrintAstNode target, string key, string value) {
+    exists(int index, string accessor | source.hasChild(target, index, accessor) |
+      key = "semmle.label" and value = accessor
+      or
+      key = "semmle.order" and value = index.toString()
+    )
+  }
 
-/** Holds if property `key` of the graph has the given `value`. */
-query predicate graphProperties(string key, string value) {
-  key = "semmle.graphKind" and value = "tree"
+  /** Holds if property `key` of the graph has the given `value`. */
+  query predicate graphProperties(string key, string value) {
+    key = "semmle.graphKind" and value = "tree"
+  }
 }
diff --git a/rust/ql/lib/codeql/rust/printast/PrintAstNode.qll b/rust/ql/lib/codeql/rust/printast/PrintAstNode.qll
index db5afa9b708c..3ba4360ada22 100644
--- a/rust/ql/lib/codeql/rust/printast/PrintAstNode.qll
+++ b/rust/ql/lib/codeql/rust/printast/PrintAstNode.qll
@@ -6,105 +6,81 @@
 import rust
 import codeql.rust.elements.internal.generated.ParentChild
 
-private newtype TPrintAstConfiguration = TMakePrintAstConfiguration()
+signature predicate shouldPrintSig(Locatable e);
 
-/**
- * The hook to customize the files and functions printed by this module.
- */
-class PrintAstConfiguration extends TPrintAstConfiguration {
+module PrintAstNode<shouldPrintSig/1 shouldPrint> {
   /**
-   * Gets the string representation of this singleton
+   * An AST node that should be printed.
    */
-  string toString() { result = "PrintAstConfiguration" }
+  private newtype TPrintAstNode = TPrintLocatable(Locatable ast) { shouldPrint(ast) }
 
   /**
-   * Holds if the AST for `e` should be printed. By default, holds for all.
+   * A node in the output tree.
    */
-  predicate shouldPrint(Locatable e) { any() }
-}
-
-private predicate shouldPrint(Locatable e) { any(PrintAstConfiguration config).shouldPrint(e) }
-
-/**
- * An AST node that should be printed.
- */
-private newtype TPrintAstNode = TPrintLocatable(Locatable ast)
-
-/**
- * A node in the output tree.
- */
-class PrintAstNode extends TPrintAstNode {
-  /**
-   * Gets a textual representation of this node.
-   */
-  abstract string toString();
-
-  /**
-   * Gets the child node at index `index`. Child indices must be unique,
-   * but need not be contiguous.
-   */
-  abstract predicate hasChild(PrintAstNode child, int index, string label);
-
-  /**
-   * Holds if this node should be printed in the output.
-   */
-  abstract predicate shouldBePrinted();
+  class PrintAstNode extends TPrintAstNode {
+    /**
+     * Gets a textual representation of this node.
+     */
+    abstract string toString();
+
+    /**
+     * Gets the child node at index `index`. Child indices must be unique,
+     * but need not be contiguous.
+     */
+    abstract predicate hasChild(PrintAstNode child, int index, string label);
+
+    /**
+     * Gets the location of this node in the source code.
+     */
+    abstract Location getLocation();
+
+    /**
+     * Gets the value of an additional property of this node, where the name of
+     * the property is `key`.
+     */
+    string getProperty(string key) { none() }
+
+    /**
+     * Gets the underlying AST node, if any.
+     */
+    abstract Locatable getAstNode();
+  }
 
-  /**
-   * Gets the location of this node in the source code.
-   */
-  abstract Location getLocation();
+  private string prettyPrint(Locatable e) { result = "[" + e.getPrimaryQlClasses() + "] " + e }
 
-  /**
-   * Gets the value of an additional property of this node, where the name of
-   * the property is `key`.
-   */
-  string getProperty(string key) { none() }
+  private class Unresolved extends Locatable {
+    Unresolved() { this != this.resolve() }
+  }
 
   /**
-   * Gets the underlying AST node, if any.
+   * A graph node representing a real Locatable node.
    */
-  abstract Locatable getAstNode();
-}
+  class PrintLocatable extends PrintAstNode, TPrintLocatable {
+    Locatable ast;
 
-private string prettyPrint(Locatable e) {
-  result = "[" + concat(e.getPrimaryQlClasses(), ", ") + "] " + e
-}
+    PrintLocatable() { this = TPrintLocatable(ast) }
 
-private class Unresolved extends Locatable {
-  Unresolved() { this != this.resolve() }
-}
+    override string toString() { result = prettyPrint(ast) }
 
-/**
- * A graph node representing a real Locatable node.
- */
-class PrintLocatable extends PrintAstNode, TPrintLocatable {
-  Locatable ast;
+    override predicate hasChild(PrintAstNode child, int index, string label) {
+      child = TPrintLocatable(any(Locatable c | c = getChildAndAccessor(ast, index, label)))
+    }
 
-  PrintLocatable() { this = TPrintLocatable(ast) }
+    final override Locatable getAstNode() { result = ast }
 
-  override string toString() { result = prettyPrint(ast) }
-
-  final override predicate shouldBePrinted() { shouldPrint(ast) }
-
-  override predicate hasChild(PrintAstNode child, int index, string label) {
-    child = TPrintLocatable(any(Locatable c | c = getChildAndAccessor(ast, index, label)))
+    final override Location getLocation() { result = ast.getLocation() }
   }
 
-  final override Locatable getAstNode() { result = ast }
-
-  final override Location getLocation() { result = ast.getLocation() }
-}
-
-/**
- * A specialization of graph node for "unresolved" children, that is nodes in
- * the parallel conversion AST.
- */
-class PrintUnresolved extends PrintLocatable {
-  override Unresolved ast;
+  /**
+   * A specialization of graph node for "unresolved" children, that is nodes in
+   * the parallel conversion AST.
+   */
+  class PrintUnresolved extends PrintLocatable {
+    override Unresolved ast;
 
-  override predicate hasChild(PrintAstNode child, int index, string label) {
-    // only print immediate unresolved children from the "parallel" AST
-    child = TPrintLocatable(getImmediateChildAndAccessor(ast, index, label).(Unresolved))
+    override predicate hasChild(PrintAstNode child, int index, string label) {
+      // only print immediate unresolved children from the "parallel" AST
+      child = TPrintLocatable(getImmediateChildAndAccessor(ast, index, label).(Unresolved))
+    }
   }
 }
diff --git a/rust/ql/src/queries/ide-contextual-queries/printAst.ql b/rust/ql/src/queries/ide-contextual-queries/printAst.ql
index 2362a206a34d..f878530c47c0 100644
--- a/rust/ql/src/queries/ide-contextual-queries/printAst.ql
+++ b/rust/ql/src/queries/ide-contextual-queries/printAst.ql
@@ -17,17 +17,10 @@ import codeql.rust.elements.internal.generated.ParentChild
  */
 external string selectedSourceFile();
 
-class PrintAstConfigurationOverride extends PrintAstConfiguration {
-  /**
-   * Holds if the location matches the selected file in the VS Code extension and
-   * the element is `e`.
-   */
-  override predicate shouldPrint(Locatable e) {
-    super.shouldPrint(e) and
-    (
-      e.getFile() = getFileBySourceArchiveName(selectedSourceFile())
-      or
-      exists(Locatable parent | this.shouldPrint(parent) and parent = getImmediateParent(e))
-    )
-  }
+predicate shouldPrint(Locatable e) {
+  e.getFile() = getFileBySourceArchiveName(selectedSourceFile())
+  or
+  exists(Locatable parent | shouldPrint(parent) and parent = getImmediateParent(e))
 }
+
+import PrintAst<shouldPrint/1>

From 3d953696087349b0fb7e3fc629405d6ea2310f7f Mon Sep 17 00:00:00 2001
From: Tom Hvitved <hvitved@github.com>
Date: Thu, 3 Oct 2024 10:26:37 +0200
Subject: [PATCH 239/347] Shared `ConditionalSplitting` implementation

---
 .../internal/ControlFlowGraphImpl.qll         |  22 +-
 .../rust/controlflow/internal/Splitting.qll   |  90 ++++----
 shared/controlflow/codeql/controlflow/Cfg.qll | 196 ++++++++++++++++--
 shared/util/codeql/util/Void.qll              |  10 +
 4 files changed, 254 insertions(+), 64 deletions(-)
 create mode 100644 shared/util/codeql/util/Void.qll

diff --git a/rust/ql/lib/codeql/rust/controlflow/internal/ControlFlowGraphImpl.qll b/rust/ql/lib/codeql/rust/controlflow/internal/ControlFlowGraphImpl.qll
index 6ade39203c96..8bb27c3d9910 100644
--- a/rust/ql/lib/codeql/rust/controlflow/internal/ControlFlowGraphImpl.qll
+++ b/rust/ql/lib/codeql/rust/controlflow/internal/ControlFlowGraphImpl.qll
@@ -7,7 +7,6 @@ private import codeql.rust.controlflow.ControlFlowGraph as Cfg
 private module CfgInput implements InputSig<Location> {
   private import rust as Rust
   private import Completion as C
-  private import Splitting as S
 
   class AstNode = Rust::AstNode;
 
@@ -24,10 +23,6 @@ private module CfgInput implements InputSig<Location> {
 
   CfgScope getCfgScope(AstNode n) { result = Scope::scopeOfAst(n) }
 
-  class SplitKindBase = S::TSplitKind;
-
-  class Split = S::Split;
-
   class SuccessorType = Cfg::SuccessorType;
 
   /** Gets a successor type that matches completion `c`. */
@@ -51,7 +46,22 @@ private module CfgInput implements InputSig<Location> {
   predicate scopeLast(CfgScope scope, AstNode last, Completion c) { scope.scopeLast(last, c) }
 }
 
-private module CfgImpl = Make<Location, CfgInput>;
+private module CfgSplittingInput implements SplittingInputSig<Location, CfgInput> {
+  private import Splitting as S
+
+  class SplitKindBase = S::TSplitKind;
+
+  class Split = S::Split;
+}
+
+private module ConditionalCompletionSplittingInput implements
+  ConditionalCompletionSplittingInputSig<Location, CfgInput, CfgSplittingInput>
+{
+  import Splitting::ConditionalCompletionSplitting::ConditionalCompletionSplittingInput
+}
+
+private module CfgImpl =
+  MakeWithSplitting<Location, CfgInput, CfgSplittingInput, ConditionalCompletionSplittingInput>;
 
 import CfgImpl
 
diff --git a/rust/ql/lib/codeql/rust/controlflow/internal/Splitting.qll b/rust/ql/lib/codeql/rust/controlflow/internal/Splitting.qll
index 10965649caa5..ae00e3e0d7a5 100644
--- a/rust/ql/lib/codeql/rust/controlflow/internal/Splitting.qll
+++ b/rust/ql/lib/codeql/rust/controlflow/internal/Splitting.qll
@@ -21,7 +21,7 @@ abstract private class Split_ extends TSplit {
 
 final class Split = Split_;
 
-private module ConditionalCompletionSplitting {
+module ConditionalCompletionSplitting {
   /**
    * A split for conditional completions. For example, in
    *
@@ -39,10 +39,12 @@ private module ConditionalCompletionSplitting {
 
     ConditionalCompletionSplit() { this = TConditionalCompletionSplit(completion) }
 
+    ConditionalCompletion getCompletion() { result = completion }
+
     override string toString() { result = completion.toString() }
   }
 
-  private class ConditionalCompletionSplitKind extends SplitKind, TConditionalCompletionSplitKind {
+  private class ConditionalCompletionSplitKind_ extends SplitKind, TConditionalCompletionSplitKind {
     override int getListOrder() { result = 0 }
 
     override predicate isEnabled(AstNode cfe) { this.appliesTo(cfe) }
@@ -50,66 +52,64 @@ private module ConditionalCompletionSplitting {
     override string toString() { result = "ConditionalCompletion" }
   }
 
-  private class ConditionalCompletionSplitImpl extends SplitImpl instanceof ConditionalCompletionSplit
-  {
-    ConditionalCompletion completion;
+  module ConditionalCompletionSplittingInput {
+    private import Completion as Comp
 
-    ConditionalCompletionSplitImpl() { this = TConditionalCompletionSplit(completion) }
+    class ConditionalCompletion = Comp::ConditionalCompletion;
 
-    override ConditionalCompletionSplitKind getKind() { any() }
+    class ConditionalCompletionSplitKind extends ConditionalCompletionSplitKind_, TSplitKind { }
 
-    override predicate hasEntry(AstNode pred, AstNode succ, Completion c) {
-      succ(pred, succ, c) and
-      last(succ, _, completion) and
+    class ConditionalCompletionSplit = ConditionalCompletionSplitting::ConditionalCompletionSplit;
+
+    bindingset[parent, parentCompletion]
+    predicate condPropagateExpr(
+      AstNode parent, ConditionalCompletion parentCompletion, AstNode child,
+      ConditionalCompletion childCompletion
+    ) {
+      child = parent.(LogicalNotExpr).getExpr() and
+      childCompletion.getDual() = parentCompletion
+      or
+      childCompletion = parentCompletion and
       (
-        last(succ.(LogicalNotExpr).getExpr(), pred, c) and
-        completion.(BooleanCompletion).getDual() = c
-        or
-        last(succ.(BinaryLogicalOperation).getAnOperand(), pred, c) and
-        completion = c
+        child = parent.(BinaryLogicalOperation).getAnOperand()
         or
-        succ =
-          any(IfExpr ie |
-            last([ie.getThen(), ie.getElse()], pred, c) and
-            completion = c
-          )
+        parent = any(IfExpr ie | child = [ie.getThen(), ie.getElse()])
         or
-        last(succ.(MatchExpr).getAnArm().getExpr(), pred, c) and
-        completion = c
+        child = parent.(MatchExpr).getAnArm().getExpr()
         or
-        last(succ.(BlockExpr).getStmtList().getTailExpr(), pred, c) and
-        completion = c
+        child = parent.(BlockExpr).getStmtList().getTailExpr()
       )
-      or
-      succ(pred, succ, c) and
-      last(succ.(BreakExpr).getExpr(), pred, c) and
-      exists(AstNode target |
-        succ(succ, target, _) and
-        last(target, _, completion)
-      ) and
-      completion = c
     }
+  }
 
-    override predicate hasEntryScope(CfgScope scope, AstNode first) { none() }
-
-    override predicate hasExit(AstNode pred, AstNode succ, Completion c) {
-      this.appliesTo(pred) and
-      succ(pred, succ, c) and
-      if c instanceof ConditionalCompletion
-      then completion = c
-      else not this.hasSuccessor(pred, succ, c)
+  private class ConditionalCompletionSplitImpl extends SplitImplementations::ConditionalCompletionSplitting::ConditionalCompletionSplitImpl
+  {
+    /**
+     * Gets a `break` expression whose target can have a Boolean completion that
+     * matches this split.
+     */
+    private BreakExpr getABreakExpr(Expr target) {
+      target = result.getTarget() and
+      last(target, _, this.getCompletion())
     }
 
-    override predicate hasExitScope(CfgScope scope, AstNode last, Completion c) {
-      this.appliesTo(last) and
-      scope.scopeLast(last, c) and
-      if c instanceof ConditionalCompletion then completion = c else any()
+    override predicate hasEntry(AstNode pred, AstNode succ, Completion c) {
+      super.hasEntry(pred, succ, c)
+      or
+      succ(pred, succ, c) and
+      last(succ.(BreakExpr).getExpr(), pred, c) and
+      succ = this.getABreakExpr(_) and
+      c = this.getCompletion()
     }
 
     override predicate hasSuccessor(AstNode pred, AstNode succ, Completion c) {
+      super.hasSuccessor(pred, succ, c)
+      or
       this.appliesTo(pred) and
       succ(pred, succ, c) and
-      not c instanceof ConditionalCompletion
+      pred = this.getABreakExpr(succ)
     }
   }
+
+  int getNextListOrder() { result = 1 }
 }
diff --git a/shared/controlflow/codeql/controlflow/Cfg.qll b/shared/controlflow/codeql/controlflow/Cfg.qll
index 7f1eb54b2b02..be05a5695a95 100644
--- a/shared/controlflow/codeql/controlflow/Cfg.qll
+++ b/shared/controlflow/codeql/controlflow/Cfg.qll
@@ -5,6 +5,7 @@
 
 private import codeql.util.Location
 private import codeql.util.FileSystem
+private import codeql.util.Void
 
 /** Provides the language-specific input specification. */
 signature module InputSig<LocationSig Location> {
@@ -56,18 +57,6 @@ signature module InputSig<LocationSig Location> {
   /** Holds if `scope` is exited when `last` finishes with completion `c`. */
   predicate scopeLast(CfgScope scope, AstNode last, Completion c);
 
-  /** Gets the maximum number of splits allowed for a given node. */
-  default int maxSplits() { result = 5 }
-
-  /** The base class of `SplitKind`. */
-  class SplitKindBase;
-
-  /** A split. */
-  class Split {
-    /** Gets a textual representation of this split. */
-    string toString();
-  }
-
   /** A type of a control flow successor. */
   class SuccessorType {
     /** Gets a textual representation of this successor type. */
@@ -90,6 +79,56 @@ signature module InputSig<LocationSig Location> {
   predicate isAbnormalExitType(SuccessorType t);
 }
 
+/** Provides input needed for CFG splitting. */
+signature module SplittingInputSig<LocationSig Location, InputSig<Location> Input> {
+  /** Gets the maximum number of splits allowed for a given node. */
+  default int maxSplits() { result = 5 }
+
+  /** The base class of `SplitKind`. */
+  class SplitKindBase;
+
+  /** A split. */
+  class Split {
+    /** Gets a textual representation of this split. */
+    string toString();
+  }
+}
+
+/** Provides input needed for `ConditionalCompletionSplitting`. */
+signature module ConditionalCompletionSplittingInputSig<
+  LocationSig Location, InputSig<Location> Input, SplittingInputSig<Location, Input> SplittingInput>
+{
+  /** A conditional control-flow completion. */
+  class ConditionalCompletion extends Input::Completion;
+
+  /** A split kind for `ConditionalCompletionSplitting`. */
+  class ConditionalCompletionSplitKind extends SplittingInput::SplitKindBase;
+
+  /** The user-facing split class. */
+  class ConditionalCompletionSplit extends SplittingInput::Split {
+    /** Gets the completion recorded in this split. */
+    ConditionalCompletion getCompletion();
+  }
+
+  /**
+   * Holds if `child` is a sub expression of `parent`, and whenever a last node
+   * of `child` (normally `child` itself) has `parent` as a successor with label
+   * `childCompletion`, then edges out of `parent` must have label
+   * `parentCompletion`.
+   *
+   * For example, for an expression `!x`, when `child = x` has conditional
+   * completion `c` then `parent = !x` must have the dual completion of `c`.
+   *
+   * Similarly, for an expression `x && y`, when `child = {x, y}` has conditional
+   * completion `c`, then `parent = x && y` must have the same completion of `c`.
+   */
+  bindingset[parent, parentCompletion]
+  predicate condPropagateExpr(
+    Input::AstNode parent, ConditionalCompletion parentCompletion, Input::AstNode child,
+    ConditionalCompletion childCompletion
+  );
+}
+
 /**
  * Provides a shared interface for constructing control-flow graphs (CFGs) from
  * abstract syntax trees (ASTs).
@@ -122,8 +161,14 @@ signature module InputSig<LocationSig Location> {
  * loop break will be caught up by its surrounding loop and turned into a normal
  * completion.
  */
-module Make<LocationSig Location, InputSig<Location> Input> {
+module MakeWithSplitting<
+  LocationSig Location, //
+  InputSig<Location> Input, //
+  SplittingInputSig<Location, Input> SplittingInput, //
+  ConditionalCompletionSplittingInputSig<Location, Input, SplittingInput> ConditionalCompletionSplittingInput>
+{
   private import Input
+  private import SplittingInput
 
   final private class AstNodeFinal = AstNode;
 
@@ -1133,6 +1178,71 @@ module Make<LocationSig Location, InputSig<Location> Input> {
 
   final class AstCfgNode = AstCfgNodeImpl;
 
+  /** Provides logic for common CFG split implementations that can be reused across languages. */
+  module SplitImplementations {
+    /**
+     * Provides an implementation of splitting for conditional completions.
+     *
+     * For example, in
+     *
+     * ```rust
+     * if x && !y {
+     *   // ...
+     * }
+     * ```
+     *
+     * we record whether `x`, `y`, and `!y` evaluate to `true` or `false`, and restrict
+     * the edges out of `!y` and `x && !y` accordingly.
+     */
+    module ConditionalCompletionSplitting {
+      private import ConditionalCompletionSplittingInput
+
+      final private class ConditionalCompletionSplitFinal =
+        ConditionalCompletionSplittingInput::ConditionalCompletionSplit;
+
+      /** A split for conditional completions. */
+      class ConditionalCompletionSplitImpl extends SplitImpl, ConditionalCompletionSplitFinal {
+        ConditionalCompletion completion;
+
+        ConditionalCompletionSplitImpl() { completion = this.getCompletion() }
+
+        override SplitKind getKind() { result instanceof ConditionalCompletionSplitKind }
+
+        override predicate hasEntry(AstNode pred, AstNode succ, Completion c) {
+          exists(AstNode child, AstNode parent |
+            last(parent, succ, completion) and
+            condPropagateExpr(parent, completion, child, c) and
+            succ(pred, succ, c) and
+            last(child, pred, c)
+          )
+        }
+
+        override predicate hasEntryScope(CfgScope scope, AstNode first) { none() }
+
+        override predicate hasExit(AstNode pred, AstNode succ, Completion c) {
+          this.appliesTo(pred) and
+          succ(pred, succ, c) and
+          if c instanceof ConditionalCompletion
+          then completion = c
+          else not this.hasSuccessor(pred, succ, c)
+        }
+
+        override predicate hasExitScope(CfgScope scope, AstNode last, Completion c) {
+          this.appliesTo(last) and
+          scopeLast(scope, last, c) and
+          if c instanceof ConditionalCompletion then completion = c else any()
+        }
+
+        override predicate hasSuccessor(AstNode pred, AstNode succ, Completion c) {
+          this.appliesTo(pred) and
+          succ(pred, succ, c) and
+          not c instanceof ConditionalCompletion and
+          completionIsNormal(c)
+        }
+      }
+    }
+  }
+
   /** A node to be included in the output of `TestOutput`. */
   signature class RelevantNodeSig extends Node;
 
@@ -1152,6 +1262,9 @@ module Make<LocationSig Location, InputSig<Location> Input> {
         )
     }
 
+    /**
+     * Provides logic for representing a CFG as a [Mermaid diagram](https://mermaid.js.org/).
+     */
     module Mermaid {
       private string nodeId(RelevantNode n) {
         result =
@@ -1200,6 +1313,7 @@ module Make<LocationSig Location, InputSig<Location> Input> {
           )
       }
 
+      /** Holds if the Mermaid representation is `s`. */
       query predicate mermaid(string s) { s = "flowchart TD\n" + nodes() + "\n\n" + edges() }
     }
   }
@@ -1277,6 +1391,7 @@ module Make<LocationSig Location, InputSig<Location> Input> {
 
     import Output::Mermaid
 
+    /** Holds if `pred` -> `succ` is an edge in the CFG. */
     query predicate edges(RelevantNode pred, RelevantNode succ, string attr, string val) {
       attr = "semmle.label" and
       Output::edges(pred, succ, val)
@@ -1397,3 +1512,58 @@ module Make<LocationSig Location, InputSig<Location> Input> {
     query predicate scopeNoFirst(CfgScope scope) { not scopeFirst(scope, _) }
   }
 }
+
+/** Provides a disabled `SplittingInputSig` implementation. */
+module NoSplittingInput<LocationSig Location, InputSig<Location> Input> implements
+  SplittingInputSig<Location, Input>
+{
+  int maxSplits() { result = 0 }
+
+  class SplitKindBase = Void;
+
+  class Split = Void;
+}
+
+/** Provides a disabled `ConditionalCompletionSplittingInputSig` implementation. */
+module NoConditionalCompletionSplittingInput<
+  LocationSig Location, InputSig<Location> Input, SplittingInputSig<Location, Input> SplittingInput>
+  implements ConditionalCompletionSplittingInputSig<Location, Input, SplittingInput>
+{
+  final private class Completion = Input::Completion;
+
+  class ConditionalCompletion extends Completion {
+    ConditionalCompletion() { none() }
+  }
+
+  final private class SplitKindBase = SplittingInput::SplitKindBase;
+
+  class ConditionalCompletionSplitKind extends SplitKindBase {
+    ConditionalCompletionSplitKind() { none() }
+
+    /** Gets a textual representation of this split kind. */
+    string toString() { none() }
+  }
+
+  final private class Split = SplittingInput::Split;
+
+  class ConditionalCompletionSplit extends Split {
+    ConditionalCompletion getCompletion() { none() }
+  }
+
+  predicate condPropagateExpr(
+    Input::AstNode parent, ConditionalCompletion parentCompletion, Input::AstNode child,
+    ConditionalCompletion childCompletion
+  ) {
+    none()
+  }
+}
+
+/** Same as `MakeWithSplitting`, but without CFG splitting. */
+module Make<LocationSig Location, InputSig<Location> Input> {
+  private module SplittingInput = NoSplittingInput<Location, Input>;
+
+  private module ConditionalCompletionSplittingInput =
+    NoConditionalCompletionSplittingInput<Location, Input, SplittingInput>;
+
+  import MakeWithSplitting<Location, Input, SplittingInput, ConditionalCompletionSplittingInput>
+}
diff --git a/shared/util/codeql/util/Void.qll b/shared/util/codeql/util/Void.qll
new file mode 100644
index 000000000000..886687b54602
--- /dev/null
+++ b/shared/util/codeql/util/Void.qll
@@ -0,0 +1,10 @@
+/** Provides the empty `Void` class. */
+
+/** The empty void type. */
+private newtype TVoid = TMkVoid() { none() }
+
+/** The trivial empty type. */
+final class Void extends TVoid {
+  /** Gets a textual representation of this element. */
+  string toString() { result = "dummy" }
+}

From 5d925d36d334e2378bc03e5c2784b5c05eaae361 Mon Sep 17 00:00:00 2001
From: Tom Hvitved <hvitved@github.com>
Date: Thu, 3 Oct 2024 15:11:43 +0200
Subject: [PATCH 240/347] C#: Adopt shared `ConditionalCompletionSplitting`
 implementation

---
 .../internal/ControlFlowGraphImpl.qll         |  21 +++-
 .../csharp/controlflow/internal/Splitting.qll | 114 +++++++-----------
 2 files changed, 61 insertions(+), 74 deletions(-)

diff --git a/csharp/ql/lib/semmle/code/csharp/controlflow/internal/ControlFlowGraphImpl.qll b/csharp/ql/lib/semmle/code/csharp/controlflow/internal/ControlFlowGraphImpl.qll
index 74383240f5e3..463ed260067c 100644
--- a/csharp/ql/lib/semmle/code/csharp/controlflow/internal/ControlFlowGraphImpl.qll
+++ b/csharp/ql/lib/semmle/code/csharp/controlflow/internal/ControlFlowGraphImpl.qll
@@ -53,7 +53,6 @@ private predicate idOf(AstNode x, int y) = equivalenceRelation(id/2)(x, y)
 private module CfgInput implements CfgShared::InputSig<Location> {
   private import ControlFlowGraphImpl as Impl
   private import Completion as Comp
-  private import Splitting as Splitting
   private import SuccessorType as ST
   private import semmle.code.csharp.Caching
 
@@ -80,10 +79,6 @@ private module CfgInput implements CfgShared::InputSig<Location> {
     Impl::scopeLast(scope, last, c)
   }
 
-  class SplitKindBase = Splitting::TSplitKind;
-
-  class Split = Splitting::Split;
-
   class SuccessorType = ST::SuccessorType;
 
   SuccessorType getAMatchingSuccessorType(Completion c) { result = c.getAMatchingSuccessorType() }
@@ -102,7 +97,21 @@ private module CfgInput implements CfgShared::InputSig<Location> {
   }
 }
 
-import CfgShared::Make<Location, CfgInput>
+private module CfgSplittingInput implements CfgShared::SplittingInputSig<Location, CfgInput> {
+  private import Splitting as S
+
+  class SplitKindBase = S::TSplitKind;
+
+  class Split = S::Split;
+}
+
+private module ConditionalCompletionSplittingInput implements
+  CfgShared::ConditionalCompletionSplittingInputSig<Location, CfgInput, CfgSplittingInput>
+{
+  import Splitting::ConditionalCompletionSplitting::ConditionalCompletionSplittingInput
+}
+
+import CfgShared::MakeWithSplitting<Location, CfgInput, CfgSplittingInput, ConditionalCompletionSplittingInput>
 
 /**
  * A compilation.
diff --git a/csharp/ql/lib/semmle/code/csharp/controlflow/internal/Splitting.qll b/csharp/ql/lib/semmle/code/csharp/controlflow/internal/Splitting.qll
index 2fc5ffe4afd6..b6efdfcf1eac 100644
--- a/csharp/ql/lib/semmle/code/csharp/controlflow/internal/Splitting.qll
+++ b/csharp/ql/lib/semmle/code/csharp/controlflow/internal/Splitting.qll
@@ -5,7 +5,8 @@
  */
 
 import csharp
-private import Completion
+private import Completion as Comp
+private import Comp
 private import ControlFlowGraphImpl
 private import semmle.code.csharp.controlflow.ControlFlowGraph::ControlFlow as Cfg
 private import semmle.code.csharp.controlflow.internal.PreSsa
@@ -260,10 +261,12 @@ module ConditionalCompletionSplitting {
 
     ConditionalCompletionSplit() { this = TConditionalCompletionSplit(completion) }
 
+    ConditionalCompletion getCompletion() { result = completion }
+
     override string toString() { result = completion.toString() }
   }
 
-  private class ConditionalCompletionSplitKind extends SplitKind, TConditionalCompletionSplitKind {
+  private class ConditionalCompletionSplitKind_ extends SplitKind, TConditionalCompletionSplitKind {
     override int getListOrder() { result = InitializerSplitting::getNextListOrder() }
 
     override predicate isEnabled(AstNode cfe) { this.appliesTo(cfe) }
@@ -271,89 +274,64 @@ module ConditionalCompletionSplitting {
     override string toString() { result = "ConditionalCompletion" }
   }
 
-  int getNextListOrder() { result = InitializerSplitting::getNextListOrder() + 1 }
+  module ConditionalCompletionSplittingInput {
+    private import Completion as Comp
 
-  private class ConditionalCompletionSplitImpl extends SplitImpl instanceof ConditionalCompletionSplit
-  {
-    ConditionalCompletion completion;
+    class ConditionalCompletion = Comp::ConditionalCompletion;
 
-    ConditionalCompletionSplitImpl() { this = TConditionalCompletionSplit(completion) }
+    class ConditionalCompletionSplitKind extends ConditionalCompletionSplitKind_, TSplitKind { }
 
-    override ConditionalCompletionSplitKind getKind() { any() }
+    class ConditionalCompletionSplit = ConditionalCompletionSplitting::ConditionalCompletionSplit;
 
-    override predicate hasEntry(AstNode pred, AstNode succ, Completion c) {
-      succ(pred, succ, c) and
-      last(succ, _, completion) and
+    bindingset[parent, parentCompletion]
+    predicate condPropagateExpr(
+      AstNode parent, ConditionalCompletion parentCompletion, AstNode child,
+      ConditionalCompletion childCompletion
+    ) {
+      child = parent.(LogicalNotExpr).getOperand() and
+      childCompletion.getDual() = parentCompletion
+      or
+      childCompletion = parentCompletion and
       (
-        last(succ.(LogicalNotExpr).getOperand(), pred, c) and
-        completion.(BooleanCompletion).getDual() = c
+        child = parent.(LogicalAndExpr).getAnOperand()
         or
-        last(succ.(LogicalAndExpr).getAnOperand(), pred, c) and
-        completion = c
+        child = parent.(LogicalOrExpr).getAnOperand()
         or
-        last(succ.(LogicalOrExpr).getAnOperand(), pred, c) and
-        completion = c
+        parent = any(ConditionalExpr ce | child = [ce.getThen(), ce.getElse()])
         or
-        succ =
-          any(ConditionalExpr ce |
-            last([ce.getThen(), ce.getElse()], pred, c) and
-            completion = c
-          )
+        child = parent.(SwitchExpr).getACase()
         or
-        succ =
+        child = parent.(SwitchCaseExpr).getBody()
+        or
+        parent =
           any(NullCoalescingExpr nce |
-            exists(Expr operand |
-              last(operand, pred, c) and
-              completion = c
-            |
-              if c instanceof NullnessCompletion
-              then operand = nce.getRightOperand()
-              else operand = nce.getAnOperand()
-            )
+            if childCompletion instanceof NullnessCompletion
+            then child = nce.getRightOperand()
+            else child = nce.getAnOperand()
           )
+      )
+      or
+      child = parent.(NotPatternExpr).getPattern() and
+      childCompletion.getDual() = parentCompletion
+      or
+      child = parent.(IsExpr).getPattern() and
+      parentCompletion.(BooleanCompletion).getValue() =
+        childCompletion.(MatchingCompletion).getValue()
+      or
+      childCompletion = parentCompletion and
+      (
+        child = parent.(AndPatternExpr).getAnOperand()
         or
-        last(succ.(SwitchExpr).getACase(), pred, c) and
-        completion = c
-        or
-        last(succ.(SwitchCaseExpr).getBody(), pred, c) and
-        completion = c
-        or
-        last(succ.(NotPatternExpr).getPattern(), pred, c) and
-        completion.(MatchingCompletion).getDual() = c
-        or
-        last(succ.(IsExpr).getPattern(), pred, c) and
-        completion.(BooleanCompletion).getValue() = c.(MatchingCompletion).getValue()
-        or
-        last(succ.(AndPatternExpr).getAnOperand(), pred, c) and
-        completion = c
-        or
-        last(succ.(OrPatternExpr).getAnOperand(), pred, c) and
-        completion = c
+        child = parent.(OrPatternExpr).getAnOperand()
         or
-        last(succ.(RecursivePatternExpr).getAChildExpr(), pred, c) and
-        completion = c
+        child = parent.(RecursivePatternExpr).getAChildExpr()
         or
-        last(succ.(PropertyPatternExpr).getPattern(_), pred, c) and
-        completion = c
+        child = parent.(PropertyPatternExpr).getPattern(_)
       )
     }
-
-    override predicate hasEntryScope(CfgScope scope, AstNode first) { none() }
-
-    override predicate hasExit(AstNode pred, AstNode succ, Completion c) {
-      this.appliesTo(pred) and
-      succ(pred, succ, c) and
-      if c instanceof ConditionalCompletion then completion = c else any()
-    }
-
-    override predicate hasExitScope(CfgScope scope, AstNode last, Completion c) {
-      this.appliesTo(last) and
-      scopeLast(scope, last, c) and
-      if c instanceof ConditionalCompletion then completion = c else any()
-    }
-
-    override predicate hasSuccessor(AstNode pred, AstNode succ, Completion c) { none() }
   }
+
+  int getNextListOrder() { result = InitializerSplitting::getNextListOrder() + 1 }
 }
 
 module AssertionSplitting {

From 3a098d7449a1f19a91737fce2722dc16cbb1e16d Mon Sep 17 00:00:00 2001
From: Tom Hvitved <hvitved@github.com>
Date: Thu, 3 Oct 2024 21:24:18 +0200
Subject: [PATCH 241/347] Ruby: Adopt shared `ConditionalCompletionSplitting`
 implementation

---
 .../internal/ControlFlowGraphImpl.qll         | 21 ++++--
 .../ruby/controlflow/internal/Splitting.qll   | 73 +++++++++----------
 2 files changed, 49 insertions(+), 45 deletions(-)

diff --git a/ruby/ql/lib/codeql/ruby/controlflow/internal/ControlFlowGraphImpl.qll b/ruby/ql/lib/codeql/ruby/controlflow/internal/ControlFlowGraphImpl.qll
index 0aa93e573ebe..643decb560b9 100644
--- a/ruby/ql/lib/codeql/ruby/controlflow/internal/ControlFlowGraphImpl.qll
+++ b/ruby/ql/lib/codeql/ruby/controlflow/internal/ControlFlowGraphImpl.qll
@@ -22,7 +22,6 @@ class AstNode extends Ast::AstNode {
 private module CfgInput implements CfgShared::InputSig<Location> {
   private import ControlFlowGraphImpl as Impl
   private import Completion as Comp
-  private import Splitting as Splitting
   private import codeql.ruby.CFG as Cfg
 
   class AstNode = Impl::AstNode;
@@ -45,10 +44,6 @@ private module CfgInput implements CfgShared::InputSig<Location> {
     scope.(Impl::CfgScopeImpl).exit(last, c)
   }
 
-  class SplitKindBase = Splitting::TSplitKind;
-
-  class Split = Splitting::Split;
-
   class SuccessorType = Cfg::SuccessorType;
 
   SuccessorType getAMatchingSuccessorType(Completion c) { result = c.getAMatchingSuccessorType() }
@@ -67,7 +62,21 @@ private module CfgInput implements CfgShared::InputSig<Location> {
   }
 }
 
-import CfgShared::Make<Location, CfgInput>
+private module CfgSplittingInput implements CfgShared::SplittingInputSig<Location, CfgInput> {
+  private import Splitting as S
+
+  class SplitKindBase = S::TSplitKind;
+
+  class Split = S::Split;
+}
+
+private module ConditionalCompletionSplittingInput implements
+  CfgShared::ConditionalCompletionSplittingInputSig<Location, CfgInput, CfgSplittingInput>
+{
+  import Splitting::ConditionalCompletionSplitting::ConditionalCompletionSplittingInput
+}
+
+import CfgShared::MakeWithSplitting<Location, CfgInput, CfgSplittingInput, ConditionalCompletionSplittingInput>
 
 abstract class CfgScopeImpl extends AstNode {
   abstract predicate entry(AstNode first);
diff --git a/ruby/ql/lib/codeql/ruby/controlflow/internal/Splitting.qll b/ruby/ql/lib/codeql/ruby/controlflow/internal/Splitting.qll
index d8cfb9230d8b..5331a3d26b64 100644
--- a/ruby/ql/lib/codeql/ruby/controlflow/internal/Splitting.qll
+++ b/ruby/ql/lib/codeql/ruby/controlflow/internal/Splitting.qll
@@ -3,7 +3,8 @@
  */
 
 private import codeql.ruby.AST as Ast
-private import Completion
+private import Completion as Comp
+private import Comp
 private import ControlFlowGraphImpl
 private import SuccessorTypes
 private import codeql.ruby.controlflow.ControlFlowGraph
@@ -31,7 +32,7 @@ class Split extends TSplit {
   string toString() { none() }
 }
 
-private module ConditionalCompletionSplitting {
+module ConditionalCompletionSplitting {
   /**
    * A split for conditional completions. For example, in
    *
@@ -51,10 +52,12 @@ private module ConditionalCompletionSplitting {
 
     ConditionalCompletionSplit() { this = TConditionalCompletionSplit(completion) }
 
+    ConditionalCompletion getCompletion() { result = completion }
+
     override string toString() { result = completion.toString() }
   }
 
-  private class ConditionalCompletionSplitKind extends SplitKind, TConditionalCompletionSplitKind {
+  private class ConditionalCompletionSplitKind_ extends SplitKind, TConditionalCompletionSplitKind {
     override int getListOrder() { result = 0 }
 
     override predicate isEnabled(AstNode n) { this.appliesTo(n) }
@@ -62,56 +65,48 @@ private module ConditionalCompletionSplitting {
     override string toString() { result = "ConditionalCompletion" }
   }
 
-  int getNextListOrder() { result = 1 }
+  module ConditionalCompletionSplittingInput {
+    private import Completion as Comp
 
-  private class ConditionalCompletionSplitImpl extends SplitImpl instanceof ConditionalCompletionSplit
-  {
-    ConditionalCompletion completion;
+    class ConditionalCompletion = Comp::ConditionalCompletion;
 
-    ConditionalCompletionSplitImpl() { this = TConditionalCompletionSplit(completion) }
+    class ConditionalCompletionSplitKind extends ConditionalCompletionSplitKind_, TSplitKind { }
 
-    override ConditionalCompletionSplitKind getKind() { any() }
+    class ConditionalCompletionSplit = ConditionalCompletionSplitting::ConditionalCompletionSplit;
 
-    override predicate hasEntry(AstNode pred, AstNode succ, Completion c) {
-      succ(pred, succ, c) and
-      last(succ, _, completion) and
+    bindingset[parent, parentCompletion]
+    predicate condPropagateExpr(
+      AstNode parent, ConditionalCompletion parentCompletion, AstNode child,
+      ConditionalCompletion childCompletion
+    ) {
+      child = parent.(Ast::NotExpr).getOperand() and
+      childCompletion.(BooleanCompletion).getDual() = parentCompletion
+      or
+      childCompletion = parentCompletion and
       (
-        last(succ.(Ast::NotExpr).getOperand(), pred, c) and
-        completion.(BooleanCompletion).getDual() = c
-        or
-        last(succ.(Ast::LogicalAndExpr).getAnOperand(), pred, c) and
-        completion = c
+        child = parent.(Ast::LogicalAndExpr).getAnOperand()
         or
-        last(succ.(Ast::LogicalOrExpr).getAnOperand(), pred, c) and
-        completion = c
+        child = parent.(Ast::LogicalOrExpr).getAnOperand()
         or
-        last(succ.(Ast::StmtSequence).getLastStmt(), pred, c) and
-        completion = c
+        child = parent.(Ast::StmtSequence).getLastStmt()
         or
-        last(succ.(Ast::ConditionalExpr).getBranch(_), pred, c) and
-        completion = c
+        child = parent.(Ast::ConditionalExpr).getBranch(_)
       )
-      or
-      succ(pred, succ, c) and
-      succ instanceof Ast::WhenClause and
-      completion = c
     }
+  }
 
-    override predicate hasEntryScope(CfgScope scope, AstNode succ) { none() }
+  int getNextListOrder() { result = 1 }
 
-    override predicate hasExit(AstNode pred, AstNode succ, Completion c) {
-      this.appliesTo(pred) and
+  private class ConditionalCompletionSplitImpl extends SplitImplementations::ConditionalCompletionSplitting::ConditionalCompletionSplitImpl
+  {
+    override predicate hasEntry(AstNode pred, AstNode succ, Completion c) {
+      super.hasEntry(pred, succ, c)
+      or
+      // a non-standard case is needed for `when` clauses
       succ(pred, succ, c) and
-      if c instanceof ConditionalCompletion then completion = c else any()
-    }
-
-    override predicate hasExitScope(CfgScope scope, AstNode last, Completion c) {
-      this.appliesTo(last) and
-      succExit(scope, last, c) and
-      if c instanceof ConditionalCompletion then completion = c else any()
+      succ instanceof Ast::WhenClause and
+      c = this.getCompletion()
     }
-
-    override predicate hasSuccessor(AstNode pred, AstNode succ, Completion c) { none() }
   }
 }
 

From bdb793ba92fb1d7766375c261bf0ba1ae40c7bcc Mon Sep 17 00:00:00 2001
From: Tom Hvitved <hvitved@github.com>
Date: Fri, 4 Oct 2024 10:13:40 +0200
Subject: [PATCH 242/347] Swift: Adopt shared `ConditionalCompletionSplitting`
 implementation

---
 .../internal/ControlFlowGraphImplSpecific.qll | 21 ++++--
 .../swift/controlflow/internal/Splitting.qll  | 72 ++++++++-----------
 2 files changed, 47 insertions(+), 46 deletions(-)

diff --git a/swift/ql/lib/codeql/swift/controlflow/internal/ControlFlowGraphImplSpecific.qll b/swift/ql/lib/codeql/swift/controlflow/internal/ControlFlowGraphImplSpecific.qll
index 07d3a0842c9b..362537068a63 100644
--- a/swift/ql/lib/codeql/swift/controlflow/internal/ControlFlowGraphImplSpecific.qll
+++ b/swift/ql/lib/codeql/swift/controlflow/internal/ControlFlowGraphImplSpecific.qll
@@ -46,10 +46,6 @@ module CfgInput implements InputSig<Location> {
 
   CfgScope getCfgScope(AstNode n) { result = scopeOfAst(n.asAstNode()) }
 
-  class SplitKindBase = Splitting::TSplitKind;
-
-  class Split = Splitting::Split;
-
   class SuccessorType = Cfg::SuccessorType;
 
   /** Gets a successor type that matches completion `c`. */
@@ -88,4 +84,19 @@ module CfgInput implements InputSig<Location> {
   }
 }
 
-module CfgImpl = Make<Location, CfgInput>;
+private module CfgSplittingInput implements SplittingInputSig<Location, CfgInput> {
+  private import Splitting as S
+
+  class SplitKindBase = S::TSplitKind;
+
+  class Split = S::Split;
+}
+
+private module ConditionalCompletionSplittingInput implements
+  ConditionalCompletionSplittingInputSig<Location, CfgInput, CfgSplittingInput>
+{
+  import Splitting::ConditionalCompletionSplitting::ConditionalCompletionSplittingInput
+}
+
+module CfgImpl =
+  MakeWithSplitting<Location, CfgInput, CfgSplittingInput, ConditionalCompletionSplittingInput>;
diff --git a/swift/ql/lib/codeql/swift/controlflow/internal/Splitting.qll b/swift/ql/lib/codeql/swift/controlflow/internal/Splitting.qll
index dcc34ceb46b6..ddf2f01a8d41 100644
--- a/swift/ql/lib/codeql/swift/controlflow/internal/Splitting.qll
+++ b/swift/ql/lib/codeql/swift/controlflow/internal/Splitting.qll
@@ -26,7 +26,7 @@ class Split extends TSplit {
   string toString() { none() }
 }
 
-private module ConditionalCompletionSplitting {
+module ConditionalCompletionSplitting {
   /** A split for conditional completions. */
   class ConditionalCompletionSplit extends Split, TConditionalCompletionSplit {
     ConditionalCompletion completion;
@@ -38,7 +38,7 @@ private module ConditionalCompletionSplitting {
     override string toString() { result = completion.toString() }
   }
 
-  private class ConditionalCompletionSplitKind extends SplitKind, TConditionalCompletionSplitKind {
+  private class ConditionalCompletionSplitKind_ extends SplitKind, TConditionalCompletionSplitKind {
     override int getListOrder() { result = 0 }
 
     override predicate isEnabled(ControlFlowElement n) { this.appliesTo(n) }
@@ -46,54 +46,44 @@ private module ConditionalCompletionSplitting {
     override string toString() { result = "ConditionalCompletion" }
   }
 
-  private class ConditionalCompletionSplitImpl extends SplitImpl instanceof ConditionalCompletionSplit
-  {
-    override ConditionalCompletionSplitKind getKind() { any() }
+  module ConditionalCompletionSplittingInput {
+    private import Completion as Comp
 
-    override predicate hasEntry(ControlFlowElement pred, ControlFlowElement succ, Completion c) {
-      succ(pred, succ, c) and
-      last(succ, _, super.getCompletion()) and
+    class ConditionalCompletion = Comp::ConditionalCompletion;
+
+    class ConditionalCompletionSplitKind extends ConditionalCompletionSplitKind_, TSplitKind { }
+
+    class ConditionalCompletionSplit = ConditionalCompletionSplitting::ConditionalCompletionSplit;
+
+    bindingset[parent, parentCompletion]
+    private predicate condPropagateAstExpr(
+      AstNode parent, ConditionalCompletion parentCompletion, AstNode child,
+      ConditionalCompletion childCompletion
+    ) {
+      child = parent.(NotExpr).getOperand().getFullyConverted() and
+      childCompletion.(BooleanCompletion).getDual() = parentCompletion
+      or
+      childCompletion = parentCompletion and
       (
-        astLast(succ.asAstNode().(NotExpr).getOperand().getFullyConverted(), pred, c) and
-        super.getCompletion().(BooleanCompletion).getDual() = c
+        child = parent.(LogicalAndExpr).getAnOperand().getFullyConverted()
         or
-        astLast(succ.asAstNode().(LogicalAndExpr).getAnOperand().getFullyConverted(), pred, c) and
-        super.getCompletion() = c
+        child = parent.(LogicalOrExpr).getAnOperand().getFullyConverted()
         or
-        astLast(succ.asAstNode().(LogicalOrExpr).getAnOperand().getFullyConverted(), pred, c) and
-        super.getCompletion() = c
+        child = parent.(IfExpr).getBranch(_).getFullyConverted()
         or
-        succ.asAstNode() =
-          any(IfExpr ce |
-            astLast(ce.getBranch(_).getFullyConverted(), pred, c) and
-            super.getCompletion() = c
-          )
-        or
-        exists(Expr e, Exprs::Conversions::ConversionOrIdentityTree conv |
-          succ.asAstNode() = conv.getAst() and
-          conv.convertsFrom(e) and
-          astLast(e, pred, c) and
-          super.getCompletion() = c
+        exists(Exprs::Conversions::ConversionOrIdentityTree conv |
+          parent = conv.getAst() and
+          conv.convertsFrom(child)
         )
       )
     }
 
-    override predicate hasEntryScope(CfgInput::CfgScope scope, ControlFlowElement succ) { none() }
-
-    override predicate hasExit(ControlFlowElement pred, ControlFlowElement succ, Completion c) {
-      this.appliesTo(pred) and
-      succ(pred, succ, c) and
-      if c instanceof ConditionalCompletion then super.getCompletion() = c else any()
-    }
-
-    override predicate hasExitScope(CfgInput::CfgScope scope, ControlFlowElement last, Completion c) {
-      this.appliesTo(last) and
-      succExit(scope, last, c) and
-      if c instanceof ConditionalCompletion then super.getCompletion() = c else any()
-    }
-
-    override predicate hasSuccessor(ControlFlowElement pred, ControlFlowElement succ, Completion c) {
-      none()
+    bindingset[parent, parentCompletion]
+    predicate condPropagateExpr(
+      ControlFlowElement parent, ConditionalCompletion parentCompletion, ControlFlowElement child,
+      ConditionalCompletion childCompletion
+    ) {
+      condPropagateAstExpr(parent.asAstNode(), parentCompletion, child.asAstNode(), childCompletion)
     }
   }
 }

From 4d251b96a6b2fe25308c95989d764fc5cd7a8043 Mon Sep 17 00:00:00 2001
From: Jeroen Ketema <jketema@github.com>
Date: Wed, 9 Oct 2024 11:24:08 +0200
Subject: [PATCH 243/347] C++: Fix copy&paste error in QLDoc

---
 cpp/ql/lib/semmle/code/cpp/Concept.qll | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cpp/ql/lib/semmle/code/cpp/Concept.qll b/cpp/ql/lib/semmle/code/cpp/Concept.qll
index fed4c0937cfa..d6245ecea825 100644
--- a/cpp/ql/lib/semmle/code/cpp/Concept.qll
+++ b/cpp/ql/lib/semmle/code/cpp/Concept.qll
@@ -5,7 +5,7 @@
 import semmle.code.cpp.exprs.Expr
 
 /**
- * A C/C++ requires expression.
+ * A C++ requires expression.
  */
 class RequiresExpr extends Expr, @requires_expr {
   override string toString() { result = "requires ..." }

From ad630bc6ff6af1391f4bc8a58b9b5644418791a9 Mon Sep 17 00:00:00 2001
From: Rasmus Lerchedahl Petersen <yoff@github.com>
Date: Wed, 9 Oct 2024 11:34:58 +0200
Subject: [PATCH 244/347] Python: ignore some extractor test output

If you test the extractor locally, you want to ignore these files.
---
 python/extractor/cli-integration-test/.gitignore | 2 ++
 python/extractor/tests/parser/.gitignore         | 1 +
 2 files changed, 3 insertions(+)
 create mode 100644 python/extractor/tests/parser/.gitignore

diff --git a/python/extractor/cli-integration-test/.gitignore b/python/extractor/cli-integration-test/.gitignore
index d3606b9b666c..9c021a4450e4 100644
--- a/python/extractor/cli-integration-test/.gitignore
+++ b/python/extractor/cli-integration-test/.gitignore
@@ -3,3 +3,5 @@
 */venv/
 **/*.egg-info/
 */.cache
+**/trap/
+**/*.testproj/
\ No newline at end of file
diff --git a/python/extractor/tests/parser/.gitignore b/python/extractor/tests/parser/.gitignore
new file mode 100644
index 000000000000..a27ba5740141
--- /dev/null
+++ b/python/extractor/tests/parser/.gitignore
@@ -0,0 +1 @@
+*.old
\ No newline at end of file

From 0b0e8a4bf5047cc07bb8284ea149d894193487b7 Mon Sep 17 00:00:00 2001
From: yoff <lerchedahl@gmail.com>
Date: Wed, 9 Oct 2024 12:22:17 +0200
Subject: [PATCH 245/347] Update python/extractor/tests/parser/.gitignore

As suggested by @tausbn
---
 python/extractor/tests/parser/.gitignore | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/python/extractor/tests/parser/.gitignore b/python/extractor/tests/parser/.gitignore
index a27ba5740141..247b8ca8c749 100644
--- a/python/extractor/tests/parser/.gitignore
+++ b/python/extractor/tests/parser/.gitignore
@@ -1 +1,2 @@
-*.old
\ No newline at end of file
+*.old
+*.new
\ No newline at end of file

From 7a6eabc8a3ec0d1450c7e94658700b9f00d79bba Mon Sep 17 00:00:00 2001
From: Geoffrey White <40627776+geoffw0@users.noreply.github.com>
Date: Tue, 8 Oct 2024 17:38:44 +0100
Subject: [PATCH 246/347] Rust: Additional test cases.

---
 .../unusedentities/UnusedVariable.expected    | 10 +++
 .../test/query-tests/unusedentities/main.rs   | 85 +++++++++++++++----
 2 files changed, 77 insertions(+), 18 deletions(-)

diff --git a/rust/ql/test/query-tests/unusedentities/UnusedVariable.expected b/rust/ql/test/query-tests/unusedentities/UnusedVariable.expected
index ccf6117f2966..a69c63ec424e 100644
--- a/rust/ql/test/query-tests/unusedentities/UnusedVariable.expected
+++ b/rust/ql/test/query-tests/unusedentities/UnusedVariable.expected
@@ -10,4 +10,14 @@
 | main.rs:223:14:223:16 | val | Variable is not used. |
 | main.rs:225:9:225:12 | None | Variable is not used. |
 | main.rs:234:9:234:12 | None | Variable is not used. |
+| main.rs:240:22:240:24 | val | Variable is not used. |
 | main.rs:248:24:248:26 | val | Variable is not used. |
+| main.rs:257:13:257:15 | num | Variable is not used. |
+| main.rs:268:9:268:11 | Yes | Variable is not used. |
+| main.rs:269:9:269:10 | No | Variable is not used. |
+| main.rs:272:12:272:12 | j | Variable is not used. |
+| main.rs:290:25:290:25 | y | Variable is not used. |
+| main.rs:294:28:294:28 | a | Variable is not used. |
+| main.rs:298:9:298:9 | p | Variable is not used. |
+| main.rs:305:13:305:13 | y | Variable is not used. |
+| main.rs:313:21:313:21 | y | Variable is not used. |
diff --git a/rust/ql/test/query-tests/unusedentities/main.rs b/rust/ql/test/query-tests/unusedentities/main.rs
index be9fdaed2e4f..1d989d2f10c4 100644
--- a/rust/ql/test/query-tests/unusedentities/main.rs
+++ b/rust/ql/test/query-tests/unusedentities/main.rs
@@ -189,12 +189,12 @@ enum YesOrNo {
     No,
 }
 
+use YesOrNo::{Yes, No}; // allows `Yes`, `No` to be accessed without qualifiers.
 
-
-
-
-
-
+struct MyPoint {
+    x: i64,
+    y: i64,
+}
 
 fn if_lets_matches() {
     let mut total: i64 = 0;
@@ -235,13 +235,13 @@ fn if_lets_matches() {
         }
     }
 
-
-
-
-
-
-
-
+    let e = Option::Some(80);
+    match e {
+        Option::Some(val) => { // BAD: unused variable
+        }
+        Option::None => {
+        }
+    }
 
     let f = MyOption::Some(90);
     match f {
@@ -250,12 +250,12 @@ fn if_lets_matches() {
         MyOption::None => {}
     }
 
-
-
-
-
-
-
+    let g : Result<i64, i64> = Ok(100);
+    match g {
+        Ok(_) => {
+        }
+        Err(num) => {} // BAD: unused variable
+    }
 
     let h = YesOrNo::Yes;
     match h {
@@ -263,11 +263,59 @@ fn if_lets_matches() {
         YesOrNo::No => {}
     }
 
+    let i = Yes;
+    match i {
+        Yes => {} // SPURIOUS: unused variable 'None'
+        No => {} // SPURIOUS: unused variable 'None'
+    }
 
+    if let j = Yes { // BAD: unused variable
+    }
 
+    if let k = Yes {
+        match k {
+            _ => {}
+        }
+    }
 
+    match 1 {
+        1 => {}
+        _ => {}
+    }
 
+    let p1 = MyPoint { x: 1, y: 2 };
+    match p1 {
+        MyPoint { x: 0, y: 0 } => {
+        }
+        MyPoint { x: 1, y } => { // BAD: unused variable
+        }
+        MyPoint { x: 2, y: _ } => {
+        }
+        MyPoint { x: 3, y: a } => { // BAD: unused variable
+        }
+        MyPoint { x: 4, .. } => {
+        }
+        p => { // BAD: unused variable
+        }
+    }
+}
+
+fn shadowing() -> i32 {
+    let x = 1; // BAD: unused value [NOT DETECTED]
+    let mut y: i32; // BAD: unused variable
 
+    {
+        let x = 2;
+        let mut y: i32;
+
+        {
+            let x = 3; // BAD: unused value [NOT DETECTED]
+            let mut y: i32; // BAD: unused variable
+        }
+
+        y = x;
+        return y;
+    }
 }
 
 fn main() {
@@ -278,6 +326,7 @@ fn main() {
     statics();
     loops();
     if_lets_matches();
+    shadowing();
 
     println!("lets use result {}", parameters(1, 2, 3));
 }

From 073189ed6b1daae6c254a0b25f0800ce3e9f85c0 Mon Sep 17 00:00:00 2001
From: Rasmus Lerchedahl Petersen <yoff@github.com>
Date: Thu, 3 Oct 2024 14:50:16 +0200
Subject: [PATCH 247/347] python: add test for `re.Match` objects returned from
 `finditer`

---
 python/ql/test/library-tests/frameworks/stdlib/test_re.py | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/python/ql/test/library-tests/frameworks/stdlib/test_re.py b/python/ql/test/library-tests/frameworks/stdlib/test_re.py
index e45a3fe2576d..b95d65619e27 100644
--- a/python/ql/test/library-tests/frameworks/stdlib/test_re.py
+++ b/python/ql/test/library-tests/frameworks/stdlib/test_re.py
@@ -38,6 +38,12 @@
 
     compiled_pat.match(ts).string, # $ tainted
     re.compile(ts).match("safe").re.pattern, # $ tainted
+
+    list(re.finditer(pat, ts))[0].string, # $ MISSING: tainted
+    [m.string for m in re.finditer(pat, ts)], # $ MISSING: tainted
+
+    list(re.finditer(pat, ts))[0].groups()[0], # $ MISSING: tainted
+    [m.groups()[0] for m in re.finditer(pat, ts)], # $ MISSING: tainted
 )
 ensure_not_tainted(
     safe_match.expand("Hello \1"),

From 494b8bd7e14d0bea50057eca124c203abb5ce584 Mon Sep 17 00:00:00 2001
From: Rasmus Lerchedahl Petersen <yoff@github.com>
Date: Wed, 9 Oct 2024 12:40:47 +0200
Subject: [PATCH 248/347] python: model `string` property of resultof
 `finditer`

---
 python/ql/lib/semmle/python/frameworks/Stdlib.qll         | 8 ++++++++
 python/ql/test/library-tests/frameworks/stdlib/test_re.py | 4 ++--
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/python/ql/lib/semmle/python/frameworks/Stdlib.qll b/python/ql/lib/semmle/python/frameworks/Stdlib.qll
index c7179dbd46c0..950e741d58eb 100644
--- a/python/ql/lib/semmle/python/frameworks/Stdlib.qll
+++ b/python/ql/lib/semmle/python/frameworks/Stdlib.qll
@@ -3463,6 +3463,14 @@ module StdlibPrivate {
           ) and
           preservesValue = false
         )
+        or
+        // flow from input string to attribute on match object
+        exists(int arg | arg = methodName.(RegexExecutionMethod).getStringArgIndex() - offset |
+          input in ["Argument[" + arg + "]", "Argument[string:]"] and
+          methodName = "finditer" and
+          output = "ReturnValue.ListElement.Attribute[string]" and
+          preservesValue = true
+        )
       )
     }
   }
diff --git a/python/ql/test/library-tests/frameworks/stdlib/test_re.py b/python/ql/test/library-tests/frameworks/stdlib/test_re.py
index b95d65619e27..c2c3c75a979a 100644
--- a/python/ql/test/library-tests/frameworks/stdlib/test_re.py
+++ b/python/ql/test/library-tests/frameworks/stdlib/test_re.py
@@ -39,8 +39,8 @@
     compiled_pat.match(ts).string, # $ tainted
     re.compile(ts).match("safe").re.pattern, # $ tainted
 
-    list(re.finditer(pat, ts))[0].string, # $ MISSING: tainted
-    [m.string for m in re.finditer(pat, ts)], # $ MISSING: tainted
+    list(re.finditer(pat, ts))[0].string, # $ tainted
+    [m.string for m in re.finditer(pat, ts)], # $ tainted
 
     list(re.finditer(pat, ts))[0].groups()[0], # $ MISSING: tainted
     [m.groups()[0] for m in re.finditer(pat, ts)], # $ MISSING: tainted

From 0ac4a10345735444ce8c00c62bfbdd5bd8387710 Mon Sep 17 00:00:00 2001
From: Rasmus Lerchedahl Petersen <yoff@github.com>
Date: Wed, 9 Oct 2024 12:42:38 +0200
Subject: [PATCH 249/347] Python: model that `finditer` returns iterable of
 `re.Match` objects

---
 .../lib/semmle/python/frameworks/Stdlib.qll   | 52 ++++++++++++-------
 .../frameworks/stdlib/test_re.py              |  4 +-
 2 files changed, 34 insertions(+), 22 deletions(-)

diff --git a/python/ql/lib/semmle/python/frameworks/Stdlib.qll b/python/ql/lib/semmle/python/frameworks/Stdlib.qll
index 950e741d58eb..2bec246bfc0b 100644
--- a/python/ql/lib/semmle/python/frameworks/Stdlib.qll
+++ b/python/ql/lib/semmle/python/frameworks/Stdlib.qll
@@ -3284,6 +3284,18 @@ module StdlibPrivate {
     }
   }
 
+  /**
+   * A base API node for regular expression functions.
+   * Either the `re` module or a compiled regular expression.
+   */
+  private API::Node re(boolean compiled) {
+    result = API::moduleImport("re") and
+    compiled = false
+    or
+    result = any(RePatternSummary c).getACall().(API::CallNode).getReturn() and
+    compiled = true
+  }
+
   /**
    * A flow summary for methods returning a `re.Match` object
    *
@@ -3293,17 +3305,18 @@ module StdlibPrivate {
     ReMatchSummary() { this = ["re.Match", "compiled re.Match"] }
 
     override DataFlow::CallCfgNode getACall() {
-      this = "re.Match" and
-      result = API::moduleImport("re").getMember(["match", "search", "fullmatch"]).getACall()
-      or
-      this = "compiled re.Match" and
-      result =
-        any(RePatternSummary c)
-            .getACall()
-            .(API::CallNode)
-            .getReturn()
-            .getMember(["match", "search", "fullmatch"])
-            .getACall()
+      exists(API::Node re, boolean compiled |
+        re = re(compiled) and
+        (
+          compiled = false and
+          this = "re.Match"
+          or
+          compiled = true and
+          this = "compiled re.Match"
+        )
+      |
+        result = re.getMember(["match", "search", "fullmatch"]).getACall()
+      )
     }
 
     override DataFlow::ArgumentNode getACallback() { none() }
@@ -3340,6 +3353,13 @@ module StdlibPrivate {
     }
   }
 
+  /** An API node for a `re.Match` object */
+  private API::Node match() {
+    result = any(ReMatchSummary c).getACall().(API::CallNode).getReturn()
+    or
+    result = re(_).getMember("finditer").getReturn().getASubscript()
+  }
+
   /**
    * A flow summary for methods on a `re.Match` object
    *
@@ -3353,15 +3373,7 @@ module StdlibPrivate {
       methodName in ["expand", "group", "groups", "groupdict"]
     }
 
-    override DataFlow::CallCfgNode getACall() {
-      result =
-        any(ReMatchSummary c)
-            .getACall()
-            .(API::CallNode)
-            .getReturn()
-            .getMember(methodName)
-            .getACall()
-    }
+    override DataFlow::CallCfgNode getACall() { result = match().getMember(methodName).getACall() }
 
     override DataFlow::ArgumentNode getACallback() { none() }
 
diff --git a/python/ql/test/library-tests/frameworks/stdlib/test_re.py b/python/ql/test/library-tests/frameworks/stdlib/test_re.py
index c2c3c75a979a..4cfe5d972b7b 100644
--- a/python/ql/test/library-tests/frameworks/stdlib/test_re.py
+++ b/python/ql/test/library-tests/frameworks/stdlib/test_re.py
@@ -42,8 +42,8 @@
     list(re.finditer(pat, ts))[0].string, # $ tainted
     [m.string for m in re.finditer(pat, ts)], # $ tainted
 
-    list(re.finditer(pat, ts))[0].groups()[0], # $ MISSING: tainted
-    [m.groups()[0] for m in re.finditer(pat, ts)], # $ MISSING: tainted
+    list(re.finditer(pat, ts))[0].groups()[0], # $ MISSING: tainted  // this requires list content in type tracking
+    [m.groups()[0] for m in re.finditer(pat, ts)], # $ tainted
 )
 ensure_not_tainted(
     safe_match.expand("Hello \1"),

From fa1c92dbe7b9b111a6476eea6a03fd82704360a6 Mon Sep 17 00:00:00 2001
From: Geoffrey White <40627776+geoffw0@users.noreply.github.com>
Date: Wed, 9 Oct 2024 11:50:29 +0100
Subject: [PATCH 250/347] Rust: Another case worth having.

---
 .../unusedentities/UnusedVariable.expected            | 11 ++++++-----
 rust/ql/test/query-tests/unusedentities/main.rs       |  4 ++++
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/rust/ql/test/query-tests/unusedentities/UnusedVariable.expected b/rust/ql/test/query-tests/unusedentities/UnusedVariable.expected
index a69c63ec424e..66b5ac84ab33 100644
--- a/rust/ql/test/query-tests/unusedentities/UnusedVariable.expected
+++ b/rust/ql/test/query-tests/unusedentities/UnusedVariable.expected
@@ -16,8 +16,9 @@
 | main.rs:268:9:268:11 | Yes | Variable is not used. |
 | main.rs:269:9:269:10 | No | Variable is not used. |
 | main.rs:272:12:272:12 | j | Variable is not used. |
-| main.rs:290:25:290:25 | y | Variable is not used. |
-| main.rs:294:28:294:28 | a | Variable is not used. |
-| main.rs:298:9:298:9 | p | Variable is not used. |
-| main.rs:305:13:305:13 | y | Variable is not used. |
-| main.rs:313:21:313:21 | y | Variable is not used. |
+| main.rs:282:12:282:14 | Yes | Variable is not used. |
+| main.rs:294:25:294:25 | y | Variable is not used. |
+| main.rs:298:28:298:28 | a | Variable is not used. |
+| main.rs:302:9:302:9 | p | Variable is not used. |
+| main.rs:309:13:309:13 | y | Variable is not used. |
+| main.rs:317:21:317:21 | y | Variable is not used. |
diff --git a/rust/ql/test/query-tests/unusedentities/main.rs b/rust/ql/test/query-tests/unusedentities/main.rs
index 1d989d2f10c4..6d883cece8c5 100644
--- a/rust/ql/test/query-tests/unusedentities/main.rs
+++ b/rust/ql/test/query-tests/unusedentities/main.rs
@@ -278,6 +278,10 @@ fn if_lets_matches() {
         }
     }
 
+    let l = Yes;
+    if let Yes = l { // SPURIOUS: unused variable 'Yes'
+    }
+
     match 1 {
         1 => {}
         _ => {}

From f3d727fadc9fa4800954c1ee0ff2c4d8e7564a62 Mon Sep 17 00:00:00 2001
From: Geoffrey White <40627776+geoffw0@users.noreply.github.com>
Date: Wed, 9 Oct 2024 11:52:24 +0100
Subject: [PATCH 251/347] Rust: Correct spurious annotations.

---
 rust/ql/test/query-tests/unusedentities/main.rs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/rust/ql/test/query-tests/unusedentities/main.rs b/rust/ql/test/query-tests/unusedentities/main.rs
index 6d883cece8c5..d7c08f05b62a 100644
--- a/rust/ql/test/query-tests/unusedentities/main.rs
+++ b/rust/ql/test/query-tests/unusedentities/main.rs
@@ -265,8 +265,8 @@ fn if_lets_matches() {
 
     let i = Yes;
     match i {
-        Yes => {} // SPURIOUS: unused variable 'None'
-        No => {} // SPURIOUS: unused variable 'None'
+        Yes => {} // SPURIOUS: unused variable 'Yes'
+        No => {} // SPURIOUS: unused variable 'No'
     }
 
     if let j = Yes { // BAD: unused variable

From 5d4ceeebb52864efdb00456a291dabd2175895e3 Mon Sep 17 00:00:00 2001
From: Michael Nebel <michaelnebel@github.com>
Date: Mon, 7 Oct 2024 16:04:21 +0200
Subject: [PATCH 252/347] Shared: Only generate df summary model in the mixed
 query in case no context sensitive model exist.

---
 .../modelgenerator/dataflow/Summaries.cs      | 29 ++++++++++++++++++-
 .../internal/ModelGeneratorImpl.qll           | 11 +++++--
 2 files changed, 37 insertions(+), 3 deletions(-)

diff --git a/csharp/ql/test/utils/modelgenerator/dataflow/Summaries.cs b/csharp/ql/test/utils/modelgenerator/dataflow/Summaries.cs
index d7256b1019c4..473144358f47 100644
--- a/csharp/ql/test/utils/modelgenerator/dataflow/Summaries.cs
+++ b/csharp/ql/test/utils/modelgenerator/dataflow/Summaries.cs
@@ -639,7 +639,7 @@ public DImpl(string s)
         public override string Prop { get { return tainted; } }
     }
 
-    public abstract class BaseContent 
+    public abstract class BaseContent
     {
         public abstract object GetValue();
 
@@ -961,3 +961,30 @@ public string ConcatValueOnBase2(string other, Base2 b2)
         return other + b2.GetValue();
     }
 }
+
+public class AvoidDuplicateLifted
+{
+    public class A
+    {
+        public object Prop { get; set; }
+
+        // contentbased-summary=Models;AvoidDuplicateLifted+A;true;GetValue;();;Argument[this].Property[Models.AvoidDuplicateLifted+A.Prop];ReturnValue;value;dfc-generated
+        // summary=Models;AvoidDuplicateLifted+A;true;GetValue;();;Argument[this];ReturnValue;taint;df-generated
+        public virtual object GetValue()
+        {
+            return Prop;
+        }
+    }
+
+    public class B : A
+    {
+        private object field;
+
+        // No content based summary as field is a dead synthetic field.
+        // summary=Models;AvoidDuplicateLifted+A;true;GetValue;();;Argument[this];ReturnValue;taint;df-generated
+        public override object GetValue()
+        {
+            return field;
+        }
+    }
+}
diff --git a/shared/mad/codeql/mad/modelgenerator/internal/ModelGeneratorImpl.qll b/shared/mad/codeql/mad/modelgenerator/internal/ModelGeneratorImpl.qll
index 8d4bb4cae5a0..d38b83bcf9c4 100644
--- a/shared/mad/codeql/mad/modelgenerator/internal/ModelGeneratorImpl.qll
+++ b/shared/mad/codeql/mad/modelgenerator/internal/ModelGeneratorImpl.qll
@@ -881,7 +881,13 @@ module MakeModelGenerator<
   string captureMixedFlow(DataFlowSummaryTargetApi api, boolean lift) {
     result = ContentSensitive::captureFlow(api, lift)
     or
-    not exists(ContentSensitive::captureFlow(api, _)) and
+    not exists(DataFlowSummaryTargetApi api0 |
+      (api0 = api or api.lift() = api0) and
+      exists(ContentSensitive::captureFlow(api0, false))
+      or
+      api0.lift() = api.lift() and
+      exists(ContentSensitive::captureFlow(api0, true))
+    ) and
     result = captureFlow(api) and
     lift = true
   }
@@ -895,7 +901,8 @@ module MakeModelGenerator<
     not exists(DataFlowSummaryTargetApi api0, boolean lift |
       exists(captureMixedFlow(api0, lift)) and
       (
-        lift = false and api0 = api
+        lift = false and
+        (api0 = api or api0 = api.lift())
         or
         lift = true and api0.lift() = api.lift()
       )

From 4c21444dd5afc33fa3637bcc6198e8fc82506fb7 Mon Sep 17 00:00:00 2001
From: Cornelius Riemenschneider <cornelius@github.com>
Date: Wed, 9 Oct 2024 14:04:05 +0200
Subject: [PATCH 253/347] Bazel: Flip --incompatible_use_plus_in_repo_names.

We've hardcoded the tilde in a lot of places :(
This improves performance on Windows and gets us ready for Bazel 8.

We need an upgrade of rules_rust for this to work.
---
 .bazelrc                                       | 1 +
 MODULE.bazel                                   | 2 +-
 java/kotlin-extractor/deps.bzl                 | 2 +-
 misc/bazel/internal/zipmerge/zipmerge_test.cpp | 2 +-
 misc/bazel/lfs.bzl                             | 4 ++--
 misc/ripunzip/install.sh                       | 2 +-
 rust/codegen/codegen.sh                        | 2 +-
 7 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/.bazelrc b/.bazelrc
index 9abda3e670a0..26a0600a44ed 100644
--- a/.bazelrc
+++ b/.bazelrc
@@ -25,5 +25,6 @@ common --registry=https://bcr.bazel.build
 
 common --@rules_dotnet//dotnet/settings:strict_deps=false
 common --experimental_isolated_extension_usages
+common --incompatible_use_plus_in_repo_names
 
 try-import %workspace%/local.bazelrc
diff --git a/MODULE.bazel b/MODULE.bazel
index 4a2219d43a54..c04fe5d3ec33 100644
--- a/MODULE.bazel
+++ b/MODULE.bazel
@@ -27,7 +27,7 @@ bazel_dep(name = "rules_kotlin", version = "1.9.4-codeql.1")
 bazel_dep(name = "gazelle", version = "0.38.0")
 bazel_dep(name = "rules_dotnet", version = "0.15.1")
 bazel_dep(name = "googletest", version = "1.14.0.bcr.1")
-bazel_dep(name = "rules_rust", version = "0.50.0")
+bazel_dep(name = "rules_rust", version = "0.52.2")
 
 bazel_dep(name = "buildifier_prebuilt", version = "6.4.0", dev_dependency = True)
 
diff --git a/java/kotlin-extractor/deps.bzl b/java/kotlin-extractor/deps.bzl
index 6e55969f2512..bee713f8c466 100644
--- a/java/kotlin-extractor/deps.bzl
+++ b/java/kotlin-extractor/deps.bzl
@@ -17,7 +17,7 @@ def _get_dep(repository_ctx, name):
     return repository_ctx.path(Label("//java/kotlin-extractor/deps:%s" % name))
 
 def _kotlin_dep_impl(repository_ctx):
-    _, _, name = repository_ctx.name.rpartition("~")
+    _, _, name = repository_ctx.name.rpartition("+")
     lfs_smudge(repository_ctx, [_get_dep(repository_ctx, name + ".jar")])
 
     # for some reason rules_kotlin warns about these jars missing, this is to silence those warnings
diff --git a/misc/bazel/internal/zipmerge/zipmerge_test.cpp b/misc/bazel/internal/zipmerge/zipmerge_test.cpp
index 9bee1a79c02f..65278a679f5b 100644
--- a/misc/bazel/internal/zipmerge/zipmerge_test.cpp
+++ b/misc/bazel/internal/zipmerge/zipmerge_test.cpp
@@ -75,7 +75,7 @@ std::string get_file(const char* name) {
     return ret;
   }();
   // this works from both `codeql` and the internal repository
-  for (auto prefix : {"_main", "ql~"}) {
+  for (auto prefix : {"_main", "ql+"}) {
     auto ret = runfiles->Rlocation(prefix + "/misc/bazel/internal/zipmerge/test-files/"s + name);
     if (fs::exists(ret)) {
       return ret;
diff --git a/misc/bazel/lfs.bzl b/misc/bazel/lfs.bzl
index a068d76b2eae..7c37c0a55236 100644
--- a/misc/bazel/lfs.bzl
+++ b/misc/bazel/lfs.bzl
@@ -64,8 +64,8 @@ def _download_lfs(repository_ctx):
         srcs = [f for f in dir.readdir() if not f.is_dir]
     lfs_smudge(repository_ctx, srcs, executable = repository_ctx.attr.executable)
 
-    # with bzlmod the name is qualified with `~` separators, and we want the base name here
-    name = repository_ctx.name.split("~")[-1]
+    # with bzlmod the name is qualified with `+` separators, and we want the base name here
+    name = repository_ctx.name.split("+")[-1]
     basenames = [src.basename for src in srcs]
     build = "exports_files(%s)\n" % repr(basenames)
 
diff --git a/misc/ripunzip/install.sh b/misc/ripunzip/install.sh
index d9ee6dda1cb6..d383381f0e2e 100755
--- a/misc/ripunzip/install.sh
+++ b/misc/ripunzip/install.sh
@@ -2,7 +2,7 @@
 
 set -eu
 
-source misc/bazel/runfiles.sh 2>/dev/null || source external/ql~/misc/bazel/runfiles.sh
+source misc/bazel/runfiles.sh 2>/dev/null || source external/ql+/misc/bazel/runfiles.sh
 
 dest="${2:-$HOME/.local/bin}"
 
diff --git a/rust/codegen/codegen.sh b/rust/codegen/codegen.sh
index e56f40627e65..cb15c796fd6a 100755
--- a/rust/codegen/codegen.sh
+++ b/rust/codegen/codegen.sh
@@ -2,7 +2,7 @@
 
 set -eu
 
-source misc/bazel/runfiles.sh 2>/dev/null || source external/ql~/misc/bazel/runfiles.sh
+source misc/bazel/runfiles.sh 2>/dev/null || source external/ql+/misc/bazel/runfiles.sh
 
 ast_generator="$(rlocation "$1")"
 ast_generator_manifest="$(rlocation "$2")"

From c883aa09f8321f9e6a9112aacbb02e3f2b975dc4 Mon Sep 17 00:00:00 2001
From: Mathias Vorreiter Pedersen <mathiasvp@github.com>
Date: Wed, 9 Oct 2024 13:45:18 +0100
Subject: [PATCH 254/347] Update
 cpp/ql/src/change-notes/2024-10-07-unclear-array-index-validation.md

Co-authored-by: Jeroen Ketema <93738568+jketema@users.noreply.github.com>
---
 .../change-notes/2024-10-07-unclear-array-index-validation.md   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cpp/ql/src/change-notes/2024-10-07-unclear-array-index-validation.md b/cpp/ql/src/change-notes/2024-10-07-unclear-array-index-validation.md
index 97944e9da7ae..b237afdd6be8 100644
--- a/cpp/ql/src/change-notes/2024-10-07-unclear-array-index-validation.md
+++ b/cpp/ql/src/change-notes/2024-10-07-unclear-array-index-validation.md
@@ -1,4 +1,4 @@
 ---
 category: minorAnalysis
 ---
-* The `cpp/unclear-array-index-validation` ("Unclear validation of array index") query has been imoroved to reduce false positives increase true positives.
\ No newline at end of file
+* The `cpp/unclear-array-index-validation` ("Unclear validation of array index") query has been improved to reduce false positives increase true positives.
\ No newline at end of file

From 61a012fc6c1a96587f5420b63ca0719d3d5d9e36 Mon Sep 17 00:00:00 2001
From: Mathias Vorreiter Pedersen <mathiasvp@github.com>
Date: Wed, 9 Oct 2024 14:17:56 +0100
Subject: [PATCH 255/347] C++: Don't allow 'x < 0' as a barrier guard.

---
 .../Security/CWE/CWE-129/ImproperArrayIndexValidation.ql  | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/cpp/ql/src/Security/CWE/CWE-129/ImproperArrayIndexValidation.ql b/cpp/ql/src/Security/CWE/CWE-129/ImproperArrayIndexValidation.ql
index 1978fc984d69..b5dc4d893b21 100644
--- a/cpp/ql/src/Security/CWE/CWE-129/ImproperArrayIndexValidation.ql
+++ b/cpp/ql/src/Security/CWE/CWE-129/ImproperArrayIndexValidation.ql
@@ -25,11 +25,11 @@ predicate isFlowSource(FS::FlowSource source, string sourceType) {
 
 predicate guardChecks(IRGuardCondition g, Expr e, boolean branch) {
   exists(Operand op | op.getDef().getConvertedResultExpression() = e |
-    // op < k
-    g.comparesLt(op, _, true, any(BooleanValue bv | bv.getValue() = branch))
+    // `op < k` is true and `k > 0`
+    g.comparesLt(op, any(int k | k > 0), true, any(BooleanValue bv | bv.getValue() = branch))
     or
-    // op < _ + k
-    g.comparesLt(op, _, _, true, branch)
+    // `op < _ + k` is true and `k > 0`.
+    g.comparesLt(op, _, any(int k | k > 0), true, branch)
     or
     // op == k
     g.comparesEq(op, _, true, any(BooleanValue bv | bv.getValue() = branch))

From 201842d2f9c8312d86909fbae5b8497f223c60c0 Mon Sep 17 00:00:00 2001
From: Mathias Vorreiter Pedersen <mathiasvp@github.com>
Date: Wed, 9 Oct 2024 14:33:20 +0100
Subject: [PATCH 256/347] C++: Add test with missing flow through 'fopen'.

---
 .../dataflow/taint-tests/localTaint.expected         |  9 +++++++++
 .../library-tests/dataflow/taint-tests/taint.cpp     | 12 ++++++++++++
 2 files changed, 21 insertions(+)

diff --git a/cpp/ql/test/library-tests/dataflow/taint-tests/localTaint.expected b/cpp/ql/test/library-tests/dataflow/taint-tests/localTaint.expected
index 80541c16115f..480899ea78bf 100644
--- a/cpp/ql/test/library-tests/dataflow/taint-tests/localTaint.expected
+++ b/cpp/ql/test/library-tests/dataflow/taint-tests/localTaint.expected
@@ -6584,6 +6584,15 @@ WARNING: module 'TaintTracking' has been deprecated and may be removed in future
 | taint.cpp:767:21:767:24 | ref arg path | taint.cpp:768:8:768:11 | path |  |
 | taint.cpp:768:8:768:11 | path | taint.cpp:768:7:768:11 | * ... |  |
 | taint.cpp:778:37:778:42 | call to source | taint.cpp:779:7:779:9 | obj |  |
+| taint.cpp:785:23:785:28 | source | taint.cpp:785:23:785:28 | source |  |
+| taint.cpp:785:23:785:28 | source | taint.cpp:786:18:786:23 | source |  |
+| taint.cpp:785:23:785:28 | source | taint.cpp:790:15:790:20 | source |  |
+| taint.cpp:786:12:786:16 | call to fopen | taint.cpp:787:7:787:7 | f |  |
+| taint.cpp:789:8:789:9 | f2 | taint.cpp:790:11:790:12 | f2 |  |
+| taint.cpp:789:8:789:9 | f2 | taint.cpp:791:7:791:8 | f2 |  |
+| taint.cpp:790:10:790:12 | ref arg & ... | taint.cpp:790:11:790:12 | f2 [inner post update] |  |
+| taint.cpp:790:10:790:12 | ref arg & ... | taint.cpp:791:7:791:8 | f2 |  |
+| taint.cpp:790:11:790:12 | f2 | taint.cpp:790:10:790:12 | & ... |  |
 | vector.cpp:16:43:16:49 | source1 | vector.cpp:17:26:17:32 | source1 |  |
 | vector.cpp:16:43:16:49 | source1 | vector.cpp:31:38:31:44 | source1 |  |
 | vector.cpp:17:21:17:33 | call to vector | vector.cpp:19:14:19:14 | v |  |
diff --git a/cpp/ql/test/library-tests/dataflow/taint-tests/taint.cpp b/cpp/ql/test/library-tests/dataflow/taint-tests/taint.cpp
index 220265a3bb1a..579df2865785 100644
--- a/cpp/ql/test/library-tests/dataflow/taint-tests/taint.cpp
+++ b/cpp/ql/test/library-tests/dataflow/taint-tests/taint.cpp
@@ -777,4 +777,16 @@ TaintInheritingContentObject source(bool);
 void test_TaintInheritingContent() {
 	TaintInheritingContentObject obj = source(true);
 	sink(obj.flowFromObject); // $ ir MISSING: ast
+}
+
+FILE* fopen(const char*, const char*);
+int fopen_s(FILE** pFile, const char *filename, const char *mode);
+
+void fopen_test(char* source) {
+	FILE* f = fopen(source, "r");
+	sink(f); // $ MISSING: ast,ir
+
+	FILE* f2;
+	fopen_s(&f2, source, "r");
+	sink(f2); // $ ast MISSING: ir
 }
\ No newline at end of file

From 338e82064e3d18f718757e19fa4beccc145d515d Mon Sep 17 00:00:00 2001
From: Mathias Vorreiter Pedersen <mathiasvp@github.com>
Date: Wed, 9 Oct 2024 14:40:26 +0100
Subject: [PATCH 257/347] C++: Add a taint model for 'fopen' and accept test
 changes.

---
 .../code/cpp/models/implementations/Fopen.qll   | 17 ++++++++++++++++-
 .../dataflow/taint-tests/localTaint.expected    |  1 +
 .../dataflow/taint-tests/taint.cpp              |  4 ++--
 3 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/cpp/ql/lib/semmle/code/cpp/models/implementations/Fopen.qll b/cpp/ql/lib/semmle/code/cpp/models/implementations/Fopen.qll
index 6bc700becf1e..e7cb84753853 100644
--- a/cpp/ql/lib/semmle/code/cpp/models/implementations/Fopen.qll
+++ b/cpp/ql/lib/semmle/code/cpp/models/implementations/Fopen.qll
@@ -7,7 +7,7 @@ import semmle.code.cpp.models.interfaces.Alias
 import semmle.code.cpp.models.interfaces.SideEffect
 
 /** The function `fopen` and friends. */
-private class Fopen extends Function, AliasFunction, SideEffectFunction {
+private class Fopen extends Function, AliasFunction, SideEffectFunction, TaintFunction {
   Fopen() {
     this.hasGlobalOrStdName(["fopen", "fopen_s", "freopen"])
     or
@@ -47,4 +47,19 @@ private class Fopen extends Function, AliasFunction, SideEffectFunction {
     i = 0 and
     buffer = true
   }
+
+  override predicate hasTaintFlow(FunctionInput input, FunctionOutput output) {
+    this.hasGlobalOrStdName(["fopen", "freopen", "_wfopen", "_fsopen", "_wfsopen"]) and
+    input.isParameterDeref(0) and
+    output.isReturnValueDeref()
+    or
+    // The out parameter is a pointer to a `FILE*`.
+    this.hasGlobalOrStdName(["fopen_s"]) and
+    input.isParameterDeref(1) and
+    output.isParameterDeref(0, 2)
+    or
+    this.hasGlobalName(["_open", "_wopen"]) and
+    input.isParameterDeref(0) and
+    output.isReturnValue()
+  }
 }
diff --git a/cpp/ql/test/library-tests/dataflow/taint-tests/localTaint.expected b/cpp/ql/test/library-tests/dataflow/taint-tests/localTaint.expected
index 480899ea78bf..7de6914e8aac 100644
--- a/cpp/ql/test/library-tests/dataflow/taint-tests/localTaint.expected
+++ b/cpp/ql/test/library-tests/dataflow/taint-tests/localTaint.expected
@@ -6588,6 +6588,7 @@ WARNING: module 'TaintTracking' has been deprecated and may be removed in future
 | taint.cpp:785:23:785:28 | source | taint.cpp:786:18:786:23 | source |  |
 | taint.cpp:785:23:785:28 | source | taint.cpp:790:15:790:20 | source |  |
 | taint.cpp:786:12:786:16 | call to fopen | taint.cpp:787:7:787:7 | f |  |
+| taint.cpp:786:18:786:23 | source | taint.cpp:786:12:786:16 | call to fopen | TAINT |
 | taint.cpp:789:8:789:9 | f2 | taint.cpp:790:11:790:12 | f2 |  |
 | taint.cpp:789:8:789:9 | f2 | taint.cpp:791:7:791:8 | f2 |  |
 | taint.cpp:790:10:790:12 | ref arg & ... | taint.cpp:790:11:790:12 | f2 [inner post update] |  |
diff --git a/cpp/ql/test/library-tests/dataflow/taint-tests/taint.cpp b/cpp/ql/test/library-tests/dataflow/taint-tests/taint.cpp
index 579df2865785..a5f63b3d2e61 100644
--- a/cpp/ql/test/library-tests/dataflow/taint-tests/taint.cpp
+++ b/cpp/ql/test/library-tests/dataflow/taint-tests/taint.cpp
@@ -784,9 +784,9 @@ int fopen_s(FILE** pFile, const char *filename, const char *mode);
 
 void fopen_test(char* source) {
 	FILE* f = fopen(source, "r");
-	sink(f); // $ MISSING: ast,ir
+	sink(f); // $ ast,ir
 
 	FILE* f2;
 	fopen_s(&f2, source, "r");
-	sink(f2); // $ ast MISSING: ir
+	sink(f2); // $ ast,ir
 }
\ No newline at end of file

From 954235ecddc426c483796788cb7c39bdd48ed840 Mon Sep 17 00:00:00 2001
From: Mathias Vorreiter Pedersen <mathiasvp@github.com>
Date: Wed, 9 Oct 2024 14:42:36 +0100
Subject: [PATCH 258/347] C++: Add change note.

---
 cpp/ql/lib/change-notes/2024-10-09-fopen-taint.md | 4 ++++
 1 file changed, 4 insertions(+)
 create mode 100644 cpp/ql/lib/change-notes/2024-10-09-fopen-taint.md

diff --git a/cpp/ql/lib/change-notes/2024-10-09-fopen-taint.md b/cpp/ql/lib/change-notes/2024-10-09-fopen-taint.md
new file mode 100644
index 000000000000..d2516859a910
--- /dev/null
+++ b/cpp/ql/lib/change-notes/2024-10-09-fopen-taint.md
@@ -0,0 +1,4 @@
+---
+category: minorAnalysis
+---
+* Added taint flow model for `fopen` and related functions.
\ No newline at end of file

From 4de0fefe867d8fc888d5ff3399c6dd4977b59155 Mon Sep 17 00:00:00 2001
From: Cornelius Riemenschneider <cornelius@github.com>
Date: Wed, 9 Oct 2024 15:49:11 +0200
Subject: [PATCH 259/347] Upgrade rules_kotlin to 2.0.0.

This is required for the bazel 8 upgrade, as one of the
incompatible-flag flips breaks 1.9.4.
---
 MODULE.bazel                                     |  2 +-
 .../rules_kotlin/1.9.4-codeql.1/source.json      |  9 ---------
 .../MODULE.bazel                                 | 12 ++++++++----
 .../codeql_add_language_version_option.patch     | 16 ++++++++--------
 .../patches/codeql_do_not_emit_jdeps.patch       |  8 +++++---
 .../rules_kotlin/2.0.0-codeql.1/source.json      |  9 +++++++++
 .../registry/modules/rules_kotlin/metadata.json  |  2 +-
 7 files changed, 32 insertions(+), 26 deletions(-)
 delete mode 100644 misc/bazel/registry/modules/rules_kotlin/1.9.4-codeql.1/source.json
 rename misc/bazel/registry/modules/rules_kotlin/{1.9.4-codeql.1 => 2.0.0-codeql.1}/MODULE.bazel (74%)
 rename misc/bazel/registry/modules/rules_kotlin/{1.9.4-codeql.1 => 2.0.0-codeql.1}/patches/codeql_add_language_version_option.patch (80%)
 rename misc/bazel/registry/modules/rules_kotlin/{1.9.4-codeql.1 => 2.0.0-codeql.1}/patches/codeql_do_not_emit_jdeps.patch (73%)
 create mode 100644 misc/bazel/registry/modules/rules_kotlin/2.0.0-codeql.1/source.json

diff --git a/MODULE.bazel b/MODULE.bazel
index 4a2219d43a54..568e35c41767 100644
--- a/MODULE.bazel
+++ b/MODULE.bazel
@@ -23,7 +23,7 @@ bazel_dep(name = "bazel_skylib", version = "1.6.1")
 bazel_dep(name = "abseil-cpp", version = "20240116.0", repo_name = "absl")
 bazel_dep(name = "nlohmann_json", version = "3.11.3", repo_name = "json")
 bazel_dep(name = "fmt", version = "10.0.0")
-bazel_dep(name = "rules_kotlin", version = "1.9.4-codeql.1")
+bazel_dep(name = "rules_kotlin", version = "2.0.0-codeql.1")
 bazel_dep(name = "gazelle", version = "0.38.0")
 bazel_dep(name = "rules_dotnet", version = "0.15.1")
 bazel_dep(name = "googletest", version = "1.14.0.bcr.1")
diff --git a/misc/bazel/registry/modules/rules_kotlin/1.9.4-codeql.1/source.json b/misc/bazel/registry/modules/rules_kotlin/1.9.4-codeql.1/source.json
deleted file mode 100644
index 5089476d754a..000000000000
--- a/misc/bazel/registry/modules/rules_kotlin/1.9.4-codeql.1/source.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-    "integrity": "sha256-dsD8wsI+33NjIK3tGs2d3guuQY5XMd8Skz2IbLqGt5U=",
-    "url": "https://github.com/bazelbuild/rules_kotlin/releases/download/v1.9.4/rules_kotlin-v1.9.4.tar.gz",
-    "patches": {
-        "codeql_do_not_emit_jdeps.patch": "sha256-x/HsujFlR1FGrgmbAbRZag9V4vKZZinBcs73tgRS478=",
-        "codeql_add_language_version_option.patch": "sha256-qFpP/hIvqGzjJi0h8LAQK0UuWqwlj/oCecZYGqlMVP8="
-    },
-    "patch_strip": 1
-}
diff --git a/misc/bazel/registry/modules/rules_kotlin/1.9.4-codeql.1/MODULE.bazel b/misc/bazel/registry/modules/rules_kotlin/2.0.0-codeql.1/MODULE.bazel
similarity index 74%
rename from misc/bazel/registry/modules/rules_kotlin/1.9.4-codeql.1/MODULE.bazel
rename to misc/bazel/registry/modules/rules_kotlin/2.0.0-codeql.1/MODULE.bazel
index 4982ad4b9a4d..6c11301e2340 100644
--- a/misc/bazel/registry/modules/rules_kotlin/1.9.4-codeql.1/MODULE.bazel
+++ b/misc/bazel/registry/modules/rules_kotlin/2.0.0-codeql.1/MODULE.bazel
@@ -1,14 +1,16 @@
 module(
     name = "rules_kotlin",
-    version = "1.9.4-codeql.1",
+    version = "2.0.0-codeql.1",
+    compatibility_level = 1,
     repo_name = "rules_kotlin",
 )
 
-bazel_dep(name = "platforms", version = "0.0.6")
-bazel_dep(name = "bazel_skylib", version = "1.4.2")
+bazel_dep(name = "platforms", version = "0.0.10")
+bazel_dep(name = "bazel_skylib", version = "1.7.1")
 bazel_dep(name = "rules_java", version = "7.2.0")
 bazel_dep(name = "rules_python", version = "0.23.1")
 bazel_dep(name = "rules_cc", version = "0.0.8")
+bazel_dep(name = "rules_android", version = "0.1.1")
 
 rules_kotlin_extensions = use_extension(
     "//src/main/starlark/core/repositories:bzlmod_setup.bzl",
@@ -19,7 +21,9 @@ use_repo(
     "com_github_google_ksp",
     "com_github_jetbrains_kotlin",
     "com_github_pinterest_ktlint",
-    "rules_android",
+    "kotlinx_serialization_core_jvm",
+    "kotlinx_serialization_json",
+    "kotlinx_serialization_json_jvm",
 )
 
 register_toolchains("//kotlin/internal:default_toolchain")
diff --git a/misc/bazel/registry/modules/rules_kotlin/1.9.4-codeql.1/patches/codeql_add_language_version_option.patch b/misc/bazel/registry/modules/rules_kotlin/2.0.0-codeql.1/patches/codeql_add_language_version_option.patch
similarity index 80%
rename from misc/bazel/registry/modules/rules_kotlin/1.9.4-codeql.1/patches/codeql_add_language_version_option.patch
rename to misc/bazel/registry/modules/rules_kotlin/2.0.0-codeql.1/patches/codeql_add_language_version_option.patch
index bb8fa5e4fcaf..d5716daba07b 100644
--- a/misc/bazel/registry/modules/rules_kotlin/1.9.4-codeql.1/patches/codeql_add_language_version_option.patch
+++ b/misc/bazel/registry/modules/rules_kotlin/2.0.0-codeql.1/patches/codeql_add_language_version_option.patch
@@ -1,13 +1,13 @@
 We need to build different extractor variants with different -language-version options, which is not allowed
 in current kotlin_rules
 diff --git a/src/main/starlark/core/options/opts.kotlinc.bzl b/src/main/starlark/core/options/opts.kotlinc.bzl
-index 9b15fb8..c0ac2cd 100644
+index 5e1461b..b93e6aa 100644
 --- a/src/main/starlark/core/options/opts.kotlinc.bzl
 +++ b/src/main/starlark/core/options/opts.kotlinc.bzl
-@@ -28,6 +28,11 @@ def _map_jvm_target_to_flag(version):
+@@ -33,6 +33,11 @@ def _map_jdk_release_to_flag(version):
          return None
-     return ["-jvm-target=%s" % version]
- 
+     return ["-Xjdk-release=%s" % version]
+
 +def _map_language_version_to_flag(version):
 +    if not version:
 +        return None
@@ -16,9 +16,9 @@ index 9b15fb8..c0ac2cd 100644
  _KOPTS_ALL = {
      "warn": struct(
          args = dict(
-@@ -349,6 +354,15 @@ _KOPTS_ALL = {
+@@ -417,6 +422,15 @@ _KOPTS_ALL = {
          value_to_flag = None,
-         map_value_to_flag = _map_jvm_target_to_flag,
+         map_value_to_flag = _map_jdk_release_to_flag,
      ),
 +    "language_version": struct(
 +        args = dict(
@@ -30,5 +30,5 @@ index 9b15fb8..c0ac2cd 100644
 +        map_value_to_flag = _map_language_version_to_flag,
 +    ),
  }
- 
- # Filters out options that are not available in current compiler release
+
+ # Filters out options that are not available in current compiler release
\ No newline at end of file
diff --git a/misc/bazel/registry/modules/rules_kotlin/1.9.4-codeql.1/patches/codeql_do_not_emit_jdeps.patch b/misc/bazel/registry/modules/rules_kotlin/2.0.0-codeql.1/patches/codeql_do_not_emit_jdeps.patch
similarity index 73%
rename from misc/bazel/registry/modules/rules_kotlin/1.9.4-codeql.1/patches/codeql_do_not_emit_jdeps.patch
rename to misc/bazel/registry/modules/rules_kotlin/2.0.0-codeql.1/patches/codeql_do_not_emit_jdeps.patch
index 1a01bd2c91bc..380c837d06a4 100644
--- a/misc/bazel/registry/modules/rules_kotlin/1.9.4-codeql.1/patches/codeql_do_not_emit_jdeps.patch
+++ b/misc/bazel/registry/modules/rules_kotlin/2.0.0-codeql.1/patches/codeql_do_not_emit_jdeps.patch
@@ -1,9 +1,11 @@
 Emitting jdeps is broken for the 2.0.0 kotlin extractor, and we don't need those files.
 Patching it here rather than passing `--@rules_kotlin//kotlin/settings:jvm_emit_jdeps=false`
 allows us to not have to specify that option (and therefore pull in `rules_kotlin`) in `semmle-code`.
---- a/kotlin/settings/BUILD.bazel	2000-01-01 01:00:00.000000000 +0100
-+++ b/kotlin/settings/BUILD.bazel	2024-04-10 14:51:16.060085986 +0200
-@@ -16,7 +16,7 @@
+diff --git a/kotlin/settings/BUILD.bazel b/kotlin/settings/BUILD.bazel
+index 2c93c11..f352b80 100644
+--- a/kotlin/settings/BUILD.bazel
++++ b/kotlin/settings/BUILD.bazel
+@@ -25,7 +25,7 @@ release_archive(
  # Flag that controls the emission of jdeps files during kotlin jvm compilation.
  bool_flag(
      name = "jvm_emit_jdeps",
diff --git a/misc/bazel/registry/modules/rules_kotlin/2.0.0-codeql.1/source.json b/misc/bazel/registry/modules/rules_kotlin/2.0.0-codeql.1/source.json
new file mode 100644
index 000000000000..96d828e3455a
--- /dev/null
+++ b/misc/bazel/registry/modules/rules_kotlin/2.0.0-codeql.1/source.json
@@ -0,0 +1,9 @@
+{
+    "integrity": "sha256-2JcjzJ67t72y66yhr30jg+B0YVZDz5ejZrdYp2t9xEM=",
+    "url": "https://github.com/bazelbuild/rules_kotlin/releases/download/v2.0.0/rules_kotlin-v2.0.0.tar.gz",
+    "patches": {
+        "codeql_do_not_emit_jdeps.patch": "sha256-1ir4Aio1SICxnj1wafQ0GefT/m7bwn2n+SQwq19V3A8=",
+        "codeql_add_language_version_option.patch": "sha256-t8Fm0bYZ4Q4vTqcoXZjyK4WPEoAafjE4whJLNnrnRbg="
+    },
+    "patch_strip": 1
+}
diff --git a/misc/bazel/registry/modules/rules_kotlin/metadata.json b/misc/bazel/registry/modules/rules_kotlin/metadata.json
index e399c3f5b0a2..ac259b2e729a 100644
--- a/misc/bazel/registry/modules/rules_kotlin/metadata.json
+++ b/misc/bazel/registry/modules/rules_kotlin/metadata.json
@@ -21,7 +21,7 @@
         "github:bazelbuild/rules_kotlin"
     ],
     "versions": [
-        "1.9.4-codeql.1"
+        "2.0.0-codeql.1"
     ],
     "yanked_versions": {}
 }

From 6965cf724605c086dcb188319e25605969aea3f7 Mon Sep 17 00:00:00 2001
From: Mathias Vorreiter Pedersen <mathiasvp@github.com>
Date: Wed, 9 Oct 2024 15:05:13 +0100
Subject: [PATCH 260/347] C++: Make ql-for-ql happy.

---
 cpp/ql/lib/semmle/code/cpp/models/implementations/Fopen.qll | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cpp/ql/lib/semmle/code/cpp/models/implementations/Fopen.qll b/cpp/ql/lib/semmle/code/cpp/models/implementations/Fopen.qll
index e7cb84753853..b191ee2a5bca 100644
--- a/cpp/ql/lib/semmle/code/cpp/models/implementations/Fopen.qll
+++ b/cpp/ql/lib/semmle/code/cpp/models/implementations/Fopen.qll
@@ -54,7 +54,7 @@ private class Fopen extends Function, AliasFunction, SideEffectFunction, TaintFu
     output.isReturnValueDeref()
     or
     // The out parameter is a pointer to a `FILE*`.
-    this.hasGlobalOrStdName(["fopen_s"]) and
+    this.hasGlobalOrStdName("fopen_s") and
     input.isParameterDeref(1) and
     output.isParameterDeref(0, 2)
     or

From a66f31d8448acfe8fcab6f5646fa8158e4da1635 Mon Sep 17 00:00:00 2001
From: Geoffrey White <40627776+geoffw0@users.noreply.github.com>
Date: Wed, 9 Oct 2024 15:09:06 +0100
Subject: [PATCH 261/347] Rust: Restrict variables to lowercase (for now).

---
 .../lib/codeql/rust/elements/internal/VariableImpl.qll |  8 +++++++-
 .../query-tests/unusedentities/UnusedVariable.expected |  5 -----
 rust/ql/test/query-tests/unusedentities/main.rs        | 10 +++++-----
 3 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/rust/ql/lib/codeql/rust/elements/internal/VariableImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/VariableImpl.qll
index b9e9bb7cb48a..6f0a7c0aebe5 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/VariableImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/VariableImpl.qll
@@ -85,7 +85,13 @@ module Impl {
     private AstNode definingNode;
     private string name;
 
-    Variable() { this = MkVariable(definingNode, name) }
+    Variable() {
+      this = MkVariable(definingNode, name) and
+      // exclude for now anything starting with an uppercase character, which may be an enum constant (e.g. `None`). This excludes
+      // static and constant variables (UPPERCASE), which we don't appear to recognize yet anyway. This also assumes programmers
+      // follow the naming guidelines, which they generally do, but they're not enforced.
+      not name.charAt(0).isUppercase()
+    }
 
     /** Gets the name of this variable. */
     string getName() { result = name }
diff --git a/rust/ql/test/query-tests/unusedentities/UnusedVariable.expected b/rust/ql/test/query-tests/unusedentities/UnusedVariable.expected
index 66b5ac84ab33..ee59aefde2c5 100644
--- a/rust/ql/test/query-tests/unusedentities/UnusedVariable.expected
+++ b/rust/ql/test/query-tests/unusedentities/UnusedVariable.expected
@@ -8,15 +8,10 @@
 | main.rs:202:17:202:17 | a | Variable is not used. |
 | main.rs:210:20:210:22 | val | Variable is not used. |
 | main.rs:223:14:223:16 | val | Variable is not used. |
-| main.rs:225:9:225:12 | None | Variable is not used. |
-| main.rs:234:9:234:12 | None | Variable is not used. |
 | main.rs:240:22:240:24 | val | Variable is not used. |
 | main.rs:248:24:248:26 | val | Variable is not used. |
 | main.rs:257:13:257:15 | num | Variable is not used. |
-| main.rs:268:9:268:11 | Yes | Variable is not used. |
-| main.rs:269:9:269:10 | No | Variable is not used. |
 | main.rs:272:12:272:12 | j | Variable is not used. |
-| main.rs:282:12:282:14 | Yes | Variable is not used. |
 | main.rs:294:25:294:25 | y | Variable is not used. |
 | main.rs:298:28:298:28 | a | Variable is not used. |
 | main.rs:302:9:302:9 | p | Variable is not used. |
diff --git a/rust/ql/test/query-tests/unusedentities/main.rs b/rust/ql/test/query-tests/unusedentities/main.rs
index d7c08f05b62a..469db64bd3f4 100644
--- a/rust/ql/test/query-tests/unusedentities/main.rs
+++ b/rust/ql/test/query-tests/unusedentities/main.rs
@@ -222,7 +222,7 @@ fn if_lets_matches() {
     match c {
         Some(val) => { // BAD: unused variable
         }
-        None => { // SPURIOUS: unused variable 'None'
+        None => {
         }
     }
 
@@ -231,7 +231,7 @@ fn if_lets_matches() {
         Some(val) => {
             total += val;
         }
-        None => { // SPURIOUS: unused variable 'None'
+        None => {
         }
     }
 
@@ -265,8 +265,8 @@ fn if_lets_matches() {
 
     let i = Yes;
     match i {
-        Yes => {} // SPURIOUS: unused variable 'Yes'
-        No => {} // SPURIOUS: unused variable 'No'
+        Yes => {}
+        No => {}
     }
 
     if let j = Yes { // BAD: unused variable
@@ -279,7 +279,7 @@ fn if_lets_matches() {
     }
 
     let l = Yes;
-    if let Yes = l { // SPURIOUS: unused variable 'Yes'
+    if let Yes = l {
     }
 
     match 1 {

From 6bd46148e75dc2a4a1c2a76c2f20542662135613 Mon Sep 17 00:00:00 2001
From: Rasmus Lerchedahl Petersen <yoff@github.com>
Date: Wed, 9 Oct 2024 16:27:52 +0200
Subject: [PATCH 262/347] Python: add change note

---
 python/ql/lib/change-notes/2024-10-09-finditer-match.md | 4 ++++
 1 file changed, 4 insertions(+)
 create mode 100644 python/ql/lib/change-notes/2024-10-09-finditer-match.md

diff --git a/python/ql/lib/change-notes/2024-10-09-finditer-match.md b/python/ql/lib/change-notes/2024-10-09-finditer-match.md
new file mode 100644
index 000000000000..ee2ccc1119a4
--- /dev/null
+++ b/python/ql/lib/change-notes/2024-10-09-finditer-match.md
@@ -0,0 +1,4 @@
+---
+category: minorAnalysis
+---
+* Modelled that `re.finditer` returns an iterable of `re.Match` objects. This is now understood by the API graph in many cases.
\ No newline at end of file

From f171eeb229ef0819be76815c44ee62e11487b897 Mon Sep 17 00:00:00 2001
From: Geoffrey White <40627776+geoffw0@users.noreply.github.com>
Date: Wed, 9 Oct 2024 15:36:58 +0100
Subject: [PATCH 263/347] Rust: Restrict 'unreachable' to nodes intended to be
 part of the CFG.

---
 .../queries/unusedentities/UnreachableCode.ql   |  7 ++++++-
 .../unusedentities/UnreachableCode.expected     | 17 -----------------
 rust/ql/test/query-tests/unusedentities/main.rs | 16 ++++++++--------
 .../query-tests/unusedentities/unreachable.rs   | 14 +++++++-------
 4 files changed, 21 insertions(+), 33 deletions(-)

diff --git a/rust/ql/src/queries/unusedentities/UnreachableCode.ql b/rust/ql/src/queries/unusedentities/UnreachableCode.ql
index e4a418c882c2..f07ab0f982a2 100644
--- a/rust/ql/src/queries/unusedentities/UnreachableCode.ql
+++ b/rust/ql/src/queries/unusedentities/UnreachableCode.ql
@@ -17,7 +17,12 @@ import codeql.rust.controlflow.internal.ControlFlowGraphImpl as ControlFlowGraph
  */
 private predicate unreachable(AstNode n) {
   not n = any(CfgNode cfn).getAstNode() and // reachable nodes
-  n instanceof ControlFlowGraphImpl::ControlFlowTree // part of the CFG
+  exists(ControlFlowGraphImpl::ControlFlowTree cft |
+    // nodes intended to be part of the CFG
+    cft.succ(n, _, _)
+    or
+    cft.succ(_, n, _)
+  )
 }
 
 /**
diff --git a/rust/ql/test/query-tests/unusedentities/UnreachableCode.expected b/rust/ql/test/query-tests/unusedentities/UnreachableCode.expected
index 0aeec4ce5c88..02c2998f1de2 100644
--- a/rust/ql/test/query-tests/unusedentities/UnreachableCode.expected
+++ b/rust/ql/test/query-tests/unusedentities/UnreachableCode.expected
@@ -1,31 +1,14 @@
-| main.rs:216:9:217:9 | MatchArm | This code is never reached. |
-| main.rs:218:9:219:9 | MatchArm | This code is never reached. |
-| main.rs:224:9:226:9 | MatchArm | This code is never reached. |
-| main.rs:227:9:228:9 | MatchArm | This code is never reached. |
-| main.rs:233:9:234:9 | MatchArm | This code is never reached. |
-| main.rs:235:9:235:28 | MatchArm | This code is never reached. |
-| main.rs:240:9:240:26 | MatchArm | This code is never reached. |
-| main.rs:241:9:241:25 | MatchArm | This code is never reached. |
 | unreachable.rs:12:3:12:17 | ExprStmt | This code is never reached. |
 | unreachable.rs:20:3:20:17 | ExprStmt | This code is never reached. |
 | unreachable.rs:32:3:32:17 | ExprStmt | This code is never reached. |
 | unreachable.rs:39:3:39:17 | ExprStmt | This code is never reached. |
-| unreachable.rs:46:6:46:8 | ParenExpr | This code is never reached. |
-| unreachable.rs:48:7:48:10 | ParenExpr | This code is never reached. |
 | unreachable.rs:60:2:60:16 | ExprStmt | This code is never reached. |
 | unreachable.rs:101:3:101:17 | ExprStmt | This code is never reached. |
 | unreachable.rs:109:3:109:17 | ExprStmt | This code is never reached. |
-| unreachable.rs:117:3:119:3 | MatchArm | This code is never reached. |
-| unreachable.rs:120:3:122:3 | MatchArm | This code is never reached. |
 | unreachable.rs:124:2:124:16 | ExprStmt | This code is never reached. |
-| unreachable.rs:127:3:129:3 | MatchArm | This code is never reached. |
-| unreachable.rs:130:3:132:3 | MatchArm | This code is never reached. |
 | unreachable.rs:134:2:134:16 | ExprStmt | This code is never reached. |
 | unreachable.rs:141:3:141:17 | ExprStmt | This code is never reached. |
 | unreachable.rs:150:4:150:18 | ExprStmt | This code is never reached. |
 | unreachable.rs:156:3:156:17 | ExprStmt | This code is never reached. |
 | unreachable.rs:162:4:162:18 | ExprStmt | This code is never reached. |
 | unreachable.rs:165:2:165:16 | ExprStmt | This code is never reached. |
-| unreachable.rs:171:10:171:16 | ParenExpr | This code is never reached. |
-| unreachable.rs:171:11:171:15 | ParenExpr | This code is never reached. |
-| unreachable.rs:171:12:171:14 | ParenExpr | This code is never reached. |
diff --git a/rust/ql/test/query-tests/unusedentities/main.rs b/rust/ql/test/query-tests/unusedentities/main.rs
index a7186a19aa1c..62764293e639 100644
--- a/rust/ql/test/query-tests/unusedentities/main.rs
+++ b/rust/ql/test/query-tests/unusedentities/main.rs
@@ -213,32 +213,32 @@ fn if_lets() {
 
     let c = Some(60);
     match c {
-        Some(val) => { // BAD: unused variable SPURIOUS: unreachable
+        Some(val) => { // BAD: unused variable
         }
-        None => { // SPURIOUS: unused variable 'None', unreachable
+        None => { // SPURIOUS: unused variable 'None'
         }
     }
 
     let d = Some(70);
     match d {
-        Some(val) => { // SPURIOUS: unreachable
+        Some(val) => {
             total += val;
         }
-        None => { // SPURIOUS: unused variable 'None', unreachable
+        None => { // SPURIOUS: unused variable 'None'
         }
     }
 
     let e = MyOption::Some(80);
     match e {
-        MyOption::Some(val) => { // BAD: unused variable, unreachable
+        MyOption::Some(val) => { // BAD: unused variable
         }
-        MyOption::None => {} // SPURIOUS: unreachable
+        MyOption::None => {}
     }
 
     let f = YesOrNo::Yes;
     match f {
-        YesOrNo::Yes => {} // SPURIOUS: unreachable
-        YesOrNo::No => {} // SPURIOUS: unreachable
+        YesOrNo::Yes => {}
+        YesOrNo::No => {}
     }
 }
 
diff --git a/rust/ql/test/query-tests/unusedentities/unreachable.rs b/rust/ql/test/query-tests/unusedentities/unreachable.rs
index 9c1625a29203..8a8fbcf70bdb 100644
--- a/rust/ql/test/query-tests/unusedentities/unreachable.rs
+++ b/rust/ql/test/query-tests/unusedentities/unreachable.rs
@@ -43,9 +43,9 @@ fn unreachable_if() {
 	if cond() {
 		let x = cond();
 
-		if (x) { // SPURIOUS: unreachable
+		if (x) {
 			do_something();
-			if (!x) { // SPURIOUS: unreachable
+			if (!x) {
 				do_something(); // BAD: unreachable code [NOT DETECTED]
 			}
 			do_something();
@@ -114,20 +114,20 @@ fn unreachable_panic() {
 
 fn unreachable_match() {
 	match get_a_number() {
-		1=>{ // [unreachable FALSE POSITIVE]
+		1=>{
 			return;
 		}
-		_=>{ // [unreachable FALSE POSITIVE]
+		_=>{
 			do_something();
 		}
 	}
 	do_something(); // [unreachable FALSE POSITIVE]
 
 	match get_a_number() {
-		1=>{ // [unreachable FALSE POSITIVE]
+		1=>{
 			return;
 		}
-		_=>{ // [unreachable FALSE POSITIVE]
+		_=>{
 			return;
 		}
 	}
@@ -168,5 +168,5 @@ fn unreachable_loop() {
 }
 
 fn unreachable_paren() {
-	let _ = (((1))); // SPURIOUS: unreachable (x3)
+	let _ = (((1)));
 }

From dfeb35fe1a46a23c9abc1ab2c9378bd7f4d955c9 Mon Sep 17 00:00:00 2001
From: Geoffrey White <40627776+geoffw0@users.noreply.github.com>
Date: Wed, 9 Oct 2024 16:21:12 +0100
Subject: [PATCH 264/347] Rust: Move the restriction to variableDecl.

---
 .../rust/elements/internal/VariableImpl.qll       | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/rust/ql/lib/codeql/rust/elements/internal/VariableImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/VariableImpl.qll
index 6f0a7c0aebe5..7647ee86a8d2 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/VariableImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/VariableImpl.qll
@@ -77,7 +77,12 @@ module Impl {
       not exists(getOutermostEnclosingOrPat(p)) and
       definingNode = p.getName()
     ) and
-    name = p.getName().getText()
+    name = p.getName().getText() and
+    // exclude for now anything starting with an uppercase character, which may be a reference to
+    // an enum constant (e.g. `None`). This excludes static and constant variables (UPPERCASE),
+    // which we don't appear to recognize yet anyway. This also assumes programmers follow the
+    // naming guidelines, which they generally do, but they're not enforced.
+    not name.charAt(0).isUppercase()
   }
 
   /** A variable. */
@@ -85,13 +90,7 @@ module Impl {
     private AstNode definingNode;
     private string name;
 
-    Variable() {
-      this = MkVariable(definingNode, name) and
-      // exclude for now anything starting with an uppercase character, which may be an enum constant (e.g. `None`). This excludes
-      // static and constant variables (UPPERCASE), which we don't appear to recognize yet anyway. This also assumes programmers
-      // follow the naming guidelines, which they generally do, but they're not enforced.
-      not name.charAt(0).isUppercase()
-    }
+    Variable() { this = MkVariable(definingNode, name) }
 
     /** Gets the name of this variable. */
     string getName() { result = name }

From aa7215bbd571d9fea19004f07b5ba6f6f46f681c Mon Sep 17 00:00:00 2001
From: Tom Hvitved <hvitved@github.com>
Date: Wed, 9 Oct 2024 17:22:16 +0200
Subject: [PATCH 265/347] Address review comments

---
 shared/util/codeql/util/DenseRank.qll | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/shared/util/codeql/util/DenseRank.qll b/shared/util/codeql/util/DenseRank.qll
index 4a01160ff1b8..d1ba4ae4b62c 100644
--- a/shared/util/codeql/util/DenseRank.qll
+++ b/shared/util/codeql/util/DenseRank.qll
@@ -1,4 +1,7 @@
-/** Provides modules for computing dense `rank`s. */
+/**
+ * Provides modules for computing dense `rank`s. See the `DenseRank` module
+ * below for a more detailed explanation.
+ */
 
 /** Provides the input to `DenseRank`. */
 signature module DenseRankInputSig {
@@ -77,7 +80,7 @@ signature module DenseRankInputSig2 {
 module DenseRank2<DenseRankInputSig2 Input> {
   private import Input
 
-  private int rank0(C c, Ranked r, int rnk) {
+  private int rankRank(C c, Ranked r, int rnk) {
     rnk = getRank(c, r) and
     rnk = rank[result](int rnk0 | rnk0 = getRank(c, _) | rnk0)
   }
@@ -85,7 +88,7 @@ module DenseRank2<DenseRankInputSig2 Input> {
   /** Gets the dense rank of `r` in the context provided by `c`. */
   int denseRank(C c, Ranked r) {
     exists(int rnk |
-      result = rank0(c, r, rnk) and
+      result = rankRank(c, r, rnk) and
       rnk = getRank(c, r)
     )
   }
@@ -113,7 +116,7 @@ signature module DenseRankInputSig3 {
 module DenseRank3<DenseRankInputSig3 Input> {
   private import Input
 
-  private int rank0(C1 c1, C2 c2, Ranked r, int rnk) {
+  private int rankRank(C1 c1, C2 c2, Ranked r, int rnk) {
     rnk = getRank(c1, c2, r) and
     rnk = rank[result](int rnk0 | rnk0 = getRank(c1, c2, _) | rnk0)
   }
@@ -121,7 +124,7 @@ module DenseRank3<DenseRankInputSig3 Input> {
   /** Gets the dense rank of `r` in the context provided by `c1` and `c2`. */
   int denseRank(C1 c1, C2 c2, Ranked r) {
     exists(int rnk |
-      result = rank0(c1, c2, r, rnk) and
+      result = rankRank(c1, c2, r, rnk) and
       rnk = getRank(c1, c2, r)
     )
   }

From 0abc0d1a67fbdc9ac1a614fa7db82256076007d7 Mon Sep 17 00:00:00 2001
From: Edward Minnix III <egregius313@github.com>
Date: Wed, 9 Oct 2024 11:35:07 -0400
Subject: [PATCH 266/347] Fix: ActiveThreatModelSource

---
 .../semmle/go/dataflow/flowsources/local/stdin/source.ql        | 2 +-
 .../semmle/go/dataflow/flowsources/local/stdin/test.ql          | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/go/ql/test/library-tests/semmle/go/dataflow/flowsources/local/stdin/source.ql b/go/ql/test/library-tests/semmle/go/dataflow/flowsources/local/stdin/source.ql
index db6bbb1a2d16..eb7ba46508e7 100644
--- a/go/ql/test/library-tests/semmle/go/dataflow/flowsources/local/stdin/source.ql
+++ b/go/ql/test/library-tests/semmle/go/dataflow/flowsources/local/stdin/source.ql
@@ -6,7 +6,7 @@ module SourceTest implements TestSig {
   string getARelevantTag() { result = "source" }
 
   predicate hasActualResult(Location location, string element, string tag, string value) {
-    exists(ThreatModelFlowSource s |
+    exists(ActiveThreatModelSource s |
       s.hasLocationInfo(location.getFile().getAbsolutePath(), location.getStartLine(),
         location.getStartColumn(), location.getEndLine(), location.getEndColumn()) and
       element = s.toString() and
diff --git a/go/ql/test/library-tests/semmle/go/dataflow/flowsources/local/stdin/test.ql b/go/ql/test/library-tests/semmle/go/dataflow/flowsources/local/stdin/test.ql
index 7c7f587de571..5cdebdbc6c93 100644
--- a/go/ql/test/library-tests/semmle/go/dataflow/flowsources/local/stdin/test.ql
+++ b/go/ql/test/library-tests/semmle/go/dataflow/flowsources/local/stdin/test.ql
@@ -5,7 +5,7 @@ import experimental.frameworks.CleverGo
 import TestUtilities.InlineFlowTest
 
 module Config implements DataFlow::ConfigSig {
-  predicate isSource(DataFlow::Node source) { source instanceof ThreatModelFlowSource }
+  predicate isSource(DataFlow::Node source) { source instanceof ActiveThreatModelSource }
 
   predicate isSink(DataFlow::Node sink) {
     sink.asExpr() = any(CallExpr c | c.getTarget().getName() = "sink").getArgument(0)

From 5ac9c2db74d8218f50654da47bbd120627ae69d4 Mon Sep 17 00:00:00 2001
From: Geoffrey White <40627776+geoffw0@users.noreply.github.com>
Date: Wed, 9 Oct 2024 17:00:15 +0100
Subject: [PATCH 267/347] Rust: Accept variables test change.

---
 rust/ql/test/library-tests/variables/variables.expected | 1 -
 1 file changed, 1 deletion(-)

diff --git a/rust/ql/test/library-tests/variables/variables.expected b/rust/ql/test/library-tests/variables/variables.expected
index ccc1cd6072be..510b580c6125 100644
--- a/rust/ql/test/library-tests/variables/variables.expected
+++ b/rust/ql/test/library-tests/variables/variables.expected
@@ -24,7 +24,6 @@ variable
 | variables.rs:100:9:100:10 | x6 |
 | variables.rs:101:9:101:10 | y1 |
 | variables.rs:105:14:105:15 | y1 |
-| variables.rs:110:9:110:12 | None |
 | variables.rs:117:9:117:15 | numbers |
 | variables.rs:121:13:121:17 | first |
 | variables.rs:122:13:122:17 | third |

From acac3a06ad32554cd19c6c10fb5f0f1f0ae84502 Mon Sep 17 00:00:00 2001
From: Mathias Vorreiter Pedersen <mathiasvp@github.com>
Date: Wed, 9 Oct 2024 17:32:37 +0100
Subject: [PATCH 268/347] C++: Respond to review comments.

---
 cpp/ql/lib/semmle/code/cpp/models/implementations/Fopen.qll | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/cpp/ql/lib/semmle/code/cpp/models/implementations/Fopen.qll b/cpp/ql/lib/semmle/code/cpp/models/implementations/Fopen.qll
index b191ee2a5bca..fc6ceb321c1f 100644
--- a/cpp/ql/lib/semmle/code/cpp/models/implementations/Fopen.qll
+++ b/cpp/ql/lib/semmle/code/cpp/models/implementations/Fopen.qll
@@ -49,7 +49,10 @@ private class Fopen extends Function, AliasFunction, SideEffectFunction, TaintFu
   }
 
   override predicate hasTaintFlow(FunctionInput input, FunctionOutput output) {
-    this.hasGlobalOrStdName(["fopen", "freopen", "_wfopen", "_fsopen", "_wfsopen"]) and
+    (
+      this.hasGlobalOrStdName(["fopen", "freopen"]) or
+      this.hasGlobalName(["_wfopen", "_fsopen", "_wfsopen"])
+    ) and
     input.isParameterDeref(0) and
     output.isReturnValueDeref()
     or

From 3711a7e3e6b3dfa7e757356f2006c3c141a1a799 Mon Sep 17 00:00:00 2001
From: Paolo Tranquilli <redsun82@github.com>
Date: Thu, 10 Oct 2024 09:30:20 +0200
Subject: [PATCH 269/347] Fix CWE coverage link in main index

Kudos to @aikenka for spotting this.

Closes https://github.com/github/codeql/issues/17723
---
 docs/codeql/index.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/codeql/index.html b/docs/codeql/index.html
index de47832a997c..2f9dcd451ef7 100644
--- a/docs/codeql/index.html
+++ b/docs/codeql/index.html
@@ -101,7 +101,7 @@ <h2 class="Box-title text-mono f2 text-center">
                             latest version of CodeQL...</div>
                     </div>
                     <div class="Subhead border-0">
-                        <a href="codeql-overview/supported-languages-and-frameworks/">
+                        <a href="query-help/codeql-cwe-coverage/">
                             <div class="Subhead-heading f4 text-center">CodeQL coverage of CWEs</div>
                         </a>
                         <div class="Subhead-description">Detailed information on the coverage of Common Weakness Enumerations (CWEs) in the latest release...</div>

From 0c9a2896d85fa832eb292d9cab23214158fc2c03 Mon Sep 17 00:00:00 2001
From: Simon Friis Vindum <simonfv@gmail.com>
Date: Thu, 10 Oct 2024 11:47:58 +0200
Subject: [PATCH 270/347] Rust: Remove unused types

---
 .../codeql/rust/controlflow/internal/SuccessorType.qll    | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/rust/ql/lib/codeql/rust/controlflow/internal/SuccessorType.qll b/rust/ql/lib/codeql/rust/controlflow/internal/SuccessorType.qll
index ba76888bd303..0b88c9f05cb4 100644
--- a/rust/ql/lib/codeql/rust/controlflow/internal/SuccessorType.qll
+++ b/rust/ql/lib/codeql/rust/controlflow/internal/SuccessorType.qll
@@ -2,14 +2,6 @@ private import rust
 private import codeql.util.Boolean
 private import Completion
 
-newtype TLoopJumpType =
-  TContinueJump() or
-  TBreakJump()
-
-newtype TLabelType =
-  TLabel(string s) { any(Label l).getLifetime().getText() = s } or
-  TNoLabel()
-
 cached
 newtype TSuccessorType =
   TSuccessorSuccessor() or

From b80b6aafddc6d4fec15b109ec126505420910693 Mon Sep 17 00:00:00 2001
From: Arthur Baars <aibaars@github.com>
Date: Thu, 10 Oct 2024 13:04:28 +0200
Subject: [PATCH 271/347] Rust: extract modifier tokens as predicates

---
 rust/ast-generator/src/main.rs | 34 +++++++++++++++++++++++++++++++---
 1 file changed, 31 insertions(+), 3 deletions(-)

diff --git a/rust/ast-generator/src/main.rs b/rust/ast-generator/src/main.rs
index 8d4114c8bde5..f721872df939 100644
--- a/rust/ast-generator/src/main.rs
+++ b/rust/ast-generator/src/main.rs
@@ -3,7 +3,7 @@ use std::{fs, path::PathBuf};
 
 pub mod codegen;
 mod flags;
-use codegen::grammar::ast_src::{AstNodeSrc, AstSrc};
+use codegen::grammar::ast_src::{AstNodeSrc, AstSrc, Field};
 use std::collections::{BTreeMap, BTreeSet};
 use std::env;
 use ungrammar::Grammar;
@@ -94,7 +94,13 @@ fn write_schema(
             }
 
             empty = false;
-            if field.tp == "string" {
+            if field.tp == "predicate" {
+                writeln!(
+                    buf,
+                    "   {}: predicate",
+                    property_name(&node.name, &field.name),
+                )?;
+            } else if field.tp == "string" {
                 writeln!(
                     buf,
                     "   {}: optional[string]",
@@ -131,6 +137,21 @@ struct FieldInfo {
 }
 fn get_fields(node: &AstNodeSrc) -> Vec<FieldInfo> {
     let mut result = Vec::new();
+    let predicates = [
+        "async", "auto", "const", "default", "gen", "move", "mut", "raw", "ref", "static", "try",
+        "unsafe",
+    ];
+    for field in &node.fields {
+        if let Field::Token(name) = field {
+            if predicates.contains(&name.as_str()) {
+                result.push(FieldInfo {
+                    name: format!("is_{name}"),
+                    tp: "predicate".to_string(),
+                    is_many: false,
+                });
+            }
+        }
+    }
 
     match node.name.as_str() {
         "Name" | "NameRef" | "Lifetime" => {
@@ -480,7 +501,14 @@ impl Translator {{
             let type_name = &field.tp;
             let struct_field_name = &field.name;
             let class_field_name = property_name(&node.name, &field.name);
-            if field.tp == "string" {
+            if field.tp == "predicate" {
+                writeln!(
+                    buf,
+                    "        let {} = node.{}_token().is_some();",
+                    class_field_name,
+                    &struct_field_name[3..],
+                )?;
+            } else if field.tp == "string" {
                 writeln!(
                     buf,
                     "        let {} = node.try_get_text();",

From 30034b425484493cf53f79991883251317dea317 Mon Sep 17 00:00:00 2001
From: Arthur Baars <aibaars@github.com>
Date: Thu, 10 Oct 2024 13:05:49 +0200
Subject: [PATCH 272/347] Rust: run 'bazel //rust/codegen'

---
 rust/extractor/src/generated/.generated.list  |   2 +-
 rust/extractor/src/generated/top.rs           | 180 ++++++++++++++
 rust/extractor/src/translate/generated.rs     |  90 +++++++
 rust/ql/.generated.list                       |  84 +++----
 .../elements/internal/generated/BlockExpr.qll |  30 +++
 .../internal/generated/ClosureExpr.qll        |  25 ++
 .../elements/internal/generated/Const.qll     |  10 +
 .../internal/generated/ConstBlockPat.qll      |   5 +
 .../internal/generated/ConstParam.qll         |   5 +
 .../internal/generated/ExternBlock.qll        |   5 +
 .../elements/internal/generated/FnPtrType.qll |  15 ++
 .../elements/internal/generated/Function.qll  |  25 ++
 .../elements/internal/generated/IdentPat.qll  |  10 +
 .../rust/elements/internal/generated/Impl.qll |  15 ++
 .../rust/elements/internal/generated/Meta.qll |   5 +
 .../elements/internal/generated/PtrType.qll   |  10 +
 .../rust/elements/internal/generated/Raw.qll  | 225 ++++++++++++++++++
 .../elements/internal/generated/RefExpr.qll   |  15 ++
 .../elements/internal/generated/RefPat.qll    |   5 +
 .../elements/internal/generated/RefType.qll   |   5 +
 .../elements/internal/generated/SelfParam.qll |   5 +
 .../elements/internal/generated/Static.qll    |  10 +
 .../elements/internal/generated/Trait.qll     |  10 +
 .../elements/internal/generated/TypeAlias.qll |   5 +
 .../elements/internal/generated/TypeBound.qll |  10 +
 rust/ql/lib/rust.dbscheme                     | 225 ++++++++++++++++++
 .../generated/BlockExpr/BlockExpr.ql          |  14 +-
 .../generated/ClosureExpr/ClosureExpr.ql      |  11 +-
 .../extractor-tests/generated/Const/Const.ql  |   9 +-
 .../generated/ConstBlockPat/ConstBlockPat.ql  |   7 +-
 .../generated/ConstParam/ConstParam.ql        |   9 +-
 .../generated/ExternBlock/ExternBlock.ql      |   7 +-
 .../generated/FnPtrType/FnPtrType.ql          |  10 +-
 .../generated/Function/Function.ql            |  15 +-
 .../generated/IdentPat/IdentPat.ql            |   7 +-
 .../extractor-tests/generated/Impl/Impl.ql    |  13 +-
 .../extractor-tests/generated/Meta/Meta.ql    |   6 +-
 .../generated/PtrType/PtrType.ql              |   6 +-
 .../generated/RefExpr/RefExpr.ql              |  10 +-
 .../generated/RefPat/RefPat.ql                |   5 +-
 .../generated/RefType/RefType.ql              |   5 +-
 .../generated/SelfParam/SelfParam.ql          |   8 +-
 .../generated/Static/Static.ql                |   9 +-
 .../extractor-tests/generated/Trait/Trait.ql  |  12 +-
 .../generated/TypeAlias/TypeAlias.ql          |   9 +-
 .../generated/TypeBound/TypeBound.ql          |   9 +-
 rust/schema/ast.py                            |  45 ++++
 47 files changed, 1159 insertions(+), 98 deletions(-)

diff --git a/rust/extractor/src/generated/.generated.list b/rust/extractor/src/generated/.generated.list
index 43459827a075..1e9f2055823c 100644
--- a/rust/extractor/src/generated/.generated.list
+++ b/rust/extractor/src/generated/.generated.list
@@ -1,2 +1,2 @@
 mod.rs 4bcb9def847469aae9d8649461546b7c21ec97cf6e63d3cf394e339915ce65d7 4bcb9def847469aae9d8649461546b7c21ec97cf6e63d3cf394e339915ce65d7
-top.rs 855f5f0639dfafd8603c9b842f6470ca6d1214bb72391890a1de64db2adebba1 855f5f0639dfafd8603c9b842f6470ca6d1214bb72391890a1de64db2adebba1
+top.rs f8cc230aca9a7696686bee1efe499c679fb4760e09187075c803016e7b83433c f8cc230aca9a7696686bee1efe499c679fb4760e09187075c803016e7b83433c
diff --git a/rust/extractor/src/generated/top.rs b/rust/extractor/src/generated/top.rs
index 5c234ae22aef..fd008b106c72 100644
--- a/rust/extractor/src/generated/top.rs
+++ b/rust/extractor/src/generated/top.rs
@@ -1202,6 +1202,7 @@ impl From<trap::Label<MatchGuard>> for trap::Label<Locatable> {
 pub struct Meta {
     pub id: trap::TrapId<Meta>,
     pub expr: Option<trap::Label<Expr>>,
+    pub is_unsafe: bool,
     pub path: Option<trap::Label<Path>>,
     pub token_tree: Option<trap::Label<TokenTree>>,
 }
@@ -1216,6 +1217,9 @@ impl trap::TrapEntry for Meta {
         if let Some(v) = self.expr {
             out.add_tuple("meta_exprs", vec![id.into(), v.into()]);
         }
+        if self.is_unsafe {
+            out.add_tuple("meta_is_unsafe", vec![id.into()]);
+        }
         if let Some(v) = self.path {
             out.add_tuple("meta_paths", vec![id.into(), v.into()]);
         }
@@ -2072,6 +2076,7 @@ impl From<trap::Label<ReturnTypeSyntax>> for trap::Label<Locatable> {
 pub struct SelfParam {
     pub id: trap::TrapId<SelfParam>,
     pub attrs: Vec<trap::Label<Attr>>,
+    pub is_mut: bool,
     pub lifetime: Option<trap::Label<Lifetime>>,
     pub name: Option<trap::Label<Name>>,
     pub ty: Option<trap::Label<TypeRef>>,
@@ -2087,6 +2092,9 @@ impl trap::TrapEntry for SelfParam {
         for (i, v) in self.attrs.into_iter().enumerate() {
             out.add_tuple("self_param_attrs", vec![id.into(), i.into(), v.into()]);
         }
+        if self.is_mut {
+            out.add_tuple("self_param_is_mut", vec![id.into()]);
+        }
         if let Some(v) = self.lifetime {
             out.add_tuple("self_param_lifetimes", vec![id.into(), v.into()]);
         }
@@ -2422,6 +2430,8 @@ impl From<trap::Label<TupleField>> for trap::Label<Locatable> {
 pub struct TypeBound {
     pub id: trap::TrapId<TypeBound>,
     pub generic_param_list: Option<trap::Label<GenericParamList>>,
+    pub is_async: bool,
+    pub is_const: bool,
     pub lifetime: Option<trap::Label<Lifetime>>,
     pub ty: Option<trap::Label<TypeRef>>,
 }
@@ -2436,6 +2446,12 @@ impl trap::TrapEntry for TypeBound {
         if let Some(v) = self.generic_param_list {
             out.add_tuple("type_bound_generic_param_lists", vec![id.into(), v.into()]);
         }
+        if self.is_async {
+            out.add_tuple("type_bound_is_async", vec![id.into()]);
+        }
+        if self.is_const {
+            out.add_tuple("type_bound_is_const", vec![id.into()]);
+        }
         if let Some(v) = self.lifetime {
             out.add_tuple("type_bound_lifetimes", vec![id.into(), v.into()]);
         }
@@ -3425,6 +3441,12 @@ impl From<trap::Label<BinaryExpr>> for trap::Label<Locatable> {
 pub struct BlockExpr {
     pub id: trap::TrapId<BlockExpr>,
     pub attrs: Vec<trap::Label<Attr>>,
+    pub is_async: bool,
+    pub is_const: bool,
+    pub is_gen: bool,
+    pub is_move: bool,
+    pub is_try: bool,
+    pub is_unsafe: bool,
     pub label: Option<trap::Label<Label>>,
     pub stmt_list: Option<trap::Label<StmtList>>,
 }
@@ -3439,6 +3461,24 @@ impl trap::TrapEntry for BlockExpr {
         for (i, v) in self.attrs.into_iter().enumerate() {
             out.add_tuple("block_expr_attrs", vec![id.into(), i.into(), v.into()]);
         }
+        if self.is_async {
+            out.add_tuple("block_expr_is_async", vec![id.into()]);
+        }
+        if self.is_const {
+            out.add_tuple("block_expr_is_const", vec![id.into()]);
+        }
+        if self.is_gen {
+            out.add_tuple("block_expr_is_gen", vec![id.into()]);
+        }
+        if self.is_move {
+            out.add_tuple("block_expr_is_move", vec![id.into()]);
+        }
+        if self.is_try {
+            out.add_tuple("block_expr_is_try", vec![id.into()]);
+        }
+        if self.is_unsafe {
+            out.add_tuple("block_expr_is_unsafe", vec![id.into()]);
+        }
         if let Some(v) = self.label {
             out.add_tuple("block_expr_labels", vec![id.into(), v.into()]);
         }
@@ -3754,6 +3794,11 @@ pub struct ClosureExpr {
     pub attrs: Vec<trap::Label<Attr>>,
     pub body: Option<trap::Label<Expr>>,
     pub closure_binder: Option<trap::Label<ClosureBinder>>,
+    pub is_async: bool,
+    pub is_const: bool,
+    pub is_gen: bool,
+    pub is_move: bool,
+    pub is_static: bool,
     pub param_list: Option<trap::Label<ParamList>>,
     pub ret_type: Option<trap::Label<RetType>>,
 }
@@ -3774,6 +3819,21 @@ impl trap::TrapEntry for ClosureExpr {
         if let Some(v) = self.closure_binder {
             out.add_tuple("closure_expr_closure_binders", vec![id.into(), v.into()]);
         }
+        if self.is_async {
+            out.add_tuple("closure_expr_is_async", vec![id.into()]);
+        }
+        if self.is_const {
+            out.add_tuple("closure_expr_is_const", vec![id.into()]);
+        }
+        if self.is_gen {
+            out.add_tuple("closure_expr_is_gen", vec![id.into()]);
+        }
+        if self.is_move {
+            out.add_tuple("closure_expr_is_move", vec![id.into()]);
+        }
+        if self.is_static {
+            out.add_tuple("closure_expr_is_static", vec![id.into()]);
+        }
         if let Some(v) = self.param_list {
             out.add_tuple("closure_expr_param_lists", vec![id.into(), v.into()]);
         }
@@ -3943,6 +4003,7 @@ impl From<trap::Label<ConstArg>> for trap::Label<Locatable> {
 pub struct ConstBlockPat {
     pub id: trap::TrapId<ConstBlockPat>,
     pub block_expr: Option<trap::Label<BlockExpr>>,
+    pub is_const: bool,
 }
 
 impl trap::TrapEntry for ConstBlockPat {
@@ -3955,6 +4016,9 @@ impl trap::TrapEntry for ConstBlockPat {
         if let Some(v) = self.block_expr {
             out.add_tuple("const_block_pat_block_exprs", vec![id.into(), v.into()]);
         }
+        if self.is_const {
+            out.add_tuple("const_block_pat_is_const", vec![id.into()]);
+        }
     }
 }
 
@@ -4003,6 +4067,7 @@ pub struct ConstParam {
     pub id: trap::TrapId<ConstParam>,
     pub attrs: Vec<trap::Label<Attr>>,
     pub default_val: Option<trap::Label<ConstArg>>,
+    pub is_const: bool,
     pub name: Option<trap::Label<Name>>,
     pub ty: Option<trap::Label<TypeRef>>,
 }
@@ -4020,6 +4085,9 @@ impl trap::TrapEntry for ConstParam {
         if let Some(v) = self.default_val {
             out.add_tuple("const_param_default_vals", vec![id.into(), v.into()]);
         }
+        if self.is_const {
+            out.add_tuple("const_param_is_const", vec![id.into()]);
+        }
         if let Some(v) = self.name {
             out.add_tuple("const_param_names", vec![id.into(), v.into()]);
         }
@@ -4321,6 +4389,9 @@ impl From<trap::Label<FieldExpr>> for trap::Label<Locatable> {
 pub struct FnPtrType {
     pub id: trap::TrapId<FnPtrType>,
     pub abi: Option<trap::Label<Abi>>,
+    pub is_async: bool,
+    pub is_const: bool,
+    pub is_unsafe: bool,
     pub param_list: Option<trap::Label<ParamList>>,
     pub ret_type: Option<trap::Label<RetType>>,
 }
@@ -4335,6 +4406,15 @@ impl trap::TrapEntry for FnPtrType {
         if let Some(v) = self.abi {
             out.add_tuple("fn_ptr_type_abis", vec![id.into(), v.into()]);
         }
+        if self.is_async {
+            out.add_tuple("fn_ptr_type_is_async", vec![id.into()]);
+        }
+        if self.is_const {
+            out.add_tuple("fn_ptr_type_is_const", vec![id.into()]);
+        }
+        if self.is_unsafe {
+            out.add_tuple("fn_ptr_type_is_unsafe", vec![id.into()]);
+        }
         if let Some(v) = self.param_list {
             out.add_tuple("fn_ptr_type_param_lists", vec![id.into(), v.into()]);
         }
@@ -4593,6 +4673,8 @@ impl From<trap::Label<FormatArgsExpr>> for trap::Label<Locatable> {
 pub struct IdentPat {
     pub id: trap::TrapId<IdentPat>,
     pub attrs: Vec<trap::Label<Attr>>,
+    pub is_mut: bool,
+    pub is_ref: bool,
     pub name: Option<trap::Label<Name>>,
     pub pat: Option<trap::Label<Pat>>,
 }
@@ -4607,6 +4689,12 @@ impl trap::TrapEntry for IdentPat {
         for (i, v) in self.attrs.into_iter().enumerate() {
             out.add_tuple("ident_pat_attrs", vec![id.into(), i.into(), v.into()]);
         }
+        if self.is_mut {
+            out.add_tuple("ident_pat_is_mut", vec![id.into()]);
+        }
+        if self.is_ref {
+            out.add_tuple("ident_pat_is_ref", vec![id.into()]);
+        }
         if let Some(v) = self.name {
             out.add_tuple("ident_pat_names", vec![id.into(), v.into()]);
         }
@@ -6342,6 +6430,8 @@ impl From<trap::Label<PrefixExpr>> for trap::Label<Locatable> {
 #[derive(Debug)]
 pub struct PtrType {
     pub id: trap::TrapId<PtrType>,
+    pub is_const: bool,
+    pub is_mut: bool,
     pub ty: Option<trap::Label<TypeRef>>,
 }
 
@@ -6352,6 +6442,12 @@ impl trap::TrapEntry for PtrType {
 
     fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
         out.add_tuple("ptr_types", vec![id.into()]);
+        if self.is_const {
+            out.add_tuple("ptr_type_is_const", vec![id.into()]);
+        }
+        if self.is_mut {
+            out.add_tuple("ptr_type_is_mut", vec![id.into()]);
+        }
         if let Some(v) = self.ty {
             out.add_tuple("ptr_type_ties", vec![id.into(), v.into()]);
         }
@@ -6726,6 +6822,9 @@ pub struct RefExpr {
     pub id: trap::TrapId<RefExpr>,
     pub attrs: Vec<trap::Label<Attr>>,
     pub expr: Option<trap::Label<Expr>>,
+    pub is_const: bool,
+    pub is_mut: bool,
+    pub is_raw: bool,
 }
 
 impl trap::TrapEntry for RefExpr {
@@ -6741,6 +6840,15 @@ impl trap::TrapEntry for RefExpr {
         if let Some(v) = self.expr {
             out.add_tuple("ref_expr_exprs", vec![id.into(), v.into()]);
         }
+        if self.is_const {
+            out.add_tuple("ref_expr_is_const", vec![id.into()]);
+        }
+        if self.is_mut {
+            out.add_tuple("ref_expr_is_mut", vec![id.into()]);
+        }
+        if self.is_raw {
+            out.add_tuple("ref_expr_is_raw", vec![id.into()]);
+        }
     }
 }
 
@@ -6787,6 +6895,7 @@ impl From<trap::Label<RefExpr>> for trap::Label<Locatable> {
 #[derive(Debug)]
 pub struct RefPat {
     pub id: trap::TrapId<RefPat>,
+    pub is_mut: bool,
     pub pat: Option<trap::Label<Pat>>,
 }
 
@@ -6797,6 +6906,9 @@ impl trap::TrapEntry for RefPat {
 
     fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
         out.add_tuple("ref_pats", vec![id.into()]);
+        if self.is_mut {
+            out.add_tuple("ref_pat_is_mut", vec![id.into()]);
+        }
         if let Some(v) = self.pat {
             out.add_tuple("ref_pat_pats", vec![id.into(), v.into()]);
         }
@@ -6846,6 +6958,7 @@ impl From<trap::Label<RefPat>> for trap::Label<Pat> {
 #[derive(Debug)]
 pub struct RefType {
     pub id: trap::TrapId<RefType>,
+    pub is_mut: bool,
     pub lifetime: Option<trap::Label<Lifetime>>,
     pub ty: Option<trap::Label<TypeRef>>,
 }
@@ -6857,6 +6970,9 @@ impl trap::TrapEntry for RefType {
 
     fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
         out.add_tuple("ref_types", vec![id.into()]);
+        if self.is_mut {
+            out.add_tuple("ref_type_is_mut", vec![id.into()]);
+        }
         if let Some(v) = self.lifetime {
             out.add_tuple("ref_type_lifetimes", vec![id.into(), v.into()]);
         }
@@ -7958,6 +8074,8 @@ pub struct Const {
     pub id: trap::TrapId<Const>,
     pub attrs: Vec<trap::Label<Attr>>,
     pub body: Option<trap::Label<Expr>>,
+    pub is_const: bool,
+    pub is_default: bool,
     pub name: Option<trap::Label<Name>>,
     pub ty: Option<trap::Label<TypeRef>>,
     pub visibility: Option<trap::Label<Visibility>>,
@@ -7976,6 +8094,12 @@ impl trap::TrapEntry for Const {
         if let Some(v) = self.body {
             out.add_tuple("const_bodies", vec![id.into(), v.into()]);
         }
+        if self.is_const {
+            out.add_tuple("const_is_const", vec![id.into()]);
+        }
+        if self.is_default {
+            out.add_tuple("const_is_default", vec![id.into()]);
+        }
         if let Some(v) = self.name {
             out.add_tuple("const_names", vec![id.into(), v.into()]);
         }
@@ -8140,6 +8264,7 @@ pub struct ExternBlock {
     pub abi: Option<trap::Label<Abi>>,
     pub attrs: Vec<trap::Label<Attr>>,
     pub extern_item_list: Option<trap::Label<ExternItemList>>,
+    pub is_unsafe: bool,
 }
 
 impl trap::TrapEntry for ExternBlock {
@@ -8158,6 +8283,9 @@ impl trap::TrapEntry for ExternBlock {
         if let Some(v) = self.extern_item_list {
             out.add_tuple("extern_block_extern_item_lists", vec![id.into(), v.into()]);
         }
+        if self.is_unsafe {
+            out.add_tuple("extern_block_is_unsafe", vec![id.into()]);
+        }
     }
 }
 
@@ -8297,6 +8425,11 @@ pub struct Function {
     pub attrs: Vec<trap::Label<Attr>>,
     pub body: Option<trap::Label<BlockExpr>>,
     pub generic_param_list: Option<trap::Label<GenericParamList>>,
+    pub is_async: bool,
+    pub is_const: bool,
+    pub is_default: bool,
+    pub is_gen: bool,
+    pub is_unsafe: bool,
     pub name: Option<trap::Label<Name>>,
     pub param_list: Option<trap::Label<ParamList>>,
     pub ret_type: Option<trap::Label<RetType>>,
@@ -8323,6 +8456,21 @@ impl trap::TrapEntry for Function {
         if let Some(v) = self.generic_param_list {
             out.add_tuple("function_generic_param_lists", vec![id.into(), v.into()]);
         }
+        if self.is_async {
+            out.add_tuple("function_is_async", vec![id.into()]);
+        }
+        if self.is_const {
+            out.add_tuple("function_is_const", vec![id.into()]);
+        }
+        if self.is_default {
+            out.add_tuple("function_is_default", vec![id.into()]);
+        }
+        if self.is_gen {
+            out.add_tuple("function_is_gen", vec![id.into()]);
+        }
+        if self.is_unsafe {
+            out.add_tuple("function_is_unsafe", vec![id.into()]);
+        }
         if let Some(v) = self.name {
             out.add_tuple("function_names", vec![id.into(), v.into()]);
         }
@@ -8414,6 +8562,9 @@ pub struct Impl {
     pub assoc_item_list: Option<trap::Label<AssocItemList>>,
     pub attrs: Vec<trap::Label<Attr>>,
     pub generic_param_list: Option<trap::Label<GenericParamList>>,
+    pub is_const: bool,
+    pub is_default: bool,
+    pub is_unsafe: bool,
     pub self_ty: Option<trap::Label<TypeRef>>,
     pub trait_: Option<trap::Label<TypeRef>>,
     pub visibility: Option<trap::Label<Visibility>>,
@@ -8436,6 +8587,15 @@ impl trap::TrapEntry for Impl {
         if let Some(v) = self.generic_param_list {
             out.add_tuple("impl_generic_param_lists", vec![id.into(), v.into()]);
         }
+        if self.is_const {
+            out.add_tuple("impl_is_const", vec![id.into()]);
+        }
+        if self.is_default {
+            out.add_tuple("impl_is_default", vec![id.into()]);
+        }
+        if self.is_unsafe {
+            out.add_tuple("impl_is_unsafe", vec![id.into()]);
+        }
         if let Some(v) = self.self_ty {
             out.add_tuple("impl_self_ties", vec![id.into(), v.into()]);
         }
@@ -8843,6 +9003,8 @@ pub struct Static {
     pub id: trap::TrapId<Static>,
     pub attrs: Vec<trap::Label<Attr>>,
     pub body: Option<trap::Label<Expr>>,
+    pub is_mut: bool,
+    pub is_static: bool,
     pub name: Option<trap::Label<Name>>,
     pub ty: Option<trap::Label<TypeRef>>,
     pub visibility: Option<trap::Label<Visibility>>,
@@ -8861,6 +9023,12 @@ impl trap::TrapEntry for Static {
         if let Some(v) = self.body {
             out.add_tuple("static_bodies", vec![id.into(), v.into()]);
         }
+        if self.is_mut {
+            out.add_tuple("static_is_mut", vec![id.into()]);
+        }
+        if self.is_static {
+            out.add_tuple("static_is_static", vec![id.into()]);
+        }
         if let Some(v) = self.name {
             out.add_tuple("static_names", vec![id.into(), v.into()]);
         }
@@ -9025,6 +9193,8 @@ pub struct Trait {
     pub assoc_item_list: Option<trap::Label<AssocItemList>>,
     pub attrs: Vec<trap::Label<Attr>>,
     pub generic_param_list: Option<trap::Label<GenericParamList>>,
+    pub is_auto: bool,
+    pub is_unsafe: bool,
     pub name: Option<trap::Label<Name>>,
     pub type_bound_list: Option<trap::Label<TypeBoundList>>,
     pub visibility: Option<trap::Label<Visibility>>,
@@ -9047,6 +9217,12 @@ impl trap::TrapEntry for Trait {
         if let Some(v) = self.generic_param_list {
             out.add_tuple("trait_generic_param_lists", vec![id.into(), v.into()]);
         }
+        if self.is_auto {
+            out.add_tuple("trait_is_auto", vec![id.into()]);
+        }
+        if self.is_unsafe {
+            out.add_tuple("trait_is_unsafe", vec![id.into()]);
+        }
         if let Some(v) = self.name {
             out.add_tuple("trait_names", vec![id.into(), v.into()]);
         }
@@ -9204,6 +9380,7 @@ pub struct TypeAlias {
     pub id: trap::TrapId<TypeAlias>,
     pub attrs: Vec<trap::Label<Attr>>,
     pub generic_param_list: Option<trap::Label<GenericParamList>>,
+    pub is_default: bool,
     pub name: Option<trap::Label<Name>>,
     pub ty: Option<trap::Label<TypeRef>>,
     pub type_bound_list: Option<trap::Label<TypeBoundList>>,
@@ -9224,6 +9401,9 @@ impl trap::TrapEntry for TypeAlias {
         if let Some(v) = self.generic_param_list {
             out.add_tuple("type_alias_generic_param_lists", vec![id.into(), v.into()]);
         }
+        if self.is_default {
+            out.add_tuple("type_alias_is_default", vec![id.into()]);
+        }
         if let Some(v) = self.name {
             out.add_tuple("type_alias_names", vec![id.into(), v.into()]);
         }
diff --git a/rust/extractor/src/translate/generated.rs b/rust/extractor/src/translate/generated.rs
index 57d3cbc186b9..55b2dc3e7897 100644
--- a/rust/extractor/src/translate/generated.rs
+++ b/rust/extractor/src/translate/generated.rs
@@ -327,11 +327,23 @@ impl Translator {
 
     pub(crate) fn emit_block_expr(&mut self, node: ast::BlockExpr) -> Label<generated::BlockExpr> {
         let attrs = node.attrs().map(|x| self.emit_attr(x)).collect();
+        let is_async = node.async_token().is_some();
+        let is_const = node.const_token().is_some();
+        let is_gen = node.gen_token().is_some();
+        let is_move = node.move_token().is_some();
+        let is_try = node.try_token().is_some();
+        let is_unsafe = node.unsafe_token().is_some();
         let label = node.label().map(|x| self.emit_label(x));
         let stmt_list = node.stmt_list().map(|x| self.emit_stmt_list(x));
         let label = self.trap.emit(generated::BlockExpr {
             id: TrapId::Star,
             attrs,
+            is_async,
+            is_const,
+            is_gen,
+            is_move,
+            is_try,
+            is_unsafe,
             label,
             stmt_list,
         });
@@ -411,6 +423,11 @@ impl Translator {
         let attrs = node.attrs().map(|x| self.emit_attr(x)).collect();
         let body = node.body().map(|x| self.emit_expr(x));
         let closure_binder = node.closure_binder().map(|x| self.emit_closure_binder(x));
+        let is_async = node.async_token().is_some();
+        let is_const = node.const_token().is_some();
+        let is_gen = node.gen_token().is_some();
+        let is_move = node.move_token().is_some();
+        let is_static = node.static_token().is_some();
         let param_list = node.param_list().map(|x| self.emit_param_list(x));
         let ret_type = node.ret_type().map(|x| self.emit_ret_type(x));
         let label = self.trap.emit(generated::ClosureExpr {
@@ -418,6 +435,11 @@ impl Translator {
             attrs,
             body,
             closure_binder,
+            is_async,
+            is_const,
+            is_gen,
+            is_move,
+            is_static,
             param_list,
             ret_type,
         });
@@ -429,6 +451,8 @@ impl Translator {
     pub(crate) fn emit_const(&mut self, node: ast::Const) -> Label<generated::Const> {
         let attrs = node.attrs().map(|x| self.emit_attr(x)).collect();
         let body = node.body().map(|x| self.emit_expr(x));
+        let is_const = node.const_token().is_some();
+        let is_default = node.default_token().is_some();
         let name = node.name().map(|x| self.emit_name(x));
         let ty = node.ty().map(|x| self.emit_type(x));
         let visibility = node.visibility().map(|x| self.emit_visibility(x));
@@ -436,6 +460,8 @@ impl Translator {
             id: TrapId::Star,
             attrs,
             body,
+            is_const,
+            is_default,
             name,
             ty,
             visibility,
@@ -458,9 +484,11 @@ impl Translator {
 
     pub(crate) fn emit_const_block_pat(&mut self, node: ast::ConstBlockPat) -> Label<generated::ConstBlockPat> {
         let block_expr = node.block_expr().map(|x| self.emit_block_expr(x));
+        let is_const = node.const_token().is_some();
         let label = self.trap.emit(generated::ConstBlockPat {
             id: TrapId::Star,
             block_expr,
+            is_const,
         });
         self.emit_location(label, &node);
         self.emit_tokens(label.into(), node.syntax().children_with_tokens());
@@ -470,12 +498,14 @@ impl Translator {
     pub(crate) fn emit_const_param(&mut self, node: ast::ConstParam) -> Label<generated::ConstParam> {
         let attrs = node.attrs().map(|x| self.emit_attr(x)).collect();
         let default_val = node.default_val().map(|x| self.emit_const_arg(x));
+        let is_const = node.const_token().is_some();
         let name = node.name().map(|x| self.emit_name(x));
         let ty = node.ty().map(|x| self.emit_type(x));
         let label = self.trap.emit(generated::ConstParam {
             id: TrapId::Star,
             attrs,
             default_val,
+            is_const,
             name,
             ty,
         });
@@ -544,11 +574,13 @@ impl Translator {
         let abi = node.abi().map(|x| self.emit_abi(x));
         let attrs = node.attrs().map(|x| self.emit_attr(x)).collect();
         let extern_item_list = node.extern_item_list().map(|x| self.emit_extern_item_list(x));
+        let is_unsafe = node.unsafe_token().is_some();
         let label = self.trap.emit(generated::ExternBlock {
             id: TrapId::Star,
             abi,
             attrs,
             extern_item_list,
+            is_unsafe,
         });
         self.emit_location(label, &node);
         self.emit_tokens(label.into(), node.syntax().children_with_tokens());
@@ -605,6 +637,11 @@ impl Translator {
         let attrs = node.attrs().map(|x| self.emit_attr(x)).collect();
         let body = node.body().map(|x| self.emit_block_expr(x));
         let generic_param_list = node.generic_param_list().map(|x| self.emit_generic_param_list(x));
+        let is_async = node.async_token().is_some();
+        let is_const = node.const_token().is_some();
+        let is_default = node.default_token().is_some();
+        let is_gen = node.gen_token().is_some();
+        let is_unsafe = node.unsafe_token().is_some();
         let name = node.name().map(|x| self.emit_name(x));
         let param_list = node.param_list().map(|x| self.emit_param_list(x));
         let ret_type = node.ret_type().map(|x| self.emit_ret_type(x));
@@ -616,6 +653,11 @@ impl Translator {
             attrs,
             body,
             generic_param_list,
+            is_async,
+            is_const,
+            is_default,
+            is_gen,
+            is_unsafe,
             name,
             param_list,
             ret_type,
@@ -629,11 +671,17 @@ impl Translator {
 
     pub(crate) fn emit_fn_ptr_type(&mut self, node: ast::FnPtrType) -> Label<generated::FnPtrType> {
         let abi = node.abi().map(|x| self.emit_abi(x));
+        let is_async = node.async_token().is_some();
+        let is_const = node.const_token().is_some();
+        let is_unsafe = node.unsafe_token().is_some();
         let param_list = node.param_list().map(|x| self.emit_param_list(x));
         let ret_type = node.ret_type().map(|x| self.emit_ret_type(x));
         let label = self.trap.emit(generated::FnPtrType {
             id: TrapId::Star,
             abi,
+            is_async,
+            is_const,
+            is_unsafe,
             param_list,
             ret_type,
         });
@@ -726,11 +774,15 @@ impl Translator {
 
     pub(crate) fn emit_ident_pat(&mut self, node: ast::IdentPat) -> Label<generated::IdentPat> {
         let attrs = node.attrs().map(|x| self.emit_attr(x)).collect();
+        let is_mut = node.mut_token().is_some();
+        let is_ref = node.ref_token().is_some();
         let name = node.name().map(|x| self.emit_name(x));
         let pat = node.pat().map(|x| self.emit_pat(x));
         let label = self.trap.emit(generated::IdentPat {
             id: TrapId::Star,
             attrs,
+            is_mut,
+            is_ref,
             name,
             pat,
         });
@@ -760,6 +812,9 @@ impl Translator {
         let assoc_item_list = node.assoc_item_list().map(|x| self.emit_assoc_item_list(x));
         let attrs = node.attrs().map(|x| self.emit_attr(x)).collect();
         let generic_param_list = node.generic_param_list().map(|x| self.emit_generic_param_list(x));
+        let is_const = node.const_token().is_some();
+        let is_default = node.default_token().is_some();
+        let is_unsafe = node.unsafe_token().is_some();
         let self_ty = node.self_ty().map(|x| self.emit_type(x));
         let trait_ = node.trait_().map(|x| self.emit_type(x));
         let visibility = node.visibility().map(|x| self.emit_visibility(x));
@@ -769,6 +824,9 @@ impl Translator {
             assoc_item_list,
             attrs,
             generic_param_list,
+            is_const,
+            is_default,
+            is_unsafe,
             self_ty,
             trait_,
             visibility,
@@ -1101,11 +1159,13 @@ impl Translator {
 
     pub(crate) fn emit_meta(&mut self, node: ast::Meta) -> Label<generated::Meta> {
         let expr = node.expr().map(|x| self.emit_expr(x));
+        let is_unsafe = node.unsafe_token().is_some();
         let path = node.path().map(|x| self.emit_path(x));
         let token_tree = node.token_tree().map(|x| self.emit_token_tree(x));
         let label = self.trap.emit(generated::Meta {
             id: TrapId::Star,
             expr,
+            is_unsafe,
             path,
             token_tree,
         });
@@ -1357,9 +1417,13 @@ impl Translator {
     }
 
     pub(crate) fn emit_ptr_type(&mut self, node: ast::PtrType) -> Label<generated::PtrType> {
+        let is_const = node.const_token().is_some();
+        let is_mut = node.mut_token().is_some();
         let ty = node.ty().map(|x| self.emit_type(x));
         let label = self.trap.emit(generated::PtrType {
             id: TrapId::Star,
+            is_const,
+            is_mut,
             ty,
         });
         self.emit_location(label, &node);
@@ -1514,10 +1578,16 @@ impl Translator {
     pub(crate) fn emit_ref_expr(&mut self, node: ast::RefExpr) -> Label<generated::RefExpr> {
         let attrs = node.attrs().map(|x| self.emit_attr(x)).collect();
         let expr = node.expr().map(|x| self.emit_expr(x));
+        let is_const = node.const_token().is_some();
+        let is_mut = node.mut_token().is_some();
+        let is_raw = node.raw_token().is_some();
         let label = self.trap.emit(generated::RefExpr {
             id: TrapId::Star,
             attrs,
             expr,
+            is_const,
+            is_mut,
+            is_raw,
         });
         self.emit_location(label, &node);
         self.emit_tokens(label.into(), node.syntax().children_with_tokens());
@@ -1525,9 +1595,11 @@ impl Translator {
     }
 
     pub(crate) fn emit_ref_pat(&mut self, node: ast::RefPat) -> Label<generated::RefPat> {
+        let is_mut = node.mut_token().is_some();
         let pat = node.pat().map(|x| self.emit_pat(x));
         let label = self.trap.emit(generated::RefPat {
             id: TrapId::Star,
+            is_mut,
             pat,
         });
         self.emit_location(label, &node);
@@ -1536,10 +1608,12 @@ impl Translator {
     }
 
     pub(crate) fn emit_ref_type(&mut self, node: ast::RefType) -> Label<generated::RefType> {
+        let is_mut = node.mut_token().is_some();
         let lifetime = node.lifetime().map(|x| self.emit_lifetime(x));
         let ty = node.ty().map(|x| self.emit_type(x));
         let label = self.trap.emit(generated::RefType {
             id: TrapId::Star,
+            is_mut,
             lifetime,
             ty,
         });
@@ -1605,12 +1679,14 @@ impl Translator {
 
     pub(crate) fn emit_self_param(&mut self, node: ast::SelfParam) -> Label<generated::SelfParam> {
         let attrs = node.attrs().map(|x| self.emit_attr(x)).collect();
+        let is_mut = node.mut_token().is_some();
         let lifetime = node.lifetime().map(|x| self.emit_lifetime(x));
         let name = node.name().map(|x| self.emit_name(x));
         let ty = node.ty().map(|x| self.emit_type(x));
         let label = self.trap.emit(generated::SelfParam {
             id: TrapId::Star,
             attrs,
+            is_mut,
             lifetime,
             name,
             ty,
@@ -1658,6 +1734,8 @@ impl Translator {
     pub(crate) fn emit_static(&mut self, node: ast::Static) -> Label<generated::Static> {
         let attrs = node.attrs().map(|x| self.emit_attr(x)).collect();
         let body = node.body().map(|x| self.emit_expr(x));
+        let is_mut = node.mut_token().is_some();
+        let is_static = node.static_token().is_some();
         let name = node.name().map(|x| self.emit_name(x));
         let ty = node.ty().map(|x| self.emit_type(x));
         let visibility = node.visibility().map(|x| self.emit_visibility(x));
@@ -1665,6 +1743,8 @@ impl Translator {
             id: TrapId::Star,
             attrs,
             body,
+            is_mut,
+            is_static,
             name,
             ty,
             visibility,
@@ -1723,6 +1803,8 @@ impl Translator {
         let assoc_item_list = node.assoc_item_list().map(|x| self.emit_assoc_item_list(x));
         let attrs = node.attrs().map(|x| self.emit_attr(x)).collect();
         let generic_param_list = node.generic_param_list().map(|x| self.emit_generic_param_list(x));
+        let is_auto = node.auto_token().is_some();
+        let is_unsafe = node.unsafe_token().is_some();
         let name = node.name().map(|x| self.emit_name(x));
         let type_bound_list = node.type_bound_list().map(|x| self.emit_type_bound_list(x));
         let visibility = node.visibility().map(|x| self.emit_visibility(x));
@@ -1732,6 +1814,8 @@ impl Translator {
             assoc_item_list,
             attrs,
             generic_param_list,
+            is_auto,
+            is_unsafe,
             name,
             type_bound_list,
             visibility,
@@ -1853,6 +1937,7 @@ impl Translator {
     pub(crate) fn emit_type_alias(&mut self, node: ast::TypeAlias) -> Label<generated::TypeAlias> {
         let attrs = node.attrs().map(|x| self.emit_attr(x)).collect();
         let generic_param_list = node.generic_param_list().map(|x| self.emit_generic_param_list(x));
+        let is_default = node.default_token().is_some();
         let name = node.name().map(|x| self.emit_name(x));
         let ty = node.ty().map(|x| self.emit_type(x));
         let type_bound_list = node.type_bound_list().map(|x| self.emit_type_bound_list(x));
@@ -1862,6 +1947,7 @@ impl Translator {
             id: TrapId::Star,
             attrs,
             generic_param_list,
+            is_default,
             name,
             ty,
             type_bound_list,
@@ -1886,11 +1972,15 @@ impl Translator {
 
     pub(crate) fn emit_type_bound(&mut self, node: ast::TypeBound) -> Label<generated::TypeBound> {
         let generic_param_list = node.generic_param_list().map(|x| self.emit_generic_param_list(x));
+        let is_async = node.async_token().is_some();
+        let is_const = node.const_token().is_some();
         let lifetime = node.lifetime().map(|x| self.emit_lifetime(x));
         let ty = node.ty().map(|x| self.emit_type(x));
         let label = self.trap.emit(generated::TypeBound {
             id: TrapId::Star,
             generic_param_list,
+            is_async,
+            is_const,
             lifetime,
             ty,
         });
diff --git a/rust/ql/.generated.list b/rust/ql/.generated.list
index e37f6947148d..9e49fc3893e4 100644
--- a/rust/ql/.generated.list
+++ b/rust/ql/.generated.list
@@ -456,43 +456,43 @@ lib/codeql/rust/elements/internal/generated/Attr.qll 2e7983b2c462750065ed58cc10c
 lib/codeql/rust/elements/internal/generated/AwaitExpr.qll 1d71af702a1f397fb231fae3e0642b3deeba0cd5a43c1d8fabdff29cac979340 e0bfa007bdecc5a09a266d449d723ae35f5a24fbdfc11e4e48aeea3ec0c5147c
 lib/codeql/rust/elements/internal/generated/BecomeExpr.qll 7a211b785a4a2f961242d1d73fd031d381aad809f7b600ce7f7f864518bb7242 17a0388680007871748cfdc6621f700a7c2817b9601e1bd817fb48561e7c63ad
 lib/codeql/rust/elements/internal/generated/BinaryExpr.qll 64e9bd9c571edd6e5f3e7662b956b1d87fa0354ce6fe95da9caf25ac16b66c68 3fca09fdbe879db2ca3293618896a462e96376a2963d15cce3d5b1baac552fcb
-lib/codeql/rust/elements/internal/generated/BlockExpr.qll 6fc90a80e60f017bf3418e45bcc35b5ddac59b51037c21aed3955d47c147ce4a 1f3f8e5107b0c6de381b7c94aab93dc5fd758a845c6ff9554888df453f1315d0
+lib/codeql/rust/elements/internal/generated/BlockExpr.qll ccfbdc7bd268735a0424ff08dcf37d0e1fed61d5fe0520593c23f2490d400438 0facad59f6aba13ee0c069b691c99f52c04b723a2bfad4da226190c3c42dcabf
 lib/codeql/rust/elements/internal/generated/BoxPat.qll ec946a3e671ab7417e04b0207967adad004df512c570c4f0780ca5816d12d75f b0e64860855c4e85914042b1a51034899ff7cd1b2c6857188de89310a2726ea3
 lib/codeql/rust/elements/internal/generated/BreakExpr.qll 0f428a8b2f4209b134c2ffc3e1c93c30bc6b0e9c9172f140cefa88c1f77d8690 957b39f38ff6befe9061f55bc0b403c2f1c366dd0cf63b874bae6f8216576d76
 lib/codeql/rust/elements/internal/generated/CallExpr.qll c2700dbd9c33dcc14de10dc72ff49abafdf0952257864d4435cf8ac46849a2ee 7932f725f97ffbe1b050c2622a61a0d56f18c9264a3293466cba9915313495b5
 lib/codeql/rust/elements/internal/generated/CastExpr.qll d6fbf02e9e202254666082a9116634d0eb933177866ac4c0a57b5e9c4bb4b383 477f67773492e3b82695461d56327c9db05a7d1a67e8d192406265f2ce369670
 lib/codeql/rust/elements/internal/generated/ClosureBinder.qll 94c0dcdd4cd87d115659d496c88a98354bc7d4ddc0fa27028003bf7688b99987 d59d713b426dbbdb775df9092d176eea031dac1f14e468810f2fc8591399cd19
-lib/codeql/rust/elements/internal/generated/ClosureExpr.qll f9047451cb8b53f8b77e1c01f7ef485d5b5a92999e0591c6702062050052fa2f 2252be8b3022c587a8c6ad93b64d856263be7bfe2938c1d063e7cad845dd38e2
+lib/codeql/rust/elements/internal/generated/ClosureExpr.qll a10596deeb7b9799f0c0d9e9dfe43f5ff58ba03a9a444d581a240a99ca06a949 e94c2f6cd0190d108d0b91340227d45fb6b8c8c2c6a0476358fe75ea7f7a7760
 lib/codeql/rust/elements/internal/generated/Comment.qll cd1ef861e3803618f9f78a4ac00516d50ecfecdca1c1d14304dc5327cbe07a3b 8b67345aeb15beb5895212228761ea3496297846c93fd2127b417406ae87c201
-lib/codeql/rust/elements/internal/generated/Const.qll 0dbea9732880a4583166714d077276ec2b5665fa9772ea4284ee7b3f3d567923 38efc474b76f0b13695e9d9b39d016200c251fd9db48d4a1ab27dcb38946ca72
+lib/codeql/rust/elements/internal/generated/Const.qll 40464df9d8baacbc85bd137c7d1661684c957c407b2363ea60d90946be93de4c a3316beae55f570a5ca4b1172ef8267d7acb1104cc7a5e9efc58d9fc8224500f
 lib/codeql/rust/elements/internal/generated/ConstArg.qll e2451cac6ee464f5b64883d60d534996fcff061a520517ac792116238a11e185 1dd6d4b073b0970448a52bbe2468cd160dfe108971dbf9ae9305900bd22ef146
-lib/codeql/rust/elements/internal/generated/ConstBlockPat.qll e90cf24d7f995595111f2b48bd3775d064bc968c24074c122141aa0f058dcb83 a44f6e14da8cc760a0aae947c20ec47fff488da1e9a8dfab58b7dbc42c296fec
-lib/codeql/rust/elements/internal/generated/ConstParam.qll cc34626ea28b8bf4dbf2c2dd312b778e43a9725722039a8ba393ddd7267a951a e3c2983a794b4d623191db97616c3167b80aa847317685960919e03aac0d044b
+lib/codeql/rust/elements/internal/generated/ConstBlockPat.qll a425a7fd216d35f17a7ff239d431b349721f71f2e52722325755f43df2bb9886 a9aa37ee4f8c9d44ae49c807ac48d5a8a22f7d7d0ae2968ab50371a418ccc48a
+lib/codeql/rust/elements/internal/generated/ConstParam.qll 26f838dbbd7659cdbf464c2107304b66ad0fbd43370d6b649373c3b9fa4f6576 c658951ba92b919278fa445cd66c3b694f42d76bde49daa50a3128e5d44f647a
 lib/codeql/rust/elements/internal/generated/ContinueExpr.qll e2010feb14fb6edeb83a991d9357e50edb770172ddfde2e8670b0d3e68169f28 48d09d661e1443002f6d22b8710e22c9c36d9daa9cde09c6366a61e960d717cb
 lib/codeql/rust/elements/internal/generated/DynTraitType.qll da9dce6347ce385d7468986cf6960b4a6787f017ff5632612a7216ed62bdc9c9 9d0b37221674b597a21bfacbdfc7e08b54381a6adacfe544df154481cd562ed8
 lib/codeql/rust/elements/internal/generated/Element.qll fb483b636180c699181c8aff83bc471b2c416206694f7028c671015918547663 542d1b9ae80c997974c94db3655887186df3921a8fa3f565eaf292dcfdac3c4c
 lib/codeql/rust/elements/internal/generated/Enum.qll 4f4cbc9cd758c20d476bc767b916c62ba434d1750067d0ffb63e0821bb95ec86 3da735d54022add50cec0217bbf8ec4cf29b47f4851ee327628bcdd6454989d0
 lib/codeql/rust/elements/internal/generated/Expr.qll 5fa34f2ed21829a1509417440dae42d416234ff43433002974328e7aabb8f30f 46f3972c7413b7db28a3ea8acb5a50a74b6dd9b658e8725f6953a8829ac912f8
 lib/codeql/rust/elements/internal/generated/ExprStmt.qll d1112230015fbeb216b43407a268dc2ccd0f9e0836ab2dca4800c51b38fa1d7d 4a80562dcc55efa5e72c6c3b1d6747ab44fe494e76faff2b8f6e9f10a4b08b5b
-lib/codeql/rust/elements/internal/generated/ExternBlock.qll a8ba7dec266603ef1e3908f923a497bd1e206ec729cfd4ad397ef4502fddc745 cc20b5a47466dab52a8d57c1b3c99b09c01420967670c2e75d3f90302ced2dbb
+lib/codeql/rust/elements/internal/generated/ExternBlock.qll c292d804a1f8d2cf6a443be701640c4e87410662921e026d3553bc624fd18abd ba6fae821d2502a97dec636e2d70476ad0693bc6185ae50e8391699529bd0ee0
 lib/codeql/rust/elements/internal/generated/ExternCrate.qll 35fea4e810a896c1656adb4682c4c3bc20283768073e26ae064189ce310433c8 fc504dff79ba758d89b10cd5049539fbc766ee9862ff495066cea26abf0b5e0b
 lib/codeql/rust/elements/internal/generated/ExternItem.qll 749b064ad60f32197d5b85e25929afe18e56e12f567b73e21e43e2fdf4c447e3 e2c2d423876675cf2dae399ca442aef7b2860319da9bfadeff29f2c6946f8de7
 lib/codeql/rust/elements/internal/generated/ExternItemList.qll 6bc97fdae6c411cab5c501129c1d6c2321c1011cccb119515d75d07dc55c253b 6b5aa808025c0a4270cac540c07ba6faede1b3c70b8db5fd89ec5d46df9041b2
 lib/codeql/rust/elements/internal/generated/FieldExpr.qll 3e506b5cb93793ec30f56bb637a600db869fcba6181b068516a671d55c362739 7bbf953696d763ad6b210f378f487ba85b875fa115b22c0c0508599a63633502
 lib/codeql/rust/elements/internal/generated/FieldList.qll 43c13c6e3c9ba75a7a4cb870fc4f18752001584d48b9df0734055a6ebb789331 7c51b0b13eb02f1286d3365e53a976ba2655c4dbd8e735bc11c8b205c829e1ee
-lib/codeql/rust/elements/internal/generated/FnPtrType.qll e8e2f159983fb0d9ccc30d62d0e8b679a06c066076eb8f4ca36f3bf12be406fe bc8f2efdf4645a63b9eafbec2f8e5d1008e1decb67f29bdf1eed4c3e2a89c64a
+lib/codeql/rust/elements/internal/generated/FnPtrType.qll 748d766dbefd19a7d644734c57885eeede66897029bbfe1b87919517f43bfde2 5a7d80acc00e56594ed85026a8ea4923104d2e98c2e42db8c5bcd32ddd164e48
 lib/codeql/rust/elements/internal/generated/ForExpr.qll 541b62b48911d4999f9ed64ab6c8b9910073ac4add0225761f319677328cf120 976c3a91c9eedfb1e2d9ea76ac501348643b3d23c723d7a777042258d416d091
 lib/codeql/rust/elements/internal/generated/ForType.qll 3d43d044a1189281f09c55caafb6c8020a836f49e2866077086101925a573cf2 646b59bfd1b428aaf7211f574c49f79cb4c6a79ca151aa0663b2b31480298721
 lib/codeql/rust/elements/internal/generated/FormatArgsArg.qll e07a1ae310f590003f1b88fada7dcf4847c99adb9d4c838d1c88e66e1da85c5f 0ef7342451fe2cb06e765fb4b33bb8c4a9b927f5edbc8feb5c6ba3655697f447
 lib/codeql/rust/elements/internal/generated/FormatArgsExpr.qll 40d6daa7d2bafb33798a21d79774dc802cfbd7a31618ac3bd0149399ea2bf893 d1172e2151791228559004792e125fc4625f6a26ffad25f29efb0ad263bf8795
-lib/codeql/rust/elements/internal/generated/Function.qll b239af1a8874802b8a311706c53d56e3ceaad7ed23a7f97d1694bf961b63768b 4bc3c23685fa05820222e472ab1cdb40a271f862727d3bd878d47de9c2e3f485
+lib/codeql/rust/elements/internal/generated/Function.qll c8826307fcb18daf8c59552a5c629a0e59e83e7f676b4a30408a042ecc216a46 ae27a8a709c187ffd6fa7e25e7850555d1be6633d6ee304457a4481135402dcb
 lib/codeql/rust/elements/internal/generated/GenericArg.qll 464da0ba1c5ddcd1be68617167f177773d99b5ac4775ec8ea24d503e789a9099 6faa1033d59baf7c210ac4837a55781cfc054b7acbad8027faf4630dbfa6e101
 lib/codeql/rust/elements/internal/generated/GenericArgList.qll b8cd936bba6f28344e28c98acf38acb8ef43af6ecf8367d79ed487e5b9da17cb 8b14331261e49d004807285b02fca190aafd62bfb9378b05c7d9c1e95525fe7b
 lib/codeql/rust/elements/internal/generated/GenericParam.qll a0285123f974f287154b706bf6688b86edf72a4adcec57346c654d962435651b b42c3915e9564b5b5c5282229bf882aa3309de26a77721b2255d6f4235c0cc38
 lib/codeql/rust/elements/internal/generated/GenericParamList.qll f2d8945bc70cda6929bb6b652f9e3c7707e73fb5e778b21e99dbac594e71285f 7b97da5b6a6504377456bedebddc293d714f90e8fc2ce64199656666d5f749af
-lib/codeql/rust/elements/internal/generated/IdentPat.qll 557b2b1fe9e719ac6658c06c162f03d5925d848d7fdc4364da850e588a3ca9df 5517fde679c47c0604a0d177c53bed64f83e33e14d1b64f45e3467e3a8be77fb
+lib/codeql/rust/elements/internal/generated/IdentPat.qll a1269182132b2f52c5d842e58cbfa1cee49b143fa3766ed9fcf65389bf5137eb 46009fa66065222d865fa4714dd16c0373ffb16d576da45e7bf3a06432bd3a23
 lib/codeql/rust/elements/internal/generated/IfExpr.qll 413dd7a20c6b98c0d2ad2e5b50981c14bf96c1a719ace3e341d78926219a5af7 c9a2d44e3baa6a265a29a683ca3c1683352457987c92f599c5771b4f3b4bafff
-lib/codeql/rust/elements/internal/generated/Impl.qll 31fdd707dd8dcec845758b19eddcd4eb5bbd44ddccac83191cebe0c402834a66 ef06985099dee900a9403898f45349619ed138d23fee185137ed0baf679fe7cc
+lib/codeql/rust/elements/internal/generated/Impl.qll e33ef5d3e49e64beca0ca9d5c0ba972d99007e5011eeedc11e67d3fbb569ab4a 5c5d88110864f4fd3d966b1ad973eaabd7a9c5a07adc18bff01dc09395214825
 lib/codeql/rust/elements/internal/generated/ImplTraitType.qll 3c29684f5ef386b883b79dc9758441d97f090e065be177ffc8240aaf0f3d1e7b 03ea42c2a95cf917ec73d88b7b4ca5e53e10d7b046074f59100c0ec6c2c1ed6d
 lib/codeql/rust/elements/internal/generated/IndexExpr.qll cf951fc40f6690e966b4dc78fa9a6221aa5c6cade44759dcb52254f799292d11 1572e71918cc4e0b7e028331b6d98c9db23100a3646cd3874d1915e06ab6211d
 lib/codeql/rust/elements/internal/generated/InferType.qll 23ee25135c59ea5578cdf7c34a41f606e217e7260c3c8f404d12836585d5cad4 400da322fa1be62c4e300ebdf481eb92d4226eb6c316c668da8cc5168065774f
@@ -519,7 +519,7 @@ lib/codeql/rust/elements/internal/generated/MatchArm.qll 8fb740a0f2e308782d9cf39
 lib/codeql/rust/elements/internal/generated/MatchArmList.qll 13362680c037fe83fef4653562cc10a4429078316b5ec7c47b076336cf4aca2e 41c674293c13eceaca62134ae0c6778541f6a5201cbc5c146f0ba01b898dc267
 lib/codeql/rust/elements/internal/generated/MatchExpr.qll 689d65f690fe05bc262d0a5bfe69bb4f8a142db387c5765fcc4958a9b49989f8 2979cd2017d0538870d17b2b7592c75cc05b706bd36c9de3e5dc38fa3a957e5b
 lib/codeql/rust/elements/internal/generated/MatchGuard.qll 521a507883963106780f1782084c581fbcf1179863c7c15438c4db79e30e78dd 6226feffaaa8d828a42ece0c693e616cd375672eb987c3b7ff1ca15fa23c116a
-lib/codeql/rust/elements/internal/generated/Meta.qll f1ce7cdaf2a6fa3b86f0465e33a9521d254c032468427b276d93276ffd5142be 046d72c868ee2664b8a291de16320238ece9d0612c93c96a0d601e0b6079bf90
+lib/codeql/rust/elements/internal/generated/Meta.qll 38fca2c9958b4179de311546fe0850319010aca9cd17c97d57e12b521c5d0947 740f99c9d41044ceebfcc9d29baaa22f59c11a40f45502a34aa587d423c018f8
 lib/codeql/rust/elements/internal/generated/MethodCallExpr.qll c2d6faf1f840628dbc5aa59c90dbd8b244f6bd4a7dba25e410047fcde11ff378 2d0251b095bf15b0275d493efdd1f9ce0926a3cff6671bb550a7a672aaf62a30
 lib/codeql/rust/elements/internal/generated/Missing.qll 16735d91df04a4e1ae52fae25db5f59a044e540755734bbab46b5fbb0fe6b0bd 28ca4e49fb7e6b4734be2f2f69e7c224c570344cc160ef80c5a5cd413e750dad
 lib/codeql/rust/elements/internal/generated/Module.qll ebae5d8963c9fd569c0fbad1d7770abd3fd2479437f236cbce0505ba9f9af52c fa3c382115fed18a26f1a755d8749a201b9489f82c09448a88fb8e9e1435fe5f
@@ -533,7 +533,7 @@ lib/codeql/rust/elements/internal/generated/ParamList.qll c808c9d84dd7800573832b
 lib/codeql/rust/elements/internal/generated/ParenExpr.qll bc0731505bfe88516205ec360582a4222d2681d11342c93e15258590ddee82f2 d4bd6e0c80cf1d63746c88d4bcb3a01d4c75732e5da09e3ebd9437ced227fb60
 lib/codeql/rust/elements/internal/generated/ParenPat.qll ce24b8f8ecbf0f204af200317405724063887257460c80cf250c39b2fdf37185 e7c87d37e1a0ca7ea03840017e1aa9ddb7f927f1f3b6396c0305b46aeee33db6
 lib/codeql/rust/elements/internal/generated/ParenType.qll 9cc954d73f8330dcac7b475f97748b63af5c8766dee9d2f2872c0a7e4c903537 c07534c8a9c683c4a9b11d490095647e420de0a0bfc23273eaf6f31b00244273
-lib/codeql/rust/elements/internal/generated/ParentChild.qll ad728d69b3ef9555d71db2274b04a5ba99b4f815120c55032c57d077e0c954ca 64c6406626a14ed3052d3996cc47fc91e435175bd982440d948416cf878400fd
+lib/codeql/rust/elements/internal/generated/ParentChild.qll 665db548af6857d2cd5c859237b9ec08fc611bccafa1fd6dad703e247b43bf7f 64c6406626a14ed3052d3996cc47fc91e435175bd982440d948416cf878400fd
 lib/codeql/rust/elements/internal/generated/Pat.qll 3605ac062be2f294ee73336e9669027b8b655f4ad55660e1eab35266275154ee 7f9400db2884d336dd1d21df2a8093759c2a110be9bf6482ce8e80ae0fd74ed4
 lib/codeql/rust/elements/internal/generated/Path.qll 299abce24762a5ab023f3cf1ab9718b83047e171aed42a8092e7a155914b1657 db1a23d18640c548f08c9f94823838b5e019ac85877c7b15df2d1493d1846572
 lib/codeql/rust/elements/internal/generated/PathExpr.qll 17cdb0a7393258a207450f08e37178fc9d35d167f064ba6015be94246f3dc933 a75fdd280aff6d87e083a92030e041c2eb52b57cf7151d4a6989fcd31d6a64bf
@@ -541,11 +541,11 @@ lib/codeql/rust/elements/internal/generated/PathPat.qll 98c9938d6a359fd717829b19
 lib/codeql/rust/elements/internal/generated/PathSegment.qll 4621597fd86246f788b8f9ca73f6b0f27929fc04261ce3ccf85da1183071431d aadda8bce386a3b7a9c53b98465eedcc4f724e37b8a904c1775af5b7ffb041ee
 lib/codeql/rust/elements/internal/generated/PathType.qll 45de78e5374d6eb0446e2112ec72d3692c2811df9fa2ad03d0127e426940abe3 622cf70408413a565a0dac58f451035ac1339c8d0ee5b24f630680201cb0aa48
 lib/codeql/rust/elements/internal/generated/PrefixExpr.qll c9ede5f2deb7b41bc8240969e8554f645057018fe96e7e9ad9c2924c8b14722b 5ae2e3c3dc8fa73e7026ef6534185afa6b0b5051804435d8b741dd3640c864e1
-lib/codeql/rust/elements/internal/generated/PtrType.qll 5f12b6ad29b4e5ce51c205e2199594ce190e1aa24fbe3ddcfd82317a0b472222 8940e8dcccdf5cfc863aa2f2bc52bbddfa4d9ac8e8b38973cc1ecc1fbe32b3d4
+lib/codeql/rust/elements/internal/generated/PtrType.qll 40099c5a4041314b66932dfd777c9e2bef90a0711fb8d7c2c2cec764c003ac4a cf8297d93557356a572223d3e8acca701837c4b1f54e8d4351ba195fb7ed27f8
 lib/codeql/rust/elements/internal/generated/PureSynthConstructors.qll dc03515d678ba052c2ff2dd9f0883e0bce54cac740ba9a15e5173f292c1b6971 dc03515d678ba052c2ff2dd9f0883e0bce54cac740ba9a15e5173f292c1b6971
 lib/codeql/rust/elements/internal/generated/RangeExpr.qll 23cca03bf43535f33b22a38894f70d669787be4e4f5b8fe5c8f7b964d30e9027 18624cef6c6b679eeace2a98737e472432e0ead354cca02192b4d45330f047c9
 lib/codeql/rust/elements/internal/generated/RangePat.qll efd93730de217cf50dcba5875595263a5eadf9f7e4e1272401342a094d158614 229b251b3d118932e31e78ac4dfb75f48b766f240f20d436062785606d44467b
-lib/codeql/rust/elements/internal/generated/Raw.qll 783c3d04b798c0a5281baf88aa3ada406492e6e6b8ff41dac658d52c88f95c46 e69891409fc89f0a3a199feb6f1a734bfdd862239a5f6794de0ee811e69fab04
+lib/codeql/rust/elements/internal/generated/Raw.qll 1936bd8e75e09639d148321d88a6ba930ccc3e7c8458f052699cbddee43ff448 03c591c9f8333e9490224672df26d4cbbc2b9ff5916e36d2a7ee3d5fd9b8c3ed
 lib/codeql/rust/elements/internal/generated/RecordExpr.qll eb6cb662e463f9260efae1a6ce874fa781172063b916ef1963f861e9942d308d 1a21cbccc8f3799ff13281e822818ebfb21d81591720a427cac3625512cb9d40
 lib/codeql/rust/elements/internal/generated/RecordExprField.qll 7e9f8663d3b74ebbc9603b10c9912f082febba6bd73d344b100bbd3edf837802 fbe6b578e7fd5d5a6f21bbb8c388957ab7210a6a249ec71510a50fb35b319ea1
 lib/codeql/rust/elements/internal/generated/RecordExprFieldList.qll 179a97211fe7aa6265085d4d54115cdbc0e1cd7c9b2135591e8f36d6432f13d3 dd44bbbc1e83a1ed3a587afb729d7debf7aeb7b63245de181726af13090e50c0
@@ -554,19 +554,19 @@ lib/codeql/rust/elements/internal/generated/RecordFieldList.qll d7bb2677338cf420
 lib/codeql/rust/elements/internal/generated/RecordPat.qll f5f9904fcd8b8fa5fe65b46a68f830021a5e4a68f95ff403151565c3ec770477 56294ed2ff753d8be7742a501b15b5f3f5f20afe0f8171ee6771d049f26489e4
 lib/codeql/rust/elements/internal/generated/RecordPatField.qll f17b1aa265091fd8309fd90d5c3822d170870e304f160225327de5a844a9aed4 0458e39dbe88060b4b664692cf0b41ebf4364de268d9417658c14c883c9c1b33
 lib/codeql/rust/elements/internal/generated/RecordPatFieldList.qll 08d4740bbb519f15ab20b694b3c45e396a2a59cce0f68fa4b9698348784cae43 99919809607ae61c707f591ee609c50bcfb90d5b4f9c263f6b8e78658d21b605
-lib/codeql/rust/elements/internal/generated/RefExpr.qll f75a9550456e8b53044d0aa94b69148cb04950273000ac19eda57a836091670e 24ea42dc26b6b84f5807959e787a0487b7a33ed1f20c24d34af2799110a1902b
-lib/codeql/rust/elements/internal/generated/RefPat.qll 7483fcf9bf555a0ca60bfdbb91fd1c7344c98cb60506469cab24fddd90450005 b233f86eec76a3916ca5daac4812083f452f26089cabc13811a5600862ac1832
-lib/codeql/rust/elements/internal/generated/RefType.qll 90b03447b77c9a8ae5317a7f605beac4a3c9251f2e5409681fe8badad41d1dd7 bd96341b52450eb0ab262aa8ffd810ff7b091d4c1ed8576d794d7705af565296
+lib/codeql/rust/elements/internal/generated/RefExpr.qll 7d995884e3dc1c25fc719f5d7253179344d63650e217e9ff6530285fe7a57f64 f2c3c12551deea4964b66553fb9b6423ee16fec53bd63db4796191aa60dc6c66
+lib/codeql/rust/elements/internal/generated/RefPat.qll 5c4d908f851d89f42cf765007c46ac4199200f9b997f368d5b0e2a435efa82cd 42fd637bc98b5a9275386f1c5fb3ae8c4681987289a89b060991416a25131306
+lib/codeql/rust/elements/internal/generated/RefType.qll 3603a3e000acc25c5e675bd4bc4a5551b8f63851591e1e9247709e48d1769dc5 91bea4a1d5ef0779d575567253cd007157d3982524e63a7c49c5cae85cb42e5f
 lib/codeql/rust/elements/internal/generated/Rename.qll d23f999dab4863f9412e142756f956d79867a3579bd077c56993bdde0a5ac2f1 9256c487d3614bf3d22faa294314f490cf312ab526b8de0882e3a4a371434931
 lib/codeql/rust/elements/internal/generated/RestPat.qll b3a4206e68cf67a0310a466721e7c4b3ab855e65490d589d3d856ad333b3d5e8 30b471bec377784f61d73ef93e74fc0dcec7f512ac4b8791d1ca65f2bcea14b8
 lib/codeql/rust/elements/internal/generated/RetType.qll a26860cd526b339b9527c089d126c5486e678dd080e88c60ea2fe641e7d661fd a83c1ce32fd043945ad455b892a60c2a9b6a62d7a5aadf121c4b4056d1dfb094
 lib/codeql/rust/elements/internal/generated/ReturnExpr.qll c9c05400d326cd8e0da11c3bfa524daa08b2579ecaee80e468076e5dd7911d56 e7694926727220f46a7617b6ca336767450e359c6fa3782e82b1e21d85d37268
 lib/codeql/rust/elements/internal/generated/ReturnTypeSyntax.qll 34e32623d2c0e848c57ce1892c16f4bc81ccca7df22dc21dad5eb48969224465 ccb07c205468bce06392ff4a150136c0d8ebacfb15d1d96dd599ab020b353f47
-lib/codeql/rust/elements/internal/generated/SelfParam.qll cc9693cd6efd7528584f00696b86e41027e05066f8e8aba1ca25bd7567b971ed 689b4746ab4e82de0b7b6e11350959c5194a1562497a21a831c75c6e325ff468
+lib/codeql/rust/elements/internal/generated/SelfParam.qll cf6837c2731b45632f04092079d295eee3e02d19f73c73b3ccbce1abe12203bf 87eaa9d982506904c42030f7173dd01fd52f3edd9d2c8d19b572f6d5454f769b
 lib/codeql/rust/elements/internal/generated/SlicePat.qll 8b1463758d7b15a0303384c8136a48a8e71ce27da4ba6e421272b9751a988e64 7562d47308f197bc63ade0f114cd23a17e7f60fa696716f6a30fc7b7411642fe
 lib/codeql/rust/elements/internal/generated/SliceType.qll 98ee8b566be28f392ab9c9507600e8461ad0b48cbbbd422d22548aca691f8330 528d6eabddf49b9dc474971a2f3a6ddb6f2d77dc7f8449140ef54646c1ceb822
 lib/codeql/rust/elements/internal/generated/SourceFile.qll 55d44c9f09c5ff28c4f715f779a0db74083e1180acaf0d410e63ca07b90d1cb5 78c0af48b0b64aa377413ea4799dfe977602a111208e1d25e4bdfa920dbd7238
-lib/codeql/rust/elements/internal/generated/Static.qll cae5313e08e4af44c46b2580226993eff639a5257863276e720de2309afff3c3 93fdbd117ecb69fbef5c84632e08483c0faf051f882f1a266215044a0d5bfd94
+lib/codeql/rust/elements/internal/generated/Static.qll 5fbd6879858cf356d4bdaa6da475de729c12d44ee99aef12bdefe657fdb885e0 0c8e9ef7a93c59b9346265338e38ae3f2e1265981f2d81aab49bc36cf0589382
 lib/codeql/rust/elements/internal/generated/Stmt.qll 8473ff532dd5cc9d7decaddcd174b94d610f6ca0aec8e473cc051dad9f3db917 6ef7d2b5237c2dbdcacbf7d8b39109d4dc100229f2b28b5c9e3e4fbf673ba72b
 lib/codeql/rust/elements/internal/generated/StmtList.qll a667193e32341e17400867c6e359878c4e645ef9f5f4d97676afc0283a33a026 a320ed678ee359302e2fc1b70a9476705cd616fcfa44a499d32f0c7715627f73
 lib/codeql/rust/elements/internal/generated/Struct.qll 4d57f0db12dc7ad3e31e750a24172ef1505406b4dab16386af0674bd18bf8f4b 1a73c83df926b996f629316f74c61ea775be04532ab61b56af904223354f033e
@@ -574,7 +574,7 @@ lib/codeql/rust/elements/internal/generated/Synth.qll 99fa143232f2cfb1ef3f6ed6a5
 lib/codeql/rust/elements/internal/generated/SynthConstructors.qll 518b68ccf6d0791bc0c141486261108bb1723e37743fc7f8e4167a1d61660531 518b68ccf6d0791bc0c141486261108bb1723e37743fc7f8e4167a1d61660531
 lib/codeql/rust/elements/internal/generated/Token.qll 77a91a25ca5669703cf3a4353b591cef4d72caa6b0b9db07bb9e005d69c848d1 2fdffc4882ed3a6ca9ac6d1fb5f1ac5a471ca703e2ffdc642885fa558d6e373b
 lib/codeql/rust/elements/internal/generated/TokenTree.qll 8577c2b097c1be2f0f7daa5acfcf146f78674a424d99563e08a84dd3e6d91b46 d2f30764e84dbfc0a6a5d3d8a5f935cd432413688cb32da9c94e420fbc10665c
-lib/codeql/rust/elements/internal/generated/Trait.qll 32bdbb4dc9f03488195a90320a947013135cd2fae1b9d62b4f71ed9a4e39a967 5dab0fbec64698bf3cdae04879d3d1665cf82386b7b030ed69e6b20776ffa9fc
+lib/codeql/rust/elements/internal/generated/Trait.qll a570fa93d0b78a35766b00d5ca256c102f824564248b9d8b678a981d6eea3e2e d9c7475e5102e21cfdee3b1791f89a4f9cdba5a4200349ff706532b704c02664
 lib/codeql/rust/elements/internal/generated/TraitAlias.qll 0a3b568100baaca129a12140b0742a1c8e507ef5b2f2c191ff7452c882ba4064 c32e74569f885c683f8d3977682fcbc8b7699b00d5e538cc6b08acdfffa56bc8
 lib/codeql/rust/elements/internal/generated/TryExpr.qll 75bf9fdda5238155d2268806d415e341fa57f293dcadef003b4a11562c4cd877 935c746f822cf183cdf36bef2332f01e7ce38aa09aa8476d64c1062c5e8f13dd
 lib/codeql/rust/elements/internal/generated/TupleExpr.qll 75186da7c077287b9a86fc9194221ab565d458c08a5f80b763e73be5b646b29f 0250d75c43e2e6f56cdc8a0c00cc42b3d459ea8d48172d236c8cdf0fe96dfed2
@@ -583,9 +583,9 @@ lib/codeql/rust/elements/internal/generated/TupleFieldList.qll 9d4981d04c2ee005e
 lib/codeql/rust/elements/internal/generated/TuplePat.qll d61163a380f3f2c1709080e2df69a90764509af060e607e27e832862e4dae18c 108b7db493a21fe1fa0db99fceee952aabb0a128eac41e050877ab9136407403
 lib/codeql/rust/elements/internal/generated/TupleStructPat.qll 87e0acfeb51d48c55648d5af783f5ea006aaeccce990ba26458c6935fbdf7c11 7c761e66ddacb51307e653c6ad45bec3fba8315049fbe6c4503ed19241204d41
 lib/codeql/rust/elements/internal/generated/TupleType.qll 7fae8e881157a24c4ce4f960269ba8010e227a81d3055b571f861f7196f868e2 18085a19a102df8e2cded938b49709225e89f0ce68b4a003310647bb259a6bd3
-lib/codeql/rust/elements/internal/generated/TypeAlias.qll c584cd4c6fedc50818e7bd6a3ac8d14ba916e7ae6be179bd2f51f3aff95673ab f4be9e83c9814fec205c606de5afeec836a7ec8d58d8b64fec9126472f2a8c68
+lib/codeql/rust/elements/internal/generated/TypeAlias.qll af02bb172b6f2d7f5eab8645a5a219eee8a4bbc445838f5739f18ba217c7e608 6d871471d673adae99c8b146f6f7ab204f24d52b5013b4582037a42b279c9f05
 lib/codeql/rust/elements/internal/generated/TypeArg.qll fe4441b3faa44e542c43a85353347df23d3f74da0c4b17cb0fdc60f5aca9dee7 1473d044e979e7cb6628525ffd454549cd8a37560488c695f534243946cf83bc
-lib/codeql/rust/elements/internal/generated/TypeBound.qll c6f75fd8e99e575c33d424c2c9c85918554bdb87b5f78848c66538df6ad08559 f107ae5edadc3bd1b2e76f0c5ab15d043946ac9d2db62c10132690de7282003c
+lib/codeql/rust/elements/internal/generated/TypeBound.qll c4e5a5a919a30f4b334e8218b69fae887bf43e3b87bc63863b2c891beba14ba0 c9d394f31a7cbcfae95d511ad030ed515f51e87697233643b9ac12d6ac61ab18
 lib/codeql/rust/elements/internal/generated/TypeBoundList.qll 31881cae2f71df5adf7a427357565bc0e7ba58c6a774a9d5835560a34c4db30f 1ff36ba34dd966d945d743781e3a1cccad4bb9fd5d32902dfd0bcad537501a85
 lib/codeql/rust/elements/internal/generated/TypeParam.qll dd57c5c370b4e3ed87c42c4fccf71b554cf1c588de1a1d1ac4ed5edbc1fb4664 09cd09537c1196f0a84850f654d324c6ad8aeaf9debcc3d9879e23a313ed93d9
 lib/codeql/rust/elements/internal/generated/TypeRef.qll c4c3bdafe3deb05338f5031c798fa6e72b58301ee7737a785314e72c9c4f091c e6ec0c680bcfe61ff79468de485241a75fbd795b2d501004324b66b003fddbce
@@ -644,7 +644,7 @@ test/extractor-tests/generated/BinaryExpr/BinaryExpr_getAttr.ql 26d985ac4b668d78
 test/extractor-tests/generated/BinaryExpr/BinaryExpr_getLhs.ql c3f19d8a60066ad6b1810291a669473c75b659cd2f6ac3ab9ed3db2203d4145c c05c5e0226e30f923155669ffc79cfe63af1ca464e8dfc85888dda5f7049711b
 test/extractor-tests/generated/BinaryExpr/BinaryExpr_getOperatorName.ql 33612159be1c111e3306009d0b04579450fc962a81119b6ea4e255d3c409b401 1a0995b298f50242217cfef81dca8ac978e19e06f90a5f4caadcb6f84460fec2
 test/extractor-tests/generated/BinaryExpr/BinaryExpr_getRhs.ql 3bcd36b678e87d5c29a43b69c54c80468a89aefa7e69481b48158ae794a53160 a629dc1472b3f6fd7c608ff760e83d8e1363db81dfe9a4b2968690c2ba4925ca
-test/extractor-tests/generated/BlockExpr/BlockExpr.ql 45aba7a94638c343b05560309ecf11e436b1265565072f1cba138bac804e57f2 6d556c1d1f6ac58dc93e542930940f127a7f69181e39275afdc6852d90f12a23
+test/extractor-tests/generated/BlockExpr/BlockExpr.ql 0ab66b190d4e2aa784e61088c4779ef4d08cb4453677ea087c4f9aa369494bc2 1c3b5794008114d1297695d82590220929e3974e27836b2c6062d14b73379a40
 test/extractor-tests/generated/BlockExpr/BlockExpr_getAttr.ql 15d4d9853d3262ce6ec629c075c60a76eb112dcafe34b71df0e09b39282223cf 792c498bc7079bb5b93034b8a87db3b275a591d78954e844821aeacffe4258ea
 test/extractor-tests/generated/BlockExpr/BlockExpr_getLabel.ql de3c28a2677ed71ebd95207aa43ce270765f7f556283f095f1f6296622b80cbc 414ebbb2bfbe4350f933fc3d3636b49a6bb8242e200180780caf95ab8523adb0
 test/extractor-tests/generated/BlockExpr/BlockExpr_getStmtList.ql 8c391dfeb69bd92c547a2417bf231cc960a8f34845802722214294728772316a f3e847fa594e9d9cf25d09a0396a10176aad1100c1977a24756ff6287a79e69e
@@ -664,14 +664,14 @@ test/extractor-tests/generated/CastExpr/CastExpr_getExpr.ql c37186b8f3e3dab8ae28
 test/extractor-tests/generated/CastExpr/CastExpr_getTy.ql ad5d6e260e1495ba360bd2ade3b60f09705a86a08d618acf8c4aff342c8ee200 c02c1dc65ba9160bc28827e40473915de5403bdc91c16d9d8b6778aa97314a1b
 test/extractor-tests/generated/ClosureBinder/ClosureBinder.ql 42516df87ac28c814d65f6739b2ede6eaa41c505d64756a3b8c7e0ca79895230 8b840f92ec033a4ef5edbe52bed909d8be0fffddf6d3e4bfaf9a8bc174fa2f2c
 test/extractor-tests/generated/ClosureBinder/ClosureBinder_getGenericParamList.ql 71010c43a78a7abe8e63c94353f4b7eb97aca011755d200e7087467c1e3b7a68 2c834328f783ec5032544a692f7e23975bac0228b52b9f8fde46ef46a5f22a5f
-test/extractor-tests/generated/ClosureExpr/ClosureExpr.ql d79b1a60e9cd4266f756872f44363d062e8030baae9eb4b1dbaf9465ae88f0ec 46414e0aa4330a42f67083bf866a360fb5e2b234b7df5564559285046311e8e1
+test/extractor-tests/generated/ClosureExpr/ClosureExpr.ql 430d566d8176d7b98d6cde6c35f9420249236eddb084f9c7cbb091cc683ff063 6b8127425cad540a1e407ff7b387f3924253da980f46e5a678aeb2870ba6ec7b
 test/extractor-tests/generated/ClosureExpr/ClosureExpr_getAttr.ql f7f803afa4e2a5976c911fdf8a91ec607c2f998e22531b9c69a63d85579e34c3 1296acd0fb97e1484aa3f1d5ba09d18088001186f3ba5821eb3218a931ca0d54
 test/extractor-tests/generated/ClosureExpr/ClosureExpr_getBody.ql 22a973a61274e87620e38338b29beef395818b95a88e2261fff197f7a78a8f76 bd28ed426e4d07823044db869aa8022dc81e8599d156e3e0e7cd49be914a1f36
 test/extractor-tests/generated/ClosureExpr/ClosureExpr_getClosureBinder.ql cbfcf89b8efb5cb9b7bfbea26b5a78b3d4c7994cbf03d5ca60b61ee1b5cb4be5 621431277732ef79c585cb0b7199c49b14c597ee6b594a70d9e6966a09d40a9f
 test/extractor-tests/generated/ClosureExpr/ClosureExpr_getParamList.ql 68ce501516094512dd5bfed42a785474583a91312f704087cba801b02ba7b834 eacbf89d63159e7decfd84c2a1dc5c067dfce56a8157fbb52bc133e9702d266d
 test/extractor-tests/generated/ClosureExpr/ClosureExpr_getRetType.ql c95bc7306b2d77aa05a6501b6321e6f1e7a48b7ad422ba082635ab20014288ae fe72d44c9819b42fff49b9092a9fb2bfafde6d3b9e4967547fb5298822f30bc3
 test/extractor-tests/generated/Comment/Comment.ql 5428b8417a737f88f0d55d87de45c4693d81f03686f03da11dc5369e163d977b 8948c1860cde198d49cff7c74741f554a9e89f8af97bb94de80f3c62e1e29244
-test/extractor-tests/generated/Const/Const.ql db81591df5a8822a578f9445b8444f6ac391efc43c61aab429edb76ab9c0303d 5f7ae3622c03eb151fa5326db785f0ff3fe6f52033fc071d758eac18ea1b5722
+test/extractor-tests/generated/Const/Const.ql d02d4010c54f2cfcb9251f362c3768740399807eb4fe995373d9a316f14e7a8b 8d277779d3d3ded5cf0829dc9bfd8936f2334d89de4a84e110f0a017224729a5
 test/extractor-tests/generated/Const/Const_getAttr.ql bd6296dab00065db39663db8d09fe62146838875206ff9d8595d06d6439f5043 34cb55ca6d1f44e27d82a8b624f16f9408bae2485c85da94cc76327eed168577
 test/extractor-tests/generated/Const/Const_getBody.ql f50f79b7f42bb1043b79ec96f999fa4740c8014e6969a25812d5d023d7a5a5d8 90e5060ba9757f1021429ed4ec4913bc78747f3fc415456ef7e7fc284b8a0026
 test/extractor-tests/generated/Const/Const_getName.ql b876a1964bbb857fbe8852fb05f589fba947a494f343e8c96a1171e791aa2b5e 83655b1fbc67a4a1704439726c1138bb6784553e35b6ac16250b807e6cd0f40c
@@ -679,9 +679,9 @@ test/extractor-tests/generated/Const/Const_getTy.ql bf9abfd2be9d22193bc6be9916c7
 test/extractor-tests/generated/Const/Const_getVisibility.ql de6b2e9d887316e279b45fab7887980ca7d93fd32c2259f3a06de2b6e2957c12 2f135cdbbb84b43d282131edb7eb4df6caba61bf7421881a49d4679f0f44f661
 test/extractor-tests/generated/ConstArg/ConstArg.ql f1422b216eb45819ff41f0c19e0f88aa184ddd3fa2984ba22ec46df398147fc3 d2e4f367848c2bc4f6aef51c1dd8180035c39919430082c83f18a3f324228df3
 test/extractor-tests/generated/ConstArg/ConstArg_getExpr.ql 317fd83ad51acc3ff3dfab71ebb1385b67d49404c1d7b3804a8ca3c099b84e99 91ecf5ebbfc1aab286dce708680f0be97417f9755676db7479fa6836e50be845
-test/extractor-tests/generated/ConstBlockPat/ConstBlockPat.ql b3e1f8c54af03af3cfe16dcf1831777404e360058f67acc4453c0d4211897d12 6f842cf96153219c7ab0d7d04db9a52b8fec71996d527bce69acb6678e437861
+test/extractor-tests/generated/ConstBlockPat/ConstBlockPat.ql ee17b4deba9c503130e3ce565102bc8e181770efcb1309be9c822f0a7ba6fc17 638ed17b5c009e71b31f580c4060ba763bd4208c3984b6c032183ab46a4dd43d
 test/extractor-tests/generated/ConstBlockPat/ConstBlockPat_getBlockExpr.ql cc06e762e1652e467c7cf02c34f17c621fb3a938f294ee527fa04ed78c8701ec f863f8f6bfc9d169b585ae56b4e4ac0fc1603fd14775450e950cca4d5ea28e8a
-test/extractor-tests/generated/ConstParam/ConstParam.ql f883b198f9c373e2d4c630706af5ba1d8a2f8f4e9847e9a54ca56cc892dbdc34 ad59caac567e80940c7e0f06239a91e7793a57e9e6ab0452535daa1aae3f2a1e
+test/extractor-tests/generated/ConstParam/ConstParam.ql 1c2ec1a00ffc754ade227536f3efe789cdbee714fa003abff5e0221b9b53d08a 6f24ef0b280b18603a6efd217c691c4249898be95dafd5ff5a586cb2f2ecdf40
 test/extractor-tests/generated/ConstParam/ConstParam_getAttr.ql af8949f1ea039a562a3b3561185a85f7f8a871bf27dba0580782f81c62b6508c 2874783b84fdce47b809f953e02c36473cad6a2d3dd1c0f1a9cb14a3e28b9c30
 test/extractor-tests/generated/ConstParam/ConstParam_getDefaultVal.ql 021630468422c30e7aa623bdf4e97f3076e68087991723c624922b1ee608d173 9fd78738cfd0455be2c655852f6c618e901af80c6b6791396d9683c118a44e91
 test/extractor-tests/generated/ConstParam/ConstParam_getName.ql e2e9b75dd7ce501793efce75079aabd3851b91aa4d437972693bacd7b04859d8 4d2326b39af870a2ef8b37448f78395cdb5c1e94df88f137ef71f8fd3548cd8e
@@ -700,7 +700,7 @@ test/extractor-tests/generated/Enum/Enum_getVisibility.ql 7fdae1b147d3d2ed41e055
 test/extractor-tests/generated/Enum/Enum_getWhereClause.ql 00be944242a2056cd760a59a04d7a4f95910c122fe8ea6eca3efe44be1386b0c 70107b11fb72ed722afa9464acc4a90916822410d6b8bf3b670f6388a193d27d
 test/extractor-tests/generated/ExprStmt/ExprStmt.ql 811d3c75a93d081002ecf03f4e299c248f708e3c2708fca9e17b36708da620e5 a4477e67931ba90fd948a7ef778b18b50c8492bae32689356899e7104a6d6794
 test/extractor-tests/generated/ExprStmt/ExprStmt_getExpr.ql e269bb222317afe1470eee1be822d305fc37c65bca2999da8d24a86fa9337036 088369d6c5b072192290c34c1828b1068aeedaabdae131594ca529bbb1630548
-test/extractor-tests/generated/ExternBlock/ExternBlock.ql d28af9f7d0fa29687fb3f420401769612ea5ed320597bddf6653a108ede53049 b4deea6cb1ebda9db6968096e4048f5eeca41261b2c2c30d5d23971301bd2cb0
+test/extractor-tests/generated/ExternBlock/ExternBlock.ql 0c50adb4ce7479100fe46e097801df699911b4888a4919aa7ca337e2ef8a2525 101eee87add6793006bac20a2f7d0e245a1c04cbc81834b6130db083578b0c5f
 test/extractor-tests/generated/ExternBlock/ExternBlock_getAbi.ql 9b7c7263fcbc84e07361f5b419026a525f781836ede051412b22fb4ddb5d0c6a c3755faa7ffb69ad7d3b4c5d6c7b4d378beca2fa349ea072e3bef4401e18ec99
 test/extractor-tests/generated/ExternBlock/ExternBlock_getAttr.ql 78ed6a2d31ccab67b02da4792e9d2c7c7084a9f20eb065d83f64cd1c0a603d1b e548d4fa8a3dc1ca4b7d7b893897537237a01242c187ac738493b9f5c4700521
 test/extractor-tests/generated/ExternBlock/ExternBlock_getExternItemList.ql 2c2b29bdfdc3b27173c068cbaab9946b42053aa14cf371236b4b60ff2e723370 dfc20fc8ef81cdce6f0badd664ef3914d6d49082eb942b1da3f45239b4351e2f
@@ -716,7 +716,7 @@ test/extractor-tests/generated/FieldExpr/FieldExpr.ql 1b45da610feb62cee42f7a3866
 test/extractor-tests/generated/FieldExpr/FieldExpr_getAttr.ql 609c4f1e275d963cf93a364b5ec750de8cb4790abdaa710cb533ff13ab750a4e 8c2aa84b1ea6ef40a7ee39a2168baf1b88323bfbc6b9f184e7b39631765a48dd
 test/extractor-tests/generated/FieldExpr/FieldExpr_getExpr.ql 57df2d733faf3e3e30ae106d8423aab612ab0ddf8659da008e384130cf1e8023 1e240bee8e83dc26f78d2c55464ca1fb88d773691d47aee9a2182c90f57eb8f1
 test/extractor-tests/generated/FieldExpr/FieldExpr_getNameRef.ql 8631f5e8bdd72443a1ee3d667ee9136a51ad49dfd206612a36b79686da1beb19 692aef607108b8e3eaa78b8c915f2fd1d310905f8fea770b9694722a9a2a6232
-test/extractor-tests/generated/FnPtrType/FnPtrType.ql c8fe0b3c849e37ac2bfbb1658ea3b0081502ed6fffb65454853298ffb2383966 d6732c9fa4e37f42c34369a67147df1a1fd453fdc1aa982c3f59578fd1f3f818
+test/extractor-tests/generated/FnPtrType/FnPtrType.ql 50b76d678582cd0b8d7cc4a7658d5009d660bafcec6bd9968c9f60a7f547fa23 5bbf2504eb835e231a2355bc5d099322423c49c6af371902cf20a150e360cea7
 test/extractor-tests/generated/FnPtrType/FnPtrType_getAbi.ql de1706382c2980c02dbdd295e0a2320c992afa3f19af0c2378b9980a7cd0c481 a3fa36711949d9d5ac53cc5dd39cb19b397c3f2e47c1d457df470c6e5142f9be
 test/extractor-tests/generated/FnPtrType/FnPtrType_getParamList.ql 9ea393acf37919e2fd1bbc16e738440e00a56552bf80baef9bfd2a9a405afb93 3b4237b22eea569cef0081eb3ea16b2d0f01f8f070f21e16390267e9cbe0cf57
 test/extractor-tests/generated/FnPtrType/FnPtrType_getRetType.ql 57f662e4778e1bf4103f061bb8085def0708528f94045c9ff4a95ce802fff13d 924b924c7d766458e956afa0963e6eb1bfc083e5f9aeae64cf2d08929f79612c
@@ -736,7 +736,7 @@ test/extractor-tests/generated/FormatArgsExpr/FormatArgsExpr.ql 0cd439f61569ecf0
 test/extractor-tests/generated/FormatArgsExpr/FormatArgsExpr_getArg.ql 8f692486be1546b914b17abdff4a989dfbaa889bfa1fc44597f4357806c1a1dd da9fd237e31e9c8dd0ef0c3c968157815b87d3e8dcdfd74674c988ce2ab6d270
 test/extractor-tests/generated/FormatArgsExpr/FormatArgsExpr_getAttr.ql 1f9bf1344f942e65c3a3591b6ae04d3f5a2a1a65459bce0d976698de7d8a5958 02acb861d8ab4d32cf144c589881a888c3da5e2ade27e8c85fec3ae45219bb3b
 test/extractor-tests/generated/FormatArgsExpr/FormatArgsExpr_getTemplate.ql c912ac37275cbe7b3b29607bed1a3190c80779436422c14a475113e1bfd91a54 ef90f67a9b952a38ce557b1afbf0b5ce8551e83ddfaad8309a0c9523e40b5ea7
-test/extractor-tests/generated/Function/Function.ql 608e1053c5be5a5d36e4be5cd9da5d4398a0a374adf0ded9f6b652c8b9e085f7 133260e1104616b467aa14a7e0237337aadac918f1b08bd1b9b4f1818fd911e9
+test/extractor-tests/generated/Function/Function.ql 28776a499f21ab36c9dfcb905861cf0bf0a2c51f24d6d9401ca45f67d9f982b0 1ded959dfd9c216975572c4577c6a2d4c56a2d3d4a2dd5b0f3f90adff98d86aa
 test/extractor-tests/generated/Function/Function_getAbi.ql e5c9c97de036ddd51cae5d99d41847c35c6b2eabbbd145f4467cb501edc606d8 0b81511528bd0ef9e63b19edfc3cb638d8af43eb87d018fad69d6ef8f8221454
 test/extractor-tests/generated/Function/Function_getAttr.ql 44067ee11bdec8e91774ff10de0704a8c5c1b60816d587378e86bf3d82e1f660 b4bebf9441bda1f2d1e34e9261e07a7468cbabf53cf8047384f3c8b11869f04e
 test/extractor-tests/generated/Function/Function_getBody.ql cf2716a751e309deba703ee4da70e607aae767c1961d3c0ac5b6728f7791f608 3beaf4032924720cb881ef6618a3dd22316f88635c86cbc1be60e3bdad173e21
@@ -750,7 +750,7 @@ test/extractor-tests/generated/GenericArgList/GenericArgList.ql 2d3e37da2c02a88e
 test/extractor-tests/generated/GenericArgList/GenericArgList_getGenericArg.ql 7f92dc62d814c39bc50dfd46c359540261fe433fcad1752ea2fe139a05071183 9863976c97c1b7c07d5d18d8ffee798b1c1b0223784a61066ee2c9ffc46c4979
 test/extractor-tests/generated/GenericParamList/GenericParamList.ql 5d04af9be32c5f8bdf9ec679b0acbabd58ff01a20f5543a0c7d4fe5c5773ebba 7e86c4d3ed64b9ef2f928abd22b593d72131862321096722df5150b5202a4a28
 test/extractor-tests/generated/GenericParamList/GenericParamList_getGenericParam.ql 7866ed49ebfca1cc1fffeec797329a592f52b4431a5d259aeb7120a7f4961c44 16d89dd05d9db1b1997f801d9e5ba2dd9389d13a3031c730414f3daf5fb7b12f
-test/extractor-tests/generated/IdentPat/IdentPat.ql 8fc54811b0fabda503949557737d14a2e71ec68170b6e42e69fde08ba1a2c39d aff69e979a6084eb4e1d902df2bafd0cde806a41ab8ef83336585a60d4e3a7c8
+test/extractor-tests/generated/IdentPat/IdentPat.ql 1e61edbdff611193bbb497eeba8c35043e1d1c6d3359903be58382b1c95e39e4 6f3a288cc12ee24a9ff21ca2fe544838d66f6481e60539cf7d4a473e628e3c3f
 test/extractor-tests/generated/IdentPat/IdentPat_getAttr.ql 02607c8c616dc94152777390f912fc1e6bb420cc3ea687397e31392848942aa7 aeb10434577815d9a9f0f45a1a448656323f05d5321ff07d435ca4a449527d53
 test/extractor-tests/generated/IdentPat/IdentPat_getName.ql b96a3dbca1bade052cad294d95f95504665ad0b14c7f5f9f8083486d0ee64026 28c851703250c25b518024add1052d3204271db3f89eddf862d9a1e122ee6eb0
 test/extractor-tests/generated/IdentPat/IdentPat_getPat.ql fea604fee0db39f83a3dadb4583cb53123c63351282bc3387b84f90477be19cb ef2e620ade30e0225f6bf1c84982d1b8f949ee0c2ced5edbd00e5547e0a81a7c
@@ -759,7 +759,7 @@ test/extractor-tests/generated/IfExpr/IfExpr_getAttr.ql f5872cdbb21683bed689e753
 test/extractor-tests/generated/IfExpr/IfExpr_getCondition.ql 5bab301a1d53fe6ee599edfb17f9c7edb2410ec6ea7108b3f4a5f0a8d14316e3 355183b52cca9dc81591a09891dab799150370fff2034ddcbf7b1e4a7cb43482
 test/extractor-tests/generated/IfExpr/IfExpr_getElse.ql 8674cedf42fb7be513fdf6b9c3988308453ae3baf8051649832e7767b366c12f e064e5f0b8e394b080a05a7bccd57277a229c1f985aa4df37daea26aeade4603
 test/extractor-tests/generated/IfExpr/IfExpr_getThen.ql 0989ddab2c231c0ee122ae805ffa0d3f0697fb7b6d9e53ee6d32b9140d4b0421 81028f9cd6b417c63091d46a8b85c3b32b1c77eea885f3f93ae12c99685bfe0a
-test/extractor-tests/generated/Impl/Impl.ql 2969c1fc9dcc836ac7f40f5a2030b6f90f57a87f8a3da72b253da34c0620d4fe 0453150f2818fc002becd34a9d8cb67bf4df93b00d91b5be9fe053a9ed44aed2
+test/extractor-tests/generated/Impl/Impl.ql b879d3101c31d57c1b7b794c241678214f65fcb1b33ec45919948809d1d62f6c 769c7a691a8034db4cc12bc8cd8df3a8ae765a3fb83bb6a5efe6e310328d800c
 test/extractor-tests/generated/Impl/Impl_getAssocItemList.ql cf875361c53c081ac967482fd3af8daf735b0bc22f21dcf0936fcf70500a001a 0ad723839fa26d30fa1cd2badd01f9453977eba81add7f0f0a0fcb3adb76b87e
 test/extractor-tests/generated/Impl/Impl_getAttr.ql 018bdf6d9a9724d4f497d249de7cecd8bda0ac2340bde64b9b3d7c57482e715b cd065899d92aa35aca5d53ef64eadf7bb195d9a4e8ed632378a4e8c550b850cd
 test/extractor-tests/generated/Impl/Impl_getGenericParamList.ql 88d5cd8fd03cb4cc2887393ee38b2e2315eeef8c4db40a9bd94cf86b95935bdd 9c72828669ccf8f7ca39851bc36a0c426325a91fc428b49681e4bb680d6547a9
@@ -843,7 +843,7 @@ test/extractor-tests/generated/MatchExpr/MatchExpr_getExpr.ql 7baaa64071cf2666e3
 test/extractor-tests/generated/MatchExpr/MatchExpr_getMatchArmList.ql d97055bcb0431e8b258b5ecdd98aa07cb24ece06b0cd658b697cd71da4ede8fc 5e9c03b2665ef6b2af98897996abb2e0a9c18d54eb64588340b8efbcee9793bd
 test/extractor-tests/generated/MatchGuard/MatchGuard.ql 23e47ec1b13e2d80e31b57894a46ec789d6ab5ed1eb66bdb6bba9bd5ae71d3ef 7302f4a93108a83228e0ebd5b4a1bc6bccc1f6f0f3272054866fa90378c0dcc4
 test/extractor-tests/generated/MatchGuard/MatchGuard_getCondition.ql 8a79dd46798f111f8d0d5a975380b5cebe5e337267752b77b3718b268ba2773d 6691d8fb483f64fc7e3ad3f46e3129e0a1184d7beb9f83a1000acdbb081c8b5e
-test/extractor-tests/generated/Meta/Meta.ql 5edf76c32512f29dbe033a02e12aa81e64ae8998b1eb70c414c08fd400f794d1 34ce5338b4a82437ba2db9e4bfb2810dcd37c463b8d667d483c3f7b3c6ca2a99
+test/extractor-tests/generated/Meta/Meta.ql 16f163f00ba2bbaa0a8c6f3f6710c860a8f61d02d43321c78e05a10a3606e39b ba982c6bb93ddb4fc2c44d24635bd487128a5b1d1f885214044c989a21f4d05a
 test/extractor-tests/generated/Meta/Meta_getExpr.ql ec9ec61f5be7d65c32775fb5c068daea04f9db7d875293ed99cc1b2481db041f 77a0c52f1cb6ddc8fdb294d637f9eda1b7301ffa3067f0fca6272d894f57d3ee
 test/extractor-tests/generated/Meta/Meta_getPath.ql aa9d4145a4e613c51b6e4637d57e3b7d0f66e0bb88f4ce959d598870814c06bb 2087e00686d502c0e2e89c88eae0fb354463576a9ae4101320981d3fd79b9078
 test/extractor-tests/generated/Meta/Meta_getTokenTree.ql 1051c27ffd0d9a20436d684fde529b9ff55abe30d50e1d575b0318951e75bd34 983975672d928fb907676628384c949731da9807bf0c781bb7ec749d25733d2d
@@ -905,7 +905,7 @@ test/extractor-tests/generated/PrefixExpr/PrefixExpr.ql 44fb7174365c6deecdc22c72
 test/extractor-tests/generated/PrefixExpr/PrefixExpr_getAttr.ql fdad6ad5199435ded1e4a9ea6b246e76b904cd73a36aaa4780e84eef91741c5b 75d63940046e62c1efa1151b0cac45b5ec0bab5e39aec2e11d43f6c385e37984
 test/extractor-tests/generated/PrefixExpr/PrefixExpr_getExpr.ql 2d1d97f6277794871fbb032ea87ac30b1aa902a74cd874720156162057ea202e b1b9880fce07d66df7ec87f12189c37adf9f233a1d0b38a1b09808d052a95642
 test/extractor-tests/generated/PrefixExpr/PrefixExpr_getOperatorName.ql d27602e77ddf491a278426de65041dda8568f427d1e0ff97c0f23069ae64670e 4e4766e948adf88a6b003ead7d9de1ad26174fe9e30c370f1d3e666aa944df52
-test/extractor-tests/generated/PtrType/PtrType.ql 6a1cae6f398efe5021e94a945d791da9f01da56a19b25fe7692cbbe7e1a3817c e2d38e534bae46176e26f3941bb0029148cb70b244b61c19d2e9524682f3c5de
+test/extractor-tests/generated/PtrType/PtrType.ql 6317c79917e024d2162ae9089c17539fae818288f9ba5976fe39d004691dd343 d7e12a58475322a1292777608056ff90d7014b3e3a77bb756e233014d2670f28
 test/extractor-tests/generated/PtrType/PtrType_getTy.ql 97f5e6197e66c4dcf15d4a62692e30a26979f2902d83354911985d39c8560d1a 0b049b882a33be9746fbb704394a024ac320415cfd1707dc48fe114781558e36
 test/extractor-tests/generated/RangeExpr/RangeExpr.ql 707c08aab49cc0a22c80a734e663b13ecbbddf0db28b6a25fdbc030a1ce38d6f 1f78950b30485cdde9fe7d9e416ad1dfdac8c5b6bc328172e6e721821c076131
 test/extractor-tests/generated/RangeExpr/RangeExpr_getAttr.ql 8767e670f88c2115bc61b16195d2c9d02bc074adc4ca57d2aa537c1af9b4c530 4fa51652c60ca7d06bd9ad604107e002603ee2a7b4587636f6b46b8e8060e06c
@@ -944,12 +944,12 @@ test/extractor-tests/generated/RecordPatField/RecordPatField_getPat.ql 577187a47
 test/extractor-tests/generated/RecordPatFieldList/RecordPatFieldList.ql 5a49488f43bbac2349d75b3acbb3bca4440d9b3725434fefd1ba2eda2be6feb2 898177f203181e5e095091b0a3f6a92f1323c80862400cbfd85902d783a9160d
 test/extractor-tests/generated/RecordPatFieldList/RecordPatFieldList_getField.ql 7c0d190762089af3b6f4fb9ef95561bb2107d7476477bdcfce6b313caa61cab1 17c85ac9670c4faea44a76e9e21184a3d5cabc6c3deba083a0b84fb91e3cbe16
 test/extractor-tests/generated/RecordPatFieldList/RecordPatFieldList_getRestPat.ql 0caef1f5d09a73a973200e061e09ea5498b855dc19af19c1dc48cd9f20da6857 45c12708b566a5efcc79155b45174fc3ff5a084109043493cffa5216b9054205
-test/extractor-tests/generated/RefExpr/RefExpr.ql 6a4d786b68003295ed2cc9a7a9b2f93d6b91f91e4faa7165537e369c3bb0923c 6dd9467a92ce7e966095c01c0356f8429e340e21c036e3ad5665c6442e705580
+test/extractor-tests/generated/RefExpr/RefExpr.ql 27d5dceb9e50668e77143ff5c4aa07cbe15aeea9829de70f1ddfe18d83690106 b95058b7a0bad4bddb857794901d9b651b2f9e4dd3554e5349a70a52cbbfaff6
 test/extractor-tests/generated/RefExpr/RefExpr_getAttr.ql 477fb3fee61395fabf78f76360ea27656432cb9db62e6f1dab1e9f3c75c83d39 5210f2ac54c082b616d8dcb091659cdad08a5d4ae06bf61193c33f208237482f
 test/extractor-tests/generated/RefExpr/RefExpr_getExpr.ql 180d6417fd7322cabf4143d0ddd7810f65506b172a5c82484b3ef398041636b2 a291f0bec1ec5b3fa6d088b3d1a658889b9a3521c39ff3bb7a5ab22a56b8b20a
-test/extractor-tests/generated/RefPat/RefPat.ql 2d2e9b058d66d2183a0795cdd719a36e53d27d9c267eca22e34624c558991250 b95d435925f0bd38a101eb00eab548acbc39a9d7e8fdaa10e1d65f0f72362a9b
+test/extractor-tests/generated/RefPat/RefPat.ql ba0f0c0b12394ed80880bea7d80a58791492f1f96a26783c2b19085d11e2fd2b 22aa62c6d4b6e4354f20511f8e6d12e6da9d8b0f0b3509eefe7a0c50f7acfb49
 test/extractor-tests/generated/RefPat/RefPat_getPat.ql 60f5e010b90c2c62d26674323d209b7e46c1c2b968a69765e1b1cde028893111 fe9e7dc6a5459250355336eca0bdf2a0be575b1e34936280fd12a76a004f7b46
-test/extractor-tests/generated/RefType/RefType.ql d5b822b2e4ffd6a85aac88cc37d113d321029ae042cacb66cb63cd7169faa1eb 3a4a866bc02d733236ebb2b32565bf6a00976afbea3cf50ef1d2271e4ebac9a5
+test/extractor-tests/generated/RefType/RefType.ql f6959c993a8e401a576c785fd1be4b910be218a212eaa9363ebf8f83dc2f1950 686678725a7f9824e74ec6dda294fc2233fd94aced8e2683b7019a1ce81f345d
 test/extractor-tests/generated/RefType/RefType_getLifetime.ql 880434f5908752adcc02d3645a48f22399250600c19e43c2da852cb6242e6a0b b8f9b9fab827972fd318d5edcaf37e4c7d0cf92261f9744e258537e6aee5a87a
 test/extractor-tests/generated/RefType/RefType_getTy.ql 0d5667542ad05a0da1a6a4c36882a39014c4803a76cadb11400d747b603890fd 2e6c3a56f1a7bbb72c181819be72d85c650af1df06f8582ae61bba9e165cf764
 test/extractor-tests/generated/Rename/Rename.ql c8605e5d8ebb39be238ba26e46861df493d86c9caf9aa9a791ed5ff8d65a812a 7263c2c2565e41c652eda03d1e1ddd030fea79a8e3c967909df9945e30ecbe68
@@ -962,7 +962,7 @@ test/extractor-tests/generated/ReturnExpr/ReturnExpr.ql 8e9eba0837a466255e8e249e
 test/extractor-tests/generated/ReturnExpr/ReturnExpr_getAttr.ql 9fb7e1c79798e4f42e18785f3af17ea75f901a36abf9beb47a1eede69c613ba9 9cdb7cc4a4742865f6c92357973f84cee9229f55ff28081e5d17b6d57d6d275f
 test/extractor-tests/generated/ReturnExpr/ReturnExpr_getExpr.ql 7d4562efb0d26d92d11f03a0ef80338eb7d5a0c073f1f09cbb8a826f0cef33de 523ebd51b97f957afaf497e5a4d27929eed18e1d276054e3d5a7c5cfe7285c6e
 test/extractor-tests/generated/ReturnTypeSyntax/ReturnTypeSyntax.ql 976ce33fe3fd34aae2028a11b4accdee122b6d82d07722488c3239f0d2c14609 906bf8c8e7769a1052196bc78947b655158dd3b2903fef2802e2031cffbc1d78
-test/extractor-tests/generated/SelfParam/SelfParam.ql 61977791634b816d79507478a0be913befc843257fea1d6c564de58ff6d22cce 3e33365f58f59f61e0d190f1bfb101d5fc8f086d24322a7ca464e2a397b90110
+test/extractor-tests/generated/SelfParam/SelfParam.ql d051c7a2dd88382e37895f1d691f2702aed7f925d3936f51d49949463e4757c8 37f1f429093be7923a55f8b4f46b37bbf71d0dff3843c4d3686383c2863dee1a
 test/extractor-tests/generated/SelfParam/SelfParam_getAttr.ql 00dd5409c07e9a7b5dc51c1444e24b35d2ac3cab11320396ef70f531a3b65dc0 effbed79ad530a835e85b931389a0c8609a10ee035cb694f2e39b8539f8e54ba
 test/extractor-tests/generated/SelfParam/SelfParam_getLifetime.ql 0b7c243f609e005dd63fd1b3b9f0096fc13cb98fe113e6f3fefb0d5c414e9a5f f6e06de8bcddfc9bd978c058079e53174edbe7b39f18df3c0bd4e80486808eda
 test/extractor-tests/generated/SelfParam/SelfParam_getName.ql 69207a57b415ba590e50003d506a64fd1780b27b8832b14f9bd3c909bddb5593 56fa28ba1222f45893237052fa5a9421d960e14fbf1396b2d1049b440c2e5abe
@@ -974,7 +974,7 @@ test/extractor-tests/generated/SliceType/SliceType_getTy.ql 0bc70c0e60fc3552584b
 test/extractor-tests/generated/SourceFile/SourceFile.ql c30a3c2c82be3114f3857295615e2ec1e59c823f0b65ea3918be85e6b7adb921 6a5bbe96f81861c953eb89f77ea64d580f996dca5950f717dd257a0b795453e6
 test/extractor-tests/generated/SourceFile/SourceFile_getAttr.ql 450404306b3d991b23c60a7bb354631d37925e74dec7cc795452fe3263dc2358 07ffcc91523fd029bd599be28fe2fc909917e22f2b95c4257d3605f54f9d7551
 test/extractor-tests/generated/SourceFile/SourceFile_getItem.ql f17e44bc0c829b2aadcb6d4ab9c687c10dc8f1afbed4e5190404e574d6ab3107 1cf49a37cc32a67fdc00d16b520daf39143e1b27205c1a610e24d2fe1a464b95
-test/extractor-tests/generated/Static/Static.ql 0a704360ff0075d90b0ab68e447892728036b55dd62ac87aba162155a920bfc2 1004434e09a18db400e57e1901555cfc20e7be743d4ec5a07beab5e163822f30
+test/extractor-tests/generated/Static/Static.ql 605b1c3b5664db0c8738c4159af0958a3d73ee4a180a8e022c1ef6b214d3d26f eb351abb9d55816b9d05c3849913074faf272a8ff267919a3d98d23ae67c7b5b
 test/extractor-tests/generated/Static/Static_getAttr.ql adb0bbf55fb962c0e9d317fd815c09c88793c04f2fb78dfd62c259420c70bc68 d317429171c69c4d5d926c26e97b47f5df87cf0552338f575cd3aeea0e57d2c2
 test/extractor-tests/generated/Static/Static_getBody.ql e735bbd421e22c67db792671f5cb78291c437621fdfd700e5ef13b5b76b3684d 9148dc9d1899cedf817258a30a274e4f2c34659140090ca2afeb1b6f2f21e52f
 test/extractor-tests/generated/Static/Static_getName.ql c7537e166d994b6f961547e8b97ab4328b78cbd038a0eb9afaae42e35f6d9cb4 bb5ae24b85cd7a8340a4ce9e9d56ec3be31558051c82257ccb84289291f38a42
@@ -992,7 +992,7 @@ test/extractor-tests/generated/Struct/Struct_getName.ql 8f1d9da4013307b4d23a1ce5
 test/extractor-tests/generated/Struct/Struct_getVisibility.ql 17139d3f91e02a0fc12ad8443fe166fe11003301fee0c303f13aa6d1138e82d5 07bdc1fbcc0ea40508364ea632fce899cbe734159f5c377ea2029bc41bc9a3b4
 test/extractor-tests/generated/Struct/Struct_getWhereClause.ql d0db2c9811ed4568359e84255f04f0c75ae65a80d40981a1545d6cddf53e9c09 1133a46bc502757aaab61a8ac94b4a256b590548c5e27ec6a239ffd5a4a81577
 test/extractor-tests/generated/TokenTree/TokenTree.ql ba2ef197e0566640b57503579f3bc811a16fec56f4817117395bf81da08922a6 2e7b105cb917a444171669eb06f5491a4b222b1f81fa79209a138ab97db85aff
-test/extractor-tests/generated/Trait/Trait.ql a51ba80b65687fb6eb99f36e4f98565b4a9ed9cc97d2c7ad2f09254ec9089b3d 81783aedb5af5a09f470ec0df6694588a4dcf8390b1b1645fb7459d35bc1bc3e
+test/extractor-tests/generated/Trait/Trait.ql a80249a821a91e11592227126209090ce5ced83a6168136f7c53db61b5bc3914 4555281baf4d9f736a68d28c6c7b788b913933a38503a323783d57db9e8c5c02
 test/extractor-tests/generated/Trait/Trait_getAssocItemList.ql 05e6896f60afabf931a244e42f75ee55e09c749954a751d8895846de3121f58f def1f07d9945e8d9b45a659a285b0eb72b37509d20624c88e0a2d34abf7f0c72
 test/extractor-tests/generated/Trait/Trait_getAttr.ql 9711125fa4fc0212b6357f06d1bc50df50b46168d139b649034296c64d732e21 901b6a9d04055b563f13d8742bd770c76ed1b2ccf9a7236a64de9d6d287fbd52
 test/extractor-tests/generated/Trait/Trait_getGenericParamList.ql b27ff28e3aff9ec3369bbbcbee40a07a4bd8af40928c8c1cb7dd1e407a88ffee 2b48e2049df18de61ae3026f8ab4c3e9e517f411605328b37a0b71b288826925
@@ -1026,7 +1026,7 @@ test/extractor-tests/generated/TupleStructPat/TupleStructPat_getField.ql f3f2e23
 test/extractor-tests/generated/TupleStructPat/TupleStructPat_getPath.ql 13a06696bbf1fa8d5b73107e28cdba40e93da04b27f9c54381b78a52368d2ad1 5558c35ea9bb371ad90a5b374d7530dd1936f83e6ba656ebfbfd5bd63598e088
 test/extractor-tests/generated/TupleType/TupleType.ql e5951a30817b8c51fe9cb9435f75bfdca2a1277b2094267d3205e33ef1ee9a9c 9a4d57322ed2cff57057654272981b056f833136f983141b033afaf64e19c117
 test/extractor-tests/generated/TupleType/TupleType_getField.ql b73a8cdaf6ba46cf9b63d8819239d2d2c06b3496ed4768e8a387a7558178fbd8 6efbcf13c25d0ff3ed0c6d194ba44d2abfa620406badef8184953395fab92bb4
-test/extractor-tests/generated/TypeAlias/TypeAlias.ql be2f90fb1bab4f8b77687f93f0fb7180582a0a3b3bb1a5e9fb77d55c12b01048 7fb298034353d13193e6b2fbb95b2cb2f7fa11c9eff7bd10bd7180f02267883f
+test/extractor-tests/generated/TypeAlias/TypeAlias.ql 8fc7144467f3be85ffcc661630cc144a244b636220aca69f1074f8b7221eb32f 692417975c0062d4d324e8a4b5c4a95bc352bfbab03664f671240739d1ddfcfc
 test/extractor-tests/generated/TypeAlias/TypeAlias_getAttr.ql ecf4b45ef4876e46252785d2e42b11207e65757cdb26e60decafd765e7b03b49 21bb4d635d3d38abd731b9ad1a2b871f8e0788f48a03e9572823abeea0ea9382
 test/extractor-tests/generated/TypeAlias/TypeAlias_getGenericParamList.ql e7e936458dce5a8c6675485a49e2769b6dbff29c112ed744c880e0fc7ae740ef e5fcf3a33d2416db6b0a73401a3cbc0cece22d0e06794e01a1645f2b3bca9306
 test/extractor-tests/generated/TypeAlias/TypeAlias_getName.ql 757deb3493764677de3eb1ff7cc119a469482b7277ed01eb8aa0c38b4a8797fb 5efed24a6968544b10ff44bfac7d0432a9621bde0e53b8477563d600d4847825
@@ -1036,7 +1036,7 @@ test/extractor-tests/generated/TypeAlias/TypeAlias_getVisibility.ql a1851a78f31a
 test/extractor-tests/generated/TypeAlias/TypeAlias_getWhereClause.ql 0cd281b7b5d3a76e4ec1938d7dcebb41e24ed54e94f352dcf48cbcdb5d48b353 5898e71246d8ba7517dab1f8d726af02a7add79924c8e6b30ce2c760e1344e8f
 test/extractor-tests/generated/TypeArg/TypeArg.ql 8019f0eb5a64162df88e7e64ba0355578dad158b884c8eb42b2f10e093e52121 4871ac369925228978a1e16cf1393a449ea846657893d8a760fb46dbd6a0d609
 test/extractor-tests/generated/TypeArg/TypeArg_getTy.ql 54c291039d88fb460b0bc6bb83938c3be272898512415d08abffea714a000275 3117f1bbc1168b0ff75948459673c50971e3e71b0bb966783a8dc44328803f33
-test/extractor-tests/generated/TypeBound/TypeBound.ql 8824b2133040a1c39ed74d3b90669e4d8859a9dd52090e3fd71fe0d8ef90c7f0 932a0361678a16c7f538d5ee9133a61c495234de323e1e012f0ae307c8d2170e
+test/extractor-tests/generated/TypeBound/TypeBound.ql f49bc5b12f9817d9464c771bd35837c1ae6c8b3162ab6b0fc9b3e6748d18e87a 2535af71fa8e212d6f9b9e10ca0ba7958808dea4d1af432e1d5167a681d7779c
 test/extractor-tests/generated/TypeBound/TypeBound_getGenericParamList.ql 7cf4ce64ea8048b85733fc2de627480465a616d62f57345c25bb62fdfda0ca59 e63b77ed3555b150cebf205016b1cc8d1b10fda315d5a21b3e60753ad602ea8f
 test/extractor-tests/generated/TypeBound/TypeBound_getLifetime.ql 615b0f5ccbffc425a3fa9480197bfae649c072717697f59d2e9b8112d2ff3fcf 1f969aca15be820eb27fe80317ad7fd4ce60f1a0fbcb4ae98b04828b0aeca632
 test/extractor-tests/generated/TypeBound/TypeBound_getTy.ql bded40be75f99b97869e5b4701a479db91867a861fb9f2071f4f7df0980ac6a2 6bdb30e50ba3ab7c2976aa602bae54a089019c8b81cab497c962b6b96362fbab
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/BlockExpr.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/BlockExpr.qll
index 7627172ee83c..c4f11fdd90c5 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/BlockExpr.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/BlockExpr.qll
@@ -53,6 +53,36 @@ module Generated {
      */
     final int getNumberOfAttrs() { result = count(int i | exists(this.getAttr(i))) }
 
+    /**
+     * Holds if this block expression is async.
+     */
+    predicate isAsync() { Synth::convertBlockExprToRaw(this).(Raw::BlockExpr).isAsync() }
+
+    /**
+     * Holds if this block expression is const.
+     */
+    predicate isConst() { Synth::convertBlockExprToRaw(this).(Raw::BlockExpr).isConst() }
+
+    /**
+     * Holds if this block expression is gen.
+     */
+    predicate isGen() { Synth::convertBlockExprToRaw(this).(Raw::BlockExpr).isGen() }
+
+    /**
+     * Holds if this block expression is move.
+     */
+    predicate isMove() { Synth::convertBlockExprToRaw(this).(Raw::BlockExpr).isMove() }
+
+    /**
+     * Holds if this block expression is try.
+     */
+    predicate isTry() { Synth::convertBlockExprToRaw(this).(Raw::BlockExpr).isTry() }
+
+    /**
+     * Holds if this block expression is unsafe.
+     */
+    predicate isUnsafe() { Synth::convertBlockExprToRaw(this).(Raw::BlockExpr).isUnsafe() }
+
     /**
      * Gets the label of this block expression, if it exists.
      */
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/ClosureExpr.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/ClosureExpr.qll
index 54a703414710..6538501d9a26 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/ClosureExpr.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/ClosureExpr.qll
@@ -83,6 +83,31 @@ module Generated {
      */
     final predicate hasClosureBinder() { exists(this.getClosureBinder()) }
 
+    /**
+     * Holds if this closure expression is async.
+     */
+    predicate isAsync() { Synth::convertClosureExprToRaw(this).(Raw::ClosureExpr).isAsync() }
+
+    /**
+     * Holds if this closure expression is const.
+     */
+    predicate isConst() { Synth::convertClosureExprToRaw(this).(Raw::ClosureExpr).isConst() }
+
+    /**
+     * Holds if this closure expression is gen.
+     */
+    predicate isGen() { Synth::convertClosureExprToRaw(this).(Raw::ClosureExpr).isGen() }
+
+    /**
+     * Holds if this closure expression is move.
+     */
+    predicate isMove() { Synth::convertClosureExprToRaw(this).(Raw::ClosureExpr).isMove() }
+
+    /**
+     * Holds if this closure expression is static.
+     */
+    predicate isStatic() { Synth::convertClosureExprToRaw(this).(Raw::ClosureExpr).isStatic() }
+
     /**
      * Gets the parameter list of this closure expression, if it exists.
      */
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/Const.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/Const.qll
index 37c3b55204db..a9b1932a935b 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/Const.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/Const.qll
@@ -59,6 +59,16 @@ module Generated {
      */
     final predicate hasBody() { exists(this.getBody()) }
 
+    /**
+     * Holds if this const is const.
+     */
+    predicate isConst() { Synth::convertConstToRaw(this).(Raw::Const).isConst() }
+
+    /**
+     * Holds if this const is default.
+     */
+    predicate isDefault() { Synth::convertConstToRaw(this).(Raw::Const).isDefault() }
+
     /**
      * Gets the name of this const, if it exists.
      */
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/ConstBlockPat.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/ConstBlockPat.qll
index 81e0319919ab..2935c7c8f85b 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/ConstBlockPat.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/ConstBlockPat.qll
@@ -42,5 +42,10 @@ module Generated {
      * Holds if `getBlockExpr()` exists.
      */
     final predicate hasBlockExpr() { exists(this.getBlockExpr()) }
+
+    /**
+     * Holds if this const block pat is const.
+     */
+    predicate isConst() { Synth::convertConstBlockPatToRaw(this).(Raw::ConstBlockPat).isConst() }
   }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/ConstParam.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/ConstParam.qll
index c4f6cfa022da..451234d3dc1b 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/ConstParam.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/ConstParam.qll
@@ -63,6 +63,11 @@ module Generated {
      */
     final predicate hasDefaultVal() { exists(this.getDefaultVal()) }
 
+    /**
+     * Holds if this const parameter is const.
+     */
+    predicate isConst() { Synth::convertConstParamToRaw(this).(Raw::ConstParam).isConst() }
+
     /**
      * Gets the name of this const parameter, if it exists.
      */
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/ExternBlock.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/ExternBlock.qll
index f259e509c1e4..823bf4173c4b 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/ExternBlock.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/ExternBlock.qll
@@ -74,5 +74,10 @@ module Generated {
      * Holds if `getExternItemList()` exists.
      */
     final predicate hasExternItemList() { exists(this.getExternItemList()) }
+
+    /**
+     * Holds if this extern block is unsafe.
+     */
+    predicate isUnsafe() { Synth::convertExternBlockToRaw(this).(Raw::ExternBlock).isUnsafe() }
   }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/FnPtrType.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/FnPtrType.qll
index 4f8f2feb07c7..8296c401fa85 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/FnPtrType.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/FnPtrType.qll
@@ -40,6 +40,21 @@ module Generated {
      */
     final predicate hasAbi() { exists(this.getAbi()) }
 
+    /**
+     * Holds if this fn ptr type is async.
+     */
+    predicate isAsync() { Synth::convertFnPtrTypeToRaw(this).(Raw::FnPtrType).isAsync() }
+
+    /**
+     * Holds if this fn ptr type is const.
+     */
+    predicate isConst() { Synth::convertFnPtrTypeToRaw(this).(Raw::FnPtrType).isConst() }
+
+    /**
+     * Holds if this fn ptr type is unsafe.
+     */
+    predicate isUnsafe() { Synth::convertFnPtrTypeToRaw(this).(Raw::FnPtrType).isUnsafe() }
+
     /**
      * Gets the parameter list of this fn ptr type, if it exists.
      */
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/Function.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/Function.qll
index 82bfe1df7dfe..4c4513d9e33b 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/Function.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/Function.qll
@@ -101,6 +101,31 @@ module Generated {
      */
     final predicate hasGenericParamList() { exists(this.getGenericParamList()) }
 
+    /**
+     * Holds if this function is async.
+     */
+    predicate isAsync() { Synth::convertFunctionToRaw(this).(Raw::Function).isAsync() }
+
+    /**
+     * Holds if this function is const.
+     */
+    predicate isConst() { Synth::convertFunctionToRaw(this).(Raw::Function).isConst() }
+
+    /**
+     * Holds if this function is default.
+     */
+    predicate isDefault() { Synth::convertFunctionToRaw(this).(Raw::Function).isDefault() }
+
+    /**
+     * Holds if this function is gen.
+     */
+    predicate isGen() { Synth::convertFunctionToRaw(this).(Raw::Function).isGen() }
+
+    /**
+     * Holds if this function is unsafe.
+     */
+    predicate isUnsafe() { Synth::convertFunctionToRaw(this).(Raw::Function).isUnsafe() }
+
     /**
      * Gets the name of this function, if it exists.
      */
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/IdentPat.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/IdentPat.qll
index bf77fbc3c083..275272f06a0d 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/IdentPat.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/IdentPat.qll
@@ -54,6 +54,16 @@ module Generated {
      */
     final int getNumberOfAttrs() { result = count(int i | exists(this.getAttr(i))) }
 
+    /**
+     * Holds if this ident pat is mut.
+     */
+    predicate isMut() { Synth::convertIdentPatToRaw(this).(Raw::IdentPat).isMut() }
+
+    /**
+     * Holds if this ident pat is reference.
+     */
+    predicate isRef() { Synth::convertIdentPatToRaw(this).(Raw::IdentPat).isRef() }
+
     /**
      * Gets the name of this ident pat, if it exists.
      */
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/Impl.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/Impl.qll
index 1b99ed4745b1..14ec8ee38630 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/Impl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/Impl.qll
@@ -77,6 +77,21 @@ module Generated {
      */
     final predicate hasGenericParamList() { exists(this.getGenericParamList()) }
 
+    /**
+     * Holds if this impl is const.
+     */
+    predicate isConst() { Synth::convertImplToRaw(this).(Raw::Impl).isConst() }
+
+    /**
+     * Holds if this impl is default.
+     */
+    predicate isDefault() { Synth::convertImplToRaw(this).(Raw::Impl).isDefault() }
+
+    /**
+     * Holds if this impl is unsafe.
+     */
+    predicate isUnsafe() { Synth::convertImplToRaw(this).(Raw::Impl).isUnsafe() }
+
     /**
      * Gets the self ty of this impl, if it exists.
      */
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/Meta.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/Meta.qll
index 146c08a9b1e6..9f4252af3090 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/Meta.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/Meta.qll
@@ -39,6 +39,11 @@ module Generated {
      */
     final predicate hasExpr() { exists(this.getExpr()) }
 
+    /**
+     * Holds if this meta is unsafe.
+     */
+    predicate isUnsafe() { Synth::convertMetaToRaw(this).(Raw::Meta).isUnsafe() }
+
     /**
      * Gets the path of this meta, if it exists.
      */
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/PtrType.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/PtrType.qll
index 47f438002db3..598052d09d5f 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/PtrType.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/PtrType.qll
@@ -25,6 +25,16 @@ module Generated {
   class PtrType extends Synth::TPtrType, TypeRefImpl::TypeRef {
     override string getAPrimaryQlClass() { result = "PtrType" }
 
+    /**
+     * Holds if this ptr type is const.
+     */
+    predicate isConst() { Synth::convertPtrTypeToRaw(this).(Raw::PtrType).isConst() }
+
+    /**
+     * Holds if this ptr type is mut.
+     */
+    predicate isMut() { Synth::convertPtrTypeToRaw(this).(Raw::PtrType).isMut() }
+
     /**
      * Gets the ty of this ptr type, if it exists.
      */
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/Raw.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/Raw.qll
index 4726ec0fd391..26330df68311 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/Raw.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/Raw.qll
@@ -421,6 +421,11 @@ module Raw {
      */
     Expr getExpr() { meta_exprs(this, result) }
 
+    /**
+     * Holds if this meta is unsafe.
+     */
+    predicate isUnsafe() { meta_is_unsafe(this) }
+
     /**
      * Gets the path of this meta, if it exists.
      */
@@ -772,6 +777,11 @@ module Raw {
      */
     Attr getAttr(int index) { self_param_attrs(this, index, result) }
 
+    /**
+     * Holds if this self parameter is mut.
+     */
+    predicate isMut() { self_param_is_mut(this) }
+
     /**
      * Gets the lifetime of this self parameter, if it exists.
      */
@@ -899,6 +909,16 @@ module Raw {
      */
     GenericParamList getGenericParamList() { type_bound_generic_param_lists(this, result) }
 
+    /**
+     * Holds if this type bound is async.
+     */
+    predicate isAsync() { type_bound_is_async(this) }
+
+    /**
+     * Holds if this type bound is const.
+     */
+    predicate isConst() { type_bound_is_const(this) }
+
     /**
      * Gets the lifetime of this type bound, if it exists.
      */
@@ -1320,6 +1340,36 @@ module Raw {
      */
     Attr getAttr(int index) { block_expr_attrs(this, index, result) }
 
+    /**
+     * Holds if this block expression is async.
+     */
+    predicate isAsync() { block_expr_is_async(this) }
+
+    /**
+     * Holds if this block expression is const.
+     */
+    predicate isConst() { block_expr_is_const(this) }
+
+    /**
+     * Holds if this block expression is gen.
+     */
+    predicate isGen() { block_expr_is_gen(this) }
+
+    /**
+     * Holds if this block expression is move.
+     */
+    predicate isMove() { block_expr_is_move(this) }
+
+    /**
+     * Holds if this block expression is try.
+     */
+    predicate isTry() { block_expr_is_try(this) }
+
+    /**
+     * Holds if this block expression is unsafe.
+     */
+    predicate isUnsafe() { block_expr_is_unsafe(this) }
+
     /**
      * Gets the label of this block expression, if it exists.
      */
@@ -1481,6 +1531,31 @@ module Raw {
      */
     ClosureBinder getClosureBinder() { closure_expr_closure_binders(this, result) }
 
+    /**
+     * Holds if this closure expression is async.
+     */
+    predicate isAsync() { closure_expr_is_async(this) }
+
+    /**
+     * Holds if this closure expression is const.
+     */
+    predicate isConst() { closure_expr_is_const(this) }
+
+    /**
+     * Holds if this closure expression is gen.
+     */
+    predicate isGen() { closure_expr_is_gen(this) }
+
+    /**
+     * Holds if this closure expression is move.
+     */
+    predicate isMove() { closure_expr_is_move(this) }
+
+    /**
+     * Holds if this closure expression is static.
+     */
+    predicate isStatic() { closure_expr_is_static(this) }
+
     /**
      * Gets the parameter list of this closure expression, if it exists.
      */
@@ -1547,6 +1622,11 @@ module Raw {
      * Gets the block expression of this const block pat, if it exists.
      */
     BlockExpr getBlockExpr() { const_block_pat_block_exprs(this, result) }
+
+    /**
+     * Holds if this const block pat is const.
+     */
+    predicate isConst() { const_block_pat_is_const(this) }
   }
 
   /**
@@ -1569,6 +1649,11 @@ module Raw {
      */
     ConstArg getDefaultVal() { const_param_default_vals(this, result) }
 
+    /**
+     * Holds if this const parameter is const.
+     */
+    predicate isConst() { const_param_is_const(this) }
+
     /**
      * Gets the name of this const parameter, if it exists.
      */
@@ -1687,6 +1772,21 @@ module Raw {
      */
     Abi getAbi() { fn_ptr_type_abis(this, result) }
 
+    /**
+     * Holds if this fn ptr type is async.
+     */
+    predicate isAsync() { fn_ptr_type_is_async(this) }
+
+    /**
+     * Holds if this fn ptr type is const.
+     */
+    predicate isConst() { fn_ptr_type_is_const(this) }
+
+    /**
+     * Holds if this fn ptr type is unsafe.
+     */
+    predicate isUnsafe() { fn_ptr_type_is_unsafe(this) }
+
     /**
      * Gets the parameter list of this fn ptr type, if it exists.
      */
@@ -1805,6 +1905,16 @@ module Raw {
      */
     Attr getAttr(int index) { ident_pat_attrs(this, index, result) }
 
+    /**
+     * Holds if this ident pat is mut.
+     */
+    predicate isMut() { ident_pat_is_mut(this) }
+
+    /**
+     * Holds if this ident pat is reference.
+     */
+    predicate isRef() { ident_pat_is_ref(this) }
+
     /**
      * Gets the name of this ident pat, if it exists.
      */
@@ -2448,6 +2558,16 @@ module Raw {
   class PtrType extends @ptr_type, TypeRef {
     override string toString() { result = "PtrType" }
 
+    /**
+     * Holds if this ptr type is const.
+     */
+    predicate isConst() { ptr_type_is_const(this) }
+
+    /**
+     * Holds if this ptr type is mut.
+     */
+    predicate isMut() { ptr_type_is_mut(this) }
+
     /**
      * Gets the ty of this ptr type, if it exists.
      */
@@ -2608,6 +2728,21 @@ module Raw {
      * Gets the expression of this reference expression, if it exists.
      */
     Expr getExpr() { ref_expr_exprs(this, result) }
+
+    /**
+     * Holds if this reference expression is const.
+     */
+    predicate isConst() { ref_expr_is_const(this) }
+
+    /**
+     * Holds if this reference expression is mut.
+     */
+    predicate isMut() { ref_expr_is_mut(this) }
+
+    /**
+     * Holds if this reference expression is raw.
+     */
+    predicate isRaw() { ref_expr_is_raw(this) }
   }
 
   /**
@@ -2623,6 +2758,11 @@ module Raw {
   class RefPat extends @ref_pat, Pat {
     override string toString() { result = "RefPat" }
 
+    /**
+     * Holds if this reference pat is mut.
+     */
+    predicate isMut() { ref_pat_is_mut(this) }
+
     /**
      * Gets the pat of this reference pat, if it exists.
      */
@@ -2639,6 +2779,11 @@ module Raw {
   class RefType extends @ref_type, TypeRef {
     override string toString() { result = "RefType" }
 
+    /**
+     * Holds if this reference type is mut.
+     */
+    predicate isMut() { ref_type_is_mut(this) }
+
     /**
      * Gets the lifetime of this reference type, if it exists.
      */
@@ -3019,6 +3164,16 @@ module Raw {
      */
     Expr getBody() { const_bodies(this, result) }
 
+    /**
+     * Holds if this const is const.
+     */
+    predicate isConst() { const_is_const(this) }
+
+    /**
+     * Holds if this const is default.
+     */
+    predicate isDefault() { const_is_default(this) }
+
     /**
      * Gets the name of this const, if it exists.
      */
@@ -3100,6 +3255,11 @@ module Raw {
      * Gets the extern item list of this extern block, if it exists.
      */
     ExternItemList getExternItemList() { extern_block_extern_item_lists(this, result) }
+
+    /**
+     * Holds if this extern block is unsafe.
+     */
+    predicate isUnsafe() { extern_block_is_unsafe(this) }
   }
 
   /**
@@ -3169,6 +3329,31 @@ module Raw {
      */
     GenericParamList getGenericParamList() { function_generic_param_lists(this, result) }
 
+    /**
+     * Holds if this function is async.
+     */
+    predicate isAsync() { function_is_async(this) }
+
+    /**
+     * Holds if this function is const.
+     */
+    predicate isConst() { function_is_const(this) }
+
+    /**
+     * Holds if this function is default.
+     */
+    predicate isDefault() { function_is_default(this) }
+
+    /**
+     * Holds if this function is gen.
+     */
+    predicate isGen() { function_is_gen(this) }
+
+    /**
+     * Holds if this function is unsafe.
+     */
+    predicate isUnsafe() { function_is_unsafe(this) }
+
     /**
      * Gets the name of this function, if it exists.
      */
@@ -3220,6 +3405,21 @@ module Raw {
      */
     GenericParamList getGenericParamList() { impl_generic_param_lists(this, result) }
 
+    /**
+     * Holds if this impl is const.
+     */
+    predicate isConst() { impl_is_const(this) }
+
+    /**
+     * Holds if this impl is default.
+     */
+    predicate isDefault() { impl_is_default(this) }
+
+    /**
+     * Holds if this impl is unsafe.
+     */
+    predicate isUnsafe() { impl_is_unsafe(this) }
+
     /**
      * Gets the self ty of this impl, if it exists.
      */
@@ -3390,6 +3590,16 @@ module Raw {
      */
     Expr getBody() { static_bodies(this, result) }
 
+    /**
+     * Holds if this static is mut.
+     */
+    predicate isMut() { static_is_mut(this) }
+
+    /**
+     * Holds if this static is static.
+     */
+    predicate isStatic() { static_is_static(this) }
+
     /**
      * Gets the name of this static, if it exists.
      */
@@ -3472,6 +3682,16 @@ module Raw {
      */
     GenericParamList getGenericParamList() { trait_generic_param_lists(this, result) }
 
+    /**
+     * Holds if this trait is auto.
+     */
+    predicate isAuto() { trait_is_auto(this) }
+
+    /**
+     * Holds if this trait is unsafe.
+     */
+    predicate isUnsafe() { trait_is_unsafe(this) }
+
     /**
      * Gets the name of this trait, if it exists.
      */
@@ -3554,6 +3774,11 @@ module Raw {
      */
     GenericParamList getGenericParamList() { type_alias_generic_param_lists(this, result) }
 
+    /**
+     * Holds if this type alias is default.
+     */
+    predicate isDefault() { type_alias_is_default(this) }
+
     /**
      * Gets the name of this type alias, if it exists.
      */
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/RefExpr.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/RefExpr.qll
index 90572fcf99ee..4eef67e3ed17 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/RefExpr.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/RefExpr.qll
@@ -58,5 +58,20 @@ module Generated {
      * Holds if `getExpr()` exists.
      */
     final predicate hasExpr() { exists(this.getExpr()) }
+
+    /**
+     * Holds if this reference expression is const.
+     */
+    predicate isConst() { Synth::convertRefExprToRaw(this).(Raw::RefExpr).isConst() }
+
+    /**
+     * Holds if this reference expression is mut.
+     */
+    predicate isMut() { Synth::convertRefExprToRaw(this).(Raw::RefExpr).isMut() }
+
+    /**
+     * Holds if this reference expression is raw.
+     */
+    predicate isRaw() { Synth::convertRefExprToRaw(this).(Raw::RefExpr).isRaw() }
   }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/RefPat.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/RefPat.qll
index c16c87405c20..197030ea1cbf 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/RefPat.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/RefPat.qll
@@ -28,6 +28,11 @@ module Generated {
   class RefPat extends Synth::TRefPat, PatImpl::Pat {
     override string getAPrimaryQlClass() { result = "RefPat" }
 
+    /**
+     * Holds if this reference pat is mut.
+     */
+    predicate isMut() { Synth::convertRefPatToRaw(this).(Raw::RefPat).isMut() }
+
     /**
      * Gets the pat of this reference pat, if it exists.
      */
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/RefType.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/RefType.qll
index 2d3df19798c1..ce0bbf1e416e 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/RefType.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/RefType.qll
@@ -26,6 +26,11 @@ module Generated {
   class RefType extends Synth::TRefType, TypeRefImpl::TypeRef {
     override string getAPrimaryQlClass() { result = "RefType" }
 
+    /**
+     * Holds if this reference type is mut.
+     */
+    predicate isMut() { Synth::convertRefTypeToRaw(this).(Raw::RefType).isMut() }
+
     /**
      * Gets the lifetime of this reference type, if it exists.
      */
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/SelfParam.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/SelfParam.qll
index 24bf5433361f..243d04e9bb77 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/SelfParam.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/SelfParam.qll
@@ -46,6 +46,11 @@ module Generated {
      */
     final int getNumberOfAttrs() { result = count(int i | exists(this.getAttr(i))) }
 
+    /**
+     * Holds if this self parameter is mut.
+     */
+    predicate isMut() { Synth::convertSelfParamToRaw(this).(Raw::SelfParam).isMut() }
+
     /**
      * Gets the lifetime of this self parameter, if it exists.
      */
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/Static.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/Static.qll
index 6fbe692fb28d..a7d5828ee980 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/Static.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/Static.qll
@@ -60,6 +60,16 @@ module Generated {
      */
     final predicate hasBody() { exists(this.getBody()) }
 
+    /**
+     * Holds if this static is mut.
+     */
+    predicate isMut() { Synth::convertStaticToRaw(this).(Raw::Static).isMut() }
+
+    /**
+     * Holds if this static is static.
+     */
+    predicate isStatic() { Synth::convertStaticToRaw(this).(Raw::Static).isStatic() }
+
     /**
      * Gets the name of this static, if it exists.
      */
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/Trait.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/Trait.qll
index 88cea87c5b5a..acbcb1e2e24b 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/Trait.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/Trait.qll
@@ -78,6 +78,16 @@ module Generated {
      */
     final predicate hasGenericParamList() { exists(this.getGenericParamList()) }
 
+    /**
+     * Holds if this trait is auto.
+     */
+    predicate isAuto() { Synth::convertTraitToRaw(this).(Raw::Trait).isAuto() }
+
+    /**
+     * Holds if this trait is unsafe.
+     */
+    predicate isUnsafe() { Synth::convertTraitToRaw(this).(Raw::Trait).isUnsafe() }
+
     /**
      * Gets the name of this trait, if it exists.
      */
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/TypeAlias.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/TypeAlias.qll
index 1014900cb0a6..2f5294ef65e8 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/TypeAlias.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/TypeAlias.qll
@@ -68,6 +68,11 @@ module Generated {
      */
     final predicate hasGenericParamList() { exists(this.getGenericParamList()) }
 
+    /**
+     * Holds if this type alias is default.
+     */
+    predicate isDefault() { Synth::convertTypeAliasToRaw(this).(Raw::TypeAlias).isDefault() }
+
     /**
      * Gets the name of this type alias, if it exists.
      */
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/TypeBound.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/TypeBound.qll
index 4a571897ba71..e83586d9cdf9 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/TypeBound.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/TypeBound.qll
@@ -42,6 +42,16 @@ module Generated {
      */
     final predicate hasGenericParamList() { exists(this.getGenericParamList()) }
 
+    /**
+     * Holds if this type bound is async.
+     */
+    predicate isAsync() { Synth::convertTypeBoundToRaw(this).(Raw::TypeBound).isAsync() }
+
+    /**
+     * Holds if this type bound is const.
+     */
+    predicate isConst() { Synth::convertTypeBoundToRaw(this).(Raw::TypeBound).isConst() }
+
     /**
      * Gets the lifetime of this type bound, if it exists.
      */
diff --git a/rust/ql/lib/rust.dbscheme b/rust/ql/lib/rust.dbscheme
index 831141fef1dd..029fff99f4dd 100644
--- a/rust/ql/lib/rust.dbscheme
+++ b/rust/ql/lib/rust.dbscheme
@@ -500,6 +500,11 @@ meta_exprs(
   int expr: @expr ref
 );
 
+#keyset[id]
+meta_is_unsafe(
+  int id: @meta ref
+);
+
 #keyset[id]
 meta_paths(
   int id: @meta ref,
@@ -804,6 +809,11 @@ self_param_attrs(
   int attr: @attr ref
 );
 
+#keyset[id]
+self_param_is_mut(
+  int id: @self_param ref
+);
+
 #keyset[id]
 self_param_lifetimes(
   int id: @self_param ref,
@@ -911,6 +921,16 @@ type_bound_generic_param_lists(
   int generic_param_list: @generic_param_list ref
 );
 
+#keyset[id]
+type_bound_is_async(
+  int id: @type_bound ref
+);
+
+#keyset[id]
+type_bound_is_const(
+  int id: @type_bound ref
+);
+
 #keyset[id]
 type_bound_lifetimes(
   int id: @type_bound ref,
@@ -1256,6 +1276,36 @@ block_expr_attrs(
   int attr: @attr ref
 );
 
+#keyset[id]
+block_expr_is_async(
+  int id: @block_expr ref
+);
+
+#keyset[id]
+block_expr_is_const(
+  int id: @block_expr ref
+);
+
+#keyset[id]
+block_expr_is_gen(
+  int id: @block_expr ref
+);
+
+#keyset[id]
+block_expr_is_move(
+  int id: @block_expr ref
+);
+
+#keyset[id]
+block_expr_is_try(
+  int id: @block_expr ref
+);
+
+#keyset[id]
+block_expr_is_unsafe(
+  int id: @block_expr ref
+);
+
 #keyset[id]
 block_expr_labels(
   int id: @block_expr ref,
@@ -1370,6 +1420,31 @@ closure_expr_closure_binders(
   int closure_binder: @closure_binder ref
 );
 
+#keyset[id]
+closure_expr_is_async(
+  int id: @closure_expr ref
+);
+
+#keyset[id]
+closure_expr_is_const(
+  int id: @closure_expr ref
+);
+
+#keyset[id]
+closure_expr_is_gen(
+  int id: @closure_expr ref
+);
+
+#keyset[id]
+closure_expr_is_move(
+  int id: @closure_expr ref
+);
+
+#keyset[id]
+closure_expr_is_static(
+  int id: @closure_expr ref
+);
+
 #keyset[id]
 closure_expr_param_lists(
   int id: @closure_expr ref,
@@ -1408,6 +1483,11 @@ const_block_pat_block_exprs(
   int block_expr: @block_expr ref
 );
 
+#keyset[id]
+const_block_pat_is_const(
+  int id: @const_block_pat ref
+);
+
 const_params(
   unique int id: @const_param
 );
@@ -1425,6 +1505,11 @@ const_param_default_vals(
   int default_val: @const_arg ref
 );
 
+#keyset[id]
+const_param_is_const(
+  int id: @const_param ref
+);
+
 #keyset[id]
 const_param_names(
   int id: @const_param ref,
@@ -1507,6 +1592,21 @@ fn_ptr_type_abis(
   int abi: @abi ref
 );
 
+#keyset[id]
+fn_ptr_type_is_async(
+  int id: @fn_ptr_type ref
+);
+
+#keyset[id]
+fn_ptr_type_is_const(
+  int id: @fn_ptr_type ref
+);
+
+#keyset[id]
+fn_ptr_type_is_unsafe(
+  int id: @fn_ptr_type ref
+);
+
 #keyset[id]
 fn_ptr_type_param_lists(
   int id: @fn_ptr_type ref,
@@ -1605,6 +1705,16 @@ ident_pat_attrs(
   int attr: @attr ref
 );
 
+#keyset[id]
+ident_pat_is_mut(
+  int id: @ident_pat ref
+);
+
+#keyset[id]
+ident_pat_is_ref(
+  int id: @ident_pat ref
+);
+
 #keyset[id]
 ident_pat_names(
   int id: @ident_pat ref,
@@ -2072,6 +2182,16 @@ ptr_types(
   unique int id: @ptr_type
 );
 
+#keyset[id]
+ptr_type_is_const(
+  int id: @ptr_type ref
+);
+
+#keyset[id]
+ptr_type_is_mut(
+  int id: @ptr_type ref
+);
+
 #keyset[id]
 ptr_type_ties(
   int id: @ptr_type ref,
@@ -2189,10 +2309,30 @@ ref_expr_exprs(
   int expr: @expr ref
 );
 
+#keyset[id]
+ref_expr_is_const(
+  int id: @ref_expr ref
+);
+
+#keyset[id]
+ref_expr_is_mut(
+  int id: @ref_expr ref
+);
+
+#keyset[id]
+ref_expr_is_raw(
+  int id: @ref_expr ref
+);
+
 ref_pats(
   unique int id: @ref_pat
 );
 
+#keyset[id]
+ref_pat_is_mut(
+  int id: @ref_pat ref
+);
+
 #keyset[id]
 ref_pat_pats(
   int id: @ref_pat ref,
@@ -2203,6 +2343,11 @@ ref_types(
   unique int id: @ref_type
 );
 
+#keyset[id]
+ref_type_is_mut(
+  int id: @ref_type ref
+);
+
 #keyset[id]
 ref_type_lifetimes(
   int id: @ref_type ref,
@@ -2483,6 +2628,16 @@ const_bodies(
   int body: @expr ref
 );
 
+#keyset[id]
+const_is_const(
+  int id: @const ref
+);
+
+#keyset[id]
+const_is_default(
+  int id: @const ref
+);
+
 #keyset[id]
 const_names(
   int id: @const ref,
@@ -2565,6 +2720,11 @@ extern_block_extern_item_lists(
   int extern_item_list: @extern_item_list ref
 );
 
+#keyset[id]
+extern_block_is_unsafe(
+  int id: @extern_block ref
+);
+
 extern_crates(
   unique int id: @extern_crate
 );
@@ -2623,6 +2783,31 @@ function_generic_param_lists(
   int generic_param_list: @generic_param_list ref
 );
 
+#keyset[id]
+function_is_async(
+  int id: @function ref
+);
+
+#keyset[id]
+function_is_const(
+  int id: @function ref
+);
+
+#keyset[id]
+function_is_default(
+  int id: @function ref
+);
+
+#keyset[id]
+function_is_gen(
+  int id: @function ref
+);
+
+#keyset[id]
+function_is_unsafe(
+  int id: @function ref
+);
+
 #keyset[id]
 function_names(
   int id: @function ref,
@@ -2676,6 +2861,21 @@ impl_generic_param_lists(
   int generic_param_list: @generic_param_list ref
 );
 
+#keyset[id]
+impl_is_const(
+  int id: @impl ref
+);
+
+#keyset[id]
+impl_is_default(
+  int id: @impl ref
+);
+
+#keyset[id]
+impl_is_unsafe(
+  int id: @impl ref
+);
+
 #keyset[id]
 impl_self_ties(
   int id: @impl ref,
@@ -2833,6 +3033,16 @@ static_bodies(
   int body: @expr ref
 );
 
+#keyset[id]
+static_is_mut(
+  int id: @static ref
+);
+
+#keyset[id]
+static_is_static(
+  int id: @static ref
+);
+
 #keyset[id]
 static_names(
   int id: @static ref,
@@ -2915,6 +3125,16 @@ trait_generic_param_lists(
   int generic_param_list: @generic_param_list ref
 );
 
+#keyset[id]
+trait_is_auto(
+  int id: @trait ref
+);
+
+#keyset[id]
+trait_is_unsafe(
+  int id: @trait ref
+);
+
 #keyset[id]
 trait_names(
   int id: @trait ref,
@@ -2997,6 +3217,11 @@ type_alias_generic_param_lists(
   int generic_param_list: @generic_param_list ref
 );
 
+#keyset[id]
+type_alias_is_default(
+  int id: @type_alias ref
+);
+
 #keyset[id]
 type_alias_names(
   int id: @type_alias ref,
diff --git a/rust/ql/test/extractor-tests/generated/BlockExpr/BlockExpr.ql b/rust/ql/test/extractor-tests/generated/BlockExpr/BlockExpr.ql
index 7748f7d14135..581070545155 100644
--- a/rust/ql/test/extractor-tests/generated/BlockExpr/BlockExpr.ql
+++ b/rust/ql/test/extractor-tests/generated/BlockExpr/BlockExpr.ql
@@ -2,11 +2,21 @@
 import codeql.rust.elements
 import TestUtils
 
-from BlockExpr x, int getNumberOfAttrs, string hasLabel, string hasStmtList
+from
+  BlockExpr x, int getNumberOfAttrs, string isAsync, string isConst, string isGen, string isMove,
+  string isTry, string isUnsafe, string hasLabel, string hasStmtList
 where
   toBeTested(x) and
   not x.isUnknown() and
   getNumberOfAttrs = x.getNumberOfAttrs() and
+  (if x.isAsync() then isAsync = "yes" else isAsync = "no") and
+  (if x.isConst() then isConst = "yes" else isConst = "no") and
+  (if x.isGen() then isGen = "yes" else isGen = "no") and
+  (if x.isMove() then isMove = "yes" else isMove = "no") and
+  (if x.isTry() then isTry = "yes" else isTry = "no") and
+  (if x.isUnsafe() then isUnsafe = "yes" else isUnsafe = "no") and
   (if x.hasLabel() then hasLabel = "yes" else hasLabel = "no") and
   if x.hasStmtList() then hasStmtList = "yes" else hasStmtList = "no"
-select x, "getNumberOfAttrs:", getNumberOfAttrs, "hasLabel:", hasLabel, "hasStmtList:", hasStmtList
+select x, "getNumberOfAttrs:", getNumberOfAttrs, "isAsync:", isAsync, "isConst:", isConst, "isGen:",
+  isGen, "isMove:", isMove, "isTry:", isTry, "isUnsafe:", isUnsafe, "hasLabel:", hasLabel,
+  "hasStmtList:", hasStmtList
diff --git a/rust/ql/test/extractor-tests/generated/ClosureExpr/ClosureExpr.ql b/rust/ql/test/extractor-tests/generated/ClosureExpr/ClosureExpr.ql
index 5fabed2d7da4..f55b0c78d22a 100644
--- a/rust/ql/test/extractor-tests/generated/ClosureExpr/ClosureExpr.ql
+++ b/rust/ql/test/extractor-tests/generated/ClosureExpr/ClosureExpr.ql
@@ -3,7 +3,8 @@ import codeql.rust.elements
 import TestUtils
 
 from
-  ClosureExpr x, int getNumberOfAttrs, string hasBody, string hasClosureBinder, string hasParamList,
+  ClosureExpr x, int getNumberOfAttrs, string hasBody, string hasClosureBinder, string isAsync,
+  string isConst, string isGen, string isMove, string isStatic, string hasParamList,
   string hasRetType
 where
   toBeTested(x) and
@@ -11,7 +12,13 @@ where
   getNumberOfAttrs = x.getNumberOfAttrs() and
   (if x.hasBody() then hasBody = "yes" else hasBody = "no") and
   (if x.hasClosureBinder() then hasClosureBinder = "yes" else hasClosureBinder = "no") and
+  (if x.isAsync() then isAsync = "yes" else isAsync = "no") and
+  (if x.isConst() then isConst = "yes" else isConst = "no") and
+  (if x.isGen() then isGen = "yes" else isGen = "no") and
+  (if x.isMove() then isMove = "yes" else isMove = "no") and
+  (if x.isStatic() then isStatic = "yes" else isStatic = "no") and
   (if x.hasParamList() then hasParamList = "yes" else hasParamList = "no") and
   if x.hasRetType() then hasRetType = "yes" else hasRetType = "no"
 select x, "getNumberOfAttrs:", getNumberOfAttrs, "hasBody:", hasBody, "hasClosureBinder:",
-  hasClosureBinder, "hasParamList:", hasParamList, "hasRetType:", hasRetType
+  hasClosureBinder, "isAsync:", isAsync, "isConst:", isConst, "isGen:", isGen, "isMove:", isMove,
+  "isStatic:", isStatic, "hasParamList:", hasParamList, "hasRetType:", hasRetType
diff --git a/rust/ql/test/extractor-tests/generated/Const/Const.ql b/rust/ql/test/extractor-tests/generated/Const/Const.ql
index 9af69afe4d3b..a5def567f8c2 100644
--- a/rust/ql/test/extractor-tests/generated/Const/Const.ql
+++ b/rust/ql/test/extractor-tests/generated/Const/Const.ql
@@ -3,14 +3,17 @@ import codeql.rust.elements
 import TestUtils
 
 from
-  Const x, int getNumberOfAttrs, string hasBody, string hasName, string hasTy, string hasVisibility
+  Const x, int getNumberOfAttrs, string hasBody, string isConst, string isDefault, string hasName,
+  string hasTy, string hasVisibility
 where
   toBeTested(x) and
   not x.isUnknown() and
   getNumberOfAttrs = x.getNumberOfAttrs() and
   (if x.hasBody() then hasBody = "yes" else hasBody = "no") and
+  (if x.isConst() then isConst = "yes" else isConst = "no") and
+  (if x.isDefault() then isDefault = "yes" else isDefault = "no") and
   (if x.hasName() then hasName = "yes" else hasName = "no") and
   (if x.hasTy() then hasTy = "yes" else hasTy = "no") and
   if x.hasVisibility() then hasVisibility = "yes" else hasVisibility = "no"
-select x, "getNumberOfAttrs:", getNumberOfAttrs, "hasBody:", hasBody, "hasName:", hasName, "hasTy:",
-  hasTy, "hasVisibility:", hasVisibility
+select x, "getNumberOfAttrs:", getNumberOfAttrs, "hasBody:", hasBody, "isConst:", isConst,
+  "isDefault:", isDefault, "hasName:", hasName, "hasTy:", hasTy, "hasVisibility:", hasVisibility
diff --git a/rust/ql/test/extractor-tests/generated/ConstBlockPat/ConstBlockPat.ql b/rust/ql/test/extractor-tests/generated/ConstBlockPat/ConstBlockPat.ql
index 058f9bcae1d8..005f8a752c1f 100644
--- a/rust/ql/test/extractor-tests/generated/ConstBlockPat/ConstBlockPat.ql
+++ b/rust/ql/test/extractor-tests/generated/ConstBlockPat/ConstBlockPat.ql
@@ -2,9 +2,10 @@
 import codeql.rust.elements
 import TestUtils
 
-from ConstBlockPat x, string hasBlockExpr
+from ConstBlockPat x, string hasBlockExpr, string isConst
 where
   toBeTested(x) and
   not x.isUnknown() and
-  if x.hasBlockExpr() then hasBlockExpr = "yes" else hasBlockExpr = "no"
-select x, "hasBlockExpr:", hasBlockExpr
+  (if x.hasBlockExpr() then hasBlockExpr = "yes" else hasBlockExpr = "no") and
+  if x.isConst() then isConst = "yes" else isConst = "no"
+select x, "hasBlockExpr:", hasBlockExpr, "isConst:", isConst
diff --git a/rust/ql/test/extractor-tests/generated/ConstParam/ConstParam.ql b/rust/ql/test/extractor-tests/generated/ConstParam/ConstParam.ql
index 2415e1728d9c..5988a54b4d1b 100644
--- a/rust/ql/test/extractor-tests/generated/ConstParam/ConstParam.ql
+++ b/rust/ql/test/extractor-tests/generated/ConstParam/ConstParam.ql
@@ -2,13 +2,16 @@
 import codeql.rust.elements
 import TestUtils
 
-from ConstParam x, int getNumberOfAttrs, string hasDefaultVal, string hasName, string hasTy
+from
+  ConstParam x, int getNumberOfAttrs, string hasDefaultVal, string isConst, string hasName,
+  string hasTy
 where
   toBeTested(x) and
   not x.isUnknown() and
   getNumberOfAttrs = x.getNumberOfAttrs() and
   (if x.hasDefaultVal() then hasDefaultVal = "yes" else hasDefaultVal = "no") and
+  (if x.isConst() then isConst = "yes" else isConst = "no") and
   (if x.hasName() then hasName = "yes" else hasName = "no") and
   if x.hasTy() then hasTy = "yes" else hasTy = "no"
-select x, "getNumberOfAttrs:", getNumberOfAttrs, "hasDefaultVal:", hasDefaultVal, "hasName:",
-  hasName, "hasTy:", hasTy
+select x, "getNumberOfAttrs:", getNumberOfAttrs, "hasDefaultVal:", hasDefaultVal, "isConst:",
+  isConst, "hasName:", hasName, "hasTy:", hasTy
diff --git a/rust/ql/test/extractor-tests/generated/ExternBlock/ExternBlock.ql b/rust/ql/test/extractor-tests/generated/ExternBlock/ExternBlock.ql
index 8400769a595f..7348a546ec20 100644
--- a/rust/ql/test/extractor-tests/generated/ExternBlock/ExternBlock.ql
+++ b/rust/ql/test/extractor-tests/generated/ExternBlock/ExternBlock.ql
@@ -2,12 +2,13 @@
 import codeql.rust.elements
 import TestUtils
 
-from ExternBlock x, string hasAbi, int getNumberOfAttrs, string hasExternItemList
+from ExternBlock x, string hasAbi, int getNumberOfAttrs, string hasExternItemList, string isUnsafe
 where
   toBeTested(x) and
   not x.isUnknown() and
   (if x.hasAbi() then hasAbi = "yes" else hasAbi = "no") and
   getNumberOfAttrs = x.getNumberOfAttrs() and
-  if x.hasExternItemList() then hasExternItemList = "yes" else hasExternItemList = "no"
+  (if x.hasExternItemList() then hasExternItemList = "yes" else hasExternItemList = "no") and
+  if x.isUnsafe() then isUnsafe = "yes" else isUnsafe = "no"
 select x, "hasAbi:", hasAbi, "getNumberOfAttrs:", getNumberOfAttrs, "hasExternItemList:",
-  hasExternItemList
+  hasExternItemList, "isUnsafe:", isUnsafe
diff --git a/rust/ql/test/extractor-tests/generated/FnPtrType/FnPtrType.ql b/rust/ql/test/extractor-tests/generated/FnPtrType/FnPtrType.ql
index b5b871c4f271..83cf90dec0a0 100644
--- a/rust/ql/test/extractor-tests/generated/FnPtrType/FnPtrType.ql
+++ b/rust/ql/test/extractor-tests/generated/FnPtrType/FnPtrType.ql
@@ -2,11 +2,17 @@
 import codeql.rust.elements
 import TestUtils
 
-from FnPtrType x, string hasAbi, string hasParamList, string hasRetType
+from
+  FnPtrType x, string hasAbi, string isAsync, string isConst, string isUnsafe, string hasParamList,
+  string hasRetType
 where
   toBeTested(x) and
   not x.isUnknown() and
   (if x.hasAbi() then hasAbi = "yes" else hasAbi = "no") and
+  (if x.isAsync() then isAsync = "yes" else isAsync = "no") and
+  (if x.isConst() then isConst = "yes" else isConst = "no") and
+  (if x.isUnsafe() then isUnsafe = "yes" else isUnsafe = "no") and
   (if x.hasParamList() then hasParamList = "yes" else hasParamList = "no") and
   if x.hasRetType() then hasRetType = "yes" else hasRetType = "no"
-select x, "hasAbi:", hasAbi, "hasParamList:", hasParamList, "hasRetType:", hasRetType
+select x, "hasAbi:", hasAbi, "isAsync:", isAsync, "isConst:", isConst, "isUnsafe:", isUnsafe,
+  "hasParamList:", hasParamList, "hasRetType:", hasRetType
diff --git a/rust/ql/test/extractor-tests/generated/Function/Function.ql b/rust/ql/test/extractor-tests/generated/Function/Function.ql
index 2ab5bea652ac..9f4fed07e57d 100644
--- a/rust/ql/test/extractor-tests/generated/Function/Function.ql
+++ b/rust/ql/test/extractor-tests/generated/Function/Function.ql
@@ -4,8 +4,8 @@ import TestUtils
 
 from
   Function x, string hasAbi, int getNumberOfAttrs, string hasBody, string hasGenericParamList,
-  string hasName, string hasParamList, string hasRetType, string hasVisibility,
-  string hasWhereClause
+  string isAsync, string isConst, string isDefault, string isGen, string isUnsafe, string hasName,
+  string hasParamList, string hasRetType, string hasVisibility, string hasWhereClause
 where
   toBeTested(x) and
   not x.isUnknown() and
@@ -13,11 +13,18 @@ where
   getNumberOfAttrs = x.getNumberOfAttrs() and
   (if x.hasBody() then hasBody = "yes" else hasBody = "no") and
   (if x.hasGenericParamList() then hasGenericParamList = "yes" else hasGenericParamList = "no") and
+  (if x.isAsync() then isAsync = "yes" else isAsync = "no") and
+  (if x.isConst() then isConst = "yes" else isConst = "no") and
+  (if x.isDefault() then isDefault = "yes" else isDefault = "no") and
+  (if x.isGen() then isGen = "yes" else isGen = "no") and
+  (if x.isUnsafe() then isUnsafe = "yes" else isUnsafe = "no") and
   (if x.hasName() then hasName = "yes" else hasName = "no") and
   (if x.hasParamList() then hasParamList = "yes" else hasParamList = "no") and
   (if x.hasRetType() then hasRetType = "yes" else hasRetType = "no") and
   (if x.hasVisibility() then hasVisibility = "yes" else hasVisibility = "no") and
   if x.hasWhereClause() then hasWhereClause = "yes" else hasWhereClause = "no"
 select x, "hasAbi:", hasAbi, "getNumberOfAttrs:", getNumberOfAttrs, "hasBody:", hasBody,
-  "hasGenericParamList:", hasGenericParamList, "hasName:", hasName, "hasParamList:", hasParamList,
-  "hasRetType:", hasRetType, "hasVisibility:", hasVisibility, "hasWhereClause:", hasWhereClause
+  "hasGenericParamList:", hasGenericParamList, "isAsync:", isAsync, "isConst:", isConst,
+  "isDefault:", isDefault, "isGen:", isGen, "isUnsafe:", isUnsafe, "hasName:", hasName,
+  "hasParamList:", hasParamList, "hasRetType:", hasRetType, "hasVisibility:", hasVisibility,
+  "hasWhereClause:", hasWhereClause
diff --git a/rust/ql/test/extractor-tests/generated/IdentPat/IdentPat.ql b/rust/ql/test/extractor-tests/generated/IdentPat/IdentPat.ql
index 9b7d6f141a38..3587ccff9ae5 100644
--- a/rust/ql/test/extractor-tests/generated/IdentPat/IdentPat.ql
+++ b/rust/ql/test/extractor-tests/generated/IdentPat/IdentPat.ql
@@ -2,11 +2,14 @@
 import codeql.rust.elements
 import TestUtils
 
-from IdentPat x, int getNumberOfAttrs, string hasName, string hasPat
+from IdentPat x, int getNumberOfAttrs, string isMut, string isRef, string hasName, string hasPat
 where
   toBeTested(x) and
   not x.isUnknown() and
   getNumberOfAttrs = x.getNumberOfAttrs() and
+  (if x.isMut() then isMut = "yes" else isMut = "no") and
+  (if x.isRef() then isRef = "yes" else isRef = "no") and
   (if x.hasName() then hasName = "yes" else hasName = "no") and
   if x.hasPat() then hasPat = "yes" else hasPat = "no"
-select x, "getNumberOfAttrs:", getNumberOfAttrs, "hasName:", hasName, "hasPat:", hasPat
+select x, "getNumberOfAttrs:", getNumberOfAttrs, "isMut:", isMut, "isRef:", isRef, "hasName:",
+  hasName, "hasPat:", hasPat
diff --git a/rust/ql/test/extractor-tests/generated/Impl/Impl.ql b/rust/ql/test/extractor-tests/generated/Impl/Impl.ql
index 72e934f58c61..b011141e5f7d 100644
--- a/rust/ql/test/extractor-tests/generated/Impl/Impl.ql
+++ b/rust/ql/test/extractor-tests/generated/Impl/Impl.ql
@@ -3,18 +3,23 @@ import codeql.rust.elements
 import TestUtils
 
 from
-  Impl x, string hasAssocItemList, int getNumberOfAttrs, string hasGenericParamList,
-  string hasSelfTy, string hasTrait, string hasVisibility, string hasWhereClause
+  Impl x, string hasAssocItemList, int getNumberOfAttrs, string hasGenericParamList, string isConst,
+  string isDefault, string isUnsafe, string hasSelfTy, string hasTrait, string hasVisibility,
+  string hasWhereClause
 where
   toBeTested(x) and
   not x.isUnknown() and
   (if x.hasAssocItemList() then hasAssocItemList = "yes" else hasAssocItemList = "no") and
   getNumberOfAttrs = x.getNumberOfAttrs() and
   (if x.hasGenericParamList() then hasGenericParamList = "yes" else hasGenericParamList = "no") and
+  (if x.isConst() then isConst = "yes" else isConst = "no") and
+  (if x.isDefault() then isDefault = "yes" else isDefault = "no") and
+  (if x.isUnsafe() then isUnsafe = "yes" else isUnsafe = "no") and
   (if x.hasSelfTy() then hasSelfTy = "yes" else hasSelfTy = "no") and
   (if x.hasTrait() then hasTrait = "yes" else hasTrait = "no") and
   (if x.hasVisibility() then hasVisibility = "yes" else hasVisibility = "no") and
   if x.hasWhereClause() then hasWhereClause = "yes" else hasWhereClause = "no"
 select x, "hasAssocItemList:", hasAssocItemList, "getNumberOfAttrs:", getNumberOfAttrs,
-  "hasGenericParamList:", hasGenericParamList, "hasSelfTy:", hasSelfTy, "hasTrait:", hasTrait,
-  "hasVisibility:", hasVisibility, "hasWhereClause:", hasWhereClause
+  "hasGenericParamList:", hasGenericParamList, "isConst:", isConst, "isDefault:", isDefault,
+  "isUnsafe:", isUnsafe, "hasSelfTy:", hasSelfTy, "hasTrait:", hasTrait, "hasVisibility:",
+  hasVisibility, "hasWhereClause:", hasWhereClause
diff --git a/rust/ql/test/extractor-tests/generated/Meta/Meta.ql b/rust/ql/test/extractor-tests/generated/Meta/Meta.ql
index 7d476131b8cd..72a0426d8098 100644
--- a/rust/ql/test/extractor-tests/generated/Meta/Meta.ql
+++ b/rust/ql/test/extractor-tests/generated/Meta/Meta.ql
@@ -2,11 +2,13 @@
 import codeql.rust.elements
 import TestUtils
 
-from Meta x, string hasExpr, string hasPath, string hasTokenTree
+from Meta x, string hasExpr, string isUnsafe, string hasPath, string hasTokenTree
 where
   toBeTested(x) and
   not x.isUnknown() and
   (if x.hasExpr() then hasExpr = "yes" else hasExpr = "no") and
+  (if x.isUnsafe() then isUnsafe = "yes" else isUnsafe = "no") and
   (if x.hasPath() then hasPath = "yes" else hasPath = "no") and
   if x.hasTokenTree() then hasTokenTree = "yes" else hasTokenTree = "no"
-select x, "hasExpr:", hasExpr, "hasPath:", hasPath, "hasTokenTree:", hasTokenTree
+select x, "hasExpr:", hasExpr, "isUnsafe:", isUnsafe, "hasPath:", hasPath, "hasTokenTree:",
+  hasTokenTree
diff --git a/rust/ql/test/extractor-tests/generated/PtrType/PtrType.ql b/rust/ql/test/extractor-tests/generated/PtrType/PtrType.ql
index 4b64e7c0efe4..7dc004522c78 100644
--- a/rust/ql/test/extractor-tests/generated/PtrType/PtrType.ql
+++ b/rust/ql/test/extractor-tests/generated/PtrType/PtrType.ql
@@ -2,9 +2,11 @@
 import codeql.rust.elements
 import TestUtils
 
-from PtrType x, string hasTy
+from PtrType x, string isConst, string isMut, string hasTy
 where
   toBeTested(x) and
   not x.isUnknown() and
+  (if x.isConst() then isConst = "yes" else isConst = "no") and
+  (if x.isMut() then isMut = "yes" else isMut = "no") and
   if x.hasTy() then hasTy = "yes" else hasTy = "no"
-select x, "hasTy:", hasTy
+select x, "isConst:", isConst, "isMut:", isMut, "hasTy:", hasTy
diff --git a/rust/ql/test/extractor-tests/generated/RefExpr/RefExpr.ql b/rust/ql/test/extractor-tests/generated/RefExpr/RefExpr.ql
index 7970aed3ebec..a2567b81ed75 100644
--- a/rust/ql/test/extractor-tests/generated/RefExpr/RefExpr.ql
+++ b/rust/ql/test/extractor-tests/generated/RefExpr/RefExpr.ql
@@ -2,10 +2,14 @@
 import codeql.rust.elements
 import TestUtils
 
-from RefExpr x, int getNumberOfAttrs, string hasExpr
+from RefExpr x, int getNumberOfAttrs, string hasExpr, string isConst, string isMut, string isRaw
 where
   toBeTested(x) and
   not x.isUnknown() and
   getNumberOfAttrs = x.getNumberOfAttrs() and
-  if x.hasExpr() then hasExpr = "yes" else hasExpr = "no"
-select x, "getNumberOfAttrs:", getNumberOfAttrs, "hasExpr:", hasExpr
+  (if x.hasExpr() then hasExpr = "yes" else hasExpr = "no") and
+  (if x.isConst() then isConst = "yes" else isConst = "no") and
+  (if x.isMut() then isMut = "yes" else isMut = "no") and
+  if x.isRaw() then isRaw = "yes" else isRaw = "no"
+select x, "getNumberOfAttrs:", getNumberOfAttrs, "hasExpr:", hasExpr, "isConst:", isConst, "isMut:",
+  isMut, "isRaw:", isRaw
diff --git a/rust/ql/test/extractor-tests/generated/RefPat/RefPat.ql b/rust/ql/test/extractor-tests/generated/RefPat/RefPat.ql
index e92585faee49..4ae72433dad4 100644
--- a/rust/ql/test/extractor-tests/generated/RefPat/RefPat.ql
+++ b/rust/ql/test/extractor-tests/generated/RefPat/RefPat.ql
@@ -2,9 +2,10 @@
 import codeql.rust.elements
 import TestUtils
 
-from RefPat x, string hasPat
+from RefPat x, string isMut, string hasPat
 where
   toBeTested(x) and
   not x.isUnknown() and
+  (if x.isMut() then isMut = "yes" else isMut = "no") and
   if x.hasPat() then hasPat = "yes" else hasPat = "no"
-select x, "hasPat:", hasPat
+select x, "isMut:", isMut, "hasPat:", hasPat
diff --git a/rust/ql/test/extractor-tests/generated/RefType/RefType.ql b/rust/ql/test/extractor-tests/generated/RefType/RefType.ql
index 63537e176306..1a0df7a0b98a 100644
--- a/rust/ql/test/extractor-tests/generated/RefType/RefType.ql
+++ b/rust/ql/test/extractor-tests/generated/RefType/RefType.ql
@@ -2,10 +2,11 @@
 import codeql.rust.elements
 import TestUtils
 
-from RefType x, string hasLifetime, string hasTy
+from RefType x, string isMut, string hasLifetime, string hasTy
 where
   toBeTested(x) and
   not x.isUnknown() and
+  (if x.isMut() then isMut = "yes" else isMut = "no") and
   (if x.hasLifetime() then hasLifetime = "yes" else hasLifetime = "no") and
   if x.hasTy() then hasTy = "yes" else hasTy = "no"
-select x, "hasLifetime:", hasLifetime, "hasTy:", hasTy
+select x, "isMut:", isMut, "hasLifetime:", hasLifetime, "hasTy:", hasTy
diff --git a/rust/ql/test/extractor-tests/generated/SelfParam/SelfParam.ql b/rust/ql/test/extractor-tests/generated/SelfParam/SelfParam.ql
index 044de94c3800..af2fa064a724 100644
--- a/rust/ql/test/extractor-tests/generated/SelfParam/SelfParam.ql
+++ b/rust/ql/test/extractor-tests/generated/SelfParam/SelfParam.ql
@@ -2,13 +2,15 @@
 import codeql.rust.elements
 import TestUtils
 
-from SelfParam x, int getNumberOfAttrs, string hasLifetime, string hasName, string hasTy
+from
+  SelfParam x, int getNumberOfAttrs, string isMut, string hasLifetime, string hasName, string hasTy
 where
   toBeTested(x) and
   not x.isUnknown() and
   getNumberOfAttrs = x.getNumberOfAttrs() and
+  (if x.isMut() then isMut = "yes" else isMut = "no") and
   (if x.hasLifetime() then hasLifetime = "yes" else hasLifetime = "no") and
   (if x.hasName() then hasName = "yes" else hasName = "no") and
   if x.hasTy() then hasTy = "yes" else hasTy = "no"
-select x, "getNumberOfAttrs:", getNumberOfAttrs, "hasLifetime:", hasLifetime, "hasName:", hasName,
-  "hasTy:", hasTy
+select x, "getNumberOfAttrs:", getNumberOfAttrs, "isMut:", isMut, "hasLifetime:", hasLifetime,
+  "hasName:", hasName, "hasTy:", hasTy
diff --git a/rust/ql/test/extractor-tests/generated/Static/Static.ql b/rust/ql/test/extractor-tests/generated/Static/Static.ql
index a629119be703..a1cac0742eea 100644
--- a/rust/ql/test/extractor-tests/generated/Static/Static.ql
+++ b/rust/ql/test/extractor-tests/generated/Static/Static.ql
@@ -3,14 +3,17 @@ import codeql.rust.elements
 import TestUtils
 
 from
-  Static x, int getNumberOfAttrs, string hasBody, string hasName, string hasTy, string hasVisibility
+  Static x, int getNumberOfAttrs, string hasBody, string isMut, string isStatic, string hasName,
+  string hasTy, string hasVisibility
 where
   toBeTested(x) and
   not x.isUnknown() and
   getNumberOfAttrs = x.getNumberOfAttrs() and
   (if x.hasBody() then hasBody = "yes" else hasBody = "no") and
+  (if x.isMut() then isMut = "yes" else isMut = "no") and
+  (if x.isStatic() then isStatic = "yes" else isStatic = "no") and
   (if x.hasName() then hasName = "yes" else hasName = "no") and
   (if x.hasTy() then hasTy = "yes" else hasTy = "no") and
   if x.hasVisibility() then hasVisibility = "yes" else hasVisibility = "no"
-select x, "getNumberOfAttrs:", getNumberOfAttrs, "hasBody:", hasBody, "hasName:", hasName, "hasTy:",
-  hasTy, "hasVisibility:", hasVisibility
+select x, "getNumberOfAttrs:", getNumberOfAttrs, "hasBody:", hasBody, "isMut:", isMut, "isStatic:",
+  isStatic, "hasName:", hasName, "hasTy:", hasTy, "hasVisibility:", hasVisibility
diff --git a/rust/ql/test/extractor-tests/generated/Trait/Trait.ql b/rust/ql/test/extractor-tests/generated/Trait/Trait.ql
index a1f58bb68204..3551f78de6ba 100644
--- a/rust/ql/test/extractor-tests/generated/Trait/Trait.ql
+++ b/rust/ql/test/extractor-tests/generated/Trait/Trait.ql
@@ -3,18 +3,22 @@ import codeql.rust.elements
 import TestUtils
 
 from
-  Trait x, string hasAssocItemList, int getNumberOfAttrs, string hasGenericParamList,
-  string hasName, string hasTypeBoundList, string hasVisibility, string hasWhereClause
+  Trait x, string hasAssocItemList, int getNumberOfAttrs, string hasGenericParamList, string isAuto,
+  string isUnsafe, string hasName, string hasTypeBoundList, string hasVisibility,
+  string hasWhereClause
 where
   toBeTested(x) and
   not x.isUnknown() and
   (if x.hasAssocItemList() then hasAssocItemList = "yes" else hasAssocItemList = "no") and
   getNumberOfAttrs = x.getNumberOfAttrs() and
   (if x.hasGenericParamList() then hasGenericParamList = "yes" else hasGenericParamList = "no") and
+  (if x.isAuto() then isAuto = "yes" else isAuto = "no") and
+  (if x.isUnsafe() then isUnsafe = "yes" else isUnsafe = "no") and
   (if x.hasName() then hasName = "yes" else hasName = "no") and
   (if x.hasTypeBoundList() then hasTypeBoundList = "yes" else hasTypeBoundList = "no") and
   (if x.hasVisibility() then hasVisibility = "yes" else hasVisibility = "no") and
   if x.hasWhereClause() then hasWhereClause = "yes" else hasWhereClause = "no"
 select x, "hasAssocItemList:", hasAssocItemList, "getNumberOfAttrs:", getNumberOfAttrs,
-  "hasGenericParamList:", hasGenericParamList, "hasName:", hasName, "hasTypeBoundList:",
-  hasTypeBoundList, "hasVisibility:", hasVisibility, "hasWhereClause:", hasWhereClause
+  "hasGenericParamList:", hasGenericParamList, "isAuto:", isAuto, "isUnsafe:", isUnsafe, "hasName:",
+  hasName, "hasTypeBoundList:", hasTypeBoundList, "hasVisibility:", hasVisibility,
+  "hasWhereClause:", hasWhereClause
diff --git a/rust/ql/test/extractor-tests/generated/TypeAlias/TypeAlias.ql b/rust/ql/test/extractor-tests/generated/TypeAlias/TypeAlias.ql
index 10494cb2889d..240791745dcd 100644
--- a/rust/ql/test/extractor-tests/generated/TypeAlias/TypeAlias.ql
+++ b/rust/ql/test/extractor-tests/generated/TypeAlias/TypeAlias.ql
@@ -3,18 +3,19 @@ import codeql.rust.elements
 import TestUtils
 
 from
-  TypeAlias x, int getNumberOfAttrs, string hasGenericParamList, string hasName, string hasTy,
-  string hasTypeBoundList, string hasVisibility, string hasWhereClause
+  TypeAlias x, int getNumberOfAttrs, string hasGenericParamList, string isDefault, string hasName,
+  string hasTy, string hasTypeBoundList, string hasVisibility, string hasWhereClause
 where
   toBeTested(x) and
   not x.isUnknown() and
   getNumberOfAttrs = x.getNumberOfAttrs() and
   (if x.hasGenericParamList() then hasGenericParamList = "yes" else hasGenericParamList = "no") and
+  (if x.isDefault() then isDefault = "yes" else isDefault = "no") and
   (if x.hasName() then hasName = "yes" else hasName = "no") and
   (if x.hasTy() then hasTy = "yes" else hasTy = "no") and
   (if x.hasTypeBoundList() then hasTypeBoundList = "yes" else hasTypeBoundList = "no") and
   (if x.hasVisibility() then hasVisibility = "yes" else hasVisibility = "no") and
   if x.hasWhereClause() then hasWhereClause = "yes" else hasWhereClause = "no"
 select x, "getNumberOfAttrs:", getNumberOfAttrs, "hasGenericParamList:", hasGenericParamList,
-  "hasName:", hasName, "hasTy:", hasTy, "hasTypeBoundList:", hasTypeBoundList, "hasVisibility:",
-  hasVisibility, "hasWhereClause:", hasWhereClause
+  "isDefault:", isDefault, "hasName:", hasName, "hasTy:", hasTy, "hasTypeBoundList:",
+  hasTypeBoundList, "hasVisibility:", hasVisibility, "hasWhereClause:", hasWhereClause
diff --git a/rust/ql/test/extractor-tests/generated/TypeBound/TypeBound.ql b/rust/ql/test/extractor-tests/generated/TypeBound/TypeBound.ql
index 06e117fe2242..449ca67ed71e 100644
--- a/rust/ql/test/extractor-tests/generated/TypeBound/TypeBound.ql
+++ b/rust/ql/test/extractor-tests/generated/TypeBound/TypeBound.ql
@@ -2,11 +2,16 @@
 import codeql.rust.elements
 import TestUtils
 
-from TypeBound x, string hasGenericParamList, string hasLifetime, string hasTy
+from
+  TypeBound x, string hasGenericParamList, string isAsync, string isConst, string hasLifetime,
+  string hasTy
 where
   toBeTested(x) and
   not x.isUnknown() and
   (if x.hasGenericParamList() then hasGenericParamList = "yes" else hasGenericParamList = "no") and
+  (if x.isAsync() then isAsync = "yes" else isAsync = "no") and
+  (if x.isConst() then isConst = "yes" else isConst = "no") and
   (if x.hasLifetime() then hasLifetime = "yes" else hasLifetime = "no") and
   if x.hasTy() then hasTy = "yes" else hasTy = "no"
-select x, "hasGenericParamList:", hasGenericParamList, "hasLifetime:", hasLifetime, "hasTy:", hasTy
+select x, "hasGenericParamList:", hasGenericParamList, "isAsync:", isAsync, "isConst:", isConst,
+  "hasLifetime:", hasLifetime, "hasTy:", hasTy
diff --git a/rust/schema/ast.py b/rust/schema/ast.py
index 665afe12b7d9..7964359ac46a 100644
--- a/rust/schema/ast.py
+++ b/rust/schema/ast.py
@@ -83,6 +83,12 @@ class BinaryExpr(Expr):
 
 class BlockExpr(Expr):
    attrs: list["Attr"] | child
+   is_async: predicate
+   is_const: predicate
+   is_gen: predicate
+   is_move: predicate
+   is_try: predicate
+   is_unsafe: predicate
    label: optional["Label"] | child
    stmt_list: optional["StmtList"] | child
 
@@ -111,12 +117,19 @@ class ClosureExpr(Expr):
    attrs: list["Attr"] | child
    body: optional["Expr"] | child
    closure_binder: optional["ClosureBinder"] | child
+   is_async: predicate
+   is_const: predicate
+   is_gen: predicate
+   is_move: predicate
+   is_static: predicate
    param_list: optional["ParamList"] | child
    ret_type: optional["RetType"] | child
 
 class Const(AssocItem,Item):
    attrs: list["Attr"] | child
    body: optional["Expr"] | child
+   is_const: predicate
+   is_default: predicate
    name: optional["Name"] | child
    ty: optional["TypeRef"] | child
    visibility: optional["Visibility"] | child
@@ -126,10 +139,12 @@ class ConstArg(GenericArg):
 
 class ConstBlockPat(Pat):
    block_expr: optional["BlockExpr"] | child
+   is_const: predicate
 
 class ConstParam(GenericParam):
    attrs: list["Attr"] | child
    default_val: optional["ConstArg"] | child
+   is_const: predicate
    name: optional["Name"] | child
    ty: optional["TypeRef"] | child
 
@@ -155,6 +170,7 @@ class ExternBlock(Item):
    abi: optional["Abi"] | child
    attrs: list["Attr"] | child
    extern_item_list: optional["ExternItemList"] | child
+   is_unsafe: predicate
 
 class ExternCrate(Item):
    attrs: list["Attr"] | child
@@ -176,6 +192,11 @@ class Function(AssocItem,ExternItem,Item):
    attrs: list["Attr"] | child
    body: optional["BlockExpr"] | child
    generic_param_list: optional["GenericParamList"] | child
+   is_async: predicate
+   is_const: predicate
+   is_default: predicate
+   is_gen: predicate
+   is_unsafe: predicate
    name: optional["Name"] | child
    param_list: optional["ParamList"] | child
    ret_type: optional["RetType"] | child
@@ -184,6 +205,9 @@ class Function(AssocItem,ExternItem,Item):
 
 class FnPtrType(TypeRef):
    abi: optional["Abi"] | child
+   is_async: predicate
+   is_const: predicate
+   is_unsafe: predicate
    param_list: optional["ParamList"] | child
    ret_type: optional["RetType"] | child
 
@@ -215,6 +239,8 @@ class GenericParamList(AstNode):
 
 class IdentPat(Pat):
    attrs: list["Attr"] | child
+   is_mut: predicate
+   is_ref: predicate
    name: optional["Name"] | child
    pat: optional["Pat"] | child
 
@@ -228,6 +254,9 @@ class Impl(Item):
    assoc_item_list: optional["AssocItemList"] | child
    attrs: list["Attr"] | child
    generic_param_list: optional["GenericParamList"] | child
+   is_const: predicate
+   is_default: predicate
+   is_unsafe: predicate
    self_ty: optional["TypeRef"] | child
    trait_: optional["TypeRef"] | child
    visibility: optional["Visibility"] | child
@@ -336,6 +365,7 @@ class MatchGuard(AstNode):
 
 class Meta(AstNode):
    expr: optional["Expr"] | child
+   is_unsafe: predicate
    path: optional["Path"] | child
    token_tree: optional["TokenTree"] | child
 
@@ -417,6 +447,8 @@ class PrefixExpr(Expr):
    operator_name: optional[string]
 
 class PtrType(TypeRef):
+   is_const: predicate
+   is_mut: predicate
    ty: optional["TypeRef"] | child
 
 class RangeExpr(Expr):
@@ -469,11 +501,16 @@ class RecordPatFieldList(AstNode):
 class RefExpr(Expr):
    attrs: list["Attr"] | child
    expr: optional["Expr"] | child
+   is_const: predicate
+   is_mut: predicate
+   is_raw: predicate
 
 class RefPat(Pat):
+   is_mut: predicate
    pat: optional["Pat"] | child
 
 class RefType(TypeRef):
+   is_mut: predicate
    lifetime: optional["Lifetime"] | child
    ty: optional["TypeRef"] | child
 
@@ -495,6 +532,7 @@ class ReturnTypeSyntax(AstNode):
 
 class SelfParam(AstNode):
    attrs: list["Attr"] | child
+   is_mut: predicate
    lifetime: optional["Lifetime"] | child
    name: optional["Name"] | child
    ty: optional["TypeRef"] | child
@@ -512,6 +550,8 @@ class SourceFile(AstNode):
 class Static(ExternItem,Item):
    attrs: list["Attr"] | child
    body: optional["Expr"] | child
+   is_mut: predicate
+   is_static: predicate
    name: optional["Name"] | child
    ty: optional["TypeRef"] | child
    visibility: optional["Visibility"] | child
@@ -536,6 +576,8 @@ class Trait(Item):
    assoc_item_list: optional["AssocItemList"] | child
    attrs: list["Attr"] | child
    generic_param_list: optional["GenericParamList"] | child
+   is_auto: predicate
+   is_unsafe: predicate
    name: optional["Name"] | child
    type_bound_list: optional["TypeBoundList"] | child
    visibility: optional["Visibility"] | child
@@ -578,6 +620,7 @@ class TupleType(TypeRef):
 class TypeAlias(AssocItem,ExternItem,Item):
    attrs: list["Attr"] | child
    generic_param_list: optional["GenericParamList"] | child
+   is_default: predicate
    name: optional["Name"] | child
    ty: optional["TypeRef"] | child
    type_bound_list: optional["TypeBoundList"] | child
@@ -589,6 +632,8 @@ class TypeArg(GenericArg):
 
 class TypeBound(AstNode):
    generic_param_list: optional["GenericParamList"] | child
+   is_async: predicate
+   is_const: predicate
    lifetime: optional["Lifetime"] | child
    ty: optional["TypeRef"] | child
 

From 32e9881cfb20db9c6d3e8329c4496a4467cad90e Mon Sep 17 00:00:00 2001
From: Arthur Baars <aibaars@github.com>
Date: Thu, 10 Oct 2024 13:11:13 +0200
Subject: [PATCH 273/347] Rust: update expected output

---
 .../generated/BlockExpr/BlockExpr.expected             |  6 +++---
 .../generated/ClosureExpr/ClosureExpr.expected         | 10 +++++-----
 .../generated/ConstBlockPat/ConstBlockPat.expected     |  2 +-
 .../generated/Function/Function.expected               |  4 ++--
 .../generated/IdentPat/IdentPat.expected               |  4 ++--
 .../extractor-tests/generated/RefExpr/RefExpr.expected |  8 ++++----
 .../extractor-tests/generated/RefPat/RefPat.expected   |  4 ++--
 7 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/rust/ql/test/extractor-tests/generated/BlockExpr/BlockExpr.expected b/rust/ql/test/extractor-tests/generated/BlockExpr/BlockExpr.expected
index 6308944a23e8..39ec1d6a7e1a 100644
--- a/rust/ql/test/extractor-tests/generated/BlockExpr/BlockExpr.expected
+++ b/rust/ql/test/extractor-tests/generated/BlockExpr/BlockExpr.expected
@@ -1,3 +1,3 @@
-| gen_block_expr.rs:3:28:12:1 | BlockExpr | getNumberOfAttrs: | 0 | hasLabel: | no | hasStmtList: | yes |
-| gen_block_expr.rs:5:5:7:5 | BlockExpr | getNumberOfAttrs: | 0 | hasLabel: | no | hasStmtList: | yes |
-| gen_block_expr.rs:8:5:11:5 | BlockExpr | getNumberOfAttrs: | 0 | hasLabel: | yes | hasStmtList: | yes |
+| gen_block_expr.rs:3:28:12:1 | BlockExpr | getNumberOfAttrs: | 0 | isAsync: | no | isConst: | no | isGen: | no | isMove: | no | isTry: | no | isUnsafe: | no | hasLabel: | no | hasStmtList: | yes |
+| gen_block_expr.rs:5:5:7:5 | BlockExpr | getNumberOfAttrs: | 0 | isAsync: | no | isConst: | no | isGen: | no | isMove: | no | isTry: | no | isUnsafe: | no | hasLabel: | no | hasStmtList: | yes |
+| gen_block_expr.rs:8:5:11:5 | BlockExpr | getNumberOfAttrs: | 0 | isAsync: | no | isConst: | no | isGen: | no | isMove: | no | isTry: | no | isUnsafe: | no | hasLabel: | yes | hasStmtList: | yes |
diff --git a/rust/ql/test/extractor-tests/generated/ClosureExpr/ClosureExpr.expected b/rust/ql/test/extractor-tests/generated/ClosureExpr/ClosureExpr.expected
index c6a8ba5ece4b..18fb82716295 100644
--- a/rust/ql/test/extractor-tests/generated/ClosureExpr/ClosureExpr.expected
+++ b/rust/ql/test/extractor-tests/generated/ClosureExpr/ClosureExpr.expected
@@ -1,5 +1,5 @@
-| gen_closure_expr.rs:5:5:5:13 | ClosureExpr | getNumberOfAttrs: | 0 | hasBody: | yes | hasClosureBinder: | no | hasParamList: | yes | hasRetType: | no |
-| gen_closure_expr.rs:6:5:6:34 | ClosureExpr | getNumberOfAttrs: | 0 | hasBody: | yes | hasClosureBinder: | no | hasParamList: | yes | hasRetType: | yes |
-| gen_closure_expr.rs:7:5:7:27 | ClosureExpr | getNumberOfAttrs: | 0 | hasBody: | yes | hasClosureBinder: | no | hasParamList: | yes | hasRetType: | no |
-| gen_closure_expr.rs:8:6:9:15 | ClosureExpr | getNumberOfAttrs: | 1 | hasBody: | yes | hasClosureBinder: | no | hasParamList: | yes | hasRetType: | no |
-| gen_closure_expr.rs:10:6:11:23 | ClosureExpr | getNumberOfAttrs: | 1 | hasBody: | yes | hasClosureBinder: | no | hasParamList: | yes | hasRetType: | no |
+| gen_closure_expr.rs:5:5:5:13 | ClosureExpr | getNumberOfAttrs: | 0 | hasBody: | yes | hasClosureBinder: | no | isAsync: | no | isConst: | no | isGen: | no | isMove: | no | isStatic: | no | hasParamList: | yes | hasRetType: | no |
+| gen_closure_expr.rs:6:5:6:34 | ClosureExpr | getNumberOfAttrs: | 0 | hasBody: | yes | hasClosureBinder: | no | isAsync: | no | isConst: | no | isGen: | no | isMove: | yes | isStatic: | no | hasParamList: | yes | hasRetType: | yes |
+| gen_closure_expr.rs:7:5:7:27 | ClosureExpr | getNumberOfAttrs: | 0 | hasBody: | yes | hasClosureBinder: | no | isAsync: | yes | isConst: | no | isGen: | no | isMove: | no | isStatic: | no | hasParamList: | yes | hasRetType: | no |
+| gen_closure_expr.rs:8:6:9:15 | ClosureExpr | getNumberOfAttrs: | 1 | hasBody: | yes | hasClosureBinder: | no | isAsync: | no | isConst: | no | isGen: | no | isMove: | no | isStatic: | no | hasParamList: | yes | hasRetType: | no |
+| gen_closure_expr.rs:10:6:11:23 | ClosureExpr | getNumberOfAttrs: | 1 | hasBody: | yes | hasClosureBinder: | no | isAsync: | no | isConst: | no | isGen: | no | isMove: | no | isStatic: | yes | hasParamList: | yes | hasRetType: | no |
diff --git a/rust/ql/test/extractor-tests/generated/ConstBlockPat/ConstBlockPat.expected b/rust/ql/test/extractor-tests/generated/ConstBlockPat/ConstBlockPat.expected
index 5b6220f2b9c9..21feba1f729f 100644
--- a/rust/ql/test/extractor-tests/generated/ConstBlockPat/ConstBlockPat.expected
+++ b/rust/ql/test/extractor-tests/generated/ConstBlockPat/ConstBlockPat.expected
@@ -1 +1 @@
-| gen_const_block_pat.rs:6:9:6:27 | ConstBlockPat | hasBlockExpr: | yes |
+| gen_const_block_pat.rs:6:9:6:27 | ConstBlockPat | hasBlockExpr: | yes | isConst: | yes |
diff --git a/rust/ql/test/extractor-tests/generated/Function/Function.expected b/rust/ql/test/extractor-tests/generated/Function/Function.expected
index fd765f9b5785..cf2de6ac0a6d 100644
--- a/rust/ql/test/extractor-tests/generated/Function/Function.expected
+++ b/rust/ql/test/extractor-tests/generated/Function/Function.expected
@@ -1,2 +1,2 @@
-| gen_function.rs:3:1:4:38 | foo | hasAbi: | no | getNumberOfAttrs: | 0 | hasBody: | yes | hasGenericParamList: | no | hasName: | yes | hasParamList: | yes | hasRetType: | yes | hasVisibility: | no | hasWhereClause: | no |
-| gen_function.rs:7:5:7:13 | bar | hasAbi: | no | getNumberOfAttrs: | 0 | hasBody: | no | hasGenericParamList: | no | hasName: | yes | hasParamList: | yes | hasRetType: | no | hasVisibility: | no | hasWhereClause: | no |
+| gen_function.rs:3:1:4:38 | foo | hasAbi: | no | getNumberOfAttrs: | 0 | hasBody: | yes | hasGenericParamList: | no | isAsync: | no | isConst: | no | isDefault: | no | isGen: | no | isUnsafe: | no | hasName: | yes | hasParamList: | yes | hasRetType: | yes | hasVisibility: | no | hasWhereClause: | no |
+| gen_function.rs:7:5:7:13 | bar | hasAbi: | no | getNumberOfAttrs: | 0 | hasBody: | no | hasGenericParamList: | no | isAsync: | no | isConst: | no | isDefault: | no | isGen: | no | isUnsafe: | no | hasName: | yes | hasParamList: | yes | hasRetType: | no | hasVisibility: | no | hasWhereClause: | no |
diff --git a/rust/ql/test/extractor-tests/generated/IdentPat/IdentPat.expected b/rust/ql/test/extractor-tests/generated/IdentPat/IdentPat.expected
index 5f7d899ccab9..bdc57b38cf31 100644
--- a/rust/ql/test/extractor-tests/generated/IdentPat/IdentPat.expected
+++ b/rust/ql/test/extractor-tests/generated/IdentPat/IdentPat.expected
@@ -1,2 +1,2 @@
-| gen_ident_pat.rs:6:22:6:22 | y | getNumberOfAttrs: | 0 | hasName: | yes | hasPat: | no |
-| gen_ident_pat.rs:10:9:10:25 | y | getNumberOfAttrs: | 0 | hasName: | yes | hasPat: | yes |
+| gen_ident_pat.rs:6:22:6:22 | y | getNumberOfAttrs: | 0 | isMut: | no | isRef: | no | hasName: | yes | hasPat: | no |
+| gen_ident_pat.rs:10:9:10:25 | y | getNumberOfAttrs: | 0 | isMut: | no | isRef: | no | hasName: | yes | hasPat: | yes |
diff --git a/rust/ql/test/extractor-tests/generated/RefExpr/RefExpr.expected b/rust/ql/test/extractor-tests/generated/RefExpr/RefExpr.expected
index b5f629c6a5c7..d4c75d9a79a0 100644
--- a/rust/ql/test/extractor-tests/generated/RefExpr/RefExpr.expected
+++ b/rust/ql/test/extractor-tests/generated/RefExpr/RefExpr.expected
@@ -1,4 +1,4 @@
-| gen_ref_expr.rs:5:25:5:28 | RefExpr | getNumberOfAttrs: | 0 | hasExpr: | yes |
-| gen_ref_expr.rs:6:23:6:30 | RefExpr | getNumberOfAttrs: | 0 | hasExpr: | yes |
-| gen_ref_expr.rs:7:35:7:48 | RefExpr | getNumberOfAttrs: | 0 | hasExpr: | yes |
-| gen_ref_expr.rs:8:33:8:44 | RefExpr | getNumberOfAttrs: | 0 | hasExpr: | yes |
+| gen_ref_expr.rs:5:25:5:28 | RefExpr | getNumberOfAttrs: | 0 | hasExpr: | yes | isConst: | no | isMut: | no | isRaw: | no |
+| gen_ref_expr.rs:6:23:6:30 | RefExpr | getNumberOfAttrs: | 0 | hasExpr: | yes | isConst: | no | isMut: | yes | isRaw: | no |
+| gen_ref_expr.rs:7:35:7:48 | RefExpr | getNumberOfAttrs: | 0 | hasExpr: | yes | isConst: | yes | isMut: | no | isRaw: | yes |
+| gen_ref_expr.rs:8:33:8:44 | RefExpr | getNumberOfAttrs: | 0 | hasExpr: | yes | isConst: | no | isMut: | yes | isRaw: | yes |
diff --git a/rust/ql/test/extractor-tests/generated/RefPat/RefPat.expected b/rust/ql/test/extractor-tests/generated/RefPat/RefPat.expected
index 2cef03b7f5d7..c2fc3416297a 100644
--- a/rust/ql/test/extractor-tests/generated/RefPat/RefPat.expected
+++ b/rust/ql/test/extractor-tests/generated/RefPat/RefPat.expected
@@ -1,2 +1,2 @@
-| gen_ref_pat.rs:6:9:6:28 | RefPat | hasPat: | yes |
-| gen_ref_pat.rs:7:9:7:21 | RefPat | hasPat: | yes |
+| gen_ref_pat.rs:6:9:6:28 | RefPat | isMut: | yes | hasPat: | yes |
+| gen_ref_pat.rs:7:9:7:21 | RefPat | isMut: | no | hasPat: | yes |

From c364fd7e56c6952c2d6b1ec1fc170b8f390ad74f Mon Sep 17 00:00:00 2001
From: Paolo Tranquilli <redsun82@gihub.com>
Date: Thu, 10 Oct 2024 14:33:06 +0200
Subject: [PATCH 274/347] Codegen: allow annotations to replace bases and drop
 fields

---
 misc/codegen/lib/schemadefs.py         | 24 +++++++++----
 misc/codegen/test/test_schemaloader.py | 50 ++++++++++++++++++++++++++
 2 files changed, 67 insertions(+), 7 deletions(-)

diff --git a/misc/codegen/lib/schemadefs.py b/misc/codegen/lib/schemadefs.py
index 7152c32d12b1..ea8d6cf09ce7 100644
--- a/misc/codegen/lib/schemadefs.py
+++ b/misc/codegen/lib/schemadefs.py
@@ -1,4 +1,8 @@
-from typing import Callable as _Callable, Dict as _Dict, ClassVar as _ClassVar
+from typing import (
+    Callable as _Callable,
+    Dict as _Dict,
+    ClassVar as _ClassVar,
+)
 from misc.codegen.lib import schema as _schema
 import inspect as _inspect
 from dataclasses import dataclass as _dataclass
@@ -271,14 +275,16 @@ def __or__(self, other: _schema.PropertyModifier):
 
 _ = _PropertyAnnotation()
 
+drop = object()
 
-def annotate(annotated_cls: type) -> _Callable[[type], _PropertyAnnotation]:
+
+def annotate(annotated_cls: type, replace_bases: _Dict[type, type] | None = None) -> _Callable[[type], _PropertyAnnotation]:
     """
-    Add or modify schema annotations after a class has been defined
-    For the moment, only docstring annotation is supported. In the future, any kind of
-    modification will be allowed.
+    Add or modify schema annotations after a class has been defined previously.
+
+    The name of the class used for annotation must be `_`.
 
-    The name of the class used for annotation must be `_`
+    `replace_bases` can be used to replace bases on the annotated class.
     """
     def decorator(cls: type) -> _PropertyAnnotation:
         if cls.__name__ != "_":
@@ -287,11 +293,15 @@ def decorator(cls: type) -> _PropertyAnnotation:
             annotated_cls.__doc__ = cls.__doc__
         for p, v in cls.__dict__.get("_pragmas", {}).items():
             _ClassPragma(p, value=v)(annotated_cls)
+        if replace_bases:
+            annotated_cls.__bases__ = tuple(replace_bases.get(b, b) for b in annotated_cls.__bases__)
         for a in dir(cls):
             if a.startswith(_schema.inheritable_pragma_prefix):
                 setattr(annotated_cls, a, getattr(cls, a))
         for p, a in cls.__annotations__.items():
-            if p in annotated_cls.__annotations__:
+            if a is drop:
+                del annotated_cls.__annotations__[p]
+            elif p in annotated_cls.__annotations__:
                 annotated_cls.__annotations__[p] |= a
             elif isinstance(a, (_PropertyAnnotation, _PropertyModifierList)):
                 raise _schema.Error(f"annotated property {p} not present in annotated class "
diff --git a/misc/codegen/test/test_schemaloader.py b/misc/codegen/test/test_schemaloader.py
index 4d1aa06ecd0f..0c9128c72727 100644
--- a/misc/codegen/test/test_schemaloader.py
+++ b/misc/codegen/test/test_schemaloader.py
@@ -884,6 +884,56 @@ class Something:
                 """
 
 
+def test_annotate_replace_bases():
+    @load
+    class data:
+        class Root:
+            pass
+
+        class A(Root):
+            pass
+
+        class B(Root):
+            pass
+
+        class C(B):
+            pass
+
+        class Derived(A, B):
+            pass
+
+        @defs.annotate(Derived, replace_bases={B: C})
+        class _:
+            pass
+    assert data.classes == {
+        "Root": schema.Class("Root", derived={"A", "B"}),
+        "A": schema.Class("A", bases=["Root"], derived={"Derived"}),
+        "B": schema.Class("B", bases=["Root"], derived={"C"}),
+        "C": schema.Class("C", bases=["B"], derived={"Derived"}),
+        "Derived": schema.Class("Derived", bases=["A", "C"]),
+    }
+
+
+def test_annotate_drop_field():
+    @load
+    class data:
+        class Root:
+            x: defs.int
+            y: defs.string
+            z: defs.boolean
+
+        @defs.annotate(Root)
+        class _:
+            y: defs.drop
+
+    assert data.classes == {
+        "Root": schema.Class("Root", properties=[
+            schema.SingleProperty("x", "int"),
+            schema.SingleProperty("z", "boolean"),
+        ]),
+    }
+
+
 def test_test_with_unknown_string():
     with pytest.raises(schema.Error):
         @load

From 601552458993e3ef0b38164c67ba18ef5db129dc Mon Sep 17 00:00:00 2001
From: Paolo Tranquilli <redsun82@gihub.com>
Date: Thu, 10 Oct 2024 14:34:24 +0200
Subject: [PATCH 275/347] Rust: insert `FunctionOrMethodCallExpr` in
 annotations

---
 rust/schema/annotations.py | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/rust/schema/annotations.py b/rust/schema/annotations.py
index b4c647f2654b..7fafb26bbb31 100644
--- a/rust/schema/annotations.py
+++ b/rust/schema/annotations.py
@@ -185,8 +185,15 @@ class _:
     ```
     """
 
+class FunctionOrMethodCallExpr(Expr):
+    """
+    A function or method call expression. See `CallExpr` and `MethodCallExpr` for further details.
+    """
+    arg_list: optional["ArgList"] | child
+    attrs: list["Attr"] | child
 
-@annotate(CallExpr)
+
+@annotate(CallExpr, replace_bases={Expr: FunctionOrMethodCallExpr})
 class _:
     """
     A function call expression. For example:
@@ -197,9 +204,10 @@ class _:
     foo(1) = 4;
     ```
     """
+    arg_list: drop
+    attrs: drop
 
-
-@annotate(MethodCallExpr)
+@annotate(MethodCallExpr, replace_bases={Expr: FunctionOrMethodCallExpr})
 class _:
     """
     A method call expression. For example:
@@ -208,6 +216,8 @@ class _:
     x.foo::<u32, u64>(42);
     ```
     """
+    arg_list: drop
+    attrs: drop
 
 
 @annotate(MatchArm)

From 89f43fb917a6c069ae4c957e69dfc6c1bb23e2c6 Mon Sep 17 00:00:00 2001
From: Paolo Tranquilli <redsun82@gihub.com>
Date: Thu, 10 Oct 2024 14:37:40 +0200
Subject: [PATCH 276/347] Rust: generate code

---
 rust/extractor/src/generated/.generated.list  |   2 +-
 rust/extractor/src/generated/top.rs           | 347 +++++++++++-------
 rust/ql/.generated.list                       |  19 +-
 rust/ql/.gitattributes                        |   3 +
 rust/ql/lib/codeql/rust/elements.qll          |   1 +
 rust/ql/lib/codeql/rust/elements/CallExpr.qll |   3 +-
 .../elements/FunctionOrMethodCallExpr.qll     |  14 +
 .../codeql/rust/elements/MethodCallExpr.qll   |   3 +-
 .../internal/FunctionOrMethodCallExprImpl.qll |  19 +
 .../elements/internal/generated/CallExpr.qll  |  37 +-
 .../generated/FunctionOrMethodCallExpr.qll    |  59 +++
 .../internal/generated/MethodCallExpr.qll     |  43 +--
 .../internal/generated/ParentChild.qll        | 135 +++----
 .../rust/elements/internal/generated/Raw.qll  | 128 ++++---
 .../elements/internal/generated/Synth.qll     |  43 ++-
 rust/ql/lib/rust.dbscheme                     | 111 +++---
 16 files changed, 538 insertions(+), 429 deletions(-)
 create mode 100644 rust/ql/lib/codeql/rust/elements/FunctionOrMethodCallExpr.qll
 create mode 100644 rust/ql/lib/codeql/rust/elements/internal/FunctionOrMethodCallExprImpl.qll
 create mode 100644 rust/ql/lib/codeql/rust/elements/internal/generated/FunctionOrMethodCallExpr.qll

diff --git a/rust/extractor/src/generated/.generated.list b/rust/extractor/src/generated/.generated.list
index 43459827a075..886def53f2da 100644
--- a/rust/extractor/src/generated/.generated.list
+++ b/rust/extractor/src/generated/.generated.list
@@ -1,2 +1,2 @@
 mod.rs 4bcb9def847469aae9d8649461546b7c21ec97cf6e63d3cf394e339915ce65d7 4bcb9def847469aae9d8649461546b7c21ec97cf6e63d3cf394e339915ce65d7
-top.rs 855f5f0639dfafd8603c9b842f6470ca6d1214bb72391890a1de64db2adebba1 855f5f0639dfafd8603c9b842f6470ca6d1214bb72391890a1de64db2adebba1
+top.rs 7269710572ed5f727107f19cf4002ec19b8a4149842b351c6c61dbeb1ec35e5c 7269710572ed5f727107f19cf4002ec19b8a4149842b351c6c61dbeb1ec35e5c
diff --git a/rust/extractor/src/generated/top.rs b/rust/extractor/src/generated/top.rs
index 5c234ae22aef..fad605cab2e0 100644
--- a/rust/extractor/src/generated/top.rs
+++ b/rust/extractor/src/generated/top.rs
@@ -3614,73 +3614,6 @@ impl From<trap::Label<BreakExpr>> for trap::Label<Locatable> {
     }
 }
 
-#[derive(Debug)]
-pub struct CallExpr {
-    pub id: trap::TrapId<CallExpr>,
-    pub arg_list: Option<trap::Label<ArgList>>,
-    pub attrs: Vec<trap::Label<Attr>>,
-    pub expr: Option<trap::Label<Expr>>,
-}
-
-impl trap::TrapEntry for CallExpr {
-    fn extract_id(&mut self) -> trap::TrapId<Self> {
-        std::mem::replace(&mut self.id, trap::TrapId::Star)
-    }
-
-    fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
-        out.add_tuple("call_exprs", vec![id.into()]);
-        if let Some(v) = self.arg_list {
-            out.add_tuple("call_expr_arg_lists", vec![id.into(), v.into()]);
-        }
-        for (i, v) in self.attrs.into_iter().enumerate() {
-            out.add_tuple("call_expr_attrs", vec![id.into(), i.into(), v.into()]);
-        }
-        if let Some(v) = self.expr {
-            out.add_tuple("call_expr_exprs", vec![id.into(), v.into()]);
-        }
-    }
-}
-
-impl trap::TrapClass for CallExpr {
-    fn class_name() -> &'static str { "CallExpr" }
-}
-
-impl From<trap::Label<CallExpr>> for trap::Label<AstNode> {
-    fn from(value: trap::Label<CallExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme CallExpr is a subclass of AstNode
-        unsafe {
-            Self::from_untyped(value.as_untyped())
-        }
-    }
-}
-
-impl From<trap::Label<CallExpr>> for trap::Label<Element> {
-    fn from(value: trap::Label<CallExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme CallExpr is a subclass of Element
-        unsafe {
-            Self::from_untyped(value.as_untyped())
-        }
-    }
-}
-
-impl From<trap::Label<CallExpr>> for trap::Label<Expr> {
-    fn from(value: trap::Label<CallExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme CallExpr is a subclass of Expr
-        unsafe {
-            Self::from_untyped(value.as_untyped())
-        }
-    }
-}
-
-impl From<trap::Label<CallExpr>> for trap::Label<Locatable> {
-    fn from(value: trap::Label<CallExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme CallExpr is a subclass of Locatable
-        unsafe {
-            Self::from_untyped(value.as_untyped())
-        }
-    }
-}
-
 #[derive(Debug)]
 pub struct CastExpr {
     pub id: trap::TrapId<CastExpr>,
@@ -4589,6 +4522,51 @@ impl From<trap::Label<FormatArgsExpr>> for trap::Label<Locatable> {
     }
 }
 
+#[derive(Debug)]
+pub struct FunctionOrMethodCallExpr {
+    _unused: ()
+}
+
+impl trap::TrapClass for FunctionOrMethodCallExpr {
+    fn class_name() -> &'static str { "FunctionOrMethodCallExpr" }
+}
+
+impl From<trap::Label<FunctionOrMethodCallExpr>> for trap::Label<AstNode> {
+    fn from(value: trap::Label<FunctionOrMethodCallExpr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme FunctionOrMethodCallExpr is a subclass of AstNode
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<FunctionOrMethodCallExpr>> for trap::Label<Element> {
+    fn from(value: trap::Label<FunctionOrMethodCallExpr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme FunctionOrMethodCallExpr is a subclass of Element
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<FunctionOrMethodCallExpr>> for trap::Label<Expr> {
+    fn from(value: trap::Label<FunctionOrMethodCallExpr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme FunctionOrMethodCallExpr is a subclass of Expr
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<FunctionOrMethodCallExpr>> for trap::Label<Locatable> {
+    fn from(value: trap::Label<FunctionOrMethodCallExpr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme FunctionOrMethodCallExpr is a subclass of Locatable
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
 #[derive(Debug)]
 pub struct IdentPat {
     pub id: trap::TrapId<IdentPat>,
@@ -5654,81 +5632,6 @@ impl From<trap::Label<MatchExpr>> for trap::Label<Locatable> {
     }
 }
 
-#[derive(Debug)]
-pub struct MethodCallExpr {
-    pub id: trap::TrapId<MethodCallExpr>,
-    pub arg_list: Option<trap::Label<ArgList>>,
-    pub attrs: Vec<trap::Label<Attr>>,
-    pub generic_arg_list: Option<trap::Label<GenericArgList>>,
-    pub name_ref: Option<trap::Label<NameRef>>,
-    pub receiver: Option<trap::Label<Expr>>,
-}
-
-impl trap::TrapEntry for MethodCallExpr {
-    fn extract_id(&mut self) -> trap::TrapId<Self> {
-        std::mem::replace(&mut self.id, trap::TrapId::Star)
-    }
-
-    fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
-        out.add_tuple("method_call_exprs", vec![id.into()]);
-        if let Some(v) = self.arg_list {
-            out.add_tuple("method_call_expr_arg_lists", vec![id.into(), v.into()]);
-        }
-        for (i, v) in self.attrs.into_iter().enumerate() {
-            out.add_tuple("method_call_expr_attrs", vec![id.into(), i.into(), v.into()]);
-        }
-        if let Some(v) = self.generic_arg_list {
-            out.add_tuple("method_call_expr_generic_arg_lists", vec![id.into(), v.into()]);
-        }
-        if let Some(v) = self.name_ref {
-            out.add_tuple("method_call_expr_name_refs", vec![id.into(), v.into()]);
-        }
-        if let Some(v) = self.receiver {
-            out.add_tuple("method_call_expr_receivers", vec![id.into(), v.into()]);
-        }
-    }
-}
-
-impl trap::TrapClass for MethodCallExpr {
-    fn class_name() -> &'static str { "MethodCallExpr" }
-}
-
-impl From<trap::Label<MethodCallExpr>> for trap::Label<AstNode> {
-    fn from(value: trap::Label<MethodCallExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme MethodCallExpr is a subclass of AstNode
-        unsafe {
-            Self::from_untyped(value.as_untyped())
-        }
-    }
-}
-
-impl From<trap::Label<MethodCallExpr>> for trap::Label<Element> {
-    fn from(value: trap::Label<MethodCallExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme MethodCallExpr is a subclass of Element
-        unsafe {
-            Self::from_untyped(value.as_untyped())
-        }
-    }
-}
-
-impl From<trap::Label<MethodCallExpr>> for trap::Label<Expr> {
-    fn from(value: trap::Label<MethodCallExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme MethodCallExpr is a subclass of Expr
-        unsafe {
-            Self::from_untyped(value.as_untyped())
-        }
-    }
-}
-
-impl From<trap::Label<MethodCallExpr>> for trap::Label<Locatable> {
-    fn from(value: trap::Label<MethodCallExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme MethodCallExpr is a subclass of Locatable
-        unsafe {
-            Self::from_untyped(value.as_untyped())
-        }
-    }
-}
-
 #[derive(Debug)]
 pub struct NeverType {
     pub id: trap::TrapId<NeverType>,
@@ -7953,6 +7856,82 @@ impl From<trap::Label<YieldExpr>> for trap::Label<Locatable> {
     }
 }
 
+#[derive(Debug)]
+pub struct CallExpr {
+    pub id: trap::TrapId<CallExpr>,
+    pub arg_list: Option<trap::Label<ArgList>>,
+    pub attrs: Vec<trap::Label<Attr>>,
+    pub expr: Option<trap::Label<Expr>>,
+}
+
+impl trap::TrapEntry for CallExpr {
+    fn extract_id(&mut self) -> trap::TrapId<Self> {
+        std::mem::replace(&mut self.id, trap::TrapId::Star)
+    }
+
+    fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
+        out.add_tuple("call_exprs", vec![id.into()]);
+        if let Some(v) = self.arg_list {
+            out.add_tuple("function_or_method_call_expr_arg_lists", vec![id.into(), v.into()]);
+        }
+        for (i, v) in self.attrs.into_iter().enumerate() {
+            out.add_tuple("function_or_method_call_expr_attrs", vec![id.into(), i.into(), v.into()]);
+        }
+        if let Some(v) = self.expr {
+            out.add_tuple("call_expr_exprs", vec![id.into(), v.into()]);
+        }
+    }
+}
+
+impl trap::TrapClass for CallExpr {
+    fn class_name() -> &'static str { "CallExpr" }
+}
+
+impl From<trap::Label<CallExpr>> for trap::Label<AstNode> {
+    fn from(value: trap::Label<CallExpr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme CallExpr is a subclass of AstNode
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<CallExpr>> for trap::Label<Element> {
+    fn from(value: trap::Label<CallExpr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme CallExpr is a subclass of Element
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<CallExpr>> for trap::Label<Expr> {
+    fn from(value: trap::Label<CallExpr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme CallExpr is a subclass of Expr
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<CallExpr>> for trap::Label<FunctionOrMethodCallExpr> {
+    fn from(value: trap::Label<CallExpr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme CallExpr is a subclass of FunctionOrMethodCallExpr
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<CallExpr>> for trap::Label<Locatable> {
+    fn from(value: trap::Label<CallExpr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme CallExpr is a subclass of Locatable
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
 #[derive(Debug)]
 pub struct Const {
     pub id: trap::TrapId<Const>,
@@ -8758,6 +8737,90 @@ impl From<trap::Label<MacroRules>> for trap::Label<Stmt> {
     }
 }
 
+#[derive(Debug)]
+pub struct MethodCallExpr {
+    pub id: trap::TrapId<MethodCallExpr>,
+    pub arg_list: Option<trap::Label<ArgList>>,
+    pub attrs: Vec<trap::Label<Attr>>,
+    pub generic_arg_list: Option<trap::Label<GenericArgList>>,
+    pub name_ref: Option<trap::Label<NameRef>>,
+    pub receiver: Option<trap::Label<Expr>>,
+}
+
+impl trap::TrapEntry for MethodCallExpr {
+    fn extract_id(&mut self) -> trap::TrapId<Self> {
+        std::mem::replace(&mut self.id, trap::TrapId::Star)
+    }
+
+    fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
+        out.add_tuple("method_call_exprs", vec![id.into()]);
+        if let Some(v) = self.arg_list {
+            out.add_tuple("function_or_method_call_expr_arg_lists", vec![id.into(), v.into()]);
+        }
+        for (i, v) in self.attrs.into_iter().enumerate() {
+            out.add_tuple("function_or_method_call_expr_attrs", vec![id.into(), i.into(), v.into()]);
+        }
+        if let Some(v) = self.generic_arg_list {
+            out.add_tuple("method_call_expr_generic_arg_lists", vec![id.into(), v.into()]);
+        }
+        if let Some(v) = self.name_ref {
+            out.add_tuple("method_call_expr_name_refs", vec![id.into(), v.into()]);
+        }
+        if let Some(v) = self.receiver {
+            out.add_tuple("method_call_expr_receivers", vec![id.into(), v.into()]);
+        }
+    }
+}
+
+impl trap::TrapClass for MethodCallExpr {
+    fn class_name() -> &'static str { "MethodCallExpr" }
+}
+
+impl From<trap::Label<MethodCallExpr>> for trap::Label<AstNode> {
+    fn from(value: trap::Label<MethodCallExpr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme MethodCallExpr is a subclass of AstNode
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<MethodCallExpr>> for trap::Label<Element> {
+    fn from(value: trap::Label<MethodCallExpr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme MethodCallExpr is a subclass of Element
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<MethodCallExpr>> for trap::Label<Expr> {
+    fn from(value: trap::Label<MethodCallExpr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme MethodCallExpr is a subclass of Expr
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<MethodCallExpr>> for trap::Label<FunctionOrMethodCallExpr> {
+    fn from(value: trap::Label<MethodCallExpr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme MethodCallExpr is a subclass of FunctionOrMethodCallExpr
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<MethodCallExpr>> for trap::Label<Locatable> {
+    fn from(value: trap::Label<MethodCallExpr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme MethodCallExpr is a subclass of Locatable
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
 #[derive(Debug)]
 pub struct Module {
     pub id: trap::TrapId<Module>,
diff --git a/rust/ql/.generated.list b/rust/ql/.generated.list
index e37f6947148d..59d71c496637 100644
--- a/rust/ql/.generated.list
+++ b/rust/ql/.generated.list
@@ -14,7 +14,7 @@ lib/codeql/rust/elements/BinaryExpr.qll 394522da3bc3a716fc7bc40c3560143ca840f5d2
 lib/codeql/rust/elements/BlockExpr.qll b952fd44b89de248931d4089834d2c9406f6f2fc1a3f5c2365156be4e55157cf daccc07ab11ac696679b9fadc99f40b1bf579c90bf6c7cca6e82eaa313932ede
 lib/codeql/rust/elements/BoxPat.qll 1b2c3fff171aa6aa238c9460b122f26c79e04577cea67fa856de99842ba873d4 0caf8d23ed6e0997a6b8751def27641582151fba6e24fccf798712a4690b42f1
 lib/codeql/rust/elements/BreakExpr.qll 7ca3807a20e9a9a988d1fd7abebf240325ed422fcb45c719ba46272f031f94db dffb7379d3f3ba220acfbd05eb7bb6cfd9cfda211e9c8b1f5240ca5fa61be3fc
-lib/codeql/rust/elements/CallExpr.qll 6760ef2753fcaa9f02860bfeadfd1b1603d0d5b35f5dd72b33a474c206f51a29 55afe003eb51ef28b382af368429930d858d291bb7d76d71149eee1c805731f1
+lib/codeql/rust/elements/CallExpr.qll 4232f42c54212fe9e8aa140194da324b77581395a4d5c899190d469609598668 a589e19792174b18ce39b74e19828bfe5c7ff796424c05f6a6084eab4ff16ab4
 lib/codeql/rust/elements/CastExpr.qll ba281bde130f43c486c4ad889539b77fba9e41afdf7980e50b6a8696a1ec7527 61257003d395896ec60729d0bc01da36697615bb725d07141255fbb5c44e50a0
 lib/codeql/rust/elements/ClosureBinder.qll 977df800f97cc9b03fffb5e5e1fc6acd08a2938e04cb6ad91108784a15b0d510 f6fad4127226fe1dff2f16416d8a7fde5d8ab4a88f30e443ac5e5ff618de3e05
 lib/codeql/rust/elements/ClosureExpr.qll 8f06357ae134e42c073eef994c83c04b8cf294fe33b286dbd75c0e705ce29d05 9d9e282d965fed723965376801d4afa49444d1d9be9b093d02e276729a2cf7ad
@@ -41,6 +41,7 @@ lib/codeql/rust/elements/ForType.qll 0036bed8749358c356d78c4a0eef40d73e279628429
 lib/codeql/rust/elements/FormatArgsArg.qll 5bc9b4cd1bac7131165836e93838c45452a08ea6011741cbddace3cbf9c69440 f825140e98dc9800d5c045402186793c7b21511448e2f6bf6402d1e06305219c
 lib/codeql/rust/elements/FormatArgsExpr.qll f2ffad5a1105b29a8437c8ed6cf918cfcf4d65ac164bbf1be0585c3b673ca749 3ba20dc312a0a994bb43b37b2db72cbd4e06061b97918fa0e84ce355070ffbeb
 lib/codeql/rust/elements/Function.qll 736c53408f8674c88c352cd1f08f7c77e51551c68ef802f2e1c1aaf3d44fa8e9 6b52dbea081a5e799f1a2cedd57be5485bc8e018ded7249a1852343053d849a6
+lib/codeql/rust/elements/FunctionOrMethodCallExpr.qll 69754853bd452c18a333e2bb70a401726cc115092a120662edac5b24586f1951 1d9226ea609d298ec76eaf6a25248c96315b14a5993ac7c8dfd7fd80e1c134fb
 lib/codeql/rust/elements/GenericArg.qll 5f11ce0e3c5f08de84db61f56ba1b984652455ba6b95a8b8a5b5a235913d4072 756b6a73d66fde45bdcc65ce2362a5b1391af2927e6d54b6550b3ecd5fd11e75
 lib/codeql/rust/elements/GenericArgList.qll dcf274db517b0e8f19e4545d77f86cdd4066ff2805e68c808d0bb5750b49f569 1055a82929e850264e501b367ef4d314a3e6bb8943ec95f4284d157fb4d0092f
 lib/codeql/rust/elements/GenericParam.qll b58448b808d6dfa05db9574f54c22ce51f0b1d78784263c75a95d6bfc787067d 4afbab71fe717d7d7d3e2f60ea8c3d97bcb29b17b4efb79eabfe8f070edcb9bb
@@ -75,7 +76,7 @@ lib/codeql/rust/elements/MatchArmList.qll e6c48fd7419d88e996b82eb45e4aa2686dfd07
 lib/codeql/rust/elements/MatchExpr.qll e9ef1664f020823b6f4bb72d906a9dc0c1ee6432d4a9a13f7dbdbab2b2b1ee4d 38d71e5c487abcb5682293c573343be66e499a6e131bb630604c120d34b7777b
 lib/codeql/rust/elements/MatchGuard.qll 20754ab2009a7d40b50feece496ff7f38650586d79190ed2a372308594693694 471f8f118317efcf112f4ddfd60125ca2a9d9b3b08e6ee331c430961de7885ff
 lib/codeql/rust/elements/Meta.qll 9fa3216c86fa55ed5c0c4671708110a6ffc7c0f5d6cda8dda31aaff17f87534d c44ee2754dd71776ffd0a8a7d6c1ae8737c47e998e6bdb8efab5283625807cf4
-lib/codeql/rust/elements/MethodCallExpr.qll 0a5cab9f21741f6a38956e6de4f6beb143db5d85ee590f9908dab3da300a6b72 df21eba9cf2823a7b06eb6672dd8249225e7c16d5b6c1c37c1f2a175d9513272
+lib/codeql/rust/elements/MethodCallExpr.qll d19c02fdd2f6f649dfbf757c53f4af441f10842ca69f56b13d218e343961688b eafb571244dcbec1bb8106f8ec03c641ca383b51b615506bf0d7bc90a1aa1934
 lib/codeql/rust/elements/Missing.qll 70e6ac9790314752849c9888443c98223ccfc93a193998b7ce350b2c6ebe8ea4 e2f0623511acaa76b091f748d417714137a8b94f1f2bdbbd177f1c682c786dad
 lib/codeql/rust/elements/Module.qll 0bc85019177709256f8078d9de2a36f62f848d476225bff7bba1e35f249875c7 3fbb70e0c417a644dd0cada2c364c6e6876cfa16f37960e219c87e49c966c94e
 lib/codeql/rust/elements/Name.qll 3d7ed16c232912e30e5a075f5087ad344a8f76dcc27bc8f71a80c133802b89d7 036dc3ba0c20eb0907ef6dcc532214aa5de8e0de0fa819eca1fce0355b3741a3
@@ -229,6 +230,7 @@ lib/codeql/rust/elements/internal/FormatArgsArgImpl.qll 601f7715e9a65bcfa7cea197
 lib/codeql/rust/elements/internal/FormatArgsExprConstructor.qll ce29ff5a839b885b1ab7a02d6a381ae474ab1be3e6ee7dcfd7595bdf28e4b558 63bf957426871905a51ea319662a59e38104c197a1024360aca364dc145b11e8
 lib/codeql/rust/elements/internal/FormatArgsExprImpl.qll bdb992ebc6be59311b486f40325b39f52a69921cfc66a731085cb184da00050f 6336e7770f9cb700f1b3914fd940c3423ab4e971b34ed8fcc79da80c1f1cdba3
 lib/codeql/rust/elements/internal/FunctionConstructor.qll b50aea579938d03745dfbd8b5fa8498f7f83b967369f63d6875510e09ab7f5d2 19cca32aeaecaf9debc27329e8c39ecec69464bb1d89d7b09908a1d73a8d92a2
+lib/codeql/rust/elements/internal/FunctionOrMethodCallExprImpl.qll 34e7b5c95c8f0fdbd9c52159494e21046acbd0d62e1fb9b2eee53a11f15be261 105783845539bc44f05473efe8bedbc033fb5fb107c2daa77af664bfccb20bf6
 lib/codeql/rust/elements/internal/GenericArgImpl.qll 6b1b804c357425c223f926e560a688e81506f5a35b95485cecf704e88cc009ee cc1ccf6a23dadc397e82664f3911d4b385d4c8ca80b1ee16d5275d9c936148dd
 lib/codeql/rust/elements/internal/GenericArgListConstructor.qll 46859bb3eb09d77987a18642d65ba2e13471a4dc9c0a83a192fddc82e37c335c 2c7d54c876269a88d3461b05745e73b06532b1616cae9b614ac94b28735d8fc4
 lib/codeql/rust/elements/internal/GenericArgListImpl.qll 1a39ba7080147abccaaba451852c9c124fb6177f2ebd64e38ee74014444a34e1 80df3150c961936037ac02b46ef5f775c3f82e66490afbca00a016cb9eee798a
@@ -459,7 +461,7 @@ lib/codeql/rust/elements/internal/generated/BinaryExpr.qll 64e9bd9c571edd6e5f3e7
 lib/codeql/rust/elements/internal/generated/BlockExpr.qll 6fc90a80e60f017bf3418e45bcc35b5ddac59b51037c21aed3955d47c147ce4a 1f3f8e5107b0c6de381b7c94aab93dc5fd758a845c6ff9554888df453f1315d0
 lib/codeql/rust/elements/internal/generated/BoxPat.qll ec946a3e671ab7417e04b0207967adad004df512c570c4f0780ca5816d12d75f b0e64860855c4e85914042b1a51034899ff7cd1b2c6857188de89310a2726ea3
 lib/codeql/rust/elements/internal/generated/BreakExpr.qll 0f428a8b2f4209b134c2ffc3e1c93c30bc6b0e9c9172f140cefa88c1f77d8690 957b39f38ff6befe9061f55bc0b403c2f1c366dd0cf63b874bae6f8216576d76
-lib/codeql/rust/elements/internal/generated/CallExpr.qll c2700dbd9c33dcc14de10dc72ff49abafdf0952257864d4435cf8ac46849a2ee 7932f725f97ffbe1b050c2622a61a0d56f18c9264a3293466cba9915313495b5
+lib/codeql/rust/elements/internal/generated/CallExpr.qll 2ed74ea3da426b351949291ae728eb6d70de033cccc667712988cf416319e999 af84a17bf5512dc97d8781cb0aa868c7f5349932596f2600785d2432e15ece3a
 lib/codeql/rust/elements/internal/generated/CastExpr.qll d6fbf02e9e202254666082a9116634d0eb933177866ac4c0a57b5e9c4bb4b383 477f67773492e3b82695461d56327c9db05a7d1a67e8d192406265f2ce369670
 lib/codeql/rust/elements/internal/generated/ClosureBinder.qll 94c0dcdd4cd87d115659d496c88a98354bc7d4ddc0fa27028003bf7688b99987 d59d713b426dbbdb775df9092d176eea031dac1f14e468810f2fc8591399cd19
 lib/codeql/rust/elements/internal/generated/ClosureExpr.qll f9047451cb8b53f8b77e1c01f7ef485d5b5a92999e0591c6702062050052fa2f 2252be8b3022c587a8c6ad93b64d856263be7bfe2938c1d063e7cad845dd38e2
@@ -486,6 +488,7 @@ lib/codeql/rust/elements/internal/generated/ForType.qll 3d43d044a1189281f09c55ca
 lib/codeql/rust/elements/internal/generated/FormatArgsArg.qll e07a1ae310f590003f1b88fada7dcf4847c99adb9d4c838d1c88e66e1da85c5f 0ef7342451fe2cb06e765fb4b33bb8c4a9b927f5edbc8feb5c6ba3655697f447
 lib/codeql/rust/elements/internal/generated/FormatArgsExpr.qll 40d6daa7d2bafb33798a21d79774dc802cfbd7a31618ac3bd0149399ea2bf893 d1172e2151791228559004792e125fc4625f6a26ffad25f29efb0ad263bf8795
 lib/codeql/rust/elements/internal/generated/Function.qll b239af1a8874802b8a311706c53d56e3ceaad7ed23a7f97d1694bf961b63768b 4bc3c23685fa05820222e472ab1cdb40a271f862727d3bd878d47de9c2e3f485
+lib/codeql/rust/elements/internal/generated/FunctionOrMethodCallExpr.qll 5c6e3b4e4d3a91d0bb934dd2402898767ef6156b7b419222dfbc144167780231 67c82e154ff4c68f601fd92ba8aad7a8dd5b688dc89189744e1515bb647e9669
 lib/codeql/rust/elements/internal/generated/GenericArg.qll 464da0ba1c5ddcd1be68617167f177773d99b5ac4775ec8ea24d503e789a9099 6faa1033d59baf7c210ac4837a55781cfc054b7acbad8027faf4630dbfa6e101
 lib/codeql/rust/elements/internal/generated/GenericArgList.qll b8cd936bba6f28344e28c98acf38acb8ef43af6ecf8367d79ed487e5b9da17cb 8b14331261e49d004807285b02fca190aafd62bfb9378b05c7d9c1e95525fe7b
 lib/codeql/rust/elements/internal/generated/GenericParam.qll a0285123f974f287154b706bf6688b86edf72a4adcec57346c654d962435651b b42c3915e9564b5b5c5282229bf882aa3309de26a77721b2255d6f4235c0cc38
@@ -520,7 +523,7 @@ lib/codeql/rust/elements/internal/generated/MatchArmList.qll 13362680c037fe83fef
 lib/codeql/rust/elements/internal/generated/MatchExpr.qll 689d65f690fe05bc262d0a5bfe69bb4f8a142db387c5765fcc4958a9b49989f8 2979cd2017d0538870d17b2b7592c75cc05b706bd36c9de3e5dc38fa3a957e5b
 lib/codeql/rust/elements/internal/generated/MatchGuard.qll 521a507883963106780f1782084c581fbcf1179863c7c15438c4db79e30e78dd 6226feffaaa8d828a42ece0c693e616cd375672eb987c3b7ff1ca15fa23c116a
 lib/codeql/rust/elements/internal/generated/Meta.qll f1ce7cdaf2a6fa3b86f0465e33a9521d254c032468427b276d93276ffd5142be 046d72c868ee2664b8a291de16320238ece9d0612c93c96a0d601e0b6079bf90
-lib/codeql/rust/elements/internal/generated/MethodCallExpr.qll c2d6faf1f840628dbc5aa59c90dbd8b244f6bd4a7dba25e410047fcde11ff378 2d0251b095bf15b0275d493efdd1f9ce0926a3cff6671bb550a7a672aaf62a30
+lib/codeql/rust/elements/internal/generated/MethodCallExpr.qll 89f5d6248ea338f0b3add9de4166df411bce2f8589b164d0a69db4650e4bcd71 3e13ddfa857e0a3655e7030b3d4ab411b09d6f0ea960b098f54ffcc1d8394d91
 lib/codeql/rust/elements/internal/generated/Missing.qll 16735d91df04a4e1ae52fae25db5f59a044e540755734bbab46b5fbb0fe6b0bd 28ca4e49fb7e6b4734be2f2f69e7c224c570344cc160ef80c5a5cd413e750dad
 lib/codeql/rust/elements/internal/generated/Module.qll ebae5d8963c9fd569c0fbad1d7770abd3fd2479437f236cbce0505ba9f9af52c fa3c382115fed18a26f1a755d8749a201b9489f82c09448a88fb8e9e1435fe5f
 lib/codeql/rust/elements/internal/generated/Name.qll 12aad57744b7d1b04454159536409244c47319aedd580acb58ee93ef9d7f837d 63fc67ccc085db22f82576a53489f15216a7c29d5b941b14a965eab481534e2e
@@ -533,7 +536,7 @@ lib/codeql/rust/elements/internal/generated/ParamList.qll c808c9d84dd7800573832b
 lib/codeql/rust/elements/internal/generated/ParenExpr.qll bc0731505bfe88516205ec360582a4222d2681d11342c93e15258590ddee82f2 d4bd6e0c80cf1d63746c88d4bcb3a01d4c75732e5da09e3ebd9437ced227fb60
 lib/codeql/rust/elements/internal/generated/ParenPat.qll ce24b8f8ecbf0f204af200317405724063887257460c80cf250c39b2fdf37185 e7c87d37e1a0ca7ea03840017e1aa9ddb7f927f1f3b6396c0305b46aeee33db6
 lib/codeql/rust/elements/internal/generated/ParenType.qll 9cc954d73f8330dcac7b475f97748b63af5c8766dee9d2f2872c0a7e4c903537 c07534c8a9c683c4a9b11d490095647e420de0a0bfc23273eaf6f31b00244273
-lib/codeql/rust/elements/internal/generated/ParentChild.qll ad728d69b3ef9555d71db2274b04a5ba99b4f815120c55032c57d077e0c954ca 64c6406626a14ed3052d3996cc47fc91e435175bd982440d948416cf878400fd
+lib/codeql/rust/elements/internal/generated/ParentChild.qll 36a5d76d16a00cb18ee2e3193708b795e502ca9a92e72b8047e215961da3c5c8 dae8c9eda242e6d4c153f070ea4eefe1cbaae44aa148c5a79a852c9f1c8f7b2d
 lib/codeql/rust/elements/internal/generated/Pat.qll 3605ac062be2f294ee73336e9669027b8b655f4ad55660e1eab35266275154ee 7f9400db2884d336dd1d21df2a8093759c2a110be9bf6482ce8e80ae0fd74ed4
 lib/codeql/rust/elements/internal/generated/Path.qll 299abce24762a5ab023f3cf1ab9718b83047e171aed42a8092e7a155914b1657 db1a23d18640c548f08c9f94823838b5e019ac85877c7b15df2d1493d1846572
 lib/codeql/rust/elements/internal/generated/PathExpr.qll 17cdb0a7393258a207450f08e37178fc9d35d167f064ba6015be94246f3dc933 a75fdd280aff6d87e083a92030e041c2eb52b57cf7151d4a6989fcd31d6a64bf
@@ -545,7 +548,7 @@ lib/codeql/rust/elements/internal/generated/PtrType.qll 5f12b6ad29b4e5ce51c205e2
 lib/codeql/rust/elements/internal/generated/PureSynthConstructors.qll dc03515d678ba052c2ff2dd9f0883e0bce54cac740ba9a15e5173f292c1b6971 dc03515d678ba052c2ff2dd9f0883e0bce54cac740ba9a15e5173f292c1b6971
 lib/codeql/rust/elements/internal/generated/RangeExpr.qll 23cca03bf43535f33b22a38894f70d669787be4e4f5b8fe5c8f7b964d30e9027 18624cef6c6b679eeace2a98737e472432e0ead354cca02192b4d45330f047c9
 lib/codeql/rust/elements/internal/generated/RangePat.qll efd93730de217cf50dcba5875595263a5eadf9f7e4e1272401342a094d158614 229b251b3d118932e31e78ac4dfb75f48b766f240f20d436062785606d44467b
-lib/codeql/rust/elements/internal/generated/Raw.qll 783c3d04b798c0a5281baf88aa3ada406492e6e6b8ff41dac658d52c88f95c46 e69891409fc89f0a3a199feb6f1a734bfdd862239a5f6794de0ee811e69fab04
+lib/codeql/rust/elements/internal/generated/Raw.qll 468493674e9f891b6b289d07dd3f6d4369ab04411b8d20a81673f56dfe3abeb4 5876c9a5cc5ede7503b9f524184585abf8fba21fa94887033d2488205d3b4f94
 lib/codeql/rust/elements/internal/generated/RecordExpr.qll eb6cb662e463f9260efae1a6ce874fa781172063b916ef1963f861e9942d308d 1a21cbccc8f3799ff13281e822818ebfb21d81591720a427cac3625512cb9d40
 lib/codeql/rust/elements/internal/generated/RecordExprField.qll 7e9f8663d3b74ebbc9603b10c9912f082febba6bd73d344b100bbd3edf837802 fbe6b578e7fd5d5a6f21bbb8c388957ab7210a6a249ec71510a50fb35b319ea1
 lib/codeql/rust/elements/internal/generated/RecordExprFieldList.qll 179a97211fe7aa6265085d4d54115cdbc0e1cd7c9b2135591e8f36d6432f13d3 dd44bbbc1e83a1ed3a587afb729d7debf7aeb7b63245de181726af13090e50c0
@@ -570,7 +573,7 @@ lib/codeql/rust/elements/internal/generated/Static.qll cae5313e08e4af44c46b25802
 lib/codeql/rust/elements/internal/generated/Stmt.qll 8473ff532dd5cc9d7decaddcd174b94d610f6ca0aec8e473cc051dad9f3db917 6ef7d2b5237c2dbdcacbf7d8b39109d4dc100229f2b28b5c9e3e4fbf673ba72b
 lib/codeql/rust/elements/internal/generated/StmtList.qll a667193e32341e17400867c6e359878c4e645ef9f5f4d97676afc0283a33a026 a320ed678ee359302e2fc1b70a9476705cd616fcfa44a499d32f0c7715627f73
 lib/codeql/rust/elements/internal/generated/Struct.qll 4d57f0db12dc7ad3e31e750a24172ef1505406b4dab16386af0674bd18bf8f4b 1a73c83df926b996f629316f74c61ea775be04532ab61b56af904223354f033e
-lib/codeql/rust/elements/internal/generated/Synth.qll 99fa143232f2cfb1ef3f6ed6a51afa634c336361105e37719ce11ca6c74de8ee b3b77e1bdea36022b3be7cef000e7113059eb8b2b1afec26ae1d62e84259143b
+lib/codeql/rust/elements/internal/generated/Synth.qll 908954d21685d16362d15c4170de397fd0af45bcd2038245b863196c96f0caeb 2a696c02a9c57411312ecbad592abd3718d4e73fbd070a2c5b03273358ed3c9d
 lib/codeql/rust/elements/internal/generated/SynthConstructors.qll 518b68ccf6d0791bc0c141486261108bb1723e37743fc7f8e4167a1d61660531 518b68ccf6d0791bc0c141486261108bb1723e37743fc7f8e4167a1d61660531
 lib/codeql/rust/elements/internal/generated/Token.qll 77a91a25ca5669703cf3a4353b591cef4d72caa6b0b9db07bb9e005d69c848d1 2fdffc4882ed3a6ca9ac6d1fb5f1ac5a471ca703e2ffdc642885fa558d6e373b
 lib/codeql/rust/elements/internal/generated/TokenTree.qll 8577c2b097c1be2f0f7daa5acfcf146f78674a424d99563e08a84dd3e6d91b46 d2f30764e84dbfc0a6a5d3d8a5f935cd432413688cb32da9c94e420fbc10665c
@@ -605,7 +608,7 @@ lib/codeql/rust/elements/internal/generated/WhileExpr.qll fec8a9211b82a80601bf73
 lib/codeql/rust/elements/internal/generated/WildcardPat.qll d74b70b57a0a66bfae017a329352a5b27a6b9e73dd5521d627f680e810c6c59e 4b913b548ba27ff3c82fcd32cf996ff329cb57d176d3bebd0fcef394486ea499
 lib/codeql/rust/elements/internal/generated/YeetExpr.qll cac328200872a35337b4bcb15c851afb4743f82c080f9738d295571eb01d7392 94af734eea08129b587fed849b643e7572800e8330c0b57d727d41abda47930b
 lib/codeql/rust/elements/internal/generated/YieldExpr.qll 37e5f0c1e373a22bbc53d8b7f2c0e1f476e5be5080b8437c5e964f4e83fad79a 4a9a68643401637bf48e5c2b2f74a6bf0ddcb4ff76f6bffb61d436b685621e85
-lib/codeql/rust/elements.qll 926e6e5f994ef7fcd04854c4d69004d7bfd81950e132c9d3d501b4b2420db222 926e6e5f994ef7fcd04854c4d69004d7bfd81950e132c9d3d501b4b2420db222
+lib/codeql/rust/elements.qll c647c2f20c9d20d49214026ea0e2965d0b751db567baceaf7a9225a8efa2546b c647c2f20c9d20d49214026ea0e2965d0b751db567baceaf7a9225a8efa2546b
 test/extractor-tests/generated/Abi/Abi.ql 7f6e7dc4af86eca3ebdc79b10373988cd0871bd78b51997d3cffd969105e5fdd 2f936b6ca005c6157c755121584410c03e4a3949c23bee302fbe05ee10ce118f
 test/extractor-tests/generated/Abi/Abi_getAbiString.ql a496762fcec5a0887b87023bbf93e9b650f02e20113e25c44d6e4281ae8f5335 14109c7ce11ba25e3cd6e7f1b3fcb4cb00622f2a4eac91bfe43145c5f366bc52
 test/extractor-tests/generated/ArgList/ArgList.ql e412927756e72165d0e7c5c9bd3fca89d08197bbf760db8fb7683c64bb2229bc 043dba8506946fbb87753e22c387987d7eded6ddb963aa067f9e60ef9024d684
diff --git a/rust/ql/.gitattributes b/rust/ql/.gitattributes
index e69d7ea5791b..63630aa20cca 100644
--- a/rust/ql/.gitattributes
+++ b/rust/ql/.gitattributes
@@ -43,6 +43,7 @@
 /lib/codeql/rust/elements/FormatArgsArg.qll linguist-generated
 /lib/codeql/rust/elements/FormatArgsExpr.qll linguist-generated
 /lib/codeql/rust/elements/Function.qll linguist-generated
+/lib/codeql/rust/elements/FunctionOrMethodCallExpr.qll linguist-generated
 /lib/codeql/rust/elements/GenericArg.qll linguist-generated
 /lib/codeql/rust/elements/GenericArgList.qll linguist-generated
 /lib/codeql/rust/elements/GenericParam.qll linguist-generated
@@ -231,6 +232,7 @@
 /lib/codeql/rust/elements/internal/FormatArgsExprConstructor.qll linguist-generated
 /lib/codeql/rust/elements/internal/FormatArgsExprImpl.qll linguist-generated
 /lib/codeql/rust/elements/internal/FunctionConstructor.qll linguist-generated
+/lib/codeql/rust/elements/internal/FunctionOrMethodCallExprImpl.qll linguist-generated
 /lib/codeql/rust/elements/internal/GenericArgImpl.qll linguist-generated
 /lib/codeql/rust/elements/internal/GenericArgListConstructor.qll linguist-generated
 /lib/codeql/rust/elements/internal/GenericArgListImpl.qll linguist-generated
@@ -488,6 +490,7 @@
 /lib/codeql/rust/elements/internal/generated/FormatArgsArg.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/FormatArgsExpr.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/Function.qll linguist-generated
+/lib/codeql/rust/elements/internal/generated/FunctionOrMethodCallExpr.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/GenericArg.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/GenericArgList.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/GenericParam.qll linguist-generated
diff --git a/rust/ql/lib/codeql/rust/elements.qll b/rust/ql/lib/codeql/rust/elements.qll
index 4abbb0b4148c..3795ecbe6c55 100644
--- a/rust/ql/lib/codeql/rust/elements.qll
+++ b/rust/ql/lib/codeql/rust/elements.qll
@@ -46,6 +46,7 @@ import codeql.rust.elements.ForType
 import codeql.rust.elements.FormatArgsArg
 import codeql.rust.elements.FormatArgsExpr
 import codeql.rust.elements.Function
+import codeql.rust.elements.FunctionOrMethodCallExpr
 import codeql.rust.elements.GenericArg
 import codeql.rust.elements.GenericArgList
 import codeql.rust.elements.GenericParam
diff --git a/rust/ql/lib/codeql/rust/elements/CallExpr.qll b/rust/ql/lib/codeql/rust/elements/CallExpr.qll
index 7047d6a8c3cf..bf637cb29a60 100644
--- a/rust/ql/lib/codeql/rust/elements/CallExpr.qll
+++ b/rust/ql/lib/codeql/rust/elements/CallExpr.qll
@@ -4,9 +4,8 @@
  */
 
 private import internal.CallExprImpl
-import codeql.rust.elements.ArgList
-import codeql.rust.elements.Attr
 import codeql.rust.elements.Expr
+import codeql.rust.elements.FunctionOrMethodCallExpr
 
 /**
  * A function call expression. For example:
diff --git a/rust/ql/lib/codeql/rust/elements/FunctionOrMethodCallExpr.qll b/rust/ql/lib/codeql/rust/elements/FunctionOrMethodCallExpr.qll
new file mode 100644
index 000000000000..3635c33e324d
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/FunctionOrMethodCallExpr.qll
@@ -0,0 +1,14 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the public class `FunctionOrMethodCallExpr`.
+ */
+
+private import internal.FunctionOrMethodCallExprImpl
+import codeql.rust.elements.ArgList
+import codeql.rust.elements.Attr
+import codeql.rust.elements.Expr
+
+/**
+ * A function or method call expression. See `CallExpr` and `MethodCallExpr` for further details.
+ */
+final class FunctionOrMethodCallExpr = Impl::FunctionOrMethodCallExpr;
diff --git a/rust/ql/lib/codeql/rust/elements/MethodCallExpr.qll b/rust/ql/lib/codeql/rust/elements/MethodCallExpr.qll
index ec3d305f63cf..3646d987f9fa 100644
--- a/rust/ql/lib/codeql/rust/elements/MethodCallExpr.qll
+++ b/rust/ql/lib/codeql/rust/elements/MethodCallExpr.qll
@@ -4,9 +4,8 @@
  */
 
 private import internal.MethodCallExprImpl
-import codeql.rust.elements.ArgList
-import codeql.rust.elements.Attr
 import codeql.rust.elements.Expr
+import codeql.rust.elements.FunctionOrMethodCallExpr
 import codeql.rust.elements.GenericArgList
 import codeql.rust.elements.NameRef
 
diff --git a/rust/ql/lib/codeql/rust/elements/internal/FunctionOrMethodCallExprImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/FunctionOrMethodCallExprImpl.qll
new file mode 100644
index 000000000000..1ad34f210cfb
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/FunctionOrMethodCallExprImpl.qll
@@ -0,0 +1,19 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ * This module provides a hand-modifiable wrapper around the generated class `FunctionOrMethodCallExpr`.
+ *
+ * INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.FunctionOrMethodCallExpr
+
+/**
+ * INTERNAL: This module contains the customizable definition of `FunctionOrMethodCallExpr` and should not
+ * be referenced directly.
+ */
+module Impl {
+  /**
+   * A function or method call expression. See `CallExpr` and `MethodCallExpr` for further details.
+   */
+  class FunctionOrMethodCallExpr extends Generated::FunctionOrMethodCallExpr { }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/CallExpr.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/CallExpr.qll
index f7b27e6e2a84..66b4ce10cb71 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/CallExpr.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/CallExpr.qll
@@ -6,10 +6,8 @@
 
 private import codeql.rust.elements.internal.generated.Synth
 private import codeql.rust.elements.internal.generated.Raw
-import codeql.rust.elements.ArgList
-import codeql.rust.elements.Attr
 import codeql.rust.elements.Expr
-import codeql.rust.elements.internal.ExprImpl::Impl as ExprImpl
+import codeql.rust.elements.internal.FunctionOrMethodCallExprImpl::Impl as FunctionOrMethodCallExprImpl
 
 /**
  * INTERNAL: This module contains the fully generated definition of `CallExpr` and should not
@@ -27,40 +25,9 @@ module Generated {
    * INTERNAL: Do not reference the `Generated::CallExpr` class directly.
    * Use the subclass `CallExpr`, where the following predicates are available.
    */
-  class CallExpr extends Synth::TCallExpr, ExprImpl::Expr {
+  class CallExpr extends Synth::TCallExpr, FunctionOrMethodCallExprImpl::FunctionOrMethodCallExpr {
     override string getAPrimaryQlClass() { result = "CallExpr" }
 
-    /**
-     * Gets the argument list of this call expression, if it exists.
-     */
-    ArgList getArgList() {
-      result =
-        Synth::convertArgListFromRaw(Synth::convertCallExprToRaw(this).(Raw::CallExpr).getArgList())
-    }
-
-    /**
-     * Holds if `getArgList()` exists.
-     */
-    final predicate hasArgList() { exists(this.getArgList()) }
-
-    /**
-     * Gets the `index`th attr of this call expression (0-based).
-     */
-    Attr getAttr(int index) {
-      result =
-        Synth::convertAttrFromRaw(Synth::convertCallExprToRaw(this).(Raw::CallExpr).getAttr(index))
-    }
-
-    /**
-     * Gets any of the attrs of this call expression.
-     */
-    final Attr getAnAttr() { result = this.getAttr(_) }
-
-    /**
-     * Gets the number of attrs of this call expression.
-     */
-    final int getNumberOfAttrs() { result = count(int i | exists(this.getAttr(i))) }
-
     /**
      * Gets the expression of this call expression, if it exists.
      */
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/FunctionOrMethodCallExpr.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/FunctionOrMethodCallExpr.qll
new file mode 100644
index 000000000000..e4ecbaa1a699
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/FunctionOrMethodCallExpr.qll
@@ -0,0 +1,59 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the generated definition of `FunctionOrMethodCallExpr`.
+ * INTERNAL: Do not import directly.
+ */
+
+private import codeql.rust.elements.internal.generated.Synth
+private import codeql.rust.elements.internal.generated.Raw
+import codeql.rust.elements.ArgList
+import codeql.rust.elements.Attr
+import codeql.rust.elements.internal.ExprImpl::Impl as ExprImpl
+
+/**
+ * INTERNAL: This module contains the fully generated definition of `FunctionOrMethodCallExpr` and should not
+ * be referenced directly.
+ */
+module Generated {
+  /**
+   * A function or method call expression. See `CallExpr` and `MethodCallExpr` for further details.
+   * INTERNAL: Do not reference the `Generated::FunctionOrMethodCallExpr` class directly.
+   * Use the subclass `FunctionOrMethodCallExpr`, where the following predicates are available.
+   */
+  class FunctionOrMethodCallExpr extends Synth::TFunctionOrMethodCallExpr, ExprImpl::Expr {
+    /**
+     * Gets the argument list of this function or method call expression, if it exists.
+     */
+    ArgList getArgList() {
+      result =
+        Synth::convertArgListFromRaw(Synth::convertFunctionOrMethodCallExprToRaw(this)
+              .(Raw::FunctionOrMethodCallExpr)
+              .getArgList())
+    }
+
+    /**
+     * Holds if `getArgList()` exists.
+     */
+    final predicate hasArgList() { exists(this.getArgList()) }
+
+    /**
+     * Gets the `index`th attr of this function or method call expression (0-based).
+     */
+    Attr getAttr(int index) {
+      result =
+        Synth::convertAttrFromRaw(Synth::convertFunctionOrMethodCallExprToRaw(this)
+              .(Raw::FunctionOrMethodCallExpr)
+              .getAttr(index))
+    }
+
+    /**
+     * Gets any of the attrs of this function or method call expression.
+     */
+    final Attr getAnAttr() { result = this.getAttr(_) }
+
+    /**
+     * Gets the number of attrs of this function or method call expression.
+     */
+    final int getNumberOfAttrs() { result = count(int i | exists(this.getAttr(i))) }
+  }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/MethodCallExpr.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/MethodCallExpr.qll
index 0cc8f2437065..de5cef9e70b5 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/MethodCallExpr.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/MethodCallExpr.qll
@@ -6,10 +6,8 @@
 
 private import codeql.rust.elements.internal.generated.Synth
 private import codeql.rust.elements.internal.generated.Raw
-import codeql.rust.elements.ArgList
-import codeql.rust.elements.Attr
 import codeql.rust.elements.Expr
-import codeql.rust.elements.internal.ExprImpl::Impl as ExprImpl
+import codeql.rust.elements.internal.FunctionOrMethodCallExprImpl::Impl as FunctionOrMethodCallExprImpl
 import codeql.rust.elements.GenericArgList
 import codeql.rust.elements.NameRef
 
@@ -27,44 +25,11 @@ module Generated {
    * INTERNAL: Do not reference the `Generated::MethodCallExpr` class directly.
    * Use the subclass `MethodCallExpr`, where the following predicates are available.
    */
-  class MethodCallExpr extends Synth::TMethodCallExpr, ExprImpl::Expr {
+  class MethodCallExpr extends Synth::TMethodCallExpr,
+    FunctionOrMethodCallExprImpl::FunctionOrMethodCallExpr
+  {
     override string getAPrimaryQlClass() { result = "MethodCallExpr" }
 
-    /**
-     * Gets the argument list of this method call expression, if it exists.
-     */
-    ArgList getArgList() {
-      result =
-        Synth::convertArgListFromRaw(Synth::convertMethodCallExprToRaw(this)
-              .(Raw::MethodCallExpr)
-              .getArgList())
-    }
-
-    /**
-     * Holds if `getArgList()` exists.
-     */
-    final predicate hasArgList() { exists(this.getArgList()) }
-
-    /**
-     * Gets the `index`th attr of this method call expression (0-based).
-     */
-    Attr getAttr(int index) {
-      result =
-        Synth::convertAttrFromRaw(Synth::convertMethodCallExprToRaw(this)
-              .(Raw::MethodCallExpr)
-              .getAttr(index))
-    }
-
-    /**
-     * Gets any of the attrs of this method call expression.
-     */
-    final Attr getAnAttr() { result = this.getAttr(_) }
-
-    /**
-     * Gets the number of attrs of this method call expression.
-     */
-    final int getNumberOfAttrs() { result = count(int i | exists(this.getAttr(i))) }
-
     /**
      * Gets the generic argument list of this method call expression, if it exists.
      */
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/ParentChild.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/ParentChild.qll
index a5c77c02914f..4dbb92f77f92 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/ParentChild.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/ParentChild.qll
@@ -1380,29 +1380,6 @@ private module Impl {
     )
   }
 
-  private Element getImmediateChildOfCallExpr(CallExpr e, int index, string partialPredicateCall) {
-    exists(int b, int bExpr, int n, int nArgList, int nAttr, int nExpr |
-      b = 0 and
-      bExpr = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfExpr(e, i, _)) | i) and
-      n = bExpr and
-      nArgList = n + 1 and
-      nAttr = nArgList + 1 + max(int i | i = -1 or exists(e.getAttr(i)) | i) and
-      nExpr = nAttr + 1 and
-      (
-        none()
-        or
-        result = getImmediateChildOfExpr(e, index - b, partialPredicateCall)
-        or
-        index = n and result = e.getArgList() and partialPredicateCall = "ArgList()"
-        or
-        result = e.getAttr(index - nArgList) and
-        partialPredicateCall = "Attr(" + (index - nArgList).toString() + ")"
-        or
-        index = nAttr and result = e.getExpr() and partialPredicateCall = "Expr()"
-      )
-    )
-  }
-
   private Element getImmediateChildOfCastExpr(CastExpr e, int index, string partialPredicateCall) {
     exists(int b, int bExpr, int n, int nAttr, int nExpr, int nTy |
       b = 0 and
@@ -1714,6 +1691,28 @@ private module Impl {
     )
   }
 
+  private Element getImmediateChildOfFunctionOrMethodCallExpr(
+    FunctionOrMethodCallExpr e, int index, string partialPredicateCall
+  ) {
+    exists(int b, int bExpr, int n, int nArgList, int nAttr |
+      b = 0 and
+      bExpr = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfExpr(e, i, _)) | i) and
+      n = bExpr and
+      nArgList = n + 1 and
+      nAttr = nArgList + 1 + max(int i | i = -1 or exists(e.getAttr(i)) | i) and
+      (
+        none()
+        or
+        result = getImmediateChildOfExpr(e, index - b, partialPredicateCall)
+        or
+        index = n and result = e.getArgList() and partialPredicateCall = "ArgList()"
+        or
+        result = e.getAttr(index - nArgList) and
+        partialPredicateCall = "Attr(" + (index - nArgList).toString() + ")"
+      )
+    )
+  }
+
   private Element getImmediateChildOfIdentPat(IdentPat e, int index, string partialPredicateCall) {
     exists(int b, int bPat, int n, int nAttr, int nName, int nPat |
       b = 0 and
@@ -2058,42 +2057,6 @@ private module Impl {
     )
   }
 
-  private Element getImmediateChildOfMethodCallExpr(
-    MethodCallExpr e, int index, string partialPredicateCall
-  ) {
-    exists(
-      int b, int bExpr, int n, int nArgList, int nAttr, int nGenericArgList, int nNameRef,
-      int nReceiver
-    |
-      b = 0 and
-      bExpr = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfExpr(e, i, _)) | i) and
-      n = bExpr and
-      nArgList = n + 1 and
-      nAttr = nArgList + 1 + max(int i | i = -1 or exists(e.getAttr(i)) | i) and
-      nGenericArgList = nAttr + 1 and
-      nNameRef = nGenericArgList + 1 and
-      nReceiver = nNameRef + 1 and
-      (
-        none()
-        or
-        result = getImmediateChildOfExpr(e, index - b, partialPredicateCall)
-        or
-        index = n and result = e.getArgList() and partialPredicateCall = "ArgList()"
-        or
-        result = e.getAttr(index - nArgList) and
-        partialPredicateCall = "Attr(" + (index - nArgList).toString() + ")"
-        or
-        index = nAttr and
-        result = e.getGenericArgList() and
-        partialPredicateCall = "GenericArgList()"
-        or
-        index = nGenericArgList and result = e.getNameRef() and partialPredicateCall = "NameRef()"
-        or
-        index = nNameRef and result = e.getReceiver() and partialPredicateCall = "Receiver()"
-      )
-    )
-  }
-
   private Element getImmediateChildOfNeverType(NeverType e, int index, string partialPredicateCall) {
     exists(int b, int bTypeRef, int n |
       b = 0 and
@@ -2780,6 +2743,24 @@ private module Impl {
     )
   }
 
+  private Element getImmediateChildOfCallExpr(CallExpr e, int index, string partialPredicateCall) {
+    exists(int b, int bFunctionOrMethodCallExpr, int n, int nExpr |
+      b = 0 and
+      bFunctionOrMethodCallExpr =
+        b + 1 +
+          max(int i | i = -1 or exists(getImmediateChildOfFunctionOrMethodCallExpr(e, i, _)) | i) and
+      n = bFunctionOrMethodCallExpr and
+      nExpr = n + 1 and
+      (
+        none()
+        or
+        result = getImmediateChildOfFunctionOrMethodCallExpr(e, index - b, partialPredicateCall)
+        or
+        index = n and result = e.getExpr() and partialPredicateCall = "Expr()"
+      )
+    )
+  }
+
   private Element getImmediateChildOfConst(Const e, int index, string partialPredicateCall) {
     exists(
       int b, int bAssocItem, int bItem, int n, int nAttr, int nBody, int nName, int nTy,
@@ -3096,6 +3077,34 @@ private module Impl {
     )
   }
 
+  private Element getImmediateChildOfMethodCallExpr(
+    MethodCallExpr e, int index, string partialPredicateCall
+  ) {
+    exists(
+      int b, int bFunctionOrMethodCallExpr, int n, int nGenericArgList, int nNameRef, int nReceiver
+    |
+      b = 0 and
+      bFunctionOrMethodCallExpr =
+        b + 1 +
+          max(int i | i = -1 or exists(getImmediateChildOfFunctionOrMethodCallExpr(e, i, _)) | i) and
+      n = bFunctionOrMethodCallExpr and
+      nGenericArgList = n + 1 and
+      nNameRef = nGenericArgList + 1 and
+      nReceiver = nNameRef + 1 and
+      (
+        none()
+        or
+        result = getImmediateChildOfFunctionOrMethodCallExpr(e, index - b, partialPredicateCall)
+        or
+        index = n and result = e.getGenericArgList() and partialPredicateCall = "GenericArgList()"
+        or
+        index = nGenericArgList and result = e.getNameRef() and partialPredicateCall = "NameRef()"
+        or
+        index = nNameRef and result = e.getReceiver() and partialPredicateCall = "Receiver()"
+      )
+    )
+  }
+
   private Element getImmediateChildOfModule(Module e, int index, string partialPredicateCall) {
     exists(int b, int bItem, int n, int nAttr, int nItemList, int nName, int nVisibility |
       b = 0 and
@@ -3519,8 +3528,6 @@ private module Impl {
     or
     result = getImmediateChildOfBreakExpr(e, index, partialAccessor)
     or
-    result = getImmediateChildOfCallExpr(e, index, partialAccessor)
-    or
     result = getImmediateChildOfCastExpr(e, index, partialAccessor)
     or
     result = getImmediateChildOfClosureExpr(e, index, partialAccessor)
@@ -3581,8 +3588,6 @@ private module Impl {
     or
     result = getImmediateChildOfMatchExpr(e, index, partialAccessor)
     or
-    result = getImmediateChildOfMethodCallExpr(e, index, partialAccessor)
-    or
     result = getImmediateChildOfNeverType(e, index, partialAccessor)
     or
     result = getImmediateChildOfOffsetOfExpr(e, index, partialAccessor)
@@ -3655,6 +3660,8 @@ private module Impl {
     or
     result = getImmediateChildOfYieldExpr(e, index, partialAccessor)
     or
+    result = getImmediateChildOfCallExpr(e, index, partialAccessor)
+    or
     result = getImmediateChildOfConst(e, index, partialAccessor)
     or
     result = getImmediateChildOfEnum(e, index, partialAccessor)
@@ -3673,6 +3680,8 @@ private module Impl {
     or
     result = getImmediateChildOfMacroRules(e, index, partialAccessor)
     or
+    result = getImmediateChildOfMethodCallExpr(e, index, partialAccessor)
+    or
     result = getImmediateChildOfModule(e, index, partialAccessor)
     or
     result = getImmediateChildOfStatic(e, index, partialAccessor)
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/Raw.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/Raw.qll
index 4726ec0fd391..57d3827561cf 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/Raw.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/Raw.qll
@@ -1395,35 +1395,6 @@ module Raw {
     Lifetime getLifetime() { break_expr_lifetimes(this, result) }
   }
 
-  /**
-   * INTERNAL: Do not use.
-   * A function call expression. For example:
-   * ```rust
-   * foo(42);
-   * foo::<u32, u64>(42);
-   * foo[0](42);
-   * foo(1) = 4;
-   * ```
-   */
-  class CallExpr extends @call_expr, Expr {
-    override string toString() { result = "CallExpr" }
-
-    /**
-     * Gets the argument list of this call expression, if it exists.
-     */
-    ArgList getArgList() { call_expr_arg_lists(this, result) }
-
-    /**
-     * Gets the `index`th attr of this call expression (0-based).
-     */
-    Attr getAttr(int index) { call_expr_attrs(this, index, result) }
-
-    /**
-     * Gets the expression of this call expression, if it exists.
-     */
-    Expr getExpr() { call_expr_exprs(this, result) }
-  }
-
   /**
    * INTERNAL: Do not use.
    * A cast expression. For example:
@@ -1781,6 +1752,22 @@ module Raw {
     Expr getTemplate() { format_args_expr_templates(this, result) }
   }
 
+  /**
+   * INTERNAL: Do not use.
+   * A function or method call expression. See `CallExpr` and `MethodCallExpr` for further details.
+   */
+  class FunctionOrMethodCallExpr extends @function_or_method_call_expr, Expr {
+    /**
+     * Gets the argument list of this function or method call expression, if it exists.
+     */
+    ArgList getArgList() { function_or_method_call_expr_arg_lists(this, result) }
+
+    /**
+     * Gets the `index`th attr of this function or method call expression (0-based).
+     */
+    Attr getAttr(int index) { function_or_method_call_expr_attrs(this, index, result) }
+  }
+
   /**
    * INTERNAL: Do not use.
    * A binding pattern. For example:
@@ -2206,43 +2193,6 @@ module Raw {
     MatchArmList getMatchArmList() { match_expr_match_arm_lists(this, result) }
   }
 
-  /**
-   * INTERNAL: Do not use.
-   * A method call expression. For example:
-   * ```rust
-   * x.foo(42);
-   * x.foo::<u32, u64>(42);
-   * ```
-   */
-  class MethodCallExpr extends @method_call_expr, Expr {
-    override string toString() { result = "MethodCallExpr" }
-
-    /**
-     * Gets the argument list of this method call expression, if it exists.
-     */
-    ArgList getArgList() { method_call_expr_arg_lists(this, result) }
-
-    /**
-     * Gets the `index`th attr of this method call expression (0-based).
-     */
-    Attr getAttr(int index) { method_call_expr_attrs(this, index, result) }
-
-    /**
-     * Gets the generic argument list of this method call expression, if it exists.
-     */
-    GenericArgList getGenericArgList() { method_call_expr_generic_arg_lists(this, result) }
-
-    /**
-     * Gets the name reference of this method call expression, if it exists.
-     */
-    NameRef getNameRef() { method_call_expr_name_refs(this, result) }
-
-    /**
-     * Gets the receiver of this method call expression, if it exists.
-     */
-    Expr getReceiver() { method_call_expr_receivers(this, result) }
-  }
-
   /**
    * INTERNAL: Do not use.
    * A NeverType. For example:
@@ -2999,6 +2949,25 @@ module Raw {
     Expr getExpr() { yield_expr_exprs(this, result) }
   }
 
+  /**
+   * INTERNAL: Do not use.
+   * A function call expression. For example:
+   * ```rust
+   * foo(42);
+   * foo::<u32, u64>(42);
+   * foo[0](42);
+   * foo(1) = 4;
+   * ```
+   */
+  class CallExpr extends @call_expr, FunctionOrMethodCallExpr {
+    override string toString() { result = "CallExpr" }
+
+    /**
+     * Gets the expression of this call expression, if it exists.
+     */
+    Expr getExpr() { call_expr_exprs(this, result) }
+  }
+
   /**
    * INTERNAL: Do not use.
    * A Const. For example:
@@ -3334,6 +3303,33 @@ module Raw {
     Visibility getVisibility() { macro_rules_visibilities(this, result) }
   }
 
+  /**
+   * INTERNAL: Do not use.
+   * A method call expression. For example:
+   * ```rust
+   * x.foo(42);
+   * x.foo::<u32, u64>(42);
+   * ```
+   */
+  class MethodCallExpr extends @method_call_expr, FunctionOrMethodCallExpr {
+    override string toString() { result = "MethodCallExpr" }
+
+    /**
+     * Gets the generic argument list of this method call expression, if it exists.
+     */
+    GenericArgList getGenericArgList() { method_call_expr_generic_arg_lists(this, result) }
+
+    /**
+     * Gets the name reference of this method call expression, if it exists.
+     */
+    NameRef getNameRef() { method_call_expr_name_refs(this, result) }
+
+    /**
+     * Gets the receiver of this method call expression, if it exists.
+     */
+    Expr getReceiver() { method_call_expr_receivers(this, result) }
+  }
+
   /**
    * INTERNAL: Do not use.
    * A module declaration. For example:
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/Synth.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/Synth.qll
index 891da3025dbe..192f22dae05a 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/Synth.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/Synth.qll
@@ -608,9 +608,9 @@ module Synth {
    */
   class TExpr =
     TArrayExpr or TAsmExpr or TAwaitExpr or TBecomeExpr or TBinaryExpr or TBlockExpr or
-        TBreakExpr or TCallExpr or TCastExpr or TClosureExpr or TContinueExpr or TFieldExpr or
-        TForExpr or TFormatArgsExpr or TIfExpr or TIndexExpr or TLetExpr or TLiteralExpr or
-        TLoopExpr or TMacroExpr or TMatchExpr or TMethodCallExpr or TOffsetOfExpr or TParenExpr or
+        TBreakExpr or TCastExpr or TClosureExpr or TContinueExpr or TFieldExpr or TForExpr or
+        TFormatArgsExpr or TFunctionOrMethodCallExpr or TIfExpr or TIndexExpr or TLetExpr or
+        TLiteralExpr or TLoopExpr or TMacroExpr or TMatchExpr or TOffsetOfExpr or TParenExpr or
         TPathExpr or TPrefixExpr or TRangeExpr or TRecordExpr or TRefExpr or TReturnExpr or
         TTryExpr or TTupleExpr or TUnderscoreExpr or TWhileExpr or TYeetExpr or TYieldExpr;
 
@@ -624,6 +624,11 @@ module Synth {
    */
   class TFieldList = TRecordFieldList or TTupleFieldList;
 
+  /**
+   * INTERNAL: Do not use.
+   */
+  class TFunctionOrMethodCallExpr = TCallExpr or TMethodCallExpr;
+
   /**
    * INTERNAL: Do not use.
    */
@@ -1693,8 +1698,6 @@ module Synth {
     or
     result = convertBreakExprFromRaw(e)
     or
-    result = convertCallExprFromRaw(e)
-    or
     result = convertCastExprFromRaw(e)
     or
     result = convertClosureExprFromRaw(e)
@@ -1707,6 +1710,8 @@ module Synth {
     or
     result = convertFormatArgsExprFromRaw(e)
     or
+    result = convertFunctionOrMethodCallExprFromRaw(e)
+    or
     result = convertIfExprFromRaw(e)
     or
     result = convertIndexExprFromRaw(e)
@@ -1721,8 +1726,6 @@ module Synth {
     or
     result = convertMatchExprFromRaw(e)
     or
-    result = convertMethodCallExprFromRaw(e)
-    or
     result = convertOffsetOfExprFromRaw(e)
     or
     result = convertParenExprFromRaw(e)
@@ -1776,6 +1779,16 @@ module Synth {
     result = convertTupleFieldListFromRaw(e)
   }
 
+  /**
+   * INTERNAL: Do not use.
+   * Converts a raw DB element to a synthesized `TFunctionOrMethodCallExpr`, if possible.
+   */
+  TFunctionOrMethodCallExpr convertFunctionOrMethodCallExprFromRaw(Raw::Element e) {
+    result = convertCallExprFromRaw(e)
+    or
+    result = convertMethodCallExprFromRaw(e)
+  }
+
   /**
    * INTERNAL: Do not use.
    * Converts a raw DB element to a synthesized `TGenericArg`, if possible.
@@ -2963,8 +2976,6 @@ module Synth {
     or
     result = convertBreakExprToRaw(e)
     or
-    result = convertCallExprToRaw(e)
-    or
     result = convertCastExprToRaw(e)
     or
     result = convertClosureExprToRaw(e)
@@ -2977,6 +2988,8 @@ module Synth {
     or
     result = convertFormatArgsExprToRaw(e)
     or
+    result = convertFunctionOrMethodCallExprToRaw(e)
+    or
     result = convertIfExprToRaw(e)
     or
     result = convertIndexExprToRaw(e)
@@ -2991,8 +3004,6 @@ module Synth {
     or
     result = convertMatchExprToRaw(e)
     or
-    result = convertMethodCallExprToRaw(e)
-    or
     result = convertOffsetOfExprToRaw(e)
     or
     result = convertParenExprToRaw(e)
@@ -3046,6 +3057,16 @@ module Synth {
     result = convertTupleFieldListToRaw(e)
   }
 
+  /**
+   * INTERNAL: Do not use.
+   * Converts a synthesized `TFunctionOrMethodCallExpr` to a raw DB element, if possible.
+   */
+  Raw::Element convertFunctionOrMethodCallExprToRaw(TFunctionOrMethodCallExpr e) {
+    result = convertCallExprToRaw(e)
+    or
+    result = convertMethodCallExprToRaw(e)
+  }
+
   /**
    * INTERNAL: Do not use.
    * Converts a synthesized `TGenericArg` to a raw DB element, if possible.
diff --git a/rust/ql/lib/rust.dbscheme b/rust/ql/lib/rust.dbscheme
index 831141fef1dd..113c3fe7d7e2 100644
--- a/rust/ql/lib/rust.dbscheme
+++ b/rust/ql/lib/rust.dbscheme
@@ -273,13 +273,13 @@ closure_binder_generic_param_lists(
 | @binary_expr
 | @block_expr
 | @break_expr
-| @call_expr
 | @cast_expr
 | @closure_expr
 | @continue_expr
 | @field_expr
 | @for_expr
 | @format_args_expr
+| @function_or_method_call_expr
 | @if_expr
 | @index_expr
 | @let_expr
@@ -287,7 +287,6 @@ closure_binder_generic_param_lists(
 | @loop_expr
 | @macro_expr
 | @match_expr
-| @method_call_expr
 | @offset_of_expr
 | @paren_expr
 | @path_expr
@@ -1301,29 +1300,6 @@ break_expr_lifetimes(
   int lifetime: @lifetime ref
 );
 
-call_exprs(
-  unique int id: @call_expr
-);
-
-#keyset[id]
-call_expr_arg_lists(
-  int id: @call_expr ref,
-  int arg_list: @arg_list ref
-);
-
-#keyset[id, index]
-call_expr_attrs(
-  int id: @call_expr ref,
-  int index: int ref,
-  int attr: @attr ref
-);
-
-#keyset[id]
-call_expr_exprs(
-  int id: @call_expr ref,
-  int expr: @expr ref
-);
-
 cast_exprs(
   unique int id: @cast_expr
 );
@@ -1594,6 +1570,24 @@ format_args_expr_templates(
   int template: @expr ref
 );
 
+@function_or_method_call_expr =
+  @call_expr
+| @method_call_expr
+;
+
+#keyset[id]
+function_or_method_call_expr_arg_lists(
+  int id: @function_or_method_call_expr ref,
+  int arg_list: @arg_list ref
+);
+
+#keyset[id, index]
+function_or_method_call_expr_attrs(
+  int id: @function_or_method_call_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
 ident_pats(
   unique int id: @ident_pat
 );
@@ -1897,41 +1891,6 @@ match_expr_match_arm_lists(
   int match_arm_list: @match_arm_list ref
 );
 
-method_call_exprs(
-  unique int id: @method_call_expr
-);
-
-#keyset[id]
-method_call_expr_arg_lists(
-  int id: @method_call_expr ref,
-  int arg_list: @arg_list ref
-);
-
-#keyset[id, index]
-method_call_expr_attrs(
-  int id: @method_call_expr ref,
-  int index: int ref,
-  int attr: @attr ref
-);
-
-#keyset[id]
-method_call_expr_generic_arg_lists(
-  int id: @method_call_expr ref,
-  int generic_arg_list: @generic_arg_list ref
-);
-
-#keyset[id]
-method_call_expr_name_refs(
-  int id: @method_call_expr ref,
-  int name_ref: @name_ref ref
-);
-
-#keyset[id]
-method_call_expr_receivers(
-  int id: @method_call_expr ref,
-  int receiver: @expr ref
-);
-
 never_types(
   unique int id: @never_type
 );
@@ -2466,6 +2425,16 @@ yield_expr_exprs(
   int expr: @expr ref
 );
 
+call_exprs(
+  unique int id: @call_expr
+);
+
+#keyset[id]
+call_expr_exprs(
+  int id: @call_expr ref,
+  int expr: @expr ref
+);
+
 consts(
   unique int id: @const
 );
@@ -2787,6 +2756,28 @@ macro_rules_visibilities(
   int visibility: @visibility ref
 );
 
+method_call_exprs(
+  unique int id: @method_call_expr
+);
+
+#keyset[id]
+method_call_expr_generic_arg_lists(
+  int id: @method_call_expr ref,
+  int generic_arg_list: @generic_arg_list ref
+);
+
+#keyset[id]
+method_call_expr_name_refs(
+  int id: @method_call_expr ref,
+  int name_ref: @name_ref ref
+);
+
+#keyset[id]
+method_call_expr_receivers(
+  int id: @method_call_expr ref,
+  int receiver: @expr ref
+);
+
 modules(
   unique int id: @module
 );

From d295cac6978fdcd1a6a23fd9ce9650d641cab730 Mon Sep 17 00:00:00 2001
From: Owen Mansel-Chan <owen-mc@github.com>
Date: Wed, 9 Oct 2024 10:56:22 +0100
Subject: [PATCH 277/347] Always use generic method object

---
 go/extractor/extractor.go | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/go/extractor/extractor.go b/go/extractor/extractor.go
index c157f7c8f672..03190183c26f 100644
--- a/go/extractor/extractor.go
+++ b/go/extractor/extractor.go
@@ -1637,7 +1637,7 @@ func extractType(tw *trap.Writer, tp types.Type) trap.Label {
 				// Note that methods coming from embedded interfaces can be
 				// accessed through `Method(i)`, so there is no need to
 				// deal with them separately.
-				meth := tp.Method(i)
+				meth := tp.Method(i).Origin()
 
 				// Note that methods do not have a parent scope, so they are
 				// not dealt with by `extractScopes`
@@ -1707,7 +1707,7 @@ func extractType(tw *trap.Writer, tp types.Type) trap.Label {
 			// ensure all methods have labels - note that methods do not have a
 			// parent scope, so they are not dealt with by `extractScopes`
 			for i := 0; i < origintp.NumMethods(); i++ {
-				meth := origintp.Method(i)
+				meth := origintp.Method(i).Origin()
 
 				extractMethod(tw, meth)
 			}
@@ -1715,7 +1715,7 @@ func extractType(tw *trap.Writer, tp types.Type) trap.Label {
 			// associate all methods of underlying interface with this type
 			if underlyingInterface, ok := underlying.(*types.Interface); ok {
 				for i := 0; i < underlyingInterface.NumMethods(); i++ {
-					methlbl := extractMethod(tw, underlyingInterface.Method(i))
+					methlbl := extractMethod(tw, underlyingInterface.Method(i).Origin())
 					dbscheme.MethodHostsTable.Emit(tw, methlbl, lbl)
 				}
 			}
@@ -1787,7 +1787,7 @@ func getTypeLabel(tw *trap.Writer, tp types.Type) (trap.Label, bool) {
 		case *types.Interface:
 			var b strings.Builder
 			for i := 0; i < tp.NumMethods(); i++ {
-				meth := tp.Method(i)
+				meth := tp.Method(i).Origin()
 				methLbl := extractType(tw, meth.Type())
 				if i > 0 {
 					b.WriteString(",")

From 6f6b4a0bfef0e6cffd21f1e12fc11eddbc98083f Mon Sep 17 00:00:00 2001
From: Owen Mansel-Chan <owen-mc@github.com>
Date: Wed, 9 Oct 2024 11:09:26 +0100
Subject: [PATCH 278/347] Add check for specialized objects

---
 go/extractor/extractor.go | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/go/extractor/extractor.go b/go/extractor/extractor.go
index 03190183c26f..f3209e8abdaf 100644
--- a/go/extractor/extractor.go
+++ b/go/extractor/extractor.go
@@ -518,6 +518,7 @@ func extractMethod(tw *trap.Writer, meth *types.Func) trap.Label {
 // For more information on objects, see:
 // https://github.com/golang/example/blob/master/gotypes/README.md#objects
 func extractObject(tw *trap.Writer, obj types.Object, lbl trap.Label) {
+	checkObjectNotSpecialized(obj)
 	name := obj.Name()
 	isBuiltin := obj.Parent() == types.Universe
 	var kind int
@@ -2143,3 +2144,15 @@ func skipExtractingValueForLeftOperand(tw *trap.Writer, be *ast.BinaryExpr) bool
 	}
 	return true
 }
+
+// checkObjectNotSpecialized exits the program if `obj` is specialized. Note
+// that specialization is only possible for function objects and variable
+// objects.
+func checkObjectNotSpecialized(obj types.Object) {
+	if funcObj, ok := obj.(*types.Func); ok && funcObj != funcObj.Origin() {
+		log.Fatalf("Encountered unexpected specialization %s of generic function object %s", funcObj.FullName(), funcObj.Origin().FullName())
+	}
+	if varObj, ok := obj.(*types.Var); ok && varObj != varObj.Origin() {
+		log.Fatalf("Encountered unexpected specialization %s of generic variable object %s", varObj.String(), varObj.Origin().String())
+	}
+}

From 513efe222d2f3084f367d260ae4694bfdbc4a436 Mon Sep 17 00:00:00 2001
From: Owen Mansel-Chan <owen-mc@github.com>
Date: Wed, 9 Oct 2024 11:19:49 +0100
Subject: [PATCH 279/347] Add check for object for specialized named type

---
 go/extractor/extractor.go | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/go/extractor/extractor.go b/go/extractor/extractor.go
index f3209e8abdaf..936e0b6fdec8 100644
--- a/go/extractor/extractor.go
+++ b/go/extractor/extractor.go
@@ -2155,4 +2155,9 @@ func checkObjectNotSpecialized(obj types.Object) {
 	if varObj, ok := obj.(*types.Var); ok && varObj != varObj.Origin() {
 		log.Fatalf("Encountered unexpected specialization %s of generic variable object %s", varObj.String(), varObj.Origin().String())
 	}
+	if typeNameObj, ok := obj.(*types.TypeName); ok {
+		if namedType, ok := typeNameObj.Type().(*types.Named); ok && namedType != namedType.Origin() {
+			log.Fatalf("Encountered type object for specialization %s of named type %s", namedType.String(), namedType.Origin().String())
+		}
+	}
 }

From 8a895740bafc0639ce607753853a8af77534fc1b Mon Sep 17 00:00:00 2001
From: Geoffrey White <40627776+geoffw0@users.noreply.github.com>
Date: Thu, 10 Oct 2024 14:05:39 +0100
Subject: [PATCH 280/347] Ruby: Move language specific code out of
 FileSystem.qll (at least for now).

---
 ruby/ql/lib/codeql/files/FileSystem.qll | 18 ------------------
 ruby/ql/lib/codeql/ruby/AST.qll         | 18 ++++++++++++++++++
 2 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/ruby/ql/lib/codeql/files/FileSystem.qll b/ruby/ql/lib/codeql/files/FileSystem.qll
index 8985cc333447..528dde52fd91 100644
--- a/ruby/ql/lib/codeql/files/FileSystem.qll
+++ b/ruby/ql/lib/codeql/files/FileSystem.qll
@@ -2,7 +2,6 @@
 
 private import codeql.Locations
 private import codeql.util.FileSystem
-private import codeql.ruby.Diagnostics
 
 private module Input implements InputSig {
   abstract class ContainerBase extends @container {
@@ -35,20 +34,3 @@ class File extends Container, Impl::File {
   /** Holds if this file was extracted from ordinary source code. */
   predicate fromSource() { any() }
 }
-
-/**
- * A successfully extracted file, that is, a file that was extracted and
- * contains no extraction errors or warnings.
- */
-class SuccessfullyExtractedFile extends File {
-  SuccessfullyExtractedFile() {
-    not exists(Diagnostic d |
-      d.getLocation().getFile() = this and
-      (
-        d instanceof ExtractionError
-        or
-        d instanceof ExtractionWarning
-      )
-    )
-  }
-}
diff --git a/ruby/ql/lib/codeql/ruby/AST.qll b/ruby/ql/lib/codeql/ruby/AST.qll
index e8dc28692c07..e98749af4273 100644
--- a/ruby/ql/lib/codeql/ruby/AST.qll
+++ b/ruby/ql/lib/codeql/ruby/AST.qll
@@ -18,6 +18,7 @@ private import ast.internal.Scope
 private import ast.internal.Synthesis
 private import ast.internal.TreeSitter
 private import Customizations
+private import Diagnostics
 
 cached
 private module Cached {
@@ -166,3 +167,20 @@ class RubyFile extends File {
   /** Gets the number of lines of comments in this file. */
   int getNumberOfLinesOfComments() { result = count(int line | this.line(line, true)) }
 }
+
+/**
+ * A successfully extracted file, that is, a file that was extracted and
+ * contains no extraction errors or warnings.
+ */
+class SuccessfullyExtractedFile extends RubyFile {
+  SuccessfullyExtractedFile() {
+    not exists(Diagnostic d |
+      d.getLocation().getFile() = this and
+      (
+        d instanceof ExtractionError
+        or
+        d instanceof ExtractionWarning
+      )
+    )
+  }
+}

From 7986fc70368c6f7c5170597a395e0deca9fa4a7c Mon Sep 17 00:00:00 2001
From: Arthur Baars <aibaars@github.com>
Date: Thu, 26 Sep 2024 05:15:41 +0200
Subject: [PATCH 281/347] Rust: avoid double '.' in trap extension

---
 rust/extractor/src/trap.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rust/extractor/src/trap.rs b/rust/extractor/src/trap.rs
index 0d549ea4dc7a..7422c3a93b2b 100644
--- a/rust/extractor/src/trap.rs
+++ b/rust/extractor/src/trap.rs
@@ -244,7 +244,7 @@ impl TrapFileProvider {
     }
 
     pub fn create(&self, category: &str, key: &Path) -> TrapFile {
-        let path = file_paths::path_for(&self.trap_dir.join(category), key, ".trap");
+        let path = file_paths::path_for(&self.trap_dir.join(category), key, "trap");
         debug!("creating trap file {}", path.display());
         let mut writer = trap::Writer::new();
         extractor::populate_empty_location(&mut writer);

From 69f0e8bcf76ed7990b45f0b077511df156dfdf23 Mon Sep 17 00:00:00 2001
From: Arthur Baars <aibaars@github.com>
Date: Tue, 1 Oct 2024 15:17:17 +0200
Subject: [PATCH 282/347] Rust: add MacroStmts and MacroItems

---
 rust/ast-generator/src/main.rs            |  3 ---
 rust/extractor/src/translate/generated.rs | 24 +++++++++++++++++++++++
 rust/schema/ast.py                        |  7 +++++++
 3 files changed, 31 insertions(+), 3 deletions(-)

diff --git a/rust/ast-generator/src/main.rs b/rust/ast-generator/src/main.rs
index 8d4114c8bde5..043848e902c8 100644
--- a/rust/ast-generator/src/main.rs
+++ b/rust/ast-generator/src/main.rs
@@ -538,9 +538,6 @@ fn main() -> std::io::Result<()> {
         .parse()
         .unwrap();
     let mut grammar = codegen::grammar::lower(&grammar);
-    grammar
-        .nodes
-        .retain(|x| x.name != "MacroStmts" && x.name != "MacroItems");
 
     grammar.enums.retain(|x| x.name != "Adt");
 
diff --git a/rust/extractor/src/translate/generated.rs b/rust/extractor/src/translate/generated.rs
index 57d3cbc186b9..9725bbfa6b64 100644
--- a/rust/extractor/src/translate/generated.rs
+++ b/rust/extractor/src/translate/generated.rs
@@ -1004,6 +1004,17 @@ impl Translator {
         label
     }
 
+    pub(crate) fn emit_macro_items(&mut self, node: ast::MacroItems) -> Label<generated::MacroItems> {
+        let items = node.items().map(|x| self.emit_item(x)).collect();
+        let label = self.trap.emit(generated::MacroItems {
+            id: TrapId::Star,
+            items,
+        });
+        self.emit_location(label, &node);
+        self.emit_tokens(label.into(), node.syntax().children_with_tokens());
+        label
+    }
+
     pub(crate) fn emit_macro_pat(&mut self, node: ast::MacroPat) -> Label<generated::MacroPat> {
         let macro_call = node.macro_call().map(|x| self.emit_macro_call(x));
         let label = self.trap.emit(generated::MacroPat {
@@ -1032,6 +1043,19 @@ impl Translator {
         label
     }
 
+    pub(crate) fn emit_macro_stmts(&mut self, node: ast::MacroStmts) -> Label<generated::MacroStmts> {
+        let expr = node.expr().map(|x| self.emit_expr(x));
+        let statements = node.statements().map(|x| self.emit_stmt(x)).collect();
+        let label = self.trap.emit(generated::MacroStmts {
+            id: TrapId::Star,
+            expr,
+            statements,
+        });
+        self.emit_location(label, &node);
+        self.emit_tokens(label.into(), node.syntax().children_with_tokens());
+        label
+    }
+
     pub(crate) fn emit_macro_type(&mut self, node: ast::MacroType) -> Label<generated::MacroType> {
         let macro_call = node.macro_call().map(|x| self.emit_macro_call(x));
         let label = self.trap.emit(generated::MacroType {
diff --git a/rust/schema/ast.py b/rust/schema/ast.py
index 665afe12b7d9..6e146c7c54d9 100644
--- a/rust/schema/ast.py
+++ b/rust/schema/ast.py
@@ -304,6 +304,9 @@ class MacroDef(Item):
 class MacroExpr(Expr):
    macro_call: optional["MacroCall"] | child
 
+class MacroItems(AstNode):
+   items: list["Item"] | child
+
 class MacroPat(Pat):
    macro_call: optional["MacroCall"] | child
 
@@ -313,6 +316,10 @@ class MacroRules(Item):
    token_tree: optional["TokenTree"] | child
    visibility: optional["Visibility"] | child
 
+class MacroStmts(AstNode):
+   expr: optional["Expr"] | child
+   statements: list["Stmt"] | child
+
 class MacroType(TypeRef):
    macro_call: optional["MacroCall"] | child
 

From 6ede20cccc3ec4c0098203d6ab3de98d841ee95e Mon Sep 17 00:00:00 2001
From: Arthur Baars <aibaars@github.com>
Date: Tue, 1 Oct 2024 15:18:17 +0200
Subject: [PATCH 283/347] Rust: regenerate code

---
 rust/extractor/src/generated/.generated.list  |   2 +-
 rust/extractor/src/generated/top.rs           | 104 ++++++++++++++++++
 rust/ql/.generated.list                       |  20 +++-
 rust/ql/.gitattributes                        |  10 ++
 rust/ql/lib/codeql/rust/elements.qll          |   2 +
 .../lib/codeql/rust/elements/MacroItems.qll   |  10 ++
 .../lib/codeql/rust/elements/MacroStmts.qll   |  11 ++
 .../internal/MacroItemsConstructor.qll        |  14 +++
 .../rust/elements/internal/MacroItemsImpl.qll |  16 +++
 .../internal/MacroStmtsConstructor.qll        |  14 +++
 .../rust/elements/internal/MacroStmtsImpl.qll |  16 +++
 .../internal/generated/MacroItems.qll         |  44 ++++++++
 .../internal/generated/MacroStmts.qll         |  58 ++++++++++
 .../internal/generated/ParentChild.qll        |  41 +++++++
 .../rust/elements/internal/generated/Raw.qll  |  29 +++++
 .../elements/internal/generated/Synth.qll     |  54 +++++++--
 .../internal/generated/SynthConstructors.qll  |   2 +
 rust/ql/lib/rust.dbscheme                     |  30 +++++
 .../generated/MacroItems/MISSING_SOURCE.txt   |   4 +
 .../generated/MacroStmts/MISSING_SOURCE.txt   |   4 +
 20 files changed, 472 insertions(+), 13 deletions(-)
 create mode 100644 rust/ql/lib/codeql/rust/elements/MacroItems.qll
 create mode 100644 rust/ql/lib/codeql/rust/elements/MacroStmts.qll
 create mode 100644 rust/ql/lib/codeql/rust/elements/internal/MacroItemsConstructor.qll
 create mode 100644 rust/ql/lib/codeql/rust/elements/internal/MacroItemsImpl.qll
 create mode 100644 rust/ql/lib/codeql/rust/elements/internal/MacroStmtsConstructor.qll
 create mode 100644 rust/ql/lib/codeql/rust/elements/internal/MacroStmtsImpl.qll
 create mode 100644 rust/ql/lib/codeql/rust/elements/internal/generated/MacroItems.qll
 create mode 100644 rust/ql/lib/codeql/rust/elements/internal/generated/MacroStmts.qll
 create mode 100644 rust/ql/test/extractor-tests/generated/MacroItems/MISSING_SOURCE.txt
 create mode 100644 rust/ql/test/extractor-tests/generated/MacroStmts/MISSING_SOURCE.txt

diff --git a/rust/extractor/src/generated/.generated.list b/rust/extractor/src/generated/.generated.list
index 43459827a075..7ae321e9a1a0 100644
--- a/rust/extractor/src/generated/.generated.list
+++ b/rust/extractor/src/generated/.generated.list
@@ -1,2 +1,2 @@
 mod.rs 4bcb9def847469aae9d8649461546b7c21ec97cf6e63d3cf394e339915ce65d7 4bcb9def847469aae9d8649461546b7c21ec97cf6e63d3cf394e339915ce65d7
-top.rs 855f5f0639dfafd8603c9b842f6470ca6d1214bb72391890a1de64db2adebba1 855f5f0639dfafd8603c9b842f6470ca6d1214bb72391890a1de64db2adebba1
+top.rs 00321b829ffca674c66daa86c003b9d5f8c64fef42873d03fa677cfa479039a2 00321b829ffca674c66daa86c003b9d5f8c64fef42873d03fa677cfa479039a2
diff --git a/rust/extractor/src/generated/top.rs b/rust/extractor/src/generated/top.rs
index 5c234ae22aef..372760d5c133 100644
--- a/rust/extractor/src/generated/top.rs
+++ b/rust/extractor/src/generated/top.rs
@@ -1032,6 +1032,110 @@ impl From<trap::Label<Lifetime>> for trap::Label<Locatable> {
     }
 }
 
+#[derive(Debug)]
+pub struct MacroItems {
+    pub id: trap::TrapId<MacroItems>,
+    pub items: Vec<trap::Label<Item>>,
+}
+
+impl trap::TrapEntry for MacroItems {
+    fn extract_id(&mut self) -> trap::TrapId<Self> {
+        std::mem::replace(&mut self.id, trap::TrapId::Star)
+    }
+
+    fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
+        out.add_tuple("macro_items", vec![id.into()]);
+        for (i, v) in self.items.into_iter().enumerate() {
+            out.add_tuple("macro_items_items", vec![id.into(), i.into(), v.into()]);
+        }
+    }
+}
+
+impl trap::TrapClass for MacroItems {
+    fn class_name() -> &'static str { "MacroItems" }
+}
+
+impl From<trap::Label<MacroItems>> for trap::Label<AstNode> {
+    fn from(value: trap::Label<MacroItems>) -> Self {
+        // SAFETY: this is safe because in the dbscheme MacroItems is a subclass of AstNode
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<MacroItems>> for trap::Label<Element> {
+    fn from(value: trap::Label<MacroItems>) -> Self {
+        // SAFETY: this is safe because in the dbscheme MacroItems is a subclass of Element
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<MacroItems>> for trap::Label<Locatable> {
+    fn from(value: trap::Label<MacroItems>) -> Self {
+        // SAFETY: this is safe because in the dbscheme MacroItems is a subclass of Locatable
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+#[derive(Debug)]
+pub struct MacroStmts {
+    pub id: trap::TrapId<MacroStmts>,
+    pub expr: Option<trap::Label<Expr>>,
+    pub statements: Vec<trap::Label<Stmt>>,
+}
+
+impl trap::TrapEntry for MacroStmts {
+    fn extract_id(&mut self) -> trap::TrapId<Self> {
+        std::mem::replace(&mut self.id, trap::TrapId::Star)
+    }
+
+    fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
+        out.add_tuple("macro_stmts", vec![id.into()]);
+        if let Some(v) = self.expr {
+            out.add_tuple("macro_stmts_exprs", vec![id.into(), v.into()]);
+        }
+        for (i, v) in self.statements.into_iter().enumerate() {
+            out.add_tuple("macro_stmts_statements", vec![id.into(), i.into(), v.into()]);
+        }
+    }
+}
+
+impl trap::TrapClass for MacroStmts {
+    fn class_name() -> &'static str { "MacroStmts" }
+}
+
+impl From<trap::Label<MacroStmts>> for trap::Label<AstNode> {
+    fn from(value: trap::Label<MacroStmts>) -> Self {
+        // SAFETY: this is safe because in the dbscheme MacroStmts is a subclass of AstNode
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<MacroStmts>> for trap::Label<Element> {
+    fn from(value: trap::Label<MacroStmts>) -> Self {
+        // SAFETY: this is safe because in the dbscheme MacroStmts is a subclass of Element
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<MacroStmts>> for trap::Label<Locatable> {
+    fn from(value: trap::Label<MacroStmts>) -> Self {
+        // SAFETY: this is safe because in the dbscheme MacroStmts is a subclass of Locatable
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
 #[derive(Debug)]
 pub struct MatchArm {
     pub id: trap::TrapId<MatchArm>,
diff --git a/rust/ql/.generated.list b/rust/ql/.generated.list
index e37f6947148d..d18865bbf1ff 100644
--- a/rust/ql/.generated.list
+++ b/rust/ql/.generated.list
@@ -67,8 +67,10 @@ lib/codeql/rust/elements/LoopExpr.qll 58ade0bc4a01a1cc361363682fde3ea56f4c5fbb4b
 lib/codeql/rust/elements/MacroCall.qll 16933db15c6c0dbb717ef442f751ad8f63c444f36a12f8d56b8a05a3e5f71d1b ac05cbf50e4b06f39f58817cddbeac6f804c2d1e4f60956a960d63d495e7183d
 lib/codeql/rust/elements/MacroDef.qll acb39275a1a3257084314a46ad4d8477946130f57e401c70c5949ad6aafc5c5f 6a8a8db12a3ec345fede51ca36e8c6acbdce58c5144388bb94f0706416fa152a
 lib/codeql/rust/elements/MacroExpr.qll ea9fed13f610bab1a2c4541c994510e0cb806530b60beef0d0c36b23e3b620f0 ad11a6bbd3a229ad97a16049cc6b0f3c8740f9f75ea61bbf4eebb072db9b12d2
+lib/codeql/rust/elements/MacroItems.qll 4acf8e5ab8f84dc8fae442d52a29266be2f1e7160120bb1dd52238b3d62b4cab 0d6e25bbf1f3082b739bb846d7c3ef21a58c79e6a65b72272a00cffc3d32aa47
 lib/codeql/rust/elements/MacroPat.qll dbf193b4fb544ac0b5a7dcfc31a6652de7239b6e643ff15b05868b2c142e940c 19b45c0a1eb1198e450c05d564b5d4aa0d6da29e7db84b9521eadf901e20a932
 lib/codeql/rust/elements/MacroRules.qll a94535506798077043b9c1470992ac4310bf67bcce5f722080886d1b3e6d90d1 bd8e08a7171991abc85100b45267631e66d1b332caf1e5882cd17caee5cf18a3
+lib/codeql/rust/elements/MacroStmts.qll 66b3e877c4e3f8ef552152c92188aae7d5901a7b2e21dec581a61ee390be2fbc cc535cb6afb29783be37b1647d3267dd693c3434d42e1ab561d3a6a74ce20cfc
 lib/codeql/rust/elements/MacroType.qll e5a153643e49a6be41483ad944550a030e0500764947b4e328cef6fa08c4fbd4 a42332c0a9c5cf7317fc49f3e1049e7751004fcc3efa056bbe058a8bfa2ef0cb
 lib/codeql/rust/elements/MatchArm.qll c39fd6cc0da24b1ff8d1e42835bcfee7695ad13580e3c7c50acd7c881b1cd894 62a31d2bd125e6aaebefc406e541a641271d3c497a377959f94dd4735b2bfbf8
 lib/codeql/rust/elements/MatchArmList.qll e6c48fd7419d88e996b82eb45e4aa2686dfd079b283b02be7710192fb2cb93a0 0ec63a0ca56f5f7f80093fd3e77b198b74c6289e67be55dc6a4deb610753c7bd
@@ -274,10 +276,14 @@ lib/codeql/rust/elements/internal/MacroDefConstructor.qll 382a3bdf46905d112ee491
 lib/codeql/rust/elements/internal/MacroDefImpl.qll f26e787ffd43e8cb079db01eba04412dbf32c338938acf1bc09a2f094bbdfdfe 044f43bc94fe4b6df22afae32e9f039d1d0d9e85ad9f24b6388be71211c37ce5
 lib/codeql/rust/elements/internal/MacroExprConstructor.qll b12edb21ea189a1b28d96309c69c3d08e08837621af22edd67ff9416c097d2df d35bc98e7b7b5451930214c0d93dce33a2c7b5b74f36bf99f113f53db1f19c14
 lib/codeql/rust/elements/internal/MacroExprImpl.qll 92dd9f658a85ae407e055f090385f451084de59190d8a00c7e1fba453c3eced4 89d544634fecdbead2ff06a26fc8132e127dab07f38b9322fa14dc55657b9f1a
+lib/codeql/rust/elements/internal/MacroItemsConstructor.qll 8e9ab7ec1e0f50a22605d4e993f99a85ca8059fbb506d67bc8f5a281af367b05 2602f9db31ea0c48192c3dde3bb5625a8ed1cae4cd3408729b9e09318d5bd071
+lib/codeql/rust/elements/internal/MacroItemsImpl.qll b20e9d0ba72de335ae1df33318339c9546c7f4c7ff25b3bf6eec884a2faa33bd 3bb159223eecb566004ce27457d5d97cd676f632be14b0411ff228a1d4e8e107
 lib/codeql/rust/elements/internal/MacroPatConstructor.qll 24744c1bbe21c1d249a04205fb09795ae38ed106ba1423e86ccbc5e62359eaa2 4fac3f731a1ffd87c1230d561c5236bd28dcde0d1ce0dcd7d7a84ba393669d4a
 lib/codeql/rust/elements/internal/MacroPatImpl.qll 7470e2d88c38c7300a64986f058ba92bb22b4945438e2e0e268f180c4f267b71 c1507df74fc4c92887f3e0a4f857f54b61f174ffae5b1af6fb70f466175d658b
 lib/codeql/rust/elements/internal/MacroRulesConstructor.qll dc04726ad59915ec980501c4cd3b3d2ad774f454ddbf138ff5808eba6bd63dea 8d6bf20feb850c47d1176237027ef131f18c5cbb095f6ab8b3ec58cea9bce856
 lib/codeql/rust/elements/internal/MacroRulesImpl.qll 10c03adfb63ee7a4348ff5cffc6ef5300a531b048f28811a51e940b053e69f68 2498bd64aeaea9849c086abeaa6c248e4ce41b4436155f4bd4840965976d5d54
+lib/codeql/rust/elements/internal/MacroStmtsConstructor.qll c293815cd69c002ba6de1db6018672654420f3f8bdd143f9d0c620adddd2be02 d376f8f07661a8cad1b10039076fd7fca353dcacf3ca40ed6507b8c874e849ca
+lib/codeql/rust/elements/internal/MacroStmtsImpl.qll 7ce09c93fedbb6453fccbc081e7ec03d2e2a088c8ff3b27e28794258ac6ff553 d48681d5ed630a1b8d563d58fdb91aa32a73e3b21420d986c8e5415c9f80280f
 lib/codeql/rust/elements/internal/MacroTypeConstructor.qll 0a23573a6f69b38f3d7470050b16197601d67bdd5a4b1a43a155b0b99ccdf6b5 19b623962e8e1f73e55e3ed9712d2a3fe84b9510b99062173902feb2458ec12a
 lib/codeql/rust/elements/internal/MacroTypeImpl.qll b8711279f09f521b05bb67568c089271b7913f863ee64dfdeec2c502de2cbdc8 51bd9d3a2fb2065bce7b193b485e225ca5c8ba2029e60cab427d43a90baf0880
 lib/codeql/rust/elements/internal/MatchArmConstructor.qll b41c1d5822d54127ce376ef62c6a5fa60e11697319fc7d9c9c54fd313d784a93 96cca80e5684e5893c0e9c0dff365ef8ad9e15ff648c9969ba42d91f95abea05
@@ -512,8 +518,10 @@ lib/codeql/rust/elements/internal/generated/LoopExpr.qll 22b755dfaf238ecea722c0c
 lib/codeql/rust/elements/internal/generated/MacroCall.qll 8b49d44e6aeac26dc2fc4b9ba03c482c65ebf0cba089d16f9d65e784e48ccbb0 9ecf6e278007adcbdc42ed1c10e7b1c0652b6c64738b780d256c9326afa3b393
 lib/codeql/rust/elements/internal/generated/MacroDef.qll e9b3f07ba41aa12a8e0bd6ec1437b26a6c363065ce134b6d059478e96c2273a6 87470dea99da1a6afb3a19565291f9382e851ba864b50a995ac6f29589efbd70
 lib/codeql/rust/elements/internal/generated/MacroExpr.qll 03a1daa41866f51e479ac20f51f8406d04e9946b24f3875e3cf75a6b172c3d35 1ae8ca0ee96bd2be32575d87c07cc999a6ff7770151b66c0e3406f9454153786
+lib/codeql/rust/elements/internal/generated/MacroItems.qll ec02912230762f2759c3ed97ff52fded62ed14fb68d0807c8085a85152a5d4b1 c9cc4f8f0a1d63787995dde173f1bc8ac25351faa66b1d323e2ac1c894c9be85
 lib/codeql/rust/elements/internal/generated/MacroPat.qll 9e927e09d47029a3025eaad271c975e73479a80ea933c921381b6c9d751f2866 bdf5c58ca27743eb2e2dae2aeea3f3fc21f8a4f98fe1001598876455c88e8f69
 lib/codeql/rust/elements/internal/generated/MacroRules.qll 4fbd94f22b5ee0f3e5aaae39c2b9a5e9b7bf878a1017811ca589942f6de92843 49fb69543ee867bae196febea6918e621f335afdf4d3ccbf219965b37c7537b1
+lib/codeql/rust/elements/internal/generated/MacroStmts.qll 502cf5490259edaefeda30d00371a9d58872e8bfcd82fa4a30a2a1c510662949 91672ea8c4c0e1e8ef6c9628e21169dfc873da4424aaf544a3cb2b9a2c523b28
 lib/codeql/rust/elements/internal/generated/MacroType.qll c462824df4a002956c036966d15cd0bce206e664888f8d0c7834dedb38b3c0bf 947480f07c40128ef3d00ad4c3a29a685472b3e20a661680c22f6bb318205ed1
 lib/codeql/rust/elements/internal/generated/MatchArm.qll 8fb740a0f2e308782d9cf390672969cd7cf6e698e5b847fb02ae3fa6c205646f 42bfe8dd94fc24ec925fbd44016df111600f99d1216c9a698631373bb6048830
 lib/codeql/rust/elements/internal/generated/MatchArmList.qll 13362680c037fe83fef4653562cc10a4429078316b5ec7c47b076336cf4aca2e 41c674293c13eceaca62134ae0c6778541f6a5201cbc5c146f0ba01b898dc267
@@ -533,7 +541,7 @@ lib/codeql/rust/elements/internal/generated/ParamList.qll c808c9d84dd7800573832b
 lib/codeql/rust/elements/internal/generated/ParenExpr.qll bc0731505bfe88516205ec360582a4222d2681d11342c93e15258590ddee82f2 d4bd6e0c80cf1d63746c88d4bcb3a01d4c75732e5da09e3ebd9437ced227fb60
 lib/codeql/rust/elements/internal/generated/ParenPat.qll ce24b8f8ecbf0f204af200317405724063887257460c80cf250c39b2fdf37185 e7c87d37e1a0ca7ea03840017e1aa9ddb7f927f1f3b6396c0305b46aeee33db6
 lib/codeql/rust/elements/internal/generated/ParenType.qll 9cc954d73f8330dcac7b475f97748b63af5c8766dee9d2f2872c0a7e4c903537 c07534c8a9c683c4a9b11d490095647e420de0a0bfc23273eaf6f31b00244273
-lib/codeql/rust/elements/internal/generated/ParentChild.qll ad728d69b3ef9555d71db2274b04a5ba99b4f815120c55032c57d077e0c954ca 64c6406626a14ed3052d3996cc47fc91e435175bd982440d948416cf878400fd
+lib/codeql/rust/elements/internal/generated/ParentChild.qll 3a14261d30beea704042dea144ef1972a93b8384eb258c6f8ff6c8254264c0e2 9fbf1176a5822728097e4c33dfefc057e381c662058b339007bea7273b6b27c6
 lib/codeql/rust/elements/internal/generated/Pat.qll 3605ac062be2f294ee73336e9669027b8b655f4ad55660e1eab35266275154ee 7f9400db2884d336dd1d21df2a8093759c2a110be9bf6482ce8e80ae0fd74ed4
 lib/codeql/rust/elements/internal/generated/Path.qll 299abce24762a5ab023f3cf1ab9718b83047e171aed42a8092e7a155914b1657 db1a23d18640c548f08c9f94823838b5e019ac85877c7b15df2d1493d1846572
 lib/codeql/rust/elements/internal/generated/PathExpr.qll 17cdb0a7393258a207450f08e37178fc9d35d167f064ba6015be94246f3dc933 a75fdd280aff6d87e083a92030e041c2eb52b57cf7151d4a6989fcd31d6a64bf
@@ -545,7 +553,7 @@ lib/codeql/rust/elements/internal/generated/PtrType.qll 5f12b6ad29b4e5ce51c205e2
 lib/codeql/rust/elements/internal/generated/PureSynthConstructors.qll dc03515d678ba052c2ff2dd9f0883e0bce54cac740ba9a15e5173f292c1b6971 dc03515d678ba052c2ff2dd9f0883e0bce54cac740ba9a15e5173f292c1b6971
 lib/codeql/rust/elements/internal/generated/RangeExpr.qll 23cca03bf43535f33b22a38894f70d669787be4e4f5b8fe5c8f7b964d30e9027 18624cef6c6b679eeace2a98737e472432e0ead354cca02192b4d45330f047c9
 lib/codeql/rust/elements/internal/generated/RangePat.qll efd93730de217cf50dcba5875595263a5eadf9f7e4e1272401342a094d158614 229b251b3d118932e31e78ac4dfb75f48b766f240f20d436062785606d44467b
-lib/codeql/rust/elements/internal/generated/Raw.qll 783c3d04b798c0a5281baf88aa3ada406492e6e6b8ff41dac658d52c88f95c46 e69891409fc89f0a3a199feb6f1a734bfdd862239a5f6794de0ee811e69fab04
+lib/codeql/rust/elements/internal/generated/Raw.qll 32faaa3ad1bd2e1bc0d588caed9ef629f1bd3f2cef3d43a2edea7b3c7d14467d a64b8cf08ef39876a7b3e33555c3305cba320d80acc8dead5ec8be6dd1fe225f
 lib/codeql/rust/elements/internal/generated/RecordExpr.qll eb6cb662e463f9260efae1a6ce874fa781172063b916ef1963f861e9942d308d 1a21cbccc8f3799ff13281e822818ebfb21d81591720a427cac3625512cb9d40
 lib/codeql/rust/elements/internal/generated/RecordExprField.qll 7e9f8663d3b74ebbc9603b10c9912f082febba6bd73d344b100bbd3edf837802 fbe6b578e7fd5d5a6f21bbb8c388957ab7210a6a249ec71510a50fb35b319ea1
 lib/codeql/rust/elements/internal/generated/RecordExprFieldList.qll 179a97211fe7aa6265085d4d54115cdbc0e1cd7c9b2135591e8f36d6432f13d3 dd44bbbc1e83a1ed3a587afb729d7debf7aeb7b63245de181726af13090e50c0
@@ -570,8 +578,8 @@ lib/codeql/rust/elements/internal/generated/Static.qll cae5313e08e4af44c46b25802
 lib/codeql/rust/elements/internal/generated/Stmt.qll 8473ff532dd5cc9d7decaddcd174b94d610f6ca0aec8e473cc051dad9f3db917 6ef7d2b5237c2dbdcacbf7d8b39109d4dc100229f2b28b5c9e3e4fbf673ba72b
 lib/codeql/rust/elements/internal/generated/StmtList.qll a667193e32341e17400867c6e359878c4e645ef9f5f4d97676afc0283a33a026 a320ed678ee359302e2fc1b70a9476705cd616fcfa44a499d32f0c7715627f73
 lib/codeql/rust/elements/internal/generated/Struct.qll 4d57f0db12dc7ad3e31e750a24172ef1505406b4dab16386af0674bd18bf8f4b 1a73c83df926b996f629316f74c61ea775be04532ab61b56af904223354f033e
-lib/codeql/rust/elements/internal/generated/Synth.qll 99fa143232f2cfb1ef3f6ed6a51afa634c336361105e37719ce11ca6c74de8ee b3b77e1bdea36022b3be7cef000e7113059eb8b2b1afec26ae1d62e84259143b
-lib/codeql/rust/elements/internal/generated/SynthConstructors.qll 518b68ccf6d0791bc0c141486261108bb1723e37743fc7f8e4167a1d61660531 518b68ccf6d0791bc0c141486261108bb1723e37743fc7f8e4167a1d61660531
+lib/codeql/rust/elements/internal/generated/Synth.qll 2ab340e385c8c759132040f8317480e29b881fc06652d9ac79d3a6c7ba226e43 a302504aff25f9c8da4aa6a0d83eb7daa7a18496cf71654be925dda460c28b61
+lib/codeql/rust/elements/internal/generated/SynthConstructors.qll 5d30b6d4f36791637f250734ee38820102c64f196454e20f79e30097da1a8e20 5d30b6d4f36791637f250734ee38820102c64f196454e20f79e30097da1a8e20
 lib/codeql/rust/elements/internal/generated/Token.qll 77a91a25ca5669703cf3a4353b591cef4d72caa6b0b9db07bb9e005d69c848d1 2fdffc4882ed3a6ca9ac6d1fb5f1ac5a471ca703e2ffdc642885fa558d6e373b
 lib/codeql/rust/elements/internal/generated/TokenTree.qll 8577c2b097c1be2f0f7daa5acfcf146f78674a424d99563e08a84dd3e6d91b46 d2f30764e84dbfc0a6a5d3d8a5f935cd432413688cb32da9c94e420fbc10665c
 lib/codeql/rust/elements/internal/generated/Trait.qll 32bdbb4dc9f03488195a90320a947013135cd2fae1b9d62b4f71ed9a4e39a967 5dab0fbec64698bf3cdae04879d3d1665cf82386b7b030ed69e6b20776ffa9fc
@@ -605,7 +613,7 @@ lib/codeql/rust/elements/internal/generated/WhileExpr.qll fec8a9211b82a80601bf73
 lib/codeql/rust/elements/internal/generated/WildcardPat.qll d74b70b57a0a66bfae017a329352a5b27a6b9e73dd5521d627f680e810c6c59e 4b913b548ba27ff3c82fcd32cf996ff329cb57d176d3bebd0fcef394486ea499
 lib/codeql/rust/elements/internal/generated/YeetExpr.qll cac328200872a35337b4bcb15c851afb4743f82c080f9738d295571eb01d7392 94af734eea08129b587fed849b643e7572800e8330c0b57d727d41abda47930b
 lib/codeql/rust/elements/internal/generated/YieldExpr.qll 37e5f0c1e373a22bbc53d8b7f2c0e1f476e5be5080b8437c5e964f4e83fad79a 4a9a68643401637bf48e5c2b2f74a6bf0ddcb4ff76f6bffb61d436b685621e85
-lib/codeql/rust/elements.qll 926e6e5f994ef7fcd04854c4d69004d7bfd81950e132c9d3d501b4b2420db222 926e6e5f994ef7fcd04854c4d69004d7bfd81950e132c9d3d501b4b2420db222
+lib/codeql/rust/elements.qll c4c6906be828eb2fa9cc5dcaf4df197a45c8e1c606f8665ca9e58c24715fd077 c4c6906be828eb2fa9cc5dcaf4df197a45c8e1c606f8665ca9e58c24715fd077
 test/extractor-tests/generated/Abi/Abi.ql 7f6e7dc4af86eca3ebdc79b10373988cd0871bd78b51997d3cffd969105e5fdd 2f936b6ca005c6157c755121584410c03e4a3949c23bee302fbe05ee10ce118f
 test/extractor-tests/generated/Abi/Abi_getAbiString.ql a496762fcec5a0887b87023bbf93e9b650f02e20113e25c44d6e4281ae8f5335 14109c7ce11ba25e3cd6e7f1b3fcb4cb00622f2a4eac91bfe43145c5f366bc52
 test/extractor-tests/generated/ArgList/ArgList.ql e412927756e72165d0e7c5c9bd3fca89d08197bbf760db8fb7683c64bb2229bc 043dba8506946fbb87753e22c387987d7eded6ddb963aa067f9e60ef9024d684
@@ -820,6 +828,7 @@ test/extractor-tests/generated/MacroDef/MacroDef_getName.ql 6bc8a17804f23782e98f
 test/extractor-tests/generated/MacroDef/MacroDef_getVisibility.ql d858ccaab381432c529bf4a621afc82ea5e4b810b463f2b1f551de79908e14e7 83a85c4f90417ab44570a862642d8f8fc9208e62ba20ca69b32d39a3190381aa
 test/extractor-tests/generated/MacroExpr/MacroExpr.ql 69445cf24f5bec5c3f11f0ebf13604891bb2c0dffe715612628e5572587c7a6c 5434db79d94e437c86126d9cf20bf1e86e5537f462a57b9bf6b22a2caa95cc40
 test/extractor-tests/generated/MacroExpr/MacroExpr_getMacroCall.ql 8859743e23b987225a6a1933054a1ed8f5f1442b61a769599e2efd143f4feb9e d2d336135ff4d2ea65e79430dee8d0f69f9d7818a674f5446903d986f3948b92
+test/extractor-tests/generated/MacroItems/MISSING_SOURCE.txt b6cf5771fdbbe981aeb3f443ec7a40517b6e99ffc9817fd8872c2e344240dae1 b6cf5771fdbbe981aeb3f443ec7a40517b6e99ffc9817fd8872c2e344240dae1
 test/extractor-tests/generated/MacroPat/MacroPat.ql d9ec72d4d6a7342ee2d9aa7e90227faa31792ca5842fe948d7fdf22597a123b7 74b0f21ef2bb6c13aae74dba1eea97451755110909a083360e2c56cfbc76fd91
 test/extractor-tests/generated/MacroPat/MacroPat_getMacroCall.ql 398996f0d0f2aa6d3b58d80b26c7d1185b5094d455c6c5c7f075f6d414150aa6 b4662e57cac36ed0e692201f53ba46c3d0826bba99c5cc6dfcb302b44dd2154b
 test/extractor-tests/generated/MacroRules/MacroRules.ql 0742faf18179fa34e0f43361e9e4b807bfc242d232f6b3664a35e138a47d39c5 10e1cf45f32a27cb46bd61f5dd45416e2c0c9f25e880f6d213597a7d96e19103
@@ -827,6 +836,7 @@ test/extractor-tests/generated/MacroRules/MacroRules_getAttr.ql 7de501c724e34655
 test/extractor-tests/generated/MacroRules/MacroRules_getName.ql 591606e3accae8b8fb49e1218c4867a42724ac209cf99786db0e5d7ea0bf55d5 d2936ef5aa4bbf024372516dde3de578990aafb2b8675bbbf0f72e8b54eb82a8
 test/extractor-tests/generated/MacroRules/MacroRules_getTokenTree.ql 7598d33c3d86f9ad8629219b90667b2b65e3a1e18c6b0887291df9455a319cab 69d90446743e78e851145683c17677497fe42ed02f61f2b2974e216dc6e05b01
 test/extractor-tests/generated/MacroRules/MacroRules_getVisibility.ql 5306cc85f470d21ebcbe6e98436334b0bf5ba819a0ae186569ba7e88c31636c6 fcbf5c54e5a904767a6f4d37d853072aa0040738e622c49c9a02dec8739d6587
+test/extractor-tests/generated/MacroStmts/MISSING_SOURCE.txt b6cf5771fdbbe981aeb3f443ec7a40517b6e99ffc9817fd8872c2e344240dae1 b6cf5771fdbbe981aeb3f443ec7a40517b6e99ffc9817fd8872c2e344240dae1
 test/extractor-tests/generated/MacroType/MacroType.ql 408327fdb4d7cf096536457401cc280f83cd7e4f6fa9aebd65e64031f6c119cf 0c502d25194ab96eb068a85e3f57a9217510a951fa923e9d7a20fd75412bd6da
 test/extractor-tests/generated/MacroType/MacroType_getMacroCall.ql 565be7a72670218d7999d3f6cec4e704b754c217186243f1b24c334589fa82e2 ba413c712783320188800e2a78738b09c40fe9a6305c08d9e67e971a8fca96ee
 test/extractor-tests/generated/MatchArm/MatchArm.ql 512aa404c94ba40b859564f07e9dffe6a5e687fafb039556e9145f4f3742981c 529f96e38cede8a26054f8981d4ba1d189c17d14d0f92d622eb20acd8f3d7e5d
diff --git a/rust/ql/.gitattributes b/rust/ql/.gitattributes
index e69d7ea5791b..495ea8eff4c7 100644
--- a/rust/ql/.gitattributes
+++ b/rust/ql/.gitattributes
@@ -69,8 +69,10 @@
 /lib/codeql/rust/elements/MacroCall.qll linguist-generated
 /lib/codeql/rust/elements/MacroDef.qll linguist-generated
 /lib/codeql/rust/elements/MacroExpr.qll linguist-generated
+/lib/codeql/rust/elements/MacroItems.qll linguist-generated
 /lib/codeql/rust/elements/MacroPat.qll linguist-generated
 /lib/codeql/rust/elements/MacroRules.qll linguist-generated
+/lib/codeql/rust/elements/MacroStmts.qll linguist-generated
 /lib/codeql/rust/elements/MacroType.qll linguist-generated
 /lib/codeql/rust/elements/MatchArm.qll linguist-generated
 /lib/codeql/rust/elements/MatchArmList.qll linguist-generated
@@ -276,10 +278,14 @@
 /lib/codeql/rust/elements/internal/MacroDefImpl.qll linguist-generated
 /lib/codeql/rust/elements/internal/MacroExprConstructor.qll linguist-generated
 /lib/codeql/rust/elements/internal/MacroExprImpl.qll linguist-generated
+/lib/codeql/rust/elements/internal/MacroItemsConstructor.qll linguist-generated
+/lib/codeql/rust/elements/internal/MacroItemsImpl.qll linguist-generated
 /lib/codeql/rust/elements/internal/MacroPatConstructor.qll linguist-generated
 /lib/codeql/rust/elements/internal/MacroPatImpl.qll linguist-generated
 /lib/codeql/rust/elements/internal/MacroRulesConstructor.qll linguist-generated
 /lib/codeql/rust/elements/internal/MacroRulesImpl.qll linguist-generated
+/lib/codeql/rust/elements/internal/MacroStmtsConstructor.qll linguist-generated
+/lib/codeql/rust/elements/internal/MacroStmtsImpl.qll linguist-generated
 /lib/codeql/rust/elements/internal/MacroTypeConstructor.qll linguist-generated
 /lib/codeql/rust/elements/internal/MacroTypeImpl.qll linguist-generated
 /lib/codeql/rust/elements/internal/MatchArmConstructor.qll linguist-generated
@@ -514,8 +520,10 @@
 /lib/codeql/rust/elements/internal/generated/MacroCall.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/MacroDef.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/MacroExpr.qll linguist-generated
+/lib/codeql/rust/elements/internal/generated/MacroItems.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/MacroPat.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/MacroRules.qll linguist-generated
+/lib/codeql/rust/elements/internal/generated/MacroStmts.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/MacroType.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/MatchArm.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/MatchArmList.qll linguist-generated
@@ -822,6 +830,7 @@
 /test/extractor-tests/generated/MacroDef/MacroDef_getVisibility.ql linguist-generated
 /test/extractor-tests/generated/MacroExpr/MacroExpr.ql linguist-generated
 /test/extractor-tests/generated/MacroExpr/MacroExpr_getMacroCall.ql linguist-generated
+/test/extractor-tests/generated/MacroItems/MISSING_SOURCE.txt linguist-generated
 /test/extractor-tests/generated/MacroPat/MacroPat.ql linguist-generated
 /test/extractor-tests/generated/MacroPat/MacroPat_getMacroCall.ql linguist-generated
 /test/extractor-tests/generated/MacroRules/MacroRules.ql linguist-generated
@@ -829,6 +838,7 @@
 /test/extractor-tests/generated/MacroRules/MacroRules_getName.ql linguist-generated
 /test/extractor-tests/generated/MacroRules/MacroRules_getTokenTree.ql linguist-generated
 /test/extractor-tests/generated/MacroRules/MacroRules_getVisibility.ql linguist-generated
+/test/extractor-tests/generated/MacroStmts/MISSING_SOURCE.txt linguist-generated
 /test/extractor-tests/generated/MacroType/MacroType.ql linguist-generated
 /test/extractor-tests/generated/MacroType/MacroType_getMacroCall.ql linguist-generated
 /test/extractor-tests/generated/MatchArm/MatchArm.ql linguist-generated
diff --git a/rust/ql/lib/codeql/rust/elements.qll b/rust/ql/lib/codeql/rust/elements.qll
index 4abbb0b4148c..2e4c30b48a6a 100644
--- a/rust/ql/lib/codeql/rust/elements.qll
+++ b/rust/ql/lib/codeql/rust/elements.qll
@@ -72,8 +72,10 @@ import codeql.rust.elements.LoopExpr
 import codeql.rust.elements.MacroCall
 import codeql.rust.elements.MacroDef
 import codeql.rust.elements.MacroExpr
+import codeql.rust.elements.MacroItems
 import codeql.rust.elements.MacroPat
 import codeql.rust.elements.MacroRules
+import codeql.rust.elements.MacroStmts
 import codeql.rust.elements.MacroType
 import codeql.rust.elements.MatchArm
 import codeql.rust.elements.MatchArmList
diff --git a/rust/ql/lib/codeql/rust/elements/MacroItems.qll b/rust/ql/lib/codeql/rust/elements/MacroItems.qll
new file mode 100644
index 000000000000..621c9884a57d
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/MacroItems.qll
@@ -0,0 +1,10 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the public class `MacroItems`.
+ */
+
+private import internal.MacroItemsImpl
+import codeql.rust.elements.AstNode
+import codeql.rust.elements.Item
+
+final class MacroItems = Impl::MacroItems;
diff --git a/rust/ql/lib/codeql/rust/elements/MacroStmts.qll b/rust/ql/lib/codeql/rust/elements/MacroStmts.qll
new file mode 100644
index 000000000000..a47f35ddeba5
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/MacroStmts.qll
@@ -0,0 +1,11 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the public class `MacroStmts`.
+ */
+
+private import internal.MacroStmtsImpl
+import codeql.rust.elements.AstNode
+import codeql.rust.elements.Expr
+import codeql.rust.elements.Stmt
+
+final class MacroStmts = Impl::MacroStmts;
diff --git a/rust/ql/lib/codeql/rust/elements/internal/MacroItemsConstructor.qll b/rust/ql/lib/codeql/rust/elements/internal/MacroItemsConstructor.qll
new file mode 100644
index 000000000000..90c37c4f2788
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/MacroItemsConstructor.qll
@@ -0,0 +1,14 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ *  This module defines the hook used internally to tweak the characteristic predicate of
+ *  `MacroItems` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.Raw
+
+/**
+ *  The characteristic predicate of `MacroItems` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+predicate constructMacroItems(Raw::MacroItems id) { any() }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/MacroItemsImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/MacroItemsImpl.qll
new file mode 100644
index 000000000000..9d04aff8b24e
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/MacroItemsImpl.qll
@@ -0,0 +1,16 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ * This module provides a hand-modifiable wrapper around the generated class `MacroItems`.
+ *
+ * INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.MacroItems
+
+/**
+ * INTERNAL: This module contains the customizable definition of `MacroItems` and should not
+ * be referenced directly.
+ */
+module Impl {
+  class MacroItems extends Generated::MacroItems { }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/MacroStmtsConstructor.qll b/rust/ql/lib/codeql/rust/elements/internal/MacroStmtsConstructor.qll
new file mode 100644
index 000000000000..6f5889551252
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/MacroStmtsConstructor.qll
@@ -0,0 +1,14 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ *  This module defines the hook used internally to tweak the characteristic predicate of
+ *  `MacroStmts` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.Raw
+
+/**
+ *  The characteristic predicate of `MacroStmts` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+predicate constructMacroStmts(Raw::MacroStmts id) { any() }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/MacroStmtsImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/MacroStmtsImpl.qll
new file mode 100644
index 000000000000..432a28e66ced
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/MacroStmtsImpl.qll
@@ -0,0 +1,16 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ * This module provides a hand-modifiable wrapper around the generated class `MacroStmts`.
+ *
+ * INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.MacroStmts
+
+/**
+ * INTERNAL: This module contains the customizable definition of `MacroStmts` and should not
+ * be referenced directly.
+ */
+module Impl {
+  class MacroStmts extends Generated::MacroStmts { }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/MacroItems.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/MacroItems.qll
new file mode 100644
index 000000000000..b9c802be8433
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/MacroItems.qll
@@ -0,0 +1,44 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the generated definition of `MacroItems`.
+ * INTERNAL: Do not import directly.
+ */
+
+private import codeql.rust.elements.internal.generated.Synth
+private import codeql.rust.elements.internal.generated.Raw
+import codeql.rust.elements.internal.AstNodeImpl::Impl as AstNodeImpl
+import codeql.rust.elements.Item
+
+/**
+ * INTERNAL: This module contains the fully generated definition of `MacroItems` and should not
+ * be referenced directly.
+ */
+module Generated {
+  /**
+   * INTERNAL: Do not reference the `Generated::MacroItems` class directly.
+   * Use the subclass `MacroItems`, where the following predicates are available.
+   */
+  class MacroItems extends Synth::TMacroItems, AstNodeImpl::AstNode {
+    override string getAPrimaryQlClass() { result = "MacroItems" }
+
+    /**
+     * Gets the `index`th item of this macro items (0-based).
+     */
+    Item getItem(int index) {
+      result =
+        Synth::convertItemFromRaw(Synth::convertMacroItemsToRaw(this)
+              .(Raw::MacroItems)
+              .getItem(index))
+    }
+
+    /**
+     * Gets any of the items of this macro items.
+     */
+    final Item getAnItem() { result = this.getItem(_) }
+
+    /**
+     * Gets the number of items of this macro items.
+     */
+    final int getNumberOfItems() { result = count(int i | exists(this.getItem(i))) }
+  }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/MacroStmts.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/MacroStmts.qll
new file mode 100644
index 000000000000..331277241fa5
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/MacroStmts.qll
@@ -0,0 +1,58 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the generated definition of `MacroStmts`.
+ * INTERNAL: Do not import directly.
+ */
+
+private import codeql.rust.elements.internal.generated.Synth
+private import codeql.rust.elements.internal.generated.Raw
+import codeql.rust.elements.internal.AstNodeImpl::Impl as AstNodeImpl
+import codeql.rust.elements.Expr
+import codeql.rust.elements.Stmt
+
+/**
+ * INTERNAL: This module contains the fully generated definition of `MacroStmts` and should not
+ * be referenced directly.
+ */
+module Generated {
+  /**
+   * INTERNAL: Do not reference the `Generated::MacroStmts` class directly.
+   * Use the subclass `MacroStmts`, where the following predicates are available.
+   */
+  class MacroStmts extends Synth::TMacroStmts, AstNodeImpl::AstNode {
+    override string getAPrimaryQlClass() { result = "MacroStmts" }
+
+    /**
+     * Gets the expression of this macro statements, if it exists.
+     */
+    Expr getExpr() {
+      result =
+        Synth::convertExprFromRaw(Synth::convertMacroStmtsToRaw(this).(Raw::MacroStmts).getExpr())
+    }
+
+    /**
+     * Holds if `getExpr()` exists.
+     */
+    final predicate hasExpr() { exists(this.getExpr()) }
+
+    /**
+     * Gets the `index`th statement of this macro statements (0-based).
+     */
+    Stmt getStatement(int index) {
+      result =
+        Synth::convertStmtFromRaw(Synth::convertMacroStmtsToRaw(this)
+              .(Raw::MacroStmts)
+              .getStatement(index))
+    }
+
+    /**
+     * Gets any of the statements of this macro statements.
+     */
+    final Stmt getAStatement() { result = this.getStatement(_) }
+
+    /**
+     * Gets the number of statements of this macro statements.
+     */
+    final int getNumberOfStatements() { result = count(int i | exists(this.getStatement(i))) }
+  }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/ParentChild.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/ParentChild.qll
index a5c77c02914f..88a02d60fa71 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/ParentChild.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/ParentChild.qll
@@ -398,6 +398,43 @@ private module Impl {
     )
   }
 
+  private Element getImmediateChildOfMacroItems(MacroItems e, int index, string partialPredicateCall) {
+    exists(int b, int bAstNode, int n, int nItem |
+      b = 0 and
+      bAstNode = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfAstNode(e, i, _)) | i) and
+      n = bAstNode and
+      nItem = n + 1 + max(int i | i = -1 or exists(e.getItem(i)) | i) and
+      (
+        none()
+        or
+        result = getImmediateChildOfAstNode(e, index - b, partialPredicateCall)
+        or
+        result = e.getItem(index - n) and
+        partialPredicateCall = "Item(" + (index - n).toString() + ")"
+      )
+    )
+  }
+
+  private Element getImmediateChildOfMacroStmts(MacroStmts e, int index, string partialPredicateCall) {
+    exists(int b, int bAstNode, int n, int nExpr, int nStatement |
+      b = 0 and
+      bAstNode = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfAstNode(e, i, _)) | i) and
+      n = bAstNode and
+      nExpr = n + 1 and
+      nStatement = nExpr + 1 + max(int i | i = -1 or exists(e.getStatement(i)) | i) and
+      (
+        none()
+        or
+        result = getImmediateChildOfAstNode(e, index - b, partialPredicateCall)
+        or
+        index = n and result = e.getExpr() and partialPredicateCall = "Expr()"
+        or
+        result = e.getStatement(index - nExpr) and
+        partialPredicateCall = "Statement(" + (index - nExpr).toString() + ")"
+      )
+    )
+  }
+
   private Element getImmediateChildOfMatchArm(MatchArm e, int index, string partialPredicateCall) {
     exists(int b, int bAstNode, int n, int nAttr, int nExpr, int nGuard, int nPat |
       b = 0 and
@@ -3435,6 +3472,10 @@ private module Impl {
     or
     result = getImmediateChildOfLifetime(e, index, partialAccessor)
     or
+    result = getImmediateChildOfMacroItems(e, index, partialAccessor)
+    or
+    result = getImmediateChildOfMacroStmts(e, index, partialAccessor)
+    or
     result = getImmediateChildOfMatchArm(e, index, partialAccessor)
     or
     result = getImmediateChildOfMatchArmList(e, index, partialAccessor)
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/Raw.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/Raw.qll
index 4726ec0fd391..6ebc715567c9 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/Raw.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/Raw.qll
@@ -329,6 +329,35 @@ module Raw {
     string getText() { lifetime_texts(this, result) }
   }
 
+  /**
+   * INTERNAL: Do not use.
+   */
+  class MacroItems extends @macro_items, AstNode {
+    override string toString() { result = "MacroItems" }
+
+    /**
+     * Gets the `index`th item of this macro items (0-based).
+     */
+    Item getItem(int index) { macro_items_items(this, index, result) }
+  }
+
+  /**
+   * INTERNAL: Do not use.
+   */
+  class MacroStmts extends @macro_stmts, AstNode {
+    override string toString() { result = "MacroStmts" }
+
+    /**
+     * Gets the expression of this macro statements, if it exists.
+     */
+    Expr getExpr() { macro_stmts_exprs(this, result) }
+
+    /**
+     * Gets the `index`th statement of this macro statements (0-based).
+     */
+    Stmt getStatement(int index) { macro_stmts_statements(this, index, result) }
+  }
+
   /**
    * INTERNAL: Do not use.
    * A match arm. For example:
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/Synth.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/Synth.qll
index 891da3025dbe..53fa252f306d 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/Synth.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/Synth.qll
@@ -250,6 +250,10 @@ module Synth {
      * INTERNAL: Do not use.
      */
     TMacroExpr(Raw::MacroExpr id) { constructMacroExpr(id) } or
+    /**
+     * INTERNAL: Do not use.
+     */
+    TMacroItems(Raw::MacroItems id) { constructMacroItems(id) } or
     /**
      * INTERNAL: Do not use.
      */
@@ -258,6 +262,10 @@ module Synth {
      * INTERNAL: Do not use.
      */
     TMacroRules(Raw::MacroRules id) { constructMacroRules(id) } or
+    /**
+     * INTERNAL: Do not use.
+     */
+    TMacroStmts(Raw::MacroStmts id) { constructMacroStmts(id) } or
     /**
      * INTERNAL: Do not use.
      */
@@ -595,13 +603,13 @@ module Synth {
     TAbi or TArgList or TAssocItem or TAssocItemList or TAttr or TClosureBinder or TExpr or
         TExternItem or TExternItemList or TFieldList or TFormatArgsArg or TGenericArg or
         TGenericArgList or TGenericParam or TGenericParamList or TItemList or TLabel or TLetElse or
-        TLifetime or TMatchArm or TMatchArmList or TMatchGuard or TMeta or TName or TNameRef or
-        TParam or TParamList or TPat or TPath or TPathSegment or TRecordExprField or
-        TRecordExprFieldList or TRecordField or TRecordPatField or TRecordPatFieldList or TRename or
-        TRetType or TReturnTypeSyntax or TSelfParam or TSourceFile or TStmt or TStmtList or
-        TToken or TTokenTree or TTupleField or TTypeBound or TTypeBoundList or TTypeRef or
-        TUseTree or TUseTreeList or TVariant or TVariantList or TVisibility or TWhereClause or
-        TWherePred;
+        TLifetime or TMacroItems or TMacroStmts or TMatchArm or TMatchArmList or TMatchGuard or
+        TMeta or TName or TNameRef or TParam or TParamList or TPat or TPath or TPathSegment or
+        TRecordExprField or TRecordExprFieldList or TRecordField or TRecordPatField or
+        TRecordPatFieldList or TRename or TRetType or TReturnTypeSyntax or TSelfParam or
+        TSourceFile or TStmt or TStmtList or TToken or TTokenTree or TTupleField or TTypeBound or
+        TTypeBoundList or TTypeRef or TUseTree or TUseTreeList or TVariant or TVariantList or
+        TVisibility or TWhereClause or TWherePred;
 
   /**
    * INTERNAL: Do not use.
@@ -1032,6 +1040,12 @@ module Synth {
    */
   TMacroExpr convertMacroExprFromRaw(Raw::Element e) { result = TMacroExpr(e) }
 
+  /**
+   * INTERNAL: Do not use.
+   * Converts a raw element to a synthesized `TMacroItems`, if possible.
+   */
+  TMacroItems convertMacroItemsFromRaw(Raw::Element e) { result = TMacroItems(e) }
+
   /**
    * INTERNAL: Do not use.
    * Converts a raw element to a synthesized `TMacroPat`, if possible.
@@ -1044,6 +1058,12 @@ module Synth {
    */
   TMacroRules convertMacroRulesFromRaw(Raw::Element e) { result = TMacroRules(e) }
 
+  /**
+   * INTERNAL: Do not use.
+   * Converts a raw element to a synthesized `TMacroStmts`, if possible.
+   */
+  TMacroStmts convertMacroStmtsFromRaw(Raw::Element e) { result = TMacroStmts(e) }
+
   /**
    * INTERNAL: Do not use.
    * Converts a raw element to a synthesized `TMacroType`, if possible.
@@ -1591,6 +1611,10 @@ module Synth {
     or
     result = convertLifetimeFromRaw(e)
     or
+    result = convertMacroItemsFromRaw(e)
+    or
+    result = convertMacroStmtsFromRaw(e)
+    or
     result = convertMatchArmFromRaw(e)
     or
     result = convertMatchArmListFromRaw(e)
@@ -2302,6 +2326,12 @@ module Synth {
    */
   Raw::Element convertMacroExprToRaw(TMacroExpr e) { e = TMacroExpr(result) }
 
+  /**
+   * INTERNAL: Do not use.
+   * Converts a synthesized `TMacroItems` to a raw DB element, if possible.
+   */
+  Raw::Element convertMacroItemsToRaw(TMacroItems e) { e = TMacroItems(result) }
+
   /**
    * INTERNAL: Do not use.
    * Converts a synthesized `TMacroPat` to a raw DB element, if possible.
@@ -2314,6 +2344,12 @@ module Synth {
    */
   Raw::Element convertMacroRulesToRaw(TMacroRules e) { e = TMacroRules(result) }
 
+  /**
+   * INTERNAL: Do not use.
+   * Converts a synthesized `TMacroStmts` to a raw DB element, if possible.
+   */
+  Raw::Element convertMacroStmtsToRaw(TMacroStmts e) { e = TMacroStmts(result) }
+
   /**
    * INTERNAL: Do not use.
    * Converts a synthesized `TMacroType` to a raw DB element, if possible.
@@ -2861,6 +2897,10 @@ module Synth {
     or
     result = convertLifetimeToRaw(e)
     or
+    result = convertMacroItemsToRaw(e)
+    or
+    result = convertMacroStmtsToRaw(e)
+    or
     result = convertMatchArmToRaw(e)
     or
     result = convertMatchArmListToRaw(e)
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/SynthConstructors.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/SynthConstructors.qll
index 7462e41379cc..3d02f199e78e 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/SynthConstructors.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/SynthConstructors.qll
@@ -62,8 +62,10 @@ import codeql.rust.elements.internal.LoopExprConstructor
 import codeql.rust.elements.internal.MacroCallConstructor
 import codeql.rust.elements.internal.MacroDefConstructor
 import codeql.rust.elements.internal.MacroExprConstructor
+import codeql.rust.elements.internal.MacroItemsConstructor
 import codeql.rust.elements.internal.MacroPatConstructor
 import codeql.rust.elements.internal.MacroRulesConstructor
+import codeql.rust.elements.internal.MacroStmtsConstructor
 import codeql.rust.elements.internal.MacroTypeConstructor
 import codeql.rust.elements.internal.MatchArmConstructor
 import codeql.rust.elements.internal.MatchArmListConstructor
diff --git a/rust/ql/lib/rust.dbscheme b/rust/ql/lib/rust.dbscheme
index 831141fef1dd..17fd9f3d5177 100644
--- a/rust/ql/lib/rust.dbscheme
+++ b/rust/ql/lib/rust.dbscheme
@@ -153,6 +153,8 @@ locatable_locations(
 | @label
 | @let_else
 | @lifetime
+| @macro_items
+| @macro_stmts
 | @match_arm
 | @match_arm_list
 | @match_guard
@@ -433,6 +435,34 @@ lifetime_texts(
   string text: string ref
 );
 
+macro_items(
+  unique int id: @macro_items
+);
+
+#keyset[id, index]
+macro_items_items(
+  int id: @macro_items ref,
+  int index: int ref,
+  int item: @item ref
+);
+
+macro_stmts(
+  unique int id: @macro_stmts
+);
+
+#keyset[id]
+macro_stmts_exprs(
+  int id: @macro_stmts ref,
+  int expr: @expr ref
+);
+
+#keyset[id, index]
+macro_stmts_statements(
+  int id: @macro_stmts ref,
+  int index: int ref,
+  int statement: @stmt ref
+);
+
 match_arms(
   unique int id: @match_arm
 );
diff --git a/rust/ql/test/extractor-tests/generated/MacroItems/MISSING_SOURCE.txt b/rust/ql/test/extractor-tests/generated/MacroItems/MISSING_SOURCE.txt
new file mode 100644
index 000000000000..7f96b17b1f3c
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/MacroItems/MISSING_SOURCE.txt
@@ -0,0 +1,4 @@
+// generated by codegen, do not edit
+
+After a source file is added in this directory and codegen is run again, test queries
+will appear and this file will be deleted
diff --git a/rust/ql/test/extractor-tests/generated/MacroStmts/MISSING_SOURCE.txt b/rust/ql/test/extractor-tests/generated/MacroStmts/MISSING_SOURCE.txt
new file mode 100644
index 000000000000..7f96b17b1f3c
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/MacroStmts/MISSING_SOURCE.txt
@@ -0,0 +1,4 @@
+// generated by codegen, do not edit
+
+After a source file is added in this directory and codegen is run again, test queries
+will appear and this file will be deleted

From cad2b7413764b67fe18e4653e325081e8f55be12 Mon Sep 17 00:00:00 2001
From: Arthur Baars <aibaars@github.com>
Date: Tue, 24 Sep 2024 10:12:55 +0200
Subject: [PATCH 284/347] Rust: integrate Rust Analyzer's Semantic module into
 extractor

---
 Cargo.lock                                |   2 +
 rust/ast-generator/src/main.rs            |   2 +-
 rust/extractor/Cargo.toml                 |   2 +
 rust/extractor/src/main.rs                |  71 +++--------
 rust/extractor/src/rust_analyzer.rs       | 144 ++++++++++++++++++++++
 rust/extractor/src/translate/base.rs      |  15 ++-
 rust/extractor/src/translate/generated.rs |   2 +-
 7 files changed, 176 insertions(+), 62 deletions(-)
 create mode 100644 rust/extractor/src/rust_analyzer.rs

diff --git a/Cargo.lock b/Cargo.lock
index 07176705783f..327f62e7935b 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -390,11 +390,13 @@ dependencies = [
  "ra_ap_base_db",
  "ra_ap_hir",
  "ra_ap_hir_def",
+ "ra_ap_hir_expand",
  "ra_ap_ide_db",
  "ra_ap_load-cargo",
  "ra_ap_parser",
  "ra_ap_paths",
  "ra_ap_project_model",
+ "ra_ap_span",
  "ra_ap_syntax",
  "ra_ap_vfs",
  "rust-extractor-macros",
diff --git a/rust/ast-generator/src/main.rs b/rust/ast-generator/src/main.rs
index 043848e902c8..3a248df4a190 100644
--- a/rust/ast-generator/src/main.rs
+++ b/rust/ast-generator/src/main.rs
@@ -428,7 +428,7 @@ use ra_ap_syntax::ast::{{
 }};
 use ra_ap_syntax::{{ast, AstNode}};
 
-impl Translator {{
+impl Translator<'_> {{
     fn emit_else_branch(&mut self, node: ast::ElseBranch) -> Label<generated::Expr> {{
         match node {{
             ast::ElseBranch::IfExpr(inner) => self.emit_if_expr(inner).into(),
diff --git a/rust/extractor/Cargo.toml b/rust/extractor/Cargo.toml
index 71ad6d8ac452..2a7112912582 100644
--- a/rust/extractor/Cargo.toml
+++ b/rust/extractor/Cargo.toml
@@ -13,12 +13,14 @@ ra_ap_base_db = "0.0.232"
 ra_ap_hir = "0.0.232"
 ra_ap_hir_def = "0.0.232"
 ra_ap_ide_db = "0.0.232"
+ra_ap_hir_expand = "0.0.232"
 ra_ap_load-cargo = "0.0.232"
 ra_ap_paths = "0.0.232"
 ra_ap_project_model = "0.0.232"
 ra_ap_syntax = "0.0.232"
 ra_ap_vfs = "0.0.232"
 ra_ap_parser = "0.0.232"
+ra_ap_span = "0.0.232"
 serde = "1.0.209"
 serde_with = "3.9.0"
 stderrlog = "0.6.0"
diff --git a/rust/extractor/src/main.rs b/rust/extractor/src/main.rs
index 81032636ceb0..2d79fedebf3a 100644
--- a/rust/extractor/src/main.rs
+++ b/rust/extractor/src/main.rs
@@ -1,76 +1,28 @@
 use anyhow::Context;
 use ra_ap_ide_db::line_index::LineIndex;
-use ra_ap_parser::Edition;
-use std::borrow::Cow;
 mod archive;
 mod config;
 pub mod generated;
+mod rust_analyzer;
 mod translate;
 pub mod trap;
-use ra_ap_syntax::ast::SourceFile;
-use ra_ap_syntax::{AstNode, SyntaxError, TextRange, TextSize};
-
-fn from_utf8_lossy(v: &[u8]) -> (Cow<'_, str>, Option<SyntaxError>) {
-    let mut iter = v.utf8_chunks();
-    let (first_valid, first_invalid) = if let Some(chunk) = iter.next() {
-        let valid = chunk.valid();
-        let invalid = chunk.invalid();
-        if invalid.is_empty() {
-            debug_assert_eq!(valid.len(), v.len());
-            return (Cow::Borrowed(valid), None);
-        }
-        (valid, invalid)
-    } else {
-        return (Cow::Borrowed(""), None);
-    };
-
-    const REPLACEMENT: &str = "\u{FFFD}";
-    let error_start = first_valid.len() as u32;
-    let error_end = error_start + first_invalid.len() as u32;
-    let error_range = TextRange::new(TextSize::new(error_start), TextSize::new(error_end));
-    let error = SyntaxError::new("invalid utf-8 sequence".to_owned(), error_range);
-    let mut res = String::with_capacity(v.len());
-    res.push_str(first_valid);
-
-    res.push_str(REPLACEMENT);
-
-    for chunk in iter {
-        res.push_str(chunk.valid());
-        if !chunk.invalid().is_empty() {
-            res.push_str(REPLACEMENT);
-        }
-    }
-
-    (Cow::Owned(res), Some(error))
-}
 
 fn extract(
-    archiver: &archive::Archiver,
+    rust_analyzer: &rust_analyzer::RustAnalyzer,
     traps: &trap::TrapFileProvider,
     file: std::path::PathBuf,
 ) -> anyhow::Result<()> {
-    let file = std::path::absolute(&file).unwrap_or(file);
-    let file = std::fs::canonicalize(&file).unwrap_or(file);
-    archiver.archive(&file);
-    let input = std::fs::read(&file)?;
-    let (input, err) = from_utf8_lossy(&input);
-    let line_index = LineIndex::new(&input);
+    let (ast, input, parse_errors, semi) = rust_analyzer.parse(&file);
+    let line_index = LineIndex::new(input.as_ref());
     let display_path = file.to_string_lossy();
     let mut trap = traps.create("source", &file);
     let label = trap.emit_file(&file);
-    let mut translator = translate::Translator::new(trap, label, line_index);
-    if let Some(err) = err {
-        translator.emit_parse_error(display_path.as_ref(), err);
-    }
-    let parse = ra_ap_syntax::ast::SourceFile::parse(&input, Edition::CURRENT);
-    for err in parse.errors() {
+    let mut translator = translate::Translator::new(trap, label, line_index, semi);
+
+    for err in parse_errors {
         translator.emit_parse_error(display_path.as_ref(), err);
     }
-    if let Some(ast) = SourceFile::cast(parse.syntax_node()) {
-        translator.emit_source_file(ast);
-    } else {
-        log::warn!("Skipped {}", display_path);
-    }
+    translator.emit_source_file(ast);
     translator.trap.commit()?;
     Ok(())
 }
@@ -81,12 +33,17 @@ fn main() -> anyhow::Result<()> {
         .verbosity(2 + cfg.verbose as usize)
         .init()?;
     log::info!("{cfg:?}");
+    let rust_analyzer = rust_analyzer::RustAnalyzer::new(&cfg)?;
+
     let traps = trap::TrapFileProvider::new(&cfg).context("failed to set up trap files")?;
     let archiver = archive::Archiver {
         root: cfg.source_archive_dir,
     };
     for file in cfg.inputs {
-        extract(&archiver, &traps, file)?;
+        let file = std::path::absolute(&file).unwrap_or(file);
+        let file = std::fs::canonicalize(&file).unwrap_or(file);
+        archiver.archive(&file);
+        extract(&rust_analyzer, &traps, file)?;
     }
 
     Ok(())
diff --git a/rust/extractor/src/rust_analyzer.rs b/rust/extractor/src/rust_analyzer.rs
new file mode 100644
index 000000000000..e1d818dc3801
--- /dev/null
+++ b/rust/extractor/src/rust_analyzer.rs
@@ -0,0 +1,144 @@
+use crate::config::Config;
+use anyhow::Context;
+use itertools::Itertools;
+use log::info;
+use ra_ap_base_db::SourceDatabase;
+use ra_ap_hir::Semantics;
+use ra_ap_ide_db::RootDatabase;
+use ra_ap_load_cargo::{load_workspace_at, LoadCargoConfig, ProcMacroServerChoice};
+use ra_ap_paths::Utf8PathBuf;
+use ra_ap_project_model::CargoConfig;
+use ra_ap_project_model::RustLibSource;
+use ra_ap_span::Edition;
+use ra_ap_span::EditionedFileId;
+use ra_ap_span::TextRange;
+use ra_ap_span::TextSize;
+use ra_ap_syntax::SourceFile;
+use ra_ap_syntax::SyntaxError;
+use ra_ap_vfs::AbsPathBuf;
+use ra_ap_vfs::Vfs;
+use ra_ap_vfs::VfsPath;
+use std::borrow::Cow;
+use std::collections::HashMap;
+use std::path::{Path, PathBuf};
+use triomphe::Arc;
+pub struct RustAnalyzer {
+    workspace: HashMap<PathBuf, (Vfs, RootDatabase)>,
+}
+
+impl RustAnalyzer {
+    pub fn new(cfg: &Config) -> anyhow::Result<RustAnalyzer> {
+        let mut workspace = HashMap::new();
+        let config = CargoConfig {
+            sysroot: Some(RustLibSource::Discover),
+            target_dir: ra_ap_paths::Utf8PathBuf::from_path_buf(cfg.scratch_dir.to_path_buf())
+                .map(|x| x.join("target"))
+                .ok(),
+            ..Default::default()
+        };
+        let progress = |t| (log::info!("progress: {}", t));
+        let load_config = LoadCargoConfig {
+            load_out_dirs_from_check: true,
+            with_proc_macro_server: ProcMacroServerChoice::Sysroot,
+            prefill_caches: false,
+        };
+        let projects = find_project_manifests(&cfg.inputs).context("loading inputs")?;
+        for project in projects {
+            let manifest = project.manifest_path();
+            let (db, vfs, _macro_server) =
+                load_workspace_at(manifest.as_ref(), &config, &load_config, &progress)?;
+            let path: &Path = manifest.parent().as_ref();
+            workspace.insert(path.to_path_buf(), (vfs, db));
+        }
+        Ok(RustAnalyzer { workspace })
+    }
+    pub fn parse(
+        &self,
+        path: &PathBuf,
+    ) -> (
+        SourceFile,
+        Arc<str>,
+        Vec<SyntaxError>,
+        Option<Semantics<'_, RootDatabase>>,
+    ) {
+        let mut p = path.as_path();
+        while let Some(parent) = p.parent() {
+            p = parent;
+            if let Some((vfs, db)) = self.workspace.get(parent) {
+                if let Some(file_id) = Utf8PathBuf::from_path_buf(path.to_path_buf())
+                    .ok()
+                    .and_then(|x| AbsPathBuf::try_from(x).ok())
+                    .map(VfsPath::from)
+                    .and_then(|x| vfs.file_id(&x))
+                {
+                    let semi = Semantics::new(db);
+                    let file_id = EditionedFileId::current_edition(file_id);
+
+                    return (
+                        semi.parse(file_id),
+                        db.file_text(file_id.into()),
+                        db.parse_errors(file_id)
+                            .map(|x| x.to_vec())
+                            .unwrap_or_default(),
+                        Some(semi),
+                    );
+                }
+            }
+        }
+        let input = std::fs::read(&path).unwrap();
+        let (input, err) = from_utf8_lossy(&input);
+        let parse = ra_ap_syntax::ast::SourceFile::parse(&input, Edition::CURRENT);
+        let mut errors = parse.errors();
+        errors.extend(err.into_iter());
+        (parse.tree(), input.as_ref().into(), errors, None)
+    }
+}
+
+fn find_project_manifests(
+    files: &[PathBuf],
+) -> anyhow::Result<Vec<ra_ap_project_model::ProjectManifest>> {
+    let current = std::env::current_dir()?;
+    let abs_files: Vec<_> = files
+        .iter()
+        .map(|path| AbsPathBuf::assert_utf8(current.join(path)))
+        .collect();
+    let ret = ra_ap_project_model::ProjectManifest::discover_all(&abs_files);
+    info!(
+        "found manifests: {}",
+        ret.iter().map(|m| format!("{m}")).join(", ")
+    );
+    Ok(ret)
+}
+fn from_utf8_lossy(v: &[u8]) -> (Cow<'_, str>, Option<SyntaxError>) {
+    let mut iter = v.utf8_chunks();
+    let (first_valid, first_invalid) = if let Some(chunk) = iter.next() {
+        let valid = chunk.valid();
+        let invalid = chunk.invalid();
+        if invalid.is_empty() {
+            debug_assert_eq!(valid.len(), v.len());
+            return (Cow::Borrowed(valid), None);
+        }
+        (valid, invalid)
+    } else {
+        return (Cow::Borrowed(""), None);
+    };
+
+    const REPLACEMENT: &str = "\u{FFFD}";
+    let error_start = first_valid.len() as u32;
+    let error_end = error_start + first_invalid.len() as u32;
+    let error_range = TextRange::new(TextSize::new(error_start), TextSize::new(error_end));
+    let error = SyntaxError::new("invalid utf-8 sequence".to_owned(), error_range);
+    let mut res = String::with_capacity(v.len());
+    res.push_str(first_valid);
+
+    res.push_str(REPLACEMENT);
+
+    for chunk in iter {
+        res.push_str(chunk.valid());
+        if !chunk.invalid().is_empty() {
+            res.push_str(REPLACEMENT);
+        }
+    }
+
+    (Cow::Owned(res), Some(error))
+}
diff --git a/rust/extractor/src/translate/base.rs b/rust/extractor/src/translate/base.rs
index 0c10150882ea..96d6cb0b007e 100644
--- a/rust/extractor/src/translate/base.rs
+++ b/rust/extractor/src/translate/base.rs
@@ -2,7 +2,9 @@ use crate::generated::{self, AstNode};
 use crate::trap::{DiagnosticSeverity, TrapFile, TrapId};
 use crate::trap::{Label, TrapClass};
 use codeql_extractor::trap::{self};
+use ra_ap_hir::Semantics;
 use ra_ap_ide_db::line_index::{LineCol, LineIndex};
+use ra_ap_ide_db::RootDatabase;
 use ra_ap_parser::SyntaxKind;
 use ra_ap_syntax::ast::RangeItem;
 use ra_ap_syntax::{ast, NodeOrToken, SyntaxElementChildren, SyntaxError, SyntaxToken, TextRange};
@@ -56,18 +58,25 @@ impl TextValue for ast::RangePat {
         self.op_token().map(|x| x.text().to_string())
     }
 }
-pub struct Translator {
+pub struct Translator<'a> {
     pub trap: TrapFile,
     label: trap::Label,
     line_index: LineIndex,
+    semi: Option<Semantics<'a, RootDatabase>>,
 }
 
-impl Translator {
-    pub fn new(trap: TrapFile, label: trap::Label, line_index: LineIndex) -> Translator {
+impl Translator<'_> {
+    pub fn new(
+        trap: TrapFile,
+        label: trap::Label,
+        line_index: LineIndex,
+        semi: Option<Semantics<'_, RootDatabase>>,
+    ) -> Translator {
         Translator {
             trap,
             label,
             line_index,
+            semi,
         }
     }
     pub fn location(&self, range: TextRange) -> (LineCol, LineCol) {
diff --git a/rust/extractor/src/translate/generated.rs b/rust/extractor/src/translate/generated.rs
index 9725bbfa6b64..45d1c540602a 100644
--- a/rust/extractor/src/translate/generated.rs
+++ b/rust/extractor/src/translate/generated.rs
@@ -11,7 +11,7 @@ use ra_ap_syntax::ast::{
 };
 use ra_ap_syntax::{ast, AstNode};
 
-impl Translator {
+impl Translator<'_> {
     fn emit_else_branch(&mut self, node: ast::ElseBranch) -> Label<generated::Expr> {
         match node {
             ast::ElseBranch::IfExpr(inner) => self.emit_if_expr(inner).into(),

From 0b3b95ab543a6c992dea76d32e9804a93a3e1b2c Mon Sep 17 00:00:00 2001
From: Arthur Baars <aibaars@github.com>
Date: Fri, 27 Sep 2024 16:20:34 +0200
Subject: [PATCH 285/347] Rust: macro expansion

---
 rust/extractor/src/generated/.generated.list  |   2 +-
 rust/extractor/src/generated/top.rs           |   6 +
 rust/extractor/src/main.rs                    |  17 +-
 rust/extractor/src/rust_analyzer.rs           |  16 +-
 rust/extractor/src/translate/base.rs          | 159 ++++++++++++--
 rust/extractor/src/translate/generated.rs     |   1 +
 rust/extractor/src/trap.rs                    |   2 +-
 rust/ql/.generated.list                       |  11 +-
 rust/ql/.gitattributes                        |   1 +
 .../ql/lib/codeql/rust/elements/MacroCall.qll |   1 +
 .../elements/internal/generated/MacroCall.qll |  16 ++
 .../internal/generated/ParentChild.qll        |   6 +-
 .../rust/elements/internal/generated/Raw.qll  |   5 +
 rust/ql/lib/rust.dbscheme                     |   6 +
 .../generated/MacroCall/MacroCall.ql          |   8 +-
 .../MacroCall/MacroCall_getExpanded.ql        |   7 +
 rust/schema/annotations.py                    | 194 ++++++++++++++++++
 17 files changed, 427 insertions(+), 31 deletions(-)
 create mode 100644 rust/ql/test/extractor-tests/generated/MacroCall/MacroCall_getExpanded.ql

diff --git a/rust/extractor/src/generated/.generated.list b/rust/extractor/src/generated/.generated.list
index 7ae321e9a1a0..e215cdc425c7 100644
--- a/rust/extractor/src/generated/.generated.list
+++ b/rust/extractor/src/generated/.generated.list
@@ -1,2 +1,2 @@
 mod.rs 4bcb9def847469aae9d8649461546b7c21ec97cf6e63d3cf394e339915ce65d7 4bcb9def847469aae9d8649461546b7c21ec97cf6e63d3cf394e339915ce65d7
-top.rs 00321b829ffca674c66daa86c003b9d5f8c64fef42873d03fa677cfa479039a2 00321b829ffca674c66daa86c003b9d5f8c64fef42873d03fa677cfa479039a2
+top.rs bbb8453f35cce3f2afa86b32c01296f78a24c19f504f9416aa049d256d11d23a bbb8453f35cce3f2afa86b32c01296f78a24c19f504f9416aa049d256d11d23a
diff --git a/rust/extractor/src/generated/top.rs b/rust/extractor/src/generated/top.rs
index 372760d5c133..bb21051d7bb9 100644
--- a/rust/extractor/src/generated/top.rs
+++ b/rust/extractor/src/generated/top.rs
@@ -8631,6 +8631,12 @@ impl trap::TrapEntry for MacroCall {
     }
 }
 
+impl MacroCall {
+    pub fn emit_expanded(id: trap::Label<Self>, value: trap::Label<AstNode>, out: &mut trap::Writer) {
+        out.add_tuple("macro_call_expandeds", vec![id.into(), value.into()]);
+    }
+}
+
 impl trap::TrapClass for MacroCall {
     fn class_name() -> &'static str { "MacroCall" }
 }
diff --git a/rust/extractor/src/main.rs b/rust/extractor/src/main.rs
index 2d79fedebf3a..701b2f0b38ea 100644
--- a/rust/extractor/src/main.rs
+++ b/rust/extractor/src/main.rs
@@ -1,5 +1,5 @@
 use anyhow::Context;
-use ra_ap_ide_db::line_index::LineIndex;
+use ra_ap_ide_db::line_index::{LineCol, LineIndex};
 mod archive;
 mod config;
 pub mod generated;
@@ -17,10 +17,21 @@ fn extract(
     let display_path = file.to_string_lossy();
     let mut trap = traps.create("source", &file);
     let label = trap.emit_file(&file);
-    let mut translator = translate::Translator::new(trap, label, line_index, semi);
+    let mut translator =
+        translate::Translator::new(trap, display_path.as_ref(), label, line_index, semi);
 
     for err in parse_errors {
-        translator.emit_parse_error(display_path.as_ref(), err);
+        translator.emit_parse_error(&err);
+    }
+    let no_location = (LineCol { line: 0, col: 0 }, LineCol { line: 0, col: 0 });
+    if translator.semi.is_none() {
+        translator.emit_diagnostic(
+            trap::DiagnosticSeverity::Warning,
+            "semantics".to_owned(),
+            "semantic analyzer unavailable".to_owned(),
+            "semantic analyzer unavailable: macro expansion, call graph, and type inference will be skipped.".to_owned(),
+            no_location,
+        );
     }
     translator.emit_source_file(ast);
     translator.trap.commit()?;
diff --git a/rust/extractor/src/rust_analyzer.rs b/rust/extractor/src/rust_analyzer.rs
index e1d818dc3801..67d43755ec40 100644
--- a/rust/extractor/src/rust_analyzer.rs
+++ b/rust/extractor/src/rust_analyzer.rs
@@ -85,11 +85,21 @@ impl RustAnalyzer {
                 }
             }
         }
-        let input = std::fs::read(&path).unwrap();
+        let mut errors = Vec::new();
+        let input = match std::fs::read(path) {
+            Ok(data) => data,
+            Err(e) => {
+                errors.push(SyntaxError::new(
+                    format!("Could not read {}: {}", path.to_string_lossy(), e),
+                    TextRange::empty(TextSize::default()),
+                ));
+                vec![]
+            }
+        };
         let (input, err) = from_utf8_lossy(&input);
         let parse = ra_ap_syntax::ast::SourceFile::parse(&input, Edition::CURRENT);
-        let mut errors = parse.errors();
-        errors.extend(err.into_iter());
+        errors.extend(parse.errors());
+        errors.extend(err);
         (parse.tree(), input.as_ref().into(), errors, None)
     }
 }
diff --git a/rust/extractor/src/translate/base.rs b/rust/extractor/src/translate/base.rs
index 96d6cb0b007e..5a99561149ca 100644
--- a/rust/extractor/src/translate/base.rs
+++ b/rust/extractor/src/translate/base.rs
@@ -1,13 +1,18 @@
-use crate::generated::{self, AstNode};
+use crate::generated::MacroCall;
+use crate::generated::{self};
 use crate::trap::{DiagnosticSeverity, TrapFile, TrapId};
 use crate::trap::{Label, TrapClass};
 use codeql_extractor::trap::{self};
+use log::Level;
+use ra_ap_hir::db::ExpandDatabase;
 use ra_ap_hir::Semantics;
 use ra_ap_ide_db::line_index::{LineCol, LineIndex};
 use ra_ap_ide_db::RootDatabase;
 use ra_ap_parser::SyntaxKind;
 use ra_ap_syntax::ast::RangeItem;
-use ra_ap_syntax::{ast, NodeOrToken, SyntaxElementChildren, SyntaxError, SyntaxToken, TextRange};
+use ra_ap_syntax::{
+    ast, AstNode, NodeOrToken, SyntaxElementChildren, SyntaxError, SyntaxToken, TextRange,
+};
 pub trait TextValue {
     fn try_get_text(&self) -> Option<String>;
 }
@@ -60,32 +65,35 @@ impl TextValue for ast::RangePat {
 }
 pub struct Translator<'a> {
     pub trap: TrapFile,
+    path: &'a str,
     label: trap::Label,
     line_index: LineIndex,
-    semi: Option<Semantics<'a, RootDatabase>>,
+    pub semi: Option<Semantics<'a, RootDatabase>>,
 }
 
-impl Translator<'_> {
+impl<'a> Translator<'a> {
     pub fn new(
         trap: TrapFile,
+        path: &'a str,
         label: trap::Label,
         line_index: LineIndex,
-        semi: Option<Semantics<'_, RootDatabase>>,
-    ) -> Translator {
+        semi: Option<Semantics<'a, RootDatabase>>,
+    ) -> Translator<'a> {
         Translator {
             trap,
+            path,
             label,
             line_index,
             semi,
         }
     }
-    pub fn location(&self, range: TextRange) -> (LineCol, LineCol) {
+    fn location(&self, range: TextRange) -> (LineCol, LineCol) {
         let start = self.line_index.line_col(range.start());
         let range_end = range.end();
         // QL end positions are inclusive, while TextRange offsets are exclusive and point at the position
         // right after the last character of the range. We need to shift the end offset one character to the left to
         // get the right inclusive QL position. Unfortunately, simply subtracting `1` from the end-offset may cause
-        // the offset to point in the middle of a mult-byte character, resulting in a `panic`. Therefore we use `try_line_col`
+        // the offset to point in the middle of a multi-byte character, resulting in a `panic`. Therefore we use `try_line_col`
         // with decreasing offsets to find the start of the last character included in the range.
         for i in 1..4 {
             if let Some(end) = range_end
@@ -98,20 +106,60 @@ impl Translator<'_> {
         let end = self.line_index.line_col(range_end);
         (start, end)
     }
+
+    pub fn text_range_for_node(&mut self, node: &impl ast::AstNode) -> TextRange {
+        if let Some(semi) = self.semi.as_ref() {
+            let file_range = semi.original_range(node.syntax());
+            file_range.range
+        } else {
+            node.syntax().text_range()
+        }
+    }
     pub fn emit_location<T: TrapClass>(&mut self, label: Label<T>, node: &impl ast::AstNode) {
-        let (start, end) = self.location(node.syntax().text_range());
+        let range = self.text_range_for_node(node);
+        let (start, end) = self.location(range);
         self.trap.emit_location(self.label, label, start, end)
     }
     pub fn emit_location_token(&mut self, label: Label<generated::Token>, token: &SyntaxToken) {
         let (start, end) = self.location(token.text_range());
         self.trap.emit_location(self.label, label, start, end)
     }
-    pub fn emit_parse_error(&mut self, path: &str, err: SyntaxError) {
-        let (start, end) = self.location(err.range());
-        log::warn!("{}:{}:{}: {}", path, start.line + 1, start.col + 1, err);
-        let message = err.to_string();
+    pub fn emit_diagnostic(
+        &mut self,
+        severity: DiagnosticSeverity,
+        error_tag: String,
+        error_message: String,
+        full_error_message: String,
+        location: (LineCol, LineCol),
+    ) {
+        let (start, end) = location;
+        let level = match severity {
+            DiagnosticSeverity::Debug => Level::Debug,
+            DiagnosticSeverity::Info => Level::Info,
+            DiagnosticSeverity::Warning => Level::Warn,
+            DiagnosticSeverity::Error => Level::Error,
+        };
+        log::log!(
+            level,
+            "{}:{}:{}: {}",
+            self.path,
+            start.line + 1,
+            start.col + 1,
+            &error_message
+        );
         let location = self.trap.emit_location_label(self.label, start, end);
         self.trap.emit_diagnostic(
+            severity,
+            error_tag,
+            error_message,
+            full_error_message,
+            location,
+        );
+    }
+    pub fn emit_parse_error(&mut self, err: &SyntaxError) {
+        let location = self.location(err.range());
+        let message = err.to_string();
+        self.emit_diagnostic(
             DiagnosticSeverity::Warning,
             "parse_error".to_owned(),
             message.clone(),
@@ -119,7 +167,11 @@ impl Translator<'_> {
             location,
         );
     }
-    pub fn emit_tokens(&mut self, parent: Label<AstNode>, children: SyntaxElementChildren) {
+    pub fn emit_tokens(
+        &mut self,
+        parent: Label<generated::AstNode>,
+        children: SyntaxElementChildren,
+    ) {
         for child in children {
             if let NodeOrToken::Token(token) = child {
                 if token.kind() == SyntaxKind::COMMENT {
@@ -133,4 +185,83 @@ impl Translator<'_> {
             }
         }
     }
+    pub(crate) fn extract_macro_call_expanded(
+        &mut self,
+        mcall: &ast::MacroCall,
+        label: Label<generated::MacroCall>,
+    ) {
+        if let Some(semi) = &self.semi {
+            if let Some(expanded) = semi.expand(mcall) {
+                if let Some(value) =
+                    semi.hir_file_for(&expanded)
+                        .macro_file()
+                        .and_then(|macro_file| {
+                            semi.db
+                                .parse_macro_expansion_error(macro_file.macro_call_id)
+                        })
+                {
+                    if let Some(err) = &value.err {
+                        let (message, _error) = err.render_to_string(semi.db);
+
+                        if err.span().anchor.file_id == semi.hir_file_for(mcall.syntax()) {
+                            let location = err.span().range
+                                + semi
+                                    .db
+                                    .ast_id_map(err.span().anchor.file_id.into())
+                                    .get_erased(err.span().anchor.ast_id)
+                                    .text_range()
+                                    .start();
+                            self.emit_parse_error(&SyntaxError::new(message, location));
+                        };
+                    }
+                    for err in value.value.iter() {
+                        self.emit_parse_error(err);
+                    }
+                }
+                let expand_to = ra_ap_hir_expand::ExpandTo::from_call_site(mcall);
+                let kind = expanded.kind();
+                let value: Option<Label<crate::generated::AstNode>> = match expand_to {
+                    ra_ap_hir_expand::ExpandTo::Statements => {
+                        ast::MacroStmts::cast(expanded).map(|x| self.emit_macro_stmts(x).into())
+                    }
+                    ra_ap_hir_expand::ExpandTo::Items => {
+                        ast::MacroItems::cast(expanded).map(|x| self.emit_macro_items(x).into())
+                    }
+
+                    ra_ap_hir_expand::ExpandTo::Pattern => {
+                        ast::Pat::cast(expanded).map(|x| self.emit_pat(x).into())
+                    }
+                    ra_ap_hir_expand::ExpandTo::Type => {
+                        ast::Type::cast(expanded).map(|x| self.emit_type(x).into())
+                    }
+                    ra_ap_hir_expand::ExpandTo::Expr => {
+                        ast::Expr::cast(expanded).map(|x| self.emit_expr(x).into())
+                    }
+                };
+                if let Some(value) = value {
+                    MacroCall::emit_expanded(label, value, &mut self.trap.writer);
+                } else {
+                    let range = self.text_range_for_node(mcall);
+                    self.emit_parse_error(&SyntaxError::new(
+                        format!(
+                            "macro expansion failed: the macro '{}' expands to {:?} but a {:?} was expected",
+                            mcall.path().map(|p| p.to_string()).unwrap_or_default(),
+                            kind, expand_to
+                        ),
+                        range,
+                    ));
+                }
+            } else {
+                let range = self.text_range_for_node(mcall);
+
+                self.emit_parse_error(&SyntaxError::new(
+                    format!(
+                        "macro expansion failed: could not resolve macro '{}'",
+                        mcall.path().map(|p| p.to_string()).unwrap_or_default()
+                    ),
+                    range,
+                ));
+            }
+        }
+    }
 }
diff --git a/rust/extractor/src/translate/generated.rs b/rust/extractor/src/translate/generated.rs
index 45d1c540602a..b969abd4771a 100644
--- a/rust/extractor/src/translate/generated.rs
+++ b/rust/extractor/src/translate/generated.rs
@@ -970,6 +970,7 @@ impl Translator<'_> {
             token_tree,
         });
         self.emit_location(label, &node);
+        self.extract_macro_call_expanded(&node, label);
         self.emit_tokens(label.into(), node.syntax().children_with_tokens());
         label
     }
diff --git a/rust/extractor/src/trap.rs b/rust/extractor/src/trap.rs
index 7422c3a93b2b..ed75010fcae7 100644
--- a/rust/extractor/src/trap.rs
+++ b/rust/extractor/src/trap.rs
@@ -124,7 +124,7 @@ impl<T: TrapClass> From<Label<T>> for trap::Arg {
 
 pub struct TrapFile {
     path: PathBuf,
-    writer: Writer,
+    pub writer: Writer,
     compression: Compression,
 }
 
diff --git a/rust/ql/.generated.list b/rust/ql/.generated.list
index d18865bbf1ff..fd5d3f743d1e 100644
--- a/rust/ql/.generated.list
+++ b/rust/ql/.generated.list
@@ -64,7 +64,7 @@ lib/codeql/rust/elements/LiteralExpr.qll 40b67404b7c2b81e5afabc53a2a93e0a503f687
 lib/codeql/rust/elements/LiteralPat.qll daffb5f380a47543669c8cc92628b0e0de478c3ac82685802c63e8d75a206bed adfe9796598cf6ca4a9170c89ffd871e117f1cea6dd7dd80ecbbb947327a1a5d
 lib/codeql/rust/elements/Locatable.qll 2855efa4a469b54e0ca85daa89309a8b991cded6f3f10db361010831ba1e11d3 00c3406d14603f90abea11bf074eaf2c0b623a30e29cf6afc3a247cb58b92f0f
 lib/codeql/rust/elements/LoopExpr.qll 58ade0bc4a01a1cc361363682fde3ea56f4c5fbb4b28f5723ceff52ebaf897d7 fa299162c742bcf3b2211dc20821b312e3c133350c288a050eb26e6f8b5a5c78
-lib/codeql/rust/elements/MacroCall.qll 16933db15c6c0dbb717ef442f751ad8f63c444f36a12f8d56b8a05a3e5f71d1b ac05cbf50e4b06f39f58817cddbeac6f804c2d1e4f60956a960d63d495e7183d
+lib/codeql/rust/elements/MacroCall.qll a39a11d387355f59af3007dcbab3282e2b9e3289c1f8f4c6b96154ddb802f8c3 88d4575e462af2aa780219ba1338a790547fdfc1d267c4b84f1b929f4bc08d05
 lib/codeql/rust/elements/MacroDef.qll acb39275a1a3257084314a46ad4d8477946130f57e401c70c5949ad6aafc5c5f 6a8a8db12a3ec345fede51ca36e8c6acbdce58c5144388bb94f0706416fa152a
 lib/codeql/rust/elements/MacroExpr.qll ea9fed13f610bab1a2c4541c994510e0cb806530b60beef0d0c36b23e3b620f0 ad11a6bbd3a229ad97a16049cc6b0f3c8740f9f75ea61bbf4eebb072db9b12d2
 lib/codeql/rust/elements/MacroItems.qll 4acf8e5ab8f84dc8fae442d52a29266be2f1e7160120bb1dd52238b3d62b4cab 0d6e25bbf1f3082b739bb846d7c3ef21a58c79e6a65b72272a00cffc3d32aa47
@@ -515,7 +515,7 @@ lib/codeql/rust/elements/internal/generated/LiteralExpr.qll f3a564d0a3ed0d915f5a
 lib/codeql/rust/elements/internal/generated/LiteralPat.qll ecc2bfe559abfce1be873fbf7b61b5728897c9afc3bb3f69551d8320d273da71 42196fb6a4a0ff9b570fd0bdbc920f24744b3f46772efbb46648af7fbfe1fbda
 lib/codeql/rust/elements/internal/generated/Locatable.qll c897dc1bdd4dfcb6ded83a4a93332ca3d8f421bae02493ea2a0555023071775e b32d242f8c9480dc9b53c1e13a5cb8dcfce575b0373991c082c1db460a3e37b8
 lib/codeql/rust/elements/internal/generated/LoopExpr.qll 22b755dfaf238ecea722c0c94c399992014e23481ec6fdd61f803bbec012b6f9 08731630c2dc05aa1e0ada222a6057752d9ce737329c62076708828247a358be
-lib/codeql/rust/elements/internal/generated/MacroCall.qll 8b49d44e6aeac26dc2fc4b9ba03c482c65ebf0cba089d16f9d65e784e48ccbb0 9ecf6e278007adcbdc42ed1c10e7b1c0652b6c64738b780d256c9326afa3b393
+lib/codeql/rust/elements/internal/generated/MacroCall.qll fc8988696493992cc4fdce8c0e5610c54ee92ea52ebb05262338f8b612353f50 188a2d7a484bd402a521787371e64f6e00e928306c8d437e6b19bf890a7aa14e
 lib/codeql/rust/elements/internal/generated/MacroDef.qll e9b3f07ba41aa12a8e0bd6ec1437b26a6c363065ce134b6d059478e96c2273a6 87470dea99da1a6afb3a19565291f9382e851ba864b50a995ac6f29589efbd70
 lib/codeql/rust/elements/internal/generated/MacroExpr.qll 03a1daa41866f51e479ac20f51f8406d04e9946b24f3875e3cf75a6b172c3d35 1ae8ca0ee96bd2be32575d87c07cc999a6ff7770151b66c0e3406f9454153786
 lib/codeql/rust/elements/internal/generated/MacroItems.qll ec02912230762f2759c3ed97ff52fded62ed14fb68d0807c8085a85152a5d4b1 c9cc4f8f0a1d63787995dde173f1bc8ac25351faa66b1d323e2ac1c894c9be85
@@ -541,7 +541,7 @@ lib/codeql/rust/elements/internal/generated/ParamList.qll c808c9d84dd7800573832b
 lib/codeql/rust/elements/internal/generated/ParenExpr.qll bc0731505bfe88516205ec360582a4222d2681d11342c93e15258590ddee82f2 d4bd6e0c80cf1d63746c88d4bcb3a01d4c75732e5da09e3ebd9437ced227fb60
 lib/codeql/rust/elements/internal/generated/ParenPat.qll ce24b8f8ecbf0f204af200317405724063887257460c80cf250c39b2fdf37185 e7c87d37e1a0ca7ea03840017e1aa9ddb7f927f1f3b6396c0305b46aeee33db6
 lib/codeql/rust/elements/internal/generated/ParenType.qll 9cc954d73f8330dcac7b475f97748b63af5c8766dee9d2f2872c0a7e4c903537 c07534c8a9c683c4a9b11d490095647e420de0a0bfc23273eaf6f31b00244273
-lib/codeql/rust/elements/internal/generated/ParentChild.qll 3a14261d30beea704042dea144ef1972a93b8384eb258c6f8ff6c8254264c0e2 9fbf1176a5822728097e4c33dfefc057e381c662058b339007bea7273b6b27c6
+lib/codeql/rust/elements/internal/generated/ParentChild.qll 8df70abc5ebf6bd1439976404a002b457a006ca677645c970f7e8a23c31b2884 887cf53d918c0825f60b7e7824eefb61f3b7d48a15d73116c42bb67b362cd376
 lib/codeql/rust/elements/internal/generated/Pat.qll 3605ac062be2f294ee73336e9669027b8b655f4ad55660e1eab35266275154ee 7f9400db2884d336dd1d21df2a8093759c2a110be9bf6482ce8e80ae0fd74ed4
 lib/codeql/rust/elements/internal/generated/Path.qll 299abce24762a5ab023f3cf1ab9718b83047e171aed42a8092e7a155914b1657 db1a23d18640c548f08c9f94823838b5e019ac85877c7b15df2d1493d1846572
 lib/codeql/rust/elements/internal/generated/PathExpr.qll 17cdb0a7393258a207450f08e37178fc9d35d167f064ba6015be94246f3dc933 a75fdd280aff6d87e083a92030e041c2eb52b57cf7151d4a6989fcd31d6a64bf
@@ -553,7 +553,7 @@ lib/codeql/rust/elements/internal/generated/PtrType.qll 5f12b6ad29b4e5ce51c205e2
 lib/codeql/rust/elements/internal/generated/PureSynthConstructors.qll dc03515d678ba052c2ff2dd9f0883e0bce54cac740ba9a15e5173f292c1b6971 dc03515d678ba052c2ff2dd9f0883e0bce54cac740ba9a15e5173f292c1b6971
 lib/codeql/rust/elements/internal/generated/RangeExpr.qll 23cca03bf43535f33b22a38894f70d669787be4e4f5b8fe5c8f7b964d30e9027 18624cef6c6b679eeace2a98737e472432e0ead354cca02192b4d45330f047c9
 lib/codeql/rust/elements/internal/generated/RangePat.qll efd93730de217cf50dcba5875595263a5eadf9f7e4e1272401342a094d158614 229b251b3d118932e31e78ac4dfb75f48b766f240f20d436062785606d44467b
-lib/codeql/rust/elements/internal/generated/Raw.qll 32faaa3ad1bd2e1bc0d588caed9ef629f1bd3f2cef3d43a2edea7b3c7d14467d a64b8cf08ef39876a7b3e33555c3305cba320d80acc8dead5ec8be6dd1fe225f
+lib/codeql/rust/elements/internal/generated/Raw.qll 37d705750dbbcddc20f86d03e98c0b9d381dfe7c050dd48587591ee5e94c7043 5db207a0a9a3b6d537f7ae2829913a5bc7c0fdb5fcc34bd3b3d1b80b748e8c67
 lib/codeql/rust/elements/internal/generated/RecordExpr.qll eb6cb662e463f9260efae1a6ce874fa781172063b916ef1963f861e9942d308d 1a21cbccc8f3799ff13281e822818ebfb21d81591720a427cac3625512cb9d40
 lib/codeql/rust/elements/internal/generated/RecordExprField.qll 7e9f8663d3b74ebbc9603b10c9912f082febba6bd73d344b100bbd3edf837802 fbe6b578e7fd5d5a6f21bbb8c388957ab7210a6a249ec71510a50fb35b319ea1
 lib/codeql/rust/elements/internal/generated/RecordExprFieldList.qll 179a97211fe7aa6265085d4d54115cdbc0e1cd7c9b2135591e8f36d6432f13d3 dd44bbbc1e83a1ed3a587afb729d7debf7aeb7b63245de181726af13090e50c0
@@ -816,8 +816,9 @@ test/extractor-tests/generated/LoopExpr/LoopExpr.ql 636c28bff5f8c1ca0fb834f614b3
 test/extractor-tests/generated/LoopExpr/LoopExpr_getAttr.ql d557c1a34ae8762b32702d6b50e79c25bc506275c33a896b6b94bbbe73d04c49 34846c9eefa0219f4a16e28b518b2afa23f372d0aa03b08d042c5a35375e0cd6
 test/extractor-tests/generated/LoopExpr/LoopExpr_getLabel.ql 0b77b9d9fb5903d37bce5a2c0d6b276e6269da56fcb37b83cd931872fb88490f c7f09c526e59dcadec13ec9719980d68b8619d630caab2c26b8368b06c1f2cc0
 test/extractor-tests/generated/LoopExpr/LoopExpr_getLoopBody.ql 0267f54077640f3dfeb38524577e4a1229115eeb1c839398d0c5f460c1d65129 96ec876635b8c561f7add19e57574444f630eae3df9ab9bc33ac180e61f3a7b8
-test/extractor-tests/generated/MacroCall/MacroCall.ql d8b71880ffbfa0f9efa56c598a9bdd3f91e85129e0f8f2b30be6862556f87fcd 682736663ad11f9fdde165904324a8b2f3cdc59f91196a1accb1cd4cf5fb70d4
+test/extractor-tests/generated/MacroCall/MacroCall.ql 9eca338d7bc42dcfc3cfcd7953484d724d4f06b1182c01a426925d9963820e37 25fe9e90c38d3bd0c92c70bf2af01b034e3c375f3dbd1c1b8aab1fc1aae09547
 test/extractor-tests/generated/MacroCall/MacroCall_getAttr.ql c22a2a29d705e85b03a6586d1eda1a2f4f99f95f7dfeb4e6908ec3188b5ad0ad 9b8d9dcc2116a123c15c520a880efab73ade20e08197c64bc3ed0c50902c4672
+test/extractor-tests/generated/MacroCall/MacroCall_getExpanded.ql 757c4a4c32888e4604044c798a3180aa6d4f73381eec9bc28ba9dc71ffcbd03a 27d5edaa2c1096a24c86744aaad0f006da20d5caa28ccfd8528e7c98aa1bead1
 test/extractor-tests/generated/MacroCall/MacroCall_getPath.ql 160edc6a001a2d946da6049ffb21a84b9a3756e85f9a2fb0a4d85058124b399a 1e25dd600f19ef89a99f328f86603bce12190220168387c5a88bfb9926da56d9
 test/extractor-tests/generated/MacroCall/MacroCall_getTokenTree.ql 1cbf6b1ac7fa0910ff299b939743153fc00ad7e28a9a70c69a8297c6841e8238 570380c0dc4b20fe25c0499378569720a6da14bdb058e73d757e174bdd62d0c0
 test/extractor-tests/generated/MacroDef/MacroDef.ql dde2df9196800d9af9645fe21786e30245bff6cfa58117900582ce1f5c0b859d 6b87bec4e4df8e9b6ed09f18e7b7c20204c39c8d249494cc66d3a06ae39791e4
diff --git a/rust/ql/.gitattributes b/rust/ql/.gitattributes
index 495ea8eff4c7..b64b089a2f21 100644
--- a/rust/ql/.gitattributes
+++ b/rust/ql/.gitattributes
@@ -820,6 +820,7 @@
 /test/extractor-tests/generated/LoopExpr/LoopExpr_getLoopBody.ql linguist-generated
 /test/extractor-tests/generated/MacroCall/MacroCall.ql linguist-generated
 /test/extractor-tests/generated/MacroCall/MacroCall_getAttr.ql linguist-generated
+/test/extractor-tests/generated/MacroCall/MacroCall_getExpanded.ql linguist-generated
 /test/extractor-tests/generated/MacroCall/MacroCall_getPath.ql linguist-generated
 /test/extractor-tests/generated/MacroCall/MacroCall_getTokenTree.ql linguist-generated
 /test/extractor-tests/generated/MacroDef/MacroDef.ql linguist-generated
diff --git a/rust/ql/lib/codeql/rust/elements/MacroCall.qll b/rust/ql/lib/codeql/rust/elements/MacroCall.qll
index 5399f1f2a872..b0985ea3fed8 100644
--- a/rust/ql/lib/codeql/rust/elements/MacroCall.qll
+++ b/rust/ql/lib/codeql/rust/elements/MacroCall.qll
@@ -5,6 +5,7 @@
 
 private import internal.MacroCallImpl
 import codeql.rust.elements.AssocItem
+import codeql.rust.elements.AstNode
 import codeql.rust.elements.Attr
 import codeql.rust.elements.ExternItem
 import codeql.rust.elements.Item
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/MacroCall.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/MacroCall.qll
index 30717a1a3919..d95a29cd3029 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/MacroCall.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/MacroCall.qll
@@ -7,6 +7,7 @@
 private import codeql.rust.elements.internal.generated.Synth
 private import codeql.rust.elements.internal.generated.Raw
 import codeql.rust.elements.internal.AssocItemImpl::Impl as AssocItemImpl
+import codeql.rust.elements.AstNode
 import codeql.rust.elements.Attr
 import codeql.rust.elements.internal.ExternItemImpl::Impl as ExternItemImpl
 import codeql.rust.elements.internal.ItemImpl::Impl as ItemImpl
@@ -76,5 +77,20 @@ module Generated {
      * Holds if `getTokenTree()` exists.
      */
     final predicate hasTokenTree() { exists(this.getTokenTree()) }
+
+    /**
+     * Gets the expanded of this macro call, if it exists.
+     */
+    AstNode getExpanded() {
+      result =
+        Synth::convertAstNodeFromRaw(Synth::convertMacroCallToRaw(this)
+              .(Raw::MacroCall)
+              .getExpanded())
+    }
+
+    /**
+     * Holds if `getExpanded()` exists.
+     */
+    final predicate hasExpanded() { exists(this.getExpanded()) }
   }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/ParentChild.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/ParentChild.qll
index 88a02d60fa71..67d3a2523949 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/ParentChild.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/ParentChild.qll
@@ -3048,7 +3048,8 @@ private module Impl {
 
   private Element getImmediateChildOfMacroCall(MacroCall e, int index, string partialPredicateCall) {
     exists(
-      int b, int bAssocItem, int bExternItem, int bItem, int n, int nAttr, int nPath, int nTokenTree
+      int b, int bAssocItem, int bExternItem, int bItem, int n, int nAttr, int nPath,
+      int nTokenTree, int nExpanded
     |
       b = 0 and
       bAssocItem = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfAssocItem(e, i, _)) | i) and
@@ -3059,6 +3060,7 @@ private module Impl {
       nAttr = n + 1 + max(int i | i = -1 or exists(e.getAttr(i)) | i) and
       nPath = nAttr + 1 and
       nTokenTree = nPath + 1 and
+      nExpanded = nTokenTree + 1 and
       (
         none()
         or
@@ -3074,6 +3076,8 @@ private module Impl {
         index = nAttr and result = e.getPath() and partialPredicateCall = "Path()"
         or
         index = nPath and result = e.getTokenTree() and partialPredicateCall = "TokenTree()"
+        or
+        index = nTokenTree and result = e.getExpanded() and partialPredicateCall = "Expanded()"
       )
     )
   }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/Raw.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/Raw.qll
index 6ebc715567c9..aa426bd92aef 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/Raw.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/Raw.qll
@@ -3294,6 +3294,11 @@ module Raw {
      * Gets the token tree of this macro call, if it exists.
      */
     TokenTree getTokenTree() { macro_call_token_trees(this, result) }
+
+    /**
+     * Gets the expanded of this macro call, if it exists.
+     */
+    AstNode getExpanded() { macro_call_expandeds(this, result) }
   }
 
   /**
diff --git a/rust/ql/lib/rust.dbscheme b/rust/ql/lib/rust.dbscheme
index 17fd9f3d5177..ab7460435995 100644
--- a/rust/ql/lib/rust.dbscheme
+++ b/rust/ql/lib/rust.dbscheme
@@ -2753,6 +2753,12 @@ macro_call_token_trees(
   int token_tree: @token_tree ref
 );
 
+#keyset[id]
+macro_call_expandeds(
+  int id: @macro_call ref,
+  int expanded: @ast_node ref
+);
+
 macro_defs(
   unique int id: @macro_def
 );
diff --git a/rust/ql/test/extractor-tests/generated/MacroCall/MacroCall.ql b/rust/ql/test/extractor-tests/generated/MacroCall/MacroCall.ql
index 6ae14827e5ad..ed7bd1246b52 100644
--- a/rust/ql/test/extractor-tests/generated/MacroCall/MacroCall.ql
+++ b/rust/ql/test/extractor-tests/generated/MacroCall/MacroCall.ql
@@ -2,11 +2,13 @@
 import codeql.rust.elements
 import TestUtils
 
-from MacroCall x, int getNumberOfAttrs, string hasPath, string hasTokenTree
+from MacroCall x, int getNumberOfAttrs, string hasPath, string hasTokenTree, string hasExpanded
 where
   toBeTested(x) and
   not x.isUnknown() and
   getNumberOfAttrs = x.getNumberOfAttrs() and
   (if x.hasPath() then hasPath = "yes" else hasPath = "no") and
-  if x.hasTokenTree() then hasTokenTree = "yes" else hasTokenTree = "no"
-select x, "getNumberOfAttrs:", getNumberOfAttrs, "hasPath:", hasPath, "hasTokenTree:", hasTokenTree
+  (if x.hasTokenTree() then hasTokenTree = "yes" else hasTokenTree = "no") and
+  if x.hasExpanded() then hasExpanded = "yes" else hasExpanded = "no"
+select x, "getNumberOfAttrs:", getNumberOfAttrs, "hasPath:", hasPath, "hasTokenTree:", hasTokenTree,
+  "hasExpanded:", hasExpanded
diff --git a/rust/ql/test/extractor-tests/generated/MacroCall/MacroCall_getExpanded.ql b/rust/ql/test/extractor-tests/generated/MacroCall/MacroCall_getExpanded.ql
new file mode 100644
index 000000000000..be63430c9edc
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/MacroCall/MacroCall_getExpanded.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from MacroCall x
+where toBeTested(x) and not x.isUnknown()
+select x, x.getExpanded()
diff --git a/rust/schema/annotations.py b/rust/schema/annotations.py
index b4c647f2654b..8fc7d3e59c31 100644
--- a/rust/schema/annotations.py
+++ b/rust/schema/annotations.py
@@ -24,12 +24,14 @@ class _:
     The base class for expressions.
     """
 
+
 @annotate(Pat)
 class _:
     """
     The base class for patterns.
     """
 
+
 @annotate(Label)
 class _:
     """
@@ -49,6 +51,7 @@ class _:
     The base class for statements.
     """
 
+
 @annotate(TypeRef)
 class _:
     """
@@ -60,6 +63,7 @@ class _:
     ```
     """
 
+
 @annotate(Path)
 class _:
     """
@@ -69,6 +73,7 @@ class _:
     ```
     """
 
+
 @annotate(GenericArgList)
 class _:
     """
@@ -78,6 +83,7 @@ class _:
     ```
     """
 
+
 @annotate(Function)
 @rust.doc_test_signature(None)
 class _:
@@ -535,6 +541,7 @@ class _:
     ```
     """
 
+
 @annotate(UnderscoreExpr)
 class _:
     """
@@ -544,6 +551,7 @@ class _:
     ```
     """
 
+
 @annotate(OffsetOfExpr)
 class _:
     """
@@ -604,6 +612,7 @@ class _:
     ```
     """
 
+
 @annotate(TuplePat)
 class _:
     """
@@ -774,6 +783,8 @@ class _:
     };
     ```
     """
+
+
 @annotate(Abi)
 class _:
     """
@@ -782,6 +793,8 @@ class _:
     todo!()
     ```
     """
+
+
 @annotate(ArgList)
 class _:
     """
@@ -790,6 +803,8 @@ class _:
     todo!()
     ```
     """
+
+
 @annotate(ArrayType)
 class _:
     """
@@ -798,6 +813,8 @@ class _:
     todo!()
     ```
     """
+
+
 @annotate(AssocItem)
 class _:
     """
@@ -806,6 +823,8 @@ class _:
     todo!()
     ```
     """
+
+
 @annotate(AssocItemList)
 class _:
     """
@@ -814,6 +833,8 @@ class _:
     todo!()
     ```
     """
+
+
 @annotate(AssocTypeArg)
 class _:
     """
@@ -822,6 +843,8 @@ class _:
     todo!()
     ```
     """
+
+
 @annotate(Attr)
 class _:
     """
@@ -830,6 +853,8 @@ class _:
     todo!()
     ```
     """
+
+
 @annotate(ClosureBinder)
 class _:
     """
@@ -838,6 +863,8 @@ class _:
     todo!()
     ```
     """
+
+
 @annotate(Const)
 class _:
     """
@@ -846,6 +873,8 @@ class _:
     todo!()
     ```
     """
+
+
 @annotate(ConstArg)
 class _:
     """
@@ -854,6 +883,8 @@ class _:
     todo!()
     ```
     """
+
+
 @annotate(ConstParam)
 class _:
     """
@@ -862,6 +893,8 @@ class _:
     todo!()
     ```
     """
+
+
 @annotate(DynTraitType)
 class _:
     """
@@ -870,6 +903,8 @@ class _:
     todo!()
     ```
     """
+
+
 @annotate(Enum)
 class _:
     """
@@ -878,6 +913,8 @@ class _:
     todo!()
     ```
     """
+
+
 @annotate(ExternBlock)
 class _:
     """
@@ -886,6 +923,8 @@ class _:
     todo!()
     ```
     """
+
+
 @annotate(ExternCrate)
 class _:
     """
@@ -894,6 +933,8 @@ class _:
     todo!()
     ```
     """
+
+
 @annotate(ExternItem)
 class _:
     """
@@ -902,6 +943,8 @@ class _:
     todo!()
     ```
     """
+
+
 @annotate(ExternItemList)
 class _:
     """
@@ -910,6 +953,8 @@ class _:
     todo!()
     ```
     """
+
+
 @annotate(FieldList)
 class _:
     """
@@ -918,6 +963,8 @@ class _:
     todo!()
     ```
     """
+
+
 @annotate(FnPtrType)
 class _:
     """
@@ -926,6 +973,8 @@ class _:
     todo!()
     ```
     """
+
+
 @annotate(ForExpr)
 class _:
     """
@@ -934,6 +983,8 @@ class _:
     todo!()
     ```
     """
+
+
 @annotate(ForType)
 class _:
     """
@@ -942,6 +993,8 @@ class _:
     todo!()
     ```
     """
+
+
 @annotate(FormatArgsArg)
 class _:
     """
@@ -950,6 +1003,8 @@ class _:
     todo!()
     ```
     """
+
+
 @annotate(FormatArgsExpr)
 class _:
     """
@@ -958,6 +1013,8 @@ class _:
     todo!()
     ```
     """
+
+
 @annotate(GenericArg)
 class _:
     """
@@ -966,6 +1023,8 @@ class _:
     todo!()
     ```
     """
+
+
 @annotate(GenericParam)
 class _:
     """
@@ -974,6 +1033,8 @@ class _:
     todo!()
     ```
     """
+
+
 @annotate(GenericParamList)
 class _:
     """
@@ -982,6 +1043,8 @@ class _:
     todo!()
     ```
     """
+
+
 @annotate(Impl)
 class _:
     """
@@ -990,6 +1053,8 @@ class _:
     todo!()
     ```
     """
+
+
 @annotate(ImplTraitType)
 class _:
     """
@@ -998,6 +1063,8 @@ class _:
     todo!()
     ```
     """
+
+
 @annotate(InferType)
 class _:
     """
@@ -1006,6 +1073,8 @@ class _:
     todo!()
     ```
     """
+
+
 @annotate(Item)
 class _:
     """
@@ -1014,6 +1083,8 @@ class _:
     todo!()
     ```
     """
+
+
 @annotate(ItemList)
 class _:
     """
@@ -1022,6 +1093,8 @@ class _:
     todo!()
     ```
     """
+
+
 @annotate(LetElse)
 class _:
     """
@@ -1030,6 +1103,8 @@ class _:
     todo!()
     ```
     """
+
+
 @annotate(Lifetime)
 class _:
     """
@@ -1038,6 +1113,8 @@ class _:
     todo!()
     ```
     """
+
+
 @annotate(LifetimeArg)
 class _:
     """
@@ -1046,6 +1123,8 @@ class _:
     todo!()
     ```
     """
+
+
 @annotate(LifetimeParam)
 class _:
     """
@@ -1054,6 +1133,8 @@ class _:
     todo!()
     ```
     """
+
+
 @annotate(MacroCall)
 class _:
     """
@@ -1062,6 +1143,9 @@ class _:
     todo!()
     ```
     """
+    expanded: optional[AstNode] | child | rust.detach
+
+
 @annotate(MacroDef)
 class _:
     """
@@ -1070,6 +1154,8 @@ class _:
     todo!()
     ```
     """
+
+
 @annotate(MacroExpr)
 class _:
     """
@@ -1078,6 +1164,8 @@ class _:
     todo!()
     ```
     """
+
+
 @annotate(MacroPat)
 class _:
     """
@@ -1086,6 +1174,8 @@ class _:
     todo!()
     ```
     """
+
+
 @annotate(MacroRules)
 class _:
     """
@@ -1094,6 +1184,8 @@ class _:
     todo!()
     ```
     """
+
+
 @annotate(MacroType)
 class _:
     """
@@ -1102,6 +1194,8 @@ class _:
     todo!()
     ```
     """
+
+
 @annotate(MatchArmList)
 class _:
     """
@@ -1110,6 +1204,8 @@ class _:
     todo!()
     ```
     """
+
+
 @annotate(MatchGuard)
 class _:
     """
@@ -1118,6 +1214,8 @@ class _:
     todo!()
     ```
     """
+
+
 @annotate(Meta)
 class _:
     """
@@ -1126,6 +1224,8 @@ class _:
     todo!()
     ```
     """
+
+
 @annotate(Name)
 class _:
     """
@@ -1134,6 +1234,8 @@ class _:
     todo!()
     ```
     """
+
+
 @annotate(NameRef)
 class _:
     """
@@ -1142,6 +1244,8 @@ class _:
     todo!()
     ```
     """
+
+
 @annotate(NeverType)
 class _:
     """
@@ -1150,6 +1254,8 @@ class _:
     todo!()
     ```
     """
+
+
 @annotate(Param)
 class _:
     """
@@ -1158,6 +1264,8 @@ class _:
     todo!()
     ```
     """
+
+
 @annotate(ParamList)
 class _:
     """
@@ -1166,6 +1274,8 @@ class _:
     todo!()
     ```
     """
+
+
 @annotate(ParenExpr)
 class _:
     """
@@ -1174,6 +1284,8 @@ class _:
     todo!()
     ```
     """
+
+
 @annotate(ParenPat)
 class _:
     """
@@ -1182,6 +1294,8 @@ class _:
     todo!()
     ```
     """
+
+
 @annotate(ParenType)
 class _:
     """
@@ -1190,6 +1304,8 @@ class _:
     todo!()
     ```
     """
+
+
 @annotate(PathSegment)
 class _:
     """
@@ -1198,6 +1314,8 @@ class _:
     todo!()
     ```
     """
+
+
 @annotate(PathType)
 class _:
     """
@@ -1206,6 +1324,8 @@ class _:
     todo!()
     ```
     """
+
+
 @annotate(PtrType)
 class _:
     """
@@ -1214,6 +1334,8 @@ class _:
     todo!()
     ```
     """
+
+
 @annotate(RecordExprFieldList)
 class _:
     """
@@ -1222,6 +1344,8 @@ class _:
     todo!()
     ```
     """
+
+
 @annotate(RecordField)
 class _:
     """
@@ -1230,6 +1354,8 @@ class _:
     todo!()
     ```
     """
+
+
 @annotate(RecordFieldList)
 class _:
     """
@@ -1238,6 +1364,8 @@ class _:
     todo!()
     ```
     """
+
+
 @annotate(RecordPatFieldList)
 class _:
     """
@@ -1246,6 +1374,8 @@ class _:
     todo!()
     ```
     """
+
+
 @annotate(RefType)
 class _:
     """
@@ -1254,6 +1384,8 @@ class _:
     todo!()
     ```
     """
+
+
 @annotate(Rename)
 class _:
     """
@@ -1262,6 +1394,8 @@ class _:
     todo!()
     ```
     """
+
+
 @annotate(RestPat)
 class _:
     """
@@ -1270,6 +1404,8 @@ class _:
     todo!()
     ```
     """
+
+
 @annotate(RetType)
 class _:
     """
@@ -1278,6 +1414,8 @@ class _:
     todo!()
     ```
     """
+
+
 @annotate(ReturnTypeSyntax)
 class _:
     """
@@ -1286,6 +1424,8 @@ class _:
     todo!()
     ```
     """
+
+
 @annotate(SelfParam)
 class _:
     """
@@ -1294,6 +1434,8 @@ class _:
     todo!()
     ```
     """
+
+
 @annotate(SliceType)
 class _:
     """
@@ -1302,6 +1444,8 @@ class _:
     todo!()
     ```
     """
+
+
 @annotate(SourceFile)
 class _:
     """
@@ -1310,6 +1454,8 @@ class _:
     todo!()
     ```
     """
+
+
 @annotate(Static)
 class _:
     """
@@ -1318,6 +1464,8 @@ class _:
     todo!()
     ```
     """
+
+
 @annotate(StmtList)
 class _:
     """
@@ -1326,6 +1474,8 @@ class _:
     todo!()
     ```
     """
+
+
 @annotate(Struct)
 class _:
     """
@@ -1334,6 +1484,8 @@ class _:
     todo!()
     ```
     """
+
+
 @annotate(TokenTree)
 class _:
     """
@@ -1342,6 +1494,8 @@ class _:
     todo!()
     ```
     """
+
+
 @annotate(Trait)
 class _:
     """
@@ -1350,6 +1504,8 @@ class _:
     todo!()
     ```
     """
+
+
 @annotate(TraitAlias)
 class _:
     """
@@ -1358,6 +1514,8 @@ class _:
     todo!()
     ```
     """
+
+
 @annotate(TryExpr)
 class _:
     """
@@ -1366,6 +1524,8 @@ class _:
     todo!()
     ```
     """
+
+
 @annotate(TupleField)
 class _:
     """
@@ -1374,6 +1534,8 @@ class _:
     todo!()
     ```
     """
+
+
 @annotate(TupleFieldList)
 class _:
     """
@@ -1382,6 +1544,8 @@ class _:
     todo!()
     ```
     """
+
+
 @annotate(TupleType)
 class _:
     """
@@ -1390,6 +1554,8 @@ class _:
     todo!()
     ```
     """
+
+
 @annotate(TypeAlias)
 class _:
     """
@@ -1398,6 +1564,8 @@ class _:
     todo!()
     ```
     """
+
+
 @annotate(TypeArg)
 class _:
     """
@@ -1406,6 +1574,8 @@ class _:
     todo!()
     ```
     """
+
+
 @annotate(TypeBound)
 class _:
     """
@@ -1414,6 +1584,8 @@ class _:
     todo!()
     ```
     """
+
+
 @annotate(TypeBoundList)
 class _:
     """
@@ -1422,6 +1594,8 @@ class _:
     todo!()
     ```
     """
+
+
 @annotate(TypeParam)
 class _:
     """
@@ -1430,6 +1604,8 @@ class _:
     todo!()
     ```
     """
+
+
 @annotate(Union)
 class _:
     """
@@ -1438,6 +1614,8 @@ class _:
     todo!()
     ```
     """
+
+
 @annotate(Use)
 class _:
     """
@@ -1446,6 +1624,8 @@ class _:
     todo!()
     ```
     """
+
+
 @annotate(UseTree)
 class _:
     """
@@ -1454,6 +1634,8 @@ class _:
     todo!()
     ```
     """
+
+
 @annotate(UseTreeList)
 class _:
     """
@@ -1462,6 +1644,8 @@ class _:
     todo!()
     ```
     """
+
+
 @annotate(Variant)
 class _:
     """
@@ -1470,6 +1654,8 @@ class _:
     todo!()
     ```
     """
+
+
 @annotate(VariantList)
 class _:
     """
@@ -1478,6 +1664,8 @@ class _:
     todo!()
     ```
     """
+
+
 @annotate(Visibility)
 class _:
     """
@@ -1486,6 +1674,8 @@ class _:
     todo!()
     ```
     """
+
+
 @annotate(WhereClause)
 class _:
     """
@@ -1494,6 +1684,8 @@ class _:
     todo!()
     ```
     """
+
+
 @annotate(WherePred)
 class _:
     """
@@ -1502,6 +1694,8 @@ class _:
     todo!()
     ```
     """
+
+
 @annotate(WhileExpr)
 class _:
     """

From 796da126b8f41605f82d6ab48983c48945c67750 Mon Sep 17 00:00:00 2001
From: Arthur Baars <aibaars@github.com>
Date: Thu, 3 Oct 2024 17:00:46 +0200
Subject: [PATCH 286/347] Rust: update expected output

---
 .../generated/ArgList/ArgList.expected        |  1 +
 .../generated/ArgList/ArgList_getArg.expected |  1 +
 .../generated/MacroCall/MacroCall.expected    |  2 +-
 .../MacroCall/MacroCall_getExpanded.expected  |  1 +
 .../generated/NameRef/NameRef.expected        |  3 +++
 .../NameRef/NameRef_getText.expected          |  3 +++
 .../PathSegment/PathSegment.expected          |  3 +++
 .../PathSegment_getNameRef.expected           |  3 +++
 .../ExtractionConsistency.expected            |  1 +
 .../variables/variables.expected              |  4 ++++
 .../test/library-tests/variables/variables.rs |  8 +++----
 .../ExtractionConsistency.expected            |  1 +
 .../diagnostics/ExtractionErrors.expected     |  1 +
 .../diagnostics/SummaryStats.expected         |  2 +-
 .../unusedentities/UnreachableCode.expected   | 24 +++++++++++++++++++
 .../unusedentities/UnusedVariable.expected    |  3 ---
 16 files changed, 52 insertions(+), 9 deletions(-)
 create mode 100644 rust/ql/test/extractor-tests/generated/MacroCall/MacroCall_getExpanded.expected

diff --git a/rust/ql/test/extractor-tests/generated/ArgList/ArgList.expected b/rust/ql/test/extractor-tests/generated/ArgList/ArgList.expected
index e69de29bb2d1..883d8f2a698c 100644
--- a/rust/ql/test/extractor-tests/generated/ArgList/ArgList.expected
+++ b/rust/ql/test/extractor-tests/generated/ArgList/ArgList.expected
@@ -0,0 +1 @@
+| gen_arg_list.rs:5:5:5:11 | ArgList | getNumberOfArgs: | 1 |
diff --git a/rust/ql/test/extractor-tests/generated/ArgList/ArgList_getArg.expected b/rust/ql/test/extractor-tests/generated/ArgList/ArgList_getArg.expected
index e69de29bb2d1..9bbaa63495cd 100644
--- a/rust/ql/test/extractor-tests/generated/ArgList/ArgList_getArg.expected
+++ b/rust/ql/test/extractor-tests/generated/ArgList/ArgList_getArg.expected
@@ -0,0 +1 @@
+| gen_arg_list.rs:5:5:5:11 | ArgList | 0 | gen_arg_list.rs:5:5:5:11 | "not yet implemented" |
diff --git a/rust/ql/test/extractor-tests/generated/MacroCall/MacroCall.expected b/rust/ql/test/extractor-tests/generated/MacroCall/MacroCall.expected
index bbe8097850f0..0aaee585a350 100644
--- a/rust/ql/test/extractor-tests/generated/MacroCall/MacroCall.expected
+++ b/rust/ql/test/extractor-tests/generated/MacroCall/MacroCall.expected
@@ -1 +1 @@
-| gen_macro_call.rs:5:5:5:11 | MacroCall | getNumberOfAttrs: | 0 | hasPath: | yes | hasTokenTree: | yes |
+| gen_macro_call.rs:5:5:5:11 | MacroCall | getNumberOfAttrs: | 0 | hasPath: | yes | hasTokenTree: | yes | hasExpanded: | yes |
diff --git a/rust/ql/test/extractor-tests/generated/MacroCall/MacroCall_getExpanded.expected b/rust/ql/test/extractor-tests/generated/MacroCall/MacroCall_getExpanded.expected
new file mode 100644
index 000000000000..7bdb564985f8
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/MacroCall/MacroCall_getExpanded.expected
@@ -0,0 +1 @@
+| gen_macro_call.rs:5:5:5:11 | MacroCall | gen_macro_call.rs:5:5:5:11 | MacroStmts |
diff --git a/rust/ql/test/extractor-tests/generated/NameRef/NameRef.expected b/rust/ql/test/extractor-tests/generated/NameRef/NameRef.expected
index d4215cca0724..d28b8224609f 100644
--- a/rust/ql/test/extractor-tests/generated/NameRef/NameRef.expected
+++ b/rust/ql/test/extractor-tests/generated/NameRef/NameRef.expected
@@ -1 +1,4 @@
 | gen_name_ref.rs:5:5:5:8 | NameRef | hasText: | yes |
+| gen_name_ref.rs:5:5:5:11 | NameRef | hasText: | yes |
+| gen_name_ref.rs:5:5:5:11 | NameRef | hasText: | yes |
+| gen_name_ref.rs:5:5:5:11 | NameRef | hasText: | yes |
diff --git a/rust/ql/test/extractor-tests/generated/NameRef/NameRef_getText.expected b/rust/ql/test/extractor-tests/generated/NameRef/NameRef_getText.expected
index 23cbafe4d304..8b41037f56d2 100644
--- a/rust/ql/test/extractor-tests/generated/NameRef/NameRef_getText.expected
+++ b/rust/ql/test/extractor-tests/generated/NameRef/NameRef_getText.expected
@@ -1 +1,4 @@
 | gen_name_ref.rs:5:5:5:8 | NameRef | todo |
+| gen_name_ref.rs:5:5:5:11 | NameRef | $crate |
+| gen_name_ref.rs:5:5:5:11 | NameRef | panic |
+| gen_name_ref.rs:5:5:5:11 | NameRef | panicking |
diff --git a/rust/ql/test/extractor-tests/generated/PathSegment/PathSegment.expected b/rust/ql/test/extractor-tests/generated/PathSegment/PathSegment.expected
index da8b58acd2d6..d3edb17d535b 100644
--- a/rust/ql/test/extractor-tests/generated/PathSegment/PathSegment.expected
+++ b/rust/ql/test/extractor-tests/generated/PathSegment/PathSegment.expected
@@ -1 +1,4 @@
 | gen_path_segment.rs:5:5:5:8 | PathSegment | hasGenericArgList: | no | hasNameRef: | yes | hasParamList: | no | hasPathType: | no | hasRetType: | no | hasReturnTypeSyntax: | no | hasTy: | no |
+| gen_path_segment.rs:5:5:5:11 | PathSegment | hasGenericArgList: | no | hasNameRef: | yes | hasParamList: | no | hasPathType: | no | hasRetType: | no | hasReturnTypeSyntax: | no | hasTy: | no |
+| gen_path_segment.rs:5:5:5:11 | PathSegment | hasGenericArgList: | no | hasNameRef: | yes | hasParamList: | no | hasPathType: | no | hasRetType: | no | hasReturnTypeSyntax: | no | hasTy: | no |
+| gen_path_segment.rs:5:5:5:11 | PathSegment | hasGenericArgList: | no | hasNameRef: | yes | hasParamList: | no | hasPathType: | no | hasRetType: | no | hasReturnTypeSyntax: | no | hasTy: | no |
diff --git a/rust/ql/test/extractor-tests/generated/PathSegment/PathSegment_getNameRef.expected b/rust/ql/test/extractor-tests/generated/PathSegment/PathSegment_getNameRef.expected
index e81802b78635..38207ad29282 100644
--- a/rust/ql/test/extractor-tests/generated/PathSegment/PathSegment_getNameRef.expected
+++ b/rust/ql/test/extractor-tests/generated/PathSegment/PathSegment_getNameRef.expected
@@ -1 +1,4 @@
 | gen_path_segment.rs:5:5:5:8 | PathSegment | gen_path_segment.rs:5:5:5:8 | NameRef |
+| gen_path_segment.rs:5:5:5:11 | PathSegment | gen_path_segment.rs:5:5:5:11 | NameRef |
+| gen_path_segment.rs:5:5:5:11 | PathSegment | gen_path_segment.rs:5:5:5:11 | NameRef |
+| gen_path_segment.rs:5:5:5:11 | PathSegment | gen_path_segment.rs:5:5:5:11 | NameRef |
diff --git a/rust/ql/test/extractor-tests/utf8/CONSISTENCY/ExtractionConsistency.expected b/rust/ql/test/extractor-tests/utf8/CONSISTENCY/ExtractionConsistency.expected
index 23b423a489a1..54fb69c68140 100644
--- a/rust/ql/test/extractor-tests/utf8/CONSISTENCY/ExtractionConsistency.expected
+++ b/rust/ql/test/extractor-tests/utf8/CONSISTENCY/ExtractionConsistency.expected
@@ -1,4 +1,5 @@
 | lib.rs:3:9:3:8 | expected `;` or `{` |
 | lib.rs:3:9:3:8 | expected an item |
+| lib.rs:3:10:3:21 | macro expansion failed: could not resolve macro 'identifiers' |
 | lib.rs:3:21:3:20 | expected BANG |
 | lib.rs:3:21:3:20 | expected `{`, `[`, `(` |
diff --git a/rust/ql/test/library-tests/variables/variables.expected b/rust/ql/test/library-tests/variables/variables.expected
index d5256eeea899..7751d42911b4 100644
--- a/rust/ql/test/library-tests/variables/variables.expected
+++ b/rust/ql/test/library-tests/variables/variables.expected
@@ -76,6 +76,8 @@ variable
 | variables.rs:366:13:366:13 | x |
 | variables.rs:367:13:367:15 | cap |
 variableAccess
+| variables.rs:4:20:4:20 | s | variables.rs:3:14:3:14 | s |
+| variables.rs:8:20:8:20 | i | variables.rs:7:14:7:14 | i |
 | variables.rs:13:15:13:16 | x1 | variables.rs:12:9:12:10 | x1 |
 | variables.rs:18:15:18:16 | x2 | variables.rs:17:13:17:14 | x2 |
 | variables.rs:19:5:19:6 | x2 | variables.rs:17:13:17:14 | x2 |
@@ -183,6 +185,8 @@ variableWriteAccess
 | variables.rs:278:9:278:10 | b4 | variables.rs:269:13:269:14 | b4 |
 | variables.rs:279:9:279:11 | a10 | variables.rs:268:13:268:15 | a10 |
 variableReadAccess
+| variables.rs:4:20:4:20 | s | variables.rs:3:14:3:14 | s |
+| variables.rs:8:20:8:20 | i | variables.rs:7:14:7:14 | i |
 | variables.rs:13:15:13:16 | x1 | variables.rs:12:9:12:10 | x1 |
 | variables.rs:18:15:18:16 | x2 | variables.rs:17:13:17:14 | x2 |
 | variables.rs:20:15:20:16 | x2 | variables.rs:17:13:17:14 | x2 |
diff --git a/rust/ql/test/library-tests/variables/variables.rs b/rust/ql/test/library-tests/variables/variables.rs
index bf3491dff613..dbc3fd4cab5c 100644
--- a/rust/ql/test/library-tests/variables/variables.rs
+++ b/rust/ql/test/library-tests/variables/variables.rs
@@ -1,11 +1,11 @@
 use std::ops::AddAssign;
 
-fn print_str(s: &str) {
-    println!("{}", s);
+fn print_str(s: &str) { // s
+    println!("{}", s); // $ read_access=s
 }
 
-fn print_i64(i: i64) {
-    println!("{}", i);
+fn print_i64(i: i64) { // i
+    println!("{}", i); // $ read_access=i
 }
 
 fn immutable_variable() {
diff --git a/rust/ql/test/query-tests/diagnostics/CONSISTENCY/ExtractionConsistency.expected b/rust/ql/test/query-tests/diagnostics/CONSISTENCY/ExtractionConsistency.expected
index 157aafc87852..39125607e963 100644
--- a/rust/ql/test/query-tests/diagnostics/CONSISTENCY/ExtractionConsistency.expected
+++ b/rust/ql/test/query-tests/diagnostics/CONSISTENCY/ExtractionConsistency.expected
@@ -4,3 +4,4 @@
 | does_not_compile.rs:2:21:2:20 | expected SEMICOLON |
 | does_not_compile.rs:2:26:2:25 | expected SEMICOLON |
 | does_not_compile.rs:2:32:2:31 | expected field name or number |
+| error.rs:2:5:2:17 | An error! |
diff --git a/rust/ql/test/query-tests/diagnostics/ExtractionErrors.expected b/rust/ql/test/query-tests/diagnostics/ExtractionErrors.expected
index b6aaf7b6d373..84fc94c78d17 100644
--- a/rust/ql/test/query-tests/diagnostics/ExtractionErrors.expected
+++ b/rust/ql/test/query-tests/diagnostics/ExtractionErrors.expected
@@ -4,3 +4,4 @@
 | does_not_compile.rs:2:21:2:20 | expected SEMICOLON | Extraction failed in does_not_compile.rs with error expected SEMICOLON | 2 |
 | does_not_compile.rs:2:26:2:25 | expected SEMICOLON | Extraction failed in does_not_compile.rs with error expected SEMICOLON | 2 |
 | does_not_compile.rs:2:32:2:31 | expected field name or number | Extraction failed in does_not_compile.rs with error expected field name or number | 2 |
+| error.rs:2:5:2:17 | An error! | Extraction failed in error.rs with error An error! | 2 |
diff --git a/rust/ql/test/query-tests/diagnostics/SummaryStats.expected b/rust/ql/test/query-tests/diagnostics/SummaryStats.expected
index d9142bcadfed..8367d199669e 100644
--- a/rust/ql/test/query-tests/diagnostics/SummaryStats.expected
+++ b/rust/ql/test/query-tests/diagnostics/SummaryStats.expected
@@ -1,4 +1,4 @@
-| Elements extracted | 290 |
+| Elements extracted | 380 |
 | Elements unextracted | 0 |
 | Files extracted | 7 |
 | Lines of code extracted | 61 |
diff --git a/rust/ql/test/query-tests/unusedentities/UnreachableCode.expected b/rust/ql/test/query-tests/unusedentities/UnreachableCode.expected
index 02c2998f1de2..dac61fb99462 100644
--- a/rust/ql/test/query-tests/unusedentities/UnreachableCode.expected
+++ b/rust/ql/test/query-tests/unusedentities/UnreachableCode.expected
@@ -1,10 +1,34 @@
+| main.rs:14:14:14:24 | ExprStmt | This code is never reached. |
+| main.rs:17:18:17:28 | ExprStmt | This code is never reached. |
+| main.rs:20:14:20:24 | ExprStmt | This code is never reached. |
+| main.rs:21:5:21:19 | ExprStmt | This code is never reached. |
+| main.rs:21:5:21:19 | ExprStmt | This code is never reached. |
+| main.rs:39:14:39:24 | ExprStmt | This code is never reached. |
+| main.rs:48:14:48:24 | ExprStmt | This code is never reached. |
+| main.rs:56:14:56:24 | ExprStmt | This code is never reached. |
+| main.rs:60:14:60:24 | ExprStmt | This code is never reached. |
+| main.rs:68:14:68:24 | ExprStmt | This code is never reached. |
+| main.rs:94:14:94:45 | ExprStmt | This code is never reached. |
+| main.rs:97:14:97:38 | ExprStmt | This code is never reached. |
+| main.rs:99:14:99:38 | ExprStmt | This code is never reached. |
+| main.rs:112:14:112:32 | ExprStmt | This code is never reached. |
+| main.rs:117:18:117:33 | ExprStmt | This code is never reached. |
+| main.rs:171:18:171:29 | ExprStmt | This code is never reached. |
+| main.rs:176:9:176:24 | ExprStmt | This code is never reached. |
+| main.rs:176:9:176:24 | ExprStmt | This code is never reached. |
+| main.rs:332:11:332:51 | ExprStmt | This code is never reached. |
 | unreachable.rs:12:3:12:17 | ExprStmt | This code is never reached. |
 | unreachable.rs:20:3:20:17 | ExprStmt | This code is never reached. |
 | unreachable.rs:32:3:32:17 | ExprStmt | This code is never reached. |
 | unreachable.rs:39:3:39:17 | ExprStmt | This code is never reached. |
 | unreachable.rs:60:2:60:16 | ExprStmt | This code is never reached. |
+| unreachable.rs:66:10:66:19 | ExprStmt | This code is never reached. |
+| unreachable.rs:100:16:100:23 | ExprStmt | This code is never reached. |
 | unreachable.rs:101:3:101:17 | ExprStmt | This code is never reached. |
+| unreachable.rs:102:16:102:23 | ExprStmt | This code is never reached. |
+| unreachable.rs:108:15:108:22 | ExprStmt | This code is never reached. |
 | unreachable.rs:109:3:109:17 | ExprStmt | This code is never reached. |
+| unreachable.rs:110:15:110:22 | ExprStmt | This code is never reached. |
 | unreachable.rs:124:2:124:16 | ExprStmt | This code is never reached. |
 | unreachable.rs:134:2:134:16 | ExprStmt | This code is never reached. |
 | unreachable.rs:141:3:141:17 | ExprStmt | This code is never reached. |
diff --git a/rust/ql/test/query-tests/unusedentities/UnusedVariable.expected b/rust/ql/test/query-tests/unusedentities/UnusedVariable.expected
index ee59aefde2c5..8203501f3a23 100644
--- a/rust/ql/test/query-tests/unusedentities/UnusedVariable.expected
+++ b/rust/ql/test/query-tests/unusedentities/UnusedVariable.expected
@@ -1,10 +1,7 @@
 | main.rs:25:9:25:9 | a | Variable is not used. |
 | main.rs:90:13:90:13 | d | Variable is not used. |
-| main.rs:114:9:114:9 | k | Variable is not used. |
 | main.rs:141:5:141:5 | y | Variable is not used. |
 | main.rs:164:9:164:9 | x | Variable is not used. |
-| main.rs:169:9:169:9 | x | Variable is not used. |
-| main.rs:174:9:174:9 | x | Variable is not used. |
 | main.rs:202:17:202:17 | a | Variable is not used. |
 | main.rs:210:20:210:22 | val | Variable is not used. |
 | main.rs:223:14:223:16 | val | Variable is not used. |

From 0c10f083cbf86c313f3c8e691b04fdce26851e07 Mon Sep 17 00:00:00 2001
From: Arthur Baars <aibaars@github.com>
Date: Fri, 4 Oct 2024 10:42:58 +0200
Subject: [PATCH 287/347] Rust: set RUST_BACKTRACE=1

---
 rust/tools/autobuild.sh   | 1 +
 rust/tools/index-files.sh | 1 +
 2 files changed, 2 insertions(+)

diff --git a/rust/tools/autobuild.sh b/rust/tools/autobuild.sh
index fdea6e80e52a..9d30ff1b3c34 100755
--- a/rust/tools/autobuild.sh
+++ b/rust/tools/autobuild.sh
@@ -1,5 +1,6 @@
 #!/bin/bash
 
+export RUST_BACKTRACE=1
 exec "${CODEQL_DIST}/codeql" database index-files \
   --working-dir=. --language=rust --include-extension=.rs \
   "${CODEQL_EXTRACTOR_RUST_WIP_DATABASE}"
diff --git a/rust/tools/index-files.sh b/rust/tools/index-files.sh
index f3d93fbaf4a9..bb8d665adfcc 100755
--- a/rust/tools/index-files.sh
+++ b/rust/tools/index-files.sh
@@ -2,4 +2,5 @@
 
 set -eu
 
+export RUST_BACKTRACE=1
 exec "$CODEQL_EXTRACTOR_RUST_ROOT/tools/$CODEQL_PLATFORM/extractor" @"$1"

From faa168993cc4393a525e836d98fcd02fb8cf26e0 Mon Sep 17 00:00:00 2001
From: Arthur Baars <aibaars@github.com>
Date: Fri, 4 Oct 2024 11:13:06 +0200
Subject: [PATCH 288/347] Rust: reduce log output

---
 rust/extractor/src/main.rs          | 1 -
 rust/extractor/src/rust_analyzer.rs | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/rust/extractor/src/main.rs b/rust/extractor/src/main.rs
index 701b2f0b38ea..5e21e4f65ac4 100644
--- a/rust/extractor/src/main.rs
+++ b/rust/extractor/src/main.rs
@@ -43,7 +43,6 @@ fn main() -> anyhow::Result<()> {
         .module(module_path!())
         .verbosity(2 + cfg.verbose as usize)
         .init()?;
-    log::info!("{cfg:?}");
     let rust_analyzer = rust_analyzer::RustAnalyzer::new(&cfg)?;
 
     let traps = trap::TrapFileProvider::new(&cfg).context("failed to set up trap files")?;
diff --git a/rust/extractor/src/rust_analyzer.rs b/rust/extractor/src/rust_analyzer.rs
index 67d43755ec40..2c269d472ccf 100644
--- a/rust/extractor/src/rust_analyzer.rs
+++ b/rust/extractor/src/rust_analyzer.rs
@@ -36,7 +36,7 @@ impl RustAnalyzer {
                 .ok(),
             ..Default::default()
         };
-        let progress = |t| (log::info!("progress: {}", t));
+        let progress = |t| (log::trace!("progress: {}", t));
         let load_config = LoadCargoConfig {
             load_out_dirs_from_check: true,
             with_proc_macro_server: ProcMacroServerChoice::Sysroot,

From ae19b2fd890bd8e0ab100345329fb0268a6853c3 Mon Sep 17 00:00:00 2001
From: Arthur Baars <aibaars@github.com>
Date: Fri, 4 Oct 2024 14:38:11 +0200
Subject: [PATCH 289/347] Rust: check that TextRanges are for the correct file

---
 rust/extractor/src/main.rs           | 12 +++++++---
 rust/extractor/src/rust_analyzer.rs  |  4 +++-
 rust/extractor/src/translate/base.rs | 35 +++++++++++++++++++++-------
 3 files changed, 39 insertions(+), 12 deletions(-)

diff --git a/rust/extractor/src/main.rs b/rust/extractor/src/main.rs
index 5e21e4f65ac4..d9bb94f17a21 100644
--- a/rust/extractor/src/main.rs
+++ b/rust/extractor/src/main.rs
@@ -12,13 +12,19 @@ fn extract(
     traps: &trap::TrapFileProvider,
     file: std::path::PathBuf,
 ) -> anyhow::Result<()> {
-    let (ast, input, parse_errors, semi) = rust_analyzer.parse(&file);
+    let (ast, input, parse_errors, file_id, semi) = rust_analyzer.parse(&file);
     let line_index = LineIndex::new(input.as_ref());
     let display_path = file.to_string_lossy();
     let mut trap = traps.create("source", &file);
     let label = trap.emit_file(&file);
-    let mut translator =
-        translate::Translator::new(trap, display_path.as_ref(), label, line_index, semi);
+    let mut translator = translate::Translator::new(
+        trap,
+        display_path.as_ref(),
+        label,
+        line_index,
+        file_id,
+        semi,
+    );
 
     for err in parse_errors {
         translator.emit_parse_error(&err);
diff --git a/rust/extractor/src/rust_analyzer.rs b/rust/extractor/src/rust_analyzer.rs
index 2c269d472ccf..caeeae6c443c 100644
--- a/rust/extractor/src/rust_analyzer.rs
+++ b/rust/extractor/src/rust_analyzer.rs
@@ -59,6 +59,7 @@ impl RustAnalyzer {
         SourceFile,
         Arc<str>,
         Vec<SyntaxError>,
+        Option<EditionedFileId>,
         Option<Semantics<'_, RootDatabase>>,
     ) {
         let mut p = path.as_path();
@@ -80,6 +81,7 @@ impl RustAnalyzer {
                         db.parse_errors(file_id)
                             .map(|x| x.to_vec())
                             .unwrap_or_default(),
+                        Some(file_id),
                         Some(semi),
                     );
                 }
@@ -100,7 +102,7 @@ impl RustAnalyzer {
         let parse = ra_ap_syntax::ast::SourceFile::parse(&input, Edition::CURRENT);
         errors.extend(parse.errors());
         errors.extend(err);
-        (parse.tree(), input.as_ref().into(), errors, None)
+        (parse.tree(), input.as_ref().into(), errors, None, None)
     }
 }
 
diff --git a/rust/extractor/src/translate/base.rs b/rust/extractor/src/translate/base.rs
index 5a99561149ca..36d39d203841 100644
--- a/rust/extractor/src/translate/base.rs
+++ b/rust/extractor/src/translate/base.rs
@@ -9,6 +9,7 @@ use ra_ap_hir::Semantics;
 use ra_ap_ide_db::line_index::{LineCol, LineIndex};
 use ra_ap_ide_db::RootDatabase;
 use ra_ap_parser::SyntaxKind;
+use ra_ap_span::{EditionedFileId, TextSize};
 use ra_ap_syntax::ast::RangeItem;
 use ra_ap_syntax::{
     ast, AstNode, NodeOrToken, SyntaxElementChildren, SyntaxError, SyntaxToken, TextRange,
@@ -63,11 +64,13 @@ impl TextValue for ast::RangePat {
         self.op_token().map(|x| x.text().to_string())
     }
 }
+
 pub struct Translator<'a> {
     pub trap: TrapFile,
     path: &'a str,
     label: trap::Label,
     line_index: LineIndex,
+    file_id: Option<EditionedFileId>,
     pub semi: Option<Semantics<'a, RootDatabase>>,
 }
 
@@ -77,6 +80,7 @@ impl<'a> Translator<'a> {
         path: &'a str,
         label: trap::Label,
         line_index: LineIndex,
+        file_id: Option<EditionedFileId>,
         semi: Option<Semantics<'a, RootDatabase>>,
     ) -> Translator<'a> {
         Translator {
@@ -84,6 +88,7 @@ impl<'a> Translator<'a> {
             path,
             label,
             line_index,
+            file_id,
             semi,
         }
     }
@@ -107,18 +112,32 @@ impl<'a> Translator<'a> {
         (start, end)
     }
 
-    pub fn text_range_for_node(&mut self, node: &impl ast::AstNode) -> TextRange {
+    pub fn text_range_for_node(&mut self, node: &impl ast::AstNode) -> Option<TextRange> {
         if let Some(semi) = self.semi.as_ref() {
             let file_range = semi.original_range(node.syntax());
-            file_range.range
+            let file_id = self.file_id?;
+            if file_id == file_range.file_id {
+                Some(file_range.range)
+            } else {
+                None
+            }
         } else {
-            node.syntax().text_range()
+            Some(node.syntax().text_range())
         }
     }
     pub fn emit_location<T: TrapClass>(&mut self, label: Label<T>, node: &impl ast::AstNode) {
-        let range = self.text_range_for_node(node);
-        let (start, end) = self.location(range);
-        self.trap.emit_location(self.label, label, start, end)
+        if let Some(range) = self.text_range_for_node(node) {
+            let (start, end) = self.location(range);
+            self.trap.emit_location(self.label, label, start, end)
+        } else {
+            self.emit_diagnostic(
+                DiagnosticSeverity::Info,
+                "locations".to_owned(),
+                "missing location for AstNode".to_owned(),
+                "missing location for AstNode".to_owned(),
+                (LineCol { line: 0, col: 0 }, LineCol { line: 0, col: 0 }),
+            );
+        }
     }
     pub fn emit_location_token(&mut self, label: Label<generated::Token>, token: &SyntaxToken) {
         let (start, end) = self.location(token.text_range());
@@ -248,7 +267,7 @@ impl<'a> Translator<'a> {
                             mcall.path().map(|p| p.to_string()).unwrap_or_default(),
                             kind, expand_to
                         ),
-                        range,
+                        range.unwrap_or_else(|| TextRange::empty(TextSize::from(0))),
                     ));
                 }
             } else {
@@ -259,7 +278,7 @@ impl<'a> Translator<'a> {
                         "macro expansion failed: could not resolve macro '{}'",
                         mcall.path().map(|p| p.to_string()).unwrap_or_default()
                     ),
-                    range,
+                    range.unwrap_or_else(|| TextRange::empty(TextSize::from(0))),
                 ));
             }
         }

From 3e877ffaacff25f33d6a510603b015368cf49d65 Mon Sep 17 00:00:00 2001
From: Arthur Baars <aibaars@github.com>
Date: Fri, 4 Oct 2024 15:09:22 +0200
Subject: [PATCH 290/347] Rust: do not fail on bad Cargo.toml files

---
 rust/extractor/src/rust_analyzer.rs | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/rust/extractor/src/rust_analyzer.rs b/rust/extractor/src/rust_analyzer.rs
index caeeae6c443c..4c8a76639954 100644
--- a/rust/extractor/src/rust_analyzer.rs
+++ b/rust/extractor/src/rust_analyzer.rs
@@ -45,10 +45,16 @@ impl RustAnalyzer {
         let projects = find_project_manifests(&cfg.inputs).context("loading inputs")?;
         for project in projects {
             let manifest = project.manifest_path();
-            let (db, vfs, _macro_server) =
-                load_workspace_at(manifest.as_ref(), &config, &load_config, &progress)?;
-            let path: &Path = manifest.parent().as_ref();
-            workspace.insert(path.to_path_buf(), (vfs, db));
+
+            match load_workspace_at(manifest.as_ref(), &config, &load_config, &progress) {
+                Ok((db, vfs, _macro_server)) => {
+                    let path: &Path = manifest.parent().as_ref();
+                    workspace.insert(path.to_path_buf(), (vfs, db));
+                }
+                Err(err) => {
+                    log::error!("failed to load workspace for {}: {}", manifest, err);
+                }
+            }
         }
         Ok(RustAnalyzer { workspace })
     }

From 1135bf6bcd012e37b8fbddaac49f1b503ec5cd6d Mon Sep 17 00:00:00 2001
From: Arthur Baars <aibaars@github.com>
Date: Sun, 6 Oct 2024 13:13:55 +0200
Subject: [PATCH 291/347] Rust: improve QL test script

---
 .../generated/Module/Module.expected              |  1 -
 .../generated/Module/Module_getName.expected      |  1 -
 .../extractor-tests/generated/Name/Name.expected  |  1 -
 .../generated/Name/Name_getText.expected          |  1 -
 .../generated/SourceFile/SourceFile.expected      |  2 +-
 .../SourceFile/SourceFile_getItem.expected        |  3 +--
 .../CONSISTENCY/ExtractionConsistency.expected    | 10 +++++-----
 rust/ql/test/extractor-tests/utf8/ast.expected    | 14 ++++++--------
 .../query-tests/diagnostics/LinesOfCode.expected  |  2 +-
 .../diagnostics/LinesOfUserCode.expected          |  2 +-
 .../diagnostics/LinesOfUserCodeInFiles.expected   |  2 +-
 .../query-tests/diagnostics/SummaryStats.expected |  6 +++---
 rust/tools/qltest.sh                              | 15 ++++++++++++++-
 13 files changed, 33 insertions(+), 27 deletions(-)

diff --git a/rust/ql/test/extractor-tests/generated/Module/Module.expected b/rust/ql/test/extractor-tests/generated/Module/Module.expected
index eceff2ab4f4b..2020ab72dc17 100644
--- a/rust/ql/test/extractor-tests/generated/Module/Module.expected
+++ b/rust/ql/test/extractor-tests/generated/Module/Module.expected
@@ -1,4 +1,3 @@
 | gen_module.rs:3:1:4:8 | Module | getNumberOfAttrs: | 0 | hasItemList: | no | hasName: | yes | hasVisibility: | no |
 | gen_module.rs:5:1:7:1 | Module | getNumberOfAttrs: | 0 | hasItemList: | yes | hasName: | yes | hasVisibility: | no |
 | lib.rs:2:1:2:15 | Module | getNumberOfAttrs: | 0 | hasItemList: | no | hasName: | yes | hasVisibility: | no |
-| lib.rs:3:1:3:8 | Module | getNumberOfAttrs: | 0 | hasItemList: | no | hasName: | yes | hasVisibility: | no |
diff --git a/rust/ql/test/extractor-tests/generated/Module/Module_getName.expected b/rust/ql/test/extractor-tests/generated/Module/Module_getName.expected
index eefe68515f02..3a8692beec65 100644
--- a/rust/ql/test/extractor-tests/generated/Module/Module_getName.expected
+++ b/rust/ql/test/extractor-tests/generated/Module/Module_getName.expected
@@ -1,4 +1,3 @@
 | gen_module.rs:3:1:4:8 | Module | gen_module.rs:4:5:4:7 | Name |
 | gen_module.rs:5:1:7:1 | Module | gen_module.rs:5:5:5:7 | Name |
 | lib.rs:2:1:2:15 | Module | lib.rs:2:5:2:14 | Name |
-| lib.rs:3:1:3:8 | Module | lib.rs:3:5:3:7 | Name |
diff --git a/rust/ql/test/extractor-tests/generated/Name/Name.expected b/rust/ql/test/extractor-tests/generated/Name/Name.expected
index 5a4e3270939b..556c1dff2dde 100644
--- a/rust/ql/test/extractor-tests/generated/Name/Name.expected
+++ b/rust/ql/test/extractor-tests/generated/Name/Name.expected
@@ -1,3 +1,2 @@
 | gen_name.rs:3:4:3:12 | Name | hasText: | yes |
 | lib.rs:2:5:2:12 | Name | hasText: | yes |
-| lib.rs:3:5:3:7 | Name | hasText: | yes |
diff --git a/rust/ql/test/extractor-tests/generated/Name/Name_getText.expected b/rust/ql/test/extractor-tests/generated/Name/Name_getText.expected
index 70cc00fa56bf..89623f2108e4 100644
--- a/rust/ql/test/extractor-tests/generated/Name/Name_getText.expected
+++ b/rust/ql/test/extractor-tests/generated/Name/Name_getText.expected
@@ -1,3 +1,2 @@
 | gen_name.rs:3:4:3:12 | Name | test_name |
 | lib.rs:2:5:2:12 | Name | gen_name |
-| lib.rs:3:5:3:7 | Name | lib |
diff --git a/rust/ql/test/extractor-tests/generated/SourceFile/SourceFile.expected b/rust/ql/test/extractor-tests/generated/SourceFile/SourceFile.expected
index 4abf0fd0df11..5c1ad52bfc39 100644
--- a/rust/ql/test/extractor-tests/generated/SourceFile/SourceFile.expected
+++ b/rust/ql/test/extractor-tests/generated/SourceFile/SourceFile.expected
@@ -1,2 +1,2 @@
 | gen_source_file.rs:1:1:6:2 | SourceFile | getNumberOfAttrs: | 0 | getNumberOfItems: | 1 |
-| lib.rs:1:1:3:9 | SourceFile | getNumberOfAttrs: | 0 | getNumberOfItems: | 2 |
+| lib.rs:1:1:2:21 | SourceFile | getNumberOfAttrs: | 0 | getNumberOfItems: | 1 |
diff --git a/rust/ql/test/extractor-tests/generated/SourceFile/SourceFile_getItem.expected b/rust/ql/test/extractor-tests/generated/SourceFile/SourceFile_getItem.expected
index 10429cbab437..aba10e75baa9 100644
--- a/rust/ql/test/extractor-tests/generated/SourceFile/SourceFile_getItem.expected
+++ b/rust/ql/test/extractor-tests/generated/SourceFile/SourceFile_getItem.expected
@@ -1,3 +1,2 @@
 | gen_source_file.rs:1:1:6:2 | SourceFile | 0 | gen_source_file.rs:3:1:6:1 | test_source_file |
-| lib.rs:1:1:3:9 | SourceFile | 0 | lib.rs:2:1:2:20 | Module |
-| lib.rs:1:1:3:9 | SourceFile | 1 | lib.rs:3:1:3:8 | Module |
+| lib.rs:1:1:2:21 | SourceFile | 0 | lib.rs:2:1:2:20 | Module |
diff --git a/rust/ql/test/extractor-tests/utf8/CONSISTENCY/ExtractionConsistency.expected b/rust/ql/test/extractor-tests/utf8/CONSISTENCY/ExtractionConsistency.expected
index 54fb69c68140..44971e7dcf36 100644
--- a/rust/ql/test/extractor-tests/utf8/CONSISTENCY/ExtractionConsistency.expected
+++ b/rust/ql/test/extractor-tests/utf8/CONSISTENCY/ExtractionConsistency.expected
@@ -1,5 +1,5 @@
-| lib.rs:3:9:3:8 | expected `;` or `{` |
-| lib.rs:3:9:3:8 | expected an item |
-| lib.rs:3:10:3:21 | macro expansion failed: could not resolve macro 'identifiers' |
-| lib.rs:3:21:3:20 | expected BANG |
-| lib.rs:3:21:3:20 | expected `{`, `[`, `(` |
+| lib.rs:2:9:2:8 | expected `;` or `{` |
+| lib.rs:2:9:2:8 | expected an item |
+| lib.rs:2:10:2:21 | macro expansion failed: could not resolve macro 'identifiers' |
+| lib.rs:2:21:2:20 | expected BANG |
+| lib.rs:2:21:2:20 | expected `{`, `[`, `(` |
diff --git a/rust/ql/test/extractor-tests/utf8/ast.expected b/rust/ql/test/extractor-tests/utf8/ast.expected
index 5f353287fbb1..39fb19f1b04e 100644
--- a/rust/ql/test/extractor-tests/utf8/ast.expected
+++ b/rust/ql/test/extractor-tests/utf8/ast.expected
@@ -1,12 +1,10 @@
-| lib.rs:1:1:3:22 | SourceFile |
+| lib.rs:1:1:2:22 | SourceFile |
 | lib.rs:2:1:2:8 | Module |
-| lib.rs:2:5:2:7 | Name |
-| lib.rs:3:1:3:8 | Module |
-| lib.rs:3:5:3:8 | Name |
-| lib.rs:3:10:3:20 | NameRef |
-| lib.rs:3:10:3:20 | Path |
-| lib.rs:3:10:3:20 | PathSegment |
-| lib.rs:3:10:3:21 | MacroCall |
+| lib.rs:2:5:2:8 | Name |
+| lib.rs:2:10:2:20 | NameRef |
+| lib.rs:2:10:2:20 | Path |
+| lib.rs:2:10:2:20 | PathSegment |
+| lib.rs:2:10:2:21 | MacroCall |
 | utf8-identifiers.rs:1:1:4:6 | foo |
 | utf8-identifiers.rs:1:1:12:2 | SourceFile |
 | utf8-identifiers.rs:1:4:1:6 | Name |
diff --git a/rust/ql/test/query-tests/diagnostics/LinesOfCode.expected b/rust/ql/test/query-tests/diagnostics/LinesOfCode.expected
index bf709e1ddc4d..6facd293859d 100644
--- a/rust/ql/test/query-tests/diagnostics/LinesOfCode.expected
+++ b/rust/ql/test/query-tests/diagnostics/LinesOfCode.expected
@@ -1 +1 @@
-| 61 |
+| 59 |
diff --git a/rust/ql/test/query-tests/diagnostics/LinesOfUserCode.expected b/rust/ql/test/query-tests/diagnostics/LinesOfUserCode.expected
index bf709e1ddc4d..6facd293859d 100644
--- a/rust/ql/test/query-tests/diagnostics/LinesOfUserCode.expected
+++ b/rust/ql/test/query-tests/diagnostics/LinesOfUserCode.expected
@@ -1 +1 @@
-| 61 |
+| 59 |
diff --git a/rust/ql/test/query-tests/diagnostics/LinesOfUserCodeInFiles.expected b/rust/ql/test/query-tests/diagnostics/LinesOfUserCodeInFiles.expected
index b93473f7e04a..fe63f68abd8b 100644
--- a/rust/ql/test/query-tests/diagnostics/LinesOfUserCodeInFiles.expected
+++ b/rust/ql/test/query-tests/diagnostics/LinesOfUserCodeInFiles.expected
@@ -1,7 +1,7 @@
 | my_struct.rs:0:0:0:0 | my_struct.rs | 20 |
 | comments.rs:0:0:0:0 | comments.rs | 13 |
 | main.rs:0:0:0:0 | main.rs | 8 |
-| lib.rs:0:0:0:0 | lib.rs | 7 |
 | my_macro.rs:0:0:0:0 | my_macro.rs | 7 |
+| lib.rs:0:0:0:0 | lib.rs | 5 |
 | does_not_compile.rs:0:0:0:0 | does_not_compile.rs | 3 |
 | error.rs:0:0:0:0 | error.rs | 3 |
diff --git a/rust/ql/test/query-tests/diagnostics/SummaryStats.expected b/rust/ql/test/query-tests/diagnostics/SummaryStats.expected
index 8367d199669e..03f12b16d8dc 100644
--- a/rust/ql/test/query-tests/diagnostics/SummaryStats.expected
+++ b/rust/ql/test/query-tests/diagnostics/SummaryStats.expected
@@ -1,5 +1,5 @@
-| Elements extracted | 380 |
+| Elements extracted | 376 |
 | Elements unextracted | 0 |
 | Files extracted | 7 |
-| Lines of code extracted | 61 |
-| Lines of user code extracted | 61 |
+| Lines of code extracted | 59 |
+| Lines of user code extracted | 59 |
diff --git a/rust/tools/qltest.sh b/rust/tools/qltest.sh
index 09c3c9ab1312..58c08a41e01e 100755
--- a/rust/tools/qltest.sh
+++ b/rust/tools/qltest.sh
@@ -9,7 +9,13 @@ QLTEST_LOG="$CODEQL_EXTRACTOR_RUST_LOG_DIR"/qltest.log
 EXTRACTOR="$CODEQL_EXTRACTOR_RUST_ROOT/tools/$CODEQL_PLATFORM/extractor"
 echo > lib.rs
 for src in *.rs; do
-  echo "mod ${src%.rs};" >> lib.rs
+  if [[ "$src" == "lib.rs" ]]; then
+    continue
+  elif [[ "$src" == "main.rs" ]]; then
+    continue
+  else
+    echo "mod ${src%.rs};" >> lib.rs
+  fi
 done
 cat > Cargo.toml << EOF
 [workspace]
@@ -20,6 +26,13 @@ edition="2021"
 [lib]
 path="lib.rs"
 EOF
+if [[ -f "main.rs" ]]; then
+cat >> Cargo.toml << EOF
+[[bin]]
+name = "main"
+path = "main.rs"
+EOF
+fi
 "$EXTRACTOR" *.rs >> "$QLTEST_LOG"
 if [[ "$?" != 0 ]]; then
   cat "$QLTEST_LOG" # Show compiler errors on extraction failure

From f70f8a3536dd1a3542ba852bd20dce20508a0b89 Mon Sep 17 00:00:00 2001
From: Arthur Baars <aibaars@github.com>
Date: Sun, 6 Oct 2024 13:58:07 +0200
Subject: [PATCH 292/347] Rust: fix utf8 test

---
 .../ExtractionConsistency.expected            |  5 --
 .../ql/test/extractor-tests/utf8/ast.expected | 68 +++++++++----------
 ...tf8-identifiers.rs => utf8_identifiers.rs} |  0
 3 files changed, 32 insertions(+), 41 deletions(-)
 delete mode 100644 rust/ql/test/extractor-tests/utf8/CONSISTENCY/ExtractionConsistency.expected
 rename rust/ql/test/extractor-tests/utf8/{utf8-identifiers.rs => utf8_identifiers.rs} (100%)

diff --git a/rust/ql/test/extractor-tests/utf8/CONSISTENCY/ExtractionConsistency.expected b/rust/ql/test/extractor-tests/utf8/CONSISTENCY/ExtractionConsistency.expected
deleted file mode 100644
index 44971e7dcf36..000000000000
--- a/rust/ql/test/extractor-tests/utf8/CONSISTENCY/ExtractionConsistency.expected
+++ /dev/null
@@ -1,5 +0,0 @@
-| lib.rs:2:9:2:8 | expected `;` or `{` |
-| lib.rs:2:9:2:8 | expected an item |
-| lib.rs:2:10:2:21 | macro expansion failed: could not resolve macro 'identifiers' |
-| lib.rs:2:21:2:20 | expected BANG |
-| lib.rs:2:21:2:20 | expected `{`, `[`, `(` |
diff --git a/rust/ql/test/extractor-tests/utf8/ast.expected b/rust/ql/test/extractor-tests/utf8/ast.expected
index 39fb19f1b04e..b0a4dfe00912 100644
--- a/rust/ql/test/extractor-tests/utf8/ast.expected
+++ b/rust/ql/test/extractor-tests/utf8/ast.expected
@@ -1,37 +1,33 @@
 | lib.rs:1:1:2:22 | SourceFile |
-| lib.rs:2:1:2:8 | Module |
-| lib.rs:2:5:2:8 | Name |
-| lib.rs:2:10:2:20 | NameRef |
-| lib.rs:2:10:2:20 | Path |
-| lib.rs:2:10:2:20 | PathSegment |
-| lib.rs:2:10:2:21 | MacroCall |
-| utf8-identifiers.rs:1:1:4:6 | foo |
-| utf8-identifiers.rs:1:1:12:2 | SourceFile |
-| utf8-identifiers.rs:1:4:1:6 | Name |
-| utf8-identifiers.rs:1:7:4:1 | GenericParamList |
-| utf8-identifiers.rs:2:5:2:6 | Lifetime |
-| utf8-identifiers.rs:2:5:2:6 | LifetimeParam |
-| utf8-identifiers.rs:3:5:3:5 | Name |
-| utf8-identifiers.rs:3:5:3:5 | TypeParam |
-| utf8-identifiers.rs:4:2:4:3 | ParamList |
-| utf8-identifiers.rs:4:5:4:6 | BlockExpr |
-| utf8-identifiers.rs:4:5:4:6 | StmtList |
-| utf8-identifiers.rs:6:1:8:1 | Struct |
-| utf8-identifiers.rs:6:8:6:8 | Name |
-| utf8-identifiers.rs:6:10:8:1 | RecordFieldList |
-| utf8-identifiers.rs:7:5:7:5 | Name |
-| utf8-identifiers.rs:7:5:7:13 | RecordField |
-| utf8-identifiers.rs:7:9:7:13 | NameRef |
-| utf8-identifiers.rs:7:9:7:13 | Path |
-| utf8-identifiers.rs:7:9:7:13 | PathSegment |
-| utf8-identifiers.rs:7:9:7:13 | PathType |
-| utf8-identifiers.rs:10:1:10:3 | Visibility |
-| utf8-identifiers.rs:10:1:12:1 | main |
-| utf8-identifiers.rs:10:8:10:11 | Name |
-| utf8-identifiers.rs:10:12:10:13 | ParamList |
-| utf8-identifiers.rs:10:15:12:1 | BlockExpr |
-| utf8-identifiers.rs:10:15:12:1 | StmtList |
-| utf8-identifiers.rs:11:5:11:24 | LetStmt |
-| utf8-identifiers.rs:11:9:11:9 | Name |
-| utf8-identifiers.rs:11:9:11:9 | \u03b1 |
-| utf8-identifiers.rs:11:14:11:23 | 0.00001f64 |
+| lib.rs:2:1:2:21 | Module |
+| lib.rs:2:5:2:20 | Name |
+| utf8_identifiers.rs:1:1:4:6 | foo |
+| utf8_identifiers.rs:1:1:12:2 | SourceFile |
+| utf8_identifiers.rs:1:4:1:6 | Name |
+| utf8_identifiers.rs:1:7:4:1 | GenericParamList |
+| utf8_identifiers.rs:2:5:2:6 | Lifetime |
+| utf8_identifiers.rs:2:5:2:6 | LifetimeParam |
+| utf8_identifiers.rs:3:5:3:5 | Name |
+| utf8_identifiers.rs:3:5:3:5 | TypeParam |
+| utf8_identifiers.rs:4:2:4:3 | ParamList |
+| utf8_identifiers.rs:4:5:4:6 | BlockExpr |
+| utf8_identifiers.rs:4:5:4:6 | StmtList |
+| utf8_identifiers.rs:6:1:8:1 | Struct |
+| utf8_identifiers.rs:6:8:6:8 | Name |
+| utf8_identifiers.rs:6:10:8:1 | RecordFieldList |
+| utf8_identifiers.rs:7:5:7:5 | Name |
+| utf8_identifiers.rs:7:5:7:13 | RecordField |
+| utf8_identifiers.rs:7:9:7:13 | NameRef |
+| utf8_identifiers.rs:7:9:7:13 | Path |
+| utf8_identifiers.rs:7:9:7:13 | PathSegment |
+| utf8_identifiers.rs:7:9:7:13 | PathType |
+| utf8_identifiers.rs:10:1:10:3 | Visibility |
+| utf8_identifiers.rs:10:1:12:1 | main |
+| utf8_identifiers.rs:10:8:10:11 | Name |
+| utf8_identifiers.rs:10:12:10:13 | ParamList |
+| utf8_identifiers.rs:10:15:12:1 | BlockExpr |
+| utf8_identifiers.rs:10:15:12:1 | StmtList |
+| utf8_identifiers.rs:11:5:11:24 | LetStmt |
+| utf8_identifiers.rs:11:9:11:9 | Name |
+| utf8_identifiers.rs:11:9:11:9 | \u03b1 |
+| utf8_identifiers.rs:11:14:11:23 | 0.00001f64 |
diff --git a/rust/ql/test/extractor-tests/utf8/utf8-identifiers.rs b/rust/ql/test/extractor-tests/utf8/utf8_identifiers.rs
similarity index 100%
rename from rust/ql/test/extractor-tests/utf8/utf8-identifiers.rs
rename to rust/ql/test/extractor-tests/utf8/utf8_identifiers.rs

From 58d2c71c209048699623b35ea64f7b606810d150 Mon Sep 17 00:00:00 2001
From: Arthur Baars <aibaars@github.com>
Date: Mon, 7 Oct 2024 17:57:49 +0200
Subject: [PATCH 293/347] Rust: load files from disk ourselves

This avoids problems with files containing invalid utf-8 data, which may cause
panic's like:
```
 thread 'main' panicked at external/rules_rust~~_crate~ql~~r~r__ra_ap_salsa-0.0.232/src/input.rs:91:32:
   no value set for CompressedFileTextQuery(FileId(2429))
   stack backtrace:
      0: rust_begin_unwind
                at /rustc/eeb90cda1969383f56a2637cbd3037bdf598841c/library/std/src/panicking.rs:665:5
      1: core::panicking::panic_fmt
                at /rustc/eeb90cda1969383f56a2637cbd3037bdf598841c/library/core/src/panicking.rs:74:14
      2: <salsa::input::InputStorage<Q> as salsa::plumbing::QueryStorageOps<Q>>::fetch
      3: <DB as ra_ap_base_db::SourceDatabase>::compressed_file_text::__shim
      4: <ra_ap_base_db::FileTextQuery as salsa::plumbing::QueryFunction>::execute
      5: salsa::Cycle::catch
      6: salsa::derived_lru::slot::Slot<Q,MP>::execute
      7: salsa::derived_lru::slot::Slot<Q,MP>::read
      8: <salsa::derived_lru::DerivedStorage<Q,MP> as salsa::plumbing::QueryStorageOps<Q>>::fetch
      9: <DB as ra_ap_base_db::SourceDatabase>::file_text::__shim
     10: <DB as ra_ap_base_db::SourceDatabase>::file_text
     11: <ra_ap_base_db::ParseQuery as salsa::plumbing::QueryFunction>::execute
     12: salsa::Cycle::catch
     13: salsa::derived_lru::slot::Slot<Q,MP>::execute
     14: salsa::derived_lru::slot::Slot<Q,MP>::read
     15: <salsa::derived_lru::DerivedStorage<Q,MP> as salsa::plumbing::QueryStorageOps<Q>>::fetch
     16: <DB as ra_ap_base_db::SourceDatabase>::parse::__shim
     17: <DB as ra_ap_base_db::SourceDatabase>::parse
     18: ra_ap_hir::semantics::SemanticsImpl::parse
     19: single_arch_extractor::main
```
---
 rust/extractor/src/main.rs          |  6 ++--
 rust/extractor/src/rust_analyzer.rs | 50 +++++++++++++++++------------
 2 files changed, 33 insertions(+), 23 deletions(-)

diff --git a/rust/extractor/src/main.rs b/rust/extractor/src/main.rs
index d9bb94f17a21..f59650b26eb2 100644
--- a/rust/extractor/src/main.rs
+++ b/rust/extractor/src/main.rs
@@ -8,7 +8,7 @@ mod translate;
 pub mod trap;
 
 fn extract(
-    rust_analyzer: &rust_analyzer::RustAnalyzer,
+    rust_analyzer: &mut rust_analyzer::RustAnalyzer,
     traps: &trap::TrapFileProvider,
     file: std::path::PathBuf,
 ) -> anyhow::Result<()> {
@@ -49,7 +49,7 @@ fn main() -> anyhow::Result<()> {
         .module(module_path!())
         .verbosity(2 + cfg.verbose as usize)
         .init()?;
-    let rust_analyzer = rust_analyzer::RustAnalyzer::new(&cfg)?;
+    let mut rust_analyzer = rust_analyzer::RustAnalyzer::new(&cfg)?;
 
     let traps = trap::TrapFileProvider::new(&cfg).context("failed to set up trap files")?;
     let archiver = archive::Archiver {
@@ -59,7 +59,7 @@ fn main() -> anyhow::Result<()> {
         let file = std::path::absolute(&file).unwrap_or(file);
         let file = std::fs::canonicalize(&file).unwrap_or(file);
         archiver.archive(&file);
-        extract(&rust_analyzer, &traps, file)?;
+        extract(&mut rust_analyzer, &traps, file)?;
     }
 
     Ok(())
diff --git a/rust/extractor/src/rust_analyzer.rs b/rust/extractor/src/rust_analyzer.rs
index 4c8a76639954..3c07e5000f72 100644
--- a/rust/extractor/src/rust_analyzer.rs
+++ b/rust/extractor/src/rust_analyzer.rs
@@ -3,6 +3,7 @@ use anyhow::Context;
 use itertools::Itertools;
 use log::info;
 use ra_ap_base_db::SourceDatabase;
+use ra_ap_base_db::SourceDatabaseFileInputExt;
 use ra_ap_hir::Semantics;
 use ra_ap_ide_db::RootDatabase;
 use ra_ap_load_cargo::{load_workspace_at, LoadCargoConfig, ProcMacroServerChoice};
@@ -59,7 +60,7 @@ impl RustAnalyzer {
         Ok(RustAnalyzer { workspace })
     }
     pub fn parse(
-        &self,
+        &mut self,
         path: &PathBuf,
     ) -> (
         SourceFile,
@@ -68,43 +69,52 @@ impl RustAnalyzer {
         Option<EditionedFileId>,
         Option<Semantics<'_, RootDatabase>>,
     ) {
+        let mut errors = Vec::new();
+        let input = match std::fs::read(path) {
+            Ok(data) => data,
+            Err(e) => {
+                errors.push(SyntaxError::new(
+                    format!("Could not read {}: {}", path.to_string_lossy(), e),
+                    TextRange::empty(TextSize::default()),
+                ));
+                vec![]
+            }
+        };
+        let (input, err) = from_utf8_lossy(&input);
+
         let mut p = path.as_path();
         while let Some(parent) = p.parent() {
             p = parent;
-            if let Some((vfs, db)) = self.workspace.get(parent) {
+            if self.workspace.contains_key(parent) {
+                let (vfs, db) = self.workspace.get_mut(parent).unwrap();
                 if let Some(file_id) = Utf8PathBuf::from_path_buf(path.to_path_buf())
                     .ok()
                     .and_then(|x| AbsPathBuf::try_from(x).ok())
                     .map(VfsPath::from)
                     .and_then(|x| vfs.file_id(&x))
                 {
+                    db.set_file_text(file_id, &input);
                     let semi = Semantics::new(db);
-                    let file_id = EditionedFileId::current_edition(file_id);
 
-                    return (
-                        semi.parse(file_id),
-                        db.file_text(file_id.into()),
+                    let file_id = EditionedFileId::current_edition(file_id);
+                    let source_file = semi.parse(file_id);
+                    errors.extend(
                         db.parse_errors(file_id)
-                            .map(|x| x.to_vec())
-                            .unwrap_or_default(),
+                            .into_iter()
+                            .flat_map(|x| x.to_vec()),
+                    );
+                    return (
+                        source_file,
+                        input.as_ref().into(),
+                        errors,
                         Some(file_id),
                         Some(semi),
                     );
+                } else {
+                    break;
                 }
             }
         }
-        let mut errors = Vec::new();
-        let input = match std::fs::read(path) {
-            Ok(data) => data,
-            Err(e) => {
-                errors.push(SyntaxError::new(
-                    format!("Could not read {}: {}", path.to_string_lossy(), e),
-                    TextRange::empty(TextSize::default()),
-                ));
-                vec![]
-            }
-        };
-        let (input, err) = from_utf8_lossy(&input);
         let parse = ra_ap_syntax::ast::SourceFile::parse(&input, Edition::CURRENT);
         errors.extend(parse.errors());
         errors.extend(err);

From 8372a2e562a9251c521afe5a1c5586c74284b60c Mon Sep 17 00:00:00 2001
From: Arthur Baars <aibaars@github.com>
Date: Mon, 7 Oct 2024 18:32:20 +0200
Subject: [PATCH 294/347] Rust: ensure error and token locations are valid

The locations are "clipped" to the ranges of the parent node of a token,
and the root node of the parse tree for errors.
---
 rust/ast-generator/src/main.rs            |   2 +-
 rust/extractor/src/main.rs                |   2 +-
 rust/extractor/src/translate/base.rs      |  75 ++++--
 rust/extractor/src/translate/generated.rs | 282 +++++++++++-----------
 4 files changed, 193 insertions(+), 168 deletions(-)

diff --git a/rust/ast-generator/src/main.rs b/rust/ast-generator/src/main.rs
index 3a248df4a190..44c067a18bcd 100644
--- a/rust/ast-generator/src/main.rs
+++ b/rust/ast-generator/src/main.rs
@@ -522,7 +522,7 @@ impl Translator<'_> {{
         writeln!(buf, "        self.emit_location(label, &node);")?;
         writeln!(
             buf,
-            "        self.emit_tokens(label.into(), node.syntax().children_with_tokens());"
+            "        self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());"
         )?;
         writeln!(buf, "        label")?;
 
diff --git a/rust/extractor/src/main.rs b/rust/extractor/src/main.rs
index f59650b26eb2..56d84176c8c5 100644
--- a/rust/extractor/src/main.rs
+++ b/rust/extractor/src/main.rs
@@ -27,7 +27,7 @@ fn extract(
     );
 
     for err in parse_errors {
-        translator.emit_parse_error(&err);
+        translator.emit_parse_error(&ast, &err);
     }
     let no_location = (LineCol { line: 0, col: 0 }, LineCol { line: 0, col: 0 });
     if translator.semi.is_none() {
diff --git a/rust/extractor/src/translate/base.rs b/rust/extractor/src/translate/base.rs
index 36d39d203841..ce0732c7c45e 100644
--- a/rust/extractor/src/translate/base.rs
+++ b/rust/extractor/src/translate/base.rs
@@ -139,9 +139,21 @@ impl<'a> Translator<'a> {
             );
         }
     }
-    pub fn emit_location_token(&mut self, label: Label<generated::Token>, token: &SyntaxToken) {
-        let (start, end) = self.location(token.text_range());
-        self.trap.emit_location(self.label, label, start, end)
+    pub fn emit_location_token(
+        &mut self,
+        label: Label<generated::Token>,
+        parent: &impl ast::AstNode,
+        token: &SyntaxToken,
+    ) {
+        let parent_range = parent.syntax().text_range();
+        let token_range = token.text_range();
+        if let Some(clipped_range) = token_range.intersect(parent_range) {
+            if let Some(parent_range2) = self.text_range_for_node(parent) {
+                let token_range = clipped_range + parent_range2.start() - parent_range.start();
+                let (start, end) = self.location(token_range);
+                self.trap.emit_location(self.label, label, start, end)
+            }
+        }
     }
     pub fn emit_diagnostic(
         &mut self,
@@ -175,20 +187,30 @@ impl<'a> Translator<'a> {
             location,
         );
     }
-    pub fn emit_parse_error(&mut self, err: &SyntaxError) {
-        let location = self.location(err.range());
-        let message = err.to_string();
-        self.emit_diagnostic(
-            DiagnosticSeverity::Warning,
-            "parse_error".to_owned(),
-            message.clone(),
-            message,
-            location,
-        );
+    pub fn emit_parse_error(&mut self, owner: &impl ast::AstNode, err: &SyntaxError) {
+        let owner_range: TextRange = owner.syntax().text_range();
+        let err_range = err.range();
+        if let Some(owner_range2) = self.text_range_for_node(owner) {
+            let location = if let Some(clipped_range) = err_range.intersect(owner_range) {
+                let err_range = clipped_range + owner_range2.start() - owner_range.start();
+                self.location(err_range)
+            } else {
+                self.location(owner_range2)
+            };
+            let message = err.to_string();
+            self.emit_diagnostic(
+                DiagnosticSeverity::Warning,
+                "parse_error".to_owned(),
+                message.clone(),
+                message,
+                location,
+            );
+        }
     }
     pub fn emit_tokens(
         &mut self,
-        parent: Label<generated::AstNode>,
+        parent_node: &impl ast::AstNode,
+        parent_label: Label<generated::AstNode>,
         children: SyntaxElementChildren,
     ) {
         for child in children {
@@ -196,10 +218,10 @@ impl<'a> Translator<'a> {
                 if token.kind() == SyntaxKind::COMMENT {
                     let label = self.trap.emit(generated::Comment {
                         id: TrapId::Star,
-                        parent,
+                        parent: parent_label,
                         text: token.text().to_owned(),
                     });
-                    self.emit_location_token(label.into(), &token);
+                    self.emit_location_token(label.into(), parent_node, &token);
                 }
             }
         }
@@ -230,11 +252,11 @@ impl<'a> Translator<'a> {
                                     .get_erased(err.span().anchor.ast_id)
                                     .text_range()
                                     .start();
-                            self.emit_parse_error(&SyntaxError::new(message, location));
+                            self.emit_parse_error(mcall, &SyntaxError::new(message, location));
                         };
                     }
                     for err in value.value.iter() {
-                        self.emit_parse_error(err);
+                        self.emit_parse_error(mcall, err);
                     }
                 }
                 let expand_to = ra_ap_hir_expand::ExpandTo::from_call_site(mcall);
@@ -261,7 +283,7 @@ impl<'a> Translator<'a> {
                     MacroCall::emit_expanded(label, value, &mut self.trap.writer);
                 } else {
                     let range = self.text_range_for_node(mcall);
-                    self.emit_parse_error(&SyntaxError::new(
+                    self.emit_parse_error(mcall, &SyntaxError::new(
                         format!(
                             "macro expansion failed: the macro '{}' expands to {:?} but a {:?} was expected",
                             mcall.path().map(|p| p.to_string()).unwrap_or_default(),
@@ -273,13 +295,16 @@ impl<'a> Translator<'a> {
             } else {
                 let range = self.text_range_for_node(mcall);
 
-                self.emit_parse_error(&SyntaxError::new(
-                    format!(
-                        "macro expansion failed: could not resolve macro '{}'",
-                        mcall.path().map(|p| p.to_string()).unwrap_or_default()
+                self.emit_parse_error(
+                    mcall,
+                    &SyntaxError::new(
+                        format!(
+                            "macro expansion failed: could not resolve macro '{}'",
+                            mcall.path().map(|p| p.to_string()).unwrap_or_default()
+                        ),
+                        range.unwrap_or_else(|| TextRange::empty(TextSize::from(0))),
                     ),
-                    range.unwrap_or_else(|| TextRange::empty(TextSize::from(0))),
-                ));
+                );
             }
         }
     }
diff --git a/rust/extractor/src/translate/generated.rs b/rust/extractor/src/translate/generated.rs
index b969abd4771a..8aaba113e6da 100644
--- a/rust/extractor/src/translate/generated.rs
+++ b/rust/extractor/src/translate/generated.rs
@@ -179,7 +179,7 @@ impl Translator<'_> {
             abi_string,
         });
         self.emit_location(label, &node);
-        self.emit_tokens(label.into(), node.syntax().children_with_tokens());
+        self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
         label
     }
 
@@ -190,7 +190,7 @@ impl Translator<'_> {
             args,
         });
         self.emit_location(label, &node);
-        self.emit_tokens(label.into(), node.syntax().children_with_tokens());
+        self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
         label
     }
 
@@ -203,7 +203,7 @@ impl Translator<'_> {
             exprs,
         });
         self.emit_location(label, &node);
-        self.emit_tokens(label.into(), node.syntax().children_with_tokens());
+        self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
         label
     }
 
@@ -216,7 +216,7 @@ impl Translator<'_> {
             ty,
         });
         self.emit_location(label, &node);
-        self.emit_tokens(label.into(), node.syntax().children_with_tokens());
+        self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
         label
     }
 
@@ -229,7 +229,7 @@ impl Translator<'_> {
             expr,
         });
         self.emit_location(label, &node);
-        self.emit_tokens(label.into(), node.syntax().children_with_tokens());
+        self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
         label
     }
 
@@ -242,7 +242,7 @@ impl Translator<'_> {
             attrs,
         });
         self.emit_location(label, &node);
-        self.emit_tokens(label.into(), node.syntax().children_with_tokens());
+        self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
         label
     }
 
@@ -267,7 +267,7 @@ impl Translator<'_> {
             type_bound_list,
         });
         self.emit_location(label, &node);
-        self.emit_tokens(label.into(), node.syntax().children_with_tokens());
+        self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
         label
     }
 
@@ -278,7 +278,7 @@ impl Translator<'_> {
             meta,
         });
         self.emit_location(label, &node);
-        self.emit_tokens(label.into(), node.syntax().children_with_tokens());
+        self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
         label
     }
 
@@ -291,7 +291,7 @@ impl Translator<'_> {
             expr,
         });
         self.emit_location(label, &node);
-        self.emit_tokens(label.into(), node.syntax().children_with_tokens());
+        self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
         label
     }
 
@@ -304,7 +304,7 @@ impl Translator<'_> {
             expr,
         });
         self.emit_location(label, &node);
-        self.emit_tokens(label.into(), node.syntax().children_with_tokens());
+        self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
         label
     }
 
@@ -321,7 +321,7 @@ impl Translator<'_> {
             rhs,
         });
         self.emit_location(label, &node);
-        self.emit_tokens(label.into(), node.syntax().children_with_tokens());
+        self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
         label
     }
 
@@ -336,7 +336,7 @@ impl Translator<'_> {
             stmt_list,
         });
         self.emit_location(label, &node);
-        self.emit_tokens(label.into(), node.syntax().children_with_tokens());
+        self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
         label
     }
 
@@ -347,7 +347,7 @@ impl Translator<'_> {
             pat,
         });
         self.emit_location(label, &node);
-        self.emit_tokens(label.into(), node.syntax().children_with_tokens());
+        self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
         label
     }
 
@@ -362,7 +362,7 @@ impl Translator<'_> {
             lifetime,
         });
         self.emit_location(label, &node);
-        self.emit_tokens(label.into(), node.syntax().children_with_tokens());
+        self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
         label
     }
 
@@ -377,7 +377,7 @@ impl Translator<'_> {
             expr,
         });
         self.emit_location(label, &node);
-        self.emit_tokens(label.into(), node.syntax().children_with_tokens());
+        self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
         label
     }
 
@@ -392,7 +392,7 @@ impl Translator<'_> {
             ty,
         });
         self.emit_location(label, &node);
-        self.emit_tokens(label.into(), node.syntax().children_with_tokens());
+        self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
         label
     }
 
@@ -403,7 +403,7 @@ impl Translator<'_> {
             generic_param_list,
         });
         self.emit_location(label, &node);
-        self.emit_tokens(label.into(), node.syntax().children_with_tokens());
+        self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
         label
     }
 
@@ -422,7 +422,7 @@ impl Translator<'_> {
             ret_type,
         });
         self.emit_location(label, &node);
-        self.emit_tokens(label.into(), node.syntax().children_with_tokens());
+        self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
         label
     }
 
@@ -441,7 +441,7 @@ impl Translator<'_> {
             visibility,
         });
         self.emit_location(label, &node);
-        self.emit_tokens(label.into(), node.syntax().children_with_tokens());
+        self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
         label
     }
 
@@ -452,7 +452,7 @@ impl Translator<'_> {
             expr,
         });
         self.emit_location(label, &node);
-        self.emit_tokens(label.into(), node.syntax().children_with_tokens());
+        self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
         label
     }
 
@@ -463,7 +463,7 @@ impl Translator<'_> {
             block_expr,
         });
         self.emit_location(label, &node);
-        self.emit_tokens(label.into(), node.syntax().children_with_tokens());
+        self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
         label
     }
 
@@ -480,7 +480,7 @@ impl Translator<'_> {
             ty,
         });
         self.emit_location(label, &node);
-        self.emit_tokens(label.into(), node.syntax().children_with_tokens());
+        self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
         label
     }
 
@@ -493,7 +493,7 @@ impl Translator<'_> {
             lifetime,
         });
         self.emit_location(label, &node);
-        self.emit_tokens(label.into(), node.syntax().children_with_tokens());
+        self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
         label
     }
 
@@ -504,7 +504,7 @@ impl Translator<'_> {
             type_bound_list,
         });
         self.emit_location(label, &node);
-        self.emit_tokens(label.into(), node.syntax().children_with_tokens());
+        self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
         label
     }
 
@@ -525,7 +525,7 @@ impl Translator<'_> {
             where_clause,
         });
         self.emit_location(label, &node);
-        self.emit_tokens(label.into(), node.syntax().children_with_tokens());
+        self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
         label
     }
 
@@ -536,7 +536,7 @@ impl Translator<'_> {
             expr,
         });
         self.emit_location(label, &node);
-        self.emit_tokens(label.into(), node.syntax().children_with_tokens());
+        self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
         label
     }
 
@@ -551,7 +551,7 @@ impl Translator<'_> {
             extern_item_list,
         });
         self.emit_location(label, &node);
-        self.emit_tokens(label.into(), node.syntax().children_with_tokens());
+        self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
         label
     }
 
@@ -568,7 +568,7 @@ impl Translator<'_> {
             visibility,
         });
         self.emit_location(label, &node);
-        self.emit_tokens(label.into(), node.syntax().children_with_tokens());
+        self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
         label
     }
 
@@ -581,7 +581,7 @@ impl Translator<'_> {
             extern_items,
         });
         self.emit_location(label, &node);
-        self.emit_tokens(label.into(), node.syntax().children_with_tokens());
+        self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
         label
     }
 
@@ -596,7 +596,7 @@ impl Translator<'_> {
             name_ref,
         });
         self.emit_location(label, &node);
-        self.emit_tokens(label.into(), node.syntax().children_with_tokens());
+        self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
         label
     }
 
@@ -623,7 +623,7 @@ impl Translator<'_> {
             where_clause,
         });
         self.emit_location(label, &node);
-        self.emit_tokens(label.into(), node.syntax().children_with_tokens());
+        self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
         label
     }
 
@@ -638,7 +638,7 @@ impl Translator<'_> {
             ret_type,
         });
         self.emit_location(label, &node);
-        self.emit_tokens(label.into(), node.syntax().children_with_tokens());
+        self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
         label
     }
 
@@ -657,7 +657,7 @@ impl Translator<'_> {
             pat,
         });
         self.emit_location(label, &node);
-        self.emit_tokens(label.into(), node.syntax().children_with_tokens());
+        self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
         label
     }
 
@@ -670,7 +670,7 @@ impl Translator<'_> {
             ty,
         });
         self.emit_location(label, &node);
-        self.emit_tokens(label.into(), node.syntax().children_with_tokens());
+        self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
         label
     }
 
@@ -683,7 +683,7 @@ impl Translator<'_> {
             name,
         });
         self.emit_location(label, &node);
-        self.emit_tokens(label.into(), node.syntax().children_with_tokens());
+        self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
         label
     }
 
@@ -698,7 +698,7 @@ impl Translator<'_> {
             template,
         });
         self.emit_location(label, &node);
-        self.emit_tokens(label.into(), node.syntax().children_with_tokens());
+        self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
         label
     }
 
@@ -709,7 +709,7 @@ impl Translator<'_> {
             generic_args,
         });
         self.emit_location(label, &node);
-        self.emit_tokens(label.into(), node.syntax().children_with_tokens());
+        self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
         label
     }
 
@@ -720,7 +720,7 @@ impl Translator<'_> {
             generic_params,
         });
         self.emit_location(label, &node);
-        self.emit_tokens(label.into(), node.syntax().children_with_tokens());
+        self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
         label
     }
 
@@ -735,7 +735,7 @@ impl Translator<'_> {
             pat,
         });
         self.emit_location(label, &node);
-        self.emit_tokens(label.into(), node.syntax().children_with_tokens());
+        self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
         label
     }
 
@@ -752,7 +752,7 @@ impl Translator<'_> {
             then,
         });
         self.emit_location(label, &node);
-        self.emit_tokens(label.into(), node.syntax().children_with_tokens());
+        self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
         label
     }
 
@@ -775,7 +775,7 @@ impl Translator<'_> {
             where_clause,
         });
         self.emit_location(label, &node);
-        self.emit_tokens(label.into(), node.syntax().children_with_tokens());
+        self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
         label
     }
 
@@ -786,7 +786,7 @@ impl Translator<'_> {
             type_bound_list,
         });
         self.emit_location(label, &node);
-        self.emit_tokens(label.into(), node.syntax().children_with_tokens());
+        self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
         label
     }
 
@@ -801,7 +801,7 @@ impl Translator<'_> {
             index,
         });
         self.emit_location(label, &node);
-        self.emit_tokens(label.into(), node.syntax().children_with_tokens());
+        self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
         label
     }
 
@@ -810,7 +810,7 @@ impl Translator<'_> {
             id: TrapId::Star,
         });
         self.emit_location(label, &node);
-        self.emit_tokens(label.into(), node.syntax().children_with_tokens());
+        self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
         label
     }
 
@@ -823,7 +823,7 @@ impl Translator<'_> {
             items,
         });
         self.emit_location(label, &node);
-        self.emit_tokens(label.into(), node.syntax().children_with_tokens());
+        self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
         label
     }
 
@@ -834,7 +834,7 @@ impl Translator<'_> {
             lifetime,
         });
         self.emit_location(label, &node);
-        self.emit_tokens(label.into(), node.syntax().children_with_tokens());
+        self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
         label
     }
 
@@ -845,7 +845,7 @@ impl Translator<'_> {
             block_expr,
         });
         self.emit_location(label, &node);
-        self.emit_tokens(label.into(), node.syntax().children_with_tokens());
+        self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
         label
     }
 
@@ -860,7 +860,7 @@ impl Translator<'_> {
             pat,
         });
         self.emit_location(label, &node);
-        self.emit_tokens(label.into(), node.syntax().children_with_tokens());
+        self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
         label
     }
 
@@ -879,7 +879,7 @@ impl Translator<'_> {
             ty,
         });
         self.emit_location(label, &node);
-        self.emit_tokens(label.into(), node.syntax().children_with_tokens());
+        self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
         label
     }
 
@@ -890,7 +890,7 @@ impl Translator<'_> {
             text,
         });
         self.emit_location(label, &node);
-        self.emit_tokens(label.into(), node.syntax().children_with_tokens());
+        self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
         label
     }
 
@@ -901,7 +901,7 @@ impl Translator<'_> {
             lifetime,
         });
         self.emit_location(label, &node);
-        self.emit_tokens(label.into(), node.syntax().children_with_tokens());
+        self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
         label
     }
 
@@ -916,7 +916,7 @@ impl Translator<'_> {
             type_bound_list,
         });
         self.emit_location(label, &node);
-        self.emit_tokens(label.into(), node.syntax().children_with_tokens());
+        self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
         label
     }
 
@@ -929,7 +929,7 @@ impl Translator<'_> {
             text_value,
         });
         self.emit_location(label, &node);
-        self.emit_tokens(label.into(), node.syntax().children_with_tokens());
+        self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
         label
     }
 
@@ -940,7 +940,7 @@ impl Translator<'_> {
             literal,
         });
         self.emit_location(label, &node);
-        self.emit_tokens(label.into(), node.syntax().children_with_tokens());
+        self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
         label
     }
 
@@ -955,7 +955,7 @@ impl Translator<'_> {
             loop_body,
         });
         self.emit_location(label, &node);
-        self.emit_tokens(label.into(), node.syntax().children_with_tokens());
+        self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
         label
     }
 
@@ -971,7 +971,7 @@ impl Translator<'_> {
         });
         self.emit_location(label, &node);
         self.extract_macro_call_expanded(&node, label);
-        self.emit_tokens(label.into(), node.syntax().children_with_tokens());
+        self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
         label
     }
 
@@ -990,7 +990,7 @@ impl Translator<'_> {
             visibility,
         });
         self.emit_location(label, &node);
-        self.emit_tokens(label.into(), node.syntax().children_with_tokens());
+        self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
         label
     }
 
@@ -1001,7 +1001,7 @@ impl Translator<'_> {
             macro_call,
         });
         self.emit_location(label, &node);
-        self.emit_tokens(label.into(), node.syntax().children_with_tokens());
+        self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
         label
     }
 
@@ -1012,7 +1012,7 @@ impl Translator<'_> {
             items,
         });
         self.emit_location(label, &node);
-        self.emit_tokens(label.into(), node.syntax().children_with_tokens());
+        self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
         label
     }
 
@@ -1023,7 +1023,7 @@ impl Translator<'_> {
             macro_call,
         });
         self.emit_location(label, &node);
-        self.emit_tokens(label.into(), node.syntax().children_with_tokens());
+        self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
         label
     }
 
@@ -1040,7 +1040,7 @@ impl Translator<'_> {
             visibility,
         });
         self.emit_location(label, &node);
-        self.emit_tokens(label.into(), node.syntax().children_with_tokens());
+        self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
         label
     }
 
@@ -1053,7 +1053,7 @@ impl Translator<'_> {
             statements,
         });
         self.emit_location(label, &node);
-        self.emit_tokens(label.into(), node.syntax().children_with_tokens());
+        self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
         label
     }
 
@@ -1064,7 +1064,7 @@ impl Translator<'_> {
             macro_call,
         });
         self.emit_location(label, &node);
-        self.emit_tokens(label.into(), node.syntax().children_with_tokens());
+        self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
         label
     }
 
@@ -1081,7 +1081,7 @@ impl Translator<'_> {
             pat,
         });
         self.emit_location(label, &node);
-        self.emit_tokens(label.into(), node.syntax().children_with_tokens());
+        self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
         label
     }
 
@@ -1094,7 +1094,7 @@ impl Translator<'_> {
             attrs,
         });
         self.emit_location(label, &node);
-        self.emit_tokens(label.into(), node.syntax().children_with_tokens());
+        self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
         label
     }
 
@@ -1109,7 +1109,7 @@ impl Translator<'_> {
             match_arm_list,
         });
         self.emit_location(label, &node);
-        self.emit_tokens(label.into(), node.syntax().children_with_tokens());
+        self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
         label
     }
 
@@ -1120,7 +1120,7 @@ impl Translator<'_> {
             condition,
         });
         self.emit_location(label, &node);
-        self.emit_tokens(label.into(), node.syntax().children_with_tokens());
+        self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
         label
     }
 
@@ -1135,7 +1135,7 @@ impl Translator<'_> {
             token_tree,
         });
         self.emit_location(label, &node);
-        self.emit_tokens(label.into(), node.syntax().children_with_tokens());
+        self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
         label
     }
 
@@ -1154,7 +1154,7 @@ impl Translator<'_> {
             receiver,
         });
         self.emit_location(label, &node);
-        self.emit_tokens(label.into(), node.syntax().children_with_tokens());
+        self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
         label
     }
 
@@ -1171,7 +1171,7 @@ impl Translator<'_> {
             visibility,
         });
         self.emit_location(label, &node);
-        self.emit_tokens(label.into(), node.syntax().children_with_tokens());
+        self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
         label
     }
 
@@ -1182,7 +1182,7 @@ impl Translator<'_> {
             text,
         });
         self.emit_location(label, &node);
-        self.emit_tokens(label.into(), node.syntax().children_with_tokens());
+        self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
         label
     }
 
@@ -1193,7 +1193,7 @@ impl Translator<'_> {
             text,
         });
         self.emit_location(label, &node);
-        self.emit_tokens(label.into(), node.syntax().children_with_tokens());
+        self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
         label
     }
 
@@ -1202,7 +1202,7 @@ impl Translator<'_> {
             id: TrapId::Star,
         });
         self.emit_location(label, &node);
-        self.emit_tokens(label.into(), node.syntax().children_with_tokens());
+        self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
         label
     }
 
@@ -1217,7 +1217,7 @@ impl Translator<'_> {
             ty,
         });
         self.emit_location(label, &node);
-        self.emit_tokens(label.into(), node.syntax().children_with_tokens());
+        self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
         label
     }
 
@@ -1228,7 +1228,7 @@ impl Translator<'_> {
             pats,
         });
         self.emit_location(label, &node);
-        self.emit_tokens(label.into(), node.syntax().children_with_tokens());
+        self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
         label
     }
 
@@ -1243,7 +1243,7 @@ impl Translator<'_> {
             ty,
         });
         self.emit_location(label, &node);
-        self.emit_tokens(label.into(), node.syntax().children_with_tokens());
+        self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
         label
     }
 
@@ -1256,7 +1256,7 @@ impl Translator<'_> {
             self_param,
         });
         self.emit_location(label, &node);
-        self.emit_tokens(label.into(), node.syntax().children_with_tokens());
+        self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
         label
     }
 
@@ -1269,7 +1269,7 @@ impl Translator<'_> {
             expr,
         });
         self.emit_location(label, &node);
-        self.emit_tokens(label.into(), node.syntax().children_with_tokens());
+        self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
         label
     }
 
@@ -1280,7 +1280,7 @@ impl Translator<'_> {
             pat,
         });
         self.emit_location(label, &node);
-        self.emit_tokens(label.into(), node.syntax().children_with_tokens());
+        self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
         label
     }
 
@@ -1291,7 +1291,7 @@ impl Translator<'_> {
             ty,
         });
         self.emit_location(label, &node);
-        self.emit_tokens(label.into(), node.syntax().children_with_tokens());
+        self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
         label
     }
 
@@ -1304,7 +1304,7 @@ impl Translator<'_> {
             part,
         });
         self.emit_location(label, &node);
-        self.emit_tokens(label.into(), node.syntax().children_with_tokens());
+        self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
         label
     }
 
@@ -1317,7 +1317,7 @@ impl Translator<'_> {
             path,
         });
         self.emit_location(label, &node);
-        self.emit_tokens(label.into(), node.syntax().children_with_tokens());
+        self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
         label
     }
 
@@ -1328,7 +1328,7 @@ impl Translator<'_> {
             path,
         });
         self.emit_location(label, &node);
-        self.emit_tokens(label.into(), node.syntax().children_with_tokens());
+        self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
         label
     }
 
@@ -1351,7 +1351,7 @@ impl Translator<'_> {
             ty,
         });
         self.emit_location(label, &node);
-        self.emit_tokens(label.into(), node.syntax().children_with_tokens());
+        self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
         label
     }
 
@@ -1362,7 +1362,7 @@ impl Translator<'_> {
             path,
         });
         self.emit_location(label, &node);
-        self.emit_tokens(label.into(), node.syntax().children_with_tokens());
+        self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
         label
     }
 
@@ -1377,7 +1377,7 @@ impl Translator<'_> {
             operator_name,
         });
         self.emit_location(label, &node);
-        self.emit_tokens(label.into(), node.syntax().children_with_tokens());
+        self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
         label
     }
 
@@ -1388,7 +1388,7 @@ impl Translator<'_> {
             ty,
         });
         self.emit_location(label, &node);
-        self.emit_tokens(label.into(), node.syntax().children_with_tokens());
+        self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
         label
     }
 
@@ -1405,7 +1405,7 @@ impl Translator<'_> {
             start,
         });
         self.emit_location(label, &node);
-        self.emit_tokens(label.into(), node.syntax().children_with_tokens());
+        self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
         label
     }
 
@@ -1420,7 +1420,7 @@ impl Translator<'_> {
             start,
         });
         self.emit_location(label, &node);
-        self.emit_tokens(label.into(), node.syntax().children_with_tokens());
+        self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
         label
     }
 
@@ -1433,7 +1433,7 @@ impl Translator<'_> {
             record_expr_field_list,
         });
         self.emit_location(label, &node);
-        self.emit_tokens(label.into(), node.syntax().children_with_tokens());
+        self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
         label
     }
 
@@ -1448,7 +1448,7 @@ impl Translator<'_> {
             name_ref,
         });
         self.emit_location(label, &node);
-        self.emit_tokens(label.into(), node.syntax().children_with_tokens());
+        self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
         label
     }
 
@@ -1463,7 +1463,7 @@ impl Translator<'_> {
             spread,
         });
         self.emit_location(label, &node);
-        self.emit_tokens(label.into(), node.syntax().children_with_tokens());
+        self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
         label
     }
 
@@ -1480,7 +1480,7 @@ impl Translator<'_> {
             visibility,
         });
         self.emit_location(label, &node);
-        self.emit_tokens(label.into(), node.syntax().children_with_tokens());
+        self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
         label
     }
 
@@ -1491,7 +1491,7 @@ impl Translator<'_> {
             fields,
         });
         self.emit_location(label, &node);
-        self.emit_tokens(label.into(), node.syntax().children_with_tokens());
+        self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
         label
     }
 
@@ -1504,7 +1504,7 @@ impl Translator<'_> {
             record_pat_field_list,
         });
         self.emit_location(label, &node);
-        self.emit_tokens(label.into(), node.syntax().children_with_tokens());
+        self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
         label
     }
 
@@ -1519,7 +1519,7 @@ impl Translator<'_> {
             pat,
         });
         self.emit_location(label, &node);
-        self.emit_tokens(label.into(), node.syntax().children_with_tokens());
+        self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
         label
     }
 
@@ -1532,7 +1532,7 @@ impl Translator<'_> {
             rest_pat,
         });
         self.emit_location(label, &node);
-        self.emit_tokens(label.into(), node.syntax().children_with_tokens());
+        self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
         label
     }
 
@@ -1545,7 +1545,7 @@ impl Translator<'_> {
             expr,
         });
         self.emit_location(label, &node);
-        self.emit_tokens(label.into(), node.syntax().children_with_tokens());
+        self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
         label
     }
 
@@ -1556,7 +1556,7 @@ impl Translator<'_> {
             pat,
         });
         self.emit_location(label, &node);
-        self.emit_tokens(label.into(), node.syntax().children_with_tokens());
+        self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
         label
     }
 
@@ -1569,7 +1569,7 @@ impl Translator<'_> {
             ty,
         });
         self.emit_location(label, &node);
-        self.emit_tokens(label.into(), node.syntax().children_with_tokens());
+        self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
         label
     }
 
@@ -1580,7 +1580,7 @@ impl Translator<'_> {
             name,
         });
         self.emit_location(label, &node);
-        self.emit_tokens(label.into(), node.syntax().children_with_tokens());
+        self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
         label
     }
 
@@ -1591,7 +1591,7 @@ impl Translator<'_> {
             attrs,
         });
         self.emit_location(label, &node);
-        self.emit_tokens(label.into(), node.syntax().children_with_tokens());
+        self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
         label
     }
 
@@ -1602,7 +1602,7 @@ impl Translator<'_> {
             ty,
         });
         self.emit_location(label, &node);
-        self.emit_tokens(label.into(), node.syntax().children_with_tokens());
+        self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
         label
     }
 
@@ -1615,7 +1615,7 @@ impl Translator<'_> {
             expr,
         });
         self.emit_location(label, &node);
-        self.emit_tokens(label.into(), node.syntax().children_with_tokens());
+        self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
         label
     }
 
@@ -1624,7 +1624,7 @@ impl Translator<'_> {
             id: TrapId::Star,
         });
         self.emit_location(label, &node);
-        self.emit_tokens(label.into(), node.syntax().children_with_tokens());
+        self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
         label
     }
 
@@ -1641,7 +1641,7 @@ impl Translator<'_> {
             ty,
         });
         self.emit_location(label, &node);
-        self.emit_tokens(label.into(), node.syntax().children_with_tokens());
+        self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
         label
     }
 
@@ -1652,7 +1652,7 @@ impl Translator<'_> {
             pats,
         });
         self.emit_location(label, &node);
-        self.emit_tokens(label.into(), node.syntax().children_with_tokens());
+        self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
         label
     }
 
@@ -1663,7 +1663,7 @@ impl Translator<'_> {
             ty,
         });
         self.emit_location(label, &node);
-        self.emit_tokens(label.into(), node.syntax().children_with_tokens());
+        self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
         label
     }
 
@@ -1676,7 +1676,7 @@ impl Translator<'_> {
             items,
         });
         self.emit_location(label, &node);
-        self.emit_tokens(label.into(), node.syntax().children_with_tokens());
+        self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
         label
     }
 
@@ -1695,7 +1695,7 @@ impl Translator<'_> {
             visibility,
         });
         self.emit_location(label, &node);
-        self.emit_tokens(label.into(), node.syntax().children_with_tokens());
+        self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
         label
     }
 
@@ -1710,7 +1710,7 @@ impl Translator<'_> {
             tail_expr,
         });
         self.emit_location(label, &node);
-        self.emit_tokens(label.into(), node.syntax().children_with_tokens());
+        self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
         label
     }
 
@@ -1731,7 +1731,7 @@ impl Translator<'_> {
             where_clause,
         });
         self.emit_location(label, &node);
-        self.emit_tokens(label.into(), node.syntax().children_with_tokens());
+        self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
         label
     }
 
@@ -1740,7 +1740,7 @@ impl Translator<'_> {
             id: TrapId::Star,
         });
         self.emit_location(label, &node);
-        self.emit_tokens(label.into(), node.syntax().children_with_tokens());
+        self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
         label
     }
 
@@ -1763,7 +1763,7 @@ impl Translator<'_> {
             where_clause,
         });
         self.emit_location(label, &node);
-        self.emit_tokens(label.into(), node.syntax().children_with_tokens());
+        self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
         label
     }
 
@@ -1784,7 +1784,7 @@ impl Translator<'_> {
             where_clause,
         });
         self.emit_location(label, &node);
-        self.emit_tokens(label.into(), node.syntax().children_with_tokens());
+        self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
         label
     }
 
@@ -1797,7 +1797,7 @@ impl Translator<'_> {
             expr,
         });
         self.emit_location(label, &node);
-        self.emit_tokens(label.into(), node.syntax().children_with_tokens());
+        self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
         label
     }
 
@@ -1810,7 +1810,7 @@ impl Translator<'_> {
             fields,
         });
         self.emit_location(label, &node);
-        self.emit_tokens(label.into(), node.syntax().children_with_tokens());
+        self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
         label
     }
 
@@ -1825,7 +1825,7 @@ impl Translator<'_> {
             visibility,
         });
         self.emit_location(label, &node);
-        self.emit_tokens(label.into(), node.syntax().children_with_tokens());
+        self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
         label
     }
 
@@ -1836,7 +1836,7 @@ impl Translator<'_> {
             fields,
         });
         self.emit_location(label, &node);
-        self.emit_tokens(label.into(), node.syntax().children_with_tokens());
+        self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
         label
     }
 
@@ -1847,7 +1847,7 @@ impl Translator<'_> {
             fields,
         });
         self.emit_location(label, &node);
-        self.emit_tokens(label.into(), node.syntax().children_with_tokens());
+        self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
         label
     }
 
@@ -1860,7 +1860,7 @@ impl Translator<'_> {
             path,
         });
         self.emit_location(label, &node);
-        self.emit_tokens(label.into(), node.syntax().children_with_tokens());
+        self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
         label
     }
 
@@ -1871,7 +1871,7 @@ impl Translator<'_> {
             fields,
         });
         self.emit_location(label, &node);
-        self.emit_tokens(label.into(), node.syntax().children_with_tokens());
+        self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
         label
     }
 
@@ -1894,7 +1894,7 @@ impl Translator<'_> {
             where_clause,
         });
         self.emit_location(label, &node);
-        self.emit_tokens(label.into(), node.syntax().children_with_tokens());
+        self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
         label
     }
 
@@ -1905,7 +1905,7 @@ impl Translator<'_> {
             ty,
         });
         self.emit_location(label, &node);
-        self.emit_tokens(label.into(), node.syntax().children_with_tokens());
+        self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
         label
     }
 
@@ -1920,7 +1920,7 @@ impl Translator<'_> {
             ty,
         });
         self.emit_location(label, &node);
-        self.emit_tokens(label.into(), node.syntax().children_with_tokens());
+        self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
         label
     }
 
@@ -1931,7 +1931,7 @@ impl Translator<'_> {
             bounds,
         });
         self.emit_location(label, &node);
-        self.emit_tokens(label.into(), node.syntax().children_with_tokens());
+        self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
         label
     }
 
@@ -1948,7 +1948,7 @@ impl Translator<'_> {
             type_bound_list,
         });
         self.emit_location(label, &node);
-        self.emit_tokens(label.into(), node.syntax().children_with_tokens());
+        self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
         label
     }
 
@@ -1959,7 +1959,7 @@ impl Translator<'_> {
             attrs,
         });
         self.emit_location(label, &node);
-        self.emit_tokens(label.into(), node.syntax().children_with_tokens());
+        self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
         label
     }
 
@@ -1980,7 +1980,7 @@ impl Translator<'_> {
             where_clause,
         });
         self.emit_location(label, &node);
-        self.emit_tokens(label.into(), node.syntax().children_with_tokens());
+        self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
         label
     }
 
@@ -1995,7 +1995,7 @@ impl Translator<'_> {
             visibility,
         });
         self.emit_location(label, &node);
-        self.emit_tokens(label.into(), node.syntax().children_with_tokens());
+        self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
         label
     }
 
@@ -2010,7 +2010,7 @@ impl Translator<'_> {
             use_tree_list,
         });
         self.emit_location(label, &node);
-        self.emit_tokens(label.into(), node.syntax().children_with_tokens());
+        self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
         label
     }
 
@@ -2021,7 +2021,7 @@ impl Translator<'_> {
             use_trees,
         });
         self.emit_location(label, &node);
-        self.emit_tokens(label.into(), node.syntax().children_with_tokens());
+        self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
         label
     }
 
@@ -2040,7 +2040,7 @@ impl Translator<'_> {
             visibility,
         });
         self.emit_location(label, &node);
-        self.emit_tokens(label.into(), node.syntax().children_with_tokens());
+        self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
         label
     }
 
@@ -2051,7 +2051,7 @@ impl Translator<'_> {
             variants,
         });
         self.emit_location(label, &node);
-        self.emit_tokens(label.into(), node.syntax().children_with_tokens());
+        self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
         label
     }
 
@@ -2062,7 +2062,7 @@ impl Translator<'_> {
             path,
         });
         self.emit_location(label, &node);
-        self.emit_tokens(label.into(), node.syntax().children_with_tokens());
+        self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
         label
     }
 
@@ -2073,7 +2073,7 @@ impl Translator<'_> {
             predicates,
         });
         self.emit_location(label, &node);
-        self.emit_tokens(label.into(), node.syntax().children_with_tokens());
+        self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
         label
     }
 
@@ -2090,7 +2090,7 @@ impl Translator<'_> {
             type_bound_list,
         });
         self.emit_location(label, &node);
-        self.emit_tokens(label.into(), node.syntax().children_with_tokens());
+        self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
         label
     }
 
@@ -2107,7 +2107,7 @@ impl Translator<'_> {
             loop_body,
         });
         self.emit_location(label, &node);
-        self.emit_tokens(label.into(), node.syntax().children_with_tokens());
+        self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
         label
     }
 
@@ -2116,7 +2116,7 @@ impl Translator<'_> {
             id: TrapId::Star,
         });
         self.emit_location(label, &node);
-        self.emit_tokens(label.into(), node.syntax().children_with_tokens());
+        self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
         label
     }
 
@@ -2129,7 +2129,7 @@ impl Translator<'_> {
             expr,
         });
         self.emit_location(label, &node);
-        self.emit_tokens(label.into(), node.syntax().children_with_tokens());
+        self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
         label
     }
 
@@ -2142,7 +2142,7 @@ impl Translator<'_> {
             expr,
         });
         self.emit_location(label, &node);
-        self.emit_tokens(label.into(), node.syntax().children_with_tokens());
+        self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
         label
     }
 

From db28f1b29eaa7c541ddf6ea62950215e8c69f0ab Mon Sep 17 00:00:00 2001
From: Arthur Baars <aibaars@github.com>
Date: Tue, 8 Oct 2024 10:47:40 +0200
Subject: [PATCH 295/347] Rust: use macro to inject extraction functions for
 detached properties

---
 rust/ast-generator/src/main.rs            |   8 +-
 rust/extractor/src/translate/base.rs      |   9 ++
 rust/extractor/src/translate/generated.rs | 145 +++++++++++++++++++++-
 3 files changed, 159 insertions(+), 3 deletions(-)

diff --git a/rust/ast-generator/src/main.rs b/rust/ast-generator/src/main.rs
index 44c067a18bcd..3b5a7aa8e7d4 100644
--- a/rust/ast-generator/src/main.rs
+++ b/rust/ast-generator/src/main.rs
@@ -419,8 +419,9 @@ fn write_extractor(grammar: &AstSrc) -> std::io::Result<String> {
         "//! Generated by `ast-generator`, do not edit by hand.\n
 #![cfg_attr(any(), rustfmt::skip)]
 
-use crate::generated;
 use super::base::{{TextValue, Translator}};
+use crate::emit_detached;
+use crate::generated;
 use crate::trap::{{Label, TrapId}};
 use ra_ap_syntax::ast::{{
     HasArgList, HasAttrs, HasGenericArgs, HasGenericParams, HasLoopBody, HasModuleItem, HasName,
@@ -520,6 +521,11 @@ impl Translator<'_> {{
         }
         writeln!(buf, "        }});")?;
         writeln!(buf, "        self.emit_location(label, &node);")?;
+        writeln!(
+            buf,
+            "        emit_detached!({}, self, node, label);",
+            class_name
+        )?;
         writeln!(
             buf,
             "        self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());"
diff --git a/rust/extractor/src/translate/base.rs b/rust/extractor/src/translate/base.rs
index ce0732c7c45e..d6467b9dc700 100644
--- a/rust/extractor/src/translate/base.rs
+++ b/rust/extractor/src/translate/base.rs
@@ -14,6 +14,15 @@ use ra_ap_syntax::ast::RangeItem;
 use ra_ap_syntax::{
     ast, AstNode, NodeOrToken, SyntaxElementChildren, SyntaxError, SyntaxToken, TextRange,
 };
+
+#[macro_export]
+macro_rules! emit_detached {
+    (MacroCall, $self:ident, $node:ident, $label:ident) => {
+        $self.extract_macro_call_expanded(&$node, $label.into());
+    };
+    ($($_:tt)*) => {};
+}
+
 pub trait TextValue {
     fn try_get_text(&self) -> Option<String>;
 }
diff --git a/rust/extractor/src/translate/generated.rs b/rust/extractor/src/translate/generated.rs
index 8aaba113e6da..195cb59b73f5 100644
--- a/rust/extractor/src/translate/generated.rs
+++ b/rust/extractor/src/translate/generated.rs
@@ -2,8 +2,9 @@
 
 #![cfg_attr(any(), rustfmt::skip)]
 
-use crate::generated;
 use super::base::{TextValue, Translator};
+use crate::emit_detached;
+use crate::generated;
 use crate::trap::{Label, TrapId};
 use ra_ap_syntax::ast::{
     HasArgList, HasAttrs, HasGenericArgs, HasGenericParams, HasLoopBody, HasModuleItem, HasName,
@@ -179,6 +180,7 @@ impl Translator<'_> {
             abi_string,
         });
         self.emit_location(label, &node);
+        emit_detached!(Abi, self, node, label);
         self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
         label
     }
@@ -190,6 +192,7 @@ impl Translator<'_> {
             args,
         });
         self.emit_location(label, &node);
+        emit_detached!(ArgList, self, node, label);
         self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
         label
     }
@@ -203,6 +206,7 @@ impl Translator<'_> {
             exprs,
         });
         self.emit_location(label, &node);
+        emit_detached!(ArrayExpr, self, node, label);
         self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
         label
     }
@@ -216,6 +220,7 @@ impl Translator<'_> {
             ty,
         });
         self.emit_location(label, &node);
+        emit_detached!(ArrayType, self, node, label);
         self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
         label
     }
@@ -229,6 +234,7 @@ impl Translator<'_> {
             expr,
         });
         self.emit_location(label, &node);
+        emit_detached!(AsmExpr, self, node, label);
         self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
         label
     }
@@ -242,6 +248,7 @@ impl Translator<'_> {
             attrs,
         });
         self.emit_location(label, &node);
+        emit_detached!(AssocItemList, self, node, label);
         self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
         label
     }
@@ -267,6 +274,7 @@ impl Translator<'_> {
             type_bound_list,
         });
         self.emit_location(label, &node);
+        emit_detached!(AssocTypeArg, self, node, label);
         self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
         label
     }
@@ -278,6 +286,7 @@ impl Translator<'_> {
             meta,
         });
         self.emit_location(label, &node);
+        emit_detached!(Attr, self, node, label);
         self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
         label
     }
@@ -291,6 +300,7 @@ impl Translator<'_> {
             expr,
         });
         self.emit_location(label, &node);
+        emit_detached!(AwaitExpr, self, node, label);
         self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
         label
     }
@@ -304,6 +314,7 @@ impl Translator<'_> {
             expr,
         });
         self.emit_location(label, &node);
+        emit_detached!(BecomeExpr, self, node, label);
         self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
         label
     }
@@ -321,6 +332,7 @@ impl Translator<'_> {
             rhs,
         });
         self.emit_location(label, &node);
+        emit_detached!(BinaryExpr, self, node, label);
         self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
         label
     }
@@ -336,6 +348,7 @@ impl Translator<'_> {
             stmt_list,
         });
         self.emit_location(label, &node);
+        emit_detached!(BlockExpr, self, node, label);
         self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
         label
     }
@@ -347,6 +360,7 @@ impl Translator<'_> {
             pat,
         });
         self.emit_location(label, &node);
+        emit_detached!(BoxPat, self, node, label);
         self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
         label
     }
@@ -362,6 +376,7 @@ impl Translator<'_> {
             lifetime,
         });
         self.emit_location(label, &node);
+        emit_detached!(BreakExpr, self, node, label);
         self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
         label
     }
@@ -377,6 +392,7 @@ impl Translator<'_> {
             expr,
         });
         self.emit_location(label, &node);
+        emit_detached!(CallExpr, self, node, label);
         self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
         label
     }
@@ -392,6 +408,7 @@ impl Translator<'_> {
             ty,
         });
         self.emit_location(label, &node);
+        emit_detached!(CastExpr, self, node, label);
         self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
         label
     }
@@ -403,6 +420,7 @@ impl Translator<'_> {
             generic_param_list,
         });
         self.emit_location(label, &node);
+        emit_detached!(ClosureBinder, self, node, label);
         self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
         label
     }
@@ -422,6 +440,7 @@ impl Translator<'_> {
             ret_type,
         });
         self.emit_location(label, &node);
+        emit_detached!(ClosureExpr, self, node, label);
         self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
         label
     }
@@ -441,6 +460,7 @@ impl Translator<'_> {
             visibility,
         });
         self.emit_location(label, &node);
+        emit_detached!(Const, self, node, label);
         self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
         label
     }
@@ -452,6 +472,7 @@ impl Translator<'_> {
             expr,
         });
         self.emit_location(label, &node);
+        emit_detached!(ConstArg, self, node, label);
         self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
         label
     }
@@ -463,6 +484,7 @@ impl Translator<'_> {
             block_expr,
         });
         self.emit_location(label, &node);
+        emit_detached!(ConstBlockPat, self, node, label);
         self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
         label
     }
@@ -480,6 +502,7 @@ impl Translator<'_> {
             ty,
         });
         self.emit_location(label, &node);
+        emit_detached!(ConstParam, self, node, label);
         self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
         label
     }
@@ -493,6 +516,7 @@ impl Translator<'_> {
             lifetime,
         });
         self.emit_location(label, &node);
+        emit_detached!(ContinueExpr, self, node, label);
         self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
         label
     }
@@ -504,6 +528,7 @@ impl Translator<'_> {
             type_bound_list,
         });
         self.emit_location(label, &node);
+        emit_detached!(DynTraitType, self, node, label);
         self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
         label
     }
@@ -525,6 +550,7 @@ impl Translator<'_> {
             where_clause,
         });
         self.emit_location(label, &node);
+        emit_detached!(Enum, self, node, label);
         self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
         label
     }
@@ -536,6 +562,7 @@ impl Translator<'_> {
             expr,
         });
         self.emit_location(label, &node);
+        emit_detached!(ExprStmt, self, node, label);
         self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
         label
     }
@@ -551,6 +578,7 @@ impl Translator<'_> {
             extern_item_list,
         });
         self.emit_location(label, &node);
+        emit_detached!(ExternBlock, self, node, label);
         self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
         label
     }
@@ -568,6 +596,7 @@ impl Translator<'_> {
             visibility,
         });
         self.emit_location(label, &node);
+        emit_detached!(ExternCrate, self, node, label);
         self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
         label
     }
@@ -581,6 +610,7 @@ impl Translator<'_> {
             extern_items,
         });
         self.emit_location(label, &node);
+        emit_detached!(ExternItemList, self, node, label);
         self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
         label
     }
@@ -596,6 +626,7 @@ impl Translator<'_> {
             name_ref,
         });
         self.emit_location(label, &node);
+        emit_detached!(FieldExpr, self, node, label);
         self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
         label
     }
@@ -623,6 +654,7 @@ impl Translator<'_> {
             where_clause,
         });
         self.emit_location(label, &node);
+        emit_detached!(Function, self, node, label);
         self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
         label
     }
@@ -638,6 +670,7 @@ impl Translator<'_> {
             ret_type,
         });
         self.emit_location(label, &node);
+        emit_detached!(FnPtrType, self, node, label);
         self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
         label
     }
@@ -657,6 +690,7 @@ impl Translator<'_> {
             pat,
         });
         self.emit_location(label, &node);
+        emit_detached!(ForExpr, self, node, label);
         self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
         label
     }
@@ -670,6 +704,7 @@ impl Translator<'_> {
             ty,
         });
         self.emit_location(label, &node);
+        emit_detached!(ForType, self, node, label);
         self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
         label
     }
@@ -683,6 +718,7 @@ impl Translator<'_> {
             name,
         });
         self.emit_location(label, &node);
+        emit_detached!(FormatArgsArg, self, node, label);
         self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
         label
     }
@@ -698,6 +734,7 @@ impl Translator<'_> {
             template,
         });
         self.emit_location(label, &node);
+        emit_detached!(FormatArgsExpr, self, node, label);
         self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
         label
     }
@@ -709,6 +746,7 @@ impl Translator<'_> {
             generic_args,
         });
         self.emit_location(label, &node);
+        emit_detached!(GenericArgList, self, node, label);
         self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
         label
     }
@@ -720,6 +758,7 @@ impl Translator<'_> {
             generic_params,
         });
         self.emit_location(label, &node);
+        emit_detached!(GenericParamList, self, node, label);
         self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
         label
     }
@@ -735,6 +774,7 @@ impl Translator<'_> {
             pat,
         });
         self.emit_location(label, &node);
+        emit_detached!(IdentPat, self, node, label);
         self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
         label
     }
@@ -752,6 +792,7 @@ impl Translator<'_> {
             then,
         });
         self.emit_location(label, &node);
+        emit_detached!(IfExpr, self, node, label);
         self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
         label
     }
@@ -775,6 +816,7 @@ impl Translator<'_> {
             where_clause,
         });
         self.emit_location(label, &node);
+        emit_detached!(Impl, self, node, label);
         self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
         label
     }
@@ -786,6 +828,7 @@ impl Translator<'_> {
             type_bound_list,
         });
         self.emit_location(label, &node);
+        emit_detached!(ImplTraitType, self, node, label);
         self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
         label
     }
@@ -801,6 +844,7 @@ impl Translator<'_> {
             index,
         });
         self.emit_location(label, &node);
+        emit_detached!(IndexExpr, self, node, label);
         self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
         label
     }
@@ -810,6 +854,7 @@ impl Translator<'_> {
             id: TrapId::Star,
         });
         self.emit_location(label, &node);
+        emit_detached!(InferType, self, node, label);
         self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
         label
     }
@@ -823,6 +868,7 @@ impl Translator<'_> {
             items,
         });
         self.emit_location(label, &node);
+        emit_detached!(ItemList, self, node, label);
         self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
         label
     }
@@ -834,6 +880,7 @@ impl Translator<'_> {
             lifetime,
         });
         self.emit_location(label, &node);
+        emit_detached!(Label, self, node, label);
         self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
         label
     }
@@ -845,6 +892,7 @@ impl Translator<'_> {
             block_expr,
         });
         self.emit_location(label, &node);
+        emit_detached!(LetElse, self, node, label);
         self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
         label
     }
@@ -860,6 +908,7 @@ impl Translator<'_> {
             pat,
         });
         self.emit_location(label, &node);
+        emit_detached!(LetExpr, self, node, label);
         self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
         label
     }
@@ -879,6 +928,7 @@ impl Translator<'_> {
             ty,
         });
         self.emit_location(label, &node);
+        emit_detached!(LetStmt, self, node, label);
         self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
         label
     }
@@ -890,6 +940,7 @@ impl Translator<'_> {
             text,
         });
         self.emit_location(label, &node);
+        emit_detached!(Lifetime, self, node, label);
         self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
         label
     }
@@ -901,6 +952,7 @@ impl Translator<'_> {
             lifetime,
         });
         self.emit_location(label, &node);
+        emit_detached!(LifetimeArg, self, node, label);
         self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
         label
     }
@@ -916,6 +968,7 @@ impl Translator<'_> {
             type_bound_list,
         });
         self.emit_location(label, &node);
+        emit_detached!(LifetimeParam, self, node, label);
         self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
         label
     }
@@ -929,6 +982,7 @@ impl Translator<'_> {
             text_value,
         });
         self.emit_location(label, &node);
+        emit_detached!(LiteralExpr, self, node, label);
         self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
         label
     }
@@ -940,6 +994,7 @@ impl Translator<'_> {
             literal,
         });
         self.emit_location(label, &node);
+        emit_detached!(LiteralPat, self, node, label);
         self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
         label
     }
@@ -955,6 +1010,7 @@ impl Translator<'_> {
             loop_body,
         });
         self.emit_location(label, &node);
+        emit_detached!(LoopExpr, self, node, label);
         self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
         label
     }
@@ -970,7 +1026,7 @@ impl Translator<'_> {
             token_tree,
         });
         self.emit_location(label, &node);
-        self.extract_macro_call_expanded(&node, label);
+        emit_detached!(MacroCall, self, node, label);
         self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
         label
     }
@@ -990,6 +1046,7 @@ impl Translator<'_> {
             visibility,
         });
         self.emit_location(label, &node);
+        emit_detached!(MacroDef, self, node, label);
         self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
         label
     }
@@ -1001,6 +1058,7 @@ impl Translator<'_> {
             macro_call,
         });
         self.emit_location(label, &node);
+        emit_detached!(MacroExpr, self, node, label);
         self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
         label
     }
@@ -1012,6 +1070,7 @@ impl Translator<'_> {
             items,
         });
         self.emit_location(label, &node);
+        emit_detached!(MacroItems, self, node, label);
         self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
         label
     }
@@ -1023,6 +1082,7 @@ impl Translator<'_> {
             macro_call,
         });
         self.emit_location(label, &node);
+        emit_detached!(MacroPat, self, node, label);
         self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
         label
     }
@@ -1040,6 +1100,7 @@ impl Translator<'_> {
             visibility,
         });
         self.emit_location(label, &node);
+        emit_detached!(MacroRules, self, node, label);
         self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
         label
     }
@@ -1053,6 +1114,7 @@ impl Translator<'_> {
             statements,
         });
         self.emit_location(label, &node);
+        emit_detached!(MacroStmts, self, node, label);
         self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
         label
     }
@@ -1064,6 +1126,7 @@ impl Translator<'_> {
             macro_call,
         });
         self.emit_location(label, &node);
+        emit_detached!(MacroType, self, node, label);
         self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
         label
     }
@@ -1081,6 +1144,7 @@ impl Translator<'_> {
             pat,
         });
         self.emit_location(label, &node);
+        emit_detached!(MatchArm, self, node, label);
         self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
         label
     }
@@ -1094,6 +1158,7 @@ impl Translator<'_> {
             attrs,
         });
         self.emit_location(label, &node);
+        emit_detached!(MatchArmList, self, node, label);
         self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
         label
     }
@@ -1109,6 +1174,7 @@ impl Translator<'_> {
             match_arm_list,
         });
         self.emit_location(label, &node);
+        emit_detached!(MatchExpr, self, node, label);
         self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
         label
     }
@@ -1120,6 +1186,7 @@ impl Translator<'_> {
             condition,
         });
         self.emit_location(label, &node);
+        emit_detached!(MatchGuard, self, node, label);
         self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
         label
     }
@@ -1135,6 +1202,7 @@ impl Translator<'_> {
             token_tree,
         });
         self.emit_location(label, &node);
+        emit_detached!(Meta, self, node, label);
         self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
         label
     }
@@ -1154,6 +1222,7 @@ impl Translator<'_> {
             receiver,
         });
         self.emit_location(label, &node);
+        emit_detached!(MethodCallExpr, self, node, label);
         self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
         label
     }
@@ -1171,6 +1240,7 @@ impl Translator<'_> {
             visibility,
         });
         self.emit_location(label, &node);
+        emit_detached!(Module, self, node, label);
         self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
         label
     }
@@ -1182,6 +1252,7 @@ impl Translator<'_> {
             text,
         });
         self.emit_location(label, &node);
+        emit_detached!(Name, self, node, label);
         self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
         label
     }
@@ -1193,6 +1264,7 @@ impl Translator<'_> {
             text,
         });
         self.emit_location(label, &node);
+        emit_detached!(NameRef, self, node, label);
         self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
         label
     }
@@ -1202,6 +1274,7 @@ impl Translator<'_> {
             id: TrapId::Star,
         });
         self.emit_location(label, &node);
+        emit_detached!(NeverType, self, node, label);
         self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
         label
     }
@@ -1217,6 +1290,7 @@ impl Translator<'_> {
             ty,
         });
         self.emit_location(label, &node);
+        emit_detached!(OffsetOfExpr, self, node, label);
         self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
         label
     }
@@ -1228,6 +1302,7 @@ impl Translator<'_> {
             pats,
         });
         self.emit_location(label, &node);
+        emit_detached!(OrPat, self, node, label);
         self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
         label
     }
@@ -1243,6 +1318,7 @@ impl Translator<'_> {
             ty,
         });
         self.emit_location(label, &node);
+        emit_detached!(Param, self, node, label);
         self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
         label
     }
@@ -1256,6 +1332,7 @@ impl Translator<'_> {
             self_param,
         });
         self.emit_location(label, &node);
+        emit_detached!(ParamList, self, node, label);
         self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
         label
     }
@@ -1269,6 +1346,7 @@ impl Translator<'_> {
             expr,
         });
         self.emit_location(label, &node);
+        emit_detached!(ParenExpr, self, node, label);
         self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
         label
     }
@@ -1280,6 +1358,7 @@ impl Translator<'_> {
             pat,
         });
         self.emit_location(label, &node);
+        emit_detached!(ParenPat, self, node, label);
         self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
         label
     }
@@ -1291,6 +1370,7 @@ impl Translator<'_> {
             ty,
         });
         self.emit_location(label, &node);
+        emit_detached!(ParenType, self, node, label);
         self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
         label
     }
@@ -1304,6 +1384,7 @@ impl Translator<'_> {
             part,
         });
         self.emit_location(label, &node);
+        emit_detached!(Path, self, node, label);
         self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
         label
     }
@@ -1317,6 +1398,7 @@ impl Translator<'_> {
             path,
         });
         self.emit_location(label, &node);
+        emit_detached!(PathExpr, self, node, label);
         self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
         label
     }
@@ -1328,6 +1410,7 @@ impl Translator<'_> {
             path,
         });
         self.emit_location(label, &node);
+        emit_detached!(PathPat, self, node, label);
         self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
         label
     }
@@ -1351,6 +1434,7 @@ impl Translator<'_> {
             ty,
         });
         self.emit_location(label, &node);
+        emit_detached!(PathSegment, self, node, label);
         self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
         label
     }
@@ -1362,6 +1446,7 @@ impl Translator<'_> {
             path,
         });
         self.emit_location(label, &node);
+        emit_detached!(PathType, self, node, label);
         self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
         label
     }
@@ -1377,6 +1462,7 @@ impl Translator<'_> {
             operator_name,
         });
         self.emit_location(label, &node);
+        emit_detached!(PrefixExpr, self, node, label);
         self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
         label
     }
@@ -1388,6 +1474,7 @@ impl Translator<'_> {
             ty,
         });
         self.emit_location(label, &node);
+        emit_detached!(PtrType, self, node, label);
         self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
         label
     }
@@ -1405,6 +1492,7 @@ impl Translator<'_> {
             start,
         });
         self.emit_location(label, &node);
+        emit_detached!(RangeExpr, self, node, label);
         self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
         label
     }
@@ -1420,6 +1508,7 @@ impl Translator<'_> {
             start,
         });
         self.emit_location(label, &node);
+        emit_detached!(RangePat, self, node, label);
         self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
         label
     }
@@ -1433,6 +1522,7 @@ impl Translator<'_> {
             record_expr_field_list,
         });
         self.emit_location(label, &node);
+        emit_detached!(RecordExpr, self, node, label);
         self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
         label
     }
@@ -1448,6 +1538,7 @@ impl Translator<'_> {
             name_ref,
         });
         self.emit_location(label, &node);
+        emit_detached!(RecordExprField, self, node, label);
         self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
         label
     }
@@ -1463,6 +1554,7 @@ impl Translator<'_> {
             spread,
         });
         self.emit_location(label, &node);
+        emit_detached!(RecordExprFieldList, self, node, label);
         self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
         label
     }
@@ -1480,6 +1572,7 @@ impl Translator<'_> {
             visibility,
         });
         self.emit_location(label, &node);
+        emit_detached!(RecordField, self, node, label);
         self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
         label
     }
@@ -1491,6 +1584,7 @@ impl Translator<'_> {
             fields,
         });
         self.emit_location(label, &node);
+        emit_detached!(RecordFieldList, self, node, label);
         self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
         label
     }
@@ -1504,6 +1598,7 @@ impl Translator<'_> {
             record_pat_field_list,
         });
         self.emit_location(label, &node);
+        emit_detached!(RecordPat, self, node, label);
         self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
         label
     }
@@ -1519,6 +1614,7 @@ impl Translator<'_> {
             pat,
         });
         self.emit_location(label, &node);
+        emit_detached!(RecordPatField, self, node, label);
         self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
         label
     }
@@ -1532,6 +1628,7 @@ impl Translator<'_> {
             rest_pat,
         });
         self.emit_location(label, &node);
+        emit_detached!(RecordPatFieldList, self, node, label);
         self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
         label
     }
@@ -1545,6 +1642,7 @@ impl Translator<'_> {
             expr,
         });
         self.emit_location(label, &node);
+        emit_detached!(RefExpr, self, node, label);
         self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
         label
     }
@@ -1556,6 +1654,7 @@ impl Translator<'_> {
             pat,
         });
         self.emit_location(label, &node);
+        emit_detached!(RefPat, self, node, label);
         self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
         label
     }
@@ -1569,6 +1668,7 @@ impl Translator<'_> {
             ty,
         });
         self.emit_location(label, &node);
+        emit_detached!(RefType, self, node, label);
         self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
         label
     }
@@ -1580,6 +1680,7 @@ impl Translator<'_> {
             name,
         });
         self.emit_location(label, &node);
+        emit_detached!(Rename, self, node, label);
         self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
         label
     }
@@ -1591,6 +1692,7 @@ impl Translator<'_> {
             attrs,
         });
         self.emit_location(label, &node);
+        emit_detached!(RestPat, self, node, label);
         self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
         label
     }
@@ -1602,6 +1704,7 @@ impl Translator<'_> {
             ty,
         });
         self.emit_location(label, &node);
+        emit_detached!(RetType, self, node, label);
         self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
         label
     }
@@ -1615,6 +1718,7 @@ impl Translator<'_> {
             expr,
         });
         self.emit_location(label, &node);
+        emit_detached!(ReturnExpr, self, node, label);
         self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
         label
     }
@@ -1624,6 +1728,7 @@ impl Translator<'_> {
             id: TrapId::Star,
         });
         self.emit_location(label, &node);
+        emit_detached!(ReturnTypeSyntax, self, node, label);
         self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
         label
     }
@@ -1641,6 +1746,7 @@ impl Translator<'_> {
             ty,
         });
         self.emit_location(label, &node);
+        emit_detached!(SelfParam, self, node, label);
         self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
         label
     }
@@ -1652,6 +1758,7 @@ impl Translator<'_> {
             pats,
         });
         self.emit_location(label, &node);
+        emit_detached!(SlicePat, self, node, label);
         self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
         label
     }
@@ -1663,6 +1770,7 @@ impl Translator<'_> {
             ty,
         });
         self.emit_location(label, &node);
+        emit_detached!(SliceType, self, node, label);
         self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
         label
     }
@@ -1676,6 +1784,7 @@ impl Translator<'_> {
             items,
         });
         self.emit_location(label, &node);
+        emit_detached!(SourceFile, self, node, label);
         self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
         label
     }
@@ -1695,6 +1804,7 @@ impl Translator<'_> {
             visibility,
         });
         self.emit_location(label, &node);
+        emit_detached!(Static, self, node, label);
         self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
         label
     }
@@ -1710,6 +1820,7 @@ impl Translator<'_> {
             tail_expr,
         });
         self.emit_location(label, &node);
+        emit_detached!(StmtList, self, node, label);
         self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
         label
     }
@@ -1731,6 +1842,7 @@ impl Translator<'_> {
             where_clause,
         });
         self.emit_location(label, &node);
+        emit_detached!(Struct, self, node, label);
         self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
         label
     }
@@ -1740,6 +1852,7 @@ impl Translator<'_> {
             id: TrapId::Star,
         });
         self.emit_location(label, &node);
+        emit_detached!(TokenTree, self, node, label);
         self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
         label
     }
@@ -1763,6 +1876,7 @@ impl Translator<'_> {
             where_clause,
         });
         self.emit_location(label, &node);
+        emit_detached!(Trait, self, node, label);
         self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
         label
     }
@@ -1784,6 +1898,7 @@ impl Translator<'_> {
             where_clause,
         });
         self.emit_location(label, &node);
+        emit_detached!(TraitAlias, self, node, label);
         self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
         label
     }
@@ -1797,6 +1912,7 @@ impl Translator<'_> {
             expr,
         });
         self.emit_location(label, &node);
+        emit_detached!(TryExpr, self, node, label);
         self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
         label
     }
@@ -1810,6 +1926,7 @@ impl Translator<'_> {
             fields,
         });
         self.emit_location(label, &node);
+        emit_detached!(TupleExpr, self, node, label);
         self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
         label
     }
@@ -1825,6 +1942,7 @@ impl Translator<'_> {
             visibility,
         });
         self.emit_location(label, &node);
+        emit_detached!(TupleField, self, node, label);
         self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
         label
     }
@@ -1836,6 +1954,7 @@ impl Translator<'_> {
             fields,
         });
         self.emit_location(label, &node);
+        emit_detached!(TupleFieldList, self, node, label);
         self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
         label
     }
@@ -1847,6 +1966,7 @@ impl Translator<'_> {
             fields,
         });
         self.emit_location(label, &node);
+        emit_detached!(TuplePat, self, node, label);
         self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
         label
     }
@@ -1860,6 +1980,7 @@ impl Translator<'_> {
             path,
         });
         self.emit_location(label, &node);
+        emit_detached!(TupleStructPat, self, node, label);
         self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
         label
     }
@@ -1871,6 +1992,7 @@ impl Translator<'_> {
             fields,
         });
         self.emit_location(label, &node);
+        emit_detached!(TupleType, self, node, label);
         self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
         label
     }
@@ -1894,6 +2016,7 @@ impl Translator<'_> {
             where_clause,
         });
         self.emit_location(label, &node);
+        emit_detached!(TypeAlias, self, node, label);
         self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
         label
     }
@@ -1905,6 +2028,7 @@ impl Translator<'_> {
             ty,
         });
         self.emit_location(label, &node);
+        emit_detached!(TypeArg, self, node, label);
         self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
         label
     }
@@ -1920,6 +2044,7 @@ impl Translator<'_> {
             ty,
         });
         self.emit_location(label, &node);
+        emit_detached!(TypeBound, self, node, label);
         self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
         label
     }
@@ -1931,6 +2056,7 @@ impl Translator<'_> {
             bounds,
         });
         self.emit_location(label, &node);
+        emit_detached!(TypeBoundList, self, node, label);
         self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
         label
     }
@@ -1948,6 +2074,7 @@ impl Translator<'_> {
             type_bound_list,
         });
         self.emit_location(label, &node);
+        emit_detached!(TypeParam, self, node, label);
         self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
         label
     }
@@ -1959,6 +2086,7 @@ impl Translator<'_> {
             attrs,
         });
         self.emit_location(label, &node);
+        emit_detached!(UnderscoreExpr, self, node, label);
         self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
         label
     }
@@ -1980,6 +2108,7 @@ impl Translator<'_> {
             where_clause,
         });
         self.emit_location(label, &node);
+        emit_detached!(Union, self, node, label);
         self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
         label
     }
@@ -1995,6 +2124,7 @@ impl Translator<'_> {
             visibility,
         });
         self.emit_location(label, &node);
+        emit_detached!(Use, self, node, label);
         self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
         label
     }
@@ -2010,6 +2140,7 @@ impl Translator<'_> {
             use_tree_list,
         });
         self.emit_location(label, &node);
+        emit_detached!(UseTree, self, node, label);
         self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
         label
     }
@@ -2021,6 +2152,7 @@ impl Translator<'_> {
             use_trees,
         });
         self.emit_location(label, &node);
+        emit_detached!(UseTreeList, self, node, label);
         self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
         label
     }
@@ -2040,6 +2172,7 @@ impl Translator<'_> {
             visibility,
         });
         self.emit_location(label, &node);
+        emit_detached!(Variant, self, node, label);
         self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
         label
     }
@@ -2051,6 +2184,7 @@ impl Translator<'_> {
             variants,
         });
         self.emit_location(label, &node);
+        emit_detached!(VariantList, self, node, label);
         self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
         label
     }
@@ -2062,6 +2196,7 @@ impl Translator<'_> {
             path,
         });
         self.emit_location(label, &node);
+        emit_detached!(Visibility, self, node, label);
         self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
         label
     }
@@ -2073,6 +2208,7 @@ impl Translator<'_> {
             predicates,
         });
         self.emit_location(label, &node);
+        emit_detached!(WhereClause, self, node, label);
         self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
         label
     }
@@ -2090,6 +2226,7 @@ impl Translator<'_> {
             type_bound_list,
         });
         self.emit_location(label, &node);
+        emit_detached!(WherePred, self, node, label);
         self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
         label
     }
@@ -2107,6 +2244,7 @@ impl Translator<'_> {
             loop_body,
         });
         self.emit_location(label, &node);
+        emit_detached!(WhileExpr, self, node, label);
         self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
         label
     }
@@ -2116,6 +2254,7 @@ impl Translator<'_> {
             id: TrapId::Star,
         });
         self.emit_location(label, &node);
+        emit_detached!(WildcardPat, self, node, label);
         self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
         label
     }
@@ -2129,6 +2268,7 @@ impl Translator<'_> {
             expr,
         });
         self.emit_location(label, &node);
+        emit_detached!(YeetExpr, self, node, label);
         self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
         label
     }
@@ -2142,6 +2282,7 @@ impl Translator<'_> {
             expr,
         });
         self.emit_location(label, &node);
+        emit_detached!(YieldExpr, self, node, label);
         self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
         label
     }

From ca27785acebf7678babfcbb20239c80b75e36901 Mon Sep 17 00:00:00 2001
From: Arthur Baars <aibaars@github.com>
Date: Tue, 8 Oct 2024 16:01:31 +0200
Subject: [PATCH 296/347] Rust: extract files on a per-project basis

This way we have only one "project" database in-memory at a time. This
should avoid running out of memory when analyzing large mono-repos.
---
 rust/extractor/src/main.rs          | 70 +++++++++++++++++++----
 rust/extractor/src/rust_analyzer.rs | 89 ++++++++++++-----------------
 2 files changed, 96 insertions(+), 63 deletions(-)

diff --git a/rust/extractor/src/main.rs b/rust/extractor/src/main.rs
index 56d84176c8c5..4bae26416fe7 100644
--- a/rust/extractor/src/main.rs
+++ b/rust/extractor/src/main.rs
@@ -1,5 +1,13 @@
+use std::{
+    collections::HashMap,
+    path::{Path, PathBuf},
+};
+
 use anyhow::Context;
+use archive::Archiver;
 use ra_ap_ide_db::line_index::{LineCol, LineIndex};
+use ra_ap_project_model::ProjectManifest;
+use rust_analyzer::RustAnalyzer;
 mod archive;
 mod config;
 pub mod generated;
@@ -9,10 +17,13 @@ pub mod trap;
 
 fn extract(
     rust_analyzer: &mut rust_analyzer::RustAnalyzer,
+    archiver: &Archiver,
     traps: &trap::TrapFileProvider,
-    file: std::path::PathBuf,
-) -> anyhow::Result<()> {
-    let (ast, input, parse_errors, file_id, semi) = rust_analyzer.parse(&file);
+    file: &std::path::Path,
+) -> () {
+    archiver.archive(&file);
+
+    let (ast, input, parse_errors, file_id, semi) = rust_analyzer.parse(file);
     let line_index = LineIndex::new(input.as_ref());
     let display_path = file.to_string_lossy();
     let mut trap = traps.create("source", &file);
@@ -40,8 +51,13 @@ fn extract(
         );
     }
     translator.emit_source_file(ast);
-    translator.trap.commit()?;
-    Ok(())
+    translator.trap.commit().unwrap_or_else(|err| {
+        log::error!(
+            "Failed to write trap file for: {}: {}",
+            display_path,
+            err.to_string()
+        )
+    });
 }
 fn main() -> anyhow::Result<()> {
     let cfg = config::Config::extract().context("failed to load configuration")?;
@@ -49,17 +65,49 @@ fn main() -> anyhow::Result<()> {
         .module(module_path!())
         .verbosity(2 + cfg.verbose as usize)
         .init()?;
-    let mut rust_analyzer = rust_analyzer::RustAnalyzer::new(&cfg)?;
 
     let traps = trap::TrapFileProvider::new(&cfg).context("failed to set up trap files")?;
     let archiver = archive::Archiver {
         root: cfg.source_archive_dir,
     };
-    for file in cfg.inputs {
-        let file = std::path::absolute(&file).unwrap_or(file);
-        let file = std::fs::canonicalize(&file).unwrap_or(file);
-        archiver.archive(&file);
-        extract(&mut rust_analyzer, &traps, file)?;
+    let files: Vec<PathBuf> = cfg
+        .inputs
+        .iter()
+        .map(|file| {
+            let file = std::path::absolute(&file).unwrap_or(file.to_path_buf());
+            std::fs::canonicalize(&file).unwrap_or(file)
+        })
+        .collect();
+    let manifests = rust_analyzer::find_project_manifests(&files)?;
+    let mut map: HashMap<&Path, (&ProjectManifest, Vec<&Path>)> = manifests
+        .iter()
+        .map(|x| (x.manifest_path().parent().as_ref(), (x, Vec::new())))
+        .collect();
+    let mut other_files = Vec::new();
+
+    'outer: for file in &files {
+        let mut p = file.as_path();
+        while let Some(parent) = p.parent() {
+            p = parent;
+            if let Some((_, files)) = map.get_mut(parent) {
+                files.push(file);
+                continue 'outer;
+            }
+        }
+        other_files.push(file);
+    }
+    for (manifest, files) in map.values() {
+        if files.is_empty() {
+            break;
+        }
+        let mut rust_analyzer = RustAnalyzer::new(manifest, &cfg.scratch_dir);
+        for file in files {
+            extract(&mut rust_analyzer, &archiver, &traps, file);
+        }
+    }
+    let mut rust_analyzer = RustAnalyzer::WithoutDatabase();
+    for file in other_files {
+        extract(&mut rust_analyzer, &archiver, &traps, file);
     }
 
     Ok(())
diff --git a/rust/extractor/src/rust_analyzer.rs b/rust/extractor/src/rust_analyzer.rs
index 3c07e5000f72..648b58e2169d 100644
--- a/rust/extractor/src/rust_analyzer.rs
+++ b/rust/extractor/src/rust_analyzer.rs
@@ -1,5 +1,3 @@
-use crate::config::Config;
-use anyhow::Context;
 use itertools::Itertools;
 use log::info;
 use ra_ap_base_db::SourceDatabase;
@@ -9,6 +7,7 @@ use ra_ap_ide_db::RootDatabase;
 use ra_ap_load_cargo::{load_workspace_at, LoadCargoConfig, ProcMacroServerChoice};
 use ra_ap_paths::Utf8PathBuf;
 use ra_ap_project_model::CargoConfig;
+use ra_ap_project_model::ProjectManifest;
 use ra_ap_project_model::RustLibSource;
 use ra_ap_span::Edition;
 use ra_ap_span::EditionedFileId;
@@ -20,19 +19,18 @@ use ra_ap_vfs::AbsPathBuf;
 use ra_ap_vfs::Vfs;
 use ra_ap_vfs::VfsPath;
 use std::borrow::Cow;
-use std::collections::HashMap;
 use std::path::{Path, PathBuf};
 use triomphe::Arc;
-pub struct RustAnalyzer {
-    workspace: HashMap<PathBuf, (Vfs, RootDatabase)>,
+pub enum RustAnalyzer {
+    WithDatabase { db: RootDatabase, vfs: Vfs },
+    WithoutDatabase(),
 }
 
 impl RustAnalyzer {
-    pub fn new(cfg: &Config) -> anyhow::Result<RustAnalyzer> {
-        let mut workspace = HashMap::new();
+    pub fn new(project: &ProjectManifest, scratch_dir: &Path) -> Self {
         let config = CargoConfig {
             sysroot: Some(RustLibSource::Discover),
-            target_dir: ra_ap_paths::Utf8PathBuf::from_path_buf(cfg.scratch_dir.to_path_buf())
+            target_dir: ra_ap_paths::Utf8PathBuf::from_path_buf(scratch_dir.to_path_buf())
                 .map(|x| x.join("target"))
                 .ok(),
             ..Default::default()
@@ -43,25 +41,19 @@ impl RustAnalyzer {
             with_proc_macro_server: ProcMacroServerChoice::Sysroot,
             prefill_caches: false,
         };
-        let projects = find_project_manifests(&cfg.inputs).context("loading inputs")?;
-        for project in projects {
-            let manifest = project.manifest_path();
+        let manifest = project.manifest_path();
 
-            match load_workspace_at(manifest.as_ref(), &config, &load_config, &progress) {
-                Ok((db, vfs, _macro_server)) => {
-                    let path: &Path = manifest.parent().as_ref();
-                    workspace.insert(path.to_path_buf(), (vfs, db));
-                }
-                Err(err) => {
-                    log::error!("failed to load workspace for {}: {}", manifest, err);
-                }
+        match load_workspace_at(manifest.as_ref(), &config, &load_config, &progress) {
+            Ok((db, vfs, _macro_server)) => RustAnalyzer::WithDatabase { db, vfs },
+            Err(err) => {
+                log::error!("failed to load workspace for {}: {}", manifest, err);
+                RustAnalyzer::WithoutDatabase()
             }
         }
-        Ok(RustAnalyzer { workspace })
     }
     pub fn parse(
         &mut self,
-        path: &PathBuf,
+        path: &Path,
     ) -> (
         SourceFile,
         Arc<str>,
@@ -82,37 +74,30 @@ impl RustAnalyzer {
         };
         let (input, err) = from_utf8_lossy(&input);
 
-        let mut p = path.as_path();
-        while let Some(parent) = p.parent() {
-            p = parent;
-            if self.workspace.contains_key(parent) {
-                let (vfs, db) = self.workspace.get_mut(parent).unwrap();
-                if let Some(file_id) = Utf8PathBuf::from_path_buf(path.to_path_buf())
-                    .ok()
-                    .and_then(|x| AbsPathBuf::try_from(x).ok())
-                    .map(VfsPath::from)
-                    .and_then(|x| vfs.file_id(&x))
-                {
-                    db.set_file_text(file_id, &input);
-                    let semi = Semantics::new(db);
+        if let RustAnalyzer::WithDatabase { vfs, db } = self {
+            if let Some(file_id) = Utf8PathBuf::from_path_buf(path.to_path_buf())
+                .ok()
+                .and_then(|x| AbsPathBuf::try_from(x).ok())
+                .map(VfsPath::from)
+                .and_then(|x| vfs.file_id(&x))
+            {
+                db.set_file_text(file_id, &input);
+                let semi = Semantics::new(db);
 
-                    let file_id = EditionedFileId::current_edition(file_id);
-                    let source_file = semi.parse(file_id);
-                    errors.extend(
-                        db.parse_errors(file_id)
-                            .into_iter()
-                            .flat_map(|x| x.to_vec()),
-                    );
-                    return (
-                        source_file,
-                        input.as_ref().into(),
-                        errors,
-                        Some(file_id),
-                        Some(semi),
-                    );
-                } else {
-                    break;
-                }
+                let file_id = EditionedFileId::current_edition(file_id);
+                let source_file = semi.parse(file_id);
+                errors.extend(
+                    db.parse_errors(file_id)
+                        .into_iter()
+                        .flat_map(|x| x.to_vec()),
+                );
+                return (
+                    source_file,
+                    input.as_ref().into(),
+                    errors,
+                    Some(file_id),
+                    Some(semi),
+                );
             }
         }
         let parse = ra_ap_syntax::ast::SourceFile::parse(&input, Edition::CURRENT);
@@ -122,7 +107,7 @@ impl RustAnalyzer {
     }
 }
 
-fn find_project_manifests(
+pub fn find_project_manifests(
     files: &[PathBuf],
 ) -> anyhow::Result<Vec<ra_ap_project_model::ProjectManifest>> {
     let current = std::env::current_dir()?;

From 88e5ce3cf896b3ec566b841f24e2c9312cf1566a Mon Sep 17 00:00:00 2001
From: Arthur Baars <aibaars@github.com>
Date: Tue, 8 Oct 2024 19:41:55 +0200
Subject: [PATCH 297/347] Rust: lower default verbosity to WARN

---
 rust/extractor/src/main.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rust/extractor/src/main.rs b/rust/extractor/src/main.rs
index 4bae26416fe7..4b6bfd5f28d4 100644
--- a/rust/extractor/src/main.rs
+++ b/rust/extractor/src/main.rs
@@ -63,7 +63,7 @@ fn main() -> anyhow::Result<()> {
     let cfg = config::Config::extract().context("failed to load configuration")?;
     stderrlog::new()
         .module(module_path!())
-        .verbosity(2 + cfg.verbose as usize)
+        .verbosity(1 + cfg.verbose as usize)
         .init()?;
 
     let traps = trap::TrapFileProvider::new(&cfg).context("failed to set up trap files")?;

From f97a1591630f1b2b5d08b61d9b3a6ebb7c5e1b08 Mon Sep 17 00:00:00 2001
From: Arthur Baars <aibaars@github.com>
Date: Wed, 9 Oct 2024 11:27:48 +0200
Subject: [PATCH 298/347] Rust: clippy fixes

---
 rust/extractor/src/main.rs | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/rust/extractor/src/main.rs b/rust/extractor/src/main.rs
index 4b6bfd5f28d4..f258f240935d 100644
--- a/rust/extractor/src/main.rs
+++ b/rust/extractor/src/main.rs
@@ -20,14 +20,14 @@ fn extract(
     archiver: &Archiver,
     traps: &trap::TrapFileProvider,
     file: &std::path::Path,
-) -> () {
-    archiver.archive(&file);
+) {
+    archiver.archive(file);
 
     let (ast, input, parse_errors, file_id, semi) = rust_analyzer.parse(file);
     let line_index = LineIndex::new(input.as_ref());
     let display_path = file.to_string_lossy();
-    let mut trap = traps.create("source", &file);
-    let label = trap.emit_file(&file);
+    let mut trap = traps.create("source", file);
+    let label = trap.emit_file(file);
     let mut translator = translate::Translator::new(
         trap,
         display_path.as_ref(),
@@ -74,7 +74,7 @@ fn main() -> anyhow::Result<()> {
         .inputs
         .iter()
         .map(|file| {
-            let file = std::path::absolute(&file).unwrap_or(file.to_path_buf());
+            let file = std::path::absolute(file).unwrap_or(file.to_path_buf());
             std::fs::canonicalize(&file).unwrap_or(file)
         })
         .collect();

From 6d43eed1e65ae2594b14afd9176c4bae71eed383 Mon Sep 17 00:00:00 2001
From: Arthur Baars <aibaars@github.com>
Date: Thu, 10 Oct 2024 16:00:04 +0200
Subject: [PATCH 299/347] Rust: add QL doc for MacroStmts and MacroItems

---
 rust/ql/.generated.list                       | 21 ++++++++-------
 rust/ql/.gitattributes                        |  7 +++--
 .../lib/codeql/rust/elements/MacroItems.qll   |  8 ++++++
 .../lib/codeql/rust/elements/MacroStmts.qll   |  8 ++++++
 .../rust/elements/internal/MacroItemsImpl.qll |  8 ++++++
 .../rust/elements/internal/MacroStmtsImpl.qll |  8 ++++++
 .../internal/generated/MacroItems.qll         |  6 +++++
 .../internal/generated/MacroStmts.qll         |  6 +++++
 .../rust/elements/internal/generated/Raw.qll  | 12 +++++++++
 .../generated/.generated_tests.list           |  2 ++
 .../extractor-tests/generated/.gitattributes  |  2 ++
 .../generated/MacroItems/MISSING_SOURCE.txt   |  4 ---
 .../generated/MacroItems/MacroItems.expected  |  1 +
 .../generated/MacroItems/MacroItems.ql        | 10 +++++++
 .../MacroItems/MacroItems_getItem.expected    |  2 ++
 .../MacroItems/MacroItems_getItem.ql          |  7 +++++
 .../MacroItems/common_definitions.rs          |  5 ++++
 .../generated/MacroItems/gen_macro_items.rs   |  6 +++++
 .../generated/MacroStmts/MISSING_SOURCE.txt   |  4 ---
 .../generated/MacroStmts/MacroStmts.expected  |  1 +
 .../generated/MacroStmts/MacroStmts.ql        | 11 ++++++++
 .../MacroStmts/MacroStmts_getExpr.expected    |  1 +
 .../MacroStmts/MacroStmts_getExpr.ql          |  7 +++++
 .../MacroStmts_getStatement.expected          |  0
 .../MacroStmts/MacroStmts_getStatement.ql     |  7 +++++
 .../generated/MacroStmts/gen_macro_stmts.rs   |  6 +++++
 rust/schema/annotations.py                    | 26 +++++++++++++++++++
 27 files changed, 167 insertions(+), 19 deletions(-)
 delete mode 100644 rust/ql/test/extractor-tests/generated/MacroItems/MISSING_SOURCE.txt
 create mode 100644 rust/ql/test/extractor-tests/generated/MacroItems/MacroItems.expected
 create mode 100644 rust/ql/test/extractor-tests/generated/MacroItems/MacroItems.ql
 create mode 100644 rust/ql/test/extractor-tests/generated/MacroItems/MacroItems_getItem.expected
 create mode 100644 rust/ql/test/extractor-tests/generated/MacroItems/MacroItems_getItem.ql
 create mode 100644 rust/ql/test/extractor-tests/generated/MacroItems/common_definitions.rs
 create mode 100644 rust/ql/test/extractor-tests/generated/MacroItems/gen_macro_items.rs
 delete mode 100644 rust/ql/test/extractor-tests/generated/MacroStmts/MISSING_SOURCE.txt
 create mode 100644 rust/ql/test/extractor-tests/generated/MacroStmts/MacroStmts.expected
 create mode 100644 rust/ql/test/extractor-tests/generated/MacroStmts/MacroStmts.ql
 create mode 100644 rust/ql/test/extractor-tests/generated/MacroStmts/MacroStmts_getExpr.expected
 create mode 100644 rust/ql/test/extractor-tests/generated/MacroStmts/MacroStmts_getExpr.ql
 create mode 100644 rust/ql/test/extractor-tests/generated/MacroStmts/MacroStmts_getStatement.expected
 create mode 100644 rust/ql/test/extractor-tests/generated/MacroStmts/MacroStmts_getStatement.ql
 create mode 100644 rust/ql/test/extractor-tests/generated/MacroStmts/gen_macro_stmts.rs

diff --git a/rust/ql/.generated.list b/rust/ql/.generated.list
index fd5d3f743d1e..bb8b04642539 100644
--- a/rust/ql/.generated.list
+++ b/rust/ql/.generated.list
@@ -67,10 +67,10 @@ lib/codeql/rust/elements/LoopExpr.qll 58ade0bc4a01a1cc361363682fde3ea56f4c5fbb4b
 lib/codeql/rust/elements/MacroCall.qll a39a11d387355f59af3007dcbab3282e2b9e3289c1f8f4c6b96154ddb802f8c3 88d4575e462af2aa780219ba1338a790547fdfc1d267c4b84f1b929f4bc08d05
 lib/codeql/rust/elements/MacroDef.qll acb39275a1a3257084314a46ad4d8477946130f57e401c70c5949ad6aafc5c5f 6a8a8db12a3ec345fede51ca36e8c6acbdce58c5144388bb94f0706416fa152a
 lib/codeql/rust/elements/MacroExpr.qll ea9fed13f610bab1a2c4541c994510e0cb806530b60beef0d0c36b23e3b620f0 ad11a6bbd3a229ad97a16049cc6b0f3c8740f9f75ea61bbf4eebb072db9b12d2
-lib/codeql/rust/elements/MacroItems.qll 4acf8e5ab8f84dc8fae442d52a29266be2f1e7160120bb1dd52238b3d62b4cab 0d6e25bbf1f3082b739bb846d7c3ef21a58c79e6a65b72272a00cffc3d32aa47
+lib/codeql/rust/elements/MacroItems.qll 00a5d41f7bb836d952abbd9382e42f72a9d81e65646a15a460b35ccd07a866c6 00efdb4d701b5599d76096f740da9ec157804865267b7e29bc2a214cbf03763e
 lib/codeql/rust/elements/MacroPat.qll dbf193b4fb544ac0b5a7dcfc31a6652de7239b6e643ff15b05868b2c142e940c 19b45c0a1eb1198e450c05d564b5d4aa0d6da29e7db84b9521eadf901e20a932
 lib/codeql/rust/elements/MacroRules.qll a94535506798077043b9c1470992ac4310bf67bcce5f722080886d1b3e6d90d1 bd8e08a7171991abc85100b45267631e66d1b332caf1e5882cd17caee5cf18a3
-lib/codeql/rust/elements/MacroStmts.qll 66b3e877c4e3f8ef552152c92188aae7d5901a7b2e21dec581a61ee390be2fbc cc535cb6afb29783be37b1647d3267dd693c3434d42e1ab561d3a6a74ce20cfc
+lib/codeql/rust/elements/MacroStmts.qll 6e9a1f90231cb72b27d3ff9479e399a9fba4abd0872a5005ab2fac45d5ca9be0 d6ca3a8254fc45794a93c451a3305c9b4be033a467ad72158d40d6f675a377a0
 lib/codeql/rust/elements/MacroType.qll e5a153643e49a6be41483ad944550a030e0500764947b4e328cef6fa08c4fbd4 a42332c0a9c5cf7317fc49f3e1049e7751004fcc3efa056bbe058a8bfa2ef0cb
 lib/codeql/rust/elements/MatchArm.qll c39fd6cc0da24b1ff8d1e42835bcfee7695ad13580e3c7c50acd7c881b1cd894 62a31d2bd125e6aaebefc406e541a641271d3c497a377959f94dd4735b2bfbf8
 lib/codeql/rust/elements/MatchArmList.qll e6c48fd7419d88e996b82eb45e4aa2686dfd079b283b02be7710192fb2cb93a0 0ec63a0ca56f5f7f80093fd3e77b198b74c6289e67be55dc6a4deb610753c7bd
@@ -277,13 +277,13 @@ lib/codeql/rust/elements/internal/MacroDefImpl.qll f26e787ffd43e8cb079db01eba044
 lib/codeql/rust/elements/internal/MacroExprConstructor.qll b12edb21ea189a1b28d96309c69c3d08e08837621af22edd67ff9416c097d2df d35bc98e7b7b5451930214c0d93dce33a2c7b5b74f36bf99f113f53db1f19c14
 lib/codeql/rust/elements/internal/MacroExprImpl.qll 92dd9f658a85ae407e055f090385f451084de59190d8a00c7e1fba453c3eced4 89d544634fecdbead2ff06a26fc8132e127dab07f38b9322fa14dc55657b9f1a
 lib/codeql/rust/elements/internal/MacroItemsConstructor.qll 8e9ab7ec1e0f50a22605d4e993f99a85ca8059fbb506d67bc8f5a281af367b05 2602f9db31ea0c48192c3dde3bb5625a8ed1cae4cd3408729b9e09318d5bd071
-lib/codeql/rust/elements/internal/MacroItemsImpl.qll b20e9d0ba72de335ae1df33318339c9546c7f4c7ff25b3bf6eec884a2faa33bd 3bb159223eecb566004ce27457d5d97cd676f632be14b0411ff228a1d4e8e107
+lib/codeql/rust/elements/internal/MacroItemsImpl.qll 76fd50a1f27336e9efc6d3f73ef4d724f19627cadbaa805d1e14d2cfa4f19899 40c0e512090050b39b69128730f4f4581f51ffd3c687fb52913617bd70a144e9
 lib/codeql/rust/elements/internal/MacroPatConstructor.qll 24744c1bbe21c1d249a04205fb09795ae38ed106ba1423e86ccbc5e62359eaa2 4fac3f731a1ffd87c1230d561c5236bd28dcde0d1ce0dcd7d7a84ba393669d4a
 lib/codeql/rust/elements/internal/MacroPatImpl.qll 7470e2d88c38c7300a64986f058ba92bb22b4945438e2e0e268f180c4f267b71 c1507df74fc4c92887f3e0a4f857f54b61f174ffae5b1af6fb70f466175d658b
 lib/codeql/rust/elements/internal/MacroRulesConstructor.qll dc04726ad59915ec980501c4cd3b3d2ad774f454ddbf138ff5808eba6bd63dea 8d6bf20feb850c47d1176237027ef131f18c5cbb095f6ab8b3ec58cea9bce856
 lib/codeql/rust/elements/internal/MacroRulesImpl.qll 10c03adfb63ee7a4348ff5cffc6ef5300a531b048f28811a51e940b053e69f68 2498bd64aeaea9849c086abeaa6c248e4ce41b4436155f4bd4840965976d5d54
 lib/codeql/rust/elements/internal/MacroStmtsConstructor.qll c293815cd69c002ba6de1db6018672654420f3f8bdd143f9d0c620adddd2be02 d376f8f07661a8cad1b10039076fd7fca353dcacf3ca40ed6507b8c874e849ca
-lib/codeql/rust/elements/internal/MacroStmtsImpl.qll 7ce09c93fedbb6453fccbc081e7ec03d2e2a088c8ff3b27e28794258ac6ff553 d48681d5ed630a1b8d563d58fdb91aa32a73e3b21420d986c8e5415c9f80280f
+lib/codeql/rust/elements/internal/MacroStmtsImpl.qll 27faff9da93ad7f22a6236c73ebb4d4631161cf4ec1b82958cdf79c85aa2087c 7e2863eaf50d4b285b9240f2c5ff9497cfb4393c8528a0738d725d00f1a78406
 lib/codeql/rust/elements/internal/MacroTypeConstructor.qll 0a23573a6f69b38f3d7470050b16197601d67bdd5a4b1a43a155b0b99ccdf6b5 19b623962e8e1f73e55e3ed9712d2a3fe84b9510b99062173902feb2458ec12a
 lib/codeql/rust/elements/internal/MacroTypeImpl.qll b8711279f09f521b05bb67568c089271b7913f863ee64dfdeec2c502de2cbdc8 51bd9d3a2fb2065bce7b193b485e225ca5c8ba2029e60cab427d43a90baf0880
 lib/codeql/rust/elements/internal/MatchArmConstructor.qll b41c1d5822d54127ce376ef62c6a5fa60e11697319fc7d9c9c54fd313d784a93 96cca80e5684e5893c0e9c0dff365ef8ad9e15ff648c9969ba42d91f95abea05
@@ -518,10 +518,10 @@ lib/codeql/rust/elements/internal/generated/LoopExpr.qll 22b755dfaf238ecea722c0c
 lib/codeql/rust/elements/internal/generated/MacroCall.qll fc8988696493992cc4fdce8c0e5610c54ee92ea52ebb05262338f8b612353f50 188a2d7a484bd402a521787371e64f6e00e928306c8d437e6b19bf890a7aa14e
 lib/codeql/rust/elements/internal/generated/MacroDef.qll e9b3f07ba41aa12a8e0bd6ec1437b26a6c363065ce134b6d059478e96c2273a6 87470dea99da1a6afb3a19565291f9382e851ba864b50a995ac6f29589efbd70
 lib/codeql/rust/elements/internal/generated/MacroExpr.qll 03a1daa41866f51e479ac20f51f8406d04e9946b24f3875e3cf75a6b172c3d35 1ae8ca0ee96bd2be32575d87c07cc999a6ff7770151b66c0e3406f9454153786
-lib/codeql/rust/elements/internal/generated/MacroItems.qll ec02912230762f2759c3ed97ff52fded62ed14fb68d0807c8085a85152a5d4b1 c9cc4f8f0a1d63787995dde173f1bc8ac25351faa66b1d323e2ac1c894c9be85
+lib/codeql/rust/elements/internal/generated/MacroItems.qll 894890f61e118b3727d03ca813ae7220a15e45195f2d1d059cb1bba6802128c8 db3854b347f8782a3ec9f9a1439da822727b66f0bd33727383184ab65dbf29ac
 lib/codeql/rust/elements/internal/generated/MacroPat.qll 9e927e09d47029a3025eaad271c975e73479a80ea933c921381b6c9d751f2866 bdf5c58ca27743eb2e2dae2aeea3f3fc21f8a4f98fe1001598876455c88e8f69
 lib/codeql/rust/elements/internal/generated/MacroRules.qll 4fbd94f22b5ee0f3e5aaae39c2b9a5e9b7bf878a1017811ca589942f6de92843 49fb69543ee867bae196febea6918e621f335afdf4d3ccbf219965b37c7537b1
-lib/codeql/rust/elements/internal/generated/MacroStmts.qll 502cf5490259edaefeda30d00371a9d58872e8bfcd82fa4a30a2a1c510662949 91672ea8c4c0e1e8ef6c9628e21169dfc873da4424aaf544a3cb2b9a2c523b28
+lib/codeql/rust/elements/internal/generated/MacroStmts.qll cb4f3c2721a4d0c8522e51f567c675f4fc95f39bac8a2bd97e125d5553515ad2 09b5a739ccee75e6c556b34ecd6f78c7dc799029d9bc7df2e6169098d24f0ccd
 lib/codeql/rust/elements/internal/generated/MacroType.qll c462824df4a002956c036966d15cd0bce206e664888f8d0c7834dedb38b3c0bf 947480f07c40128ef3d00ad4c3a29a685472b3e20a661680c22f6bb318205ed1
 lib/codeql/rust/elements/internal/generated/MatchArm.qll 8fb740a0f2e308782d9cf390672969cd7cf6e698e5b847fb02ae3fa6c205646f 42bfe8dd94fc24ec925fbd44016df111600f99d1216c9a698631373bb6048830
 lib/codeql/rust/elements/internal/generated/MatchArmList.qll 13362680c037fe83fef4653562cc10a4429078316b5ec7c47b076336cf4aca2e 41c674293c13eceaca62134ae0c6778541f6a5201cbc5c146f0ba01b898dc267
@@ -553,7 +553,7 @@ lib/codeql/rust/elements/internal/generated/PtrType.qll 5f12b6ad29b4e5ce51c205e2
 lib/codeql/rust/elements/internal/generated/PureSynthConstructors.qll dc03515d678ba052c2ff2dd9f0883e0bce54cac740ba9a15e5173f292c1b6971 dc03515d678ba052c2ff2dd9f0883e0bce54cac740ba9a15e5173f292c1b6971
 lib/codeql/rust/elements/internal/generated/RangeExpr.qll 23cca03bf43535f33b22a38894f70d669787be4e4f5b8fe5c8f7b964d30e9027 18624cef6c6b679eeace2a98737e472432e0ead354cca02192b4d45330f047c9
 lib/codeql/rust/elements/internal/generated/RangePat.qll efd93730de217cf50dcba5875595263a5eadf9f7e4e1272401342a094d158614 229b251b3d118932e31e78ac4dfb75f48b766f240f20d436062785606d44467b
-lib/codeql/rust/elements/internal/generated/Raw.qll 37d705750dbbcddc20f86d03e98c0b9d381dfe7c050dd48587591ee5e94c7043 5db207a0a9a3b6d537f7ae2829913a5bc7c0fdb5fcc34bd3b3d1b80b748e8c67
+lib/codeql/rust/elements/internal/generated/Raw.qll 2584a84e50134d9f936e15a6a02e6d9db12d10115530f006fe322e9aad001473 c7cce257bbc41aa45d1275abd95c4cb9ee42335e934356f8666429afb34e0111
 lib/codeql/rust/elements/internal/generated/RecordExpr.qll eb6cb662e463f9260efae1a6ce874fa781172063b916ef1963f861e9942d308d 1a21cbccc8f3799ff13281e822818ebfb21d81591720a427cac3625512cb9d40
 lib/codeql/rust/elements/internal/generated/RecordExprField.qll 7e9f8663d3b74ebbc9603b10c9912f082febba6bd73d344b100bbd3edf837802 fbe6b578e7fd5d5a6f21bbb8c388957ab7210a6a249ec71510a50fb35b319ea1
 lib/codeql/rust/elements/internal/generated/RecordExprFieldList.qll 179a97211fe7aa6265085d4d54115cdbc0e1cd7c9b2135591e8f36d6432f13d3 dd44bbbc1e83a1ed3a587afb729d7debf7aeb7b63245de181726af13090e50c0
@@ -829,7 +829,8 @@ test/extractor-tests/generated/MacroDef/MacroDef_getName.ql 6bc8a17804f23782e98f
 test/extractor-tests/generated/MacroDef/MacroDef_getVisibility.ql d858ccaab381432c529bf4a621afc82ea5e4b810b463f2b1f551de79908e14e7 83a85c4f90417ab44570a862642d8f8fc9208e62ba20ca69b32d39a3190381aa
 test/extractor-tests/generated/MacroExpr/MacroExpr.ql 69445cf24f5bec5c3f11f0ebf13604891bb2c0dffe715612628e5572587c7a6c 5434db79d94e437c86126d9cf20bf1e86e5537f462a57b9bf6b22a2caa95cc40
 test/extractor-tests/generated/MacroExpr/MacroExpr_getMacroCall.ql 8859743e23b987225a6a1933054a1ed8f5f1442b61a769599e2efd143f4feb9e d2d336135ff4d2ea65e79430dee8d0f69f9d7818a674f5446903d986f3948b92
-test/extractor-tests/generated/MacroItems/MISSING_SOURCE.txt b6cf5771fdbbe981aeb3f443ec7a40517b6e99ffc9817fd8872c2e344240dae1 b6cf5771fdbbe981aeb3f443ec7a40517b6e99ffc9817fd8872c2e344240dae1
+test/extractor-tests/generated/MacroItems/MacroItems.ql 876b5d2a4ce7dcb599e022083ff3f2d57300bcb0ea05f61069d59ad58353ca69 61ea54d4633ef871d3e634069e39fbb2545f7dc2796fa66f8edbacd4e0aa4ef5
+test/extractor-tests/generated/MacroItems/MacroItems_getItem.ql 53fc2db35a23b9aca6ee327d2a51202d23ddf482e6bdd92c5399b7f3a73959b1 63051c8b7a7bfbe9cc640f775e753c9a82f1eb8472989f7d3c8af94fdf26c7a0
 test/extractor-tests/generated/MacroPat/MacroPat.ql d9ec72d4d6a7342ee2d9aa7e90227faa31792ca5842fe948d7fdf22597a123b7 74b0f21ef2bb6c13aae74dba1eea97451755110909a083360e2c56cfbc76fd91
 test/extractor-tests/generated/MacroPat/MacroPat_getMacroCall.ql 398996f0d0f2aa6d3b58d80b26c7d1185b5094d455c6c5c7f075f6d414150aa6 b4662e57cac36ed0e692201f53ba46c3d0826bba99c5cc6dfcb302b44dd2154b
 test/extractor-tests/generated/MacroRules/MacroRules.ql 0742faf18179fa34e0f43361e9e4b807bfc242d232f6b3664a35e138a47d39c5 10e1cf45f32a27cb46bd61f5dd45416e2c0c9f25e880f6d213597a7d96e19103
@@ -837,7 +838,9 @@ test/extractor-tests/generated/MacroRules/MacroRules_getAttr.ql 7de501c724e34655
 test/extractor-tests/generated/MacroRules/MacroRules_getName.ql 591606e3accae8b8fb49e1218c4867a42724ac209cf99786db0e5d7ea0bf55d5 d2936ef5aa4bbf024372516dde3de578990aafb2b8675bbbf0f72e8b54eb82a8
 test/extractor-tests/generated/MacroRules/MacroRules_getTokenTree.ql 7598d33c3d86f9ad8629219b90667b2b65e3a1e18c6b0887291df9455a319cab 69d90446743e78e851145683c17677497fe42ed02f61f2b2974e216dc6e05b01
 test/extractor-tests/generated/MacroRules/MacroRules_getVisibility.ql 5306cc85f470d21ebcbe6e98436334b0bf5ba819a0ae186569ba7e88c31636c6 fcbf5c54e5a904767a6f4d37d853072aa0040738e622c49c9a02dec8739d6587
-test/extractor-tests/generated/MacroStmts/MISSING_SOURCE.txt b6cf5771fdbbe981aeb3f443ec7a40517b6e99ffc9817fd8872c2e344240dae1 b6cf5771fdbbe981aeb3f443ec7a40517b6e99ffc9817fd8872c2e344240dae1
+test/extractor-tests/generated/MacroStmts/MacroStmts.ql 991042263ba99acef0972697ce79132e5650b27bf53be2f975a0da1f29940fd8 64c44e65b3c5d3de5f9532b4ff7ce54b39442b37f63da8b10d789b9b52b85a9e
+test/extractor-tests/generated/MacroStmts/MacroStmts_getExpr.ql 5717f20376600e7bf5e471beae1a7c0084f235f0931f8b3f25d2de94ebb86f8b e4685fd9d45b078a6402c285eed3a15cc4550f6656c8bc5e7e274a88d1c7e9b3
+test/extractor-tests/generated/MacroStmts/MacroStmts_getStatement.ql 8958b2212776f487869c29314e7d28f5871f5c3dde62fd9d6f87fb9e94204498 6804f5d4c0c5909689bdcdd5b8ec11ca7a8c0399b47695f66d2f99e39561565a
 test/extractor-tests/generated/MacroType/MacroType.ql 408327fdb4d7cf096536457401cc280f83cd7e4f6fa9aebd65e64031f6c119cf 0c502d25194ab96eb068a85e3f57a9217510a951fa923e9d7a20fd75412bd6da
 test/extractor-tests/generated/MacroType/MacroType_getMacroCall.ql 565be7a72670218d7999d3f6cec4e704b754c217186243f1b24c334589fa82e2 ba413c712783320188800e2a78738b09c40fe9a6305c08d9e67e971a8fca96ee
 test/extractor-tests/generated/MatchArm/MatchArm.ql 512aa404c94ba40b859564f07e9dffe6a5e687fafb039556e9145f4f3742981c 529f96e38cede8a26054f8981d4ba1d189c17d14d0f92d622eb20acd8f3d7e5d
diff --git a/rust/ql/.gitattributes b/rust/ql/.gitattributes
index b64b089a2f21..22b87763a2d9 100644
--- a/rust/ql/.gitattributes
+++ b/rust/ql/.gitattributes
@@ -831,7 +831,8 @@
 /test/extractor-tests/generated/MacroDef/MacroDef_getVisibility.ql linguist-generated
 /test/extractor-tests/generated/MacroExpr/MacroExpr.ql linguist-generated
 /test/extractor-tests/generated/MacroExpr/MacroExpr_getMacroCall.ql linguist-generated
-/test/extractor-tests/generated/MacroItems/MISSING_SOURCE.txt linguist-generated
+/test/extractor-tests/generated/MacroItems/MacroItems.ql linguist-generated
+/test/extractor-tests/generated/MacroItems/MacroItems_getItem.ql linguist-generated
 /test/extractor-tests/generated/MacroPat/MacroPat.ql linguist-generated
 /test/extractor-tests/generated/MacroPat/MacroPat_getMacroCall.ql linguist-generated
 /test/extractor-tests/generated/MacroRules/MacroRules.ql linguist-generated
@@ -839,7 +840,9 @@
 /test/extractor-tests/generated/MacroRules/MacroRules_getName.ql linguist-generated
 /test/extractor-tests/generated/MacroRules/MacroRules_getTokenTree.ql linguist-generated
 /test/extractor-tests/generated/MacroRules/MacroRules_getVisibility.ql linguist-generated
-/test/extractor-tests/generated/MacroStmts/MISSING_SOURCE.txt linguist-generated
+/test/extractor-tests/generated/MacroStmts/MacroStmts.ql linguist-generated
+/test/extractor-tests/generated/MacroStmts/MacroStmts_getExpr.ql linguist-generated
+/test/extractor-tests/generated/MacroStmts/MacroStmts_getStatement.ql linguist-generated
 /test/extractor-tests/generated/MacroType/MacroType.ql linguist-generated
 /test/extractor-tests/generated/MacroType/MacroType_getMacroCall.ql linguist-generated
 /test/extractor-tests/generated/MatchArm/MatchArm.ql linguist-generated
diff --git a/rust/ql/lib/codeql/rust/elements/MacroItems.qll b/rust/ql/lib/codeql/rust/elements/MacroItems.qll
index 621c9884a57d..e189c0dca2e0 100644
--- a/rust/ql/lib/codeql/rust/elements/MacroItems.qll
+++ b/rust/ql/lib/codeql/rust/elements/MacroItems.qll
@@ -7,4 +7,12 @@ private import internal.MacroItemsImpl
 import codeql.rust.elements.AstNode
 import codeql.rust.elements.Item
 
+/**
+ * A sequence of items generated by a `MacroCall`. For example:
+ * ```rust
+ * mod foo{
+ *     include!("common_definitions.rs");
+ * }
+ * ```
+ */
 final class MacroItems = Impl::MacroItems;
diff --git a/rust/ql/lib/codeql/rust/elements/MacroStmts.qll b/rust/ql/lib/codeql/rust/elements/MacroStmts.qll
index a47f35ddeba5..77416d936995 100644
--- a/rust/ql/lib/codeql/rust/elements/MacroStmts.qll
+++ b/rust/ql/lib/codeql/rust/elements/MacroStmts.qll
@@ -8,4 +8,12 @@ import codeql.rust.elements.AstNode
 import codeql.rust.elements.Expr
 import codeql.rust.elements.Stmt
 
+/**
+ * A sequence of statements generated by a `MacroCall`. For example:
+ * ```rust
+ * fn main() {
+ *     println!("Hello, world!"); // This macro expands into a list of statements
+ * }
+ * ```
+ */
 final class MacroStmts = Impl::MacroStmts;
diff --git a/rust/ql/lib/codeql/rust/elements/internal/MacroItemsImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/MacroItemsImpl.qll
index 9d04aff8b24e..2ed6536fac87 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/MacroItemsImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/MacroItemsImpl.qll
@@ -12,5 +12,13 @@ private import codeql.rust.elements.internal.generated.MacroItems
  * be referenced directly.
  */
 module Impl {
+  /**
+   * A sequence of items generated by a `MacroCall`. For example:
+   * ```rust
+   * mod foo{
+   *     include!("common_definitions.rs");
+   * }
+   * ```
+   */
   class MacroItems extends Generated::MacroItems { }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/MacroStmtsImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/MacroStmtsImpl.qll
index 432a28e66ced..8ec38e3c5266 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/MacroStmtsImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/MacroStmtsImpl.qll
@@ -12,5 +12,13 @@ private import codeql.rust.elements.internal.generated.MacroStmts
  * be referenced directly.
  */
 module Impl {
+  /**
+   * A sequence of statements generated by a `MacroCall`. For example:
+   * ```rust
+   * fn main() {
+   *     println!("Hello, world!"); // This macro expands into a list of statements
+   * }
+   * ```
+   */
   class MacroStmts extends Generated::MacroStmts { }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/MacroItems.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/MacroItems.qll
index b9c802be8433..c86181ff5d5c 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/MacroItems.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/MacroItems.qll
@@ -15,6 +15,12 @@ import codeql.rust.elements.Item
  */
 module Generated {
   /**
+   * A sequence of items generated by a `MacroCall`. For example:
+   * ```rust
+   * mod foo{
+   *     include!("common_definitions.rs");
+   * }
+   * ```
    * INTERNAL: Do not reference the `Generated::MacroItems` class directly.
    * Use the subclass `MacroItems`, where the following predicates are available.
    */
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/MacroStmts.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/MacroStmts.qll
index 331277241fa5..e80debcb27dc 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/MacroStmts.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/MacroStmts.qll
@@ -16,6 +16,12 @@ import codeql.rust.elements.Stmt
  */
 module Generated {
   /**
+   * A sequence of statements generated by a `MacroCall`. For example:
+   * ```rust
+   * fn main() {
+   *     println!("Hello, world!"); // This macro expands into a list of statements
+   * }
+   * ```
    * INTERNAL: Do not reference the `Generated::MacroStmts` class directly.
    * Use the subclass `MacroStmts`, where the following predicates are available.
    */
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/Raw.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/Raw.qll
index aa426bd92aef..0a4506ab4b7d 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/Raw.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/Raw.qll
@@ -331,6 +331,12 @@ module Raw {
 
   /**
    * INTERNAL: Do not use.
+   * A sequence of items generated by a `MacroCall`. For example:
+   * ```rust
+   * mod foo{
+   *     include!("common_definitions.rs");
+   * }
+   * ```
    */
   class MacroItems extends @macro_items, AstNode {
     override string toString() { result = "MacroItems" }
@@ -343,6 +349,12 @@ module Raw {
 
   /**
    * INTERNAL: Do not use.
+   * A sequence of statements generated by a `MacroCall`. For example:
+   * ```rust
+   * fn main() {
+   *     println!("Hello, world!"); // This macro expands into a list of statements
+   * }
+   * ```
    */
   class MacroStmts extends @macro_stmts, AstNode {
     override string toString() { result = "MacroStmts" }
diff --git a/rust/ql/test/extractor-tests/generated/.generated_tests.list b/rust/ql/test/extractor-tests/generated/.generated_tests.list
index 9cd5c07427a8..62b8447a136d 100644
--- a/rust/ql/test/extractor-tests/generated/.generated_tests.list
+++ b/rust/ql/test/extractor-tests/generated/.generated_tests.list
@@ -57,8 +57,10 @@ LoopExpr/gen_loop_expr.rs 35deaf35e765db4ae3124a11284266d8f341d1ce7b700030efada0
 MacroCall/gen_macro_call.rs 139ef2c69323eea1a901e260d4e2acdd00b26f013b90c9344f48c6503ce29d79 139ef2c69323eea1a901e260d4e2acdd00b26f013b90c9344f48c6503ce29d79
 MacroDef/gen_macro_def.rs 17c5387fb464a60b4a4520d22b055ba35ff23e9fe431a18a33808ae02c4bbff5 17c5387fb464a60b4a4520d22b055ba35ff23e9fe431a18a33808ae02c4bbff5
 MacroExpr/gen_macro_expr.rs 3c23dc88fcc4bc8f97d9364d2f367671a0a5a63d07e52237d28204b64756dcdb 3c23dc88fcc4bc8f97d9364d2f367671a0a5a63d07e52237d28204b64756dcdb
+MacroItems/gen_macro_items.rs 8ef3e16b73635dc97afa3ffa4db2bb21a8f1b435176861a594b0200cc5b9b931 8ef3e16b73635dc97afa3ffa4db2bb21a8f1b435176861a594b0200cc5b9b931
 MacroPat/gen_macro_pat.rs b8041370598bd7fb26778d829a15c415c2078d69124f6af634ddeba13a114aa0 b8041370598bd7fb26778d829a15c415c2078d69124f6af634ddeba13a114aa0
 MacroRules/gen_macro_rules.rs 7e03b410f4669e422d3b4328f7aafdca2e286e5d951495dd69cee0d44cb793a9 7e03b410f4669e422d3b4328f7aafdca2e286e5d951495dd69cee0d44cb793a9
+MacroStmts/gen_macro_stmts.rs 2e45dcf44bf2e8404b49ce9abeee4931572693174b5d96f3fd81eb40ea8e7b4b 2e45dcf44bf2e8404b49ce9abeee4931572693174b5d96f3fd81eb40ea8e7b4b
 MacroType/gen_macro_type.rs 84db79c78860512b14f885391fcae999ca7282f2d8a9ab65d30cc413d5bbebd0 84db79c78860512b14f885391fcae999ca7282f2d8a9ab65d30cc413d5bbebd0
 MatchArm/gen_match_arm.rs ac75b4836a103e2755bd47a1ee1b74af6eb8349adc4ebedaaa27b3ea3ae41aa5 ac75b4836a103e2755bd47a1ee1b74af6eb8349adc4ebedaaa27b3ea3ae41aa5
 MatchArmList/gen_match_arm_list.rs dbf36444d371421a2b8768a188660dd45ed3b823fb1c56b90c1ba77f177d23d6 dbf36444d371421a2b8768a188660dd45ed3b823fb1c56b90c1ba77f177d23d6
diff --git a/rust/ql/test/extractor-tests/generated/.gitattributes b/rust/ql/test/extractor-tests/generated/.gitattributes
index 573ce113977e..136801c1ce37 100644
--- a/rust/ql/test/extractor-tests/generated/.gitattributes
+++ b/rust/ql/test/extractor-tests/generated/.gitattributes
@@ -59,8 +59,10 @@
 /MacroCall/gen_macro_call.rs linguist-generated
 /MacroDef/gen_macro_def.rs linguist-generated
 /MacroExpr/gen_macro_expr.rs linguist-generated
+/MacroItems/gen_macro_items.rs linguist-generated
 /MacroPat/gen_macro_pat.rs linguist-generated
 /MacroRules/gen_macro_rules.rs linguist-generated
+/MacroStmts/gen_macro_stmts.rs linguist-generated
 /MacroType/gen_macro_type.rs linguist-generated
 /MatchArm/gen_match_arm.rs linguist-generated
 /MatchArmList/gen_match_arm_list.rs linguist-generated
diff --git a/rust/ql/test/extractor-tests/generated/MacroItems/MISSING_SOURCE.txt b/rust/ql/test/extractor-tests/generated/MacroItems/MISSING_SOURCE.txt
deleted file mode 100644
index 7f96b17b1f3c..000000000000
--- a/rust/ql/test/extractor-tests/generated/MacroItems/MISSING_SOURCE.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-// generated by codegen, do not edit
-
-After a source file is added in this directory and codegen is run again, test queries
-will appear and this file will be deleted
diff --git a/rust/ql/test/extractor-tests/generated/MacroItems/MacroItems.expected b/rust/ql/test/extractor-tests/generated/MacroItems/MacroItems.expected
new file mode 100644
index 000000000000..6ef208f9c742
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/MacroItems/MacroItems.expected
@@ -0,0 +1 @@
+| file://:0:0:0:0 | MacroItems | getNumberOfItems: | 2 |
diff --git a/rust/ql/test/extractor-tests/generated/MacroItems/MacroItems.ql b/rust/ql/test/extractor-tests/generated/MacroItems/MacroItems.ql
new file mode 100644
index 000000000000..cd72b24c18d9
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/MacroItems/MacroItems.ql
@@ -0,0 +1,10 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from MacroItems x, int getNumberOfItems
+where
+  toBeTested(x) and
+  not x.isUnknown() and
+  getNumberOfItems = x.getNumberOfItems()
+select x, "getNumberOfItems:", getNumberOfItems
diff --git a/rust/ql/test/extractor-tests/generated/MacroItems/MacroItems_getItem.expected b/rust/ql/test/extractor-tests/generated/MacroItems/MacroItems_getItem.expected
new file mode 100644
index 000000000000..a66e6bcca5ec
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/MacroItems/MacroItems_getItem.expected
@@ -0,0 +1,2 @@
+| file://:0:0:0:0 | MacroItems | 0 | file://:0:0:0:0 | Use |
+| file://:0:0:0:0 | MacroItems | 1 | file://:0:0:0:0 | get_parent |
diff --git a/rust/ql/test/extractor-tests/generated/MacroItems/MacroItems_getItem.ql b/rust/ql/test/extractor-tests/generated/MacroItems/MacroItems_getItem.ql
new file mode 100644
index 000000000000..09aaa2b8be7a
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/MacroItems/MacroItems_getItem.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from MacroItems x, int index
+where toBeTested(x) and not x.isUnknown()
+select x, index, x.getItem(index)
diff --git a/rust/ql/test/extractor-tests/generated/MacroItems/common_definitions.rs b/rust/ql/test/extractor-tests/generated/MacroItems/common_definitions.rs
new file mode 100644
index 000000000000..95a388ea93dd
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/MacroItems/common_definitions.rs
@@ -0,0 +1,5 @@
+use std::path::Path;
+
+fn get_parent(path: &Path) -> &Path {
+    path.parent().unwrap()
+}
diff --git a/rust/ql/test/extractor-tests/generated/MacroItems/gen_macro_items.rs b/rust/ql/test/extractor-tests/generated/MacroItems/gen_macro_items.rs
new file mode 100644
index 000000000000..08914ad04525
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/MacroItems/gen_macro_items.rs
@@ -0,0 +1,6 @@
+// generated by codegen, do not edit
+
+// A sequence of items generated by a `MacroCall`. For example:
+mod foo{
+    include!("common_definitions.rs");
+}
diff --git a/rust/ql/test/extractor-tests/generated/MacroStmts/MISSING_SOURCE.txt b/rust/ql/test/extractor-tests/generated/MacroStmts/MISSING_SOURCE.txt
deleted file mode 100644
index 7f96b17b1f3c..000000000000
--- a/rust/ql/test/extractor-tests/generated/MacroStmts/MISSING_SOURCE.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-// generated by codegen, do not edit
-
-After a source file is added in this directory and codegen is run again, test queries
-will appear and this file will be deleted
diff --git a/rust/ql/test/extractor-tests/generated/MacroStmts/MacroStmts.expected b/rust/ql/test/extractor-tests/generated/MacroStmts/MacroStmts.expected
new file mode 100644
index 000000000000..e74a5e4e8575
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/MacroStmts/MacroStmts.expected
@@ -0,0 +1 @@
+| gen_macro_stmts.rs:5:14:5:28 | MacroStmts | hasExpr: | yes | getNumberOfStatements: | 0 |
diff --git a/rust/ql/test/extractor-tests/generated/MacroStmts/MacroStmts.ql b/rust/ql/test/extractor-tests/generated/MacroStmts/MacroStmts.ql
new file mode 100644
index 000000000000..189e280605ce
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/MacroStmts/MacroStmts.ql
@@ -0,0 +1,11 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from MacroStmts x, string hasExpr, int getNumberOfStatements
+where
+  toBeTested(x) and
+  not x.isUnknown() and
+  (if x.hasExpr() then hasExpr = "yes" else hasExpr = "no") and
+  getNumberOfStatements = x.getNumberOfStatements()
+select x, "hasExpr:", hasExpr, "getNumberOfStatements:", getNumberOfStatements
diff --git a/rust/ql/test/extractor-tests/generated/MacroStmts/MacroStmts_getExpr.expected b/rust/ql/test/extractor-tests/generated/MacroStmts/MacroStmts_getExpr.expected
new file mode 100644
index 000000000000..7d30926c1528
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/MacroStmts/MacroStmts_getExpr.expected
@@ -0,0 +1 @@
+| gen_macro_stmts.rs:5:14:5:28 | MacroStmts | gen_macro_stmts.rs:5:14:5:28 | BlockExpr |
diff --git a/rust/ql/test/extractor-tests/generated/MacroStmts/MacroStmts_getExpr.ql b/rust/ql/test/extractor-tests/generated/MacroStmts/MacroStmts_getExpr.ql
new file mode 100644
index 000000000000..f03854ddb147
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/MacroStmts/MacroStmts_getExpr.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from MacroStmts x
+where toBeTested(x) and not x.isUnknown()
+select x, x.getExpr()
diff --git a/rust/ql/test/extractor-tests/generated/MacroStmts/MacroStmts_getStatement.expected b/rust/ql/test/extractor-tests/generated/MacroStmts/MacroStmts_getStatement.expected
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/rust/ql/test/extractor-tests/generated/MacroStmts/MacroStmts_getStatement.ql b/rust/ql/test/extractor-tests/generated/MacroStmts/MacroStmts_getStatement.ql
new file mode 100644
index 000000000000..0d0743de096e
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/MacroStmts/MacroStmts_getStatement.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from MacroStmts x, int index
+where toBeTested(x) and not x.isUnknown()
+select x, index, x.getStatement(index)
diff --git a/rust/ql/test/extractor-tests/generated/MacroStmts/gen_macro_stmts.rs b/rust/ql/test/extractor-tests/generated/MacroStmts/gen_macro_stmts.rs
new file mode 100644
index 000000000000..035b7ddc98c6
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/MacroStmts/gen_macro_stmts.rs
@@ -0,0 +1,6 @@
+// generated by codegen, do not edit
+
+// A sequence of statements generated by a `MacroCall`. For example:
+fn main() {
+    println!("Hello, world!"); // This macro expands into a list of statements
+}
diff --git a/rust/schema/annotations.py b/rust/schema/annotations.py
index 8fc7d3e59c31..2046aa9e5365 100644
--- a/rust/schema/annotations.py
+++ b/rust/schema/annotations.py
@@ -1166,6 +1166,19 @@ class _:
     """
 
 
+@annotate(MacroItems)
+@rust.doc_test_signature(None)
+class _:
+    """
+    A sequence of items generated by a `MacroCall`. For example:
+    ```rust
+    mod foo{
+        include!("common_definitions.rs");
+    }
+    ```
+    """
+
+
 @annotate(MacroPat)
 class _:
     """
@@ -1186,6 +1199,19 @@ class _:
     """
 
 
+@annotate(MacroStmts)
+@rust.doc_test_signature(None)
+class _:
+    """
+    A sequence of statements generated by a `MacroCall`. For example:
+    ```rust
+    fn main() {
+        println!("Hello, world!"); // This macro expands into a list of statements
+    }
+    ```
+    """
+
+
 @annotate(MacroType)
 class _:
     """

From 7420d07935d166daaf4f7387bac21339315035cb Mon Sep 17 00:00:00 2001
From: Geoffrey White <40627776+geoffw0@users.noreply.github.com>
Date: Thu, 10 Oct 2024 15:54:14 +0100
Subject: [PATCH 300/347] Update ruby/ql/lib/codeql/ruby/AST.qll

Co-authored-by: Arthur Baars <aibaars@github.com>
---
 ruby/ql/lib/codeql/ruby/AST.qll | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ruby/ql/lib/codeql/ruby/AST.qll b/ruby/ql/lib/codeql/ruby/AST.qll
index e98749af4273..bd42696a8dbe 100644
--- a/ruby/ql/lib/codeql/ruby/AST.qll
+++ b/ruby/ql/lib/codeql/ruby/AST.qll
@@ -172,7 +172,7 @@ class RubyFile extends File {
  * A successfully extracted file, that is, a file that was extracted and
  * contains no extraction errors or warnings.
  */
-class SuccessfullyExtractedFile extends RubyFile {
+class SuccessfullyExtractedFile extends File {
   SuccessfullyExtractedFile() {
     not exists(Diagnostic d |
       d.getLocation().getFile() = this and

From f1a350c96a752154cc26da755366a1931777ed8e Mon Sep 17 00:00:00 2001
From: Jeroen Ketema <jketema@github.com>
Date: Thu, 10 Oct 2024 20:00:55 +0200
Subject: [PATCH 301/347] C++: Print handler parameters in PrintAST

---
 cpp/ql/lib/semmle/code/cpp/PrintAST.qll       | 20 +++++++++++++++++++
 .../examples/expressions/PrintAST.expected    |  2 ++
 .../library-tests/ir/ir/PrintAST.expected     | 14 +++++++++++++
 3 files changed, 36 insertions(+)

diff --git a/cpp/ql/lib/semmle/code/cpp/PrintAST.qll b/cpp/ql/lib/semmle/code/cpp/PrintAST.qll
index 6194710f0c58..3bdbd637cca6 100644
--- a/cpp/ql/lib/semmle/code/cpp/PrintAST.qll
+++ b/cpp/ql/lib/semmle/code/cpp/PrintAST.qll
@@ -80,6 +80,8 @@ private Declaration getAnEnclosingDeclaration(Locatable ast) {
   or
   result = ast.(Parameter).getFunction()
   or
+  result = ast.(Parameter).getCatchBlock().getEnclosingFunction()
+  or
   result = ast.(Expr).getEnclosingDeclaration()
   or
   result = ast.(Initializer).getDeclaration()
@@ -510,6 +512,22 @@ class DeclStmtNode extends StmtNode {
   }
 }
 
+/**
+ * A node representing a `Handler`.
+ */
+class HandlerNode extends ChildStmtNode {
+  Handler handler;
+
+  HandlerNode() { handler = stmt }
+
+  override BaseAstNode getChildInternal(int childIndex) {
+    result = super.getChildInternal(childIndex)
+    or
+    childIndex = -1 and
+    result.getAst() = handler.getParameter()
+  }
+}
+
 /**
  * A node representing a `Parameter`.
  */
@@ -754,6 +772,8 @@ private predicate namedStmtChildPredicates(Locatable s, Element e, string pred)
     or
     s.(ConstexprIfStmt).getElse() = e and pred = "getElse()"
     or
+    s.(Handler).getParameter() = e and pred = "getParameter()"
+    or
     s.(IfStmt).getInitialization() = e and pred = "getInitialization()"
     or
     s.(IfStmt).getCondition() = e and pred = "getCondition()"
diff --git a/cpp/ql/test/examples/expressions/PrintAST.expected b/cpp/ql/test/examples/expressions/PrintAST.expected
index 7de95cb8b4a4..e8e753becb56 100644
--- a/cpp/ql/test/examples/expressions/PrintAST.expected
+++ b/cpp/ql/test/examples/expressions/PrintAST.expected
@@ -870,6 +870,8 @@ Throw.cpp:
 #    8|               Type = [BoolType] bool
 #    8|               ValueCategory = prvalue
 #   12|       getChild(1): [Handler] <handler>
+#   12|         getParameter(): [Parameter] e
+#   12|             Type = [PointerType] E *
 #   12|         getBlock(): [CatchBlock] { ... }
 #   13|           getStmt(0): [ExprStmt] ExprStmt
 #   13|             getExpr(): [ReThrowExpr] re-throw exception 
diff --git a/cpp/ql/test/library-tests/ir/ir/PrintAST.expected b/cpp/ql/test/library-tests/ir/ir/PrintAST.expected
index 1e0ef80c269b..510d13fdfa2b 100644
--- a/cpp/ql/test/library-tests/ir/ir/PrintAST.expected
+++ b/cpp/ql/test/library-tests/ir/ir/PrintAST.expected
@@ -9055,6 +9055,8 @@ ir.cpp:
 #  733|                 Value = [Literal] 7
 #  733|                 ValueCategory = prvalue
 #  735|       getChild(1): [Handler] <handler>
+#  735|         getParameter(): [Parameter] s
+#  735|             Type = [PointerType] const char *
 #  735|         getBlock(): [CatchBlock] { ... }
 #  736|           getStmt(0): [ExprStmt] ExprStmt
 #  736|             getExpr(): [ThrowExpr] throw ...
@@ -9067,6 +9069,8 @@ ir.cpp:
 #  736|                     Type = [PointerType] const char *
 #  736|                     ValueCategory = prvalue(load)
 #  738|       getChild(2): [Handler] <handler>
+#  738|         getParameter(): [Parameter] e
+#  738|             Type = [LValueReferenceType] const String &
 #  738|         getBlock(): [CatchBlock] { ... }
 #  740|       getChild(3): [Handler] <handler>
 #  740|         getBlock(): [CatchAnyBlock] { ... }
@@ -12852,6 +12856,8 @@ ir.cpp:
 # 1200|                 Value = [Literal] 7
 # 1200|                 ValueCategory = prvalue
 # 1202|       getChild(1): [Handler] <handler>
+# 1202|         getParameter(): [Parameter] s
+# 1202|             Type = [PointerType] const char *
 # 1202|         getBlock(): [CatchBlock] { ... }
 # 1203|           getStmt(0): [ExprStmt] ExprStmt
 # 1203|             getExpr(): [ThrowExpr] throw ...
@@ -12864,6 +12870,8 @@ ir.cpp:
 # 1203|                     Type = [PointerType] const char *
 # 1203|                     ValueCategory = prvalue(load)
 # 1205|       getChild(2): [Handler] <handler>
+# 1205|         getParameter(): [Parameter] e
+# 1205|             Type = [LValueReferenceType] const String &
 # 1205|         getBlock(): [CatchBlock] { ... }
 # 1207|     getStmt(1): [ReturnStmt] return ...
 # 1211| [TopLevelFunction] void VectorTypes(int)
@@ -20586,6 +20594,8 @@ ir.cpp:
 # 2281|               Type = [Struct] String
 # 2281|               ValueCategory = lvalue
 # 2282|       getChild(1): [Handler] <handler>
+# 2282|         getParameter(): [Parameter] s
+# 2282|             Type = [PointerType] const char *
 # 2282|         getBlock(): [CatchBlock] { ... }
 # 2283|           getStmt(0): [ExprStmt] ExprStmt
 # 2283|             getExpr(): [ThrowExpr] throw ...
@@ -20598,6 +20608,8 @@ ir.cpp:
 # 2283|                     Type = [PointerType] const char *
 # 2283|                     ValueCategory = prvalue(load)
 # 2285|       getChild(2): [Handler] <handler>
+# 2285|         getParameter(): [Parameter] e
+# 2285|             Type = [LValueReferenceType] const String &
 # 2285|         getBlock(): [CatchBlock] { ... }
 # 2287|       getChild(3): [Handler] <handler>
 # 2287|         getBlock(): [CatchAnyBlock] { ... }
@@ -22845,6 +22857,8 @@ ir.cpp:
 # 2537|                 Value = [Literal] 42
 # 2537|                 ValueCategory = prvalue
 # 2539|       getChild(1): [Handler] <handler>
+# 2539|         getParameter(): [Parameter] (unnamed parameter 0)
+# 2539|             Type = [PlainCharType] char
 # 2539|         getBlock(): [CatchBlock] { ... }
 # 2541|         getImplicitDestructorCall(0): [DestructorCall] call to ~ClassWithDestructor
 # 2541|             Type = [VoidType] void

From 665da3958a39a986092f6e6470bbb7f6b0ac8c35 Mon Sep 17 00:00:00 2001
From: Tom Hvitved <hvitved@github.com>
Date: Thu, 10 Oct 2024 09:47:05 +0200
Subject: [PATCH 302/347] Rust: Add CFG test for nested function

---
 .../library-tests/controlflow/Cfg.expected    | 20 +++++++++++++++++++
 .../ql/test/library-tests/controlflow/test.rs |  8 ++++++++
 2 files changed, 28 insertions(+)

diff --git a/rust/ql/test/library-tests/controlflow/Cfg.expected b/rust/ql/test/library-tests/controlflow/Cfg.expected
index 036dca8af5a3..4c3a60312f9a 100644
--- a/rust/ql/test/library-tests/controlflow/Cfg.expected
+++ b/rust/ql/test/library-tests/controlflow/Cfg.expected
@@ -565,6 +565,26 @@ edges
 | test.rs:299:13:299:27 | ExprStmt | test.rs:299:26:299:26 | 1 |  |
 | test.rs:299:26:299:26 | 1 | test.rs:299:13:299:26 | BreakExpr |  |
 | test.rs:301:9:301:9 | x | test.rs:296:18:302:5 | BlockExpr |  |
+| test.rs:305:1:311:1 | enter test_nested_function | test.rs:306:5:306:18 | LetStmt |  |
+| test.rs:305:1:311:1 | exit test_nested_function (normal) | test.rs:305:1:311:1 | exit test_nested_function |  |
+| test.rs:305:27:311:1 | BlockExpr | test.rs:305:1:311:1 | exit test_nested_function (normal) |  |
+| test.rs:306:5:306:18 | LetStmt | test.rs:306:17:306:17 | 0 |  |
+| test.rs:306:9:306:13 | x | test.rs:307:5:309:5 | nested | match, no-match |
+| test.rs:306:17:306:17 | 0 | test.rs:306:9:306:13 | x |  |
+| test.rs:307:5:309:5 | enter nested | test.rs:308:9:308:16 | ExprStmt |  |
+| test.rs:307:5:309:5 | exit nested (normal) | test.rs:307:5:309:5 | exit nested |  |
+| test.rs:307:5:309:5 | nested | test.rs:310:5:310:19 | ExprStmt |  |
+| test.rs:307:29:309:5 | BlockExpr | test.rs:307:5:309:5 | exit nested (normal) |  |
+| test.rs:308:9:308:10 | * ... | test.rs:308:15:308:15 | 1 |  |
+| test.rs:308:9:308:15 | ... += ... | test.rs:307:29:309:5 | BlockExpr |  |
+| test.rs:308:9:308:16 | ExprStmt | test.rs:308:10:308:10 | x |  |
+| test.rs:308:10:308:10 | x | test.rs:308:9:308:10 | * ... |  |
+| test.rs:308:15:308:15 | 1 | test.rs:308:9:308:15 | ... += ... |  |
+| test.rs:310:5:310:10 | PathExpr | test.rs:310:17:310:17 | x |  |
+| test.rs:310:5:310:18 | CallExpr | test.rs:305:27:311:1 | BlockExpr |  |
+| test.rs:310:5:310:19 | ExprStmt | test.rs:310:5:310:10 | PathExpr |  |
+| test.rs:310:12:310:17 | RefExpr | test.rs:310:5:310:18 | CallExpr |  |
+| test.rs:310:17:310:17 | x | test.rs:310:12:310:17 | RefExpr |  |
 breakTarget
 | test.rs:16:17:16:21 | BreakExpr | test.rs:10:9:22:9 | LoopExpr |
 | test.rs:30:21:30:25 | BreakExpr | test.rs:28:13:35:13 | LoopExpr |
diff --git a/rust/ql/test/library-tests/controlflow/test.rs b/rust/ql/test/library-tests/controlflow/test.rs
index 4ad742b30444..74a8589181c3 100644
--- a/rust/ql/test/library-tests/controlflow/test.rs
+++ b/rust/ql/test/library-tests/controlflow/test.rs
@@ -301,3 +301,11 @@ fn labelled_block2() -> i64 {
         x
     };
 }
+
+fn test_nested_function() {
+    let mut x = 0;
+    fn nested(x : &mut i64) {
+        *x += 1;
+    }
+    nested(&mut x);
+}
\ No newline at end of file

From f6f54c6e3b927b8e4782937b2cf998461117da14 Mon Sep 17 00:00:00 2001
From: Tom Hvitved <hvitved@github.com>
Date: Tue, 8 Oct 2024 10:59:43 +0200
Subject: [PATCH 303/347] Rust: Include parameters in the CFG

---
 .../internal/ControlFlowGraphImpl.qll         |  50 ++++++-
 .../rust/controlflow/internal/Scope.qll       |   8 +-
 .../library-tests/controlflow/Cfg.expected    | 132 ++++++++++++++----
 .../test/library-tests/variables/Cfg.expected |  30 +++-
 4 files changed, 181 insertions(+), 39 deletions(-)

diff --git a/rust/ql/lib/codeql/rust/controlflow/internal/ControlFlowGraphImpl.qll b/rust/ql/lib/codeql/rust/controlflow/internal/ControlFlowGraphImpl.qll
index 8bb27c3d9910..84ddc28de9e6 100644
--- a/rust/ql/lib/codeql/rust/controlflow/internal/ControlFlowGraphImpl.qll
+++ b/rust/ql/lib/codeql/rust/controlflow/internal/ControlFlowGraphImpl.qll
@@ -183,7 +183,26 @@ class CastExprTree extends StandardPostOrderTree instanceof CastExpr {
   override AstNode getChildNode(int i) { i = 0 and result = super.getExpr() }
 }
 
-class ClosureExprTree extends LeafTree instanceof ClosureExpr { }
+// Closures have their own CFG scope, so we need to make sure that their
+// CFG is not mixed with the surrounding CFG. This is done by retrofitting
+// `first`, `propagatesAbnormal`, and `succ` below.
+class ClosureExprTree extends StandardPostOrderTree, ClosureExpr {
+  override predicate first(AstNode first) { first = this }
+
+  override predicate propagatesAbnormal(AstNode child) { none() }
+
+  override AstNode getChildNode(int i) {
+    result = this.getParamList().getParam(i)
+    or
+    i = this.getParamList().getNumberOfParams() and
+    result = this.getBody()
+  }
+
+  override predicate succ(AstNode pred, AstNode succ, Completion c) {
+    super.succ(pred, succ, c) and
+    not succ = this
+  }
+}
 
 class ContinueExprTree extends LeafTree, ContinueExpr {
   override predicate last(AstNode last, Completion c) { none() }
@@ -203,7 +222,34 @@ class FieldExprTree extends StandardPostOrderTree instanceof FieldExpr {
   override AstNode getChildNode(int i) { i = 0 and result = super.getExpr() }
 }
 
-class FunctionTree extends LeafTree instanceof Function { }
+// Functions have their own CFG scope, so we need to make sure that their
+// CFG is not mixed with the surrounding CFG in case of nested functions.
+// This is done by retrofitting `last`, `propagatesAbnormal`, and `succ`
+// below.
+class FunctionTree extends StandardPreOrderTree, Function {
+  override predicate last(AstNode last, Completion c) {
+    last = this and
+    completionIsValidFor(c, this)
+  }
+
+  override predicate propagatesAbnormal(AstNode child) { none() }
+
+  override AstNode getChildNode(int i) {
+    result = this.getParamList().getParam(i)
+    or
+    i = this.getParamList().getNumberOfParams() and
+    result = this.getBody()
+  }
+
+  override predicate succ(AstNode pred, AstNode succ, Completion c) {
+    super.succ(pred, succ, c) and
+    not pred = this
+  }
+}
+
+class ParamTree extends StandardPostOrderTree, Param {
+  override AstNode getChildNode(int i) { i = 0 and result = this.getPat() }
+}
 
 class IfExprTree extends PostOrderTree instanceof IfExpr {
   override predicate first(AstNode node) { first(super.getCondition(), node) }
diff --git a/rust/ql/lib/codeql/rust/controlflow/internal/Scope.qll b/rust/ql/lib/codeql/rust/controlflow/internal/Scope.qll
index bfc0d2ed3b9a..da4e153597d0 100644
--- a/rust/ql/lib/codeql/rust/controlflow/internal/Scope.qll
+++ b/rust/ql/lib/codeql/rust/controlflow/internal/Scope.qll
@@ -12,13 +12,17 @@ abstract class CfgScope extends AstNode {
 }
 
 final class FunctionScope extends CfgScope, Function {
-  override predicate scopeFirst(AstNode node) { first(this.getBody(), node) }
+  override predicate scopeFirst(AstNode node) {
+    first(this.(FunctionTree).getFirstChildNode(), node)
+  }
 
   override predicate scopeLast(AstNode node, Completion c) { last(this.getBody(), node, c) }
 }
 
 final class ClosureScope extends CfgScope, ClosureExpr {
-  override predicate scopeFirst(AstNode node) { first(this.getBody(), node) }
+  override predicate scopeFirst(AstNode node) {
+    first(this.(ClosureExprTree).getFirstChildNode(), node)
+  }
 
   override predicate scopeLast(AstNode node, Completion c) { last(this.getBody(), node, c) }
 }
diff --git a/rust/ql/test/library-tests/controlflow/Cfg.expected b/rust/ql/test/library-tests/controlflow/Cfg.expected
index 4c3a60312f9a..853a99e2c986 100644
--- a/rust/ql/test/library-tests/controlflow/Cfg.expected
+++ b/rust/ql/test/library-tests/controlflow/Cfg.expected
@@ -12,8 +12,10 @@ edges
 | test.rs:3:5:3:23 | CallExpr | test.rs:1:24:4:1 | BlockExpr |  |
 | test.rs:3:5:3:24 | ExprStmt | test.rs:3:5:3:19 | PathExpr |  |
 | test.rs:3:21:3:22 | 42 | test.rs:3:5:3:23 | CallExpr |  |
-| test.rs:8:5:24:5 | enter test_break_and_continue | test.rs:9:9:9:22 | LetStmt |  |
+| test.rs:8:5:24:5 | enter test_break_and_continue | test.rs:8:32:8:32 | n |  |
 | test.rs:8:5:24:5 | exit test_break_and_continue (normal) | test.rs:8:5:24:5 | exit test_break_and_continue |  |
+| test.rs:8:32:8:32 | n | test.rs:8:32:8:37 | Param | match, no-match |
+| test.rs:8:32:8:37 | Param | test.rs:9:9:9:22 | LetStmt |  |
 | test.rs:9:9:9:22 | LetStmt | test.rs:9:21:9:21 | n |  |
 | test.rs:9:13:9:17 | i | test.rs:10:9:22:9 | ExprStmt | match, no-match |
 | test.rs:9:21:9:21 | n | test.rs:9:13:9:17 | i |  |
@@ -61,8 +63,10 @@ edges
 | test.rs:23:9:23:19 | ReturnExpr | test.rs:8:5:24:5 | exit test_break_and_continue (normal) | return |
 | test.rs:23:9:23:20 | ExprStmt | test.rs:23:16:23:19 | true |  |
 | test.rs:23:16:23:19 | true | test.rs:23:9:23:19 | ReturnExpr |  |
-| test.rs:26:5:38:5 | enter test_break_with_labels | test.rs:27:9:36:9 | ExprStmt |  |
+| test.rs:26:5:38:5 | enter test_break_with_labels | test.rs:26:31:26:31 | b |  |
 | test.rs:26:5:38:5 | exit test_break_with_labels (normal) | test.rs:26:5:38:5 | exit test_break_with_labels |  |
+| test.rs:26:31:26:31 | b | test.rs:26:31:26:37 | Param | match, no-match |
+| test.rs:26:31:26:37 | Param | test.rs:27:9:36:9 | ExprStmt |  |
 | test.rs:26:48:38:5 | BlockExpr | test.rs:26:5:38:5 | exit test_break_with_labels (normal) |  |
 | test.rs:27:9:36:9 | ExprStmt | test.rs:29:17:33:17 | ExprStmt |  |
 | test.rs:27:9:36:9 | LoopExpr | test.rs:37:9:37:12 | true |  |
@@ -82,7 +86,9 @@ edges
 | test.rs:34:17:34:28 | BreakExpr | test.rs:28:13:35:13 | LoopExpr | break |
 | test.rs:34:17:34:29 | ExprStmt | test.rs:34:17:34:28 | BreakExpr |  |
 | test.rs:37:9:37:12 | true | test.rs:26:48:38:5 | BlockExpr |  |
-| test.rs:40:5:52:5 | enter test_continue_with_labels | test.rs:42:13:42:14 | ExprStmt |  |
+| test.rs:40:5:52:5 | enter test_continue_with_labels | test.rs:40:34:40:34 | b |  |
+| test.rs:40:34:40:34 | b | test.rs:40:34:40:40 | Param | match, no-match |
+| test.rs:40:34:40:40 | Param | test.rs:42:13:42:14 | ExprStmt |  |
 | test.rs:42:13:42:13 | 1 | test.rs:44:17:48:17 | ExprStmt |  |
 | test.rs:42:13:42:14 | ExprStmt | test.rs:42:13:42:13 | 1 |  |
 | test.rs:44:17:48:17 | ExprStmt | test.rs:44:20:44:20 | b |  |
@@ -98,7 +104,9 @@ edges
 | test.rs:47:21:47:36 | ExprStmt | test.rs:47:21:47:35 | ContinueExpr |  |
 | test.rs:49:17:49:31 | ContinueExpr | test.rs:44:17:48:17 | ExprStmt | continue |
 | test.rs:49:17:49:32 | ExprStmt | test.rs:49:17:49:31 | ContinueExpr |  |
-| test.rs:54:5:66:5 | enter test_loop_label_shadowing | test.rs:56:13:56:14 | ExprStmt |  |
+| test.rs:54:5:66:5 | enter test_loop_label_shadowing | test.rs:54:34:54:34 | b |  |
+| test.rs:54:34:54:34 | b | test.rs:54:34:54:40 | Param | match, no-match |
+| test.rs:54:34:54:40 | Param | test.rs:56:13:56:14 | ExprStmt |  |
 | test.rs:56:13:56:13 | 1 | test.rs:58:17:62:17 | ExprStmt |  |
 | test.rs:56:13:56:14 | ExprStmt | test.rs:56:13:56:13 | 1 |  |
 | test.rs:58:17:62:17 | ExprStmt | test.rs:58:20:58:20 | b |  |
@@ -114,8 +122,10 @@ edges
 | test.rs:61:21:61:35 | ExprStmt | test.rs:61:21:61:34 | ContinueExpr |  |
 | test.rs:63:17:63:30 | ContinueExpr | test.rs:58:17:62:17 | ExprStmt | continue |
 | test.rs:63:17:63:31 | ExprStmt | test.rs:63:17:63:30 | ContinueExpr |  |
-| test.rs:68:5:77:5 | enter test_while | test.rs:69:9:69:25 | LetStmt |  |
+| test.rs:68:5:77:5 | enter test_while | test.rs:68:19:68:19 | i |  |
 | test.rs:68:5:77:5 | exit test_while (normal) | test.rs:68:5:77:5 | exit test_while |  |
+| test.rs:68:19:68:19 | i | test.rs:68:19:68:24 | Param | match, no-match |
+| test.rs:68:19:68:24 | Param | test.rs:69:9:69:25 | LetStmt |  |
 | test.rs:68:27:77:5 | BlockExpr | test.rs:68:5:77:5 | exit test_while (normal) |  |
 | test.rs:69:9:69:25 | LetStmt | test.rs:69:21:69:24 | true |  |
 | test.rs:69:13:69:17 | b | test.rs:70:15:70:15 | b | match, no-match |
@@ -158,8 +168,10 @@ edges
 | test.rs:82:21:82:21 | 5 | test.rs:82:17:82:21 | ... = ... |  |
 | test.rs:83:17:83:21 | BreakExpr | test.rs:81:9:85:9 | WhileExpr | break |
 | test.rs:83:17:83:22 | ExprStmt | test.rs:83:17:83:21 | BreakExpr |  |
-| test.rs:88:5:95:5 | enter test_for | test.rs:89:18:89:18 | 0 |  |
+| test.rs:88:5:95:5 | enter test_for | test.rs:88:17:88:17 | j |  |
 | test.rs:88:5:95:5 | exit test_for (normal) | test.rs:88:5:95:5 | exit test_for |  |
+| test.rs:88:17:88:17 | j | test.rs:88:17:88:22 | Param | match, no-match |
+| test.rs:88:17:88:22 | Param | test.rs:89:18:89:18 | 0 |  |
 | test.rs:88:25:95:5 | BlockExpr | test.rs:88:5:95:5 | exit test_for (normal) |  |
 | test.rs:89:9:94:9 | ForExpr | test.rs:88:25:95:5 | BlockExpr |  |
 | test.rs:89:13:89:13 | i | test.rs:89:9:94:9 | ForExpr | no-match |
@@ -178,14 +190,18 @@ edges
 | test.rs:91:17:91:22 | ExprStmt | test.rs:91:17:91:21 | BreakExpr |  |
 | test.rs:93:13:93:13 | 1 | test.rs:89:24:94:9 | BlockExpr |  |
 | test.rs:93:13:93:14 | ExprStmt | test.rs:93:13:93:13 | 1 |  |
-| test.rs:98:1:101:1 | enter test_nested_function | test.rs:99:5:99:28 | LetStmt |  |
+| test.rs:98:1:101:1 | enter test_nested_function | test.rs:98:25:98:25 | n |  |
 | test.rs:98:1:101:1 | exit test_nested_function (normal) | test.rs:98:1:101:1 | exit test_nested_function |  |
+| test.rs:98:25:98:25 | n | test.rs:98:25:98:30 | Param | match, no-match |
+| test.rs:98:25:98:30 | Param | test.rs:99:5:99:28 | LetStmt |  |
 | test.rs:98:40:101:1 | BlockExpr | test.rs:98:1:101:1 | exit test_nested_function (normal) |  |
 | test.rs:99:5:99:28 | LetStmt | test.rs:99:19:99:27 | ClosureExpr |  |
 | test.rs:99:9:99:15 | add_one | test.rs:100:5:100:11 | add_one | match, no-match |
 | test.rs:99:19:99:27 | ClosureExpr | test.rs:99:9:99:15 | add_one |  |
-| test.rs:99:19:99:27 | enter ClosureExpr | test.rs:99:23:99:23 | i |  |
+| test.rs:99:19:99:27 | enter ClosureExpr | test.rs:99:20:99:20 | i |  |
 | test.rs:99:19:99:27 | exit ClosureExpr (normal) | test.rs:99:19:99:27 | exit ClosureExpr |  |
+| test.rs:99:20:99:20 | Param | test.rs:99:23:99:23 | i |  |
+| test.rs:99:20:99:20 | i | test.rs:99:20:99:20 | Param | match, no-match |
 | test.rs:99:23:99:23 | i | test.rs:99:27:99:27 | 1 |  |
 | test.rs:99:23:99:27 | ... + ... | test.rs:99:19:99:27 | exit ClosureExpr (normal) |  |
 | test.rs:99:27:99:27 | 1 | test.rs:99:23:99:27 | ... + ... |  |
@@ -194,8 +210,10 @@ edges
 | test.rs:100:13:100:19 | add_one | test.rs:100:21:100:21 | n |  |
 | test.rs:100:13:100:22 | CallExpr | test.rs:100:5:100:23 | CallExpr |  |
 | test.rs:100:21:100:21 | n | test.rs:100:13:100:22 | CallExpr |  |
-| test.rs:105:5:111:5 | enter test_if_else | test.rs:106:12:106:12 | n |  |
+| test.rs:105:5:111:5 | enter test_if_else | test.rs:105:21:105:21 | n |  |
 | test.rs:105:5:111:5 | exit test_if_else (normal) | test.rs:105:5:111:5 | exit test_if_else |  |
+| test.rs:105:21:105:21 | n | test.rs:105:21:105:26 | Param | match, no-match |
+| test.rs:105:21:105:26 | Param | test.rs:106:12:106:12 | n |  |
 | test.rs:105:36:111:5 | BlockExpr | test.rs:105:5:111:5 | exit test_if_else (normal) |  |
 | test.rs:106:9:110:9 | IfExpr | test.rs:105:36:111:5 | BlockExpr |  |
 | test.rs:106:12:106:12 | n | test.rs:106:17:106:17 | 0 |  |
@@ -208,8 +226,10 @@ edges
 | test.rs:109:13:109:13 | n | test.rs:109:17:109:17 | 1 |  |
 | test.rs:109:13:109:17 | ... - ... | test.rs:108:16:110:9 | BlockExpr |  |
 | test.rs:109:17:109:17 | 1 | test.rs:109:13:109:17 | ... - ... |  |
-| test.rs:113:5:119:5 | enter test_if_let_else | test.rs:114:12:114:26 | LetExpr |  |
+| test.rs:113:5:119:5 | enter test_if_let_else | test.rs:113:25:113:25 | a |  |
 | test.rs:113:5:119:5 | exit test_if_let_else (normal) | test.rs:113:5:119:5 | exit test_if_let_else |  |
+| test.rs:113:25:113:25 | a | test.rs:113:25:113:38 | Param | match, no-match |
+| test.rs:113:25:113:38 | Param | test.rs:114:12:114:26 | LetExpr |  |
 | test.rs:113:48:119:5 | BlockExpr | test.rs:113:5:119:5 | exit test_if_let_else (normal) |  |
 | test.rs:114:9:118:9 | IfExpr | test.rs:113:48:119:5 | BlockExpr |  |
 | test.rs:114:12:114:26 | LetExpr | test.rs:114:16:114:22 | TupleStructPat |  |
@@ -219,8 +239,10 @@ edges
 | test.rs:115:13:115:13 | n | test.rs:114:28:116:9 | BlockExpr |  |
 | test.rs:116:16:118:9 | BlockExpr | test.rs:114:9:118:9 | IfExpr |  |
 | test.rs:117:13:117:13 | 0 | test.rs:116:16:118:9 | BlockExpr |  |
-| test.rs:121:5:126:5 | enter test_if_let | test.rs:122:9:124:9 | ExprStmt |  |
+| test.rs:121:5:126:5 | enter test_if_let | test.rs:121:20:121:20 | a |  |
 | test.rs:121:5:126:5 | exit test_if_let (normal) | test.rs:121:5:126:5 | exit test_if_let |  |
+| test.rs:121:20:121:20 | a | test.rs:121:20:121:33 | Param | match, no-match |
+| test.rs:121:20:121:33 | Param | test.rs:122:9:124:9 | ExprStmt |  |
 | test.rs:121:43:126:5 | BlockExpr | test.rs:121:5:126:5 | exit test_if_let (normal) |  |
 | test.rs:122:9:124:9 | ExprStmt | test.rs:122:12:122:26 | LetExpr |  |
 | test.rs:122:9:124:9 | IfExpr | test.rs:125:9:125:9 | 0 |  |
@@ -230,8 +252,10 @@ edges
 | test.rs:122:28:124:9 | BlockExpr | test.rs:122:9:124:9 | IfExpr |  |
 | test.rs:123:13:123:13 | n | test.rs:122:28:124:9 | BlockExpr |  |
 | test.rs:125:9:125:9 | 0 | test.rs:121:43:126:5 | BlockExpr |  |
-| test.rs:128:5:134:5 | enter test_nested_if | test.rs:129:16:129:16 | a |  |
+| test.rs:128:5:134:5 | enter test_nested_if | test.rs:128:23:128:23 | a |  |
 | test.rs:128:5:134:5 | exit test_nested_if (normal) | test.rs:128:5:134:5 | exit test_nested_if |  |
+| test.rs:128:23:128:23 | a | test.rs:128:23:128:28 | Param | match, no-match |
+| test.rs:128:23:128:28 | Param | test.rs:129:16:129:16 | a |  |
 | test.rs:128:38:134:5 | BlockExpr | test.rs:128:5:134:5 | exit test_nested_if (normal) |  |
 | test.rs:129:9:133:9 | IfExpr | test.rs:128:38:134:5 | BlockExpr |  |
 | test.rs:129:13:129:48 | [boolean(false)] IfExpr | test.rs:132:13:132:13 | 0 | false |
@@ -257,8 +281,10 @@ edges
 | test.rs:130:13:130:13 | 1 | test.rs:129:51:131:9 | BlockExpr |  |
 | test.rs:131:16:133:9 | BlockExpr | test.rs:129:9:133:9 | IfExpr |  |
 | test.rs:132:13:132:13 | 0 | test.rs:131:16:133:9 | BlockExpr |  |
-| test.rs:136:5:145:5 | enter test_nested_if_match | test.rs:137:19:137:19 | a |  |
+| test.rs:136:5:145:5 | enter test_nested_if_match | test.rs:136:29:136:29 | a |  |
 | test.rs:136:5:145:5 | exit test_nested_if_match (normal) | test.rs:136:5:145:5 | exit test_nested_if_match |  |
+| test.rs:136:29:136:29 | a | test.rs:136:29:136:34 | Param | match, no-match |
+| test.rs:136:29:136:34 | Param | test.rs:137:19:137:19 | a |  |
 | test.rs:136:44:145:5 | BlockExpr | test.rs:136:5:145:5 | exit test_nested_if_match (normal) |  |
 | test.rs:137:9:144:9 | IfExpr | test.rs:136:44:145:5 | BlockExpr |  |
 | test.rs:137:13:140:9 | [boolean(false)] MatchExpr | test.rs:143:13:143:13 | 0 | false |
@@ -273,8 +299,10 @@ edges
 | test.rs:141:13:141:13 | 1 | test.rs:140:12:142:9 | BlockExpr |  |
 | test.rs:142:16:144:9 | BlockExpr | test.rs:137:9:144:9 | IfExpr |  |
 | test.rs:143:13:143:13 | 0 | test.rs:142:16:144:9 | BlockExpr |  |
-| test.rs:147:5:156:5 | enter test_nested_if_block | test.rs:149:13:149:15 | ExprStmt |  |
+| test.rs:147:5:156:5 | enter test_nested_if_block | test.rs:147:29:147:29 | a |  |
 | test.rs:147:5:156:5 | exit test_nested_if_block (normal) | test.rs:147:5:156:5 | exit test_nested_if_block |  |
+| test.rs:147:29:147:29 | a | test.rs:147:29:147:34 | Param | match, no-match |
+| test.rs:147:29:147:34 | Param | test.rs:149:13:149:15 | ExprStmt |  |
 | test.rs:147:44:156:5 | BlockExpr | test.rs:147:5:156:5 | exit test_nested_if_block (normal) |  |
 | test.rs:148:9:155:9 | IfExpr | test.rs:147:44:156:5 | BlockExpr |  |
 | test.rs:148:12:151:9 | [boolean(false)] BlockExpr | test.rs:154:13:154:13 | 0 | false |
@@ -289,8 +317,10 @@ edges
 | test.rs:152:13:152:13 | 1 | test.rs:151:11:153:9 | BlockExpr |  |
 | test.rs:153:16:155:9 | BlockExpr | test.rs:148:9:155:9 | IfExpr |  |
 | test.rs:154:13:154:13 | 0 | test.rs:153:16:155:9 | BlockExpr |  |
-| test.rs:158:5:165:5 | enter test_if_assignment | test.rs:159:9:159:26 | LetStmt |  |
+| test.rs:158:5:165:5 | enter test_if_assignment | test.rs:158:27:158:27 | a |  |
 | test.rs:158:5:165:5 | exit test_if_assignment (normal) | test.rs:158:5:165:5 | exit test_if_assignment |  |
+| test.rs:158:27:158:27 | a | test.rs:158:27:158:32 | Param | match, no-match |
+| test.rs:158:27:158:32 | Param | test.rs:159:9:159:26 | LetStmt |  |
 | test.rs:158:42:165:5 | BlockExpr | test.rs:158:5:165:5 | exit test_if_assignment (normal) |  |
 | test.rs:159:9:159:26 | LetStmt | test.rs:159:21:159:25 | false |  |
 | test.rs:159:13:159:17 | x | test.rs:160:12:160:12 | x | match, no-match |
@@ -304,8 +334,10 @@ edges
 | test.rs:161:13:161:13 | 1 | test.rs:160:21:162:9 | BlockExpr |  |
 | test.rs:162:16:164:9 | BlockExpr | test.rs:160:9:164:9 | IfExpr |  |
 | test.rs:163:13:163:13 | 0 | test.rs:162:16:164:9 | BlockExpr |  |
-| test.rs:167:5:178:5 | enter test_if_loop1 | test.rs:169:13:171:14 | ExprStmt |  |
+| test.rs:167:5:178:5 | enter test_if_loop1 | test.rs:167:22:167:22 | a |  |
 | test.rs:167:5:178:5 | exit test_if_loop1 (normal) | test.rs:167:5:178:5 | exit test_if_loop1 |  |
+| test.rs:167:22:167:22 | a | test.rs:167:22:167:27 | Param | match, no-match |
+| test.rs:167:22:167:27 | Param | test.rs:169:13:171:14 | ExprStmt |  |
 | test.rs:167:37:178:5 | BlockExpr | test.rs:167:5:178:5 | exit test_if_loop1 (normal) |  |
 | test.rs:168:9:177:9 | IfExpr | test.rs:167:37:178:5 | BlockExpr |  |
 | test.rs:168:13:173:9 | [boolean(false)] LoopExpr | test.rs:176:13:176:13 | 0 | false |
@@ -332,8 +364,10 @@ edges
 | test.rs:174:13:174:13 | 1 | test.rs:173:12:175:9 | BlockExpr |  |
 | test.rs:175:16:177:9 | BlockExpr | test.rs:168:9:177:9 | IfExpr |  |
 | test.rs:176:13:176:13 | 0 | test.rs:175:16:177:9 | BlockExpr |  |
-| test.rs:180:5:191:5 | enter test_if_loop2 | test.rs:182:13:184:14 | ExprStmt |  |
+| test.rs:180:5:191:5 | enter test_if_loop2 | test.rs:180:22:180:22 | a |  |
 | test.rs:180:5:191:5 | exit test_if_loop2 (normal) | test.rs:180:5:191:5 | exit test_if_loop2 |  |
+| test.rs:180:22:180:22 | a | test.rs:180:22:180:27 | Param | match, no-match |
+| test.rs:180:22:180:27 | Param | test.rs:182:13:184:14 | ExprStmt |  |
 | test.rs:180:37:191:5 | BlockExpr | test.rs:180:5:191:5 | exit test_if_loop2 (normal) |  |
 | test.rs:181:9:190:9 | IfExpr | test.rs:180:37:191:5 | BlockExpr |  |
 | test.rs:181:13:186:9 | [boolean(false)] LoopExpr | test.rs:189:13:189:13 | 0 | false |
@@ -360,8 +394,10 @@ edges
 | test.rs:187:13:187:13 | 1 | test.rs:186:12:188:9 | BlockExpr |  |
 | test.rs:188:16:190:9 | BlockExpr | test.rs:181:9:190:9 | IfExpr |  |
 | test.rs:189:13:189:13 | 0 | test.rs:188:16:190:9 | BlockExpr |  |
-| test.rs:193:5:201:5 | enter test_labelled_block | test.rs:195:13:195:31 | ExprStmt |  |
+| test.rs:193:5:201:5 | enter test_labelled_block | test.rs:193:28:193:28 | a |  |
 | test.rs:193:5:201:5 | exit test_labelled_block (normal) | test.rs:193:5:201:5 | exit test_labelled_block |  |
+| test.rs:193:28:193:28 | a | test.rs:193:28:193:33 | Param | match, no-match |
+| test.rs:193:28:193:33 | Param | test.rs:195:13:195:31 | ExprStmt |  |
 | test.rs:193:43:201:5 | BlockExpr | test.rs:193:5:201:5 | exit test_labelled_block (normal) |  |
 | test.rs:194:9:200:9 | IfExpr | test.rs:193:43:201:5 | BlockExpr |  |
 | test.rs:194:13:196:9 | [boolean(false)] BlockExpr | test.rs:199:13:199:13 | 0 | false |
@@ -377,8 +413,14 @@ edges
 | test.rs:197:13:197:13 | 1 | test.rs:196:12:198:9 | BlockExpr |  |
 | test.rs:198:16:200:9 | BlockExpr | test.rs:194:9:200:9 | IfExpr |  |
 | test.rs:199:13:199:13 | 0 | test.rs:198:16:200:9 | BlockExpr |  |
-| test.rs:206:5:209:5 | enter test_and_operator | test.rs:207:9:207:28 | LetStmt |  |
+| test.rs:206:5:209:5 | enter test_and_operator | test.rs:206:26:206:26 | a |  |
 | test.rs:206:5:209:5 | exit test_and_operator (normal) | test.rs:206:5:209:5 | exit test_and_operator |  |
+| test.rs:206:26:206:26 | a | test.rs:206:26:206:32 | Param | match, no-match |
+| test.rs:206:26:206:32 | Param | test.rs:206:35:206:35 | b |  |
+| test.rs:206:35:206:35 | b | test.rs:206:35:206:41 | Param | match, no-match |
+| test.rs:206:35:206:41 | Param | test.rs:206:44:206:44 | c |  |
+| test.rs:206:44:206:44 | c | test.rs:206:44:206:50 | Param | match, no-match |
+| test.rs:206:44:206:50 | Param | test.rs:207:9:207:28 | LetStmt |  |
 | test.rs:206:61:209:5 | BlockExpr | test.rs:206:5:209:5 | exit test_and_operator (normal) |  |
 | test.rs:207:9:207:28 | LetStmt | test.rs:207:17:207:17 | a |  |
 | test.rs:207:13:207:13 | d | test.rs:208:9:208:9 | d | match, no-match |
@@ -391,8 +433,14 @@ edges
 | test.rs:207:22:207:22 | b | test.rs:207:17:207:22 | [boolean(true)] ... && ... | true |
 | test.rs:207:27:207:27 | c | test.rs:207:17:207:27 | ... && ... |  |
 | test.rs:208:9:208:9 | d | test.rs:206:61:209:5 | BlockExpr |  |
-| test.rs:211:5:214:5 | enter test_or_operator | test.rs:212:9:212:28 | LetStmt |  |
+| test.rs:211:5:214:5 | enter test_or_operator | test.rs:211:25:211:25 | a |  |
 | test.rs:211:5:214:5 | exit test_or_operator (normal) | test.rs:211:5:214:5 | exit test_or_operator |  |
+| test.rs:211:25:211:25 | a | test.rs:211:25:211:31 | Param | match, no-match |
+| test.rs:211:25:211:31 | Param | test.rs:211:34:211:34 | b |  |
+| test.rs:211:34:211:34 | b | test.rs:211:34:211:40 | Param | match, no-match |
+| test.rs:211:34:211:40 | Param | test.rs:211:43:211:43 | c |  |
+| test.rs:211:43:211:43 | c | test.rs:211:43:211:49 | Param | match, no-match |
+| test.rs:211:43:211:49 | Param | test.rs:212:9:212:28 | LetStmt |  |
 | test.rs:211:60:214:5 | BlockExpr | test.rs:211:5:214:5 | exit test_or_operator (normal) |  |
 | test.rs:212:9:212:28 | LetStmt | test.rs:212:17:212:17 | a |  |
 | test.rs:212:13:212:13 | d | test.rs:213:9:213:9 | d | match, no-match |
@@ -405,8 +453,14 @@ edges
 | test.rs:212:22:212:22 | b | test.rs:212:17:212:22 | [boolean(true)] ... \|\| ... | true |
 | test.rs:212:27:212:27 | c | test.rs:212:17:212:27 | ... \|\| ... |  |
 | test.rs:213:9:213:9 | d | test.rs:211:60:214:5 | BlockExpr |  |
-| test.rs:216:5:219:5 | enter test_or_operator_2 | test.rs:217:9:217:36 | LetStmt |  |
+| test.rs:216:5:219:5 | enter test_or_operator_2 | test.rs:216:27:216:27 | a |  |
 | test.rs:216:5:219:5 | exit test_or_operator_2 (normal) | test.rs:216:5:219:5 | exit test_or_operator_2 |  |
+| test.rs:216:27:216:27 | a | test.rs:216:27:216:33 | Param | match, no-match |
+| test.rs:216:27:216:33 | Param | test.rs:216:36:216:36 | b |  |
+| test.rs:216:36:216:36 | b | test.rs:216:36:216:41 | Param | match, no-match |
+| test.rs:216:36:216:41 | Param | test.rs:216:44:216:44 | c |  |
+| test.rs:216:44:216:44 | c | test.rs:216:44:216:50 | Param | match, no-match |
+| test.rs:216:44:216:50 | Param | test.rs:217:9:217:36 | LetStmt |  |
 | test.rs:216:61:219:5 | BlockExpr | test.rs:216:5:219:5 | exit test_or_operator_2 (normal) |  |
 | test.rs:217:9:217:36 | LetStmt | test.rs:217:17:217:17 | a |  |
 | test.rs:217:13:217:13 | d | test.rs:218:9:218:9 | d | match, no-match |
@@ -421,16 +475,24 @@ edges
 | test.rs:217:28:217:29 | 28 | test.rs:217:23:217:29 | ... == ... |  |
 | test.rs:217:35:217:35 | c | test.rs:217:17:217:35 | ... \|\| ... |  |
 | test.rs:218:9:218:9 | d | test.rs:216:61:219:5 | BlockExpr |  |
-| test.rs:221:5:224:5 | enter test_not_operator | test.rs:222:9:222:19 | LetStmt |  |
+| test.rs:221:5:224:5 | enter test_not_operator | test.rs:221:26:221:26 | a |  |
 | test.rs:221:5:224:5 | exit test_not_operator (normal) | test.rs:221:5:224:5 | exit test_not_operator |  |
+| test.rs:221:26:221:26 | a | test.rs:221:26:221:32 | Param | match, no-match |
+| test.rs:221:26:221:32 | Param | test.rs:222:9:222:19 | LetStmt |  |
 | test.rs:221:43:224:5 | BlockExpr | test.rs:221:5:224:5 | exit test_not_operator (normal) |  |
 | test.rs:222:9:222:19 | LetStmt | test.rs:222:18:222:18 | a |  |
 | test.rs:222:13:222:13 | d | test.rs:223:9:223:9 | d | match, no-match |
 | test.rs:222:17:222:18 | ! ... | test.rs:222:13:222:13 | d |  |
 | test.rs:222:18:222:18 | a | test.rs:222:17:222:18 | ! ... |  |
 | test.rs:223:9:223:9 | d | test.rs:221:43:224:5 | BlockExpr |  |
-| test.rs:226:5:232:5 | enter test_if_and_operator | test.rs:227:12:227:12 | a |  |
+| test.rs:226:5:232:5 | enter test_if_and_operator | test.rs:226:29:226:29 | a |  |
 | test.rs:226:5:232:5 | exit test_if_and_operator (normal) | test.rs:226:5:232:5 | exit test_if_and_operator |  |
+| test.rs:226:29:226:29 | a | test.rs:226:29:226:35 | Param | match, no-match |
+| test.rs:226:29:226:35 | Param | test.rs:226:38:226:38 | b |  |
+| test.rs:226:38:226:38 | b | test.rs:226:38:226:43 | Param | match, no-match |
+| test.rs:226:38:226:43 | Param | test.rs:226:46:226:46 | c |  |
+| test.rs:226:46:226:46 | c | test.rs:226:46:226:52 | Param | match, no-match |
+| test.rs:226:46:226:52 | Param | test.rs:227:12:227:12 | a |  |
 | test.rs:226:63:232:5 | BlockExpr | test.rs:226:5:232:5 | exit test_if_and_operator (normal) |  |
 | test.rs:227:9:231:9 | IfExpr | test.rs:226:63:232:5 | BlockExpr |  |
 | test.rs:227:12:227:12 | a | test.rs:227:12:227:17 | [boolean(false)] ... && ... | false |
@@ -447,8 +509,14 @@ edges
 | test.rs:228:13:228:16 | true | test.rs:227:24:229:9 | BlockExpr |  |
 | test.rs:229:16:231:9 | BlockExpr | test.rs:227:9:231:9 | IfExpr |  |
 | test.rs:230:13:230:17 | false | test.rs:229:16:231:9 | BlockExpr |  |
-| test.rs:234:5:240:5 | enter test_if_or_operator | test.rs:235:12:235:12 | a |  |
+| test.rs:234:5:240:5 | enter test_if_or_operator | test.rs:234:28:234:28 | a |  |
 | test.rs:234:5:240:5 | exit test_if_or_operator (normal) | test.rs:234:5:240:5 | exit test_if_or_operator |  |
+| test.rs:234:28:234:28 | a | test.rs:234:28:234:34 | Param | match, no-match |
+| test.rs:234:28:234:34 | Param | test.rs:234:37:234:37 | b |  |
+| test.rs:234:37:234:37 | b | test.rs:234:37:234:42 | Param | match, no-match |
+| test.rs:234:37:234:42 | Param | test.rs:234:45:234:45 | c |  |
+| test.rs:234:45:234:45 | c | test.rs:234:45:234:51 | Param | match, no-match |
+| test.rs:234:45:234:51 | Param | test.rs:235:12:235:12 | a |  |
 | test.rs:234:62:240:5 | BlockExpr | test.rs:234:5:240:5 | exit test_if_or_operator (normal) |  |
 | test.rs:235:9:239:9 | IfExpr | test.rs:234:62:240:5 | BlockExpr |  |
 | test.rs:235:12:235:12 | a | test.rs:235:12:235:17 | [boolean(true)] ... \|\| ... | true |
@@ -465,8 +533,10 @@ edges
 | test.rs:236:13:236:16 | true | test.rs:235:24:237:9 | BlockExpr |  |
 | test.rs:237:16:239:9 | BlockExpr | test.rs:235:9:239:9 | IfExpr |  |
 | test.rs:238:13:238:17 | false | test.rs:237:16:239:9 | BlockExpr |  |
-| test.rs:242:5:248:5 | enter test_if_not_operator | test.rs:243:13:243:13 | a |  |
+| test.rs:242:5:248:5 | enter test_if_not_operator | test.rs:242:29:242:29 | a |  |
 | test.rs:242:5:248:5 | exit test_if_not_operator (normal) | test.rs:242:5:248:5 | exit test_if_not_operator |  |
+| test.rs:242:29:242:29 | a | test.rs:242:29:242:35 | Param | match, no-match |
+| test.rs:242:29:242:35 | Param | test.rs:243:13:243:13 | a |  |
 | test.rs:242:46:248:5 | BlockExpr | test.rs:242:5:248:5 | exit test_if_not_operator (normal) |  |
 | test.rs:243:9:247:9 | IfExpr | test.rs:242:46:248:5 | BlockExpr |  |
 | test.rs:243:12:243:13 | [boolean(false)] ! ... | test.rs:246:13:246:17 | false | false |
@@ -477,8 +547,10 @@ edges
 | test.rs:244:13:244:16 | true | test.rs:243:15:245:9 | BlockExpr |  |
 | test.rs:245:16:247:9 | BlockExpr | test.rs:243:9:247:9 | IfExpr |  |
 | test.rs:246:13:246:17 | false | test.rs:245:16:247:9 | BlockExpr |  |
-| test.rs:251:1:257:1 | enter test_match | test.rs:252:11:252:21 | maybe_digit |  |
+| test.rs:251:1:257:1 | enter test_match | test.rs:251:15:251:25 | maybe_digit |  |
 | test.rs:251:1:257:1 | exit test_match (normal) | test.rs:251:1:257:1 | exit test_match |  |
+| test.rs:251:15:251:25 | maybe_digit | test.rs:251:15:251:38 | Param | match, no-match |
+| test.rs:251:15:251:38 | Param | test.rs:252:11:252:21 | maybe_digit |  |
 | test.rs:251:48:257:1 | BlockExpr | test.rs:251:1:257:1 | exit test_match (normal) |  |
 | test.rs:252:5:256:5 | MatchExpr | test.rs:251:48:257:1 | BlockExpr |  |
 | test.rs:252:11:252:21 | maybe_digit | test.rs:253:9:253:23 | TupleStructPat |  |
@@ -500,8 +572,10 @@ edges
 | test.rs:261:9:263:9 | ExprStmt | test.rs:262:13:262:13 | 1 |  |
 | test.rs:261:14:263:9 | BlockExpr | test.rs:262:13:262:13 | 1 |  |
 | test.rs:262:13:262:13 | 1 | test.rs:261:14:263:9 | BlockExpr |  |
-| test.rs:267:5:270:5 | enter test_let_match | test.rs:268:9:268:49 | LetStmt |  |
+| test.rs:267:5:270:5 | enter test_let_match | test.rs:267:23:267:23 | a |  |
 | test.rs:267:5:270:5 | exit test_let_match (normal) | test.rs:267:5:270:5 | exit test_let_match |  |
+| test.rs:267:23:267:23 | a | test.rs:267:23:267:36 | Param | match, no-match |
+| test.rs:267:23:267:36 | Param | test.rs:268:9:268:49 | LetStmt |  |
 | test.rs:267:39:270:5 | BlockExpr | test.rs:267:5:270:5 | exit test_let_match (normal) |  |
 | test.rs:268:9:268:49 | LetStmt | test.rs:268:23:268:23 | a |  |
 | test.rs:268:13:268:19 | TupleStructPat | test.rs:268:32:268:46 | "Expected some" | no-match |
@@ -571,9 +645,11 @@ edges
 | test.rs:306:5:306:18 | LetStmt | test.rs:306:17:306:17 | 0 |  |
 | test.rs:306:9:306:13 | x | test.rs:307:5:309:5 | nested | match, no-match |
 | test.rs:306:17:306:17 | 0 | test.rs:306:9:306:13 | x |  |
-| test.rs:307:5:309:5 | enter nested | test.rs:308:9:308:16 | ExprStmt |  |
+| test.rs:307:5:309:5 | enter nested | test.rs:307:15:307:15 | x |  |
 | test.rs:307:5:309:5 | exit nested (normal) | test.rs:307:5:309:5 | exit nested |  |
 | test.rs:307:5:309:5 | nested | test.rs:310:5:310:19 | ExprStmt |  |
+| test.rs:307:15:307:15 | x | test.rs:307:15:307:26 | Param | match, no-match |
+| test.rs:307:15:307:26 | Param | test.rs:308:9:308:16 | ExprStmt |  |
 | test.rs:307:29:309:5 | BlockExpr | test.rs:307:5:309:5 | exit nested (normal) |  |
 | test.rs:308:9:308:10 | * ... | test.rs:308:15:308:15 | 1 |  |
 | test.rs:308:9:308:15 | ... += ... | test.rs:307:29:309:5 | BlockExpr |  |
diff --git a/rust/ql/test/library-tests/variables/Cfg.expected b/rust/ql/test/library-tests/variables/Cfg.expected
index 89e7aaec297e..b8b61495f754 100644
--- a/rust/ql/test/library-tests/variables/Cfg.expected
+++ b/rust/ql/test/library-tests/variables/Cfg.expected
@@ -1,11 +1,15 @@
 edges
-| variables.rs:3:1:5:1 | enter print_str | variables.rs:4:5:4:22 | ExprStmt |  |
+| variables.rs:3:1:5:1 | enter print_str | variables.rs:3:14:3:14 | s |  |
 | variables.rs:3:1:5:1 | exit print_str (normal) | variables.rs:3:1:5:1 | exit print_str |  |
+| variables.rs:3:14:3:14 | s | variables.rs:3:14:3:20 | Param | match, no-match |
+| variables.rs:3:14:3:20 | Param | variables.rs:4:5:4:22 | ExprStmt |  |
 | variables.rs:3:23:5:1 | BlockExpr | variables.rs:3:1:5:1 | exit print_str (normal) |  |
 | variables.rs:4:5:4:21 | MacroExpr | variables.rs:3:23:5:1 | BlockExpr |  |
 | variables.rs:4:5:4:22 | ExprStmt | variables.rs:4:5:4:21 | MacroExpr |  |
-| variables.rs:7:1:9:1 | enter print_i64 | variables.rs:8:5:8:22 | ExprStmt |  |
+| variables.rs:7:1:9:1 | enter print_i64 | variables.rs:7:14:7:14 | i |  |
 | variables.rs:7:1:9:1 | exit print_i64 (normal) | variables.rs:7:1:9:1 | exit print_i64 |  |
+| variables.rs:7:14:7:14 | i | variables.rs:7:14:7:19 | Param | match, no-match |
+| variables.rs:7:14:7:19 | Param | variables.rs:8:5:8:22 | ExprStmt |  |
 | variables.rs:7:22:9:1 | BlockExpr | variables.rs:7:1:9:1 | exit print_i64 (normal) |  |
 | variables.rs:8:5:8:21 | MacroExpr | variables.rs:7:22:9:1 | BlockExpr |  |
 | variables.rs:8:5:8:22 | ExprStmt | variables.rs:8:5:8:21 | MacroExpr |  |
@@ -393,8 +397,12 @@ edges
 | variables.rs:245:16:245:24 | PathExpr | variables.rs:245:26:245:28 | a13 |  |
 | variables.rs:245:16:245:29 | CallExpr | variables.rs:243:5:246:5 | MatchExpr |  |
 | variables.rs:245:26:245:28 | a13 | variables.rs:245:16:245:29 | CallExpr |  |
-| variables.rs:249:1:258:1 | enter param_pattern1 | variables.rs:255:5:255:18 | ExprStmt |  |
+| variables.rs:249:1:258:1 | enter param_pattern1 | variables.rs:250:5:250:6 | a8 |  |
 | variables.rs:249:1:258:1 | exit param_pattern1 (normal) | variables.rs:249:1:258:1 | exit param_pattern1 |  |
+| variables.rs:250:5:250:6 | a8 | variables.rs:250:5:250:12 | Param | match, no-match |
+| variables.rs:250:5:250:12 | Param | variables.rs:251:5:254:5 | TuplePat |  |
+| variables.rs:251:5:254:5 | TuplePat | variables.rs:251:5:254:19 | Param | match, no-match |
+| variables.rs:251:5:254:19 | Param | variables.rs:255:5:255:18 | ExprStmt |  |
 | variables.rs:254:28:258:1 | BlockExpr | variables.rs:249:1:258:1 | exit param_pattern1 (normal) |  |
 | variables.rs:255:5:255:13 | PathExpr | variables.rs:255:15:255:16 | a8 |  |
 | variables.rs:255:5:255:17 | CallExpr | variables.rs:256:5:256:18 | ExprStmt |  |
@@ -408,8 +416,10 @@ edges
 | variables.rs:257:5:257:17 | CallExpr | variables.rs:254:28:258:1 | BlockExpr |  |
 | variables.rs:257:5:257:18 | ExprStmt | variables.rs:257:5:257:13 | PathExpr |  |
 | variables.rs:257:15:257:16 | c1 | variables.rs:257:5:257:17 | CallExpr |  |
-| variables.rs:260:1:264:1 | enter param_pattern2 | variables.rs:263:5:263:18 | ExprStmt |  |
+| variables.rs:260:1:264:1 | enter param_pattern2 | variables.rs:261:5:261:42 | ParenPat |  |
 | variables.rs:260:1:264:1 | exit param_pattern2 (normal) | variables.rs:260:1:264:1 | exit param_pattern2 |  |
+| variables.rs:261:5:261:42 | ParenPat | variables.rs:261:5:261:50 | Param | match, no-match |
+| variables.rs:261:5:261:50 | Param | variables.rs:263:5:263:18 | ExprStmt |  |
 | variables.rs:262:9:264:1 | BlockExpr | variables.rs:260:1:264:1 | exit param_pattern2 (normal) |  |
 | variables.rs:263:5:263:13 | PathExpr | variables.rs:263:15:263:16 | a9 |  |
 | variables.rs:263:5:263:17 | CallExpr | variables.rs:262:9:264:1 | BlockExpr |  |
@@ -487,8 +497,10 @@ edges
 | variables.rs:304:5:306:10 | LetStmt | variables.rs:305:9:306:9 | ClosureExpr |  |
 | variables.rs:304:9:304:23 | example_closure | variables.rs:307:5:308:27 | LetStmt | match, no-match |
 | variables.rs:305:9:306:9 | ClosureExpr | variables.rs:304:9:304:23 | example_closure |  |
-| variables.rs:305:9:306:9 | enter ClosureExpr | variables.rs:306:9:306:9 | x |  |
+| variables.rs:305:9:306:9 | enter ClosureExpr | variables.rs:305:10:305:10 | x |  |
 | variables.rs:305:9:306:9 | exit ClosureExpr (normal) | variables.rs:305:9:306:9 | exit ClosureExpr |  |
+| variables.rs:305:10:305:10 | x | variables.rs:305:10:305:15 | Param | match, no-match |
+| variables.rs:305:10:305:15 | Param | variables.rs:306:9:306:9 | x |  |
 | variables.rs:306:9:306:9 | x | variables.rs:305:9:306:9 | exit ClosureExpr (normal) |  |
 | variables.rs:307:5:308:27 | LetStmt | variables.rs:308:9:308:23 | example_closure |  |
 | variables.rs:307:9:307:10 | n1 | variables.rs:309:5:309:18 | ExprStmt | match, no-match |
@@ -505,8 +517,10 @@ edges
 | variables.rs:312:5:314:10 | LetStmt | variables.rs:313:9:314:9 | ClosureExpr |  |
 | variables.rs:312:9:312:26 | immutable_variable | variables.rs:315:5:316:30 | LetStmt | match, no-match |
 | variables.rs:313:9:314:9 | ClosureExpr | variables.rs:312:9:312:26 | immutable_variable |  |
-| variables.rs:313:9:314:9 | enter ClosureExpr | variables.rs:314:9:314:9 | x |  |
+| variables.rs:313:9:314:9 | enter ClosureExpr | variables.rs:313:10:313:10 | x |  |
 | variables.rs:313:9:314:9 | exit ClosureExpr (normal) | variables.rs:313:9:314:9 | exit ClosureExpr |  |
+| variables.rs:313:10:313:10 | x | variables.rs:313:10:313:15 | Param | match, no-match |
+| variables.rs:313:10:313:15 | Param | variables.rs:314:9:314:9 | x |  |
 | variables.rs:314:9:314:9 | x | variables.rs:313:9:314:9 | exit ClosureExpr (normal) |  |
 | variables.rs:315:5:316:30 | LetStmt | variables.rs:316:9:316:26 | immutable_variable |  |
 | variables.rs:315:9:315:10 | n2 | variables.rs:317:5:317:18 | ExprStmt | match, no-match |
@@ -575,8 +589,10 @@ edges
 | variables.rs:342:5:342:16 | CallExpr | variables.rs:337:13:343:1 | BlockExpr |  |
 | variables.rs:342:5:342:17 | ExprStmt | variables.rs:342:5:342:13 | PathExpr |  |
 | variables.rs:342:15:342:15 | i | variables.rs:342:5:342:16 | CallExpr |  |
-| variables.rs:345:1:349:1 | enter mutate_param | variables.rs:346:5:348:11 | ExprStmt |  |
+| variables.rs:345:1:349:1 | enter mutate_param | variables.rs:345:17:345:17 | x |  |
 | variables.rs:345:1:349:1 | exit mutate_param (normal) | variables.rs:345:1:349:1 | exit mutate_param |  |
+| variables.rs:345:17:345:17 | x | variables.rs:345:17:345:28 | Param | match, no-match |
+| variables.rs:345:17:345:28 | Param | variables.rs:346:5:348:11 | ExprStmt |  |
 | variables.rs:345:31:349:1 | BlockExpr | variables.rs:345:1:349:1 | exit mutate_param (normal) |  |
 | variables.rs:346:5:346:6 | * ... | variables.rs:347:10:347:10 | x |  |
 | variables.rs:346:5:348:10 | ... = ... | variables.rs:345:31:349:1 | BlockExpr |  |

From 2f14ec9f2a2086cebae9ed91698db1c8bdd9e917 Mon Sep 17 00:00:00 2001
From: Tom Hvitved <hvitved@github.com>
Date: Tue, 8 Oct 2024 11:00:07 +0200
Subject: [PATCH 304/347] Rust: Include patterns in the CFG

---
 rust/ql/.generated.list                       |   1 -
 rust/ql/.gitattributes                        |   1 -
 .../rust/controlflow/internal/Completion.qll  |  52 +++-
 .../internal/ControlFlowGraphImpl.qll         | 236 ++++++++++++----
 .../rust/controlflow/internal/Splitting.qll   |   5 +
 .../rust/elements/internal/MatchExprImpl.qll  |   6 +
 .../rust/elements/internal/OrPatImpl.qll      |   8 +-
 .../library-tests/controlflow/Cfg.expected    | 123 +++++----
 .../test/library-tests/variables/Cfg.expected | 255 +++++++++++++-----
 9 files changed, 504 insertions(+), 183 deletions(-)

diff --git a/rust/ql/.generated.list b/rust/ql/.generated.list
index 9e49fc3893e4..5be950fab56c 100644
--- a/rust/ql/.generated.list
+++ b/rust/ql/.generated.list
@@ -304,7 +304,6 @@ lib/codeql/rust/elements/internal/NeverTypeImpl.qll 8c7464cb76f9d081dab318d74381
 lib/codeql/rust/elements/internal/OffsetOfExprConstructor.qll 616e146562adb3ac0fba4d6f55dd6ce60518ed377c0856f1f09ba49593e7bfab 80518ce90fc6d08011d6f5fc2a543958067739e1b0a6a5f2ed90fc9b1db078f0
 lib/codeql/rust/elements/internal/OffsetOfExprImpl.qll e52d4596068cc54719438121f7d5afcaab04e0c70168ac5e4df1a3a0969817a6 6ab37e659d79e02fb2685d6802ae124157bf14b6f790b31688f437c87f40f52c
 lib/codeql/rust/elements/internal/OrPatConstructor.qll 4ef583e07298487c0c4c6d7c76ffcc04b1e5fe58aba0c1da3e2c8446a9e0c92b 980a6bd176ae5e5b11c134569910c5468ba91f480982d846e222d031a6a05f1a
-lib/codeql/rust/elements/internal/OrPatImpl.qll 0dbc461115f62306e679f69c4354550bc3425d4291aec0124ad8f7a55c779d51 d32ebaa5a3002e87b35949cb624b20377155869ad33aec873326f60f2f0b666d
 lib/codeql/rust/elements/internal/ParamConstructor.qll b98a2d8969f289fdcc8c0fb11cbd19a3b0c71be038c4a74f5988295a2bae52f0 77d81b31064167945b79b19d9697b57ca24462c3a7cc19e462c4693ce87db532
 lib/codeql/rust/elements/internal/ParamImpl.qll 8a5101559f5d636b60ab80237057944b537823ce054d760c3dbd58b2acf05a46 e7a08cefeb6a290a975899045b7b19a9624f5a2b0946cba0866b1854cc0c0fb0
 lib/codeql/rust/elements/internal/ParamListConstructor.qll 3123142ab3cab46fb53d7f3eff6ba2d3ff7a45b78839a53dc1979a9c6a54920e 165f3d777ea257cfcf142cc4ba9a0ebcd1902eb99842b8a6657c87087f3df6fe
diff --git a/rust/ql/.gitattributes b/rust/ql/.gitattributes
index e69d7ea5791b..6d8e3c081e89 100644
--- a/rust/ql/.gitattributes
+++ b/rust/ql/.gitattributes
@@ -306,7 +306,6 @@
 /lib/codeql/rust/elements/internal/OffsetOfExprConstructor.qll linguist-generated
 /lib/codeql/rust/elements/internal/OffsetOfExprImpl.qll linguist-generated
 /lib/codeql/rust/elements/internal/OrPatConstructor.qll linguist-generated
-/lib/codeql/rust/elements/internal/OrPatImpl.qll linguist-generated
 /lib/codeql/rust/elements/internal/ParamConstructor.qll linguist-generated
 /lib/codeql/rust/elements/internal/ParamImpl.qll linguist-generated
 /lib/codeql/rust/elements/internal/ParamListConstructor.qll linguist-generated
diff --git a/rust/ql/lib/codeql/rust/controlflow/internal/Completion.qll b/rust/ql/lib/codeql/rust/controlflow/internal/Completion.qll
index c0aac56b8f1d..fc67c32045b7 100644
--- a/rust/ql/lib/codeql/rust/controlflow/internal/Completion.qll
+++ b/rust/ql/lib/codeql/rust/controlflow/internal/Completion.qll
@@ -62,7 +62,7 @@ abstract class ConditionalCompletion extends NormalCompletion {
   abstract ConditionalCompletion getDual();
 }
 
-/** Holds if node `le` has the Boolean constant value `value`. */
+/** Holds if node `le` has the constant Boolean value `value`. */
 private predicate isBooleanConstant(LiteralExpr le, Boolean value) {
   le.getTextValue() = value.toString()
 }
@@ -117,13 +117,61 @@ class BooleanCompletion extends ConditionalCompletion, TBooleanCompletion {
   override string toString() { result = "boolean(" + value + ")" }
 }
 
+/** Holds if node `pat` has the constant match value `value`. */
+pragma[nomagic]
+private predicate isMatchConstant(Pat pat, boolean value) {
+  value = true and
+  (
+    pat instanceof WildcardPat
+    or
+    pat = any(IdentPat ip | not ip.hasPat() and ip = any(Variable v).getPat())
+    or
+    pat instanceof RestPat
+    or
+    // `let` statements without an `else` branch must be exhaustive
+    pat = any(LetStmt let | not let.hasLetElse()).getPat()
+    or
+    // `match` expressions must be exhaustive, so last arm cannot fail
+    pat = any(MatchExpr me).getLastArm().getPat()
+    or
+    // parameter patterns must be exhaustive
+    pat = any(Param p).getPat()
+  ) and
+  not pat = any(ForExpr for).getPat() // workaround until `for` loops are desugared
+  or
+  exists(Pat parent | isMatchConstant(parent, value) |
+    pat = parent.(BoxPat).getPat()
+    or
+    pat = parent.(IdentPat).getPat()
+    or
+    pat = parent.(ParenPat).getPat()
+    or
+    pat = parent.(RecordPat).getRecordPatFieldList().getField(_).getPat()
+    or
+    pat = parent.(RefPat).getPat()
+    or
+    pat = parent.(TuplePat).getAField()
+    or
+    pat = parent.(TupleStructPat).getAField()
+    or
+    pat = parent.(OrPat).getLastPat()
+  )
+}
+
 /**
  * A completion that represents the result of a pattern match.
  */
 class MatchCompletion extends TMatchCompletion, ConditionalCompletion {
   MatchCompletion() { this = TMatchCompletion(value) }
 
-  override predicate isValidForSpecific(AstNode e) { e instanceof Pat }
+  override predicate isValidForSpecific(AstNode e) {
+    e instanceof Pat and
+    (
+      isMatchConstant(e, value)
+      or
+      not isMatchConstant(e, _)
+    )
+  }
 
   override MatchSuccessor getAMatchingSuccessorType() { result.getValue() = value }
 
diff --git a/rust/ql/lib/codeql/rust/controlflow/internal/ControlFlowGraphImpl.qll b/rust/ql/lib/codeql/rust/controlflow/internal/ControlFlowGraphImpl.qll
index 84ddc28de9e6..471afaa920ea 100644
--- a/rust/ql/lib/codeql/rust/controlflow/internal/ControlFlowGraphImpl.qll
+++ b/rust/ql/lib/codeql/rust/controlflow/internal/ControlFlowGraphImpl.qll
@@ -65,9 +65,6 @@ private module CfgImpl =
 
 import CfgImpl
 
-/** Holds if `p` is a trivial pattern that is always guaranteed to match. */
-predicate trivialPat(Pat p) { p instanceof WildcardPat or p instanceof IdentPat }
-
 class ArrayExprTree extends StandardPostOrderTree, ArrayExpr {
   override AstNode getChildNode(int i) { result = this.getExpr(i) }
 }
@@ -141,11 +138,10 @@ class LogicalAndTree extends PostOrderTree, LogicalAndExpr {
 
 class BlockExprTree extends StandardPostOrderTree, BlockExpr {
   override AstNode getChildNode(int i) {
-    result = super.getStmtList().getStatement(i)
+    result = this.getStmtList().getStatement(i)
     or
-    not exists(super.getStmtList().getStatement(i)) and
-    (exists(super.getStmtList().getStatement(i - 1)) or i = 0) and
-    result = super.getStmtList().getTailExpr()
+    i = this.getStmtList().getNumberOfStatements() and
+    result = this.getStmtList().getTailExpr()
   }
 
   override predicate propagatesAbnormal(AstNode child) { child = this.getChildNode(_) }
@@ -304,44 +300,33 @@ class LetExprTree extends StandardPreOrderTree instanceof LetExpr {
   override AstNode getChildNode(int i) { i = 0 and result = super.getPat() }
 }
 
-// We handle `let` statements with trivial patterns separately as they don't
-// lead to non-standard control flow. For instance, in `let a = ...` it is not
-// interesing to create match edges as it would carry no information.
-class LetStmtTreeTrivialPat extends StandardPreOrderTree instanceof LetStmt {
-  LetStmtTreeTrivialPat() { trivialPat(super.getPat()) }
-
-  override AstNode getChildNode(int i) {
-    i = 0 and result = super.getInitializer()
-    or
-    i = 1 and result = super.getPat()
-  }
-}
-
-// `let` statements with interesting patterns that we want to be reflected in
-// the CFG.
-class LetStmtTree extends PreOrderTree instanceof LetStmt {
-  LetStmtTree() { not trivialPat(super.getPat()) }
-
+class LetStmtTree extends PreOrderTree, LetStmt {
   final override predicate propagatesAbnormal(AstNode child) {
-    child = [super.getInitializer(), super.getLetElse().getBlockExpr()]
+    child = [this.getInitializer(), this.getLetElse().getBlockExpr()]
   }
 
   override predicate succ(AstNode pred, AstNode succ, Completion c) {
     // Edge to start of initializer.
-    pred = this and first(super.getInitializer(), succ) and completionIsSimple(c)
+    pred = this and first(this.getInitializer(), succ) and completionIsSimple(c)
+    or
+    // Edge to pattern when there is no initializer.
+    pred = this and
+    first(this.getPat(), succ) and
+    completionIsSimple(c) and
+    not this.hasInitializer()
     or
     // Edge from end of initializer to pattern.
-    last(super.getInitializer(), pred, c) and first(super.getPat(), succ)
+    last(this.getInitializer(), pred, c) and first(this.getPat(), succ)
     or
     // Edge from failed pattern to `else` branch.
-    last(super.getPat(), pred, c) and
-    first(super.getLetElse().getBlockExpr(), succ) and
+    last(this.getPat(), pred, c) and
+    first(this.getLetElse().getBlockExpr(), succ) and
     c.(MatchCompletion).failed()
   }
 
   override predicate last(AstNode node, Completion c) {
     // Edge out of a successfully matched pattern.
-    last(super.getPat(), node, c) and c.(MatchCompletion).succeeded()
+    last(this.getPat(), node, c) and c.(MatchCompletion).succeeded()
     // NOTE: No edge out of the `else` branch as that is guaranteed to diverge.
   }
 }
@@ -440,33 +425,33 @@ class ForExprTree extends LoopingExprTree instanceof ForExpr {
 // TODO: replace with expanded macro once the extractor supports it
 class MacroExprTree extends LeafTree, MacroExpr { }
 
-class MatchArmTree extends ControlFlowTree instanceof MatchArm {
-  override predicate propagatesAbnormal(AstNode child) { child = super.getExpr() }
+class MatchArmTree extends ControlFlowTree, MatchArm {
+  override predicate propagatesAbnormal(AstNode child) { child = this.getExpr() }
 
-  override predicate first(AstNode node) { node = super.getPat() }
+  override predicate first(AstNode node) { first(this.getPat(), node) }
 
   override predicate succ(AstNode pred, AstNode succ, Completion c) {
     // Edge from pattern to guard/arm if match succeeds.
-    pred = super.getPat() and
+    last(this.getPat(), pred, c) and
     c.(MatchCompletion).succeeded() and
     (
-      first(super.getGuard().getCondition(), succ)
+      first(this.getGuard().getCondition(), succ)
       or
-      not super.hasGuard() and first(super.getExpr(), succ)
+      not this.hasGuard() and first(this.getExpr(), succ)
     )
     or
     // Edge from guard to arm if the guard succeeds.
-    last(super.getGuard().getCondition(), pred, c) and
-    first(super.getExpr(), succ) and
+    last(this.getGuard().getCondition(), pred, c) and
+    first(this.getExpr(), succ) and
     c.(BooleanCompletion).succeeded()
   }
 
   override predicate last(AstNode node, Completion c) {
-    node = super.getPat() and c.(MatchCompletion).failed()
+    last(this.getPat(), node, c) and c.(MatchCompletion).failed()
     or
-    last(super.getGuard().getCondition(), node, c) and c.(BooleanCompletion).failed()
+    last(this.getGuard().getCondition(), node, c) and c.(BooleanCompletion).failed()
     or
-    last(super.getExpr(), node, c)
+    last(this.getExpr(), node, c)
   }
 }
 
@@ -479,7 +464,8 @@ class MatchExprTree extends PostOrderTree instanceof MatchExpr {
 
   override predicate succ(AstNode pred, AstNode succ, Completion c) {
     // Edge from the scrutinee to the first arm.
-    last(super.getExpr(), pred, c) and succ = super.getArm(0).getPat()
+    last(super.getExpr(), pred, c) and
+    first(super.getArm(0).getPat(), succ)
     or
     // Edge from a failed match/guard in one arm to the beginning of the next arm.
     exists(int i |
@@ -520,9 +506,6 @@ class ParenExprTree extends ControlFlowTree, ParenExpr {
   override predicate succ(AstNode pred, AstNode succ, Completion c) { none() }
 }
 
-// This covers all patterns as they all extend `Pat`
-class PatExprTree extends LeafTree instanceof Pat { }
-
 class PathExprTree extends LeafTree instanceof PathExpr { }
 
 class PrefixExprTree extends StandardPostOrderTree instanceof PrefixExpr {
@@ -578,3 +561,164 @@ class YieldExprTree extends StandardPostOrderTree instanceof YieldExpr {
 class YeetExprTree extends StandardPostOrderTree instanceof YeetExpr {
   override AstNode getChildNode(int i) { i = 0 and result = super.getExpr() }
 }
+
+/**
+ * Provides `ControlFlowTree`s for patterns.
+ *
+ * Since patterns destruct values, they are modeled in pre-order, except for
+ * `OrPat`s and `IdentPat`s.
+ */
+module PatternTrees {
+  abstract class PreOrderPatTree extends PreOrderTree {
+    abstract Pat getPat(int i);
+
+    private Pat getPatRanked(int i) {
+      result = rank[i + 1](Pat pat, int j | pat = this.getPat(j) | pat order by j)
+    }
+
+    override predicate propagatesAbnormal(AstNode child) { child = this.getPatRanked(_) }
+
+    override predicate succ(AstNode pred, AstNode succ, Completion c) {
+      pred = this and
+      completionIsValidFor(c, this) and
+      c.(MatchCompletion).succeeded() and
+      first(this.getPatRanked(0), succ)
+      or
+      exists(int i | last(this.getPatRanked(i), pred, c) |
+        // Edge from successful pattern to the next
+        c.(MatchCompletion).succeeded() and
+        first(this.getPatRanked(i + 1), succ)
+      )
+    }
+
+    override predicate last(AstNode node, Completion c) {
+      node = this and
+      completionIsValidFor(c, this) and
+      c.(MatchCompletion).failed()
+      or
+      exists(int i | last(this.getPatRanked(i), node, c) |
+        c.(MatchCompletion).failed()
+        or
+        not exists(this.getPatRanked(i + 1)) and
+        completionIsNormal(c)
+      )
+    }
+  }
+
+  abstract class PostOrderPatTree extends PostOrderTree {
+    abstract Pat getPat(int i);
+
+    private Pat getPatRanked(int i) {
+      result = rank[i + 1](Pat pat, int j | pat = this.getPat(j) | pat order by j)
+    }
+
+    override predicate propagatesAbnormal(AstNode child) { child = this.getPatRanked(_) }
+
+    override predicate first(AstNode node) {
+      first(this.getPat(0), node)
+      or
+      not exists(this.getPat(_)) and
+      node = this
+    }
+
+    override predicate succ(AstNode pred, AstNode succ, Completion c) {
+      exists(int i | last(this.getPat(i), pred, c) |
+        // Edge from unsuccessful pattern to the next
+        c.(MatchCompletion).failed() and
+        first(this.getPat(i + 1), succ)
+        or
+        // Edge from successful pattern to this
+        c.(MatchCompletion).succeeded() and
+        succ = this
+        or
+        // Edge from last pattern to this
+        not exists(this.getPat(i + 1)) and
+        succ = this and
+        completionIsNormal(c)
+      )
+    }
+  }
+
+  class IdentPatTree extends PostOrderPatTree, IdentPat {
+    override Pat getPat(int i) { i = 0 and result = this.getPat() }
+
+    override predicate last(AstNode node, Completion c) {
+      super.last(node, c)
+      or
+      last(this.getPat(), node, c) and
+      c.(MatchCompletion).failed()
+    }
+
+    override predicate succ(AstNode pred, AstNode succ, Completion c) {
+      super.succ(pred, succ, c) and
+      not (succ = this and c.(MatchCompletion).failed())
+    }
+  }
+
+  class BoxPatTree extends PreOrderPatTree, BoxPat {
+    override Pat getPat(int i) { i = 0 and result = this.getPat() }
+  }
+
+  class RestPatTree extends LeafTree, RestPat { }
+
+  class LiteralPatTree extends LeafTree, LiteralPat { }
+
+  class MacroPatTree extends LeafTree, MacroPat { } // todo
+
+  class OrPatTree extends PostOrderPatTree instanceof OrPat {
+    override Pat getPat(int i) { result = OrPat.super.getPat(i) }
+  }
+
+  class ParenPatTree extends ControlFlowTree, ParenPat {
+    private ControlFlowTree pat;
+
+    ParenPatTree() { pat = this.getPat() }
+
+    override predicate propagatesAbnormal(AstNode child) { pat.propagatesAbnormal(child) }
+
+    override predicate first(AstNode first) { pat.first(first) }
+
+    override predicate last(AstNode last, Completion c) { pat.last(last, c) }
+
+    override predicate succ(AstNode pred, AstNode succ, Completion c) { none() }
+  }
+
+  class PathPatTree extends LeafTree, PathPat { }
+
+  class WildcardPatTree extends LeafTree, WildcardPat { }
+
+  class RangePatTree extends PreOrderPatTree, RangePat {
+    override Pat getPat(int i) {
+      i = 0 and result = this.getStart()
+      or
+      i = 1 and result = this.getEnd()
+    }
+  }
+
+  class RecordPatTree extends PreOrderPatTree, RecordPat {
+    override Pat getPat(int i) {
+      result = this.getRecordPatFieldList().getField(i).getPat()
+      or
+      i = this.getRecordPatFieldList().getNumberOfFields() and
+      result = this.getRecordPatFieldList().getRestPat()
+    }
+  }
+
+  class RefPatTree extends PreOrderPatTree, RefPat {
+    override Pat getPat(int i) { i = 0 and result = super.getPat() }
+  }
+
+  class SlicePatTree extends PreOrderPatTree instanceof SlicePat {
+    override Pat getPat(int i) { result = SlicePat.super.getPat(i) }
+  }
+
+  class TuplePatTree extends PreOrderPatTree, TuplePat {
+    override Pat getPat(int i) { result = this.getField(i) }
+  }
+
+  class TupleStructPatTree extends PreOrderPatTree, TupleStructPat {
+    override Pat getPat(int i) { result = this.getField(i) }
+  }
+
+  class ConstBlockPatTree extends LeafTree, ConstBlockPat { } // todo?
+}
diff --git a/rust/ql/lib/codeql/rust/controlflow/internal/Splitting.qll b/rust/ql/lib/codeql/rust/controlflow/internal/Splitting.qll
index ae00e3e0d7a5..3c59d6659c21 100644
--- a/rust/ql/lib/codeql/rust/controlflow/internal/Splitting.qll
+++ b/rust/ql/lib/codeql/rust/controlflow/internal/Splitting.qll
@@ -78,6 +78,11 @@ module ConditionalCompletionSplitting {
         child = parent.(MatchExpr).getAnArm().getExpr()
         or
         child = parent.(BlockExpr).getStmtList().getTailExpr()
+        or
+        child = parent.(PatternTrees::PreOrderPatTree).getPat(_) and
+        childCompletion.(MatchCompletion).failed()
+        or
+        child = parent.(PatternTrees::PostOrderPatTree).getPat(_)
       )
     }
   }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/MatchExprImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/MatchExprImpl.qll
index ebb0b8510678..f707a27afd49 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/MatchExprImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/MatchExprImpl.qll
@@ -42,5 +42,11 @@ module Impl {
      * Gets the number of arms of this match expression.
      */
     int getNumberOfArms() { result = this.getMatchArmList().getNumberOfArms() }
+
+    /**
+     * Gets the last arm of this match expression. Due to exhaustiveness checking,
+     * this arm is guaranteed to succeed.
+     */
+    MatchArm getLastArm() { result = this.getArm(this.getNumberOfArms() - 1) }
   }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/OrPatImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/OrPatImpl.qll
index c00be2a77938..f29e3d1865fc 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/OrPatImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/OrPatImpl.qll
@@ -1,4 +1,3 @@
-// generated by codegen, remove this comment if you wish to edit this file
 /**
  * This module provides a hand-modifiable wrapper around the generated class `OrPat`.
  *
@@ -12,6 +11,7 @@ private import codeql.rust.elements.internal.generated.OrPat
  * be referenced directly.
  */
 module Impl {
+  // the following QLdoc is generated: if you need to edit it, do it in the schema file
   /**
    * An or pattern. For example:
    * ```rust
@@ -20,5 +20,9 @@ module Impl {
    * }
    * ```
    */
-  class OrPat extends Generated::OrPat { }
+  class OrPat extends Generated::OrPat {
+    /** Gets the last pattern in this or pattern. */
+    pragma[nomagic]
+    Pat getLastPat() { result = this.getPat(this.getNumberOfPats() - 1) }
+  }
 }
diff --git a/rust/ql/test/library-tests/controlflow/Cfg.expected b/rust/ql/test/library-tests/controlflow/Cfg.expected
index 853a99e2c986..73f3e9d84123 100644
--- a/rust/ql/test/library-tests/controlflow/Cfg.expected
+++ b/rust/ql/test/library-tests/controlflow/Cfg.expected
@@ -14,10 +14,10 @@ edges
 | test.rs:3:21:3:22 | 42 | test.rs:3:5:3:23 | CallExpr |  |
 | test.rs:8:5:24:5 | enter test_break_and_continue | test.rs:8:32:8:32 | n |  |
 | test.rs:8:5:24:5 | exit test_break_and_continue (normal) | test.rs:8:5:24:5 | exit test_break_and_continue |  |
-| test.rs:8:32:8:32 | n | test.rs:8:32:8:37 | Param | match, no-match |
+| test.rs:8:32:8:32 | n | test.rs:8:32:8:37 | Param | match |
 | test.rs:8:32:8:37 | Param | test.rs:9:9:9:22 | LetStmt |  |
 | test.rs:9:9:9:22 | LetStmt | test.rs:9:21:9:21 | n |  |
-| test.rs:9:13:9:17 | i | test.rs:10:9:22:9 | ExprStmt | match, no-match |
+| test.rs:9:13:9:17 | i | test.rs:10:9:22:9 | ExprStmt | match |
 | test.rs:9:21:9:21 | n | test.rs:9:13:9:17 | i |  |
 | test.rs:10:9:22:9 | ExprStmt | test.rs:11:13:11:24 | ExprStmt |  |
 | test.rs:10:9:22:9 | LoopExpr | test.rs:23:9:23:20 | ExprStmt |  |
@@ -65,7 +65,7 @@ edges
 | test.rs:23:16:23:19 | true | test.rs:23:9:23:19 | ReturnExpr |  |
 | test.rs:26:5:38:5 | enter test_break_with_labels | test.rs:26:31:26:31 | b |  |
 | test.rs:26:5:38:5 | exit test_break_with_labels (normal) | test.rs:26:5:38:5 | exit test_break_with_labels |  |
-| test.rs:26:31:26:31 | b | test.rs:26:31:26:37 | Param | match, no-match |
+| test.rs:26:31:26:31 | b | test.rs:26:31:26:37 | Param | match |
 | test.rs:26:31:26:37 | Param | test.rs:27:9:36:9 | ExprStmt |  |
 | test.rs:26:48:38:5 | BlockExpr | test.rs:26:5:38:5 | exit test_break_with_labels (normal) |  |
 | test.rs:27:9:36:9 | ExprStmt | test.rs:29:17:33:17 | ExprStmt |  |
@@ -87,7 +87,7 @@ edges
 | test.rs:34:17:34:29 | ExprStmt | test.rs:34:17:34:28 | BreakExpr |  |
 | test.rs:37:9:37:12 | true | test.rs:26:48:38:5 | BlockExpr |  |
 | test.rs:40:5:52:5 | enter test_continue_with_labels | test.rs:40:34:40:34 | b |  |
-| test.rs:40:34:40:34 | b | test.rs:40:34:40:40 | Param | match, no-match |
+| test.rs:40:34:40:34 | b | test.rs:40:34:40:40 | Param | match |
 | test.rs:40:34:40:40 | Param | test.rs:42:13:42:14 | ExprStmt |  |
 | test.rs:42:13:42:13 | 1 | test.rs:44:17:48:17 | ExprStmt |  |
 | test.rs:42:13:42:14 | ExprStmt | test.rs:42:13:42:13 | 1 |  |
@@ -105,7 +105,7 @@ edges
 | test.rs:49:17:49:31 | ContinueExpr | test.rs:44:17:48:17 | ExprStmt | continue |
 | test.rs:49:17:49:32 | ExprStmt | test.rs:49:17:49:31 | ContinueExpr |  |
 | test.rs:54:5:66:5 | enter test_loop_label_shadowing | test.rs:54:34:54:34 | b |  |
-| test.rs:54:34:54:34 | b | test.rs:54:34:54:40 | Param | match, no-match |
+| test.rs:54:34:54:34 | b | test.rs:54:34:54:40 | Param | match |
 | test.rs:54:34:54:40 | Param | test.rs:56:13:56:14 | ExprStmt |  |
 | test.rs:56:13:56:13 | 1 | test.rs:58:17:62:17 | ExprStmt |  |
 | test.rs:56:13:56:14 | ExprStmt | test.rs:56:13:56:13 | 1 |  |
@@ -124,11 +124,11 @@ edges
 | test.rs:63:17:63:31 | ExprStmt | test.rs:63:17:63:30 | ContinueExpr |  |
 | test.rs:68:5:77:5 | enter test_while | test.rs:68:19:68:19 | i |  |
 | test.rs:68:5:77:5 | exit test_while (normal) | test.rs:68:5:77:5 | exit test_while |  |
-| test.rs:68:19:68:19 | i | test.rs:68:19:68:24 | Param | match, no-match |
+| test.rs:68:19:68:19 | i | test.rs:68:19:68:24 | Param | match |
 | test.rs:68:19:68:24 | Param | test.rs:69:9:69:25 | LetStmt |  |
 | test.rs:68:27:77:5 | BlockExpr | test.rs:68:5:77:5 | exit test_while (normal) |  |
 | test.rs:69:9:69:25 | LetStmt | test.rs:69:21:69:24 | true |  |
-| test.rs:69:13:69:17 | b | test.rs:70:15:70:15 | b | match, no-match |
+| test.rs:69:13:69:17 | b | test.rs:70:15:70:15 | b | match |
 | test.rs:69:21:69:24 | true | test.rs:69:13:69:17 | b |  |
 | test.rs:70:9:76:9 | WhileExpr | test.rs:68:27:77:5 | BlockExpr |  |
 | test.rs:70:15:70:15 | b | test.rs:70:9:76:9 | WhileExpr | false |
@@ -152,14 +152,15 @@ edges
 | test.rs:79:5:86:5 | exit test_while_let (normal) | test.rs:79:5:86:5 | exit test_while_let |  |
 | test.rs:79:25:86:5 | BlockExpr | test.rs:79:5:86:5 | exit test_while_let (normal) |  |
 | test.rs:80:9:80:29 | LetStmt | test.rs:80:24:80:24 | 1 |  |
-| test.rs:80:13:80:20 | iter | test.rs:81:15:81:39 | LetExpr | match, no-match |
+| test.rs:80:13:80:20 | iter | test.rs:81:15:81:39 | LetExpr | match |
 | test.rs:80:24:80:24 | 1 | test.rs:80:27:80:28 | 10 |  |
 | test.rs:80:24:80:28 | RangeExpr | test.rs:80:13:80:20 | iter |  |
 | test.rs:80:27:80:28 | 10 | test.rs:80:24:80:28 | RangeExpr |  |
 | test.rs:81:9:85:9 | WhileExpr | test.rs:79:25:86:5 | BlockExpr |  |
 | test.rs:81:15:81:39 | LetExpr | test.rs:81:19:81:25 | TupleStructPat |  |
 | test.rs:81:19:81:25 | TupleStructPat | test.rs:81:9:85:9 | WhileExpr | no-match |
-| test.rs:81:19:81:25 | TupleStructPat | test.rs:82:17:82:17 | PathExpr | match |
+| test.rs:81:19:81:25 | TupleStructPat | test.rs:81:24:81:24 | x | match |
+| test.rs:81:24:81:24 | x | test.rs:82:17:82:17 | PathExpr | match |
 | test.rs:81:41:85:9 | BlockExpr | test.rs:81:15:81:39 | LetExpr |  |
 | test.rs:82:13:84:13 | IfExpr | test.rs:81:41:85:9 | BlockExpr |  |
 | test.rs:82:17:82:17 | PathExpr | test.rs:82:21:82:21 | 5 |  |
@@ -170,7 +171,7 @@ edges
 | test.rs:83:17:83:22 | ExprStmt | test.rs:83:17:83:21 | BreakExpr |  |
 | test.rs:88:5:95:5 | enter test_for | test.rs:88:17:88:17 | j |  |
 | test.rs:88:5:95:5 | exit test_for (normal) | test.rs:88:5:95:5 | exit test_for |  |
-| test.rs:88:17:88:17 | j | test.rs:88:17:88:22 | Param | match, no-match |
+| test.rs:88:17:88:17 | j | test.rs:88:17:88:22 | Param | match |
 | test.rs:88:17:88:22 | Param | test.rs:89:18:89:18 | 0 |  |
 | test.rs:88:25:95:5 | BlockExpr | test.rs:88:5:95:5 | exit test_for (normal) |  |
 | test.rs:89:9:94:9 | ForExpr | test.rs:88:25:95:5 | BlockExpr |  |
@@ -192,16 +193,16 @@ edges
 | test.rs:93:13:93:14 | ExprStmt | test.rs:93:13:93:13 | 1 |  |
 | test.rs:98:1:101:1 | enter test_nested_function | test.rs:98:25:98:25 | n |  |
 | test.rs:98:1:101:1 | exit test_nested_function (normal) | test.rs:98:1:101:1 | exit test_nested_function |  |
-| test.rs:98:25:98:25 | n | test.rs:98:25:98:30 | Param | match, no-match |
+| test.rs:98:25:98:25 | n | test.rs:98:25:98:30 | Param | match |
 | test.rs:98:25:98:30 | Param | test.rs:99:5:99:28 | LetStmt |  |
 | test.rs:98:40:101:1 | BlockExpr | test.rs:98:1:101:1 | exit test_nested_function (normal) |  |
 | test.rs:99:5:99:28 | LetStmt | test.rs:99:19:99:27 | ClosureExpr |  |
-| test.rs:99:9:99:15 | add_one | test.rs:100:5:100:11 | add_one | match, no-match |
+| test.rs:99:9:99:15 | add_one | test.rs:100:5:100:11 | add_one | match |
 | test.rs:99:19:99:27 | ClosureExpr | test.rs:99:9:99:15 | add_one |  |
 | test.rs:99:19:99:27 | enter ClosureExpr | test.rs:99:20:99:20 | i |  |
 | test.rs:99:19:99:27 | exit ClosureExpr (normal) | test.rs:99:19:99:27 | exit ClosureExpr |  |
 | test.rs:99:20:99:20 | Param | test.rs:99:23:99:23 | i |  |
-| test.rs:99:20:99:20 | i | test.rs:99:20:99:20 | Param | match, no-match |
+| test.rs:99:20:99:20 | i | test.rs:99:20:99:20 | Param | match |
 | test.rs:99:23:99:23 | i | test.rs:99:27:99:27 | 1 |  |
 | test.rs:99:23:99:27 | ... + ... | test.rs:99:19:99:27 | exit ClosureExpr (normal) |  |
 | test.rs:99:27:99:27 | 1 | test.rs:99:23:99:27 | ... + ... |  |
@@ -212,7 +213,7 @@ edges
 | test.rs:100:21:100:21 | n | test.rs:100:13:100:22 | CallExpr |  |
 | test.rs:105:5:111:5 | enter test_if_else | test.rs:105:21:105:21 | n |  |
 | test.rs:105:5:111:5 | exit test_if_else (normal) | test.rs:105:5:111:5 | exit test_if_else |  |
-| test.rs:105:21:105:21 | n | test.rs:105:21:105:26 | Param | match, no-match |
+| test.rs:105:21:105:21 | n | test.rs:105:21:105:26 | Param | match |
 | test.rs:105:21:105:26 | Param | test.rs:106:12:106:12 | n |  |
 | test.rs:105:36:111:5 | BlockExpr | test.rs:105:5:111:5 | exit test_if_else (normal) |  |
 | test.rs:106:9:110:9 | IfExpr | test.rs:105:36:111:5 | BlockExpr |  |
@@ -228,33 +229,35 @@ edges
 | test.rs:109:17:109:17 | 1 | test.rs:109:13:109:17 | ... - ... |  |
 | test.rs:113:5:119:5 | enter test_if_let_else | test.rs:113:25:113:25 | a |  |
 | test.rs:113:5:119:5 | exit test_if_let_else (normal) | test.rs:113:5:119:5 | exit test_if_let_else |  |
-| test.rs:113:25:113:25 | a | test.rs:113:25:113:38 | Param | match, no-match |
+| test.rs:113:25:113:25 | a | test.rs:113:25:113:38 | Param | match |
 | test.rs:113:25:113:38 | Param | test.rs:114:12:114:26 | LetExpr |  |
 | test.rs:113:48:119:5 | BlockExpr | test.rs:113:5:119:5 | exit test_if_let_else (normal) |  |
 | test.rs:114:9:118:9 | IfExpr | test.rs:113:48:119:5 | BlockExpr |  |
 | test.rs:114:12:114:26 | LetExpr | test.rs:114:16:114:22 | TupleStructPat |  |
-| test.rs:114:16:114:22 | TupleStructPat | test.rs:115:13:115:13 | n | match |
+| test.rs:114:16:114:22 | TupleStructPat | test.rs:114:21:114:21 | n | match |
 | test.rs:114:16:114:22 | TupleStructPat | test.rs:117:13:117:13 | 0 | no-match |
+| test.rs:114:21:114:21 | n | test.rs:115:13:115:13 | n | match |
 | test.rs:114:28:116:9 | BlockExpr | test.rs:114:9:118:9 | IfExpr |  |
 | test.rs:115:13:115:13 | n | test.rs:114:28:116:9 | BlockExpr |  |
 | test.rs:116:16:118:9 | BlockExpr | test.rs:114:9:118:9 | IfExpr |  |
 | test.rs:117:13:117:13 | 0 | test.rs:116:16:118:9 | BlockExpr |  |
 | test.rs:121:5:126:5 | enter test_if_let | test.rs:121:20:121:20 | a |  |
 | test.rs:121:5:126:5 | exit test_if_let (normal) | test.rs:121:5:126:5 | exit test_if_let |  |
-| test.rs:121:20:121:20 | a | test.rs:121:20:121:33 | Param | match, no-match |
+| test.rs:121:20:121:20 | a | test.rs:121:20:121:33 | Param | match |
 | test.rs:121:20:121:33 | Param | test.rs:122:9:124:9 | ExprStmt |  |
 | test.rs:121:43:126:5 | BlockExpr | test.rs:121:5:126:5 | exit test_if_let (normal) |  |
 | test.rs:122:9:124:9 | ExprStmt | test.rs:122:12:122:26 | LetExpr |  |
 | test.rs:122:9:124:9 | IfExpr | test.rs:125:9:125:9 | 0 |  |
 | test.rs:122:12:122:26 | LetExpr | test.rs:122:16:122:22 | TupleStructPat |  |
 | test.rs:122:16:122:22 | TupleStructPat | test.rs:122:9:124:9 | IfExpr | no-match |
-| test.rs:122:16:122:22 | TupleStructPat | test.rs:123:13:123:13 | n | match |
+| test.rs:122:16:122:22 | TupleStructPat | test.rs:122:21:122:21 | n | match |
+| test.rs:122:21:122:21 | n | test.rs:123:13:123:13 | n | match |
 | test.rs:122:28:124:9 | BlockExpr | test.rs:122:9:124:9 | IfExpr |  |
 | test.rs:123:13:123:13 | n | test.rs:122:28:124:9 | BlockExpr |  |
 | test.rs:125:9:125:9 | 0 | test.rs:121:43:126:5 | BlockExpr |  |
 | test.rs:128:5:134:5 | enter test_nested_if | test.rs:128:23:128:23 | a |  |
 | test.rs:128:5:134:5 | exit test_nested_if (normal) | test.rs:128:5:134:5 | exit test_nested_if |  |
-| test.rs:128:23:128:23 | a | test.rs:128:23:128:28 | Param | match, no-match |
+| test.rs:128:23:128:23 | a | test.rs:128:23:128:28 | Param | match |
 | test.rs:128:23:128:28 | Param | test.rs:129:16:129:16 | a |  |
 | test.rs:128:38:134:5 | BlockExpr | test.rs:128:5:134:5 | exit test_nested_if (normal) |  |
 | test.rs:129:9:133:9 | IfExpr | test.rs:128:38:134:5 | BlockExpr |  |
@@ -283,7 +286,7 @@ edges
 | test.rs:132:13:132:13 | 0 | test.rs:131:16:133:9 | BlockExpr |  |
 | test.rs:136:5:145:5 | enter test_nested_if_match | test.rs:136:29:136:29 | a |  |
 | test.rs:136:5:145:5 | exit test_nested_if_match (normal) | test.rs:136:5:145:5 | exit test_nested_if_match |  |
-| test.rs:136:29:136:29 | a | test.rs:136:29:136:34 | Param | match, no-match |
+| test.rs:136:29:136:29 | a | test.rs:136:29:136:34 | Param | match |
 | test.rs:136:29:136:34 | Param | test.rs:137:19:137:19 | a |  |
 | test.rs:136:44:145:5 | BlockExpr | test.rs:136:5:145:5 | exit test_nested_if_match (normal) |  |
 | test.rs:137:9:144:9 | IfExpr | test.rs:136:44:145:5 | BlockExpr |  |
@@ -301,7 +304,7 @@ edges
 | test.rs:143:13:143:13 | 0 | test.rs:142:16:144:9 | BlockExpr |  |
 | test.rs:147:5:156:5 | enter test_nested_if_block | test.rs:147:29:147:29 | a |  |
 | test.rs:147:5:156:5 | exit test_nested_if_block (normal) | test.rs:147:5:156:5 | exit test_nested_if_block |  |
-| test.rs:147:29:147:29 | a | test.rs:147:29:147:34 | Param | match, no-match |
+| test.rs:147:29:147:29 | a | test.rs:147:29:147:34 | Param | match |
 | test.rs:147:29:147:34 | Param | test.rs:149:13:149:15 | ExprStmt |  |
 | test.rs:147:44:156:5 | BlockExpr | test.rs:147:5:156:5 | exit test_nested_if_block (normal) |  |
 | test.rs:148:9:155:9 | IfExpr | test.rs:147:44:156:5 | BlockExpr |  |
@@ -319,11 +322,11 @@ edges
 | test.rs:154:13:154:13 | 0 | test.rs:153:16:155:9 | BlockExpr |  |
 | test.rs:158:5:165:5 | enter test_if_assignment | test.rs:158:27:158:27 | a |  |
 | test.rs:158:5:165:5 | exit test_if_assignment (normal) | test.rs:158:5:165:5 | exit test_if_assignment |  |
-| test.rs:158:27:158:27 | a | test.rs:158:27:158:32 | Param | match, no-match |
+| test.rs:158:27:158:27 | a | test.rs:158:27:158:32 | Param | match |
 | test.rs:158:27:158:32 | Param | test.rs:159:9:159:26 | LetStmt |  |
 | test.rs:158:42:165:5 | BlockExpr | test.rs:158:5:165:5 | exit test_if_assignment (normal) |  |
 | test.rs:159:9:159:26 | LetStmt | test.rs:159:21:159:25 | false |  |
-| test.rs:159:13:159:17 | x | test.rs:160:12:160:12 | x | match, no-match |
+| test.rs:159:13:159:17 | x | test.rs:160:12:160:12 | x | match |
 | test.rs:159:21:159:25 | false | test.rs:159:13:159:17 | x |  |
 | test.rs:160:9:164:9 | IfExpr | test.rs:158:42:165:5 | BlockExpr |  |
 | test.rs:160:12:160:12 | x | test.rs:160:16:160:19 | true |  |
@@ -336,7 +339,7 @@ edges
 | test.rs:163:13:163:13 | 0 | test.rs:162:16:164:9 | BlockExpr |  |
 | test.rs:167:5:178:5 | enter test_if_loop1 | test.rs:167:22:167:22 | a |  |
 | test.rs:167:5:178:5 | exit test_if_loop1 (normal) | test.rs:167:5:178:5 | exit test_if_loop1 |  |
-| test.rs:167:22:167:22 | a | test.rs:167:22:167:27 | Param | match, no-match |
+| test.rs:167:22:167:22 | a | test.rs:167:22:167:27 | Param | match |
 | test.rs:167:22:167:27 | Param | test.rs:169:13:171:14 | ExprStmt |  |
 | test.rs:167:37:178:5 | BlockExpr | test.rs:167:5:178:5 | exit test_if_loop1 (normal) |  |
 | test.rs:168:9:177:9 | IfExpr | test.rs:167:37:178:5 | BlockExpr |  |
@@ -366,7 +369,7 @@ edges
 | test.rs:176:13:176:13 | 0 | test.rs:175:16:177:9 | BlockExpr |  |
 | test.rs:180:5:191:5 | enter test_if_loop2 | test.rs:180:22:180:22 | a |  |
 | test.rs:180:5:191:5 | exit test_if_loop2 (normal) | test.rs:180:5:191:5 | exit test_if_loop2 |  |
-| test.rs:180:22:180:22 | a | test.rs:180:22:180:27 | Param | match, no-match |
+| test.rs:180:22:180:22 | a | test.rs:180:22:180:27 | Param | match |
 | test.rs:180:22:180:27 | Param | test.rs:182:13:184:14 | ExprStmt |  |
 | test.rs:180:37:191:5 | BlockExpr | test.rs:180:5:191:5 | exit test_if_loop2 (normal) |  |
 | test.rs:181:9:190:9 | IfExpr | test.rs:180:37:191:5 | BlockExpr |  |
@@ -396,7 +399,7 @@ edges
 | test.rs:189:13:189:13 | 0 | test.rs:188:16:190:9 | BlockExpr |  |
 | test.rs:193:5:201:5 | enter test_labelled_block | test.rs:193:28:193:28 | a |  |
 | test.rs:193:5:201:5 | exit test_labelled_block (normal) | test.rs:193:5:201:5 | exit test_labelled_block |  |
-| test.rs:193:28:193:28 | a | test.rs:193:28:193:33 | Param | match, no-match |
+| test.rs:193:28:193:28 | a | test.rs:193:28:193:33 | Param | match |
 | test.rs:193:28:193:33 | Param | test.rs:195:13:195:31 | ExprStmt |  |
 | test.rs:193:43:201:5 | BlockExpr | test.rs:193:5:201:5 | exit test_labelled_block (normal) |  |
 | test.rs:194:9:200:9 | IfExpr | test.rs:193:43:201:5 | BlockExpr |  |
@@ -415,15 +418,15 @@ edges
 | test.rs:199:13:199:13 | 0 | test.rs:198:16:200:9 | BlockExpr |  |
 | test.rs:206:5:209:5 | enter test_and_operator | test.rs:206:26:206:26 | a |  |
 | test.rs:206:5:209:5 | exit test_and_operator (normal) | test.rs:206:5:209:5 | exit test_and_operator |  |
-| test.rs:206:26:206:26 | a | test.rs:206:26:206:32 | Param | match, no-match |
+| test.rs:206:26:206:26 | a | test.rs:206:26:206:32 | Param | match |
 | test.rs:206:26:206:32 | Param | test.rs:206:35:206:35 | b |  |
-| test.rs:206:35:206:35 | b | test.rs:206:35:206:41 | Param | match, no-match |
+| test.rs:206:35:206:35 | b | test.rs:206:35:206:41 | Param | match |
 | test.rs:206:35:206:41 | Param | test.rs:206:44:206:44 | c |  |
-| test.rs:206:44:206:44 | c | test.rs:206:44:206:50 | Param | match, no-match |
+| test.rs:206:44:206:44 | c | test.rs:206:44:206:50 | Param | match |
 | test.rs:206:44:206:50 | Param | test.rs:207:9:207:28 | LetStmt |  |
 | test.rs:206:61:209:5 | BlockExpr | test.rs:206:5:209:5 | exit test_and_operator (normal) |  |
 | test.rs:207:9:207:28 | LetStmt | test.rs:207:17:207:17 | a |  |
-| test.rs:207:13:207:13 | d | test.rs:208:9:208:9 | d | match, no-match |
+| test.rs:207:13:207:13 | d | test.rs:208:9:208:9 | d | match |
 | test.rs:207:17:207:17 | a | test.rs:207:17:207:22 | [boolean(false)] ... && ... | false |
 | test.rs:207:17:207:17 | a | test.rs:207:22:207:22 | b | true |
 | test.rs:207:17:207:22 | [boolean(false)] ... && ... | test.rs:207:17:207:27 | ... && ... | false |
@@ -435,15 +438,15 @@ edges
 | test.rs:208:9:208:9 | d | test.rs:206:61:209:5 | BlockExpr |  |
 | test.rs:211:5:214:5 | enter test_or_operator | test.rs:211:25:211:25 | a |  |
 | test.rs:211:5:214:5 | exit test_or_operator (normal) | test.rs:211:5:214:5 | exit test_or_operator |  |
-| test.rs:211:25:211:25 | a | test.rs:211:25:211:31 | Param | match, no-match |
+| test.rs:211:25:211:25 | a | test.rs:211:25:211:31 | Param | match |
 | test.rs:211:25:211:31 | Param | test.rs:211:34:211:34 | b |  |
-| test.rs:211:34:211:34 | b | test.rs:211:34:211:40 | Param | match, no-match |
+| test.rs:211:34:211:34 | b | test.rs:211:34:211:40 | Param | match |
 | test.rs:211:34:211:40 | Param | test.rs:211:43:211:43 | c |  |
-| test.rs:211:43:211:43 | c | test.rs:211:43:211:49 | Param | match, no-match |
+| test.rs:211:43:211:43 | c | test.rs:211:43:211:49 | Param | match |
 | test.rs:211:43:211:49 | Param | test.rs:212:9:212:28 | LetStmt |  |
 | test.rs:211:60:214:5 | BlockExpr | test.rs:211:5:214:5 | exit test_or_operator (normal) |  |
 | test.rs:212:9:212:28 | LetStmt | test.rs:212:17:212:17 | a |  |
-| test.rs:212:13:212:13 | d | test.rs:213:9:213:9 | d | match, no-match |
+| test.rs:212:13:212:13 | d | test.rs:213:9:213:9 | d | match |
 | test.rs:212:17:212:17 | a | test.rs:212:17:212:22 | [boolean(true)] ... \|\| ... | true |
 | test.rs:212:17:212:17 | a | test.rs:212:22:212:22 | b | false |
 | test.rs:212:17:212:22 | [boolean(false)] ... \|\| ... | test.rs:212:27:212:27 | c | false |
@@ -455,15 +458,15 @@ edges
 | test.rs:213:9:213:9 | d | test.rs:211:60:214:5 | BlockExpr |  |
 | test.rs:216:5:219:5 | enter test_or_operator_2 | test.rs:216:27:216:27 | a |  |
 | test.rs:216:5:219:5 | exit test_or_operator_2 (normal) | test.rs:216:5:219:5 | exit test_or_operator_2 |  |
-| test.rs:216:27:216:27 | a | test.rs:216:27:216:33 | Param | match, no-match |
+| test.rs:216:27:216:27 | a | test.rs:216:27:216:33 | Param | match |
 | test.rs:216:27:216:33 | Param | test.rs:216:36:216:36 | b |  |
-| test.rs:216:36:216:36 | b | test.rs:216:36:216:41 | Param | match, no-match |
+| test.rs:216:36:216:36 | b | test.rs:216:36:216:41 | Param | match |
 | test.rs:216:36:216:41 | Param | test.rs:216:44:216:44 | c |  |
-| test.rs:216:44:216:44 | c | test.rs:216:44:216:50 | Param | match, no-match |
+| test.rs:216:44:216:44 | c | test.rs:216:44:216:50 | Param | match |
 | test.rs:216:44:216:50 | Param | test.rs:217:9:217:36 | LetStmt |  |
 | test.rs:216:61:219:5 | BlockExpr | test.rs:216:5:219:5 | exit test_or_operator_2 (normal) |  |
 | test.rs:217:9:217:36 | LetStmt | test.rs:217:17:217:17 | a |  |
-| test.rs:217:13:217:13 | d | test.rs:218:9:218:9 | d | match, no-match |
+| test.rs:217:13:217:13 | d | test.rs:218:9:218:9 | d | match |
 | test.rs:217:17:217:17 | a | test.rs:217:17:217:30 | [boolean(true)] ... \|\| ... | true |
 | test.rs:217:17:217:17 | a | test.rs:217:23:217:23 | b | false |
 | test.rs:217:17:217:30 | [boolean(false)] ... \|\| ... | test.rs:217:35:217:35 | c | false |
@@ -477,21 +480,21 @@ edges
 | test.rs:218:9:218:9 | d | test.rs:216:61:219:5 | BlockExpr |  |
 | test.rs:221:5:224:5 | enter test_not_operator | test.rs:221:26:221:26 | a |  |
 | test.rs:221:5:224:5 | exit test_not_operator (normal) | test.rs:221:5:224:5 | exit test_not_operator |  |
-| test.rs:221:26:221:26 | a | test.rs:221:26:221:32 | Param | match, no-match |
+| test.rs:221:26:221:26 | a | test.rs:221:26:221:32 | Param | match |
 | test.rs:221:26:221:32 | Param | test.rs:222:9:222:19 | LetStmt |  |
 | test.rs:221:43:224:5 | BlockExpr | test.rs:221:5:224:5 | exit test_not_operator (normal) |  |
 | test.rs:222:9:222:19 | LetStmt | test.rs:222:18:222:18 | a |  |
-| test.rs:222:13:222:13 | d | test.rs:223:9:223:9 | d | match, no-match |
+| test.rs:222:13:222:13 | d | test.rs:223:9:223:9 | d | match |
 | test.rs:222:17:222:18 | ! ... | test.rs:222:13:222:13 | d |  |
 | test.rs:222:18:222:18 | a | test.rs:222:17:222:18 | ! ... |  |
 | test.rs:223:9:223:9 | d | test.rs:221:43:224:5 | BlockExpr |  |
 | test.rs:226:5:232:5 | enter test_if_and_operator | test.rs:226:29:226:29 | a |  |
 | test.rs:226:5:232:5 | exit test_if_and_operator (normal) | test.rs:226:5:232:5 | exit test_if_and_operator |  |
-| test.rs:226:29:226:29 | a | test.rs:226:29:226:35 | Param | match, no-match |
+| test.rs:226:29:226:29 | a | test.rs:226:29:226:35 | Param | match |
 | test.rs:226:29:226:35 | Param | test.rs:226:38:226:38 | b |  |
-| test.rs:226:38:226:38 | b | test.rs:226:38:226:43 | Param | match, no-match |
+| test.rs:226:38:226:38 | b | test.rs:226:38:226:43 | Param | match |
 | test.rs:226:38:226:43 | Param | test.rs:226:46:226:46 | c |  |
-| test.rs:226:46:226:46 | c | test.rs:226:46:226:52 | Param | match, no-match |
+| test.rs:226:46:226:46 | c | test.rs:226:46:226:52 | Param | match |
 | test.rs:226:46:226:52 | Param | test.rs:227:12:227:12 | a |  |
 | test.rs:226:63:232:5 | BlockExpr | test.rs:226:5:232:5 | exit test_if_and_operator (normal) |  |
 | test.rs:227:9:231:9 | IfExpr | test.rs:226:63:232:5 | BlockExpr |  |
@@ -511,11 +514,11 @@ edges
 | test.rs:230:13:230:17 | false | test.rs:229:16:231:9 | BlockExpr |  |
 | test.rs:234:5:240:5 | enter test_if_or_operator | test.rs:234:28:234:28 | a |  |
 | test.rs:234:5:240:5 | exit test_if_or_operator (normal) | test.rs:234:5:240:5 | exit test_if_or_operator |  |
-| test.rs:234:28:234:28 | a | test.rs:234:28:234:34 | Param | match, no-match |
+| test.rs:234:28:234:28 | a | test.rs:234:28:234:34 | Param | match |
 | test.rs:234:28:234:34 | Param | test.rs:234:37:234:37 | b |  |
-| test.rs:234:37:234:37 | b | test.rs:234:37:234:42 | Param | match, no-match |
+| test.rs:234:37:234:37 | b | test.rs:234:37:234:42 | Param | match |
 | test.rs:234:37:234:42 | Param | test.rs:234:45:234:45 | c |  |
-| test.rs:234:45:234:45 | c | test.rs:234:45:234:51 | Param | match, no-match |
+| test.rs:234:45:234:45 | c | test.rs:234:45:234:51 | Param | match |
 | test.rs:234:45:234:51 | Param | test.rs:235:12:235:12 | a |  |
 | test.rs:234:62:240:5 | BlockExpr | test.rs:234:5:240:5 | exit test_if_or_operator (normal) |  |
 | test.rs:235:9:239:9 | IfExpr | test.rs:234:62:240:5 | BlockExpr |  |
@@ -535,7 +538,7 @@ edges
 | test.rs:238:13:238:17 | false | test.rs:237:16:239:9 | BlockExpr |  |
 | test.rs:242:5:248:5 | enter test_if_not_operator | test.rs:242:29:242:29 | a |  |
 | test.rs:242:5:248:5 | exit test_if_not_operator (normal) | test.rs:242:5:248:5 | exit test_if_not_operator |  |
-| test.rs:242:29:242:29 | a | test.rs:242:29:242:35 | Param | match, no-match |
+| test.rs:242:29:242:29 | a | test.rs:242:29:242:35 | Param | match |
 | test.rs:242:29:242:35 | Param | test.rs:243:13:243:13 | a |  |
 | test.rs:242:46:248:5 | BlockExpr | test.rs:242:5:248:5 | exit test_if_not_operator (normal) |  |
 | test.rs:243:9:247:9 | IfExpr | test.rs:242:46:248:5 | BlockExpr |  |
@@ -549,13 +552,14 @@ edges
 | test.rs:246:13:246:17 | false | test.rs:245:16:247:9 | BlockExpr |  |
 | test.rs:251:1:257:1 | enter test_match | test.rs:251:15:251:25 | maybe_digit |  |
 | test.rs:251:1:257:1 | exit test_match (normal) | test.rs:251:1:257:1 | exit test_match |  |
-| test.rs:251:15:251:25 | maybe_digit | test.rs:251:15:251:38 | Param | match, no-match |
+| test.rs:251:15:251:25 | maybe_digit | test.rs:251:15:251:38 | Param | match |
 | test.rs:251:15:251:38 | Param | test.rs:252:11:252:21 | maybe_digit |  |
 | test.rs:251:48:257:1 | BlockExpr | test.rs:251:1:257:1 | exit test_match (normal) |  |
 | test.rs:252:5:256:5 | MatchExpr | test.rs:251:48:257:1 | BlockExpr |  |
 | test.rs:252:11:252:21 | maybe_digit | test.rs:253:9:253:23 | TupleStructPat |  |
-| test.rs:253:9:253:23 | TupleStructPat | test.rs:253:28:253:28 | x | match |
+| test.rs:253:9:253:23 | TupleStructPat | test.rs:253:22:253:22 | x | match |
 | test.rs:253:9:253:23 | TupleStructPat | test.rs:254:9:254:23 | TupleStructPat | no-match |
+| test.rs:253:22:253:22 | x | test.rs:253:28:253:28 | x | match |
 | test.rs:253:28:253:28 | x | test.rs:253:32:253:33 | 10 |  |
 | test.rs:253:28:253:33 | ... < ... | test.rs:253:38:253:38 | x | true |
 | test.rs:253:28:253:33 | ... < ... | test.rs:254:9:254:23 | TupleStructPat | false |
@@ -563,8 +567,9 @@ edges
 | test.rs:253:38:253:38 | x | test.rs:253:42:253:42 | 5 |  |
 | test.rs:253:38:253:42 | ... + ... | test.rs:252:5:256:5 | MatchExpr |  |
 | test.rs:253:42:253:42 | 5 | test.rs:253:38:253:42 | ... + ... |  |
-| test.rs:254:9:254:23 | TupleStructPat | test.rs:254:28:254:28 | x | match |
+| test.rs:254:9:254:23 | TupleStructPat | test.rs:254:22:254:22 | x | match |
 | test.rs:254:9:254:23 | TupleStructPat | test.rs:255:9:255:20 | PathPat | no-match |
+| test.rs:254:22:254:22 | x | test.rs:254:28:254:28 | x | match |
 | test.rs:254:28:254:28 | x | test.rs:252:5:256:5 | MatchExpr |  |
 | test.rs:255:9:255:20 | PathPat | test.rs:255:25:255:25 | 5 | match |
 | test.rs:255:25:255:25 | 5 | test.rs:252:5:256:5 | MatchExpr |  |
@@ -574,12 +579,13 @@ edges
 | test.rs:262:13:262:13 | 1 | test.rs:261:14:263:9 | BlockExpr |  |
 | test.rs:267:5:270:5 | enter test_let_match | test.rs:267:23:267:23 | a |  |
 | test.rs:267:5:270:5 | exit test_let_match (normal) | test.rs:267:5:270:5 | exit test_let_match |  |
-| test.rs:267:23:267:23 | a | test.rs:267:23:267:36 | Param | match, no-match |
+| test.rs:267:23:267:23 | a | test.rs:267:23:267:36 | Param | match |
 | test.rs:267:23:267:36 | Param | test.rs:268:9:268:49 | LetStmt |  |
 | test.rs:267:39:270:5 | BlockExpr | test.rs:267:5:270:5 | exit test_let_match (normal) |  |
 | test.rs:268:9:268:49 | LetStmt | test.rs:268:23:268:23 | a |  |
+| test.rs:268:13:268:19 | TupleStructPat | test.rs:268:18:268:18 | n | match |
 | test.rs:268:13:268:19 | TupleStructPat | test.rs:268:32:268:46 | "Expected some" | no-match |
-| test.rs:268:13:268:19 | TupleStructPat | test.rs:269:9:269:9 | n | match |
+| test.rs:268:18:268:18 | n | test.rs:269:9:269:9 | n | match |
 | test.rs:268:23:268:23 | a | test.rs:268:13:268:19 | TupleStructPat |  |
 | test.rs:268:32:268:46 | "Expected some" | test.rs:268:30:268:48 | BlockExpr |  |
 | test.rs:269:9:269:9 | n | test.rs:267:39:270:5 | BlockExpr |  |
@@ -594,7 +600,7 @@ edges
 | test.rs:280:1:293:1 | exit labelled_block1 (normal) | test.rs:280:1:293:1 | exit labelled_block1 |  |
 | test.rs:280:29:293:1 | BlockExpr | test.rs:280:1:293:1 | exit labelled_block1 (normal) |  |
 | test.rs:281:5:292:6 | LetStmt | test.rs:282:9:282:19 | ExprStmt |  |
-| test.rs:281:9:281:14 | result | test.rs:280:29:293:1 | BlockExpr | match, no-match |
+| test.rs:281:9:281:14 | result | test.rs:280:29:293:1 | BlockExpr | match |
 | test.rs:281:18:292:5 | BlockExpr | test.rs:281:9:281:14 | result |  |
 | test.rs:282:9:282:16 | PathExpr | test.rs:282:9:282:18 | CallExpr |  |
 | test.rs:282:9:282:18 | CallExpr | test.rs:283:9:285:9 | ExprStmt |  |
@@ -626,14 +632,15 @@ edges
 | test.rs:295:1:303:1 | exit labelled_block2 (normal) | test.rs:295:1:303:1 | exit labelled_block2 |  |
 | test.rs:295:29:303:1 | BlockExpr | test.rs:295:1:303:1 | exit labelled_block2 (normal) |  |
 | test.rs:296:5:302:6 | LetStmt | test.rs:297:9:297:34 | LetStmt |  |
-| test.rs:296:9:296:14 | result | test.rs:295:29:303:1 | BlockExpr | match, no-match |
+| test.rs:296:9:296:14 | result | test.rs:295:29:303:1 | BlockExpr | match |
 | test.rs:296:18:302:5 | BlockExpr | test.rs:296:9:296:14 | result |  |
 | test.rs:297:9:297:34 | LetStmt | test.rs:297:30:297:33 | PathExpr |  |
-| test.rs:297:13:297:13 | x | test.rs:298:9:300:10 | LetStmt | match, no-match |
+| test.rs:297:13:297:13 | x | test.rs:298:9:300:10 | LetStmt | match |
 | test.rs:297:30:297:33 | PathExpr | test.rs:297:13:297:13 | x |  |
 | test.rs:298:9:300:10 | LetStmt | test.rs:298:23:298:23 | x |  |
+| test.rs:298:13:298:19 | TupleStructPat | test.rs:298:18:298:18 | y | match |
 | test.rs:298:13:298:19 | TupleStructPat | test.rs:299:13:299:27 | ExprStmt | no-match |
-| test.rs:298:13:298:19 | TupleStructPat | test.rs:301:9:301:9 | x | match |
+| test.rs:298:18:298:18 | y | test.rs:301:9:301:9 | x | match |
 | test.rs:298:23:298:23 | x | test.rs:298:13:298:19 | TupleStructPat |  |
 | test.rs:299:13:299:26 | BreakExpr | test.rs:296:18:302:5 | BlockExpr | break |
 | test.rs:299:13:299:27 | ExprStmt | test.rs:299:26:299:26 | 1 |  |
@@ -643,12 +650,12 @@ edges
 | test.rs:305:1:311:1 | exit test_nested_function (normal) | test.rs:305:1:311:1 | exit test_nested_function |  |
 | test.rs:305:27:311:1 | BlockExpr | test.rs:305:1:311:1 | exit test_nested_function (normal) |  |
 | test.rs:306:5:306:18 | LetStmt | test.rs:306:17:306:17 | 0 |  |
-| test.rs:306:9:306:13 | x | test.rs:307:5:309:5 | nested | match, no-match |
+| test.rs:306:9:306:13 | x | test.rs:307:5:309:5 | nested | match |
 | test.rs:306:17:306:17 | 0 | test.rs:306:9:306:13 | x |  |
 | test.rs:307:5:309:5 | enter nested | test.rs:307:15:307:15 | x |  |
 | test.rs:307:5:309:5 | exit nested (normal) | test.rs:307:5:309:5 | exit nested |  |
 | test.rs:307:5:309:5 | nested | test.rs:310:5:310:19 | ExprStmt |  |
-| test.rs:307:15:307:15 | x | test.rs:307:15:307:26 | Param | match, no-match |
+| test.rs:307:15:307:15 | x | test.rs:307:15:307:26 | Param | match |
 | test.rs:307:15:307:26 | Param | test.rs:308:9:308:16 | ExprStmt |  |
 | test.rs:307:29:309:5 | BlockExpr | test.rs:307:5:309:5 | exit nested (normal) |  |
 | test.rs:308:9:308:10 | * ... | test.rs:308:15:308:15 | 1 |  |
diff --git a/rust/ql/test/library-tests/variables/Cfg.expected b/rust/ql/test/library-tests/variables/Cfg.expected
index b8b61495f754..db01e6c6e7f8 100644
--- a/rust/ql/test/library-tests/variables/Cfg.expected
+++ b/rust/ql/test/library-tests/variables/Cfg.expected
@@ -1,14 +1,14 @@
 edges
 | variables.rs:3:1:5:1 | enter print_str | variables.rs:3:14:3:14 | s |  |
 | variables.rs:3:1:5:1 | exit print_str (normal) | variables.rs:3:1:5:1 | exit print_str |  |
-| variables.rs:3:14:3:14 | s | variables.rs:3:14:3:20 | Param | match, no-match |
+| variables.rs:3:14:3:14 | s | variables.rs:3:14:3:20 | Param | match |
 | variables.rs:3:14:3:20 | Param | variables.rs:4:5:4:22 | ExprStmt |  |
 | variables.rs:3:23:5:1 | BlockExpr | variables.rs:3:1:5:1 | exit print_str (normal) |  |
 | variables.rs:4:5:4:21 | MacroExpr | variables.rs:3:23:5:1 | BlockExpr |  |
 | variables.rs:4:5:4:22 | ExprStmt | variables.rs:4:5:4:21 | MacroExpr |  |
 | variables.rs:7:1:9:1 | enter print_i64 | variables.rs:7:14:7:14 | i |  |
 | variables.rs:7:1:9:1 | exit print_i64 (normal) | variables.rs:7:1:9:1 | exit print_i64 |  |
-| variables.rs:7:14:7:14 | i | variables.rs:7:14:7:19 | Param | match, no-match |
+| variables.rs:7:14:7:14 | i | variables.rs:7:14:7:19 | Param | match |
 | variables.rs:7:14:7:19 | Param | variables.rs:8:5:8:22 | ExprStmt |  |
 | variables.rs:7:22:9:1 | BlockExpr | variables.rs:7:1:9:1 | exit print_i64 (normal) |  |
 | variables.rs:8:5:8:21 | MacroExpr | variables.rs:7:22:9:1 | BlockExpr |  |
@@ -17,7 +17,7 @@ edges
 | variables.rs:11:1:14:1 | exit immutable_variable (normal) | variables.rs:11:1:14:1 | exit immutable_variable |  |
 | variables.rs:11:25:14:1 | BlockExpr | variables.rs:11:1:14:1 | exit immutable_variable (normal) |  |
 | variables.rs:12:5:12:17 | LetStmt | variables.rs:12:14:12:16 | "a" |  |
-| variables.rs:12:9:12:10 | x1 | variables.rs:13:5:13:18 | ExprStmt | match, no-match |
+| variables.rs:12:9:12:10 | x1 | variables.rs:13:5:13:18 | ExprStmt | match |
 | variables.rs:12:14:12:16 | "a" | variables.rs:12:9:12:10 | x1 |  |
 | variables.rs:13:5:13:13 | PathExpr | variables.rs:13:15:13:16 | x1 |  |
 | variables.rs:13:5:13:17 | CallExpr | variables.rs:11:25:14:1 | BlockExpr |  |
@@ -27,7 +27,7 @@ edges
 | variables.rs:16:1:21:1 | exit mutable_variable (normal) | variables.rs:16:1:21:1 | exit mutable_variable |  |
 | variables.rs:16:23:21:1 | BlockExpr | variables.rs:16:1:21:1 | exit mutable_variable (normal) |  |
 | variables.rs:17:5:17:19 | LetStmt | variables.rs:17:18:17:18 | 4 |  |
-| variables.rs:17:9:17:14 | x2 | variables.rs:18:5:18:18 | ExprStmt | match, no-match |
+| variables.rs:17:9:17:14 | x2 | variables.rs:18:5:18:18 | ExprStmt | match |
 | variables.rs:17:18:17:18 | 4 | variables.rs:17:9:17:14 | x2 |  |
 | variables.rs:18:5:18:13 | PathExpr | variables.rs:18:15:18:16 | x2 |  |
 | variables.rs:18:5:18:17 | CallExpr | variables.rs:19:5:19:11 | ExprStmt |  |
@@ -45,14 +45,14 @@ edges
 | variables.rs:23:1:29:1 | exit variable_shadow1 (normal) | variables.rs:23:1:29:1 | exit variable_shadow1 |  |
 | variables.rs:23:23:29:1 | BlockExpr | variables.rs:23:1:29:1 | exit variable_shadow1 (normal) |  |
 | variables.rs:24:5:24:15 | LetStmt | variables.rs:24:14:24:14 | 1 |  |
-| variables.rs:24:9:24:10 | x3 | variables.rs:25:5:25:18 | ExprStmt | match, no-match |
+| variables.rs:24:9:24:10 | x3 | variables.rs:25:5:25:18 | ExprStmt | match |
 | variables.rs:24:14:24:14 | 1 | variables.rs:24:9:24:10 | x3 |  |
 | variables.rs:25:5:25:13 | PathExpr | variables.rs:25:15:25:16 | x3 |  |
 | variables.rs:25:5:25:17 | CallExpr | variables.rs:26:5:27:15 | LetStmt |  |
 | variables.rs:25:5:25:18 | ExprStmt | variables.rs:25:5:25:13 | PathExpr |  |
 | variables.rs:25:15:25:16 | x3 | variables.rs:25:5:25:17 | CallExpr |  |
 | variables.rs:26:5:27:15 | LetStmt | variables.rs:27:9:27:10 | x3 |  |
-| variables.rs:26:9:26:10 | x3 | variables.rs:28:5:28:18 | ExprStmt | match, no-match |
+| variables.rs:26:9:26:10 | x3 | variables.rs:28:5:28:18 | ExprStmt | match |
 | variables.rs:27:9:27:10 | x3 | variables.rs:27:14:27:14 | 1 |  |
 | variables.rs:27:9:27:14 | ... + ... | variables.rs:26:9:26:10 | x3 |  |
 | variables.rs:27:14:27:14 | 1 | variables.rs:27:9:27:14 | ... + ... |  |
@@ -64,7 +64,7 @@ edges
 | variables.rs:31:1:39:1 | exit variable_shadow2 (normal) | variables.rs:31:1:39:1 | exit variable_shadow2 |  |
 | variables.rs:31:23:39:1 | BlockExpr | variables.rs:31:1:39:1 | exit variable_shadow2 (normal) |  |
 | variables.rs:32:5:32:17 | LetStmt | variables.rs:32:14:32:16 | "a" |  |
-| variables.rs:32:9:32:10 | x4 | variables.rs:33:5:33:18 | ExprStmt | match, no-match |
+| variables.rs:32:9:32:10 | x4 | variables.rs:33:5:33:18 | ExprStmt | match |
 | variables.rs:32:14:32:16 | "a" | variables.rs:32:9:32:10 | x4 |  |
 | variables.rs:33:5:33:13 | PathExpr | variables.rs:33:15:33:16 | x4 |  |
 | variables.rs:33:5:33:17 | CallExpr | variables.rs:34:5:37:5 | ExprStmt |  |
@@ -73,7 +73,7 @@ edges
 | variables.rs:34:5:37:5 | BlockExpr | variables.rs:38:5:38:18 | ExprStmt |  |
 | variables.rs:34:5:37:5 | ExprStmt | variables.rs:35:9:35:21 | LetStmt |  |
 | variables.rs:35:9:35:21 | LetStmt | variables.rs:35:18:35:20 | "b" |  |
-| variables.rs:35:13:35:14 | x4 | variables.rs:36:9:36:22 | ExprStmt | match, no-match |
+| variables.rs:35:13:35:14 | x4 | variables.rs:36:9:36:22 | ExprStmt | match |
 | variables.rs:35:18:35:20 | "b" | variables.rs:35:13:35:14 | x4 |  |
 | variables.rs:36:9:36:17 | PathExpr | variables.rs:36:19:36:20 | x4 |  |
 | variables.rs:36:9:36:21 | CallExpr | variables.rs:34:5:37:5 | BlockExpr |  |
@@ -87,7 +87,13 @@ edges
 | variables.rs:46:1:61:1 | exit let_pattern1 (normal) | variables.rs:46:1:61:1 | exit let_pattern1 |  |
 | variables.rs:46:19:61:1 | BlockExpr | variables.rs:46:1:61:1 | exit let_pattern1 (normal) |  |
 | variables.rs:47:5:56:47 | LetStmt | variables.rs:56:11:56:13 | "a" |  |
-| variables.rs:47:9:56:5 | TuplePat | variables.rs:57:5:57:18 | ExprStmt | match |
+| variables.rs:47:9:56:5 | TuplePat | variables.rs:48:9:51:9 | TuplePat | match |
+| variables.rs:48:9:51:9 | TuplePat | variables.rs:49:13:49:14 | a1 | match |
+| variables.rs:49:13:49:14 | a1 | variables.rs:50:13:50:14 | b1 | match |
+| variables.rs:50:13:50:14 | b1 | variables.rs:52:9:55:9 | RecordPat | match |
+| variables.rs:52:9:55:9 | RecordPat | variables.rs:53:13:53:13 | x | match |
+| variables.rs:53:13:53:13 | x | variables.rs:54:13:54:13 | y | match |
+| variables.rs:54:13:54:13 | y | variables.rs:57:5:57:18 | ExprStmt | match |
 | variables.rs:56:9:56:46 | TupleExpr | variables.rs:47:9:56:5 | TuplePat |  |
 | variables.rs:56:10:56:19 | TupleExpr | variables.rs:56:33:56:35 | "x" |  |
 | variables.rs:56:11:56:13 | "a" | variables.rs:56:16:56:18 | "b" |  |
@@ -115,12 +121,14 @@ edges
 | variables.rs:63:1:71:1 | exit let_pattern2 (normal) | variables.rs:63:1:71:1 | exit let_pattern2 |  |
 | variables.rs:63:19:71:1 | BlockExpr | variables.rs:63:1:71:1 | exit let_pattern2 (normal) |  |
 | variables.rs:64:5:64:38 | LetStmt | variables.rs:64:25:64:27 | "a" |  |
-| variables.rs:64:9:64:10 | p1 | variables.rs:65:5:68:11 | LetStmt | match, no-match |
+| variables.rs:64:9:64:10 | p1 | variables.rs:65:5:68:11 | LetStmt | match |
 | variables.rs:64:14:64:37 | RecordExpr | variables.rs:64:9:64:10 | p1 |  |
 | variables.rs:64:25:64:27 | "a" | variables.rs:64:33:64:35 | "b" |  |
 | variables.rs:64:33:64:35 | "b" | variables.rs:64:14:64:37 | RecordExpr |  |
 | variables.rs:65:5:68:11 | LetStmt | variables.rs:68:9:68:10 | p1 |  |
-| variables.rs:65:9:68:5 | RecordPat | variables.rs:69:5:69:18 | ExprStmt | match |
+| variables.rs:65:9:68:5 | RecordPat | variables.rs:66:12:66:13 | a2 | match |
+| variables.rs:66:12:66:13 | a2 | variables.rs:67:12:67:13 | b2 | match |
+| variables.rs:67:12:67:13 | b2 | variables.rs:69:5:69:18 | ExprStmt | match |
 | variables.rs:68:9:68:10 | p1 | variables.rs:65:9:68:5 | RecordPat |  |
 | variables.rs:69:5:69:13 | PathExpr | variables.rs:69:15:69:16 | a2 |  |
 | variables.rs:69:5:69:17 | CallExpr | variables.rs:70:5:70:18 | ExprStmt |  |
@@ -134,7 +142,7 @@ edges
 | variables.rs:73:1:80:1 | exit let_pattern3 (normal) | variables.rs:73:1:80:1 | exit let_pattern3 |  |
 | variables.rs:73:19:80:1 | BlockExpr | variables.rs:73:1:80:1 | exit let_pattern3 (normal) |  |
 | variables.rs:74:5:74:42 | LetStmt | variables.rs:74:14:74:17 | PathExpr |  |
-| variables.rs:74:9:74:10 | s1 | variables.rs:76:8:77:12 | LetExpr | match, no-match |
+| variables.rs:74:9:74:10 | s1 | variables.rs:76:8:77:12 | LetExpr | match |
 | variables.rs:74:14:74:17 | PathExpr | variables.rs:74:19:74:30 | PathExpr |  |
 | variables.rs:74:14:74:41 | CallExpr | variables.rs:74:9:74:10 | s1 |  |
 | variables.rs:74:19:74:30 | PathExpr | variables.rs:74:32:74:39 | "Hello!" |  |
@@ -143,7 +151,8 @@ edges
 | variables.rs:76:5:79:5 | IfExpr | variables.rs:73:19:80:1 | BlockExpr |  |
 | variables.rs:76:8:77:12 | LetExpr | variables.rs:76:12:76:23 | TupleStructPat |  |
 | variables.rs:76:12:76:23 | TupleStructPat | variables.rs:76:5:79:5 | IfExpr | no-match |
-| variables.rs:76:12:76:23 | TupleStructPat | variables.rs:78:9:78:22 | ExprStmt | match |
+| variables.rs:76:12:76:23 | TupleStructPat | variables.rs:76:17:76:22 | s2 | match |
+| variables.rs:76:17:76:22 | s2 | variables.rs:78:9:78:22 | ExprStmt | match |
 | variables.rs:77:14:79:5 | BlockExpr | variables.rs:76:5:79:5 | IfExpr |  |
 | variables.rs:78:9:78:17 | PathExpr | variables.rs:78:19:78:20 | s2 |  |
 | variables.rs:78:9:78:21 | CallExpr | variables.rs:77:14:79:5 | BlockExpr |  |
@@ -153,8 +162,9 @@ edges
 | variables.rs:82:1:88:1 | exit let_pattern4 (normal) | variables.rs:82:1:88:1 | exit let_pattern4 |  |
 | variables.rs:82:19:88:1 | BlockExpr | variables.rs:82:1:88:1 | exit let_pattern4 (normal) |  |
 | variables.rs:83:5:86:10 | LetStmt | variables.rs:83:34:83:37 | PathExpr |  |
+| variables.rs:83:9:83:16 | TupleStructPat | variables.rs:83:14:83:15 | x5 | match |
 | variables.rs:83:9:83:16 | TupleStructPat | variables.rs:85:13:85:19 | MacroExpr | no-match |
-| variables.rs:83:9:83:16 | TupleStructPat | variables.rs:87:5:87:18 | ExprStmt | match |
+| variables.rs:83:14:83:15 | x5 | variables.rs:87:5:87:18 | ExprStmt | match |
 | variables.rs:83:34:83:37 | PathExpr | variables.rs:83:39:83:42 | "x5" |  |
 | variables.rs:83:34:83:43 | CallExpr | variables.rs:83:9:83:16 | TupleStructPat |  |
 | variables.rs:83:39:83:42 | "x5" | variables.rs:83:34:83:43 | CallExpr |  |
@@ -167,7 +177,7 @@ edges
 | variables.rs:90:1:97:1 | exit let_pattern5 (normal) | variables.rs:90:1:97:1 | exit let_pattern5 |  |
 | variables.rs:90:19:97:1 | BlockExpr | variables.rs:90:1:97:1 | exit let_pattern5 (normal) |  |
 | variables.rs:91:5:91:42 | LetStmt | variables.rs:91:14:91:17 | PathExpr |  |
-| variables.rs:91:9:91:10 | s1 | variables.rs:93:11:94:12 | LetExpr | match, no-match |
+| variables.rs:91:9:91:10 | s1 | variables.rs:93:11:94:12 | LetExpr | match |
 | variables.rs:91:14:91:17 | PathExpr | variables.rs:91:19:91:30 | PathExpr |  |
 | variables.rs:91:14:91:41 | CallExpr | variables.rs:91:9:91:10 | s1 |  |
 | variables.rs:91:19:91:30 | PathExpr | variables.rs:91:32:91:39 | "Hello!" |  |
@@ -176,7 +186,8 @@ edges
 | variables.rs:93:5:96:5 | WhileExpr | variables.rs:90:19:97:1 | BlockExpr |  |
 | variables.rs:93:11:94:12 | LetExpr | variables.rs:93:15:93:26 | TupleStructPat |  |
 | variables.rs:93:15:93:26 | TupleStructPat | variables.rs:93:5:96:5 | WhileExpr | no-match |
-| variables.rs:93:15:93:26 | TupleStructPat | variables.rs:95:9:95:22 | ExprStmt | match |
+| variables.rs:93:15:93:26 | TupleStructPat | variables.rs:93:20:93:25 | s2 | match |
+| variables.rs:93:20:93:25 | s2 | variables.rs:95:9:95:22 | ExprStmt | match |
 | variables.rs:94:14:96:5 | BlockExpr | variables.rs:93:11:94:12 | LetExpr |  |
 | variables.rs:95:9:95:17 | PathExpr | variables.rs:95:19:95:20 | s2 |  |
 | variables.rs:95:9:95:21 | CallExpr | variables.rs:94:14:96:5 | BlockExpr |  |
@@ -186,23 +197,26 @@ edges
 | variables.rs:99:1:114:1 | exit match_pattern1 (normal) | variables.rs:99:1:114:1 | exit match_pattern1 |  |
 | variables.rs:99:21:114:1 | BlockExpr | variables.rs:99:1:114:1 | exit match_pattern1 (normal) |  |
 | variables.rs:100:5:100:21 | LetStmt | variables.rs:100:14:100:17 | PathExpr |  |
-| variables.rs:100:9:100:10 | x6 | variables.rs:101:5:101:16 | LetStmt | match, no-match |
+| variables.rs:100:9:100:10 | x6 | variables.rs:101:5:101:16 | LetStmt | match |
 | variables.rs:100:14:100:17 | PathExpr | variables.rs:100:19:100:19 | 5 |  |
 | variables.rs:100:14:100:20 | CallExpr | variables.rs:100:9:100:10 | x6 |  |
 | variables.rs:100:19:100:19 | 5 | variables.rs:100:14:100:20 | CallExpr |  |
 | variables.rs:101:5:101:16 | LetStmt | variables.rs:101:14:101:15 | 10 |  |
-| variables.rs:101:9:101:10 | y1 | variables.rs:103:5:111:5 | ExprStmt | match, no-match |
+| variables.rs:101:9:101:10 | y1 | variables.rs:103:5:111:5 | ExprStmt | match |
 | variables.rs:101:14:101:15 | 10 | variables.rs:101:9:101:10 | y1 |  |
 | variables.rs:103:5:111:5 | ExprStmt | variables.rs:103:11:103:12 | x6 |  |
 | variables.rs:103:5:111:5 | MatchExpr | variables.rs:113:5:113:18 | ExprStmt |  |
 | variables.rs:103:11:103:12 | x6 | variables.rs:104:9:104:16 | TupleStructPat |  |
-| variables.rs:104:9:104:16 | TupleStructPat | variables.rs:104:21:104:29 | PathExpr | match |
+| variables.rs:104:9:104:16 | TupleStructPat | variables.rs:104:14:104:15 | LiteralPat | match |
 | variables.rs:104:9:104:16 | TupleStructPat | variables.rs:105:9:105:16 | TupleStructPat | no-match |
+| variables.rs:104:14:104:15 | LiteralPat | variables.rs:104:21:104:29 | PathExpr | match |
+| variables.rs:104:14:104:15 | LiteralPat | variables.rs:105:9:105:16 | TupleStructPat | no-match |
 | variables.rs:104:21:104:29 | PathExpr | variables.rs:104:31:104:38 | "Got 50" |  |
 | variables.rs:104:21:104:39 | CallExpr | variables.rs:103:5:111:5 | MatchExpr |  |
 | variables.rs:104:31:104:38 | "Got 50" | variables.rs:104:21:104:39 | CallExpr |  |
-| variables.rs:105:9:105:16 | TupleStructPat | variables.rs:108:13:108:21 | PathExpr | match |
+| variables.rs:105:9:105:16 | TupleStructPat | variables.rs:105:14:105:15 | y1 | match |
 | variables.rs:105:9:105:16 | TupleStructPat | variables.rs:110:9:110:12 | None | no-match |
+| variables.rs:105:14:105:15 | y1 | variables.rs:108:13:108:21 | PathExpr | match |
 | variables.rs:107:9:109:9 | BlockExpr | variables.rs:103:5:111:5 | MatchExpr |  |
 | variables.rs:108:13:108:21 | PathExpr | variables.rs:108:23:108:24 | y1 |  |
 | variables.rs:108:13:108:25 | CallExpr | variables.rs:107:9:109:9 | BlockExpr |  |
@@ -219,7 +233,7 @@ edges
 | variables.rs:116:1:141:1 | exit match_pattern2 (normal) | variables.rs:116:1:141:1 | exit match_pattern2 |  |
 | variables.rs:116:21:141:1 | BlockExpr | variables.rs:116:1:141:1 | exit match_pattern2 (normal) |  |
 | variables.rs:117:5:117:36 | LetStmt | variables.rs:117:20:117:20 | 2 |  |
-| variables.rs:117:9:117:15 | numbers | variables.rs:119:5:129:5 | ExprStmt | match, no-match |
+| variables.rs:117:9:117:15 | numbers | variables.rs:119:5:129:5 | ExprStmt | match |
 | variables.rs:117:19:117:35 | TupleExpr | variables.rs:117:9:117:15 | numbers |  |
 | variables.rs:117:20:117:20 | 2 | variables.rs:117:23:117:23 | 4 |  |
 | variables.rs:117:23:117:23 | 4 | variables.rs:117:26:117:26 | 8 |  |
@@ -229,7 +243,12 @@ edges
 | variables.rs:119:5:129:5 | ExprStmt | variables.rs:119:11:119:17 | numbers |  |
 | variables.rs:119:5:129:5 | MatchExpr | variables.rs:131:11:131:17 | numbers |  |
 | variables.rs:119:11:119:17 | numbers | variables.rs:120:9:124:9 | TuplePat |  |
-| variables.rs:120:9:124:9 | TuplePat | variables.rs:125:13:125:29 | ExprStmt | match |
+| variables.rs:120:9:124:9 | TuplePat | variables.rs:121:13:121:17 | first | match |
+| variables.rs:121:13:121:17 | first | variables.rs:121:20:121:20 | WildcardPat | match |
+| variables.rs:121:20:121:20 | WildcardPat | variables.rs:122:13:122:17 | third | match |
+| variables.rs:122:13:122:17 | third | variables.rs:122:20:122:20 | WildcardPat | match |
+| variables.rs:122:20:122:20 | WildcardPat | variables.rs:123:13:123:17 | fifth | match |
+| variables.rs:123:13:123:17 | fifth | variables.rs:125:13:125:29 | ExprStmt | match |
 | variables.rs:124:14:128:9 | BlockExpr | variables.rs:119:5:129:5 | MatchExpr |  |
 | variables.rs:125:13:125:21 | PathExpr | variables.rs:125:23:125:27 | first |  |
 | variables.rs:125:13:125:28 | CallExpr | variables.rs:126:13:126:29 | ExprStmt |  |
@@ -245,7 +264,10 @@ edges
 | variables.rs:127:23:127:27 | fifth | variables.rs:127:13:127:28 | CallExpr |  |
 | variables.rs:131:5:140:5 | MatchExpr | variables.rs:116:21:141:1 | BlockExpr |  |
 | variables.rs:131:11:131:17 | numbers | variables.rs:132:9:136:9 | TuplePat |  |
-| variables.rs:132:9:136:9 | TuplePat | variables.rs:137:13:137:29 | ExprStmt | match |
+| variables.rs:132:9:136:9 | TuplePat | variables.rs:133:13:133:17 | first | match |
+| variables.rs:133:13:133:17 | first | variables.rs:134:13:134:14 | RestPat | match |
+| variables.rs:134:13:134:14 | RestPat | variables.rs:135:13:135:16 | last | match |
+| variables.rs:135:13:135:16 | last | variables.rs:137:13:137:29 | ExprStmt | match |
 | variables.rs:136:14:139:9 | BlockExpr | variables.rs:131:5:140:5 | MatchExpr |  |
 | variables.rs:137:13:137:21 | PathExpr | variables.rs:137:23:137:27 | first |  |
 | variables.rs:137:13:137:28 | CallExpr | variables.rs:138:13:138:28 | ExprStmt |  |
@@ -259,13 +281,15 @@ edges
 | variables.rs:143:1:151:1 | exit match_pattern3 (normal) | variables.rs:143:1:151:1 | exit match_pattern3 |  |
 | variables.rs:143:21:151:1 | BlockExpr | variables.rs:143:1:151:1 | exit match_pattern3 (normal) |  |
 | variables.rs:144:5:144:38 | LetStmt | variables.rs:144:25:144:27 | "x" |  |
-| variables.rs:144:9:144:10 | p2 | variables.rs:146:11:146:12 | p2 | match, no-match |
+| variables.rs:144:9:144:10 | p2 | variables.rs:146:11:146:12 | p2 | match |
 | variables.rs:144:14:144:37 | RecordExpr | variables.rs:144:9:144:10 | p2 |  |
 | variables.rs:144:25:144:27 | "x" | variables.rs:144:33:144:35 | "y" |  |
 | variables.rs:144:33:144:35 | "y" | variables.rs:144:14:144:37 | RecordExpr |  |
 | variables.rs:146:5:150:5 | MatchExpr | variables.rs:143:21:151:1 | BlockExpr |  |
 | variables.rs:146:11:146:12 | p2 | variables.rs:147:9:149:9 | RecordPat |  |
-| variables.rs:147:9:149:9 | RecordPat | variables.rs:149:14:149:22 | PathExpr | match |
+| variables.rs:147:9:149:9 | RecordPat | variables.rs:148:16:148:17 | x7 | match |
+| variables.rs:148:16:148:17 | x7 | variables.rs:148:20:148:21 | RestPat | match |
+| variables.rs:148:20:148:21 | RestPat | variables.rs:149:14:149:22 | PathExpr | match |
 | variables.rs:149:14:149:22 | PathExpr | variables.rs:149:24:149:25 | x7 |  |
 | variables.rs:149:14:149:26 | CallExpr | variables.rs:146:5:150:5 | MatchExpr |  |
 | variables.rs:149:24:149:25 | x7 | variables.rs:149:14:149:26 | CallExpr |  |
@@ -273,21 +297,35 @@ edges
 | variables.rs:157:1:170:1 | exit match_pattern4 (normal) | variables.rs:157:1:170:1 | exit match_pattern4 |  |
 | variables.rs:157:21:170:1 | BlockExpr | variables.rs:157:1:170:1 | exit match_pattern4 (normal) |  |
 | variables.rs:158:5:158:39 | LetStmt | variables.rs:158:36:158:36 | 0 |  |
-| variables.rs:158:9:158:11 | msg | variables.rs:160:11:160:13 | msg | match, no-match |
+| variables.rs:158:9:158:11 | msg | variables.rs:160:11:160:13 | msg | match |
 | variables.rs:158:15:158:38 | RecordExpr | variables.rs:158:9:158:11 | msg |  |
 | variables.rs:158:36:158:36 | 0 | variables.rs:158:15:158:38 | RecordExpr |  |
 | variables.rs:160:5:169:5 | MatchExpr | variables.rs:157:21:170:1 | BlockExpr |  |
 | variables.rs:160:11:160:13 | msg | variables.rs:161:9:163:9 | RecordPat |  |
-| variables.rs:161:9:163:9 | RecordPat | variables.rs:163:14:163:22 | PathExpr | match |
+| variables.rs:161:9:163:9 | RecordPat | variables.rs:162:31:162:35 | RangePat | match |
 | variables.rs:161:9:163:9 | RecordPat | variables.rs:164:9:164:38 | RecordPat | no-match |
+| variables.rs:162:17:162:35 | [match(true)] id_variable | variables.rs:163:14:163:22 | PathExpr | match |
+| variables.rs:162:31:162:31 | LiteralPat | variables.rs:162:35:162:35 | LiteralPat | match |
+| variables.rs:162:31:162:31 | LiteralPat | variables.rs:164:9:164:38 | RecordPat | no-match |
+| variables.rs:162:31:162:35 | RangePat | variables.rs:162:31:162:31 | LiteralPat | match |
+| variables.rs:162:31:162:35 | RangePat | variables.rs:164:9:164:38 | RecordPat | no-match |
+| variables.rs:162:35:162:35 | LiteralPat | variables.rs:162:17:162:35 | [match(true)] id_variable | match |
+| variables.rs:162:35:162:35 | LiteralPat | variables.rs:164:9:164:38 | RecordPat | no-match |
 | variables.rs:163:14:163:22 | PathExpr | variables.rs:163:24:163:34 | id_variable |  |
 | variables.rs:163:14:163:35 | CallExpr | variables.rs:160:5:169:5 | MatchExpr |  |
 | variables.rs:163:24:163:34 | id_variable | variables.rs:163:14:163:35 | CallExpr |  |
-| variables.rs:164:9:164:38 | RecordPat | variables.rs:165:13:165:52 | MacroExpr | match |
+| variables.rs:164:9:164:38 | RecordPat | variables.rs:164:30:164:36 | RangePat | match |
 | variables.rs:164:9:164:38 | RecordPat | variables.rs:167:9:167:29 | RecordPat | no-match |
+| variables.rs:164:30:164:31 | LiteralPat | variables.rs:164:35:164:36 | LiteralPat | match |
+| variables.rs:164:30:164:31 | LiteralPat | variables.rs:167:9:167:29 | RecordPat | no-match |
+| variables.rs:164:30:164:36 | RangePat | variables.rs:164:30:164:31 | LiteralPat | match |
+| variables.rs:164:30:164:36 | RangePat | variables.rs:167:9:167:29 | RecordPat | no-match |
+| variables.rs:164:35:164:36 | LiteralPat | variables.rs:165:13:165:52 | MacroExpr | match |
+| variables.rs:164:35:164:36 | LiteralPat | variables.rs:167:9:167:29 | RecordPat | no-match |
 | variables.rs:164:43:166:9 | BlockExpr | variables.rs:160:5:169:5 | MatchExpr |  |
 | variables.rs:165:13:165:52 | MacroExpr | variables.rs:164:43:166:9 | BlockExpr |  |
-| variables.rs:167:9:167:29 | RecordPat | variables.rs:168:13:168:21 | PathExpr | match |
+| variables.rs:167:9:167:29 | RecordPat | variables.rs:167:26:167:27 | id | match |
+| variables.rs:167:26:167:27 | id | variables.rs:168:13:168:21 | PathExpr | match |
 | variables.rs:168:13:168:21 | PathExpr | variables.rs:168:23:168:24 | id |  |
 | variables.rs:168:13:168:25 | CallExpr | variables.rs:160:5:169:5 | MatchExpr |  |
 | variables.rs:168:23:168:24 | id | variables.rs:168:13:168:25 | CallExpr |  |
@@ -295,13 +333,18 @@ edges
 | variables.rs:177:1:183:1 | exit match_pattern5 (normal) | variables.rs:177:1:183:1 | exit match_pattern5 |  |
 | variables.rs:177:21:183:1 | BlockExpr | variables.rs:177:1:183:1 | exit match_pattern5 (normal) |  |
 | variables.rs:178:5:178:34 | LetStmt | variables.rs:178:18:178:29 | PathExpr |  |
-| variables.rs:178:9:178:14 | either | variables.rs:179:11:179:16 | either | match, no-match |
+| variables.rs:178:9:178:14 | either | variables.rs:179:11:179:16 | either | match |
 | variables.rs:178:18:178:29 | PathExpr | variables.rs:178:31:178:32 | 32 |  |
 | variables.rs:178:18:178:33 | CallExpr | variables.rs:178:9:178:14 | either |  |
 | variables.rs:178:31:178:32 | 32 | variables.rs:178:18:178:33 | CallExpr |  |
 | variables.rs:179:5:182:5 | MatchExpr | variables.rs:177:21:183:1 | BlockExpr |  |
-| variables.rs:179:11:179:16 | either | variables.rs:180:9:180:44 | OrPat |  |
-| variables.rs:180:9:180:44 | OrPat | variables.rs:181:16:181:24 | PathExpr | match |
+| variables.rs:179:11:179:16 | either | variables.rs:180:9:180:24 | TupleStructPat |  |
+| variables.rs:180:9:180:24 | TupleStructPat | variables.rs:180:22:180:23 | a3 | match |
+| variables.rs:180:9:180:24 | TupleStructPat | variables.rs:180:28:180:44 | TupleStructPat | no-match |
+| variables.rs:180:9:180:44 | [match(true)] OrPat | variables.rs:181:16:181:24 | PathExpr | match |
+| variables.rs:180:22:180:23 | a3 | variables.rs:180:9:180:44 | [match(true)] OrPat | match |
+| variables.rs:180:28:180:44 | TupleStructPat | variables.rs:180:42:180:43 | a3 | match |
+| variables.rs:180:42:180:43 | a3 | variables.rs:180:9:180:44 | [match(true)] OrPat | match |
 | variables.rs:181:16:181:24 | PathExpr | variables.rs:181:26:181:27 | a3 |  |
 | variables.rs:181:16:181:28 | CallExpr | variables.rs:179:5:182:5 | MatchExpr |  |
 | variables.rs:181:26:181:27 | a3 | variables.rs:181:16:181:28 | CallExpr |  |
@@ -309,27 +352,54 @@ edges
 | variables.rs:191:1:205:1 | exit match_pattern6 (normal) | variables.rs:191:1:205:1 | exit match_pattern6 |  |
 | variables.rs:191:21:205:1 | BlockExpr | variables.rs:191:1:205:1 | exit match_pattern6 (normal) |  |
 | variables.rs:192:5:192:37 | LetStmt | variables.rs:192:14:192:32 | PathExpr |  |
-| variables.rs:192:9:192:10 | tv | variables.rs:193:5:196:5 | ExprStmt | match, no-match |
+| variables.rs:192:9:192:10 | tv | variables.rs:193:5:196:5 | ExprStmt | match |
 | variables.rs:192:14:192:32 | PathExpr | variables.rs:192:34:192:35 | 62 |  |
 | variables.rs:192:14:192:36 | CallExpr | variables.rs:192:9:192:10 | tv |  |
 | variables.rs:192:34:192:35 | 62 | variables.rs:192:14:192:36 | CallExpr |  |
 | variables.rs:193:5:196:5 | ExprStmt | variables.rs:193:11:193:12 | tv |  |
 | variables.rs:193:5:196:5 | MatchExpr | variables.rs:197:5:200:5 | ExprStmt |  |
-| variables.rs:193:11:193:12 | tv | variables.rs:194:9:194:81 | OrPat |  |
-| variables.rs:194:9:194:81 | OrPat | variables.rs:195:16:195:24 | PathExpr | match |
+| variables.rs:193:11:193:12 | tv | variables.rs:194:9:194:30 | TupleStructPat |  |
+| variables.rs:194:9:194:30 | TupleStructPat | variables.rs:194:28:194:29 | a4 | match |
+| variables.rs:194:9:194:30 | TupleStructPat | variables.rs:194:34:194:56 | TupleStructPat | no-match |
+| variables.rs:194:9:194:81 | [match(true)] OrPat | variables.rs:195:16:195:24 | PathExpr | match |
+| variables.rs:194:28:194:29 | a4 | variables.rs:194:9:194:81 | [match(true)] OrPat | match |
+| variables.rs:194:34:194:56 | TupleStructPat | variables.rs:194:54:194:55 | a4 | match |
+| variables.rs:194:34:194:56 | TupleStructPat | variables.rs:194:60:194:81 | TupleStructPat | no-match |
+| variables.rs:194:54:194:55 | a4 | variables.rs:194:9:194:81 | [match(true)] OrPat | match |
+| variables.rs:194:60:194:81 | TupleStructPat | variables.rs:194:79:194:80 | a4 | match |
+| variables.rs:194:79:194:80 | a4 | variables.rs:194:9:194:81 | [match(true)] OrPat | match |
 | variables.rs:195:16:195:24 | PathExpr | variables.rs:195:26:195:27 | a4 |  |
 | variables.rs:195:16:195:28 | CallExpr | variables.rs:193:5:196:5 | MatchExpr |  |
 | variables.rs:195:26:195:27 | a4 | variables.rs:195:16:195:28 | CallExpr |  |
 | variables.rs:197:5:200:5 | ExprStmt | variables.rs:197:11:197:12 | tv |  |
 | variables.rs:197:5:200:5 | MatchExpr | variables.rs:201:11:201:12 | tv |  |
-| variables.rs:197:11:197:12 | tv | variables.rs:198:9:198:83 | OrPat |  |
-| variables.rs:198:9:198:83 | OrPat | variables.rs:199:16:199:24 | PathExpr | match |
+| variables.rs:197:11:197:12 | tv | variables.rs:198:10:198:31 | TupleStructPat |  |
+| variables.rs:198:9:198:83 | [match(true)] OrPat | variables.rs:199:16:199:24 | PathExpr | match |
+| variables.rs:198:10:198:31 | TupleStructPat | variables.rs:198:29:198:30 | a5 | match |
+| variables.rs:198:10:198:31 | TupleStructPat | variables.rs:198:35:198:57 | TupleStructPat | no-match |
+| variables.rs:198:10:198:57 | [match(false)] OrPat | variables.rs:198:62:198:83 | TupleStructPat | no-match |
+| variables.rs:198:10:198:57 | [match(true)] OrPat | variables.rs:198:9:198:83 | [match(true)] OrPat | match |
+| variables.rs:198:29:198:30 | a5 | variables.rs:198:10:198:57 | [match(true)] OrPat | match |
+| variables.rs:198:35:198:57 | TupleStructPat | variables.rs:198:10:198:57 | [match(false)] OrPat | no-match |
+| variables.rs:198:35:198:57 | TupleStructPat | variables.rs:198:55:198:56 | a5 | match |
+| variables.rs:198:55:198:56 | a5 | variables.rs:198:10:198:57 | [match(true)] OrPat | match |
+| variables.rs:198:62:198:83 | TupleStructPat | variables.rs:198:81:198:82 | a5 | match |
+| variables.rs:198:81:198:82 | a5 | variables.rs:198:9:198:83 | [match(true)] OrPat | match |
 | variables.rs:199:16:199:24 | PathExpr | variables.rs:199:26:199:27 | a5 |  |
 | variables.rs:199:16:199:28 | CallExpr | variables.rs:197:5:200:5 | MatchExpr |  |
 | variables.rs:199:26:199:27 | a5 | variables.rs:199:16:199:28 | CallExpr |  |
 | variables.rs:201:5:204:5 | MatchExpr | variables.rs:191:21:205:1 | BlockExpr |  |
-| variables.rs:201:11:201:12 | tv | variables.rs:202:9:202:83 | OrPat |  |
-| variables.rs:202:9:202:83 | OrPat | variables.rs:203:16:203:24 | PathExpr | match |
+| variables.rs:201:11:201:12 | tv | variables.rs:202:9:202:30 | TupleStructPat |  |
+| variables.rs:202:9:202:30 | TupleStructPat | variables.rs:202:28:202:29 | a6 | match |
+| variables.rs:202:9:202:30 | TupleStructPat | variables.rs:202:35:202:57 | TupleStructPat | no-match |
+| variables.rs:202:9:202:83 | [match(true)] OrPat | variables.rs:203:16:203:24 | PathExpr | match |
+| variables.rs:202:28:202:29 | a6 | variables.rs:202:9:202:83 | [match(true)] OrPat | match |
+| variables.rs:202:35:202:57 | TupleStructPat | variables.rs:202:55:202:56 | a6 | match |
+| variables.rs:202:35:202:57 | TupleStructPat | variables.rs:202:61:202:82 | TupleStructPat | no-match |
+| variables.rs:202:35:202:82 | [match(true)] OrPat | variables.rs:202:9:202:83 | [match(true)] OrPat | match |
+| variables.rs:202:55:202:56 | a6 | variables.rs:202:35:202:82 | [match(true)] OrPat | match |
+| variables.rs:202:61:202:82 | TupleStructPat | variables.rs:202:80:202:81 | a6 | match |
+| variables.rs:202:80:202:81 | a6 | variables.rs:202:35:202:82 | [match(true)] OrPat | match |
 | variables.rs:203:16:203:24 | PathExpr | variables.rs:203:26:203:27 | a6 |  |
 | variables.rs:203:16:203:28 | CallExpr | variables.rs:201:5:204:5 | MatchExpr |  |
 | variables.rs:203:26:203:27 | a6 | variables.rs:203:16:203:28 | CallExpr |  |
@@ -337,14 +407,20 @@ edges
 | variables.rs:207:1:215:1 | exit match_pattern7 (normal) | variables.rs:207:1:215:1 | exit match_pattern7 |  |
 | variables.rs:207:21:215:1 | BlockExpr | variables.rs:207:1:215:1 | exit match_pattern7 (normal) |  |
 | variables.rs:208:5:208:34 | LetStmt | variables.rs:208:18:208:29 | PathExpr |  |
-| variables.rs:208:9:208:14 | either | variables.rs:209:11:209:16 | either | match, no-match |
+| variables.rs:208:9:208:14 | either | variables.rs:209:11:209:16 | either | match |
 | variables.rs:208:18:208:29 | PathExpr | variables.rs:208:31:208:32 | 32 |  |
 | variables.rs:208:18:208:33 | CallExpr | variables.rs:208:9:208:14 | either |  |
 | variables.rs:208:31:208:32 | 32 | variables.rs:208:18:208:33 | CallExpr |  |
 | variables.rs:209:5:214:5 | MatchExpr | variables.rs:207:21:215:1 | BlockExpr |  |
-| variables.rs:209:11:209:16 | either | variables.rs:210:9:210:44 | OrPat |  |
-| variables.rs:210:9:210:44 | OrPat | variables.rs:211:16:211:17 | a7 | match |
-| variables.rs:210:9:210:44 | OrPat | variables.rs:213:9:213:9 | WildcardPat | no-match |
+| variables.rs:209:11:209:16 | either | variables.rs:210:9:210:24 | TupleStructPat |  |
+| variables.rs:210:9:210:24 | TupleStructPat | variables.rs:210:22:210:23 | a7 | match |
+| variables.rs:210:9:210:24 | TupleStructPat | variables.rs:210:28:210:44 | TupleStructPat | no-match |
+| variables.rs:210:9:210:44 | [match(false)] OrPat | variables.rs:213:9:213:9 | WildcardPat | no-match |
+| variables.rs:210:9:210:44 | [match(true)] OrPat | variables.rs:211:16:211:17 | a7 | match |
+| variables.rs:210:22:210:23 | a7 | variables.rs:210:9:210:44 | [match(true)] OrPat | match |
+| variables.rs:210:28:210:44 | TupleStructPat | variables.rs:210:9:210:44 | [match(false)] OrPat | no-match |
+| variables.rs:210:28:210:44 | TupleStructPat | variables.rs:210:42:210:43 | a7 | match |
+| variables.rs:210:42:210:43 | a7 | variables.rs:210:9:210:44 | [match(true)] OrPat | match |
 | variables.rs:211:16:211:17 | a7 | variables.rs:211:21:211:21 | 0 |  |
 | variables.rs:211:16:211:21 | ... > ... | variables.rs:212:16:212:24 | PathExpr | true |
 | variables.rs:211:16:211:21 | ... > ... | variables.rs:213:9:213:9 | WildcardPat | false |
@@ -358,14 +434,21 @@ edges
 | variables.rs:217:1:232:1 | exit match_pattern8 (normal) | variables.rs:217:1:232:1 | exit match_pattern8 |  |
 | variables.rs:217:21:232:1 | BlockExpr | variables.rs:217:1:232:1 | exit match_pattern8 (normal) |  |
 | variables.rs:218:5:218:34 | LetStmt | variables.rs:218:18:218:29 | PathExpr |  |
-| variables.rs:218:9:218:14 | either | variables.rs:220:11:220:16 | either | match, no-match |
+| variables.rs:218:9:218:14 | either | variables.rs:220:11:220:16 | either | match |
 | variables.rs:218:18:218:29 | PathExpr | variables.rs:218:31:218:32 | 32 |  |
 | variables.rs:218:18:218:33 | CallExpr | variables.rs:218:9:218:14 | either |  |
 | variables.rs:218:31:218:32 | 32 | variables.rs:218:18:218:33 | CallExpr |  |
 | variables.rs:220:5:231:5 | MatchExpr | variables.rs:217:21:232:1 | BlockExpr |  |
-| variables.rs:220:11:220:16 | either | variables.rs:221:9:222:52 | e |  |
-| variables.rs:221:9:222:52 | e | variables.rs:224:13:224:27 | ExprStmt | match |
-| variables.rs:221:9:222:52 | e | variables.rs:230:9:230:9 | WildcardPat | no-match |
+| variables.rs:220:11:220:16 | either | variables.rs:222:14:222:30 | TupleStructPat |  |
+| variables.rs:221:9:222:52 | [match(true)] e | variables.rs:224:13:224:27 | ExprStmt | match |
+| variables.rs:222:14:222:30 | TupleStructPat | variables.rs:222:27:222:29 | a11 | match |
+| variables.rs:222:14:222:30 | TupleStructPat | variables.rs:222:34:222:51 | TupleStructPat | no-match |
+| variables.rs:222:14:222:51 | [match(false)] OrPat | variables.rs:230:9:230:9 | WildcardPat | no-match |
+| variables.rs:222:14:222:51 | [match(true)] OrPat | variables.rs:221:9:222:52 | [match(true)] e | match |
+| variables.rs:222:27:222:29 | a11 | variables.rs:222:14:222:51 | [match(true)] OrPat | match |
+| variables.rs:222:34:222:51 | TupleStructPat | variables.rs:222:14:222:51 | [match(false)] OrPat | no-match |
+| variables.rs:222:34:222:51 | TupleStructPat | variables.rs:222:48:222:50 | a11 | match |
+| variables.rs:222:48:222:50 | a11 | variables.rs:222:14:222:51 | [match(true)] OrPat | match |
 | variables.rs:223:12:229:9 | BlockExpr | variables.rs:220:5:231:5 | MatchExpr |  |
 | variables.rs:224:13:224:21 | PathExpr | variables.rs:224:23:224:25 | a11 |  |
 | variables.rs:224:13:224:26 | CallExpr | variables.rs:225:16:226:15 | LetExpr |  |
@@ -374,7 +457,8 @@ edges
 | variables.rs:225:13:228:13 | IfExpr | variables.rs:223:12:229:9 | BlockExpr |  |
 | variables.rs:225:16:226:15 | LetExpr | variables.rs:225:20:225:36 | TupleStructPat |  |
 | variables.rs:225:20:225:36 | TupleStructPat | variables.rs:225:13:228:13 | IfExpr | no-match |
-| variables.rs:225:20:225:36 | TupleStructPat | variables.rs:227:17:227:32 | ExprStmt | match |
+| variables.rs:225:20:225:36 | TupleStructPat | variables.rs:225:33:225:35 | a12 | match |
+| variables.rs:225:33:225:35 | a12 | variables.rs:227:17:227:32 | ExprStmt | match |
 | variables.rs:226:17:228:13 | BlockExpr | variables.rs:225:13:228:13 | IfExpr |  |
 | variables.rs:227:17:227:25 | PathExpr | variables.rs:227:28:227:30 | a12 |  |
 | variables.rs:227:17:227:31 | CallExpr | variables.rs:226:17:228:13 | BlockExpr |  |
@@ -387,22 +471,37 @@ edges
 | variables.rs:241:1:247:1 | exit match_pattern9 (normal) | variables.rs:241:1:247:1 | exit match_pattern9 |  |
 | variables.rs:241:21:247:1 | BlockExpr | variables.rs:241:1:247:1 | exit match_pattern9 (normal) |  |
 | variables.rs:242:5:242:36 | LetStmt | variables.rs:242:14:242:31 | PathExpr |  |
-| variables.rs:242:9:242:10 | fv | variables.rs:243:11:243:12 | fv | match, no-match |
+| variables.rs:242:9:242:10 | fv | variables.rs:243:11:243:12 | fv | match |
 | variables.rs:242:14:242:31 | PathExpr | variables.rs:242:33:242:34 | 62 |  |
 | variables.rs:242:14:242:35 | CallExpr | variables.rs:242:9:242:10 | fv |  |
 | variables.rs:242:33:242:34 | 62 | variables.rs:242:14:242:35 | CallExpr |  |
 | variables.rs:243:5:246:5 | MatchExpr | variables.rs:241:21:247:1 | BlockExpr |  |
-| variables.rs:243:11:243:12 | fv | variables.rs:244:9:244:109 | OrPat |  |
-| variables.rs:244:9:244:109 | OrPat | variables.rs:245:16:245:24 | PathExpr | match |
+| variables.rs:243:11:243:12 | fv | variables.rs:244:9:244:30 | TupleStructPat |  |
+| variables.rs:244:9:244:30 | TupleStructPat | variables.rs:244:27:244:29 | a13 | match |
+| variables.rs:244:9:244:30 | TupleStructPat | variables.rs:244:35:244:57 | TupleStructPat | no-match |
+| variables.rs:244:9:244:109 | [match(true)] OrPat | variables.rs:245:16:245:24 | PathExpr | match |
+| variables.rs:244:27:244:29 | a13 | variables.rs:244:9:244:109 | [match(true)] OrPat | match |
+| variables.rs:244:35:244:57 | TupleStructPat | variables.rs:244:54:244:56 | a13 | match |
+| variables.rs:244:35:244:57 | TupleStructPat | variables.rs:244:61:244:82 | TupleStructPat | no-match |
+| variables.rs:244:35:244:82 | [match(false)] OrPat | variables.rs:244:87:244:109 | TupleStructPat | no-match |
+| variables.rs:244:35:244:82 | [match(true)] OrPat | variables.rs:244:9:244:109 | [match(true)] OrPat | match |
+| variables.rs:244:54:244:56 | a13 | variables.rs:244:35:244:82 | [match(true)] OrPat | match |
+| variables.rs:244:61:244:82 | TupleStructPat | variables.rs:244:35:244:82 | [match(false)] OrPat | no-match |
+| variables.rs:244:61:244:82 | TupleStructPat | variables.rs:244:79:244:81 | a13 | match |
+| variables.rs:244:79:244:81 | a13 | variables.rs:244:35:244:82 | [match(true)] OrPat | match |
+| variables.rs:244:87:244:109 | TupleStructPat | variables.rs:244:106:244:108 | a13 | match |
+| variables.rs:244:106:244:108 | a13 | variables.rs:244:9:244:109 | [match(true)] OrPat | match |
 | variables.rs:245:16:245:24 | PathExpr | variables.rs:245:26:245:28 | a13 |  |
 | variables.rs:245:16:245:29 | CallExpr | variables.rs:243:5:246:5 | MatchExpr |  |
 | variables.rs:245:26:245:28 | a13 | variables.rs:245:16:245:29 | CallExpr |  |
 | variables.rs:249:1:258:1 | enter param_pattern1 | variables.rs:250:5:250:6 | a8 |  |
 | variables.rs:249:1:258:1 | exit param_pattern1 (normal) | variables.rs:249:1:258:1 | exit param_pattern1 |  |
-| variables.rs:250:5:250:6 | a8 | variables.rs:250:5:250:12 | Param | match, no-match |
+| variables.rs:250:5:250:6 | a8 | variables.rs:250:5:250:12 | Param | match |
 | variables.rs:250:5:250:12 | Param | variables.rs:251:5:254:5 | TuplePat |  |
-| variables.rs:251:5:254:5 | TuplePat | variables.rs:251:5:254:19 | Param | match, no-match |
+| variables.rs:251:5:254:5 | TuplePat | variables.rs:252:9:252:10 | b3 | match |
 | variables.rs:251:5:254:19 | Param | variables.rs:255:5:255:18 | ExprStmt |  |
+| variables.rs:252:9:252:10 | b3 | variables.rs:253:9:253:10 | c1 | match |
+| variables.rs:253:9:253:10 | c1 | variables.rs:251:5:254:19 | Param | match |
 | variables.rs:254:28:258:1 | BlockExpr | variables.rs:249:1:258:1 | exit param_pattern1 (normal) |  |
 | variables.rs:255:5:255:13 | PathExpr | variables.rs:255:15:255:16 | a8 |  |
 | variables.rs:255:5:255:17 | CallExpr | variables.rs:256:5:256:18 | ExprStmt |  |
@@ -416,10 +515,15 @@ edges
 | variables.rs:257:5:257:17 | CallExpr | variables.rs:254:28:258:1 | BlockExpr |  |
 | variables.rs:257:5:257:18 | ExprStmt | variables.rs:257:5:257:13 | PathExpr |  |
 | variables.rs:257:15:257:16 | c1 | variables.rs:257:5:257:17 | CallExpr |  |
-| variables.rs:260:1:264:1 | enter param_pattern2 | variables.rs:261:5:261:42 | ParenPat |  |
+| variables.rs:260:1:264:1 | enter param_pattern2 | variables.rs:261:6:261:21 | TupleStructPat |  |
 | variables.rs:260:1:264:1 | exit param_pattern2 (normal) | variables.rs:260:1:264:1 | exit param_pattern2 |  |
-| variables.rs:261:5:261:42 | ParenPat | variables.rs:261:5:261:50 | Param | match, no-match |
 | variables.rs:261:5:261:50 | Param | variables.rs:263:5:263:18 | ExprStmt |  |
+| variables.rs:261:6:261:21 | TupleStructPat | variables.rs:261:19:261:20 | a9 | match |
+| variables.rs:261:6:261:21 | TupleStructPat | variables.rs:261:25:261:41 | TupleStructPat | no-match |
+| variables.rs:261:6:261:41 | [match(true)] OrPat | variables.rs:261:5:261:50 | Param | match |
+| variables.rs:261:19:261:20 | a9 | variables.rs:261:6:261:41 | [match(true)] OrPat | match |
+| variables.rs:261:25:261:41 | TupleStructPat | variables.rs:261:39:261:40 | a9 | match |
+| variables.rs:261:39:261:40 | a9 | variables.rs:261:6:261:41 | [match(true)] OrPat | match |
 | variables.rs:262:9:264:1 | BlockExpr | variables.rs:260:1:264:1 | exit param_pattern2 (normal) |  |
 | variables.rs:263:5:263:13 | PathExpr | variables.rs:263:15:263:16 | a9 |  |
 | variables.rs:263:5:263:17 | CallExpr | variables.rs:262:9:264:1 | BlockExpr |  |
@@ -429,7 +533,10 @@ edges
 | variables.rs:266:1:301:1 | exit destruct_assignment (normal) | variables.rs:266:1:301:1 | exit destruct_assignment |  |
 | variables.rs:266:26:301:1 | BlockExpr | variables.rs:266:1:301:1 | exit destruct_assignment (normal) |  |
 | variables.rs:267:5:271:18 | LetStmt | variables.rs:271:10:271:10 | 1 |  |
-| variables.rs:267:9:271:5 | TuplePat | variables.rs:272:5:272:19 | ExprStmt | match |
+| variables.rs:267:9:271:5 | TuplePat | variables.rs:268:9:268:15 | a10 | match |
+| variables.rs:268:9:268:15 | a10 | variables.rs:269:9:269:14 | b4 | match |
+| variables.rs:269:9:269:14 | b4 | variables.rs:270:9:270:14 | c2 | match |
+| variables.rs:270:9:270:14 | c2 | variables.rs:272:5:272:19 | ExprStmt | match |
 | variables.rs:271:9:271:17 | TupleExpr | variables.rs:267:9:271:5 | TuplePat |  |
 | variables.rs:271:10:271:10 | 1 | variables.rs:271:13:271:13 | 2 |  |
 | variables.rs:271:13:271:13 | 2 | variables.rs:271:16:271:16 | 3 |  |
@@ -473,7 +580,9 @@ edges
 | variables.rs:289:11:289:16 | TupleExpr | variables.rs:290:9:293:9 | TuplePat |  |
 | variables.rs:289:12:289:12 | 4 | variables.rs:289:15:289:15 | 5 |  |
 | variables.rs:289:15:289:15 | 5 | variables.rs:289:11:289:16 | TupleExpr |  |
-| variables.rs:290:9:293:9 | TuplePat | variables.rs:294:13:294:27 | ExprStmt | match |
+| variables.rs:290:9:293:9 | TuplePat | variables.rs:291:13:291:15 | a10 | match |
+| variables.rs:291:13:291:15 | a10 | variables.rs:292:13:292:14 | b4 | match |
+| variables.rs:292:13:292:14 | b4 | variables.rs:294:13:294:27 | ExprStmt | match |
 | variables.rs:293:14:296:9 | BlockExpr | variables.rs:289:5:297:5 | MatchExpr |  |
 | variables.rs:294:13:294:21 | PathExpr | variables.rs:294:23:294:25 | a10 |  |
 | variables.rs:294:13:294:26 | CallExpr | variables.rs:295:13:295:26 | ExprStmt |  |
@@ -495,15 +604,15 @@ edges
 | variables.rs:303:1:318:1 | exit closure_variable (normal) | variables.rs:303:1:318:1 | exit closure_variable |  |
 | variables.rs:303:23:318:1 | BlockExpr | variables.rs:303:1:318:1 | exit closure_variable (normal) |  |
 | variables.rs:304:5:306:10 | LetStmt | variables.rs:305:9:306:9 | ClosureExpr |  |
-| variables.rs:304:9:304:23 | example_closure | variables.rs:307:5:308:27 | LetStmt | match, no-match |
+| variables.rs:304:9:304:23 | example_closure | variables.rs:307:5:308:27 | LetStmt | match |
 | variables.rs:305:9:306:9 | ClosureExpr | variables.rs:304:9:304:23 | example_closure |  |
 | variables.rs:305:9:306:9 | enter ClosureExpr | variables.rs:305:10:305:10 | x |  |
 | variables.rs:305:9:306:9 | exit ClosureExpr (normal) | variables.rs:305:9:306:9 | exit ClosureExpr |  |
-| variables.rs:305:10:305:10 | x | variables.rs:305:10:305:15 | Param | match, no-match |
+| variables.rs:305:10:305:10 | x | variables.rs:305:10:305:15 | Param | match |
 | variables.rs:305:10:305:15 | Param | variables.rs:306:9:306:9 | x |  |
 | variables.rs:306:9:306:9 | x | variables.rs:305:9:306:9 | exit ClosureExpr (normal) |  |
 | variables.rs:307:5:308:27 | LetStmt | variables.rs:308:9:308:23 | example_closure |  |
-| variables.rs:307:9:307:10 | n1 | variables.rs:309:5:309:18 | ExprStmt | match, no-match |
+| variables.rs:307:9:307:10 | n1 | variables.rs:309:5:309:18 | ExprStmt | match |
 | variables.rs:308:9:308:23 | example_closure | variables.rs:308:25:308:25 | 5 |  |
 | variables.rs:308:9:308:26 | CallExpr | variables.rs:307:9:307:10 | n1 |  |
 | variables.rs:308:25:308:25 | 5 | variables.rs:308:9:308:26 | CallExpr |  |
@@ -515,15 +624,15 @@ edges
 | variables.rs:311:5:311:24 | CallExpr | variables.rs:312:5:314:10 | LetStmt |  |
 | variables.rs:311:5:311:25 | ExprStmt | variables.rs:311:5:311:22 | PathExpr |  |
 | variables.rs:312:5:314:10 | LetStmt | variables.rs:313:9:314:9 | ClosureExpr |  |
-| variables.rs:312:9:312:26 | immutable_variable | variables.rs:315:5:316:30 | LetStmt | match, no-match |
+| variables.rs:312:9:312:26 | immutable_variable | variables.rs:315:5:316:30 | LetStmt | match |
 | variables.rs:313:9:314:9 | ClosureExpr | variables.rs:312:9:312:26 | immutable_variable |  |
 | variables.rs:313:9:314:9 | enter ClosureExpr | variables.rs:313:10:313:10 | x |  |
 | variables.rs:313:9:314:9 | exit ClosureExpr (normal) | variables.rs:313:9:314:9 | exit ClosureExpr |  |
-| variables.rs:313:10:313:10 | x | variables.rs:313:10:313:15 | Param | match, no-match |
+| variables.rs:313:10:313:10 | x | variables.rs:313:10:313:15 | Param | match |
 | variables.rs:313:10:313:15 | Param | variables.rs:314:9:314:9 | x |  |
 | variables.rs:314:9:314:9 | x | variables.rs:313:9:314:9 | exit ClosureExpr (normal) |  |
 | variables.rs:315:5:316:30 | LetStmt | variables.rs:316:9:316:26 | immutable_variable |  |
-| variables.rs:315:9:315:10 | n2 | variables.rs:317:5:317:18 | ExprStmt | match, no-match |
+| variables.rs:315:9:315:10 | n2 | variables.rs:317:5:317:18 | ExprStmt | match |
 | variables.rs:316:9:316:26 | immutable_variable | variables.rs:316:28:316:28 | 6 |  |
 | variables.rs:316:9:316:29 | CallExpr | variables.rs:315:9:315:10 | n2 |  |
 | variables.rs:316:28:316:28 | 6 | variables.rs:316:9:316:29 | CallExpr |  |
@@ -535,7 +644,7 @@ edges
 | variables.rs:320:1:327:1 | exit for_variable (normal) | variables.rs:320:1:327:1 | exit for_variable |  |
 | variables.rs:320:19:327:1 | BlockExpr | variables.rs:320:1:327:1 | exit for_variable (normal) |  |
 | variables.rs:321:5:321:42 | LetStmt | variables.rs:321:15:321:22 | "apples" |  |
-| variables.rs:321:9:321:9 | v | variables.rs:324:12:324:12 | v | match, no-match |
+| variables.rs:321:9:321:9 | v | variables.rs:324:12:324:12 | v | match |
 | variables.rs:321:13:321:41 | RefExpr | variables.rs:321:9:321:9 | v |  |
 | variables.rs:321:14:321:41 | ArrayExpr | variables.rs:321:13:321:41 | RefExpr |  |
 | variables.rs:321:15:321:22 | "apples" | variables.rs:321:25:321:30 | "cake" |  |
@@ -554,7 +663,7 @@ edges
 | variables.rs:329:1:335:1 | exit add_assign (normal) | variables.rs:329:1:335:1 | exit add_assign |  |
 | variables.rs:329:17:335:1 | BlockExpr | variables.rs:329:1:335:1 | exit add_assign (normal) |  |
 | variables.rs:330:5:330:18 | LetStmt | variables.rs:330:17:330:17 | 0 |  |
-| variables.rs:330:9:330:13 | a | variables.rs:331:5:331:11 | ExprStmt | match, no-match |
+| variables.rs:330:9:330:13 | a | variables.rs:331:5:331:11 | ExprStmt | match |
 | variables.rs:330:17:330:17 | 0 | variables.rs:330:9:330:13 | a |  |
 | variables.rs:331:5:331:5 | a | variables.rs:331:10:331:10 | 1 |  |
 | variables.rs:331:5:331:10 | ... += ... | variables.rs:332:5:332:17 | ExprStmt |  |
@@ -574,10 +683,10 @@ edges
 | variables.rs:337:1:343:1 | exit mutate (normal) | variables.rs:337:1:343:1 | exit mutate |  |
 | variables.rs:337:13:343:1 | BlockExpr | variables.rs:337:1:343:1 | exit mutate (normal) |  |
 | variables.rs:338:5:338:18 | LetStmt | variables.rs:338:17:338:17 | 1 |  |
-| variables.rs:338:9:338:13 | i | variables.rs:339:5:340:15 | LetStmt | match, no-match |
+| variables.rs:338:9:338:13 | i | variables.rs:339:5:340:15 | LetStmt | match |
 | variables.rs:338:17:338:17 | 1 | variables.rs:338:9:338:13 | i |  |
 | variables.rs:339:5:340:15 | LetStmt | variables.rs:340:14:340:14 | i |  |
-| variables.rs:339:9:339:13 | ref_i | variables.rs:341:5:341:15 | ExprStmt | match, no-match |
+| variables.rs:339:9:339:13 | ref_i | variables.rs:341:5:341:15 | ExprStmt | match |
 | variables.rs:340:9:340:14 | RefExpr | variables.rs:339:9:339:13 | ref_i |  |
 | variables.rs:340:14:340:14 | i | variables.rs:340:9:340:14 | RefExpr |  |
 | variables.rs:341:5:341:10 | * ... | variables.rs:341:14:341:14 | 2 |  |
@@ -591,7 +700,7 @@ edges
 | variables.rs:342:15:342:15 | i | variables.rs:342:5:342:16 | CallExpr |  |
 | variables.rs:345:1:349:1 | enter mutate_param | variables.rs:345:17:345:17 | x |  |
 | variables.rs:345:1:349:1 | exit mutate_param (normal) | variables.rs:345:1:349:1 | exit mutate_param |  |
-| variables.rs:345:17:345:17 | x | variables.rs:345:17:345:28 | Param | match, no-match |
+| variables.rs:345:17:345:17 | x | variables.rs:345:17:345:28 | Param | match |
 | variables.rs:345:17:345:28 | Param | variables.rs:346:5:348:11 | ExprStmt |  |
 | variables.rs:345:31:349:1 | BlockExpr | variables.rs:345:1:349:1 | exit mutate_param (normal) |  |
 | variables.rs:346:5:346:6 | * ... | variables.rs:347:10:347:10 | x |  |
@@ -607,7 +716,7 @@ edges
 | variables.rs:351:1:355:1 | exit mutate_arg (normal) | variables.rs:351:1:355:1 | exit mutate_arg |  |
 | variables.rs:351:17:355:1 | BlockExpr | variables.rs:351:1:355:1 | exit mutate_arg (normal) |  |
 | variables.rs:352:5:352:18 | LetStmt | variables.rs:352:17:352:17 | 2 |  |
-| variables.rs:352:9:352:13 | x | variables.rs:353:5:353:25 | ExprStmt | match, no-match |
+| variables.rs:352:9:352:13 | x | variables.rs:353:5:353:25 | ExprStmt | match |
 | variables.rs:352:17:352:17 | 2 | variables.rs:352:9:352:13 | x |  |
 | variables.rs:353:5:353:16 | PathExpr | variables.rs:353:23:353:23 | x |  |
 | variables.rs:353:5:353:24 | CallExpr | variables.rs:354:5:354:17 | ExprStmt |  |
@@ -622,10 +731,10 @@ edges
 | variables.rs:357:1:363:1 | exit alias (normal) | variables.rs:357:1:363:1 | exit alias |  |
 | variables.rs:357:12:363:1 | BlockExpr | variables.rs:357:1:363:1 | exit alias (normal) |  |
 | variables.rs:358:5:358:18 | LetStmt | variables.rs:358:17:358:17 | 1 |  |
-| variables.rs:358:9:358:13 | x | variables.rs:359:5:360:15 | LetStmt | match, no-match |
+| variables.rs:358:9:358:13 | x | variables.rs:359:5:360:15 | LetStmt | match |
 | variables.rs:358:17:358:17 | 1 | variables.rs:358:9:358:13 | x |  |
 | variables.rs:359:5:360:15 | LetStmt | variables.rs:360:14:360:14 | x |  |
-| variables.rs:359:9:359:9 | y | variables.rs:361:5:361:11 | ExprStmt | match, no-match |
+| variables.rs:359:9:359:9 | y | variables.rs:361:5:361:11 | ExprStmt | match |
 | variables.rs:360:9:360:14 | RefExpr | variables.rs:359:9:359:9 | y |  |
 | variables.rs:360:14:360:14 | x | variables.rs:360:9:360:14 | RefExpr |  |
 | variables.rs:361:5:361:6 | * ... | variables.rs:361:10:361:10 | 2 |  |
@@ -641,10 +750,10 @@ edges
 | variables.rs:365:1:373:1 | exit capture (normal) | variables.rs:365:1:373:1 | exit capture |  |
 | variables.rs:365:14:373:1 | BlockExpr | variables.rs:365:1:373:1 | exit capture (normal) |  |
 | variables.rs:366:5:366:19 | LetStmt | variables.rs:366:17:366:18 | 10 |  |
-| variables.rs:366:9:366:13 | x | variables.rs:367:5:370:6 | LetStmt | match, no-match |
+| variables.rs:366:9:366:13 | x | variables.rs:367:5:370:6 | LetStmt | match |
 | variables.rs:366:17:366:18 | 10 | variables.rs:366:9:366:13 | x |  |
 | variables.rs:367:5:370:6 | LetStmt | variables.rs:367:19:370:5 | ClosureExpr |  |
-| variables.rs:367:9:367:15 | cap | variables.rs:371:5:371:10 | ExprStmt | match, no-match |
+| variables.rs:367:9:367:15 | cap | variables.rs:371:5:371:10 | ExprStmt | match |
 | variables.rs:367:19:370:5 | ClosureExpr | variables.rs:367:9:367:15 | cap |  |
 | variables.rs:367:19:370:5 | enter ClosureExpr | variables.rs:368:9:368:21 | ExprStmt |  |
 | variables.rs:367:19:370:5 | exit ClosureExpr (normal) | variables.rs:367:19:370:5 | exit ClosureExpr |  |

From 756affa4aaedfb8fbbc6e4b36402109683ede413 Mon Sep 17 00:00:00 2001
From: Tom Hvitved <hvitved@github.com>
Date: Wed, 9 Oct 2024 19:51:17 +0200
Subject: [PATCH 305/347] Rust: Fix bugs in `LetExprTree` and
 `MethodCallExprTree`

---
 .../internal/ControlFlowGraphImpl.qll          | 18 +++++++++++++-----
 .../library-tests/controlflow/Cfg.expected     | 10 +++++++---
 .../test/library-tests/variables/Cfg.expected  | 14 ++++++++++----
 3 files changed, 30 insertions(+), 12 deletions(-)

diff --git a/rust/ql/lib/codeql/rust/controlflow/internal/ControlFlowGraphImpl.qll b/rust/ql/lib/codeql/rust/controlflow/internal/ControlFlowGraphImpl.qll
index 471afaa920ea..6c0c257767a7 100644
--- a/rust/ql/lib/codeql/rust/controlflow/internal/ControlFlowGraphImpl.qll
+++ b/rust/ql/lib/codeql/rust/controlflow/internal/ControlFlowGraphImpl.qll
@@ -296,8 +296,14 @@ class ItemTree extends LeafTree, Item { }
 // `LetExpr` is a pre-order tree such that the pattern itself ends up
 // dominating successors in the graph in the same way that patterns do in
 // `match` expressions.
-class LetExprTree extends StandardPreOrderTree instanceof LetExpr {
-  override AstNode getChildNode(int i) { i = 0 and result = super.getPat() }
+class LetExprTree extends StandardPreOrderTree, LetExpr {
+  override AstNode getChildNode(int i) {
+    i = 0 and
+    result = this.getExpr()
+    or
+    i = 1 and
+    result = this.getPat()
+  }
 }
 
 class LetStmtTree extends PreOrderTree, LetStmt {
@@ -479,10 +485,12 @@ class MatchExprTree extends PostOrderTree instanceof MatchExpr {
   }
 }
 
-class MethodCallExprTree extends StandardPostOrderTree instanceof MethodCallExpr {
+class MethodCallExprTree extends StandardPostOrderTree, MethodCallExpr {
   override AstNode getChildNode(int i) {
-    result = super.getReceiver() and
-    result = super.getArgList().getArg(i + 1)
+    i = 0 and
+    result = this.getReceiver()
+    or
+    result = this.getArgList().getArg(i + 1)
   }
 }
 
diff --git a/rust/ql/test/library-tests/controlflow/Cfg.expected b/rust/ql/test/library-tests/controlflow/Cfg.expected
index 73f3e9d84123..0862f5f3415f 100644
--- a/rust/ql/test/library-tests/controlflow/Cfg.expected
+++ b/rust/ql/test/library-tests/controlflow/Cfg.expected
@@ -157,10 +157,12 @@ edges
 | test.rs:80:24:80:28 | RangeExpr | test.rs:80:13:80:20 | iter |  |
 | test.rs:80:27:80:28 | 10 | test.rs:80:24:80:28 | RangeExpr |  |
 | test.rs:81:9:85:9 | WhileExpr | test.rs:79:25:86:5 | BlockExpr |  |
-| test.rs:81:15:81:39 | LetExpr | test.rs:81:19:81:25 | TupleStructPat |  |
+| test.rs:81:15:81:39 | LetExpr | test.rs:81:29:81:32 | iter |  |
 | test.rs:81:19:81:25 | TupleStructPat | test.rs:81:9:85:9 | WhileExpr | no-match |
 | test.rs:81:19:81:25 | TupleStructPat | test.rs:81:24:81:24 | x | match |
 | test.rs:81:24:81:24 | x | test.rs:82:17:82:17 | PathExpr | match |
+| test.rs:81:29:81:32 | iter | test.rs:81:29:81:39 | MethodCallExpr |  |
+| test.rs:81:29:81:39 | MethodCallExpr | test.rs:81:19:81:25 | TupleStructPat |  |
 | test.rs:81:41:85:9 | BlockExpr | test.rs:81:15:81:39 | LetExpr |  |
 | test.rs:82:13:84:13 | IfExpr | test.rs:81:41:85:9 | BlockExpr |  |
 | test.rs:82:17:82:17 | PathExpr | test.rs:82:21:82:21 | 5 |  |
@@ -233,10 +235,11 @@ edges
 | test.rs:113:25:113:38 | Param | test.rs:114:12:114:26 | LetExpr |  |
 | test.rs:113:48:119:5 | BlockExpr | test.rs:113:5:119:5 | exit test_if_let_else (normal) |  |
 | test.rs:114:9:118:9 | IfExpr | test.rs:113:48:119:5 | BlockExpr |  |
-| test.rs:114:12:114:26 | LetExpr | test.rs:114:16:114:22 | TupleStructPat |  |
+| test.rs:114:12:114:26 | LetExpr | test.rs:114:26:114:26 | a |  |
 | test.rs:114:16:114:22 | TupleStructPat | test.rs:114:21:114:21 | n | match |
 | test.rs:114:16:114:22 | TupleStructPat | test.rs:117:13:117:13 | 0 | no-match |
 | test.rs:114:21:114:21 | n | test.rs:115:13:115:13 | n | match |
+| test.rs:114:26:114:26 | a | test.rs:114:16:114:22 | TupleStructPat |  |
 | test.rs:114:28:116:9 | BlockExpr | test.rs:114:9:118:9 | IfExpr |  |
 | test.rs:115:13:115:13 | n | test.rs:114:28:116:9 | BlockExpr |  |
 | test.rs:116:16:118:9 | BlockExpr | test.rs:114:9:118:9 | IfExpr |  |
@@ -248,10 +251,11 @@ edges
 | test.rs:121:43:126:5 | BlockExpr | test.rs:121:5:126:5 | exit test_if_let (normal) |  |
 | test.rs:122:9:124:9 | ExprStmt | test.rs:122:12:122:26 | LetExpr |  |
 | test.rs:122:9:124:9 | IfExpr | test.rs:125:9:125:9 | 0 |  |
-| test.rs:122:12:122:26 | LetExpr | test.rs:122:16:122:22 | TupleStructPat |  |
+| test.rs:122:12:122:26 | LetExpr | test.rs:122:26:122:26 | a |  |
 | test.rs:122:16:122:22 | TupleStructPat | test.rs:122:9:124:9 | IfExpr | no-match |
 | test.rs:122:16:122:22 | TupleStructPat | test.rs:122:21:122:21 | n | match |
 | test.rs:122:21:122:21 | n | test.rs:123:13:123:13 | n | match |
+| test.rs:122:26:122:26 | a | test.rs:122:16:122:22 | TupleStructPat |  |
 | test.rs:122:28:124:9 | BlockExpr | test.rs:122:9:124:9 | IfExpr |  |
 | test.rs:123:13:123:13 | n | test.rs:122:28:124:9 | BlockExpr |  |
 | test.rs:125:9:125:9 | 0 | test.rs:121:43:126:5 | BlockExpr |  |
diff --git a/rust/ql/test/library-tests/variables/Cfg.expected b/rust/ql/test/library-tests/variables/Cfg.expected
index db01e6c6e7f8..771d68b602d2 100644
--- a/rust/ql/test/library-tests/variables/Cfg.expected
+++ b/rust/ql/test/library-tests/variables/Cfg.expected
@@ -149,10 +149,11 @@ edges
 | variables.rs:74:19:74:40 | CallExpr | variables.rs:74:14:74:41 | CallExpr |  |
 | variables.rs:74:32:74:39 | "Hello!" | variables.rs:74:19:74:40 | CallExpr |  |
 | variables.rs:76:5:79:5 | IfExpr | variables.rs:73:19:80:1 | BlockExpr |  |
-| variables.rs:76:8:77:12 | LetExpr | variables.rs:76:12:76:23 | TupleStructPat |  |
+| variables.rs:76:8:77:12 | LetExpr | variables.rs:77:11:77:12 | s1 |  |
 | variables.rs:76:12:76:23 | TupleStructPat | variables.rs:76:5:79:5 | IfExpr | no-match |
 | variables.rs:76:12:76:23 | TupleStructPat | variables.rs:76:17:76:22 | s2 | match |
 | variables.rs:76:17:76:22 | s2 | variables.rs:78:9:78:22 | ExprStmt | match |
+| variables.rs:77:11:77:12 | s1 | variables.rs:76:12:76:23 | TupleStructPat |  |
 | variables.rs:77:14:79:5 | BlockExpr | variables.rs:76:5:79:5 | IfExpr |  |
 | variables.rs:78:9:78:17 | PathExpr | variables.rs:78:19:78:20 | s2 |  |
 | variables.rs:78:9:78:21 | CallExpr | variables.rs:77:14:79:5 | BlockExpr |  |
@@ -184,10 +185,11 @@ edges
 | variables.rs:91:19:91:40 | CallExpr | variables.rs:91:14:91:41 | CallExpr |  |
 | variables.rs:91:32:91:39 | "Hello!" | variables.rs:91:19:91:40 | CallExpr |  |
 | variables.rs:93:5:96:5 | WhileExpr | variables.rs:90:19:97:1 | BlockExpr |  |
-| variables.rs:93:11:94:12 | LetExpr | variables.rs:93:15:93:26 | TupleStructPat |  |
+| variables.rs:93:11:94:12 | LetExpr | variables.rs:94:11:94:12 | s1 |  |
 | variables.rs:93:15:93:26 | TupleStructPat | variables.rs:93:5:96:5 | WhileExpr | no-match |
 | variables.rs:93:15:93:26 | TupleStructPat | variables.rs:93:20:93:25 | s2 | match |
 | variables.rs:93:20:93:25 | s2 | variables.rs:95:9:95:22 | ExprStmt | match |
+| variables.rs:94:11:94:12 | s1 | variables.rs:93:15:93:26 | TupleStructPat |  |
 | variables.rs:94:14:96:5 | BlockExpr | variables.rs:93:11:94:12 | LetExpr |  |
 | variables.rs:95:9:95:17 | PathExpr | variables.rs:95:19:95:20 | s2 |  |
 | variables.rs:95:9:95:21 | CallExpr | variables.rs:94:14:96:5 | BlockExpr |  |
@@ -455,10 +457,11 @@ edges
 | variables.rs:224:13:224:27 | ExprStmt | variables.rs:224:13:224:21 | PathExpr |  |
 | variables.rs:224:23:224:25 | a11 | variables.rs:224:13:224:26 | CallExpr |  |
 | variables.rs:225:13:228:13 | IfExpr | variables.rs:223:12:229:9 | BlockExpr |  |
-| variables.rs:225:16:226:15 | LetExpr | variables.rs:225:20:225:36 | TupleStructPat |  |
+| variables.rs:225:16:226:15 | LetExpr | variables.rs:226:15:226:15 | e |  |
 | variables.rs:225:20:225:36 | TupleStructPat | variables.rs:225:13:228:13 | IfExpr | no-match |
 | variables.rs:225:20:225:36 | TupleStructPat | variables.rs:225:33:225:35 | a12 | match |
 | variables.rs:225:33:225:35 | a12 | variables.rs:227:17:227:32 | ExprStmt | match |
+| variables.rs:226:15:226:15 | e | variables.rs:225:20:225:36 | TupleStructPat |  |
 | variables.rs:226:17:228:13 | BlockExpr | variables.rs:225:13:228:13 | IfExpr |  |
 | variables.rs:227:17:227:25 | PathExpr | variables.rs:227:28:227:30 | a12 |  |
 | variables.rs:227:17:227:31 | CallExpr | variables.rs:226:17:228:13 | BlockExpr |  |
@@ -674,7 +677,10 @@ edges
 | variables.rs:332:5:332:17 | ExprStmt | variables.rs:332:5:332:13 | PathExpr |  |
 | variables.rs:332:15:332:15 | a | variables.rs:332:5:332:16 | CallExpr |  |
 | variables.rs:333:5:333:27 | MethodCallExpr | variables.rs:334:5:334:17 | ExprStmt |  |
-| variables.rs:333:5:333:28 | ExprStmt | variables.rs:333:5:333:27 | MethodCallExpr |  |
+| variables.rs:333:5:333:28 | ExprStmt | variables.rs:333:25:333:26 | 10 |  |
+| variables.rs:333:6:333:11 | RefExpr | variables.rs:333:5:333:27 | MethodCallExpr |  |
+| variables.rs:333:11:333:11 | a | variables.rs:333:6:333:11 | RefExpr |  |
+| variables.rs:333:25:333:26 | 10 | variables.rs:333:11:333:11 | a |  |
 | variables.rs:334:5:334:13 | PathExpr | variables.rs:334:15:334:15 | a |  |
 | variables.rs:334:5:334:16 | CallExpr | variables.rs:329:17:335:1 | BlockExpr |  |
 | variables.rs:334:5:334:17 | ExprStmt | variables.rs:334:5:334:13 | PathExpr |  |

From d013c8940d26b33e55e1b2215dab8d3ba5263eab Mon Sep 17 00:00:00 2001
From: Owen Mansel-Chan <62447351+owen-mc@users.noreply.github.com>
Date: Thu, 10 Oct 2024 21:37:44 +0100
Subject: [PATCH 306/347] Revert "Go: extractor/objecttypes consistency
 generics"

---
 go/extractor/extractor.go | 26 ++++----------------------
 1 file changed, 4 insertions(+), 22 deletions(-)

diff --git a/go/extractor/extractor.go b/go/extractor/extractor.go
index 936e0b6fdec8..c157f7c8f672 100644
--- a/go/extractor/extractor.go
+++ b/go/extractor/extractor.go
@@ -518,7 +518,6 @@ func extractMethod(tw *trap.Writer, meth *types.Func) trap.Label {
 // For more information on objects, see:
 // https://github.com/golang/example/blob/master/gotypes/README.md#objects
 func extractObject(tw *trap.Writer, obj types.Object, lbl trap.Label) {
-	checkObjectNotSpecialized(obj)
 	name := obj.Name()
 	isBuiltin := obj.Parent() == types.Universe
 	var kind int
@@ -1638,7 +1637,7 @@ func extractType(tw *trap.Writer, tp types.Type) trap.Label {
 				// Note that methods coming from embedded interfaces can be
 				// accessed through `Method(i)`, so there is no need to
 				// deal with them separately.
-				meth := tp.Method(i).Origin()
+				meth := tp.Method(i)
 
 				// Note that methods do not have a parent scope, so they are
 				// not dealt with by `extractScopes`
@@ -1708,7 +1707,7 @@ func extractType(tw *trap.Writer, tp types.Type) trap.Label {
 			// ensure all methods have labels - note that methods do not have a
 			// parent scope, so they are not dealt with by `extractScopes`
 			for i := 0; i < origintp.NumMethods(); i++ {
-				meth := origintp.Method(i).Origin()
+				meth := origintp.Method(i)
 
 				extractMethod(tw, meth)
 			}
@@ -1716,7 +1715,7 @@ func extractType(tw *trap.Writer, tp types.Type) trap.Label {
 			// associate all methods of underlying interface with this type
 			if underlyingInterface, ok := underlying.(*types.Interface); ok {
 				for i := 0; i < underlyingInterface.NumMethods(); i++ {
-					methlbl := extractMethod(tw, underlyingInterface.Method(i).Origin())
+					methlbl := extractMethod(tw, underlyingInterface.Method(i))
 					dbscheme.MethodHostsTable.Emit(tw, methlbl, lbl)
 				}
 			}
@@ -1788,7 +1787,7 @@ func getTypeLabel(tw *trap.Writer, tp types.Type) (trap.Label, bool) {
 		case *types.Interface:
 			var b strings.Builder
 			for i := 0; i < tp.NumMethods(); i++ {
-				meth := tp.Method(i).Origin()
+				meth := tp.Method(i)
 				methLbl := extractType(tw, meth.Type())
 				if i > 0 {
 					b.WriteString(",")
@@ -2144,20 +2143,3 @@ func skipExtractingValueForLeftOperand(tw *trap.Writer, be *ast.BinaryExpr) bool
 	}
 	return true
 }
-
-// checkObjectNotSpecialized exits the program if `obj` is specialized. Note
-// that specialization is only possible for function objects and variable
-// objects.
-func checkObjectNotSpecialized(obj types.Object) {
-	if funcObj, ok := obj.(*types.Func); ok && funcObj != funcObj.Origin() {
-		log.Fatalf("Encountered unexpected specialization %s of generic function object %s", funcObj.FullName(), funcObj.Origin().FullName())
-	}
-	if varObj, ok := obj.(*types.Var); ok && varObj != varObj.Origin() {
-		log.Fatalf("Encountered unexpected specialization %s of generic variable object %s", varObj.String(), varObj.Origin().String())
-	}
-	if typeNameObj, ok := obj.(*types.TypeName); ok {
-		if namedType, ok := typeNameObj.Type().(*types.Named); ok && namedType != namedType.Origin() {
-			log.Fatalf("Encountered type object for specialization %s of named type %s", namedType.String(), namedType.Origin().String())
-		}
-	}
-}

From c66bd72620e58439241c00f01c3961d8ed9154a7 Mon Sep 17 00:00:00 2001
From: Paolo Tranquilli <redsun82@gihub.com>
Date: Fri, 11 Oct 2024 09:52:30 +0200
Subject: [PATCH 307/347] Rust: rename to `CallExprBase`

---
 rust/extractor/src/generated/.generated.list  |   2 +-
 rust/extractor/src/generated/top.rs           | 122 +++++++++---------
 rust/ql/.generated.list                       |  22 ++--
 rust/ql/.gitattributes                        |   6 +-
 rust/ql/lib/codeql/rust/elements.qll          |   2 +-
 rust/ql/lib/codeql/rust/elements/CallExpr.qll |   2 +-
 ...nOrMethodCallExpr.qll => CallExprBase.qll} |   6 +-
 .../codeql/rust/elements/MethodCallExpr.qll   |   2 +-
 ...dCallExprImpl.qll => CallExprBaseImpl.qll} |   8 +-
 .../elements/internal/generated/CallExpr.qll  |   4 +-
 ...nOrMethodCallExpr.qll => CallExprBase.qll} |  26 ++--
 .../internal/generated/MethodCallExpr.qll     |   6 +-
 .../internal/generated/ParentChild.qll        |  68 +++++-----
 .../rust/elements/internal/generated/Raw.qll  |  36 +++---
 .../elements/internal/generated/Synth.qll     |  68 +++++-----
 rust/ql/lib/rust.dbscheme                     |  38 +++---
 rust/schema/annotations.py                    |   6 +-
 17 files changed, 209 insertions(+), 215 deletions(-)
 rename rust/ql/lib/codeql/rust/elements/{FunctionOrMethodCallExpr.qll => CallExprBase.qll} (56%)
 rename rust/ql/lib/codeql/rust/elements/internal/{FunctionOrMethodCallExprImpl.qll => CallExprBaseImpl.qll} (62%)
 rename rust/ql/lib/codeql/rust/elements/internal/generated/{FunctionOrMethodCallExpr.qll => CallExprBase.qll} (51%)

diff --git a/rust/extractor/src/generated/.generated.list b/rust/extractor/src/generated/.generated.list
index 886def53f2da..e354f7a6efdd 100644
--- a/rust/extractor/src/generated/.generated.list
+++ b/rust/extractor/src/generated/.generated.list
@@ -1,2 +1,2 @@
 mod.rs 4bcb9def847469aae9d8649461546b7c21ec97cf6e63d3cf394e339915ce65d7 4bcb9def847469aae9d8649461546b7c21ec97cf6e63d3cf394e339915ce65d7
-top.rs 7269710572ed5f727107f19cf4002ec19b8a4149842b351c6c61dbeb1ec35e5c 7269710572ed5f727107f19cf4002ec19b8a4149842b351c6c61dbeb1ec35e5c
+top.rs 6cb5c672cc7e8f2f3870c7d8b36714bfb42148fd94a097458d0011e135ea899a 6cb5c672cc7e8f2f3870c7d8b36714bfb42148fd94a097458d0011e135ea899a
diff --git a/rust/extractor/src/generated/top.rs b/rust/extractor/src/generated/top.rs
index fad605cab2e0..50db26e14a30 100644
--- a/rust/extractor/src/generated/top.rs
+++ b/rust/extractor/src/generated/top.rs
@@ -3614,6 +3614,51 @@ impl From<trap::Label<BreakExpr>> for trap::Label<Locatable> {
     }
 }
 
+#[derive(Debug)]
+pub struct CallExprBase {
+    _unused: ()
+}
+
+impl trap::TrapClass for CallExprBase {
+    fn class_name() -> &'static str { "CallExprBase" }
+}
+
+impl From<trap::Label<CallExprBase>> for trap::Label<AstNode> {
+    fn from(value: trap::Label<CallExprBase>) -> Self {
+        // SAFETY: this is safe because in the dbscheme CallExprBase is a subclass of AstNode
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<CallExprBase>> for trap::Label<Element> {
+    fn from(value: trap::Label<CallExprBase>) -> Self {
+        // SAFETY: this is safe because in the dbscheme CallExprBase is a subclass of Element
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<CallExprBase>> for trap::Label<Expr> {
+    fn from(value: trap::Label<CallExprBase>) -> Self {
+        // SAFETY: this is safe because in the dbscheme CallExprBase is a subclass of Expr
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<CallExprBase>> for trap::Label<Locatable> {
+    fn from(value: trap::Label<CallExprBase>) -> Self {
+        // SAFETY: this is safe because in the dbscheme CallExprBase is a subclass of Locatable
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
 #[derive(Debug)]
 pub struct CastExpr {
     pub id: trap::TrapId<CastExpr>,
@@ -4522,51 +4567,6 @@ impl From<trap::Label<FormatArgsExpr>> for trap::Label<Locatable> {
     }
 }
 
-#[derive(Debug)]
-pub struct FunctionOrMethodCallExpr {
-    _unused: ()
-}
-
-impl trap::TrapClass for FunctionOrMethodCallExpr {
-    fn class_name() -> &'static str { "FunctionOrMethodCallExpr" }
-}
-
-impl From<trap::Label<FunctionOrMethodCallExpr>> for trap::Label<AstNode> {
-    fn from(value: trap::Label<FunctionOrMethodCallExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme FunctionOrMethodCallExpr is a subclass of AstNode
-        unsafe {
-            Self::from_untyped(value.as_untyped())
-        }
-    }
-}
-
-impl From<trap::Label<FunctionOrMethodCallExpr>> for trap::Label<Element> {
-    fn from(value: trap::Label<FunctionOrMethodCallExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme FunctionOrMethodCallExpr is a subclass of Element
-        unsafe {
-            Self::from_untyped(value.as_untyped())
-        }
-    }
-}
-
-impl From<trap::Label<FunctionOrMethodCallExpr>> for trap::Label<Expr> {
-    fn from(value: trap::Label<FunctionOrMethodCallExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme FunctionOrMethodCallExpr is a subclass of Expr
-        unsafe {
-            Self::from_untyped(value.as_untyped())
-        }
-    }
-}
-
-impl From<trap::Label<FunctionOrMethodCallExpr>> for trap::Label<Locatable> {
-    fn from(value: trap::Label<FunctionOrMethodCallExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme FunctionOrMethodCallExpr is a subclass of Locatable
-        unsafe {
-            Self::from_untyped(value.as_untyped())
-        }
-    }
-}
-
 #[derive(Debug)]
 pub struct IdentPat {
     pub id: trap::TrapId<IdentPat>,
@@ -7872,10 +7872,10 @@ impl trap::TrapEntry for CallExpr {
     fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
         out.add_tuple("call_exprs", vec![id.into()]);
         if let Some(v) = self.arg_list {
-            out.add_tuple("function_or_method_call_expr_arg_lists", vec![id.into(), v.into()]);
+            out.add_tuple("call_expr_base_arg_lists", vec![id.into(), v.into()]);
         }
         for (i, v) in self.attrs.into_iter().enumerate() {
-            out.add_tuple("function_or_method_call_expr_attrs", vec![id.into(), i.into(), v.into()]);
+            out.add_tuple("call_expr_base_attrs", vec![id.into(), i.into(), v.into()]);
         }
         if let Some(v) = self.expr {
             out.add_tuple("call_expr_exprs", vec![id.into(), v.into()]);
@@ -7896,27 +7896,27 @@ impl From<trap::Label<CallExpr>> for trap::Label<AstNode> {
     }
 }
 
-impl From<trap::Label<CallExpr>> for trap::Label<Element> {
+impl From<trap::Label<CallExpr>> for trap::Label<CallExprBase> {
     fn from(value: trap::Label<CallExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme CallExpr is a subclass of Element
+        // SAFETY: this is safe because in the dbscheme CallExpr is a subclass of CallExprBase
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<CallExpr>> for trap::Label<Expr> {
+impl From<trap::Label<CallExpr>> for trap::Label<Element> {
     fn from(value: trap::Label<CallExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme CallExpr is a subclass of Expr
+        // SAFETY: this is safe because in the dbscheme CallExpr is a subclass of Element
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<CallExpr>> for trap::Label<FunctionOrMethodCallExpr> {
+impl From<trap::Label<CallExpr>> for trap::Label<Expr> {
     fn from(value: trap::Label<CallExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme CallExpr is a subclass of FunctionOrMethodCallExpr
+        // SAFETY: this is safe because in the dbscheme CallExpr is a subclass of Expr
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
@@ -8755,10 +8755,10 @@ impl trap::TrapEntry for MethodCallExpr {
     fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
         out.add_tuple("method_call_exprs", vec![id.into()]);
         if let Some(v) = self.arg_list {
-            out.add_tuple("function_or_method_call_expr_arg_lists", vec![id.into(), v.into()]);
+            out.add_tuple("call_expr_base_arg_lists", vec![id.into(), v.into()]);
         }
         for (i, v) in self.attrs.into_iter().enumerate() {
-            out.add_tuple("function_or_method_call_expr_attrs", vec![id.into(), i.into(), v.into()]);
+            out.add_tuple("call_expr_base_attrs", vec![id.into(), i.into(), v.into()]);
         }
         if let Some(v) = self.generic_arg_list {
             out.add_tuple("method_call_expr_generic_arg_lists", vec![id.into(), v.into()]);
@@ -8785,27 +8785,27 @@ impl From<trap::Label<MethodCallExpr>> for trap::Label<AstNode> {
     }
 }
 
-impl From<trap::Label<MethodCallExpr>> for trap::Label<Element> {
+impl From<trap::Label<MethodCallExpr>> for trap::Label<CallExprBase> {
     fn from(value: trap::Label<MethodCallExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme MethodCallExpr is a subclass of Element
+        // SAFETY: this is safe because in the dbscheme MethodCallExpr is a subclass of CallExprBase
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<MethodCallExpr>> for trap::Label<Expr> {
+impl From<trap::Label<MethodCallExpr>> for trap::Label<Element> {
     fn from(value: trap::Label<MethodCallExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme MethodCallExpr is a subclass of Expr
+        // SAFETY: this is safe because in the dbscheme MethodCallExpr is a subclass of Element
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<MethodCallExpr>> for trap::Label<FunctionOrMethodCallExpr> {
+impl From<trap::Label<MethodCallExpr>> for trap::Label<Expr> {
     fn from(value: trap::Label<MethodCallExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme MethodCallExpr is a subclass of FunctionOrMethodCallExpr
+        // SAFETY: this is safe because in the dbscheme MethodCallExpr is a subclass of Expr
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
diff --git a/rust/ql/.generated.list b/rust/ql/.generated.list
index 59d71c496637..9cc24f2efe6f 100644
--- a/rust/ql/.generated.list
+++ b/rust/ql/.generated.list
@@ -14,7 +14,8 @@ lib/codeql/rust/elements/BinaryExpr.qll 394522da3bc3a716fc7bc40c3560143ca840f5d2
 lib/codeql/rust/elements/BlockExpr.qll b952fd44b89de248931d4089834d2c9406f6f2fc1a3f5c2365156be4e55157cf daccc07ab11ac696679b9fadc99f40b1bf579c90bf6c7cca6e82eaa313932ede
 lib/codeql/rust/elements/BoxPat.qll 1b2c3fff171aa6aa238c9460b122f26c79e04577cea67fa856de99842ba873d4 0caf8d23ed6e0997a6b8751def27641582151fba6e24fccf798712a4690b42f1
 lib/codeql/rust/elements/BreakExpr.qll 7ca3807a20e9a9a988d1fd7abebf240325ed422fcb45c719ba46272f031f94db dffb7379d3f3ba220acfbd05eb7bb6cfd9cfda211e9c8b1f5240ca5fa61be3fc
-lib/codeql/rust/elements/CallExpr.qll 4232f42c54212fe9e8aa140194da324b77581395a4d5c899190d469609598668 a589e19792174b18ce39b74e19828bfe5c7ff796424c05f6a6084eab4ff16ab4
+lib/codeql/rust/elements/CallExpr.qll f336500ca7a611b164d48b90e80edb0c0d3816792b0ececce659ac1ff1ffeb3e f99a9c55466418ef53860c44d9f2d6161af4b492178ddd9e5870dff742b70ae5
+lib/codeql/rust/elements/CallExprBase.qll 2846202b5208b541977500286951d96487bf555838c6c16cdd006a71e383745a c789d412bf099c624329379e0c7d94fa0d23ae2edea7a25a2ea0f3c0042ccf62
 lib/codeql/rust/elements/CastExpr.qll ba281bde130f43c486c4ad889539b77fba9e41afdf7980e50b6a8696a1ec7527 61257003d395896ec60729d0bc01da36697615bb725d07141255fbb5c44e50a0
 lib/codeql/rust/elements/ClosureBinder.qll 977df800f97cc9b03fffb5e5e1fc6acd08a2938e04cb6ad91108784a15b0d510 f6fad4127226fe1dff2f16416d8a7fde5d8ab4a88f30e443ac5e5ff618de3e05
 lib/codeql/rust/elements/ClosureExpr.qll 8f06357ae134e42c073eef994c83c04b8cf294fe33b286dbd75c0e705ce29d05 9d9e282d965fed723965376801d4afa49444d1d9be9b093d02e276729a2cf7ad
@@ -41,7 +42,6 @@ lib/codeql/rust/elements/ForType.qll 0036bed8749358c356d78c4a0eef40d73e279628429
 lib/codeql/rust/elements/FormatArgsArg.qll 5bc9b4cd1bac7131165836e93838c45452a08ea6011741cbddace3cbf9c69440 f825140e98dc9800d5c045402186793c7b21511448e2f6bf6402d1e06305219c
 lib/codeql/rust/elements/FormatArgsExpr.qll f2ffad5a1105b29a8437c8ed6cf918cfcf4d65ac164bbf1be0585c3b673ca749 3ba20dc312a0a994bb43b37b2db72cbd4e06061b97918fa0e84ce355070ffbeb
 lib/codeql/rust/elements/Function.qll 736c53408f8674c88c352cd1f08f7c77e51551c68ef802f2e1c1aaf3d44fa8e9 6b52dbea081a5e799f1a2cedd57be5485bc8e018ded7249a1852343053d849a6
-lib/codeql/rust/elements/FunctionOrMethodCallExpr.qll 69754853bd452c18a333e2bb70a401726cc115092a120662edac5b24586f1951 1d9226ea609d298ec76eaf6a25248c96315b14a5993ac7c8dfd7fd80e1c134fb
 lib/codeql/rust/elements/GenericArg.qll 5f11ce0e3c5f08de84db61f56ba1b984652455ba6b95a8b8a5b5a235913d4072 756b6a73d66fde45bdcc65ce2362a5b1391af2927e6d54b6550b3ecd5fd11e75
 lib/codeql/rust/elements/GenericArgList.qll dcf274db517b0e8f19e4545d77f86cdd4066ff2805e68c808d0bb5750b49f569 1055a82929e850264e501b367ef4d314a3e6bb8943ec95f4284d157fb4d0092f
 lib/codeql/rust/elements/GenericParam.qll b58448b808d6dfa05db9574f54c22ce51f0b1d78784263c75a95d6bfc787067d 4afbab71fe717d7d7d3e2f60ea8c3d97bcb29b17b4efb79eabfe8f070edcb9bb
@@ -76,7 +76,7 @@ lib/codeql/rust/elements/MatchArmList.qll e6c48fd7419d88e996b82eb45e4aa2686dfd07
 lib/codeql/rust/elements/MatchExpr.qll e9ef1664f020823b6f4bb72d906a9dc0c1ee6432d4a9a13f7dbdbab2b2b1ee4d 38d71e5c487abcb5682293c573343be66e499a6e131bb630604c120d34b7777b
 lib/codeql/rust/elements/MatchGuard.qll 20754ab2009a7d40b50feece496ff7f38650586d79190ed2a372308594693694 471f8f118317efcf112f4ddfd60125ca2a9d9b3b08e6ee331c430961de7885ff
 lib/codeql/rust/elements/Meta.qll 9fa3216c86fa55ed5c0c4671708110a6ffc7c0f5d6cda8dda31aaff17f87534d c44ee2754dd71776ffd0a8a7d6c1ae8737c47e998e6bdb8efab5283625807cf4
-lib/codeql/rust/elements/MethodCallExpr.qll d19c02fdd2f6f649dfbf757c53f4af441f10842ca69f56b13d218e343961688b eafb571244dcbec1bb8106f8ec03c641ca383b51b615506bf0d7bc90a1aa1934
+lib/codeql/rust/elements/MethodCallExpr.qll 91b411e0fb1a0547dcad8726db460dccc61bed972741598d5cb3740593fe75a7 538d23b6db115bb699389d29a1829bb0449c08424a1fff80377828eb7ceb2563
 lib/codeql/rust/elements/Missing.qll 70e6ac9790314752849c9888443c98223ccfc93a193998b7ce350b2c6ebe8ea4 e2f0623511acaa76b091f748d417714137a8b94f1f2bdbbd177f1c682c786dad
 lib/codeql/rust/elements/Module.qll 0bc85019177709256f8078d9de2a36f62f848d476225bff7bba1e35f249875c7 3fbb70e0c417a644dd0cada2c364c6e6876cfa16f37960e219c87e49c966c94e
 lib/codeql/rust/elements/Name.qll 3d7ed16c232912e30e5a075f5087ad344a8f76dcc27bc8f71a80c133802b89d7 036dc3ba0c20eb0907ef6dcc532214aa5de8e0de0fa819eca1fce0355b3741a3
@@ -184,6 +184,7 @@ lib/codeql/rust/elements/internal/BlockExprImpl.qll 36ac09e4a6eeeec22919b62b1d00
 lib/codeql/rust/elements/internal/BoxPatConstructor.qll 153f110ba25fd6c889092bfd16f73bb610fa60d6e0c8965d5f44d2446fcd48a2 9324cf0d8aa29945551bf8ab64801d598f57aab8cd4e19bcd4e9ef8a4a4e06eb
 lib/codeql/rust/elements/internal/BoxPatImpl.qll d62a3cc1d5bab6bd258f702ec731ec57f0e5ef2672ab9de4b6f3b558078629eb 26b4fabb676adbbdb0d7f81449e493ee49380ea04d131f779714ac2434bb323a
 lib/codeql/rust/elements/internal/BreakExprConstructor.qll 356be043c28e0b34fdf925a119c945632ee883c6f5ebb9a27003c6a8d250afd9 bb77e66b04bb9489340e7506931559b94285c6904b6f9d2f83b214cba4f3cfd5
+lib/codeql/rust/elements/internal/CallExprBaseImpl.qll d2749cc1a9d7ee8bf7f34b6c3e0238a576a68e439a8c10a503c164ff45ffcbeb ffc7b0a8841945fe6736b0e1aed7d9ed69185db03dee2b16da121325b39397c7
 lib/codeql/rust/elements/internal/CallExprConstructor.qll 742b38e862e2cf82fd1ecc4d4fc5b4782a9c7c07f031452b2bae7aa59d5aa13a cad6e0a8be21d91b20ac2ec16cab9c30eae810b452c0f1992ed87d5c7f4144dc
 lib/codeql/rust/elements/internal/CallExprImpl.qll 7e48610680ba6f2876a1a005ab0743496dd2364b9c44aca441bd33e11317e2d7 bb12c3c28156b40796fe3ba112760f87bb5abb323aab3c5b7bb3e0facaef8d35
 lib/codeql/rust/elements/internal/CastExprConstructor.qll f3d6e10c4731f38a384675aeab3fba47d17b9e15648293787092bb3247ed808d d738a7751dbadb70aa1dcffcf8af7fa61d4cf8029798369a7e8620013afff4ed
@@ -230,7 +231,6 @@ lib/codeql/rust/elements/internal/FormatArgsArgImpl.qll 601f7715e9a65bcfa7cea197
 lib/codeql/rust/elements/internal/FormatArgsExprConstructor.qll ce29ff5a839b885b1ab7a02d6a381ae474ab1be3e6ee7dcfd7595bdf28e4b558 63bf957426871905a51ea319662a59e38104c197a1024360aca364dc145b11e8
 lib/codeql/rust/elements/internal/FormatArgsExprImpl.qll bdb992ebc6be59311b486f40325b39f52a69921cfc66a731085cb184da00050f 6336e7770f9cb700f1b3914fd940c3423ab4e971b34ed8fcc79da80c1f1cdba3
 lib/codeql/rust/elements/internal/FunctionConstructor.qll b50aea579938d03745dfbd8b5fa8498f7f83b967369f63d6875510e09ab7f5d2 19cca32aeaecaf9debc27329e8c39ecec69464bb1d89d7b09908a1d73a8d92a2
-lib/codeql/rust/elements/internal/FunctionOrMethodCallExprImpl.qll 34e7b5c95c8f0fdbd9c52159494e21046acbd0d62e1fb9b2eee53a11f15be261 105783845539bc44f05473efe8bedbc033fb5fb107c2daa77af664bfccb20bf6
 lib/codeql/rust/elements/internal/GenericArgImpl.qll 6b1b804c357425c223f926e560a688e81506f5a35b95485cecf704e88cc009ee cc1ccf6a23dadc397e82664f3911d4b385d4c8ca80b1ee16d5275d9c936148dd
 lib/codeql/rust/elements/internal/GenericArgListConstructor.qll 46859bb3eb09d77987a18642d65ba2e13471a4dc9c0a83a192fddc82e37c335c 2c7d54c876269a88d3461b05745e73b06532b1616cae9b614ac94b28735d8fc4
 lib/codeql/rust/elements/internal/GenericArgListImpl.qll 1a39ba7080147abccaaba451852c9c124fb6177f2ebd64e38ee74014444a34e1 80df3150c961936037ac02b46ef5f775c3f82e66490afbca00a016cb9eee798a
@@ -461,7 +461,8 @@ lib/codeql/rust/elements/internal/generated/BinaryExpr.qll 64e9bd9c571edd6e5f3e7
 lib/codeql/rust/elements/internal/generated/BlockExpr.qll 6fc90a80e60f017bf3418e45bcc35b5ddac59b51037c21aed3955d47c147ce4a 1f3f8e5107b0c6de381b7c94aab93dc5fd758a845c6ff9554888df453f1315d0
 lib/codeql/rust/elements/internal/generated/BoxPat.qll ec946a3e671ab7417e04b0207967adad004df512c570c4f0780ca5816d12d75f b0e64860855c4e85914042b1a51034899ff7cd1b2c6857188de89310a2726ea3
 lib/codeql/rust/elements/internal/generated/BreakExpr.qll 0f428a8b2f4209b134c2ffc3e1c93c30bc6b0e9c9172f140cefa88c1f77d8690 957b39f38ff6befe9061f55bc0b403c2f1c366dd0cf63b874bae6f8216576d76
-lib/codeql/rust/elements/internal/generated/CallExpr.qll 2ed74ea3da426b351949291ae728eb6d70de033cccc667712988cf416319e999 af84a17bf5512dc97d8781cb0aa868c7f5349932596f2600785d2432e15ece3a
+lib/codeql/rust/elements/internal/generated/CallExpr.qll 23ee64e3bf643cd5e6ff705181d2bb31e1aeaffecb5bdce73836172dbf15f12f 34b280139b1f8f70d78e1432392f03c971be392e8cb68d014eb325d0c101bddd
+lib/codeql/rust/elements/internal/generated/CallExprBase.qll cce796e36847249f416629bacf3ea146313084de3374587412e66c10d2917b83 c219aa2174321c161a4a742ca0605521687ca9a5ca32db453a5c62db6f7784cc
 lib/codeql/rust/elements/internal/generated/CastExpr.qll d6fbf02e9e202254666082a9116634d0eb933177866ac4c0a57b5e9c4bb4b383 477f67773492e3b82695461d56327c9db05a7d1a67e8d192406265f2ce369670
 lib/codeql/rust/elements/internal/generated/ClosureBinder.qll 94c0dcdd4cd87d115659d496c88a98354bc7d4ddc0fa27028003bf7688b99987 d59d713b426dbbdb775df9092d176eea031dac1f14e468810f2fc8591399cd19
 lib/codeql/rust/elements/internal/generated/ClosureExpr.qll f9047451cb8b53f8b77e1c01f7ef485d5b5a92999e0591c6702062050052fa2f 2252be8b3022c587a8c6ad93b64d856263be7bfe2938c1d063e7cad845dd38e2
@@ -488,7 +489,6 @@ lib/codeql/rust/elements/internal/generated/ForType.qll 3d43d044a1189281f09c55ca
 lib/codeql/rust/elements/internal/generated/FormatArgsArg.qll e07a1ae310f590003f1b88fada7dcf4847c99adb9d4c838d1c88e66e1da85c5f 0ef7342451fe2cb06e765fb4b33bb8c4a9b927f5edbc8feb5c6ba3655697f447
 lib/codeql/rust/elements/internal/generated/FormatArgsExpr.qll 40d6daa7d2bafb33798a21d79774dc802cfbd7a31618ac3bd0149399ea2bf893 d1172e2151791228559004792e125fc4625f6a26ffad25f29efb0ad263bf8795
 lib/codeql/rust/elements/internal/generated/Function.qll b239af1a8874802b8a311706c53d56e3ceaad7ed23a7f97d1694bf961b63768b 4bc3c23685fa05820222e472ab1cdb40a271f862727d3bd878d47de9c2e3f485
-lib/codeql/rust/elements/internal/generated/FunctionOrMethodCallExpr.qll 5c6e3b4e4d3a91d0bb934dd2402898767ef6156b7b419222dfbc144167780231 67c82e154ff4c68f601fd92ba8aad7a8dd5b688dc89189744e1515bb647e9669
 lib/codeql/rust/elements/internal/generated/GenericArg.qll 464da0ba1c5ddcd1be68617167f177773d99b5ac4775ec8ea24d503e789a9099 6faa1033d59baf7c210ac4837a55781cfc054b7acbad8027faf4630dbfa6e101
 lib/codeql/rust/elements/internal/generated/GenericArgList.qll b8cd936bba6f28344e28c98acf38acb8ef43af6ecf8367d79ed487e5b9da17cb 8b14331261e49d004807285b02fca190aafd62bfb9378b05c7d9c1e95525fe7b
 lib/codeql/rust/elements/internal/generated/GenericParam.qll a0285123f974f287154b706bf6688b86edf72a4adcec57346c654d962435651b b42c3915e9564b5b5c5282229bf882aa3309de26a77721b2255d6f4235c0cc38
@@ -523,7 +523,7 @@ lib/codeql/rust/elements/internal/generated/MatchArmList.qll 13362680c037fe83fef
 lib/codeql/rust/elements/internal/generated/MatchExpr.qll 689d65f690fe05bc262d0a5bfe69bb4f8a142db387c5765fcc4958a9b49989f8 2979cd2017d0538870d17b2b7592c75cc05b706bd36c9de3e5dc38fa3a957e5b
 lib/codeql/rust/elements/internal/generated/MatchGuard.qll 521a507883963106780f1782084c581fbcf1179863c7c15438c4db79e30e78dd 6226feffaaa8d828a42ece0c693e616cd375672eb987c3b7ff1ca15fa23c116a
 lib/codeql/rust/elements/internal/generated/Meta.qll f1ce7cdaf2a6fa3b86f0465e33a9521d254c032468427b276d93276ffd5142be 046d72c868ee2664b8a291de16320238ece9d0612c93c96a0d601e0b6079bf90
-lib/codeql/rust/elements/internal/generated/MethodCallExpr.qll 89f5d6248ea338f0b3add9de4166df411bce2f8589b164d0a69db4650e4bcd71 3e13ddfa857e0a3655e7030b3d4ab411b09d6f0ea960b098f54ffcc1d8394d91
+lib/codeql/rust/elements/internal/generated/MethodCallExpr.qll 0966b268c9d71a8007044d608935e0c07d2144eaafef4812ef259d68b00a06f4 b3a5ab7ec79a6cfa55f671288b8c7c946883fd2edc0b3fac68221ab742cf8604
 lib/codeql/rust/elements/internal/generated/Missing.qll 16735d91df04a4e1ae52fae25db5f59a044e540755734bbab46b5fbb0fe6b0bd 28ca4e49fb7e6b4734be2f2f69e7c224c570344cc160ef80c5a5cd413e750dad
 lib/codeql/rust/elements/internal/generated/Module.qll ebae5d8963c9fd569c0fbad1d7770abd3fd2479437f236cbce0505ba9f9af52c fa3c382115fed18a26f1a755d8749a201b9489f82c09448a88fb8e9e1435fe5f
 lib/codeql/rust/elements/internal/generated/Name.qll 12aad57744b7d1b04454159536409244c47319aedd580acb58ee93ef9d7f837d 63fc67ccc085db22f82576a53489f15216a7c29d5b941b14a965eab481534e2e
@@ -536,7 +536,7 @@ lib/codeql/rust/elements/internal/generated/ParamList.qll c808c9d84dd7800573832b
 lib/codeql/rust/elements/internal/generated/ParenExpr.qll bc0731505bfe88516205ec360582a4222d2681d11342c93e15258590ddee82f2 d4bd6e0c80cf1d63746c88d4bcb3a01d4c75732e5da09e3ebd9437ced227fb60
 lib/codeql/rust/elements/internal/generated/ParenPat.qll ce24b8f8ecbf0f204af200317405724063887257460c80cf250c39b2fdf37185 e7c87d37e1a0ca7ea03840017e1aa9ddb7f927f1f3b6396c0305b46aeee33db6
 lib/codeql/rust/elements/internal/generated/ParenType.qll 9cc954d73f8330dcac7b475f97748b63af5c8766dee9d2f2872c0a7e4c903537 c07534c8a9c683c4a9b11d490095647e420de0a0bfc23273eaf6f31b00244273
-lib/codeql/rust/elements/internal/generated/ParentChild.qll 36a5d76d16a00cb18ee2e3193708b795e502ca9a92e72b8047e215961da3c5c8 dae8c9eda242e6d4c153f070ea4eefe1cbaae44aa148c5a79a852c9f1c8f7b2d
+lib/codeql/rust/elements/internal/generated/ParentChild.qll 37dde0401161d1a4a668d89418b8f1d5afeaceecf7af54d4302ab30907a8a83e 8000db77bab203447063283adb8d0835731c802bc17ef4ffb39cbdb855cef993
 lib/codeql/rust/elements/internal/generated/Pat.qll 3605ac062be2f294ee73336e9669027b8b655f4ad55660e1eab35266275154ee 7f9400db2884d336dd1d21df2a8093759c2a110be9bf6482ce8e80ae0fd74ed4
 lib/codeql/rust/elements/internal/generated/Path.qll 299abce24762a5ab023f3cf1ab9718b83047e171aed42a8092e7a155914b1657 db1a23d18640c548f08c9f94823838b5e019ac85877c7b15df2d1493d1846572
 lib/codeql/rust/elements/internal/generated/PathExpr.qll 17cdb0a7393258a207450f08e37178fc9d35d167f064ba6015be94246f3dc933 a75fdd280aff6d87e083a92030e041c2eb52b57cf7151d4a6989fcd31d6a64bf
@@ -548,7 +548,7 @@ lib/codeql/rust/elements/internal/generated/PtrType.qll 5f12b6ad29b4e5ce51c205e2
 lib/codeql/rust/elements/internal/generated/PureSynthConstructors.qll dc03515d678ba052c2ff2dd9f0883e0bce54cac740ba9a15e5173f292c1b6971 dc03515d678ba052c2ff2dd9f0883e0bce54cac740ba9a15e5173f292c1b6971
 lib/codeql/rust/elements/internal/generated/RangeExpr.qll 23cca03bf43535f33b22a38894f70d669787be4e4f5b8fe5c8f7b964d30e9027 18624cef6c6b679eeace2a98737e472432e0ead354cca02192b4d45330f047c9
 lib/codeql/rust/elements/internal/generated/RangePat.qll efd93730de217cf50dcba5875595263a5eadf9f7e4e1272401342a094d158614 229b251b3d118932e31e78ac4dfb75f48b766f240f20d436062785606d44467b
-lib/codeql/rust/elements/internal/generated/Raw.qll 468493674e9f891b6b289d07dd3f6d4369ab04411b8d20a81673f56dfe3abeb4 5876c9a5cc5ede7503b9f524184585abf8fba21fa94887033d2488205d3b4f94
+lib/codeql/rust/elements/internal/generated/Raw.qll ca7eab2abc07ed3b241694a1ab9bafb920b892b0b4e873e0d522c1b11e68195b 8a29d6f4a4a580c9d4bd43023e0e14fc0e539b82745e36918de44a689ca4477a
 lib/codeql/rust/elements/internal/generated/RecordExpr.qll eb6cb662e463f9260efae1a6ce874fa781172063b916ef1963f861e9942d308d 1a21cbccc8f3799ff13281e822818ebfb21d81591720a427cac3625512cb9d40
 lib/codeql/rust/elements/internal/generated/RecordExprField.qll 7e9f8663d3b74ebbc9603b10c9912f082febba6bd73d344b100bbd3edf837802 fbe6b578e7fd5d5a6f21bbb8c388957ab7210a6a249ec71510a50fb35b319ea1
 lib/codeql/rust/elements/internal/generated/RecordExprFieldList.qll 179a97211fe7aa6265085d4d54115cdbc0e1cd7c9b2135591e8f36d6432f13d3 dd44bbbc1e83a1ed3a587afb729d7debf7aeb7b63245de181726af13090e50c0
@@ -573,7 +573,7 @@ lib/codeql/rust/elements/internal/generated/Static.qll cae5313e08e4af44c46b25802
 lib/codeql/rust/elements/internal/generated/Stmt.qll 8473ff532dd5cc9d7decaddcd174b94d610f6ca0aec8e473cc051dad9f3db917 6ef7d2b5237c2dbdcacbf7d8b39109d4dc100229f2b28b5c9e3e4fbf673ba72b
 lib/codeql/rust/elements/internal/generated/StmtList.qll a667193e32341e17400867c6e359878c4e645ef9f5f4d97676afc0283a33a026 a320ed678ee359302e2fc1b70a9476705cd616fcfa44a499d32f0c7715627f73
 lib/codeql/rust/elements/internal/generated/Struct.qll 4d57f0db12dc7ad3e31e750a24172ef1505406b4dab16386af0674bd18bf8f4b 1a73c83df926b996f629316f74c61ea775be04532ab61b56af904223354f033e
-lib/codeql/rust/elements/internal/generated/Synth.qll 908954d21685d16362d15c4170de397fd0af45bcd2038245b863196c96f0caeb 2a696c02a9c57411312ecbad592abd3718d4e73fbd070a2c5b03273358ed3c9d
+lib/codeql/rust/elements/internal/generated/Synth.qll a87bb2f82978d4baf9234627d2c7769f2395ab6d164b12b72011f96a95096ce4 0342246219252dd29608e07398f4036d99d9b88d9b2e8e9873a93e9bb6d9535c
 lib/codeql/rust/elements/internal/generated/SynthConstructors.qll 518b68ccf6d0791bc0c141486261108bb1723e37743fc7f8e4167a1d61660531 518b68ccf6d0791bc0c141486261108bb1723e37743fc7f8e4167a1d61660531
 lib/codeql/rust/elements/internal/generated/Token.qll 77a91a25ca5669703cf3a4353b591cef4d72caa6b0b9db07bb9e005d69c848d1 2fdffc4882ed3a6ca9ac6d1fb5f1ac5a471ca703e2ffdc642885fa558d6e373b
 lib/codeql/rust/elements/internal/generated/TokenTree.qll 8577c2b097c1be2f0f7daa5acfcf146f78674a424d99563e08a84dd3e6d91b46 d2f30764e84dbfc0a6a5d3d8a5f935cd432413688cb32da9c94e420fbc10665c
@@ -608,7 +608,7 @@ lib/codeql/rust/elements/internal/generated/WhileExpr.qll fec8a9211b82a80601bf73
 lib/codeql/rust/elements/internal/generated/WildcardPat.qll d74b70b57a0a66bfae017a329352a5b27a6b9e73dd5521d627f680e810c6c59e 4b913b548ba27ff3c82fcd32cf996ff329cb57d176d3bebd0fcef394486ea499
 lib/codeql/rust/elements/internal/generated/YeetExpr.qll cac328200872a35337b4bcb15c851afb4743f82c080f9738d295571eb01d7392 94af734eea08129b587fed849b643e7572800e8330c0b57d727d41abda47930b
 lib/codeql/rust/elements/internal/generated/YieldExpr.qll 37e5f0c1e373a22bbc53d8b7f2c0e1f476e5be5080b8437c5e964f4e83fad79a 4a9a68643401637bf48e5c2b2f74a6bf0ddcb4ff76f6bffb61d436b685621e85
-lib/codeql/rust/elements.qll c647c2f20c9d20d49214026ea0e2965d0b751db567baceaf7a9225a8efa2546b c647c2f20c9d20d49214026ea0e2965d0b751db567baceaf7a9225a8efa2546b
+lib/codeql/rust/elements.qll 78908ca1e1988b47323eb47fa58bcceeb984022fa40f89fb0af4f7219d2dd77b 78908ca1e1988b47323eb47fa58bcceeb984022fa40f89fb0af4f7219d2dd77b
 test/extractor-tests/generated/Abi/Abi.ql 7f6e7dc4af86eca3ebdc79b10373988cd0871bd78b51997d3cffd969105e5fdd 2f936b6ca005c6157c755121584410c03e4a3949c23bee302fbe05ee10ce118f
 test/extractor-tests/generated/Abi/Abi_getAbiString.ql a496762fcec5a0887b87023bbf93e9b650f02e20113e25c44d6e4281ae8f5335 14109c7ce11ba25e3cd6e7f1b3fcb4cb00622f2a4eac91bfe43145c5f366bc52
 test/extractor-tests/generated/ArgList/ArgList.ql e412927756e72165d0e7c5c9bd3fca89d08197bbf760db8fb7683c64bb2229bc 043dba8506946fbb87753e22c387987d7eded6ddb963aa067f9e60ef9024d684
diff --git a/rust/ql/.gitattributes b/rust/ql/.gitattributes
index 63630aa20cca..6069457be452 100644
--- a/rust/ql/.gitattributes
+++ b/rust/ql/.gitattributes
@@ -17,6 +17,7 @@
 /lib/codeql/rust/elements/BoxPat.qll linguist-generated
 /lib/codeql/rust/elements/BreakExpr.qll linguist-generated
 /lib/codeql/rust/elements/CallExpr.qll linguist-generated
+/lib/codeql/rust/elements/CallExprBase.qll linguist-generated
 /lib/codeql/rust/elements/CastExpr.qll linguist-generated
 /lib/codeql/rust/elements/ClosureBinder.qll linguist-generated
 /lib/codeql/rust/elements/ClosureExpr.qll linguist-generated
@@ -43,7 +44,6 @@
 /lib/codeql/rust/elements/FormatArgsArg.qll linguist-generated
 /lib/codeql/rust/elements/FormatArgsExpr.qll linguist-generated
 /lib/codeql/rust/elements/Function.qll linguist-generated
-/lib/codeql/rust/elements/FunctionOrMethodCallExpr.qll linguist-generated
 /lib/codeql/rust/elements/GenericArg.qll linguist-generated
 /lib/codeql/rust/elements/GenericArgList.qll linguist-generated
 /lib/codeql/rust/elements/GenericParam.qll linguist-generated
@@ -186,6 +186,7 @@
 /lib/codeql/rust/elements/internal/BoxPatConstructor.qll linguist-generated
 /lib/codeql/rust/elements/internal/BoxPatImpl.qll linguist-generated
 /lib/codeql/rust/elements/internal/BreakExprConstructor.qll linguist-generated
+/lib/codeql/rust/elements/internal/CallExprBaseImpl.qll linguist-generated
 /lib/codeql/rust/elements/internal/CallExprConstructor.qll linguist-generated
 /lib/codeql/rust/elements/internal/CallExprImpl.qll linguist-generated
 /lib/codeql/rust/elements/internal/CastExprConstructor.qll linguist-generated
@@ -232,7 +233,6 @@
 /lib/codeql/rust/elements/internal/FormatArgsExprConstructor.qll linguist-generated
 /lib/codeql/rust/elements/internal/FormatArgsExprImpl.qll linguist-generated
 /lib/codeql/rust/elements/internal/FunctionConstructor.qll linguist-generated
-/lib/codeql/rust/elements/internal/FunctionOrMethodCallExprImpl.qll linguist-generated
 /lib/codeql/rust/elements/internal/GenericArgImpl.qll linguist-generated
 /lib/codeql/rust/elements/internal/GenericArgListConstructor.qll linguist-generated
 /lib/codeql/rust/elements/internal/GenericArgListImpl.qll linguist-generated
@@ -464,6 +464,7 @@
 /lib/codeql/rust/elements/internal/generated/BoxPat.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/BreakExpr.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/CallExpr.qll linguist-generated
+/lib/codeql/rust/elements/internal/generated/CallExprBase.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/CastExpr.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/ClosureBinder.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/ClosureExpr.qll linguist-generated
@@ -490,7 +491,6 @@
 /lib/codeql/rust/elements/internal/generated/FormatArgsArg.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/FormatArgsExpr.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/Function.qll linguist-generated
-/lib/codeql/rust/elements/internal/generated/FunctionOrMethodCallExpr.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/GenericArg.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/GenericArgList.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/GenericParam.qll linguist-generated
diff --git a/rust/ql/lib/codeql/rust/elements.qll b/rust/ql/lib/codeql/rust/elements.qll
index 3795ecbe6c55..77aad9315c19 100644
--- a/rust/ql/lib/codeql/rust/elements.qll
+++ b/rust/ql/lib/codeql/rust/elements.qll
@@ -20,6 +20,7 @@ import codeql.rust.elements.BlockExpr
 import codeql.rust.elements.BoxPat
 import codeql.rust.elements.BreakExpr
 import codeql.rust.elements.CallExpr
+import codeql.rust.elements.CallExprBase
 import codeql.rust.elements.CastExpr
 import codeql.rust.elements.ClosureBinder
 import codeql.rust.elements.ClosureExpr
@@ -46,7 +47,6 @@ import codeql.rust.elements.ForType
 import codeql.rust.elements.FormatArgsArg
 import codeql.rust.elements.FormatArgsExpr
 import codeql.rust.elements.Function
-import codeql.rust.elements.FunctionOrMethodCallExpr
 import codeql.rust.elements.GenericArg
 import codeql.rust.elements.GenericArgList
 import codeql.rust.elements.GenericParam
diff --git a/rust/ql/lib/codeql/rust/elements/CallExpr.qll b/rust/ql/lib/codeql/rust/elements/CallExpr.qll
index bf637cb29a60..ab5631b07ca7 100644
--- a/rust/ql/lib/codeql/rust/elements/CallExpr.qll
+++ b/rust/ql/lib/codeql/rust/elements/CallExpr.qll
@@ -4,8 +4,8 @@
  */
 
 private import internal.CallExprImpl
+import codeql.rust.elements.CallExprBase
 import codeql.rust.elements.Expr
-import codeql.rust.elements.FunctionOrMethodCallExpr
 
 /**
  * A function call expression. For example:
diff --git a/rust/ql/lib/codeql/rust/elements/FunctionOrMethodCallExpr.qll b/rust/ql/lib/codeql/rust/elements/CallExprBase.qll
similarity index 56%
rename from rust/ql/lib/codeql/rust/elements/FunctionOrMethodCallExpr.qll
rename to rust/ql/lib/codeql/rust/elements/CallExprBase.qll
index 3635c33e324d..d59c4c705f7c 100644
--- a/rust/ql/lib/codeql/rust/elements/FunctionOrMethodCallExpr.qll
+++ b/rust/ql/lib/codeql/rust/elements/CallExprBase.qll
@@ -1,9 +1,9 @@
 // generated by codegen, do not edit
 /**
- * This module provides the public class `FunctionOrMethodCallExpr`.
+ * This module provides the public class `CallExprBase`.
  */
 
-private import internal.FunctionOrMethodCallExprImpl
+private import internal.CallExprBaseImpl
 import codeql.rust.elements.ArgList
 import codeql.rust.elements.Attr
 import codeql.rust.elements.Expr
@@ -11,4 +11,4 @@ import codeql.rust.elements.Expr
 /**
  * A function or method call expression. See `CallExpr` and `MethodCallExpr` for further details.
  */
-final class FunctionOrMethodCallExpr = Impl::FunctionOrMethodCallExpr;
+final class CallExprBase = Impl::CallExprBase;
diff --git a/rust/ql/lib/codeql/rust/elements/MethodCallExpr.qll b/rust/ql/lib/codeql/rust/elements/MethodCallExpr.qll
index 3646d987f9fa..fca8b0861345 100644
--- a/rust/ql/lib/codeql/rust/elements/MethodCallExpr.qll
+++ b/rust/ql/lib/codeql/rust/elements/MethodCallExpr.qll
@@ -4,8 +4,8 @@
  */
 
 private import internal.MethodCallExprImpl
+import codeql.rust.elements.CallExprBase
 import codeql.rust.elements.Expr
-import codeql.rust.elements.FunctionOrMethodCallExpr
 import codeql.rust.elements.GenericArgList
 import codeql.rust.elements.NameRef
 
diff --git a/rust/ql/lib/codeql/rust/elements/internal/FunctionOrMethodCallExprImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/CallExprBaseImpl.qll
similarity index 62%
rename from rust/ql/lib/codeql/rust/elements/internal/FunctionOrMethodCallExprImpl.qll
rename to rust/ql/lib/codeql/rust/elements/internal/CallExprBaseImpl.qll
index 1ad34f210cfb..332ba0fb6b3f 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/FunctionOrMethodCallExprImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/CallExprBaseImpl.qll
@@ -1,19 +1,19 @@
 // generated by codegen, remove this comment if you wish to edit this file
 /**
- * This module provides a hand-modifiable wrapper around the generated class `FunctionOrMethodCallExpr`.
+ * This module provides a hand-modifiable wrapper around the generated class `CallExprBase`.
  *
  * INTERNAL: Do not use.
  */
 
-private import codeql.rust.elements.internal.generated.FunctionOrMethodCallExpr
+private import codeql.rust.elements.internal.generated.CallExprBase
 
 /**
- * INTERNAL: This module contains the customizable definition of `FunctionOrMethodCallExpr` and should not
+ * INTERNAL: This module contains the customizable definition of `CallExprBase` and should not
  * be referenced directly.
  */
 module Impl {
   /**
    * A function or method call expression. See `CallExpr` and `MethodCallExpr` for further details.
    */
-  class FunctionOrMethodCallExpr extends Generated::FunctionOrMethodCallExpr { }
+  class CallExprBase extends Generated::CallExprBase { }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/CallExpr.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/CallExpr.qll
index 66b4ce10cb71..2e41b664a4ee 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/CallExpr.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/CallExpr.qll
@@ -6,8 +6,8 @@
 
 private import codeql.rust.elements.internal.generated.Synth
 private import codeql.rust.elements.internal.generated.Raw
+import codeql.rust.elements.internal.CallExprBaseImpl::Impl as CallExprBaseImpl
 import codeql.rust.elements.Expr
-import codeql.rust.elements.internal.FunctionOrMethodCallExprImpl::Impl as FunctionOrMethodCallExprImpl
 
 /**
  * INTERNAL: This module contains the fully generated definition of `CallExpr` and should not
@@ -25,7 +25,7 @@ module Generated {
    * INTERNAL: Do not reference the `Generated::CallExpr` class directly.
    * Use the subclass `CallExpr`, where the following predicates are available.
    */
-  class CallExpr extends Synth::TCallExpr, FunctionOrMethodCallExprImpl::FunctionOrMethodCallExpr {
+  class CallExpr extends Synth::TCallExpr, CallExprBaseImpl::CallExprBase {
     override string getAPrimaryQlClass() { result = "CallExpr" }
 
     /**
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/FunctionOrMethodCallExpr.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/CallExprBase.qll
similarity index 51%
rename from rust/ql/lib/codeql/rust/elements/internal/generated/FunctionOrMethodCallExpr.qll
rename to rust/ql/lib/codeql/rust/elements/internal/generated/CallExprBase.qll
index e4ecbaa1a699..046558c356d2 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/FunctionOrMethodCallExpr.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/CallExprBase.qll
@@ -1,6 +1,6 @@
 // generated by codegen, do not edit
 /**
- * This module provides the generated definition of `FunctionOrMethodCallExpr`.
+ * This module provides the generated definition of `CallExprBase`.
  * INTERNAL: Do not import directly.
  */
 
@@ -11,23 +11,23 @@ import codeql.rust.elements.Attr
 import codeql.rust.elements.internal.ExprImpl::Impl as ExprImpl
 
 /**
- * INTERNAL: This module contains the fully generated definition of `FunctionOrMethodCallExpr` and should not
+ * INTERNAL: This module contains the fully generated definition of `CallExprBase` and should not
  * be referenced directly.
  */
 module Generated {
   /**
    * A function or method call expression. See `CallExpr` and `MethodCallExpr` for further details.
-   * INTERNAL: Do not reference the `Generated::FunctionOrMethodCallExpr` class directly.
-   * Use the subclass `FunctionOrMethodCallExpr`, where the following predicates are available.
+   * INTERNAL: Do not reference the `Generated::CallExprBase` class directly.
+   * Use the subclass `CallExprBase`, where the following predicates are available.
    */
-  class FunctionOrMethodCallExpr extends Synth::TFunctionOrMethodCallExpr, ExprImpl::Expr {
+  class CallExprBase extends Synth::TCallExprBase, ExprImpl::Expr {
     /**
-     * Gets the argument list of this function or method call expression, if it exists.
+     * Gets the argument list of this call expression base, if it exists.
      */
     ArgList getArgList() {
       result =
-        Synth::convertArgListFromRaw(Synth::convertFunctionOrMethodCallExprToRaw(this)
-              .(Raw::FunctionOrMethodCallExpr)
+        Synth::convertArgListFromRaw(Synth::convertCallExprBaseToRaw(this)
+              .(Raw::CallExprBase)
               .getArgList())
     }
 
@@ -37,22 +37,22 @@ module Generated {
     final predicate hasArgList() { exists(this.getArgList()) }
 
     /**
-     * Gets the `index`th attr of this function or method call expression (0-based).
+     * Gets the `index`th attr of this call expression base (0-based).
      */
     Attr getAttr(int index) {
       result =
-        Synth::convertAttrFromRaw(Synth::convertFunctionOrMethodCallExprToRaw(this)
-              .(Raw::FunctionOrMethodCallExpr)
+        Synth::convertAttrFromRaw(Synth::convertCallExprBaseToRaw(this)
+              .(Raw::CallExprBase)
               .getAttr(index))
     }
 
     /**
-     * Gets any of the attrs of this function or method call expression.
+     * Gets any of the attrs of this call expression base.
      */
     final Attr getAnAttr() { result = this.getAttr(_) }
 
     /**
-     * Gets the number of attrs of this function or method call expression.
+     * Gets the number of attrs of this call expression base.
      */
     final int getNumberOfAttrs() { result = count(int i | exists(this.getAttr(i))) }
   }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/MethodCallExpr.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/MethodCallExpr.qll
index de5cef9e70b5..4aeb89e8e85b 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/MethodCallExpr.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/MethodCallExpr.qll
@@ -6,8 +6,8 @@
 
 private import codeql.rust.elements.internal.generated.Synth
 private import codeql.rust.elements.internal.generated.Raw
+import codeql.rust.elements.internal.CallExprBaseImpl::Impl as CallExprBaseImpl
 import codeql.rust.elements.Expr
-import codeql.rust.elements.internal.FunctionOrMethodCallExprImpl::Impl as FunctionOrMethodCallExprImpl
 import codeql.rust.elements.GenericArgList
 import codeql.rust.elements.NameRef
 
@@ -25,9 +25,7 @@ module Generated {
    * INTERNAL: Do not reference the `Generated::MethodCallExpr` class directly.
    * Use the subclass `MethodCallExpr`, where the following predicates are available.
    */
-  class MethodCallExpr extends Synth::TMethodCallExpr,
-    FunctionOrMethodCallExprImpl::FunctionOrMethodCallExpr
-  {
+  class MethodCallExpr extends Synth::TMethodCallExpr, CallExprBaseImpl::CallExprBase {
     override string getAPrimaryQlClass() { result = "MethodCallExpr" }
 
     /**
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/ParentChild.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/ParentChild.qll
index 4dbb92f77f92..5a895eff78b1 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/ParentChild.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/ParentChild.qll
@@ -1380,6 +1380,28 @@ private module Impl {
     )
   }
 
+  private Element getImmediateChildOfCallExprBase(
+    CallExprBase e, int index, string partialPredicateCall
+  ) {
+    exists(int b, int bExpr, int n, int nArgList, int nAttr |
+      b = 0 and
+      bExpr = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfExpr(e, i, _)) | i) and
+      n = bExpr and
+      nArgList = n + 1 and
+      nAttr = nArgList + 1 + max(int i | i = -1 or exists(e.getAttr(i)) | i) and
+      (
+        none()
+        or
+        result = getImmediateChildOfExpr(e, index - b, partialPredicateCall)
+        or
+        index = n and result = e.getArgList() and partialPredicateCall = "ArgList()"
+        or
+        result = e.getAttr(index - nArgList) and
+        partialPredicateCall = "Attr(" + (index - nArgList).toString() + ")"
+      )
+    )
+  }
+
   private Element getImmediateChildOfCastExpr(CastExpr e, int index, string partialPredicateCall) {
     exists(int b, int bExpr, int n, int nAttr, int nExpr, int nTy |
       b = 0 and
@@ -1691,28 +1713,6 @@ private module Impl {
     )
   }
 
-  private Element getImmediateChildOfFunctionOrMethodCallExpr(
-    FunctionOrMethodCallExpr e, int index, string partialPredicateCall
-  ) {
-    exists(int b, int bExpr, int n, int nArgList, int nAttr |
-      b = 0 and
-      bExpr = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfExpr(e, i, _)) | i) and
-      n = bExpr and
-      nArgList = n + 1 and
-      nAttr = nArgList + 1 + max(int i | i = -1 or exists(e.getAttr(i)) | i) and
-      (
-        none()
-        or
-        result = getImmediateChildOfExpr(e, index - b, partialPredicateCall)
-        or
-        index = n and result = e.getArgList() and partialPredicateCall = "ArgList()"
-        or
-        result = e.getAttr(index - nArgList) and
-        partialPredicateCall = "Attr(" + (index - nArgList).toString() + ")"
-      )
-    )
-  }
-
   private Element getImmediateChildOfIdentPat(IdentPat e, int index, string partialPredicateCall) {
     exists(int b, int bPat, int n, int nAttr, int nName, int nPat |
       b = 0 and
@@ -2744,17 +2744,16 @@ private module Impl {
   }
 
   private Element getImmediateChildOfCallExpr(CallExpr e, int index, string partialPredicateCall) {
-    exists(int b, int bFunctionOrMethodCallExpr, int n, int nExpr |
+    exists(int b, int bCallExprBase, int n, int nExpr |
       b = 0 and
-      bFunctionOrMethodCallExpr =
-        b + 1 +
-          max(int i | i = -1 or exists(getImmediateChildOfFunctionOrMethodCallExpr(e, i, _)) | i) and
-      n = bFunctionOrMethodCallExpr and
+      bCallExprBase =
+        b + 1 + max(int i | i = -1 or exists(getImmediateChildOfCallExprBase(e, i, _)) | i) and
+      n = bCallExprBase and
       nExpr = n + 1 and
       (
         none()
         or
-        result = getImmediateChildOfFunctionOrMethodCallExpr(e, index - b, partialPredicateCall)
+        result = getImmediateChildOfCallExprBase(e, index - b, partialPredicateCall)
         or
         index = n and result = e.getExpr() and partialPredicateCall = "Expr()"
       )
@@ -3080,21 +3079,18 @@ private module Impl {
   private Element getImmediateChildOfMethodCallExpr(
     MethodCallExpr e, int index, string partialPredicateCall
   ) {
-    exists(
-      int b, int bFunctionOrMethodCallExpr, int n, int nGenericArgList, int nNameRef, int nReceiver
-    |
+    exists(int b, int bCallExprBase, int n, int nGenericArgList, int nNameRef, int nReceiver |
       b = 0 and
-      bFunctionOrMethodCallExpr =
-        b + 1 +
-          max(int i | i = -1 or exists(getImmediateChildOfFunctionOrMethodCallExpr(e, i, _)) | i) and
-      n = bFunctionOrMethodCallExpr and
+      bCallExprBase =
+        b + 1 + max(int i | i = -1 or exists(getImmediateChildOfCallExprBase(e, i, _)) | i) and
+      n = bCallExprBase and
       nGenericArgList = n + 1 and
       nNameRef = nGenericArgList + 1 and
       nReceiver = nNameRef + 1 and
       (
         none()
         or
-        result = getImmediateChildOfFunctionOrMethodCallExpr(e, index - b, partialPredicateCall)
+        result = getImmediateChildOfCallExprBase(e, index - b, partialPredicateCall)
         or
         index = n and result = e.getGenericArgList() and partialPredicateCall = "GenericArgList()"
         or
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/Raw.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/Raw.qll
index 57d3827561cf..28ee45ebef2a 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/Raw.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/Raw.qll
@@ -1395,6 +1395,22 @@ module Raw {
     Lifetime getLifetime() { break_expr_lifetimes(this, result) }
   }
 
+  /**
+   * INTERNAL: Do not use.
+   * A function or method call expression. See `CallExpr` and `MethodCallExpr` for further details.
+   */
+  class CallExprBase extends @call_expr_base, Expr {
+    /**
+     * Gets the argument list of this call expression base, if it exists.
+     */
+    ArgList getArgList() { call_expr_base_arg_lists(this, result) }
+
+    /**
+     * Gets the `index`th attr of this call expression base (0-based).
+     */
+    Attr getAttr(int index) { call_expr_base_attrs(this, index, result) }
+  }
+
   /**
    * INTERNAL: Do not use.
    * A cast expression. For example:
@@ -1752,22 +1768,6 @@ module Raw {
     Expr getTemplate() { format_args_expr_templates(this, result) }
   }
 
-  /**
-   * INTERNAL: Do not use.
-   * A function or method call expression. See `CallExpr` and `MethodCallExpr` for further details.
-   */
-  class FunctionOrMethodCallExpr extends @function_or_method_call_expr, Expr {
-    /**
-     * Gets the argument list of this function or method call expression, if it exists.
-     */
-    ArgList getArgList() { function_or_method_call_expr_arg_lists(this, result) }
-
-    /**
-     * Gets the `index`th attr of this function or method call expression (0-based).
-     */
-    Attr getAttr(int index) { function_or_method_call_expr_attrs(this, index, result) }
-  }
-
   /**
    * INTERNAL: Do not use.
    * A binding pattern. For example:
@@ -2959,7 +2959,7 @@ module Raw {
    * foo(1) = 4;
    * ```
    */
-  class CallExpr extends @call_expr, FunctionOrMethodCallExpr {
+  class CallExpr extends @call_expr, CallExprBase {
     override string toString() { result = "CallExpr" }
 
     /**
@@ -3311,7 +3311,7 @@ module Raw {
    * x.foo::<u32, u64>(42);
    * ```
    */
-  class MethodCallExpr extends @method_call_expr, FunctionOrMethodCallExpr {
+  class MethodCallExpr extends @method_call_expr, CallExprBase {
     override string toString() { result = "MethodCallExpr" }
 
     /**
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/Synth.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/Synth.qll
index 192f22dae05a..bd3ddf9feb47 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/Synth.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/Synth.qll
@@ -606,28 +606,28 @@ module Synth {
   /**
    * INTERNAL: Do not use.
    */
-  class TExpr =
-    TArrayExpr or TAsmExpr or TAwaitExpr or TBecomeExpr or TBinaryExpr or TBlockExpr or
-        TBreakExpr or TCastExpr or TClosureExpr or TContinueExpr or TFieldExpr or TForExpr or
-        TFormatArgsExpr or TFunctionOrMethodCallExpr or TIfExpr or TIndexExpr or TLetExpr or
-        TLiteralExpr or TLoopExpr or TMacroExpr or TMatchExpr or TOffsetOfExpr or TParenExpr or
-        TPathExpr or TPrefixExpr or TRangeExpr or TRecordExpr or TRefExpr or TReturnExpr or
-        TTryExpr or TTupleExpr or TUnderscoreExpr or TWhileExpr or TYeetExpr or TYieldExpr;
+  class TCallExprBase = TCallExpr or TMethodCallExpr;
 
   /**
    * INTERNAL: Do not use.
    */
-  class TExternItem = TFunction or TMacroCall or TStatic or TTypeAlias;
+  class TExpr =
+    TArrayExpr or TAsmExpr or TAwaitExpr or TBecomeExpr or TBinaryExpr or TBlockExpr or
+        TBreakExpr or TCallExprBase or TCastExpr or TClosureExpr or TContinueExpr or TFieldExpr or
+        TForExpr or TFormatArgsExpr or TIfExpr or TIndexExpr or TLetExpr or TLiteralExpr or
+        TLoopExpr or TMacroExpr or TMatchExpr or TOffsetOfExpr or TParenExpr or TPathExpr or
+        TPrefixExpr or TRangeExpr or TRecordExpr or TRefExpr or TReturnExpr or TTryExpr or
+        TTupleExpr or TUnderscoreExpr or TWhileExpr or TYeetExpr or TYieldExpr;
 
   /**
    * INTERNAL: Do not use.
    */
-  class TFieldList = TRecordFieldList or TTupleFieldList;
+  class TExternItem = TFunction or TMacroCall or TStatic or TTypeAlias;
 
   /**
    * INTERNAL: Do not use.
    */
-  class TFunctionOrMethodCallExpr = TCallExpr or TMethodCallExpr;
+  class TFieldList = TRecordFieldList or TTupleFieldList;
 
   /**
    * INTERNAL: Do not use.
@@ -1669,6 +1669,16 @@ module Synth {
     result = convertWherePredFromRaw(e)
   }
 
+  /**
+   * INTERNAL: Do not use.
+   * Converts a raw DB element to a synthesized `TCallExprBase`, if possible.
+   */
+  TCallExprBase convertCallExprBaseFromRaw(Raw::Element e) {
+    result = convertCallExprFromRaw(e)
+    or
+    result = convertMethodCallExprFromRaw(e)
+  }
+
   /**
    * INTERNAL: Do not use.
    * Converts a raw DB element to a synthesized `TElement`, if possible.
@@ -1698,6 +1708,8 @@ module Synth {
     or
     result = convertBreakExprFromRaw(e)
     or
+    result = convertCallExprBaseFromRaw(e)
+    or
     result = convertCastExprFromRaw(e)
     or
     result = convertClosureExprFromRaw(e)
@@ -1710,8 +1722,6 @@ module Synth {
     or
     result = convertFormatArgsExprFromRaw(e)
     or
-    result = convertFunctionOrMethodCallExprFromRaw(e)
-    or
     result = convertIfExprFromRaw(e)
     or
     result = convertIndexExprFromRaw(e)
@@ -1779,16 +1789,6 @@ module Synth {
     result = convertTupleFieldListFromRaw(e)
   }
 
-  /**
-   * INTERNAL: Do not use.
-   * Converts a raw DB element to a synthesized `TFunctionOrMethodCallExpr`, if possible.
-   */
-  TFunctionOrMethodCallExpr convertFunctionOrMethodCallExprFromRaw(Raw::Element e) {
-    result = convertCallExprFromRaw(e)
-    or
-    result = convertMethodCallExprFromRaw(e)
-  }
-
   /**
    * INTERNAL: Do not use.
    * Converts a raw DB element to a synthesized `TGenericArg`, if possible.
@@ -2947,6 +2947,16 @@ module Synth {
     result = convertWherePredToRaw(e)
   }
 
+  /**
+   * INTERNAL: Do not use.
+   * Converts a synthesized `TCallExprBase` to a raw DB element, if possible.
+   */
+  Raw::Element convertCallExprBaseToRaw(TCallExprBase e) {
+    result = convertCallExprToRaw(e)
+    or
+    result = convertMethodCallExprToRaw(e)
+  }
+
   /**
    * INTERNAL: Do not use.
    * Converts a synthesized `TElement` to a raw DB element, if possible.
@@ -2976,6 +2986,8 @@ module Synth {
     or
     result = convertBreakExprToRaw(e)
     or
+    result = convertCallExprBaseToRaw(e)
+    or
     result = convertCastExprToRaw(e)
     or
     result = convertClosureExprToRaw(e)
@@ -2988,8 +3000,6 @@ module Synth {
     or
     result = convertFormatArgsExprToRaw(e)
     or
-    result = convertFunctionOrMethodCallExprToRaw(e)
-    or
     result = convertIfExprToRaw(e)
     or
     result = convertIndexExprToRaw(e)
@@ -3057,16 +3067,6 @@ module Synth {
     result = convertTupleFieldListToRaw(e)
   }
 
-  /**
-   * INTERNAL: Do not use.
-   * Converts a synthesized `TFunctionOrMethodCallExpr` to a raw DB element, if possible.
-   */
-  Raw::Element convertFunctionOrMethodCallExprToRaw(TFunctionOrMethodCallExpr e) {
-    result = convertCallExprToRaw(e)
-    or
-    result = convertMethodCallExprToRaw(e)
-  }
-
   /**
    * INTERNAL: Do not use.
    * Converts a synthesized `TGenericArg` to a raw DB element, if possible.
diff --git a/rust/ql/lib/rust.dbscheme b/rust/ql/lib/rust.dbscheme
index 113c3fe7d7e2..bb46706d3a35 100644
--- a/rust/ql/lib/rust.dbscheme
+++ b/rust/ql/lib/rust.dbscheme
@@ -273,13 +273,13 @@ closure_binder_generic_param_lists(
 | @binary_expr
 | @block_expr
 | @break_expr
+| @call_expr_base
 | @cast_expr
 | @closure_expr
 | @continue_expr
 | @field_expr
 | @for_expr
 | @format_args_expr
-| @function_or_method_call_expr
 | @if_expr
 | @index_expr
 | @let_expr
@@ -1300,6 +1300,24 @@ break_expr_lifetimes(
   int lifetime: @lifetime ref
 );
 
+@call_expr_base =
+  @call_expr
+| @method_call_expr
+;
+
+#keyset[id]
+call_expr_base_arg_lists(
+  int id: @call_expr_base ref,
+  int arg_list: @arg_list ref
+);
+
+#keyset[id, index]
+call_expr_base_attrs(
+  int id: @call_expr_base ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
 cast_exprs(
   unique int id: @cast_expr
 );
@@ -1570,24 +1588,6 @@ format_args_expr_templates(
   int template: @expr ref
 );
 
-@function_or_method_call_expr =
-  @call_expr
-| @method_call_expr
-;
-
-#keyset[id]
-function_or_method_call_expr_arg_lists(
-  int id: @function_or_method_call_expr ref,
-  int arg_list: @arg_list ref
-);
-
-#keyset[id, index]
-function_or_method_call_expr_attrs(
-  int id: @function_or_method_call_expr ref,
-  int index: int ref,
-  int attr: @attr ref
-);
-
 ident_pats(
   unique int id: @ident_pat
 );
diff --git a/rust/schema/annotations.py b/rust/schema/annotations.py
index 7fafb26bbb31..5dcd085e4050 100644
--- a/rust/schema/annotations.py
+++ b/rust/schema/annotations.py
@@ -185,7 +185,7 @@ class _:
     ```
     """
 
-class FunctionOrMethodCallExpr(Expr):
+class CallExprBase(Expr):
     """
     A function or method call expression. See `CallExpr` and `MethodCallExpr` for further details.
     """
@@ -193,7 +193,7 @@ class FunctionOrMethodCallExpr(Expr):
     attrs: list["Attr"] | child
 
 
-@annotate(CallExpr, replace_bases={Expr: FunctionOrMethodCallExpr})
+@annotate(CallExpr, replace_bases={Expr: CallExprBase})
 class _:
     """
     A function call expression. For example:
@@ -207,7 +207,7 @@ class _:
     arg_list: drop
     attrs: drop
 
-@annotate(MethodCallExpr, replace_bases={Expr: FunctionOrMethodCallExpr})
+@annotate(MethodCallExpr, replace_bases={Expr: CallExprBase})
 class _:
     """
     A method call expression. For example:

From 9fad5410c0bc3b6a7745990d130daf1884fc735b Mon Sep 17 00:00:00 2001
From: Arthur Baars <aibaars@github.com>
Date: Thu, 10 Oct 2024 16:50:20 +0200
Subject: [PATCH 308/347] Rust: implement CFG for macros

---
 .../internal/ControlFlowGraphImpl.qll         | 54 +++++++++++++++++--
 .../test/library-tests/variables/Cfg.expected | 38 +++++++++++--
 .../unusedentities/UnreachableCode.expected   | 24 ---------
 3 files changed, 83 insertions(+), 33 deletions(-)

diff --git a/rust/ql/lib/codeql/rust/controlflow/internal/ControlFlowGraphImpl.qll b/rust/ql/lib/codeql/rust/controlflow/internal/ControlFlowGraphImpl.qll
index 8bb27c3d9910..92124ee17c0c 100644
--- a/rust/ql/lib/codeql/rust/controlflow/internal/ControlFlowGraphImpl.qll
+++ b/rust/ql/lib/codeql/rust/controlflow/internal/ControlFlowGraphImpl.qll
@@ -143,8 +143,7 @@ class BlockExprTree extends StandardPostOrderTree, BlockExpr {
   override AstNode getChildNode(int i) {
     result = super.getStmtList().getStatement(i)
     or
-    not exists(super.getStmtList().getStatement(i)) and
-    (exists(super.getStmtList().getStatement(i - 1)) or i = 0) and
+    i = super.getStmtList().getNumberOfStatements() and
     result = super.getStmtList().getTailExpr()
   }
 
@@ -241,6 +240,14 @@ class IfExprTree extends PostOrderTree instanceof IfExpr {
   }
 }
 
+class FormatArgsExprTree extends StandardPostOrderTree instanceof FormatArgsExpr {
+  override AstNode getChildNode(int i) {
+    i = -1 and result = super.getTemplate()
+    or
+    result = super.getArg(i).getExpr()
+  }
+}
+
 class IndexExprTree extends StandardPostOrderTree instanceof IndexExpr {
   override AstNode getChildNode(int i) {
     i = 0 and result = super.getBase()
@@ -249,7 +256,12 @@ class IndexExprTree extends StandardPostOrderTree instanceof IndexExpr {
   }
 }
 
-class ItemTree extends LeafTree, Item { }
+class ItemTree extends LeafTree, Item {
+  ItemTree() {
+    not this instanceof MacroCall and
+    this = [any(StmtList s).getAStatement(), any(MacroStmts s).getAStatement()]
+  }
+}
 
 // `LetExpr` is a pre-order tree such that the pattern itself ends up
 // dominating successors in the graph in the same way that patterns do in
@@ -391,8 +403,40 @@ class ForExprTree extends LoopingExprTree instanceof ForExpr {
   }
 }
 
-// TODO: replace with expanded macro once the extractor supports it
-class MacroExprTree extends LeafTree, MacroExpr { }
+class MacroCallTree extends ControlFlowTree instanceof MacroCall {
+  override predicate first(AstNode first) {
+    first(super.getExpanded(), first)
+    or
+    not exists(super.getExpanded()) and first = this
+  }
+
+  override predicate last(AstNode last, Completion c) {
+    last(super.getExpanded(), last, c)
+    or
+    not exists(super.getExpanded()) and last = this
+  }
+
+  override predicate succ(AstNode pred, AstNode succ, Completion c) { none() }
+
+  override predicate propagatesAbnormal(AstNode child) { none() }
+}
+
+class MacroExprTree extends StandardPostOrderTree instanceof MacroExpr {
+  override AstNode getChildNode(int i) { i = 0 and result = super.getMacroCall() }
+}
+
+class MacroPatTree extends StandardPostOrderTree instanceof MacroExpr {
+  override AstNode getChildNode(int i) { i = 0 and result = super.getMacroCall() }
+}
+
+class MacroStmtsTree extends StandardPreOrderTree instanceof MacroStmts {
+  override AstNode getChildNode(int i) {
+    result = super.getStatement(i)
+    or
+    i = super.getNumberOfStatements() and
+    result = super.getExpr()
+  }
+}
 
 class MatchArmTree extends ControlFlowTree instanceof MatchArm {
   override predicate propagatesAbnormal(AstNode child) { child = super.getExpr() }
diff --git a/rust/ql/test/library-tests/variables/Cfg.expected b/rust/ql/test/library-tests/variables/Cfg.expected
index 89e7aaec297e..aaec24d6b555 100644
--- a/rust/ql/test/library-tests/variables/Cfg.expected
+++ b/rust/ql/test/library-tests/variables/Cfg.expected
@@ -3,12 +3,30 @@ edges
 | variables.rs:3:1:5:1 | exit print_str (normal) | variables.rs:3:1:5:1 | exit print_str |  |
 | variables.rs:3:23:5:1 | BlockExpr | variables.rs:3:1:5:1 | exit print_str (normal) |  |
 | variables.rs:4:5:4:21 | MacroExpr | variables.rs:3:23:5:1 | BlockExpr |  |
-| variables.rs:4:5:4:22 | ExprStmt | variables.rs:4:5:4:21 | MacroExpr |  |
+| variables.rs:4:5:4:21 | PathExpr | variables.rs:4:14:4:17 | "{}\\n" |  |
+| variables.rs:4:5:4:22 | ExprStmt | variables.rs:4:14:4:20 | MacroStmts |  |
+| variables.rs:4:14:4:17 | "{}\\n" | variables.rs:4:20:4:20 | s |  |
+| variables.rs:4:14:4:20 | BlockExpr | variables.rs:4:5:4:21 | MacroExpr |  |
+| variables.rs:4:14:4:20 | CallExpr | variables.rs:4:14:4:20 | BlockExpr |  |
+| variables.rs:4:14:4:20 | ExprStmt | variables.rs:4:5:4:21 | PathExpr |  |
+| variables.rs:4:14:4:20 | FormatArgsExpr | variables.rs:4:14:4:20 | MacroExpr |  |
+| variables.rs:4:14:4:20 | MacroExpr | variables.rs:4:14:4:20 | CallExpr |  |
+| variables.rs:4:14:4:20 | MacroStmts | variables.rs:4:14:4:20 | ExprStmt |  |
+| variables.rs:4:20:4:20 | s | variables.rs:4:14:4:20 | FormatArgsExpr |  |
 | variables.rs:7:1:9:1 | enter print_i64 | variables.rs:8:5:8:22 | ExprStmt |  |
 | variables.rs:7:1:9:1 | exit print_i64 (normal) | variables.rs:7:1:9:1 | exit print_i64 |  |
 | variables.rs:7:22:9:1 | BlockExpr | variables.rs:7:1:9:1 | exit print_i64 (normal) |  |
 | variables.rs:8:5:8:21 | MacroExpr | variables.rs:7:22:9:1 | BlockExpr |  |
-| variables.rs:8:5:8:22 | ExprStmt | variables.rs:8:5:8:21 | MacroExpr |  |
+| variables.rs:8:5:8:21 | PathExpr | variables.rs:8:14:8:17 | "{}\\n" |  |
+| variables.rs:8:5:8:22 | ExprStmt | variables.rs:8:14:8:20 | MacroStmts |  |
+| variables.rs:8:14:8:17 | "{}\\n" | variables.rs:8:20:8:20 | i |  |
+| variables.rs:8:14:8:20 | BlockExpr | variables.rs:8:5:8:21 | MacroExpr |  |
+| variables.rs:8:14:8:20 | CallExpr | variables.rs:8:14:8:20 | BlockExpr |  |
+| variables.rs:8:14:8:20 | ExprStmt | variables.rs:8:5:8:21 | PathExpr |  |
+| variables.rs:8:14:8:20 | FormatArgsExpr | variables.rs:8:14:8:20 | MacroExpr |  |
+| variables.rs:8:14:8:20 | MacroExpr | variables.rs:8:14:8:20 | CallExpr |  |
+| variables.rs:8:14:8:20 | MacroStmts | variables.rs:8:14:8:20 | ExprStmt |  |
+| variables.rs:8:20:8:20 | i | variables.rs:8:14:8:20 | FormatArgsExpr |  |
 | variables.rs:11:1:14:1 | enter immutable_variable | variables.rs:12:5:12:17 | LetStmt |  |
 | variables.rs:11:1:14:1 | exit immutable_variable (normal) | variables.rs:11:1:14:1 | exit immutable_variable |  |
 | variables.rs:11:25:14:1 | BlockExpr | variables.rs:11:1:14:1 | exit immutable_variable (normal) |  |
@@ -149,12 +167,16 @@ edges
 | variables.rs:82:1:88:1 | exit let_pattern4 (normal) | variables.rs:82:1:88:1 | exit let_pattern4 |  |
 | variables.rs:82:19:88:1 | BlockExpr | variables.rs:82:1:88:1 | exit let_pattern4 (normal) |  |
 | variables.rs:83:5:86:10 | LetStmt | variables.rs:83:34:83:37 | PathExpr |  |
-| variables.rs:83:9:83:16 | TupleStructPat | variables.rs:85:13:85:19 | MacroExpr | no-match |
+| variables.rs:83:9:83:16 | TupleStructPat | variables.rs:85:13:85:19 | MacroStmts | no-match |
 | variables.rs:83:9:83:16 | TupleStructPat | variables.rs:87:5:87:18 | ExprStmt | match |
 | variables.rs:83:34:83:37 | PathExpr | variables.rs:83:39:83:42 | "x5" |  |
 | variables.rs:83:34:83:43 | CallExpr | variables.rs:83:9:83:16 | TupleStructPat |  |
 | variables.rs:83:39:83:42 | "x5" | variables.rs:83:34:83:43 | CallExpr |  |
+| variables.rs:85:13:85:19 | "not yet implemented" | variables.rs:85:13:85:19 | CallExpr |  |
+| variables.rs:85:13:85:19 | CallExpr | variables.rs:85:13:85:19 | MacroExpr |  |
 | variables.rs:85:13:85:19 | MacroExpr | variables.rs:84:14:86:9 | BlockExpr |  |
+| variables.rs:85:13:85:19 | MacroStmts | variables.rs:85:13:85:19 | PathExpr |  |
+| variables.rs:85:13:85:19 | PathExpr | variables.rs:85:13:85:19 | "not yet implemented" |  |
 | variables.rs:87:5:87:13 | PathExpr | variables.rs:87:15:87:16 | x5 |  |
 | variables.rs:87:5:87:17 | CallExpr | variables.rs:82:19:88:1 | BlockExpr |  |
 | variables.rs:87:5:87:18 | ExprStmt | variables.rs:87:5:87:13 | PathExpr |  |
@@ -279,10 +301,18 @@ edges
 | variables.rs:163:14:163:22 | PathExpr | variables.rs:163:24:163:34 | id_variable |  |
 | variables.rs:163:14:163:35 | CallExpr | variables.rs:160:5:169:5 | MatchExpr |  |
 | variables.rs:163:24:163:34 | id_variable | variables.rs:163:14:163:35 | CallExpr |  |
-| variables.rs:164:9:164:38 | RecordPat | variables.rs:165:13:165:52 | MacroExpr | match |
+| variables.rs:164:9:164:38 | RecordPat | variables.rs:165:22:165:51 | MacroStmts | match |
 | variables.rs:164:9:164:38 | RecordPat | variables.rs:167:9:167:29 | RecordPat | no-match |
 | variables.rs:164:43:166:9 | BlockExpr | variables.rs:160:5:169:5 | MatchExpr |  |
 | variables.rs:165:13:165:52 | MacroExpr | variables.rs:164:43:166:9 | BlockExpr |  |
+| variables.rs:165:13:165:52 | PathExpr | variables.rs:165:22:165:51 | "Found an id in another range\\n" |  |
+| variables.rs:165:22:165:51 | "Found an id in another range\\n" | variables.rs:165:22:165:51 | FormatArgsExpr |  |
+| variables.rs:165:22:165:51 | BlockExpr | variables.rs:165:13:165:52 | MacroExpr |  |
+| variables.rs:165:22:165:51 | CallExpr | variables.rs:165:22:165:51 | BlockExpr |  |
+| variables.rs:165:22:165:51 | ExprStmt | variables.rs:165:13:165:52 | PathExpr |  |
+| variables.rs:165:22:165:51 | FormatArgsExpr | variables.rs:165:22:165:51 | MacroExpr |  |
+| variables.rs:165:22:165:51 | MacroExpr | variables.rs:165:22:165:51 | CallExpr |  |
+| variables.rs:165:22:165:51 | MacroStmts | variables.rs:165:22:165:51 | ExprStmt |  |
 | variables.rs:167:9:167:29 | RecordPat | variables.rs:168:13:168:21 | PathExpr | match |
 | variables.rs:168:13:168:21 | PathExpr | variables.rs:168:23:168:24 | id |  |
 | variables.rs:168:13:168:25 | CallExpr | variables.rs:160:5:169:5 | MatchExpr |  |
diff --git a/rust/ql/test/query-tests/unusedentities/UnreachableCode.expected b/rust/ql/test/query-tests/unusedentities/UnreachableCode.expected
index dac61fb99462..18831b723278 100644
--- a/rust/ql/test/query-tests/unusedentities/UnreachableCode.expected
+++ b/rust/ql/test/query-tests/unusedentities/UnreachableCode.expected
@@ -1,34 +1,10 @@
-| main.rs:14:14:14:24 | ExprStmt | This code is never reached. |
-| main.rs:17:18:17:28 | ExprStmt | This code is never reached. |
-| main.rs:20:14:20:24 | ExprStmt | This code is never reached. |
-| main.rs:21:5:21:19 | ExprStmt | This code is never reached. |
-| main.rs:21:5:21:19 | ExprStmt | This code is never reached. |
-| main.rs:39:14:39:24 | ExprStmt | This code is never reached. |
-| main.rs:48:14:48:24 | ExprStmt | This code is never reached. |
-| main.rs:56:14:56:24 | ExprStmt | This code is never reached. |
-| main.rs:60:14:60:24 | ExprStmt | This code is never reached. |
-| main.rs:68:14:68:24 | ExprStmt | This code is never reached. |
-| main.rs:94:14:94:45 | ExprStmt | This code is never reached. |
-| main.rs:97:14:97:38 | ExprStmt | This code is never reached. |
-| main.rs:99:14:99:38 | ExprStmt | This code is never reached. |
-| main.rs:112:14:112:32 | ExprStmt | This code is never reached. |
-| main.rs:117:18:117:33 | ExprStmt | This code is never reached. |
-| main.rs:171:18:171:29 | ExprStmt | This code is never reached. |
-| main.rs:176:9:176:24 | ExprStmt | This code is never reached. |
-| main.rs:176:9:176:24 | ExprStmt | This code is never reached. |
-| main.rs:332:11:332:51 | ExprStmt | This code is never reached. |
 | unreachable.rs:12:3:12:17 | ExprStmt | This code is never reached. |
 | unreachable.rs:20:3:20:17 | ExprStmt | This code is never reached. |
 | unreachable.rs:32:3:32:17 | ExprStmt | This code is never reached. |
 | unreachable.rs:39:3:39:17 | ExprStmt | This code is never reached. |
 | unreachable.rs:60:2:60:16 | ExprStmt | This code is never reached. |
-| unreachable.rs:66:10:66:19 | ExprStmt | This code is never reached. |
 | unreachable.rs:100:16:100:23 | ExprStmt | This code is never reached. |
-| unreachable.rs:101:3:101:17 | ExprStmt | This code is never reached. |
-| unreachable.rs:102:16:102:23 | ExprStmt | This code is never reached. |
 | unreachable.rs:108:15:108:22 | ExprStmt | This code is never reached. |
-| unreachable.rs:109:3:109:17 | ExprStmt | This code is never reached. |
-| unreachable.rs:110:15:110:22 | ExprStmt | This code is never reached. |
 | unreachable.rs:124:2:124:16 | ExprStmt | This code is never reached. |
 | unreachable.rs:134:2:134:16 | ExprStmt | This code is never reached. |
 | unreachable.rs:141:3:141:17 | ExprStmt | This code is never reached. |

From 6ade2a8054ba0ec275a625ebfff2e10424a8b6e7 Mon Sep 17 00:00:00 2001
From: Arthur Baars <aibaars@github.com>
Date: Fri, 11 Oct 2024 11:33:46 +0200
Subject: [PATCH 309/347] Rust: address comments

---
 rust/extractor/src/main.rs           |  18 ++-
 rust/extractor/src/rust_analyzer.rs  |  43 ++++----
 rust/extractor/src/translate/base.rs | 157 ++++++++++++++-------------
 3 files changed, 119 insertions(+), 99 deletions(-)

diff --git a/rust/extractor/src/main.rs b/rust/extractor/src/main.rs
index f258f240935d..adcb6f681ae1 100644
--- a/rust/extractor/src/main.rs
+++ b/rust/extractor/src/main.rs
@@ -7,7 +7,7 @@ use anyhow::Context;
 use archive::Archiver;
 use ra_ap_ide_db::line_index::{LineCol, LineIndex};
 use ra_ap_project_model::ProjectManifest;
-use rust_analyzer::RustAnalyzer;
+use rust_analyzer::{ParseResult, RustAnalyzer};
 mod archive;
 mod config;
 pub mod generated;
@@ -23,8 +23,14 @@ fn extract(
 ) {
     archiver.archive(file);
 
-    let (ast, input, parse_errors, file_id, semi) = rust_analyzer.parse(file);
-    let line_index = LineIndex::new(input.as_ref());
+    let ParseResult {
+        ast,
+        text,
+        errors,
+        file_id,
+        semantics,
+    } = rust_analyzer.parse(file);
+    let line_index = LineIndex::new(text.as_ref());
     let display_path = file.to_string_lossy();
     let mut trap = traps.create("source", file);
     let label = trap.emit_file(file);
@@ -34,14 +40,14 @@ fn extract(
         label,
         line_index,
         file_id,
-        semi,
+        semantics,
     );
 
-    for err in parse_errors {
+    for err in errors {
         translator.emit_parse_error(&ast, &err);
     }
     let no_location = (LineCol { line: 0, col: 0 }, LineCol { line: 0, col: 0 });
-    if translator.semi.is_none() {
+    if translator.semantics.is_none() {
         translator.emit_diagnostic(
             trap::DiagnosticSeverity::Warning,
             "semantics".to_owned(),
diff --git a/rust/extractor/src/rust_analyzer.rs b/rust/extractor/src/rust_analyzer.rs
index 648b58e2169d..80c34658a647 100644
--- a/rust/extractor/src/rust_analyzer.rs
+++ b/rust/extractor/src/rust_analyzer.rs
@@ -25,7 +25,13 @@ pub enum RustAnalyzer {
     WithDatabase { db: RootDatabase, vfs: Vfs },
     WithoutDatabase(),
 }
-
+pub struct ParseResult<'a> {
+    pub ast: SourceFile,
+    pub text: Arc<str>,
+    pub errors: Vec<SyntaxError>,
+    pub file_id: Option<EditionedFileId>,
+    pub semantics: Option<Semantics<'a, RootDatabase>>,
+}
 impl RustAnalyzer {
     pub fn new(project: &ProjectManifest, scratch_dir: &Path) -> Self {
         let config = CargoConfig {
@@ -51,16 +57,7 @@ impl RustAnalyzer {
             }
         }
     }
-    pub fn parse(
-        &mut self,
-        path: &Path,
-    ) -> (
-        SourceFile,
-        Arc<str>,
-        Vec<SyntaxError>,
-        Option<EditionedFileId>,
-        Option<Semantics<'_, RootDatabase>>,
-    ) {
+    pub fn parse(&mut self, path: &Path) -> ParseResult<'_> {
         let mut errors = Vec::new();
         let input = match std::fs::read(path) {
             Ok(data) => data,
@@ -82,28 +79,34 @@ impl RustAnalyzer {
                 .and_then(|x| vfs.file_id(&x))
             {
                 db.set_file_text(file_id, &input);
-                let semi = Semantics::new(db);
+                let semantics = Semantics::new(db);
 
                 let file_id = EditionedFileId::current_edition(file_id);
-                let source_file = semi.parse(file_id);
+                let source_file = semantics.parse(file_id);
                 errors.extend(
                     db.parse_errors(file_id)
                         .into_iter()
                         .flat_map(|x| x.to_vec()),
                 );
-                return (
-                    source_file,
-                    input.as_ref().into(),
+                return ParseResult {
+                    ast: source_file,
+                    text: input.as_ref().into(),
                     errors,
-                    Some(file_id),
-                    Some(semi),
-                );
+                    file_id: Some(file_id),
+                    semantics: Some(semantics),
+                };
             }
         }
         let parse = ra_ap_syntax::ast::SourceFile::parse(&input, Edition::CURRENT);
         errors.extend(parse.errors());
         errors.extend(err);
-        (parse.tree(), input.as_ref().into(), errors, None, None)
+        ParseResult {
+            ast: parse.tree(),
+            text: input.as_ref().into(),
+            errors,
+            file_id: None,
+            semantics: None,
+        }
     }
 }
 
diff --git a/rust/extractor/src/translate/base.rs b/rust/extractor/src/translate/base.rs
index d6467b9dc700..721e2f1a537e 100644
--- a/rust/extractor/src/translate/base.rs
+++ b/rust/extractor/src/translate/base.rs
@@ -6,13 +6,15 @@ use codeql_extractor::trap::{self};
 use log::Level;
 use ra_ap_hir::db::ExpandDatabase;
 use ra_ap_hir::Semantics;
+use ra_ap_hir_expand::ExpandTo;
 use ra_ap_ide_db::line_index::{LineCol, LineIndex};
 use ra_ap_ide_db::RootDatabase;
 use ra_ap_parser::SyntaxKind;
 use ra_ap_span::{EditionedFileId, TextSize};
 use ra_ap_syntax::ast::RangeItem;
 use ra_ap_syntax::{
-    ast, AstNode, NodeOrToken, SyntaxElementChildren, SyntaxError, SyntaxToken, TextRange,
+    ast, AstNode, NodeOrToken, SyntaxElementChildren, SyntaxError, SyntaxNode, SyntaxToken,
+    TextRange,
 };
 
 #[macro_export]
@@ -80,7 +82,7 @@ pub struct Translator<'a> {
     label: trap::Label,
     line_index: LineIndex,
     file_id: Option<EditionedFileId>,
-    pub semi: Option<Semantics<'a, RootDatabase>>,
+    pub semantics: Option<Semantics<'a, RootDatabase>>,
 }
 
 impl<'a> Translator<'a> {
@@ -90,7 +92,7 @@ impl<'a> Translator<'a> {
         label: trap::Label,
         line_index: LineIndex,
         file_id: Option<EditionedFileId>,
-        semi: Option<Semantics<'a, RootDatabase>>,
+        semantics: Option<Semantics<'a, RootDatabase>>,
     ) -> Translator<'a> {
         Translator {
             trap,
@@ -98,7 +100,7 @@ impl<'a> Translator<'a> {
             label,
             line_index,
             file_id,
-            semi,
+            semantics,
         }
     }
     fn location(&self, range: TextRange) -> (LineCol, LineCol) {
@@ -122,8 +124,8 @@ impl<'a> Translator<'a> {
     }
 
     pub fn text_range_for_node(&mut self, node: &impl ast::AstNode) -> Option<TextRange> {
-        if let Some(semi) = self.semi.as_ref() {
-            let file_range = semi.original_range(node.syntax());
+        if let Some(semantics) = self.semantics.as_ref() {
+            let file_range = semantics.original_range(node.syntax());
             let file_id = self.file_id?;
             if file_id == file_range.file_id {
                 Some(file_range.range)
@@ -235,64 +237,75 @@ impl<'a> Translator<'a> {
             }
         }
     }
+    fn emit_macro_expansion_parse_errors(&mut self, mcall: &ast::MacroCall, expanded: &SyntaxNode) {
+        let semantics = self.semantics.as_ref().unwrap();
+        if let Some(value) = semantics
+            .hir_file_for(expanded)
+            .macro_file()
+            .and_then(|macro_file| {
+                semantics
+                    .db
+                    .parse_macro_expansion_error(macro_file.macro_call_id)
+            })
+        {
+            if let Some(err) = &value.err {
+                let (message, _error) = err.render_to_string(semantics.db);
+
+                if err.span().anchor.file_id == semantics.hir_file_for(mcall.syntax()) {
+                    let location = err.span().range
+                        + semantics
+                            .db
+                            .ast_id_map(err.span().anchor.file_id.into())
+                            .get_erased(err.span().anchor.ast_id)
+                            .text_range()
+                            .start();
+                    self.emit_parse_error(mcall, &SyntaxError::new(message, location));
+                };
+            }
+            for err in value.value.iter() {
+                self.emit_parse_error(mcall, err);
+            }
+        }
+    }
+
+    fn emit_expanded_as(
+        &mut self,
+        expand_to: ExpandTo,
+        expanded: SyntaxNode,
+    ) -> Option<Label<generated::AstNode>> {
+        match expand_to {
+            ra_ap_hir_expand::ExpandTo::Statements => {
+                ast::MacroStmts::cast(expanded).map(|x| self.emit_macro_stmts(x).into())
+            }
+            ra_ap_hir_expand::ExpandTo::Items => {
+                ast::MacroItems::cast(expanded).map(|x| self.emit_macro_items(x).into())
+            }
+
+            ra_ap_hir_expand::ExpandTo::Pattern => {
+                ast::Pat::cast(expanded).map(|x| self.emit_pat(x).into())
+            }
+            ra_ap_hir_expand::ExpandTo::Type => {
+                ast::Type::cast(expanded).map(|x| self.emit_type(x).into())
+            }
+            ra_ap_hir_expand::ExpandTo::Expr => {
+                ast::Expr::cast(expanded).map(|x| self.emit_expr(x).into())
+            }
+        }
+    }
     pub(crate) fn extract_macro_call_expanded(
         &mut self,
         mcall: &ast::MacroCall,
         label: Label<generated::MacroCall>,
     ) {
-        if let Some(semi) = &self.semi {
-            if let Some(expanded) = semi.expand(mcall) {
-                if let Some(value) =
-                    semi.hir_file_for(&expanded)
-                        .macro_file()
-                        .and_then(|macro_file| {
-                            semi.db
-                                .parse_macro_expansion_error(macro_file.macro_call_id)
-                        })
-                {
-                    if let Some(err) = &value.err {
-                        let (message, _error) = err.render_to_string(semi.db);
-
-                        if err.span().anchor.file_id == semi.hir_file_for(mcall.syntax()) {
-                            let location = err.span().range
-                                + semi
-                                    .db
-                                    .ast_id_map(err.span().anchor.file_id.into())
-                                    .get_erased(err.span().anchor.ast_id)
-                                    .text_range()
-                                    .start();
-                            self.emit_parse_error(mcall, &SyntaxError::new(message, location));
-                        };
-                    }
-                    for err in value.value.iter() {
-                        self.emit_parse_error(mcall, err);
-                    }
-                }
-                let expand_to = ra_ap_hir_expand::ExpandTo::from_call_site(mcall);
-                let kind = expanded.kind();
-                let value: Option<Label<crate::generated::AstNode>> = match expand_to {
-                    ra_ap_hir_expand::ExpandTo::Statements => {
-                        ast::MacroStmts::cast(expanded).map(|x| self.emit_macro_stmts(x).into())
-                    }
-                    ra_ap_hir_expand::ExpandTo::Items => {
-                        ast::MacroItems::cast(expanded).map(|x| self.emit_macro_items(x).into())
-                    }
-
-                    ra_ap_hir_expand::ExpandTo::Pattern => {
-                        ast::Pat::cast(expanded).map(|x| self.emit_pat(x).into())
-                    }
-                    ra_ap_hir_expand::ExpandTo::Type => {
-                        ast::Type::cast(expanded).map(|x| self.emit_type(x).into())
-                    }
-                    ra_ap_hir_expand::ExpandTo::Expr => {
-                        ast::Expr::cast(expanded).map(|x| self.emit_expr(x).into())
-                    }
-                };
-                if let Some(value) = value {
-                    MacroCall::emit_expanded(label, value, &mut self.trap.writer);
-                } else {
-                    let range = self.text_range_for_node(mcall);
-                    self.emit_parse_error(mcall, &SyntaxError::new(
+        if let Some(expanded) = self.semantics.as_ref().and_then(|s| s.expand(mcall)) {
+            self.emit_macro_expansion_parse_errors(mcall, &expanded);
+            let expand_to = ra_ap_hir_expand::ExpandTo::from_call_site(mcall);
+            let kind = expanded.kind();
+            if let Some(value) = self.emit_expanded_as(expand_to, expanded) {
+                MacroCall::emit_expanded(label, value, &mut self.trap.writer);
+            } else {
+                let range = self.text_range_for_node(mcall);
+                self.emit_parse_error(mcall, &SyntaxError::new(
                         format!(
                             "macro expansion failed: the macro '{}' expands to {:?} but a {:?} was expected",
                             mcall.path().map(|p| p.to_string()).unwrap_or_default(),
@@ -300,21 +313,19 @@ impl<'a> Translator<'a> {
                         ),
                         range.unwrap_or_else(|| TextRange::empty(TextSize::from(0))),
                     ));
-                }
-            } else {
-                let range = self.text_range_for_node(mcall);
-
-                self.emit_parse_error(
-                    mcall,
-                    &SyntaxError::new(
-                        format!(
-                            "macro expansion failed: could not resolve macro '{}'",
-                            mcall.path().map(|p| p.to_string()).unwrap_or_default()
-                        ),
-                        range.unwrap_or_else(|| TextRange::empty(TextSize::from(0))),
-                    ),
-                );
             }
+        } else {
+            let range = self.text_range_for_node(mcall);
+            self.emit_parse_error(
+                mcall,
+                &SyntaxError::new(
+                    format!(
+                        "macro expansion failed: could not resolve macro '{}'",
+                        mcall.path().map(|p| p.to_string()).unwrap_or_default()
+                    ),
+                    range.unwrap_or_else(|| TextRange::empty(TextSize::from(0))),
+                ),
+            );
         }
     }
 }

From 659ce6f1caa2c6ec6607fcf9992a4f5aa4fdbb72 Mon Sep 17 00:00:00 2001
From: Arthur Baars <aibaars@github.com>
Date: Fri, 11 Oct 2024 13:45:10 +0200
Subject: [PATCH 310/347] Rust: fix CodeQL alert

---
 .../codeql/rust/controlflow/internal/ControlFlowGraphImpl.qll | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/rust/ql/lib/codeql/rust/controlflow/internal/ControlFlowGraphImpl.qll b/rust/ql/lib/codeql/rust/controlflow/internal/ControlFlowGraphImpl.qll
index 92124ee17c0c..d132ac525c5c 100644
--- a/rust/ql/lib/codeql/rust/controlflow/internal/ControlFlowGraphImpl.qll
+++ b/rust/ql/lib/codeql/rust/controlflow/internal/ControlFlowGraphImpl.qll
@@ -413,7 +413,9 @@ class MacroCallTree extends ControlFlowTree instanceof MacroCall {
   override predicate last(AstNode last, Completion c) {
     last(super.getExpanded(), last, c)
     or
-    not exists(super.getExpanded()) and last = this
+    not exists(super.getExpanded()) and
+    last = this and
+    completionIsValidFor(c, last)
   }
 
   override predicate succ(AstNode pred, AstNode succ, Completion c) { none() }

From ffd6b9864c3b7108f20d192031202ebed3d37cbc Mon Sep 17 00:00:00 2001
From: Tom Hvitved <hvitved@github.com>
Date: Fri, 11 Oct 2024 14:27:42 +0200
Subject: [PATCH 311/347] Address review comments

---
 .../rust/controlflow/internal/Completion.qll  | 19 +++++--------
 .../internal/ControlFlowGraphImpl.qll         | 28 ++++++-------------
 2 files changed, 16 insertions(+), 31 deletions(-)

diff --git a/rust/ql/lib/codeql/rust/controlflow/internal/Completion.qll b/rust/ql/lib/codeql/rust/controlflow/internal/Completion.qll
index fc67c32045b7..256b058f823e 100644
--- a/rust/ql/lib/codeql/rust/controlflow/internal/Completion.qll
+++ b/rust/ql/lib/codeql/rust/controlflow/internal/Completion.qll
@@ -117,10 +117,9 @@ class BooleanCompletion extends ConditionalCompletion, TBooleanCompletion {
   override string toString() { result = "boolean(" + value + ")" }
 }
 
-/** Holds if node `pat` has the constant match value `value`. */
+/** Holds if `pat` is guaranteed to match. */
 pragma[nomagic]
-private predicate isMatchConstant(Pat pat, boolean value) {
-  value = true and
+private predicate isIrrefutablePattern(Pat pat) {
   (
     pat instanceof WildcardPat
     or
@@ -128,18 +127,18 @@ private predicate isMatchConstant(Pat pat, boolean value) {
     or
     pat instanceof RestPat
     or
-    // `let` statements without an `else` branch must be exhaustive
+    // `let` statements without an `else` branch must be irrefutible
     pat = any(LetStmt let | not let.hasLetElse()).getPat()
     or
-    // `match` expressions must be exhaustive, so last arm cannot fail
+    // `match` expressions must be irrefutible, so last arm cannot fail
     pat = any(MatchExpr me).getLastArm().getPat()
     or
-    // parameter patterns must be exhaustive
+    // parameter patterns must be irrefutible
     pat = any(Param p).getPat()
   ) and
   not pat = any(ForExpr for).getPat() // workaround until `for` loops are desugared
   or
-  exists(Pat parent | isMatchConstant(parent, value) |
+  exists(Pat parent | isIrrefutablePattern(parent) |
     pat = parent.(BoxPat).getPat()
     or
     pat = parent.(IdentPat).getPat()
@@ -166,11 +165,7 @@ class MatchCompletion extends TMatchCompletion, ConditionalCompletion {
 
   override predicate isValidForSpecific(AstNode e) {
     e instanceof Pat and
-    (
-      isMatchConstant(e, value)
-      or
-      not isMatchConstant(e, _)
-    )
+    if isIrrefutablePattern(e) then value = true else any()
   }
 
   override MatchSuccessor getAMatchingSuccessorType() { result.getValue() = value }
diff --git a/rust/ql/lib/codeql/rust/controlflow/internal/ControlFlowGraphImpl.qll b/rust/ql/lib/codeql/rust/controlflow/internal/ControlFlowGraphImpl.qll
index 6c0c257767a7..cc797dcb3de9 100644
--- a/rust/ql/lib/codeql/rust/controlflow/internal/ControlFlowGraphImpl.qll
+++ b/rust/ql/lib/codeql/rust/controlflow/internal/ControlFlowGraphImpl.qll
@@ -179,12 +179,14 @@ class CastExprTree extends StandardPostOrderTree instanceof CastExpr {
   override AstNode getChildNode(int i) { i = 0 and result = super.getExpr() }
 }
 
-// Closures have their own CFG scope, so we need to make sure that their
-// CFG is not mixed with the surrounding CFG. This is done by retrofitting
-// `first`, `propagatesAbnormal`, and `succ` below.
-class ClosureExprTree extends StandardPostOrderTree, ClosureExpr {
+class ClosureExprTree extends StandardTree, ClosureExpr {
   override predicate first(AstNode first) { first = this }
 
+  override predicate last(AstNode last, Completion c) {
+    last = this and
+    completionIsValidFor(c, this)
+  }
+
   override predicate propagatesAbnormal(AstNode child) { none() }
 
   override AstNode getChildNode(int i) {
@@ -193,11 +195,6 @@ class ClosureExprTree extends StandardPostOrderTree, ClosureExpr {
     i = this.getParamList().getNumberOfParams() and
     result = this.getBody()
   }
-
-  override predicate succ(AstNode pred, AstNode succ, Completion c) {
-    super.succ(pred, succ, c) and
-    not succ = this
-  }
 }
 
 class ContinueExprTree extends LeafTree, ContinueExpr {
@@ -218,11 +215,9 @@ class FieldExprTree extends StandardPostOrderTree instanceof FieldExpr {
   override AstNode getChildNode(int i) { i = 0 and result = super.getExpr() }
 }
 
-// Functions have their own CFG scope, so we need to make sure that their
-// CFG is not mixed with the surrounding CFG in case of nested functions.
-// This is done by retrofitting `last`, `propagatesAbnormal`, and `succ`
-// below.
-class FunctionTree extends StandardPreOrderTree, Function {
+class FunctionTree extends StandardTree, Function {
+  override predicate first(AstNode first) { first = this }
+
   override predicate last(AstNode last, Completion c) {
     last = this and
     completionIsValidFor(c, this)
@@ -236,11 +231,6 @@ class FunctionTree extends StandardPreOrderTree, Function {
     i = this.getParamList().getNumberOfParams() and
     result = this.getBody()
   }
-
-  override predicate succ(AstNode pred, AstNode succ, Completion c) {
-    super.succ(pred, succ, c) and
-    not pred = this
-  }
 }
 
 class ParamTree extends StandardPostOrderTree, Param {

From e91efaa92effb73d240b6b9766fe7eb391b69d90 Mon Sep 17 00:00:00 2001
From: Rasmus Lerchedahl Petersen <yoff@github.com>
Date: Thu, 11 Apr 2024 16:02:49 +0200
Subject: [PATCH 312/347] python: do not extract stdlib by default

---
 .../cli-integration-test/extract-stdlib/test.sh    |  4 ++--
 python/extractor/semmle/cmdline.py                 | 14 ++++++++++++--
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/python/extractor/cli-integration-test/extract-stdlib/test.sh b/python/extractor/cli-integration-test/extract-stdlib/test.sh
index 6a61becd25c0..937cf08ce435 100755
--- a/python/extractor/cli-integration-test/extract-stdlib/test.sh
+++ b/python/extractor/cli-integration-test/extract-stdlib/test.sh
@@ -13,10 +13,10 @@ rm -rf dbs
 
 mkdir dbs
 
-CODEQL_EXTRACTOR_PYTHON_DONT_EXTRACT_STDLIB=True $CODEQL database create dbs/without-stdlib --language python --source-root repo_dir/
+$CODEQL database create dbs/without-stdlib --language python --source-root repo_dir/
 $CODEQL query run --database dbs/without-stdlib query.ql > query.without-stdlib.actual
 diff query.without-stdlib.expected query.without-stdlib.actual
 
-LGTM_INDEX_EXCLUDE="/usr/lib/**" $CODEQL database create dbs/with-stdlib --language python --source-root repo_dir/
+LGTM_INDEX_EXCLUDE="/usr/lib/**" CODEQL_EXTRACTOR_PYTHON_EXTRACT_STDLIB=True $CODEQL database create dbs/with-stdlib --language python --source-root repo_dir/
 $CODEQL query run --database dbs/with-stdlib query.ql > query.with-stdlib.actual
 diff query.with-stdlib.expected query.with-stdlib.actual
diff --git a/python/extractor/semmle/cmdline.py b/python/extractor/semmle/cmdline.py
index 9c2ff4a32744..79f974279bcb 100644
--- a/python/extractor/semmle/cmdline.py
+++ b/python/extractor/semmle/cmdline.py
@@ -102,8 +102,10 @@ def make_parser():
     config_options.add_option("--colorize", dest="colorize", default=False, action="store_true",
                       help = """Colorize the logging output.""")
 
-    config_options.add_option("--dont-extract-stdlib", dest="extract_stdlib", default=True, action="store_false",
-        help="Do not extract the standard library.")
+    config_options.add_option("--dont-extract-stdlib", dest="extract_stdlib", action="store_false",
+        help="This flag is deprecated; not extracting the standard library is now the default.")
+    config_options.add_option("--extract-stdlib", dest="extract_stdlib", default=False, action="store_true",
+        help="Extract the standard library.")
 
     parser.add_option_group(config_options)
 
@@ -226,8 +228,16 @@ def parse(command_line):
 
     if 'CODEQL_EXTRACTOR_PYTHON_DONT_EXTRACT_STDLIB' in os.environ:
         options.extract_stdlib = False
+        print ("Warning: CODEQL_EXTRACTOR_PYTHON_DONT_EXTRACT_STDLIB is deprecated; the default is now to not extract the standard library.")
+
+    if 'CODEQL_EXTRACTOR_PYTHON_EXTRACT_STDLIB' in os.environ:
+        options.extract_stdlib = True
 
     options.prune = True
+
+    if options.extract_stdlib:
+        print ("Warning: The analysis will extract the standard library. This behavior is deprecated and will be removed in a future release. We expect it to be gone in CLI version 2.20.0.")
+
     return options, args
 
 def split_and_flatten(options_list, div):

From bb78c2a67e21d165552a38c970a170b9dfbf9a62 Mon Sep 17 00:00:00 2001
From: Rasmus Lerchedahl Petersen <yoff@github.com>
Date: Wed, 9 Oct 2024 23:27:00 +0200
Subject: [PATCH 313/347] Python: update test expectations

---
 .../PointsTo/class_properties/ClassValues.expected        | 3 ---
 .../3/library-tests/PointsTo/imports/Runtime.expected     | 4 ----
 .../PointsTo/imports/RuntimeWithType.expected             | 4 ----
 .../regressions/subprocess-assert/ClassValue.expected     | 4 ++--
 .../modules/general/moduleobject_test.expected            | 1 -
 python/ql/test/3/library-tests/six/pointsto.expected      | 4 ++--
 python/ql/test/3/query-tests/Summary/LinesOfCode.expected | 2 +-
 .../Variables/undefined/UndefinedExport.expected          | 2 ++
 python/ql/test/extractor-tests/flags/Flags.expected       | 2 +-
 .../test/library-tests/PointsTo/decorators/Test.expected  | 2 --
 .../library-tests/PointsTo/decorators/Values.expected     | 4 ++--
 .../PointsTo/general/GlobalPointsTo.expected              | 4 ----
 .../library-tests/PointsTo/general/LocalPointsTo.expected | 4 ----
 .../PointsTo/general/LocalPointsToType.expected           | 4 ----
 .../test/library-tests/PointsTo/guarded/PointsTo.expected | 4 ----
 .../PointsTo/guarded/PointsToWithType.expected            | 4 ----
 .../ql/test/library-tests/PointsTo/new/NameSpace.expected | 3 ---
 .../PointsTo/new/PointsToWithContext.expected             | 8 --------
 .../library-tests/PointsTo/new/PointsToWithType.expected  | 8 --------
 python/ql/test/library-tests/PointsTo/new/Values.expected | 8 +++-----
 .../conflict-stdlib/LocalModuleWithRef.expected           | 1 -
 .../conflict-stdlib/ModuleWithLocalRef.expected           | 2 +-
 .../dataflow/coverage-py3/argumentRoutingTest.expected    | 4 ++++
 .../dataflow/fieldflow/UnresolvedCalls.expected           | 4 ++++
 .../frameworks/stdlib/InlineTaintTest.expected            | 1 +
 .../library-tests/modules/duplicate_name/Modules.expected | 2 --
 .../WeakFilePermissions.expected                          | 1 -
 .../Statements/no_effect/StatementNoEffect.expected       | 2 ++
 28 files changed, 25 insertions(+), 71 deletions(-)

diff --git a/python/ql/test/3/library-tests/PointsTo/class_properties/ClassValues.expected b/python/ql/test/3/library-tests/PointsTo/class_properties/ClassValues.expected
index 537882af86f7..2c6a15909646 100644
--- a/python/ql/test/3/library-tests/PointsTo/class_properties/ClassValues.expected
+++ b/python/ql/test/3/library-tests/PointsTo/class_properties/ClassValues.expected
@@ -1,9 +1,6 @@
-| mapping | builtin-class collections.OrderedDict |
-| mapping | builtin-class collections.defaultdict |
 | mapping | builtin-class dict |
 | mapping | class MyDictSubclass |
 | mapping | class MyMappingABC |
-| mapping | class OrderedDict |
 | neither sequence nor mapping | builtin-class set |
 | sequence | builtin-class bytes |
 | sequence | builtin-class list |
diff --git a/python/ql/test/3/library-tests/PointsTo/imports/Runtime.expected b/python/ql/test/3/library-tests/PointsTo/imports/Runtime.expected
index f1dcc270a3ed..fe825523ca21 100644
--- a/python/ql/test/3/library-tests/PointsTo/imports/Runtime.expected
+++ b/python/ql/test/3/library-tests/PointsTo/imports/Runtime.expected
@@ -44,14 +44,10 @@
 | test.py | 15 | ControlFlowNode for moduleX | Module package.moduleX | Entry node for Module package.moduleX |
 | test.py | 16 | ControlFlowNode for Attribute | class Y | ControlFlowNode for ClassExpr |
 | test.py | 16 | ControlFlowNode for moduleX | Module package.moduleX | Entry node for Module package.moduleX |
-| test.py | 19 | ControlFlowNode for ImportExpr | Module tty | ControlFlowNode for ImportExpr |
-| test.py | 19 | ControlFlowNode for tty | Module tty | ControlFlowNode for ImportExpr |
 | test.py | 22 | ControlFlowNode for Attribute | Builtin-function exc_info | ControlFlowNode for from sys import * |
 | test.py | 22 | ControlFlowNode for x | Module package.x | Entry node for Module package.x |
 | test.py | 24 | ControlFlowNode for IntegerLiteral | int 0 | ControlFlowNode for IntegerLiteral |
 | test.py | 24 | ControlFlowNode for argv | int 0 | ControlFlowNode for IntegerLiteral |
 | test.py | 27 | ControlFlowNode for ImportExpr | Module sys | ControlFlowNode for ImportExpr |
 | test.py | 31 | ControlFlowNode for argv | list object | ControlFlowNode for from sys import * |
-| test.py | 33 | ControlFlowNode for ImportExpr | Module socket | ControlFlowNode for ImportExpr |
-| test.py | 34 | ControlFlowNode for timeout | builtin-class TimeoutError | ControlFlowNode for from _socket import * |
 | x.py | 2 | ControlFlowNode for ImportExpr | Module sys | ControlFlowNode for ImportExpr |
diff --git a/python/ql/test/3/library-tests/PointsTo/imports/RuntimeWithType.expected b/python/ql/test/3/library-tests/PointsTo/imports/RuntimeWithType.expected
index 60cc3c6b52db..e55d70d073df 100644
--- a/python/ql/test/3/library-tests/PointsTo/imports/RuntimeWithType.expected
+++ b/python/ql/test/3/library-tests/PointsTo/imports/RuntimeWithType.expected
@@ -44,14 +44,10 @@
 | test.py | 15 | ControlFlowNode for moduleX | Module package.moduleX | builtin-class module | Entry node for Module package.moduleX |
 | test.py | 16 | ControlFlowNode for Attribute | class Y | builtin-class type | ControlFlowNode for ClassExpr |
 | test.py | 16 | ControlFlowNode for moduleX | Module package.moduleX | builtin-class module | Entry node for Module package.moduleX |
-| test.py | 19 | ControlFlowNode for ImportExpr | Module tty | builtin-class module | ControlFlowNode for ImportExpr |
-| test.py | 19 | ControlFlowNode for tty | Module tty | builtin-class module | ControlFlowNode for ImportExpr |
 | test.py | 22 | ControlFlowNode for Attribute | Builtin-function exc_info | builtin-class builtin_function_or_method | ControlFlowNode for from sys import * |
 | test.py | 22 | ControlFlowNode for x | Module package.x | builtin-class module | Entry node for Module package.x |
 | test.py | 24 | ControlFlowNode for IntegerLiteral | int 0 | builtin-class int | ControlFlowNode for IntegerLiteral |
 | test.py | 24 | ControlFlowNode for argv | int 0 | builtin-class int | ControlFlowNode for IntegerLiteral |
 | test.py | 27 | ControlFlowNode for ImportExpr | Module sys | builtin-class module | ControlFlowNode for ImportExpr |
 | test.py | 31 | ControlFlowNode for argv | list object | builtin-class list | ControlFlowNode for from sys import * |
-| test.py | 33 | ControlFlowNode for ImportExpr | Module socket | builtin-class module | ControlFlowNode for ImportExpr |
-| test.py | 34 | ControlFlowNode for timeout | builtin-class TimeoutError | builtin-class type | ControlFlowNode for from _socket import * |
 | x.py | 2 | ControlFlowNode for ImportExpr | Module sys | builtin-class module | ControlFlowNode for ImportExpr |
diff --git a/python/ql/test/3/library-tests/PointsTo/regressions/subprocess-assert/ClassValue.expected b/python/ql/test/3/library-tests/PointsTo/regressions/subprocess-assert/ClassValue.expected
index 1c02b5ee6c6e..ef899d04d790 100644
--- a/python/ql/test/3/library-tests/PointsTo/regressions/subprocess-assert/ClassValue.expected
+++ b/python/ql/test/3/library-tests/PointsTo/regressions/subprocess-assert/ClassValue.expected
@@ -1,3 +1,3 @@
-| mwe_failure.py:7:1:7:23 | class MyTest | <MISSING BASE TYPE> |
-| mwe_failure_2.py:7:1:7:23 | class MyTest | <MISSING BASE TYPE> |
+| mwe_failure.py:7:1:7:23 | class MyTest | class TestCase |
+| mwe_failure_2.py:7:1:7:23 | class MyTest | class TestCase |
 | mwe_success.py:7:1:7:23 | class MyTest | class TestCase |
diff --git a/python/ql/test/3/library-tests/modules/general/moduleobject_test.expected b/python/ql/test/3/library-tests/modules/general/moduleobject_test.expected
index eed40d8d9329..53f645c9a9ee 100644
--- a/python/ql/test/3/library-tests/modules/general/moduleobject_test.expected
+++ b/python/ql/test/3/library-tests/modules/general/moduleobject_test.expected
@@ -37,7 +37,6 @@
 | Module package.assistant | e | Wrong() |
 | Module package.assistant | f | int 1 |
 | Module package.helper | __name__ | str u'package.helper' |
-| Module package.helper | absolute_import | _Feature() |
 | Module package.helper | assistant | Module package.assistant |
 | Module package.helper | d | int 4 |
 | Module package.helper | e | int 5 |
diff --git a/python/ql/test/3/library-tests/six/pointsto.expected b/python/ql/test/3/library-tests/six/pointsto.expected
index 83f61848b7cd..85a50cad8085 100644
--- a/python/ql/test/3/library-tests/six/pointsto.expected
+++ b/python/ql/test/3/library-tests/six/pointsto.expected
@@ -1,7 +1,7 @@
 | six | Package six |
 | six.moves | Package six.moves |
-| six.moves.http_client | Module http.client |
-| six.moves.http_client.HTTPConnection | class HTTPConnection |
+| six.moves.http_client | Missing module http.client |
+| six.moves.http_client.HTTPConnection | Missing module attribute http.client.HTTPConnection |
 | six.moves.range | builtin-class range |
 | six.moves.urllib | Package six.moves.urllib |
 | six.moves.urllib.parse | Module six.moves.urllib_parse |
diff --git a/python/ql/test/3/query-tests/Summary/LinesOfCode.expected b/python/ql/test/3/query-tests/Summary/LinesOfCode.expected
index 183d68cab22a..74c7709367a7 100644
--- a/python/ql/test/3/query-tests/Summary/LinesOfCode.expected
+++ b/python/ql/test/3/query-tests/Summary/LinesOfCode.expected
@@ -1 +1 @@
-| 51 |
+| 11 |
diff --git a/python/ql/test/3/query-tests/Variables/undefined/UndefinedExport.expected b/python/ql/test/3/query-tests/Variables/undefined/UndefinedExport.expected
index 2b1ef223673e..6bd8188ed3de 100644
--- a/python/ql/test/3/query-tests/Variables/undefined/UndefinedExport.expected
+++ b/python/ql/test/3/query-tests/Variables/undefined/UndefinedExport.expected
@@ -1,4 +1,6 @@
 | UndefinedExport.py:3:18:3:20 | StringLiteral | The name 'y' is exported by __all__ but is not defined. |
 | UndefinedExport.py:3:23:3:25 | StringLiteral | The name 'z' is exported by __all__ but is not defined. |
 | UndefinedExport.py:3:28:3:35 | StringLiteral | The name 'module' is exported by __all__ but is not defined. |
+| enum_convert.py:8:13:8:19 | StringLiteral | The name 'Maybe' is exported by __all__ but is not defined. |
+| enum_convert.py:8:22:8:32 | StringLiteral | The name 'Maybe_not' is exported by __all__ but is not defined. |
 | package/__init__.py:1:23:1:34 | StringLiteral | The name 'not_exists' is exported by __all__ but is not defined. |
diff --git a/python/ql/test/extractor-tests/flags/Flags.expected b/python/ql/test/extractor-tests/flags/Flags.expected
index 380cf9a08241..eeb4db916e73 100644
--- a/python/ql/test/extractor-tests/flags/Flags.expected
+++ b/python/ql/test/extractor-tests/flags/Flags.expected
@@ -1,7 +1,7 @@
 | options.all | False |
 | options.colorize | True |
 | options.context_cost | 11 |
-| options.extract_stdlib | True |
+| options.extract_stdlib | False |
 | options.guess | False |
 | options.help | False |
 | options.ignore_missing_modules | False |
diff --git a/python/ql/test/library-tests/PointsTo/decorators/Test.expected b/python/ql/test/library-tests/PointsTo/decorators/Test.expected
index 4352b429ca01..4e465134ef63 100644
--- a/python/ql/test/library-tests/PointsTo/decorators/Test.expected
+++ b/python/ql/test/library-tests/PointsTo/decorators/Test.expected
@@ -1,4 +1,3 @@
-| 1 | ControlFlowNode for functools | Module functools | test.py:1 |
 | 3 | ControlFlowNode for annotate | Function annotate | test.py:3 |
 | 4 | ControlFlowNode for inner | Function inner | test.py:4 |
 | 5 | ControlFlowNode for func | Function func1 | test.py:23 |
@@ -11,7 +10,6 @@
 | 13 | ControlFlowNode for wrapper | Function wrapper | test.py:10 |
 | 15 | ControlFlowNode for wraps2 | Function wraps2 | test.py:15 |
 | 16 | ControlFlowNode for func | Function func3 | test.py:31 |
-| 16 | ControlFlowNode for functools | Module functools | test.py:1 |
 | 17 | ControlFlowNode for args | args | test.py:17 |
 | 17 | ControlFlowNode for wrapper | Attribute()() | test.py:16 |
 | 18 | ControlFlowNode for args | args | test.py:17 |
diff --git a/python/ql/test/library-tests/PointsTo/decorators/Values.expected b/python/ql/test/library-tests/PointsTo/decorators/Values.expected
index d9887d944f16..c63ec2d22ccd 100644
--- a/python/ql/test/library-tests/PointsTo/decorators/Values.expected
+++ b/python/ql/test/library-tests/PointsTo/decorators/Values.expected
@@ -7,8 +7,8 @@
 | test.py:11:21:11:24 | ControlFlowNode for args | runtime | instance of tuple |
 | test.py:13:12:13:18 | ControlFlowNode for wrapper | runtime | Function wraps1.wrapper |
 | test.py:13:12:13:18 | ControlFlowNode for wrapper | test.py:26 from import | Function wraps1.wrapper |
-| test.py:16:6:16:14 | ControlFlowNode for functools | runtime | Module functools |
-| test.py:16:6:16:14 | ControlFlowNode for functools | test.py:30 from import | Module functools |
+| test.py:16:6:16:14 | ControlFlowNode for functools | runtime | Missing module functools |
+| test.py:16:6:16:14 | ControlFlowNode for functools | test.py:30 from import | Missing module functools |
 | test.py:16:22:16:25 | ControlFlowNode for func | runtime | Unknown value |
 | test.py:16:22:16:25 | ControlFlowNode for func | test.py:30 from import | Function func3 |
 | test.py:18:21:18:24 | ControlFlowNode for args | runtime | instance of tuple |
diff --git a/python/ql/test/library-tests/PointsTo/general/GlobalPointsTo.expected b/python/ql/test/library-tests/PointsTo/general/GlobalPointsTo.expected
index 9040788529a8..85c8304b58aa 100644
--- a/python/ql/test/library-tests/PointsTo/general/GlobalPointsTo.expected
+++ b/python/ql/test/library-tests/PointsTo/general/GlobalPointsTo.expected
@@ -87,10 +87,6 @@
 | Module pointsto_test | 69 | ControlFlowNode for X | class X |
 | Module pointsto_test | 70 | ControlFlowNode for Attribute | deco() |
 | Module pointsto_test | 70 | ControlFlowNode for X | class X |
-| Module pointsto_test | 72 | ControlFlowNode for ImportExpr | Module abc |
-| Module pointsto_test | 72 | ControlFlowNode for ImportMember | Function abstractmethod |
-| Module pointsto_test | 72 | ControlFlowNode for abstractmethod | Function abstractmethod |
-| Module pointsto_test | 73 | ControlFlowNode for abstractmethod | Function abstractmethod |
 | Module pointsto_test | 75 | ControlFlowNode for C | class C |
 | Module pointsto_test | 75 | ControlFlowNode for C() | C() |
 | Module pointsto_test | 75 | ControlFlowNode for type | builtin-class type |
diff --git a/python/ql/test/library-tests/PointsTo/general/LocalPointsTo.expected b/python/ql/test/library-tests/PointsTo/general/LocalPointsTo.expected
index b94942506153..fc4970a8c0cc 100644
--- a/python/ql/test/library-tests/PointsTo/general/LocalPointsTo.expected
+++ b/python/ql/test/library-tests/PointsTo/general/LocalPointsTo.expected
@@ -95,10 +95,6 @@
 | 69 | ControlFlowNode for X | class X |
 | 70 | ControlFlowNode for Attribute | deco() |
 | 70 | ControlFlowNode for X | class X |
-| 72 | ControlFlowNode for ImportExpr | Module abc |
-| 72 | ControlFlowNode for ImportMember | Function abstractmethod |
-| 72 | ControlFlowNode for abstractmethod | Function abstractmethod |
-| 73 | ControlFlowNode for abstractmethod | Function abstractmethod |
 | 75 | ControlFlowNode for C | class C |
 | 75 | ControlFlowNode for C() | C() |
 | 75 | ControlFlowNode for type | builtin-class type |
diff --git a/python/ql/test/library-tests/PointsTo/general/LocalPointsToType.expected b/python/ql/test/library-tests/PointsTo/general/LocalPointsToType.expected
index 15f283ac4b97..92dde139cdec 100644
--- a/python/ql/test/library-tests/PointsTo/general/LocalPointsToType.expected
+++ b/python/ql/test/library-tests/PointsTo/general/LocalPointsToType.expected
@@ -95,10 +95,6 @@
 | 69 | ControlFlowNode for Attribute | Attribute | builtin-class method |
 | 69 | ControlFlowNode for X | class X | builtin-class type |
 | 70 | ControlFlowNode for X | class X | builtin-class type |
-| 72 | ControlFlowNode for ImportExpr | Module abc | builtin-class module |
-| 72 | ControlFlowNode for ImportMember | Function abstractmethod | builtin-class function |
-| 72 | ControlFlowNode for abstractmethod | Function abstractmethod | builtin-class function |
-| 73 | ControlFlowNode for abstractmethod | Function abstractmethod | builtin-class function |
 | 75 | ControlFlowNode for C | class C | builtin-class type |
 | 75 | ControlFlowNode for C() | C() | class C |
 | 75 | ControlFlowNode for type | builtin-class type | builtin-class type |
diff --git a/python/ql/test/library-tests/PointsTo/guarded/PointsTo.expected b/python/ql/test/library-tests/PointsTo/guarded/PointsTo.expected
index b6872c3a4e62..8c83b21f782c 100644
--- a/python/ql/test/library-tests/PointsTo/guarded/PointsTo.expected
+++ b/python/ql/test/library-tests/PointsTo/guarded/PointsTo.expected
@@ -70,7 +70,3 @@
 | type_test.py | 55 | ControlFlowNode for arg | class E | 29 |
 | type_test.py | 67 | ControlFlowNode for x | float 1.0 | 62 |
 | type_test.py | 67 | ControlFlowNode for x | int 0 | 62 |
-| type_test.py | 77 | ControlFlowNode for IntegerLiteral | int 0 | 77 |
-| type_test.py | 83 | ControlFlowNode for IntegerLiteral | int 0 | 83 |
-| type_test.py | 89 | ControlFlowNode for IntegerLiteral | int 0 | 89 |
-| type_test.py | 95 | ControlFlowNode for IntegerLiteral | int 0 | 95 |
diff --git a/python/ql/test/library-tests/PointsTo/guarded/PointsToWithType.expected b/python/ql/test/library-tests/PointsTo/guarded/PointsToWithType.expected
index 2f71fc6107b6..9993b96d18a6 100644
--- a/python/ql/test/library-tests/PointsTo/guarded/PointsToWithType.expected
+++ b/python/ql/test/library-tests/PointsTo/guarded/PointsToWithType.expected
@@ -70,7 +70,3 @@
 | type_test.py | 55 | ControlFlowNode for arg | class E | builtin-class type | 29 |
 | type_test.py | 67 | ControlFlowNode for x | float 1.0 | builtin-class float | 62 |
 | type_test.py | 67 | ControlFlowNode for x | int 0 | builtin-class int | 62 |
-| type_test.py | 77 | ControlFlowNode for IntegerLiteral | int 0 | builtin-class int | 77 |
-| type_test.py | 83 | ControlFlowNode for IntegerLiteral | int 0 | builtin-class int | 83 |
-| type_test.py | 89 | ControlFlowNode for IntegerLiteral | int 0 | builtin-class int | 89 |
-| type_test.py | 95 | ControlFlowNode for IntegerLiteral | int 0 | builtin-class int | 95 |
diff --git a/python/ql/test/library-tests/PointsTo/new/NameSpace.expected b/python/ql/test/library-tests/PointsTo/new/NameSpace.expected
index 6508ef5b13f3..43f4158ba7fa 100644
--- a/python/ql/test/library-tests/PointsTo/new/NameSpace.expected
+++ b/python/ql/test/library-tests/PointsTo/new/NameSpace.expected
@@ -85,15 +85,12 @@
 | h_classes.py:23 | Class Base | __init__ | Function __init__ |
 | h_classes.py:48 | Class D | m | Function f |
 | h_classes.py:48 | Class D | n | Function n |
-| i_imports.py:0 | Module code.i_imports | BytesIO | builtin-class _io.BytesIO |
-| i_imports.py:0 | Module code.i_imports | StringIO | builtin-class _io.StringIO |
 | i_imports.py:0 | Module code.i_imports | _io | Module _io |
 | i_imports.py:0 | Module code.i_imports | a | int 1 |
 | i_imports.py:0 | Module code.i_imports | argv | list object |
 | i_imports.py:0 | Module code.i_imports | b | int 2 |
 | i_imports.py:0 | Module code.i_imports | c | int 3 |
 | i_imports.py:0 | Module code.i_imports | code | Module code |
-| i_imports.py:0 | Module code.i_imports | io | Module io |
 | i_imports.py:0 | Module code.i_imports | module1 | Module code.test_package.module1 |
 | i_imports.py:0 | Module code.i_imports | module2 | Module code.test_package.module2 |
 | i_imports.py:0 | Module code.i_imports | p | int 1 |
diff --git a/python/ql/test/library-tests/PointsTo/new/PointsToWithContext.expected b/python/ql/test/library-tests/PointsTo/new/PointsToWithContext.expected
index cd1a08a4dac2..04c794f49adf 100644
--- a/python/ql/test/library-tests/PointsTo/new/PointsToWithContext.expected
+++ b/python/ql/test/library-tests/PointsTo/new/PointsToWithContext.expected
@@ -475,14 +475,6 @@
 | i_imports.py:31 | ControlFlowNode for Attribute | builtin-class _io.BytesIO | builtin-class type | 31 | import |
 | i_imports.py:31 | ControlFlowNode for BytesIO | builtin-class _io.BytesIO | builtin-class type | 31 | import |
 | i_imports.py:31 | ControlFlowNode for _io | Module _io | builtin-class module | 29 | import |
-| i_imports.py:33 | ControlFlowNode for ImportExpr | Module io | builtin-class module | 33 | import |
-| i_imports.py:33 | ControlFlowNode for io | Module io | builtin-class module | 33 | import |
-| i_imports.py:34 | ControlFlowNode for Attribute | builtin-class _io.StringIO | builtin-class type | 55 | import |
-| i_imports.py:34 | ControlFlowNode for StringIO | builtin-class _io.StringIO | builtin-class type | 55 | import |
-| i_imports.py:34 | ControlFlowNode for io | Module io | builtin-class module | 33 | import |
-| i_imports.py:35 | ControlFlowNode for Attribute | builtin-class _io.BytesIO | builtin-class type | 55 | import |
-| i_imports.py:35 | ControlFlowNode for BytesIO | builtin-class _io.BytesIO | builtin-class type | 55 | import |
-| i_imports.py:35 | ControlFlowNode for io | Module io | builtin-class module | 33 | import |
 | i_imports.py:37 | ControlFlowNode for ImportExpr | Module code | builtin-class module | 37 | import |
 | i_imports.py:37 | ControlFlowNode for code | Module code | builtin-class module | 37 | import |
 | i_imports.py:38 | ControlFlowNode for Attribute | Function f2 | builtin-class function | 24 | import |
diff --git a/python/ql/test/library-tests/PointsTo/new/PointsToWithType.expected b/python/ql/test/library-tests/PointsTo/new/PointsToWithType.expected
index 783237edc9d3..15e9081dd206 100644
--- a/python/ql/test/library-tests/PointsTo/new/PointsToWithType.expected
+++ b/python/ql/test/library-tests/PointsTo/new/PointsToWithType.expected
@@ -572,14 +572,6 @@
 | i_imports.py:31 | ControlFlowNode for Attribute | builtin-class _io.BytesIO | builtin-class type | 31 |
 | i_imports.py:31 | ControlFlowNode for BytesIO | builtin-class _io.BytesIO | builtin-class type | 31 |
 | i_imports.py:31 | ControlFlowNode for _io | Module _io | builtin-class module | 29 |
-| i_imports.py:33 | ControlFlowNode for ImportExpr | Module io | builtin-class module | 33 |
-| i_imports.py:33 | ControlFlowNode for io | Module io | builtin-class module | 33 |
-| i_imports.py:34 | ControlFlowNode for Attribute | builtin-class _io.StringIO | builtin-class type | 55 |
-| i_imports.py:34 | ControlFlowNode for StringIO | builtin-class _io.StringIO | builtin-class type | 55 |
-| i_imports.py:34 | ControlFlowNode for io | Module io | builtin-class module | 33 |
-| i_imports.py:35 | ControlFlowNode for Attribute | builtin-class _io.BytesIO | builtin-class type | 55 |
-| i_imports.py:35 | ControlFlowNode for BytesIO | builtin-class _io.BytesIO | builtin-class type | 55 |
-| i_imports.py:35 | ControlFlowNode for io | Module io | builtin-class module | 33 |
 | i_imports.py:37 | ControlFlowNode for ImportExpr | Module code | builtin-class module | 37 |
 | i_imports.py:37 | ControlFlowNode for code | Module code | builtin-class module | 37 |
 | i_imports.py:38 | ControlFlowNode for Attribute | Function f2 | builtin-class function | 24 |
diff --git a/python/ql/test/library-tests/PointsTo/new/Values.expected b/python/ql/test/library-tests/PointsTo/new/Values.expected
index 5466ca854457..396249f9b94e 100644
--- a/python/ql/test/library-tests/PointsTo/new/Values.expected
+++ b/python/ql/test/library-tests/PointsTo/new/Values.expected
@@ -373,11 +373,9 @@
 | i_imports.py:30 | ControlFlowNode for _io | import | Module _io | builtin-class module |
 | i_imports.py:31 | ControlFlowNode for Attribute | import | builtin-class _io.BytesIO | builtin-class type |
 | i_imports.py:31 | ControlFlowNode for _io | import | Module _io | builtin-class module |
-| i_imports.py:33 | ControlFlowNode for ImportExpr | import | Module io | builtin-class module |
-| i_imports.py:34 | ControlFlowNode for Attribute | import | builtin-class _io.StringIO | builtin-class type |
-| i_imports.py:34 | ControlFlowNode for io | import | Module io | builtin-class module |
-| i_imports.py:35 | ControlFlowNode for Attribute | import | builtin-class _io.BytesIO | builtin-class type |
-| i_imports.py:35 | ControlFlowNode for io | import | Module io | builtin-class module |
+| i_imports.py:33 | ControlFlowNode for ImportExpr | import | Missing module io | builtin-class module |
+| i_imports.py:34 | ControlFlowNode for io | import | Missing module io | builtin-class module |
+| i_imports.py:35 | ControlFlowNode for io | import | Missing module io | builtin-class module |
 | i_imports.py:37 | ControlFlowNode for ImportExpr | import | Package code | builtin-class module |
 | i_imports.py:38 | ControlFlowNode for Attribute | import | Function f2 | builtin-class function |
 | i_imports.py:38 | ControlFlowNode for Attribute | import | Module code.n_nesting | builtin-class module |
diff --git a/python/ql/test/library-tests/PointsTo/regressions/wrong/module-imports/conflict-stdlib/LocalModuleWithRef.expected b/python/ql/test/library-tests/PointsTo/regressions/wrong/module-imports/conflict-stdlib/LocalModuleWithRef.expected
index 92e569f09e6e..f79649b8a1a8 100644
--- a/python/ql/test/library-tests/PointsTo/regressions/wrong/module-imports/conflict-stdlib/LocalModuleWithRef.expected
+++ b/python/ql/test/library-tests/PointsTo/regressions/wrong/module-imports/conflict-stdlib/LocalModuleWithRef.expected
@@ -1,3 +1,2 @@
-| Local module | code-invalid-package-name/cmd.py:0:0:0:0 | Module cmd | referenced in external file called | pdb.py |
 | Local module | code-invalid-package-name/cmd.py:0:0:0:0 | Module cmd | referenced in local file called | test_ok.py |
 | Local module | code-invalid-package-name/unique_name.py:0:0:0:0 | Module unique_name | referenced in local file called | unique_name_use.py |
diff --git a/python/ql/test/library-tests/PointsTo/regressions/wrong/module-imports/conflict-stdlib/ModuleWithLocalRef.expected b/python/ql/test/library-tests/PointsTo/regressions/wrong/module-imports/conflict-stdlib/ModuleWithLocalRef.expected
index cf5d7560b9ae..4c08caeec0bc 100644
--- a/python/ql/test/library-tests/PointsTo/regressions/wrong/module-imports/conflict-stdlib/ModuleWithLocalRef.expected
+++ b/python/ql/test/library-tests/PointsTo/regressions/wrong/module-imports/conflict-stdlib/ModuleWithLocalRef.expected
@@ -1,3 +1,3 @@
 | Module 'cmd' (local, not in stdlib, not missing) referenced in local file | code-invalid-package-name/test_ok.py:1 |
-| Module 'pdb' (external, in stdlib, not missing) referenced in local file | code-invalid-package-name/test_fail.py:3 |
+| Module 'pdb' (external, not in stdlib, missing) referenced in local file | code-invalid-package-name/test_fail.py:3 |
 | Module 'unique_name' (local, not in stdlib, not missing) referenced in local file | code-invalid-package-name/unique_name_use.py:1 |
diff --git a/python/ql/test/library-tests/dataflow/coverage-py3/argumentRoutingTest.expected b/python/ql/test/library-tests/dataflow/coverage-py3/argumentRoutingTest.expected
index 8ec8033d086e..8f2ca113e3c3 100644
--- a/python/ql/test/library-tests/dataflow/coverage-py3/argumentRoutingTest.expected
+++ b/python/ql/test/library-tests/dataflow/coverage-py3/argumentRoutingTest.expected
@@ -1,2 +1,6 @@
 testFailures
+| classes.py:54:44:54:107 | Comment #$ arg1="with_length_hint" func=With_length_hint.__length_hint__ | Missing result:arg1="with_length_hint" |
+| classes.py:54:44:54:107 | Comment #$ arg1="with_length_hint" func=With_length_hint.__length_hint__ | Missing result:func=With_length_hint.__length_hint__ |
+| classes.py:71:32:71:77 | Comment #$ arg1="with_index" func=With_index.__index__ | Missing result:arg1="with_index" |
+| classes.py:71:32:71:77 | Comment #$ arg1="with_index" func=With_index.__index__ | Missing result:func=With_index.__index__ |
 failures
diff --git a/python/ql/test/library-tests/dataflow/fieldflow/UnresolvedCalls.expected b/python/ql/test/library-tests/dataflow/fieldflow/UnresolvedCalls.expected
index 8ec8033d086e..961827020749 100644
--- a/python/ql/test/library-tests/dataflow/fieldflow/UnresolvedCalls.expected
+++ b/python/ql/test/library-tests/dataflow/fieldflow/UnresolvedCalls.expected
@@ -1,2 +1,6 @@
 testFailures
+| test.py:4:17:4:60 | ControlFlowNode for Attribute() | Unexpected result: unresolved_call=os.path.dirname(..) |
+| test.py:4:33:4:59 | ControlFlowNode for Attribute() | Unexpected result: unresolved_call=os.path.dirname(..) |
+| test_dict.py:4:17:4:60 | ControlFlowNode for Attribute() | Unexpected result: unresolved_call=os.path.dirname(..) |
+| test_dict.py:4:33:4:59 | ControlFlowNode for Attribute() | Unexpected result: unresolved_call=os.path.dirname(..) |
 failures
diff --git a/python/ql/test/library-tests/frameworks/stdlib/InlineTaintTest.expected b/python/ql/test/library-tests/frameworks/stdlib/InlineTaintTest.expected
index 366de37b8677..847392ab5942 100644
--- a/python/ql/test/library-tests/frameworks/stdlib/InlineTaintTest.expected
+++ b/python/ql/test/library-tests/frameworks/stdlib/InlineTaintTest.expected
@@ -1,4 +1,5 @@
 argumentToEnsureNotTaintedNotMarkedAsSpurious
 untaintedArgumentToEnsureTaintedNotMarkedAsMissing
 testFailures
+| threat_models.py:40:35:40:55 | Comment # $ SPURIOUS: tainted | Fixed spurious result:tainted= |
 failures
diff --git a/python/ql/test/library-tests/modules/duplicate_name/Modules.expected b/python/ql/test/library-tests/modules/duplicate_name/Modules.expected
index 45bd0378c226..bd3437af6501 100644
--- a/python/ql/test/library-tests/modules/duplicate_name/Modules.expected
+++ b/python/ql/test/library-tests/modules/duplicate_name/Modules.expected
@@ -1,3 +1 @@
 | sqlite3 | 2 | 1 |
-| sqlite3.__init__ | 2 | 1 |
-| sqlite3.dump | 2 | 1 |
diff --git a/python/ql/test/query-tests/Security/CWE-732-WeakFilePermissions/WeakFilePermissions.expected b/python/ql/test/query-tests/Security/CWE-732-WeakFilePermissions/WeakFilePermissions.expected
index 3bfb6fe4f88a..762d2599c2d8 100644
--- a/python/ql/test/query-tests/Security/CWE-732-WeakFilePermissions/WeakFilePermissions.expected
+++ b/python/ql/test/query-tests/Security/CWE-732-WeakFilePermissions/WeakFilePermissions.expected
@@ -2,6 +2,5 @@
 | test.py:8:1:8:20 | ControlFlowNode for Attribute() | Overly permissive mask in chmod sets file to world writable. |
 | test.py:9:1:9:21 | ControlFlowNode for Attribute() | Overly permissive mask in chmod sets file to world writable. |
 | test.py:11:1:11:21 | ControlFlowNode for Attribute() | Overly permissive mask in chmod sets file to group readable. |
-| test.py:13:1:13:28 | ControlFlowNode for Attribute() | Overly permissive mask in chmod sets file to group writable. |
 | test.py:14:1:14:19 | ControlFlowNode for Attribute() | Overly permissive mask in chmod sets file to group writable. |
 | test.py:16:1:16:25 | ControlFlowNode for Attribute() | Overly permissive mask in open sets file to world readable. |
diff --git a/python/ql/test/query-tests/Statements/no_effect/StatementNoEffect.expected b/python/ql/test/query-tests/Statements/no_effect/StatementNoEffect.expected
index 5b1626128a44..9b534e55d7f1 100644
--- a/python/ql/test/query-tests/Statements/no_effect/StatementNoEffect.expected
+++ b/python/ql/test/query-tests/Statements/no_effect/StatementNoEffect.expected
@@ -1,3 +1,5 @@
+| assert_raises.py:9:13:9:19 | ExprStmt | This statement has no effect. |
+| assert_raises.py:11:13:11:16 | ExprStmt | This statement has no effect. |
 | test.py:24:1:24:3 | ExprStmt | This statement has no effect. |
 | test.py:25:1:25:13 | ExprStmt | This statement has no effect. |
 | test.py:26:1:26:6 | ExprStmt | This statement has no effect. |

From 4a291147e08e75cdc023e166bfbd86aef6d66817 Mon Sep 17 00:00:00 2001
From: Rasmus Lerchedahl Petersen <yoff@github.com>
Date: Thu, 10 Oct 2024 13:45:08 +0200
Subject: [PATCH 314/347] Python: only look for the py2 stdlib if we extract
 std lib

---
 python/extractor/semmle/populator.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/python/extractor/semmle/populator.py b/python/extractor/semmle/populator.py
index c2d6b6277c90..a1be196ffaf6 100644
--- a/python/extractor/semmle/populator.py
+++ b/python/extractor/semmle/populator.py
@@ -67,7 +67,7 @@ def main(sys_path = sys.path[:]):
         update_analysis_version(last_version)
 
     found_py2 = False
-    if get_analysis_major_version() == 2:
+    if get_analysis_major_version() == 2 and options.extract_stdlib:
         # Setup `sys_path` to use the Python 2 standard library
         sys_path, found_py2 = get_py2_sys_path(logger, sys_path)
 

From c013d4a59c94f396ad57cc5574be3ce16b0f46ea Mon Sep 17 00:00:00 2001
From: Rasmus Lerchedahl Petersen <yoff@github.com>
Date: Thu, 10 Oct 2024 14:11:58 +0200
Subject: [PATCH 315/347] Python: update test expectations

---
 .../PointsTo/class_properties/ClassValues.expected          | 6 ++----
 .../test/2/library-tests/PointsTo/imports2/Runtime.expected | 4 ----
 .../PointsTo/imports2/RuntimeWithType.expected              | 4 ----
 python/ql/test/2/library-tests/six/pointsto.expected        | 4 ++--
 python/ql/test/2/query-tests/Summary/LinesOfCode.expected   | 2 +-
 5 files changed, 5 insertions(+), 15 deletions(-)

diff --git a/python/ql/test/2/library-tests/PointsTo/class_properties/ClassValues.expected b/python/ql/test/2/library-tests/PointsTo/class_properties/ClassValues.expected
index 9835b2573b19..56d3bde865f4 100644
--- a/python/ql/test/2/library-tests/PointsTo/class_properties/ClassValues.expected
+++ b/python/ql/test/2/library-tests/PointsTo/class_properties/ClassValues.expected
@@ -1,12 +1,10 @@
-| mapping | builtin-class collections.defaultdict |
 | mapping | builtin-class dict |
 | mapping | class MyDictSubclass |
-| mapping | class MyMappingABC |
-| mapping | class OrderedDict |
 | neither sequence nor mapping | builtin-class set |
+| neither sequence nor mapping | class MyMappingABC |
+| neither sequence nor mapping | class MySequenceABC |
 | sequence | builtin-class list |
 | sequence | builtin-class str |
 | sequence | builtin-class tuple |
 | sequence | builtin-class unicode |
-| sequence | class MySequenceABC |
 | sequence | class MySequenceImpl |
diff --git a/python/ql/test/2/library-tests/PointsTo/imports2/Runtime.expected b/python/ql/test/2/library-tests/PointsTo/imports2/Runtime.expected
index 345f112dccb9..fe825523ca21 100644
--- a/python/ql/test/2/library-tests/PointsTo/imports2/Runtime.expected
+++ b/python/ql/test/2/library-tests/PointsTo/imports2/Runtime.expected
@@ -44,14 +44,10 @@
 | test.py | 15 | ControlFlowNode for moduleX | Module package.moduleX | Entry node for Module package.moduleX |
 | test.py | 16 | ControlFlowNode for Attribute | class Y | ControlFlowNode for ClassExpr |
 | test.py | 16 | ControlFlowNode for moduleX | Module package.moduleX | Entry node for Module package.moduleX |
-| test.py | 19 | ControlFlowNode for ImportExpr | Module tty | ControlFlowNode for ImportExpr |
-| test.py | 19 | ControlFlowNode for tty | Module tty | ControlFlowNode for ImportExpr |
 | test.py | 22 | ControlFlowNode for Attribute | Builtin-function exc_info | ControlFlowNode for from sys import * |
 | test.py | 22 | ControlFlowNode for x | Module package.x | Entry node for Module package.x |
 | test.py | 24 | ControlFlowNode for IntegerLiteral | int 0 | ControlFlowNode for IntegerLiteral |
 | test.py | 24 | ControlFlowNode for argv | int 0 | ControlFlowNode for IntegerLiteral |
 | test.py | 27 | ControlFlowNode for ImportExpr | Module sys | ControlFlowNode for ImportExpr |
 | test.py | 31 | ControlFlowNode for argv | list object | ControlFlowNode for from sys import * |
-| test.py | 33 | ControlFlowNode for ImportExpr | Module socket | ControlFlowNode for ImportExpr |
-| test.py | 34 | ControlFlowNode for timeout | builtin-class socket.timeout | ControlFlowNode for from _socket import * |
 | x.py | 2 | ControlFlowNode for ImportExpr | Module sys | ControlFlowNode for ImportExpr |
diff --git a/python/ql/test/2/library-tests/PointsTo/imports2/RuntimeWithType.expected b/python/ql/test/2/library-tests/PointsTo/imports2/RuntimeWithType.expected
index 7082c15e4104..e55d70d073df 100644
--- a/python/ql/test/2/library-tests/PointsTo/imports2/RuntimeWithType.expected
+++ b/python/ql/test/2/library-tests/PointsTo/imports2/RuntimeWithType.expected
@@ -44,14 +44,10 @@
 | test.py | 15 | ControlFlowNode for moduleX | Module package.moduleX | builtin-class module | Entry node for Module package.moduleX |
 | test.py | 16 | ControlFlowNode for Attribute | class Y | builtin-class type | ControlFlowNode for ClassExpr |
 | test.py | 16 | ControlFlowNode for moduleX | Module package.moduleX | builtin-class module | Entry node for Module package.moduleX |
-| test.py | 19 | ControlFlowNode for ImportExpr | Module tty | builtin-class module | ControlFlowNode for ImportExpr |
-| test.py | 19 | ControlFlowNode for tty | Module tty | builtin-class module | ControlFlowNode for ImportExpr |
 | test.py | 22 | ControlFlowNode for Attribute | Builtin-function exc_info | builtin-class builtin_function_or_method | ControlFlowNode for from sys import * |
 | test.py | 22 | ControlFlowNode for x | Module package.x | builtin-class module | Entry node for Module package.x |
 | test.py | 24 | ControlFlowNode for IntegerLiteral | int 0 | builtin-class int | ControlFlowNode for IntegerLiteral |
 | test.py | 24 | ControlFlowNode for argv | int 0 | builtin-class int | ControlFlowNode for IntegerLiteral |
 | test.py | 27 | ControlFlowNode for ImportExpr | Module sys | builtin-class module | ControlFlowNode for ImportExpr |
 | test.py | 31 | ControlFlowNode for argv | list object | builtin-class list | ControlFlowNode for from sys import * |
-| test.py | 33 | ControlFlowNode for ImportExpr | Module socket | builtin-class module | ControlFlowNode for ImportExpr |
-| test.py | 34 | ControlFlowNode for timeout | builtin-class socket.timeout | builtin-class type | ControlFlowNode for from _socket import * |
 | x.py | 2 | ControlFlowNode for ImportExpr | Module sys | builtin-class module | ControlFlowNode for ImportExpr |
diff --git a/python/ql/test/2/library-tests/six/pointsto.expected b/python/ql/test/2/library-tests/six/pointsto.expected
index ca063a000e31..1d2e4e7f74e2 100644
--- a/python/ql/test/2/library-tests/six/pointsto.expected
+++ b/python/ql/test/2/library-tests/six/pointsto.expected
@@ -1,7 +1,7 @@
 | six | Package six |
 | six.moves | Package six.moves |
-| six.moves.http_client | Module httplib |
-| six.moves.http_client.HTTPConnection | class HTTPConnection |
+| six.moves.http_client | Missing module httplib |
+| six.moves.http_client.HTTPConnection | Missing module attribute httplib.HTTPConnection |
 | six.moves.range | builtin-class xrange |
 | six.moves.urllib | Package six.moves.urllib |
 | six.moves.urllib.parse | Module six.moves.urllib_parse |
diff --git a/python/ql/test/2/query-tests/Summary/LinesOfCode.expected b/python/ql/test/2/query-tests/Summary/LinesOfCode.expected
index 5aa95ec1ce55..74c7709367a7 100644
--- a/python/ql/test/2/query-tests/Summary/LinesOfCode.expected
+++ b/python/ql/test/2/query-tests/Summary/LinesOfCode.expected
@@ -1 +1 @@
-| 38 |
+| 11 |

From 22588c9f85fcb0da45a63844abd9b3a7cabf3f8d Mon Sep 17 00:00:00 2001
From: Rasmus Lerchedahl Petersen <yoff@github.com>
Date: Thu, 10 Oct 2024 15:25:04 +0200
Subject: [PATCH 316/347] Python: update ectractor version

---
 python/extractor/semmle/util.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/python/extractor/semmle/util.py b/python/extractor/semmle/util.py
index 8e1a371fc717..41af1d497b32 100644
--- a/python/extractor/semmle/util.py
+++ b/python/extractor/semmle/util.py
@@ -10,7 +10,7 @@
 
 #Semantic version of extractor.
 #Update this if any changes are made
-VERSION = "6.1.2"
+VERSION = "7.0.0"
 
 PY_EXTENSIONS = ".py", ".pyw"
 

From e2eb08b543f1a5299806c9cd9f0b8d4f8059e7fb Mon Sep 17 00:00:00 2001
From: Rasmus Lerchedahl Petersen <yoff@github.com>
Date: Fri, 11 Oct 2024 14:03:43 +0200
Subject: [PATCH 317/347] Python: improve messaging

---
 python/extractor/semmle/cmdline.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/python/extractor/semmle/cmdline.py b/python/extractor/semmle/cmdline.py
index 79f974279bcb..47007c065fdc 100644
--- a/python/extractor/semmle/cmdline.py
+++ b/python/extractor/semmle/cmdline.py
@@ -228,7 +228,7 @@ def parse(command_line):
 
     if 'CODEQL_EXTRACTOR_PYTHON_DONT_EXTRACT_STDLIB' in os.environ:
         options.extract_stdlib = False
-        print ("Warning: CODEQL_EXTRACTOR_PYTHON_DONT_EXTRACT_STDLIB is deprecated; the default is now to not extract the standard library.")
+        print ("WARNING: CODEQL_EXTRACTOR_PYTHON_DONT_EXTRACT_STDLIB is deprecated; the default is now to not extract the standard library.")
 
     if 'CODEQL_EXTRACTOR_PYTHON_EXTRACT_STDLIB' in os.environ:
         options.extract_stdlib = True
@@ -236,7 +236,9 @@ def parse(command_line):
     options.prune = True
 
     if options.extract_stdlib:
-        print ("Warning: The analysis will extract the standard library. This behavior is deprecated and will be removed in a future release. We expect it to be gone in CLI version 2.20.0.")
+        print ("WARNING: The analysis will extract the standard library. This behavior is deprecated and will be removed in a future release. We expect it to be gone in CLI version 2.20.0.")
+    else:
+        print ("INFO: The Python extractor has recently stopped extracting the standard library by default. If you encounter problems, please let us know by submitting an issue to https://github.com/github/codeql. It is possible to re-enable extraction of the standard library by setting the environment variable CODEQL_EXTRACTOR_PYTHON_EXTRACT_STDLIB.")
 
     return options, args
 

From 56506943139faccf06a7efcb36dab37d8032fe4e Mon Sep 17 00:00:00 2001
From: Rasmus Lerchedahl Petersen <yoff@github.com>
Date: Fri, 11 Oct 2024 14:10:32 +0200
Subject: [PATCH 318/347] Python: update tests

---
 .../library-tests/frameworks/stdlib/InlineTaintTest.expected    | 1 -
 python/ql/test/library-tests/frameworks/stdlib/threat_models.py | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/python/ql/test/library-tests/frameworks/stdlib/InlineTaintTest.expected b/python/ql/test/library-tests/frameworks/stdlib/InlineTaintTest.expected
index 847392ab5942..366de37b8677 100644
--- a/python/ql/test/library-tests/frameworks/stdlib/InlineTaintTest.expected
+++ b/python/ql/test/library-tests/frameworks/stdlib/InlineTaintTest.expected
@@ -1,5 +1,4 @@
 argumentToEnsureNotTaintedNotMarkedAsSpurious
 untaintedArgumentToEnsureTaintedNotMarkedAsMissing
 testFailures
-| threat_models.py:40:35:40:55 | Comment # $ SPURIOUS: tainted | Fixed spurious result:tainted= |
 failures
diff --git a/python/ql/test/library-tests/frameworks/stdlib/threat_models.py b/python/ql/test/library-tests/frameworks/stdlib/threat_models.py
index 23b800ce576e..4b6a1a066e7f 100644
--- a/python/ql/test/library-tests/frameworks/stdlib/threat_models.py
+++ b/python/ql/test/library-tests/frameworks/stdlib/threat_models.py
@@ -37,7 +37,7 @@
 ensure_tainted(explicit_argv_parsing.foo) # $ tainted
 
 fake_args = parser.parse_args(["<foo>"])
-ensure_not_tainted(fake_args.foo) # $ SPURIOUS: tainted
+ensure_not_tainted(fake_args.foo)
 
 ########################################
 # reading input from stdin

From fc298b23c939863c2f9ad84b46902b400ea2b9f5 Mon Sep 17 00:00:00 2001
From: Arthur Baars <aibaars@github.com>
Date: Fri, 11 Oct 2024 15:53:50 +0200
Subject: [PATCH 319/347] Rust: address comment

---
 .../rust/controlflow/internal/ControlFlowGraphImpl.qll | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/rust/ql/lib/codeql/rust/controlflow/internal/ControlFlowGraphImpl.qll b/rust/ql/lib/codeql/rust/controlflow/internal/ControlFlowGraphImpl.qll
index d73678b216c1..795ae50d363d 100644
--- a/rust/ql/lib/codeql/rust/controlflow/internal/ControlFlowGraphImpl.qll
+++ b/rust/ql/lib/codeql/rust/controlflow/internal/ControlFlowGraphImpl.qll
@@ -273,11 +273,11 @@ class IfExprTree extends PostOrderTree instanceof IfExpr {
   }
 }
 
-class FormatArgsExprTree extends StandardPostOrderTree instanceof FormatArgsExpr {
+class FormatArgsExprTree extends StandardPostOrderTree, FormatArgsExpr {
   override AstNode getChildNode(int i) {
-    i = -1 and result = super.getTemplate()
+    i = -1 and result = this.getTemplate()
     or
-    result = super.getArg(i).getExpr()
+    result = this.getArg(i).getExpr()
   }
 }
 
@@ -441,14 +441,14 @@ class MacroCallTree extends ControlFlowTree, MacroCall {
   override predicate last(AstNode last, Completion c) {
     last(this.getExpanded(), last, c)
     or
-    not exists(super.getExpanded()) and
+    not exists(this.getExpanded()) and
     last = this and
     completionIsValidFor(c, last)
   }
 
   override predicate succ(AstNode pred, AstNode succ, Completion c) { none() }
 
-  override predicate propagatesAbnormal(AstNode child) { none() }
+  override predicate propagatesAbnormal(AstNode child) { child = this.getExpanded() }
 }
 
 class MacroExprTree extends StandardPostOrderTree, MacroExpr {

From c4256f21c728b8082c42deefa1f04f3fceb5103b Mon Sep 17 00:00:00 2001
From: Geoffrey White <40627776+geoffw0@users.noreply.github.com>
Date: Fri, 11 Oct 2024 17:18:41 +0100
Subject: [PATCH 320/347] Rust: Fix out-of-date spurious tags.

---
 rust/ql/test/query-tests/unusedentities/main.rs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/rust/ql/test/query-tests/unusedentities/main.rs b/rust/ql/test/query-tests/unusedentities/main.rs
index 788918ffcba1..9b4fdb0cdd19 100644
--- a/rust/ql/test/query-tests/unusedentities/main.rs
+++ b/rust/ql/test/query-tests/unusedentities/main.rs
@@ -111,7 +111,7 @@ fn arrays() {
 
     println!("lets use {:?}", js);
 
-    for k // SPURIOUS: unused variable [macros not yet supported]
+    for k
 	in ks
 	{
         println!("lets use {}", k); // [unreachable FALSE POSITIVE]
@@ -166,12 +166,12 @@ fn loops() {
 
     for _ in 1..10 {}
 
-    for x // SPURIOUS: unused variable [macros not yet supported]
+    for x
     in 1..10 {
         println!("x is {}", x);
     }
 
-    for x // SPURIOUS: unused variable [macros not yet supported]
+    for x
     in 1..10 {
         assert!(x != 11);
     }

From b0ea17502189e0844084aa0831fcb274597f070a Mon Sep 17 00:00:00 2001
From: Tom Hvitved <hvitved@github.com>
Date: Fri, 11 Oct 2024 10:40:23 +0200
Subject: [PATCH 321/347] Rust: Add more variables tests

---
 .../test/library-tests/variables/Cfg.expected | 587 +++++++++++++-----
 .../variables/variables.expected              | 168 ++++-
 .../test/library-tests/variables/variables.rs | 125 +++-
 3 files changed, 692 insertions(+), 188 deletions(-)

diff --git a/rust/ql/test/library-tests/variables/Cfg.expected b/rust/ql/test/library-tests/variables/Cfg.expected
index d8a19287f4f0..1c04117a2ccd 100644
--- a/rust/ql/test/library-tests/variables/Cfg.expected
+++ b/rust/ql/test/library-tests/variables/Cfg.expected
@@ -734,13 +734,12 @@ edges
 | variables.rs:342:5:342:16 | CallExpr | variables.rs:337:13:343:1 | BlockExpr |  |
 | variables.rs:342:5:342:17 | ExprStmt | variables.rs:342:5:342:13 | PathExpr |  |
 | variables.rs:342:15:342:15 | i | variables.rs:342:5:342:16 | CallExpr |  |
-| variables.rs:345:1:349:1 | enter mutate_param | variables.rs:345:17:345:17 | x |  |
-| variables.rs:345:1:349:1 | exit mutate_param (normal) | variables.rs:345:1:349:1 | exit mutate_param |  |
+| variables.rs:345:1:350:1 | enter mutate_param | variables.rs:345:17:345:17 | x |  |
+| variables.rs:345:1:350:1 | exit mutate_param (normal) | variables.rs:345:1:350:1 | exit mutate_param |  |
 | variables.rs:345:17:345:17 | x | variables.rs:345:17:345:28 | Param | match |
 | variables.rs:345:17:345:28 | Param | variables.rs:346:5:348:11 | ExprStmt |  |
-| variables.rs:345:31:349:1 | BlockExpr | variables.rs:345:1:349:1 | exit mutate_param (normal) |  |
 | variables.rs:346:5:346:6 | * ... | variables.rs:347:10:347:10 | x |  |
-| variables.rs:346:5:348:10 | ... = ... | variables.rs:345:31:349:1 | BlockExpr |  |
+| variables.rs:346:5:348:10 | ... = ... | variables.rs:349:5:349:13 | ExprStmt |  |
 | variables.rs:346:5:348:11 | ExprStmt | variables.rs:346:6:346:6 | x |  |
 | variables.rs:346:6:346:6 | x | variables.rs:346:5:346:6 | * ... |  |
 | variables.rs:347:9:347:10 | * ... | variables.rs:348:10:348:10 | x |  |
@@ -748,157 +747,433 @@ edges
 | variables.rs:347:10:347:10 | x | variables.rs:347:9:347:10 | * ... |  |
 | variables.rs:348:9:348:10 | * ... | variables.rs:347:9:348:10 | ... + ... |  |
 | variables.rs:348:10:348:10 | x | variables.rs:348:9:348:10 | * ... |  |
-| variables.rs:351:1:355:1 | enter mutate_arg | variables.rs:352:5:352:18 | LetStmt |  |
-| variables.rs:351:1:355:1 | exit mutate_arg (normal) | variables.rs:351:1:355:1 | exit mutate_arg |  |
-| variables.rs:351:17:355:1 | BlockExpr | variables.rs:351:1:355:1 | exit mutate_arg (normal) |  |
-| variables.rs:352:5:352:18 | LetStmt | variables.rs:352:17:352:17 | 2 |  |
-| variables.rs:352:9:352:13 | x | variables.rs:353:5:353:25 | ExprStmt | match |
-| variables.rs:352:17:352:17 | 2 | variables.rs:352:9:352:13 | x |  |
-| variables.rs:353:5:353:16 | PathExpr | variables.rs:353:23:353:23 | x |  |
-| variables.rs:353:5:353:24 | CallExpr | variables.rs:354:5:354:17 | ExprStmt |  |
-| variables.rs:353:5:353:25 | ExprStmt | variables.rs:353:5:353:16 | PathExpr |  |
-| variables.rs:353:18:353:23 | RefExpr | variables.rs:353:5:353:24 | CallExpr |  |
-| variables.rs:353:23:353:23 | x | variables.rs:353:18:353:23 | RefExpr |  |
-| variables.rs:354:5:354:13 | PathExpr | variables.rs:354:15:354:15 | x |  |
-| variables.rs:354:5:354:16 | CallExpr | variables.rs:351:17:355:1 | BlockExpr |  |
-| variables.rs:354:5:354:17 | ExprStmt | variables.rs:354:5:354:13 | PathExpr |  |
-| variables.rs:354:15:354:15 | x | variables.rs:354:5:354:16 | CallExpr |  |
-| variables.rs:357:1:363:1 | enter alias | variables.rs:358:5:358:18 | LetStmt |  |
-| variables.rs:357:1:363:1 | exit alias (normal) | variables.rs:357:1:363:1 | exit alias |  |
-| variables.rs:357:12:363:1 | BlockExpr | variables.rs:357:1:363:1 | exit alias (normal) |  |
-| variables.rs:358:5:358:18 | LetStmt | variables.rs:358:17:358:17 | 1 |  |
-| variables.rs:358:9:358:13 | x | variables.rs:359:5:360:15 | LetStmt | match |
-| variables.rs:358:17:358:17 | 1 | variables.rs:358:9:358:13 | x |  |
-| variables.rs:359:5:360:15 | LetStmt | variables.rs:360:14:360:14 | x |  |
-| variables.rs:359:9:359:9 | y | variables.rs:361:5:361:11 | ExprStmt | match |
-| variables.rs:360:9:360:14 | RefExpr | variables.rs:359:9:359:9 | y |  |
-| variables.rs:360:14:360:14 | x | variables.rs:360:9:360:14 | RefExpr |  |
-| variables.rs:361:5:361:6 | * ... | variables.rs:361:10:361:10 | 2 |  |
-| variables.rs:361:5:361:10 | ... = ... | variables.rs:362:5:362:17 | ExprStmt |  |
-| variables.rs:361:5:361:11 | ExprStmt | variables.rs:361:6:361:6 | y |  |
-| variables.rs:361:6:361:6 | y | variables.rs:361:5:361:6 | * ... |  |
-| variables.rs:361:10:361:10 | 2 | variables.rs:361:5:361:10 | ... = ... |  |
-| variables.rs:362:5:362:13 | PathExpr | variables.rs:362:15:362:15 | x |  |
-| variables.rs:362:5:362:16 | CallExpr | variables.rs:357:12:363:1 | BlockExpr |  |
-| variables.rs:362:5:362:17 | ExprStmt | variables.rs:362:5:362:13 | PathExpr |  |
-| variables.rs:362:15:362:15 | x | variables.rs:362:5:362:16 | CallExpr |  |
-| variables.rs:365:1:373:1 | enter capture | variables.rs:366:5:366:19 | LetStmt |  |
-| variables.rs:365:1:373:1 | exit capture (normal) | variables.rs:365:1:373:1 | exit capture |  |
-| variables.rs:365:14:373:1 | BlockExpr | variables.rs:365:1:373:1 | exit capture (normal) |  |
-| variables.rs:366:5:366:19 | LetStmt | variables.rs:366:17:366:18 | 10 |  |
-| variables.rs:366:9:366:13 | x | variables.rs:367:5:370:6 | LetStmt | match |
-| variables.rs:366:17:366:18 | 10 | variables.rs:366:9:366:13 | x |  |
-| variables.rs:367:5:370:6 | LetStmt | variables.rs:367:19:370:5 | ClosureExpr |  |
-| variables.rs:367:9:367:15 | cap | variables.rs:371:5:371:10 | ExprStmt | match |
-| variables.rs:367:19:370:5 | ClosureExpr | variables.rs:367:9:367:15 | cap |  |
-| variables.rs:367:19:370:5 | enter ClosureExpr | variables.rs:368:9:368:21 | ExprStmt |  |
-| variables.rs:367:19:370:5 | exit ClosureExpr (normal) | variables.rs:367:19:370:5 | exit ClosureExpr |  |
-| variables.rs:367:22:370:5 | BlockExpr | variables.rs:367:19:370:5 | exit ClosureExpr (normal) |  |
-| variables.rs:368:9:368:17 | PathExpr | variables.rs:368:19:368:19 | x |  |
-| variables.rs:368:9:368:20 | CallExpr | variables.rs:369:9:369:15 | ExprStmt |  |
-| variables.rs:368:9:368:21 | ExprStmt | variables.rs:368:9:368:17 | PathExpr |  |
-| variables.rs:368:19:368:19 | x | variables.rs:368:9:368:20 | CallExpr |  |
-| variables.rs:369:9:369:9 | x | variables.rs:369:14:369:14 | 1 |  |
-| variables.rs:369:9:369:14 | ... += ... | variables.rs:367:22:370:5 | BlockExpr |  |
-| variables.rs:369:9:369:15 | ExprStmt | variables.rs:369:9:369:9 | x |  |
-| variables.rs:369:14:369:14 | 1 | variables.rs:369:9:369:14 | ... += ... |  |
-| variables.rs:371:5:371:7 | cap | variables.rs:371:5:371:9 | CallExpr |  |
-| variables.rs:371:5:371:9 | CallExpr | variables.rs:372:5:372:17 | ExprStmt |  |
-| variables.rs:371:5:371:10 | ExprStmt | variables.rs:371:5:371:7 | cap |  |
-| variables.rs:372:5:372:13 | PathExpr | variables.rs:372:15:372:15 | x |  |
-| variables.rs:372:5:372:16 | CallExpr | variables.rs:365:14:373:1 | BlockExpr |  |
-| variables.rs:372:5:372:17 | ExprStmt | variables.rs:372:5:372:13 | PathExpr |  |
-| variables.rs:372:15:372:15 | x | variables.rs:372:5:372:16 | CallExpr |  |
-| variables.rs:375:1:403:1 | enter main | variables.rs:376:5:376:25 | ExprStmt |  |
-| variables.rs:375:1:403:1 | exit main (normal) | variables.rs:375:1:403:1 | exit main |  |
-| variables.rs:375:11:403:1 | BlockExpr | variables.rs:375:1:403:1 | exit main (normal) |  |
-| variables.rs:376:5:376:22 | PathExpr | variables.rs:376:5:376:24 | CallExpr |  |
-| variables.rs:376:5:376:24 | CallExpr | variables.rs:377:5:377:23 | ExprStmt |  |
-| variables.rs:376:5:376:25 | ExprStmt | variables.rs:376:5:376:22 | PathExpr |  |
-| variables.rs:377:5:377:20 | PathExpr | variables.rs:377:5:377:22 | CallExpr |  |
-| variables.rs:377:5:377:22 | CallExpr | variables.rs:378:5:378:23 | ExprStmt |  |
-| variables.rs:377:5:377:23 | ExprStmt | variables.rs:377:5:377:20 | PathExpr |  |
-| variables.rs:378:5:378:20 | PathExpr | variables.rs:378:5:378:22 | CallExpr |  |
-| variables.rs:378:5:378:22 | CallExpr | variables.rs:379:5:379:23 | ExprStmt |  |
-| variables.rs:378:5:378:23 | ExprStmt | variables.rs:378:5:378:20 | PathExpr |  |
-| variables.rs:379:5:379:20 | PathExpr | variables.rs:379:5:379:22 | CallExpr |  |
-| variables.rs:379:5:379:22 | CallExpr | variables.rs:380:5:380:19 | ExprStmt |  |
-| variables.rs:379:5:379:23 | ExprStmt | variables.rs:379:5:379:20 | PathExpr |  |
-| variables.rs:380:5:380:16 | PathExpr | variables.rs:380:5:380:18 | CallExpr |  |
-| variables.rs:380:5:380:18 | CallExpr | variables.rs:381:5:381:19 | ExprStmt |  |
-| variables.rs:380:5:380:19 | ExprStmt | variables.rs:380:5:380:16 | PathExpr |  |
-| variables.rs:381:5:381:16 | PathExpr | variables.rs:381:5:381:18 | CallExpr |  |
-| variables.rs:381:5:381:18 | CallExpr | variables.rs:382:5:382:19 | ExprStmt |  |
-| variables.rs:381:5:381:19 | ExprStmt | variables.rs:381:5:381:16 | PathExpr |  |
-| variables.rs:382:5:382:16 | PathExpr | variables.rs:382:5:382:18 | CallExpr |  |
-| variables.rs:382:5:382:18 | CallExpr | variables.rs:383:5:383:19 | ExprStmt |  |
-| variables.rs:382:5:382:19 | ExprStmt | variables.rs:382:5:382:16 | PathExpr |  |
-| variables.rs:383:5:383:16 | PathExpr | variables.rs:383:5:383:18 | CallExpr |  |
-| variables.rs:383:5:383:18 | CallExpr | variables.rs:384:5:384:21 | ExprStmt |  |
-| variables.rs:383:5:383:19 | ExprStmt | variables.rs:383:5:383:16 | PathExpr |  |
-| variables.rs:384:5:384:18 | PathExpr | variables.rs:384:5:384:20 | CallExpr |  |
-| variables.rs:384:5:384:20 | CallExpr | variables.rs:385:5:385:21 | ExprStmt |  |
-| variables.rs:384:5:384:21 | ExprStmt | variables.rs:384:5:384:18 | PathExpr |  |
-| variables.rs:385:5:385:18 | PathExpr | variables.rs:385:5:385:20 | CallExpr |  |
-| variables.rs:385:5:385:20 | CallExpr | variables.rs:386:5:386:21 | ExprStmt |  |
-| variables.rs:385:5:385:21 | ExprStmt | variables.rs:385:5:385:18 | PathExpr |  |
-| variables.rs:386:5:386:18 | PathExpr | variables.rs:386:5:386:20 | CallExpr |  |
-| variables.rs:386:5:386:20 | CallExpr | variables.rs:387:5:387:21 | ExprStmt |  |
-| variables.rs:386:5:386:21 | ExprStmt | variables.rs:386:5:386:18 | PathExpr |  |
-| variables.rs:387:5:387:18 | PathExpr | variables.rs:387:5:387:20 | CallExpr |  |
-| variables.rs:387:5:387:20 | CallExpr | variables.rs:388:5:388:21 | ExprStmt |  |
-| variables.rs:387:5:387:21 | ExprStmt | variables.rs:387:5:387:18 | PathExpr |  |
-| variables.rs:388:5:388:18 | PathExpr | variables.rs:388:5:388:20 | CallExpr |  |
-| variables.rs:388:5:388:20 | CallExpr | variables.rs:389:5:389:21 | ExprStmt |  |
-| variables.rs:388:5:388:21 | ExprStmt | variables.rs:388:5:388:18 | PathExpr |  |
-| variables.rs:389:5:389:18 | PathExpr | variables.rs:389:5:389:20 | CallExpr |  |
-| variables.rs:389:5:389:20 | CallExpr | variables.rs:390:5:390:21 | ExprStmt |  |
-| variables.rs:389:5:389:21 | ExprStmt | variables.rs:389:5:389:18 | PathExpr |  |
-| variables.rs:390:5:390:18 | PathExpr | variables.rs:390:5:390:20 | CallExpr |  |
-| variables.rs:390:5:390:20 | CallExpr | variables.rs:391:5:391:21 | ExprStmt |  |
-| variables.rs:390:5:390:21 | ExprStmt | variables.rs:390:5:390:18 | PathExpr |  |
-| variables.rs:391:5:391:18 | PathExpr | variables.rs:391:5:391:20 | CallExpr |  |
-| variables.rs:391:5:391:20 | CallExpr | variables.rs:392:5:392:21 | ExprStmt |  |
-| variables.rs:391:5:391:21 | ExprStmt | variables.rs:391:5:391:18 | PathExpr |  |
-| variables.rs:392:5:392:18 | PathExpr | variables.rs:392:5:392:20 | CallExpr |  |
-| variables.rs:392:5:392:20 | CallExpr | variables.rs:393:5:393:36 | ExprStmt |  |
-| variables.rs:392:5:392:21 | ExprStmt | variables.rs:392:5:392:18 | PathExpr |  |
-| variables.rs:393:5:393:18 | PathExpr | variables.rs:393:20:393:22 | "a" |  |
-| variables.rs:393:5:393:35 | CallExpr | variables.rs:394:5:394:37 | ExprStmt |  |
-| variables.rs:393:5:393:36 | ExprStmt | variables.rs:393:5:393:18 | PathExpr |  |
-| variables.rs:393:20:393:22 | "a" | variables.rs:393:26:393:28 | "b" |  |
-| variables.rs:393:25:393:34 | TupleExpr | variables.rs:393:5:393:35 | CallExpr |  |
-| variables.rs:393:26:393:28 | "b" | variables.rs:393:31:393:33 | "c" |  |
-| variables.rs:393:31:393:33 | "c" | variables.rs:393:25:393:34 | TupleExpr |  |
-| variables.rs:394:5:394:18 | PathExpr | variables.rs:394:20:394:31 | PathExpr |  |
-| variables.rs:394:5:394:36 | CallExpr | variables.rs:395:5:395:26 | ExprStmt |  |
-| variables.rs:394:5:394:37 | ExprStmt | variables.rs:394:5:394:18 | PathExpr |  |
-| variables.rs:394:20:394:31 | PathExpr | variables.rs:394:33:394:34 | 45 |  |
-| variables.rs:394:20:394:35 | CallExpr | variables.rs:394:5:394:36 | CallExpr |  |
-| variables.rs:394:33:394:34 | 45 | variables.rs:394:20:394:35 | CallExpr |  |
-| variables.rs:395:5:395:23 | PathExpr | variables.rs:395:5:395:25 | CallExpr |  |
-| variables.rs:395:5:395:25 | CallExpr | variables.rs:396:5:396:23 | ExprStmt |  |
-| variables.rs:395:5:395:26 | ExprStmt | variables.rs:395:5:395:23 | PathExpr |  |
-| variables.rs:396:5:396:20 | PathExpr | variables.rs:396:5:396:22 | CallExpr |  |
-| variables.rs:396:5:396:22 | CallExpr | variables.rs:397:5:397:19 | ExprStmt |  |
-| variables.rs:396:5:396:23 | ExprStmt | variables.rs:396:5:396:20 | PathExpr |  |
-| variables.rs:397:5:397:16 | PathExpr | variables.rs:397:5:397:18 | CallExpr |  |
-| variables.rs:397:5:397:18 | CallExpr | variables.rs:398:5:398:17 | ExprStmt |  |
-| variables.rs:397:5:397:19 | ExprStmt | variables.rs:397:5:397:16 | PathExpr |  |
-| variables.rs:398:5:398:14 | PathExpr | variables.rs:398:5:398:16 | CallExpr |  |
-| variables.rs:398:5:398:16 | CallExpr | variables.rs:399:5:399:13 | ExprStmt |  |
-| variables.rs:398:5:398:17 | ExprStmt | variables.rs:398:5:398:14 | PathExpr |  |
-| variables.rs:399:5:399:10 | PathExpr | variables.rs:399:5:399:12 | CallExpr |  |
-| variables.rs:399:5:399:12 | CallExpr | variables.rs:400:5:400:17 | ExprStmt |  |
-| variables.rs:399:5:399:13 | ExprStmt | variables.rs:399:5:399:10 | PathExpr |  |
-| variables.rs:400:5:400:14 | PathExpr | variables.rs:400:5:400:16 | CallExpr |  |
-| variables.rs:400:5:400:16 | CallExpr | variables.rs:401:5:401:12 | ExprStmt |  |
-| variables.rs:400:5:400:17 | ExprStmt | variables.rs:400:5:400:14 | PathExpr |  |
-| variables.rs:401:5:401:9 | PathExpr | variables.rs:401:5:401:11 | CallExpr |  |
-| variables.rs:401:5:401:11 | CallExpr | variables.rs:402:5:402:14 | ExprStmt |  |
-| variables.rs:401:5:401:12 | ExprStmt | variables.rs:401:5:401:9 | PathExpr |  |
-| variables.rs:402:5:402:11 | PathExpr | variables.rs:402:5:402:13 | CallExpr |  |
-| variables.rs:402:5:402:13 | CallExpr | variables.rs:375:11:403:1 | BlockExpr |  |
-| variables.rs:402:5:402:14 | ExprStmt | variables.rs:402:5:402:11 | PathExpr |  |
+| variables.rs:349:5:349:12 | ReturnExpr | variables.rs:345:1:350:1 | exit mutate_param (normal) | return |
+| variables.rs:349:5:349:13 | ExprStmt | variables.rs:349:12:349:12 | x |  |
+| variables.rs:349:12:349:12 | x | variables.rs:349:5:349:12 | ReturnExpr |  |
+| variables.rs:352:1:358:1 | enter mutate_param2 | variables.rs:352:22:352:22 | x |  |
+| variables.rs:352:1:358:1 | exit mutate_param2 (normal) | variables.rs:352:1:358:1 | exit mutate_param2 |  |
+| variables.rs:352:22:352:22 | x | variables.rs:352:22:352:36 | Param | match |
+| variables.rs:352:22:352:36 | Param | variables.rs:352:39:352:39 | y |  |
+| variables.rs:352:39:352:39 | y | variables.rs:352:39:352:57 | Param | match |
+| variables.rs:352:39:352:57 | Param | variables.rs:353:5:355:11 | ExprStmt |  |
+| variables.rs:352:60:358:1 | BlockExpr | variables.rs:352:1:358:1 | exit mutate_param2 (normal) |  |
+| variables.rs:353:5:353:6 | * ... | variables.rs:354:10:354:10 | x |  |
+| variables.rs:353:5:355:10 | ... = ... | variables.rs:356:5:357:10 | ExprStmt |  |
+| variables.rs:353:5:355:11 | ExprStmt | variables.rs:353:6:353:6 | x |  |
+| variables.rs:353:6:353:6 | x | variables.rs:353:5:353:6 | * ... |  |
+| variables.rs:354:9:354:10 | * ... | variables.rs:355:10:355:10 | x |  |
+| variables.rs:354:9:355:10 | ... + ... | variables.rs:353:5:355:10 | ... = ... |  |
+| variables.rs:354:10:354:10 | x | variables.rs:354:9:354:10 | * ... |  |
+| variables.rs:355:9:355:10 | * ... | variables.rs:354:9:355:10 | ... + ... |  |
+| variables.rs:355:10:355:10 | x | variables.rs:355:9:355:10 | * ... |  |
+| variables.rs:356:5:356:6 | * ... | variables.rs:357:9:357:9 | x |  |
+| variables.rs:356:5:357:9 | ... = ... | variables.rs:352:60:358:1 | BlockExpr |  |
+| variables.rs:356:5:357:10 | ExprStmt | variables.rs:356:6:356:6 | y |  |
+| variables.rs:356:6:356:6 | y | variables.rs:356:5:356:6 | * ... |  |
+| variables.rs:357:9:357:9 | x | variables.rs:356:5:357:9 | ... = ... |  |
+| variables.rs:360:1:378:1 | enter mutate_arg | variables.rs:361:5:361:18 | LetStmt |  |
+| variables.rs:360:1:378:1 | exit mutate_arg (normal) | variables.rs:360:1:378:1 | exit mutate_arg |  |
+| variables.rs:360:17:378:1 | BlockExpr | variables.rs:360:1:378:1 | exit mutate_arg (normal) |  |
+| variables.rs:361:5:361:18 | LetStmt | variables.rs:361:17:361:17 | 2 |  |
+| variables.rs:361:9:361:13 | x | variables.rs:362:5:363:29 | LetStmt | match |
+| variables.rs:361:17:361:17 | 2 | variables.rs:361:9:361:13 | x |  |
+| variables.rs:362:5:363:29 | LetStmt | variables.rs:363:9:363:20 | PathExpr |  |
+| variables.rs:362:9:362:9 | y | variables.rs:364:5:364:12 | ExprStmt | match |
+| variables.rs:363:9:363:20 | PathExpr | variables.rs:363:27:363:27 | x |  |
+| variables.rs:363:9:363:28 | CallExpr | variables.rs:362:9:362:9 | y |  |
+| variables.rs:363:22:363:27 | RefExpr | variables.rs:363:9:363:28 | CallExpr |  |
+| variables.rs:363:27:363:27 | x | variables.rs:363:22:363:27 | RefExpr |  |
+| variables.rs:364:5:364:6 | * ... | variables.rs:364:10:364:11 | 10 |  |
+| variables.rs:364:5:364:11 | ... = ... | variables.rs:366:5:366:17 | ExprStmt |  |
+| variables.rs:364:5:364:12 | ExprStmt | variables.rs:364:6:364:6 | y |  |
+| variables.rs:364:6:364:6 | y | variables.rs:364:5:364:6 | * ... |  |
+| variables.rs:364:10:364:11 | 10 | variables.rs:364:5:364:11 | ... = ... |  |
+| variables.rs:366:5:366:13 | PathExpr | variables.rs:366:15:366:15 | x |  |
+| variables.rs:366:5:366:16 | CallExpr | variables.rs:368:5:368:18 | LetStmt |  |
+| variables.rs:366:5:366:17 | ExprStmt | variables.rs:366:5:366:13 | PathExpr |  |
+| variables.rs:366:15:366:15 | x | variables.rs:366:5:366:16 | CallExpr |  |
+| variables.rs:368:5:368:18 | LetStmt | variables.rs:368:17:368:17 | 4 |  |
+| variables.rs:368:9:368:13 | z | variables.rs:369:5:370:20 | LetStmt | match |
+| variables.rs:368:17:368:17 | 4 | variables.rs:368:9:368:13 | z |  |
+| variables.rs:369:5:370:20 | LetStmt | variables.rs:370:19:370:19 | x |  |
+| variables.rs:369:9:369:9 | w | variables.rs:371:5:374:6 | ExprStmt | match |
+| variables.rs:370:9:370:19 | RefExpr | variables.rs:369:9:369:9 | w |  |
+| variables.rs:370:14:370:19 | RefExpr | variables.rs:370:9:370:19 | RefExpr |  |
+| variables.rs:370:19:370:19 | x | variables.rs:370:14:370:19 | RefExpr |  |
+| variables.rs:371:5:371:17 | PathExpr | variables.rs:372:14:372:14 | z |  |
+| variables.rs:371:5:374:5 | CallExpr | variables.rs:375:5:375:13 | ExprStmt |  |
+| variables.rs:371:5:374:6 | ExprStmt | variables.rs:371:5:371:17 | PathExpr |  |
+| variables.rs:372:9:372:14 | RefExpr | variables.rs:373:9:373:9 | w |  |
+| variables.rs:372:14:372:14 | z | variables.rs:372:9:372:14 | RefExpr |  |
+| variables.rs:373:9:373:9 | w | variables.rs:371:5:374:5 | CallExpr |  |
+| variables.rs:375:5:375:7 | * ... | variables.rs:375:11:375:12 | 11 |  |
+| variables.rs:375:5:375:12 | ... = ... | variables.rs:377:5:377:17 | ExprStmt |  |
+| variables.rs:375:5:375:13 | ExprStmt | variables.rs:375:7:375:7 | w |  |
+| variables.rs:375:6:375:7 | * ... | variables.rs:375:5:375:7 | * ... |  |
+| variables.rs:375:7:375:7 | w | variables.rs:375:6:375:7 | * ... |  |
+| variables.rs:375:11:375:12 | 11 | variables.rs:375:5:375:12 | ... = ... |  |
+| variables.rs:377:5:377:13 | PathExpr | variables.rs:377:15:377:15 | z |  |
+| variables.rs:377:5:377:16 | CallExpr | variables.rs:360:17:378:1 | BlockExpr |  |
+| variables.rs:377:5:377:17 | ExprStmt | variables.rs:377:5:377:13 | PathExpr |  |
+| variables.rs:377:15:377:15 | z | variables.rs:377:5:377:16 | CallExpr |  |
+| variables.rs:380:1:386:1 | enter alias | variables.rs:381:5:381:18 | LetStmt |  |
+| variables.rs:380:1:386:1 | exit alias (normal) | variables.rs:380:1:386:1 | exit alias |  |
+| variables.rs:380:12:386:1 | BlockExpr | variables.rs:380:1:386:1 | exit alias (normal) |  |
+| variables.rs:381:5:381:18 | LetStmt | variables.rs:381:17:381:17 | 1 |  |
+| variables.rs:381:9:381:13 | x | variables.rs:382:5:383:15 | LetStmt | match |
+| variables.rs:381:17:381:17 | 1 | variables.rs:381:9:381:13 | x |  |
+| variables.rs:382:5:383:15 | LetStmt | variables.rs:383:14:383:14 | x |  |
+| variables.rs:382:9:382:9 | y | variables.rs:384:5:384:11 | ExprStmt | match |
+| variables.rs:383:9:383:14 | RefExpr | variables.rs:382:9:382:9 | y |  |
+| variables.rs:383:14:383:14 | x | variables.rs:383:9:383:14 | RefExpr |  |
+| variables.rs:384:5:384:6 | * ... | variables.rs:384:10:384:10 | 2 |  |
+| variables.rs:384:5:384:10 | ... = ... | variables.rs:385:5:385:17 | ExprStmt |  |
+| variables.rs:384:5:384:11 | ExprStmt | variables.rs:384:6:384:6 | y |  |
+| variables.rs:384:6:384:6 | y | variables.rs:384:5:384:6 | * ... |  |
+| variables.rs:384:10:384:10 | 2 | variables.rs:384:5:384:10 | ... = ... |  |
+| variables.rs:385:5:385:13 | PathExpr | variables.rs:385:15:385:15 | x |  |
+| variables.rs:385:5:385:16 | CallExpr | variables.rs:380:12:386:1 | BlockExpr |  |
+| variables.rs:385:5:385:17 | ExprStmt | variables.rs:385:5:385:13 | PathExpr |  |
+| variables.rs:385:15:385:15 | x | variables.rs:385:5:385:16 | CallExpr |  |
+| variables.rs:388:1:396:1 | enter capture_mut | variables.rs:389:5:389:19 | LetStmt |  |
+| variables.rs:388:1:396:1 | exit capture_mut (normal) | variables.rs:388:1:396:1 | exit capture_mut |  |
+| variables.rs:388:18:396:1 | BlockExpr | variables.rs:388:1:396:1 | exit capture_mut (normal) |  |
+| variables.rs:389:5:389:19 | LetStmt | variables.rs:389:17:389:18 | 10 |  |
+| variables.rs:389:9:389:13 | x | variables.rs:390:5:393:6 | LetStmt | match |
+| variables.rs:389:17:389:18 | 10 | variables.rs:389:9:389:13 | x |  |
+| variables.rs:390:5:393:6 | LetStmt | variables.rs:390:19:393:5 | ClosureExpr |  |
+| variables.rs:390:9:390:15 | cap | variables.rs:394:5:394:10 | ExprStmt | match |
+| variables.rs:390:19:393:5 | ClosureExpr | variables.rs:390:9:390:15 | cap |  |
+| variables.rs:390:19:393:5 | enter ClosureExpr | variables.rs:391:9:391:21 | ExprStmt |  |
+| variables.rs:390:19:393:5 | exit ClosureExpr (normal) | variables.rs:390:19:393:5 | exit ClosureExpr |  |
+| variables.rs:390:22:393:5 | BlockExpr | variables.rs:390:19:393:5 | exit ClosureExpr (normal) |  |
+| variables.rs:391:9:391:17 | PathExpr | variables.rs:391:19:391:19 | x |  |
+| variables.rs:391:9:391:20 | CallExpr | variables.rs:392:9:392:15 | ExprStmt |  |
+| variables.rs:391:9:391:21 | ExprStmt | variables.rs:391:9:391:17 | PathExpr |  |
+| variables.rs:391:19:391:19 | x | variables.rs:391:9:391:20 | CallExpr |  |
+| variables.rs:392:9:392:9 | x | variables.rs:392:14:392:14 | 1 |  |
+| variables.rs:392:9:392:14 | ... += ... | variables.rs:390:22:393:5 | BlockExpr |  |
+| variables.rs:392:9:392:15 | ExprStmt | variables.rs:392:9:392:9 | x |  |
+| variables.rs:392:14:392:14 | 1 | variables.rs:392:9:392:14 | ... += ... |  |
+| variables.rs:394:5:394:7 | cap | variables.rs:394:5:394:9 | CallExpr |  |
+| variables.rs:394:5:394:9 | CallExpr | variables.rs:395:5:395:17 | ExprStmt |  |
+| variables.rs:394:5:394:10 | ExprStmt | variables.rs:394:5:394:7 | cap |  |
+| variables.rs:395:5:395:13 | PathExpr | variables.rs:395:15:395:15 | x |  |
+| variables.rs:395:5:395:16 | CallExpr | variables.rs:388:18:396:1 | BlockExpr |  |
+| variables.rs:395:5:395:17 | ExprStmt | variables.rs:395:5:395:13 | PathExpr |  |
+| variables.rs:395:15:395:15 | x | variables.rs:395:5:395:16 | CallExpr |  |
+| variables.rs:398:1:405:1 | enter capture_immut | variables.rs:399:5:399:16 | LetStmt |  |
+| variables.rs:398:1:405:1 | exit capture_immut (normal) | variables.rs:398:1:405:1 | exit capture_immut |  |
+| variables.rs:398:20:405:1 | BlockExpr | variables.rs:398:1:405:1 | exit capture_immut (normal) |  |
+| variables.rs:399:5:399:16 | LetStmt | variables.rs:399:13:399:15 | 100 |  |
+| variables.rs:399:9:399:9 | x | variables.rs:400:5:402:6 | LetStmt | match |
+| variables.rs:399:13:399:15 | 100 | variables.rs:399:9:399:9 | x |  |
+| variables.rs:400:5:402:6 | LetStmt | variables.rs:400:19:402:5 | ClosureExpr |  |
+| variables.rs:400:9:400:15 | cap | variables.rs:403:5:403:10 | ExprStmt | match |
+| variables.rs:400:19:402:5 | ClosureExpr | variables.rs:400:9:400:15 | cap |  |
+| variables.rs:400:19:402:5 | enter ClosureExpr | variables.rs:401:9:401:21 | ExprStmt |  |
+| variables.rs:400:19:402:5 | exit ClosureExpr (normal) | variables.rs:400:19:402:5 | exit ClosureExpr |  |
+| variables.rs:400:22:402:5 | BlockExpr | variables.rs:400:19:402:5 | exit ClosureExpr (normal) |  |
+| variables.rs:401:9:401:17 | PathExpr | variables.rs:401:19:401:19 | x |  |
+| variables.rs:401:9:401:20 | CallExpr | variables.rs:400:22:402:5 | BlockExpr |  |
+| variables.rs:401:9:401:21 | ExprStmt | variables.rs:401:9:401:17 | PathExpr |  |
+| variables.rs:401:19:401:19 | x | variables.rs:401:9:401:20 | CallExpr |  |
+| variables.rs:403:5:403:7 | cap | variables.rs:403:5:403:9 | CallExpr |  |
+| variables.rs:403:5:403:9 | CallExpr | variables.rs:404:5:404:17 | ExprStmt |  |
+| variables.rs:403:5:403:10 | ExprStmt | variables.rs:403:5:403:7 | cap |  |
+| variables.rs:404:5:404:13 | PathExpr | variables.rs:404:15:404:15 | x |  |
+| variables.rs:404:5:404:16 | CallExpr | variables.rs:398:20:405:1 | BlockExpr |  |
+| variables.rs:404:5:404:17 | ExprStmt | variables.rs:404:5:404:13 | PathExpr |  |
+| variables.rs:404:15:404:15 | x | variables.rs:404:5:404:16 | CallExpr |  |
+| variables.rs:407:1:421:1 | enter phi | variables.rs:407:8:407:8 | b |  |
+| variables.rs:407:1:421:1 | exit phi (normal) | variables.rs:407:1:421:1 | exit phi |  |
+| variables.rs:407:8:407:8 | b | variables.rs:407:8:407:15 | Param | match |
+| variables.rs:407:8:407:15 | Param | variables.rs:408:5:408:18 | LetStmt |  |
+| variables.rs:407:18:421:1 | BlockExpr | variables.rs:407:1:421:1 | exit phi (normal) |  |
+| variables.rs:408:5:408:18 | LetStmt | variables.rs:408:17:408:17 | 1 |  |
+| variables.rs:408:9:408:13 | x | variables.rs:409:5:409:17 | ExprStmt | match |
+| variables.rs:408:17:408:17 | 1 | variables.rs:408:9:408:13 | x |  |
+| variables.rs:409:5:409:13 | PathExpr | variables.rs:409:15:409:15 | x |  |
+| variables.rs:409:5:409:16 | CallExpr | variables.rs:410:5:410:21 | ExprStmt |  |
+| variables.rs:409:5:409:17 | ExprStmt | variables.rs:409:5:409:13 | PathExpr |  |
+| variables.rs:409:15:409:15 | x | variables.rs:409:5:409:16 | CallExpr |  |
+| variables.rs:410:5:410:13 | PathExpr | variables.rs:410:15:410:15 | x |  |
+| variables.rs:410:5:410:20 | CallExpr | variables.rs:411:5:419:5 | ExprStmt |  |
+| variables.rs:410:5:410:21 | ExprStmt | variables.rs:410:5:410:13 | PathExpr |  |
+| variables.rs:410:15:410:15 | x | variables.rs:410:19:410:19 | 1 |  |
+| variables.rs:410:15:410:19 | ... + ... | variables.rs:410:5:410:20 | CallExpr |  |
+| variables.rs:410:19:410:19 | 1 | variables.rs:410:15:410:19 | ... + ... |  |
+| variables.rs:411:5:419:5 | ExprStmt | variables.rs:411:8:411:8 | b |  |
+| variables.rs:411:5:419:5 | IfExpr | variables.rs:420:5:420:17 | ExprStmt |  |
+| variables.rs:411:8:411:8 | b | variables.rs:412:9:412:14 | ExprStmt | true |
+| variables.rs:411:8:411:8 | b | variables.rs:416:9:416:14 | ExprStmt | false |
+| variables.rs:411:10:415:5 | BlockExpr | variables.rs:411:5:419:5 | IfExpr |  |
+| variables.rs:412:9:412:9 | x | variables.rs:412:13:412:13 | 2 |  |
+| variables.rs:412:9:412:13 | ... = ... | variables.rs:413:9:413:21 | ExprStmt |  |
+| variables.rs:412:9:412:14 | ExprStmt | variables.rs:412:9:412:9 | x |  |
+| variables.rs:412:13:412:13 | 2 | variables.rs:412:9:412:13 | ... = ... |  |
+| variables.rs:413:9:413:17 | PathExpr | variables.rs:413:19:413:19 | x |  |
+| variables.rs:413:9:413:20 | CallExpr | variables.rs:414:9:414:25 | ExprStmt |  |
+| variables.rs:413:9:413:21 | ExprStmt | variables.rs:413:9:413:17 | PathExpr |  |
+| variables.rs:413:19:413:19 | x | variables.rs:413:9:413:20 | CallExpr |  |
+| variables.rs:414:9:414:17 | PathExpr | variables.rs:414:19:414:19 | x |  |
+| variables.rs:414:9:414:24 | CallExpr | variables.rs:411:10:415:5 | BlockExpr |  |
+| variables.rs:414:9:414:25 | ExprStmt | variables.rs:414:9:414:17 | PathExpr |  |
+| variables.rs:414:19:414:19 | x | variables.rs:414:23:414:23 | 1 |  |
+| variables.rs:414:19:414:23 | ... + ... | variables.rs:414:9:414:24 | CallExpr |  |
+| variables.rs:414:23:414:23 | 1 | variables.rs:414:19:414:23 | ... + ... |  |
+| variables.rs:415:12:419:5 | BlockExpr | variables.rs:411:5:419:5 | IfExpr |  |
+| variables.rs:416:9:416:9 | x | variables.rs:416:13:416:13 | 3 |  |
+| variables.rs:416:9:416:13 | ... = ... | variables.rs:417:9:417:21 | ExprStmt |  |
+| variables.rs:416:9:416:14 | ExprStmt | variables.rs:416:9:416:9 | x |  |
+| variables.rs:416:13:416:13 | 3 | variables.rs:416:9:416:13 | ... = ... |  |
+| variables.rs:417:9:417:17 | PathExpr | variables.rs:417:19:417:19 | x |  |
+| variables.rs:417:9:417:20 | CallExpr | variables.rs:418:9:418:25 | ExprStmt |  |
+| variables.rs:417:9:417:21 | ExprStmt | variables.rs:417:9:417:17 | PathExpr |  |
+| variables.rs:417:19:417:19 | x | variables.rs:417:9:417:20 | CallExpr |  |
+| variables.rs:418:9:418:17 | PathExpr | variables.rs:418:19:418:19 | x |  |
+| variables.rs:418:9:418:24 | CallExpr | variables.rs:415:12:419:5 | BlockExpr |  |
+| variables.rs:418:9:418:25 | ExprStmt | variables.rs:418:9:418:17 | PathExpr |  |
+| variables.rs:418:19:418:19 | x | variables.rs:418:23:418:23 | 1 |  |
+| variables.rs:418:19:418:23 | ... + ... | variables.rs:418:9:418:24 | CallExpr |  |
+| variables.rs:418:23:418:23 | 1 | variables.rs:418:19:418:23 | ... + ... |  |
+| variables.rs:420:5:420:13 | PathExpr | variables.rs:420:15:420:15 | x |  |
+| variables.rs:420:5:420:16 | CallExpr | variables.rs:407:18:421:1 | BlockExpr |  |
+| variables.rs:420:5:420:17 | ExprStmt | variables.rs:420:5:420:13 | PathExpr |  |
+| variables.rs:420:15:420:15 | x | variables.rs:420:5:420:16 | CallExpr |  |
+| variables.rs:423:1:436:1 | enter phi_read | variables.rs:423:13:423:14 | b1 |  |
+| variables.rs:423:1:436:1 | exit phi_read (normal) | variables.rs:423:1:436:1 | exit phi_read |  |
+| variables.rs:423:13:423:14 | b1 | variables.rs:423:13:423:21 | Param | match |
+| variables.rs:423:13:423:21 | Param | variables.rs:423:24:423:25 | b2 |  |
+| variables.rs:423:24:423:25 | b2 | variables.rs:423:24:423:32 | Param | match |
+| variables.rs:423:24:423:32 | Param | variables.rs:424:5:424:14 | LetStmt |  |
+| variables.rs:423:35:436:1 | BlockExpr | variables.rs:423:1:436:1 | exit phi_read (normal) |  |
+| variables.rs:424:5:424:14 | LetStmt | variables.rs:424:13:424:13 | 1 |  |
+| variables.rs:424:9:424:9 | x | variables.rs:425:5:429:5 | ExprStmt | match |
+| variables.rs:424:13:424:13 | 1 | variables.rs:424:9:424:9 | x |  |
+| variables.rs:425:5:429:5 | ExprStmt | variables.rs:425:8:425:9 | b1 |  |
+| variables.rs:425:5:429:5 | IfExpr | variables.rs:431:8:431:9 | b2 |  |
+| variables.rs:425:8:425:9 | b1 | variables.rs:426:9:426:21 | ExprStmt | true |
+| variables.rs:425:8:425:9 | b1 | variables.rs:428:9:428:21 | ExprStmt | false |
+| variables.rs:425:11:427:5 | BlockExpr | variables.rs:425:5:429:5 | IfExpr |  |
+| variables.rs:426:9:426:17 | PathExpr | variables.rs:426:19:426:19 | x |  |
+| variables.rs:426:9:426:20 | CallExpr | variables.rs:425:11:427:5 | BlockExpr |  |
+| variables.rs:426:9:426:21 | ExprStmt | variables.rs:426:9:426:17 | PathExpr |  |
+| variables.rs:426:19:426:19 | x | variables.rs:426:9:426:20 | CallExpr |  |
+| variables.rs:427:12:429:5 | BlockExpr | variables.rs:425:5:429:5 | IfExpr |  |
+| variables.rs:428:9:428:17 | PathExpr | variables.rs:428:19:428:19 | x |  |
+| variables.rs:428:9:428:20 | CallExpr | variables.rs:427:12:429:5 | BlockExpr |  |
+| variables.rs:428:9:428:21 | ExprStmt | variables.rs:428:9:428:17 | PathExpr |  |
+| variables.rs:428:19:428:19 | x | variables.rs:428:9:428:20 | CallExpr |  |
+| variables.rs:431:5:435:5 | IfExpr | variables.rs:423:35:436:1 | BlockExpr |  |
+| variables.rs:431:8:431:9 | b2 | variables.rs:432:9:432:21 | ExprStmt | true |
+| variables.rs:431:8:431:9 | b2 | variables.rs:434:9:434:21 | ExprStmt | false |
+| variables.rs:431:11:433:5 | BlockExpr | variables.rs:431:5:435:5 | IfExpr |  |
+| variables.rs:432:9:432:17 | PathExpr | variables.rs:432:19:432:19 | x |  |
+| variables.rs:432:9:432:20 | CallExpr | variables.rs:431:11:433:5 | BlockExpr |  |
+| variables.rs:432:9:432:21 | ExprStmt | variables.rs:432:9:432:17 | PathExpr |  |
+| variables.rs:432:19:432:19 | x | variables.rs:432:9:432:20 | CallExpr |  |
+| variables.rs:433:12:435:5 | BlockExpr | variables.rs:431:5:435:5 | IfExpr |  |
+| variables.rs:434:9:434:17 | PathExpr | variables.rs:434:19:434:19 | x |  |
+| variables.rs:434:9:434:20 | CallExpr | variables.rs:433:12:435:5 | BlockExpr |  |
+| variables.rs:434:9:434:21 | ExprStmt | variables.rs:434:9:434:17 | PathExpr |  |
+| variables.rs:434:19:434:19 | x | variables.rs:434:9:434:20 | CallExpr |  |
+| variables.rs:444:5:446:5 | enter my_get | variables.rs:445:9:445:24 | ExprStmt |  |
+| variables.rs:444:5:446:5 | exit my_get (normal) | variables.rs:444:5:446:5 | exit my_get |  |
+| variables.rs:445:9:445:23 | ReturnExpr | variables.rs:444:5:446:5 | exit my_get (normal) | return |
+| variables.rs:445:9:445:24 | ExprStmt | variables.rs:445:16:445:19 | PathExpr |  |
+| variables.rs:445:16:445:19 | PathExpr | variables.rs:445:16:445:23 | FieldExpr |  |
+| variables.rs:445:16:445:23 | FieldExpr | variables.rs:445:9:445:23 | ReturnExpr |  |
+| variables.rs:449:1:456:1 | enter structs | variables.rs:450:5:450:36 | LetStmt |  |
+| variables.rs:449:1:456:1 | exit structs (normal) | variables.rs:449:1:456:1 | exit structs |  |
+| variables.rs:449:14:456:1 | BlockExpr | variables.rs:449:1:456:1 | exit structs (normal) |  |
+| variables.rs:450:5:450:36 | LetStmt | variables.rs:450:33:450:33 | 1 |  |
+| variables.rs:450:9:450:13 | a | variables.rs:451:5:451:26 | ExprStmt | match |
+| variables.rs:450:17:450:35 | RecordExpr | variables.rs:450:9:450:13 | a |  |
+| variables.rs:450:33:450:33 | 1 | variables.rs:450:17:450:35 | RecordExpr |  |
+| variables.rs:451:5:451:13 | PathExpr | variables.rs:451:15:451:15 | a |  |
+| variables.rs:451:5:451:25 | CallExpr | variables.rs:452:5:452:14 | ExprStmt |  |
+| variables.rs:451:5:451:26 | ExprStmt | variables.rs:451:5:451:13 | PathExpr |  |
+| variables.rs:451:15:451:15 | a | variables.rs:451:15:451:24 | MethodCallExpr |  |
+| variables.rs:451:15:451:24 | MethodCallExpr | variables.rs:451:5:451:25 | CallExpr |  |
+| variables.rs:452:5:452:5 | a | variables.rs:452:5:452:9 | FieldExpr |  |
+| variables.rs:452:5:452:9 | FieldExpr | variables.rs:452:13:452:13 | 5 |  |
+| variables.rs:452:5:452:13 | ... = ... | variables.rs:453:5:453:26 | ExprStmt |  |
+| variables.rs:452:5:452:14 | ExprStmt | variables.rs:452:5:452:5 | a |  |
+| variables.rs:452:13:452:13 | 5 | variables.rs:452:5:452:13 | ... = ... |  |
+| variables.rs:453:5:453:13 | PathExpr | variables.rs:453:15:453:15 | a |  |
+| variables.rs:453:5:453:25 | CallExpr | variables.rs:454:5:454:28 | ExprStmt |  |
+| variables.rs:453:5:453:26 | ExprStmt | variables.rs:453:5:453:13 | PathExpr |  |
+| variables.rs:453:15:453:15 | a | variables.rs:453:15:453:24 | MethodCallExpr |  |
+| variables.rs:453:15:453:24 | MethodCallExpr | variables.rs:453:5:453:25 | CallExpr |  |
+| variables.rs:454:5:454:5 | a | variables.rs:454:25:454:25 | 2 |  |
+| variables.rs:454:5:454:27 | ... = ... | variables.rs:455:5:455:26 | ExprStmt |  |
+| variables.rs:454:5:454:28 | ExprStmt | variables.rs:454:5:454:5 | a |  |
+| variables.rs:454:9:454:27 | RecordExpr | variables.rs:454:5:454:27 | ... = ... |  |
+| variables.rs:454:25:454:25 | 2 | variables.rs:454:9:454:27 | RecordExpr |  |
+| variables.rs:455:5:455:13 | PathExpr | variables.rs:455:15:455:15 | a |  |
+| variables.rs:455:5:455:25 | CallExpr | variables.rs:449:14:456:1 | BlockExpr |  |
+| variables.rs:455:5:455:26 | ExprStmt | variables.rs:455:5:455:13 | PathExpr |  |
+| variables.rs:455:15:455:15 | a | variables.rs:455:15:455:24 | MethodCallExpr |  |
+| variables.rs:455:15:455:24 | MethodCallExpr | variables.rs:455:5:455:25 | CallExpr |  |
+| variables.rs:458:1:460:1 | enter ref_param | variables.rs:458:14:458:14 | x |  |
+| variables.rs:458:1:460:1 | exit ref_param (normal) | variables.rs:458:1:460:1 | exit ref_param |  |
+| variables.rs:458:14:458:14 | x | variables.rs:458:14:458:20 | Param | match |
+| variables.rs:458:14:458:20 | Param | variables.rs:459:5:459:13 | PathExpr |  |
+| variables.rs:458:23:460:1 | BlockExpr | variables.rs:458:1:460:1 | exit ref_param (normal) |  |
+| variables.rs:459:5:459:13 | PathExpr | variables.rs:459:16:459:16 | x |  |
+| variables.rs:459:5:459:17 | CallExpr | variables.rs:458:23:460:1 | BlockExpr |  |
+| variables.rs:459:15:459:16 | * ... | variables.rs:459:5:459:17 | CallExpr |  |
+| variables.rs:459:16:459:16 | x | variables.rs:459:15:459:16 | * ... |  |
+| variables.rs:462:1:469:1 | enter ref_arg | variables.rs:463:5:463:15 | LetStmt |  |
+| variables.rs:462:1:469:1 | exit ref_arg (normal) | variables.rs:462:1:469:1 | exit ref_arg |  |
+| variables.rs:462:14:469:1 | BlockExpr | variables.rs:462:1:469:1 | exit ref_arg (normal) |  |
+| variables.rs:463:5:463:15 | LetStmt | variables.rs:463:13:463:14 | 16 |  |
+| variables.rs:463:9:463:9 | x | variables.rs:464:5:464:18 | ExprStmt | match |
+| variables.rs:463:13:463:14 | 16 | variables.rs:463:9:463:9 | x |  |
+| variables.rs:464:5:464:13 | PathExpr | variables.rs:464:16:464:16 | x |  |
+| variables.rs:464:5:464:17 | CallExpr | variables.rs:465:5:465:17 | ExprStmt |  |
+| variables.rs:464:5:464:18 | ExprStmt | variables.rs:464:5:464:13 | PathExpr |  |
+| variables.rs:464:15:464:16 | RefExpr | variables.rs:464:5:464:17 | CallExpr |  |
+| variables.rs:464:16:464:16 | x | variables.rs:464:15:464:16 | RefExpr |  |
+| variables.rs:465:5:465:13 | PathExpr | variables.rs:465:15:465:15 | x |  |
+| variables.rs:465:5:465:16 | CallExpr | variables.rs:467:5:467:15 | LetStmt |  |
+| variables.rs:465:5:465:17 | ExprStmt | variables.rs:465:5:465:13 | PathExpr |  |
+| variables.rs:465:15:465:15 | x | variables.rs:465:5:465:16 | CallExpr |  |
+| variables.rs:467:5:467:15 | LetStmt | variables.rs:467:13:467:14 | 17 |  |
+| variables.rs:467:9:467:9 | z | variables.rs:468:5:468:18 | ExprStmt | match |
+| variables.rs:467:13:467:14 | 17 | variables.rs:467:9:467:9 | z |  |
+| variables.rs:468:5:468:13 | PathExpr | variables.rs:468:16:468:16 | z |  |
+| variables.rs:468:5:468:17 | CallExpr | variables.rs:462:14:469:1 | BlockExpr |  |
+| variables.rs:468:5:468:18 | ExprStmt | variables.rs:468:5:468:13 | PathExpr |  |
+| variables.rs:468:15:468:16 | RefExpr | variables.rs:468:5:468:17 | CallExpr |  |
+| variables.rs:468:16:468:16 | z | variables.rs:468:15:468:16 | RefExpr |  |
+| variables.rs:476:3:478:3 | enter bar | variables.rs:477:5:477:32 | ExprStmt |  |
+| variables.rs:476:3:478:3 | exit bar (normal) | variables.rs:476:3:478:3 | exit bar |  |
+| variables.rs:476:21:478:3 | BlockExpr | variables.rs:476:3:478:3 | exit bar (normal) |  |
+| variables.rs:477:5:477:9 | * ... | variables.rs:477:29:477:29 | 3 |  |
+| variables.rs:477:5:477:31 | ... = ... | variables.rs:476:21:478:3 | BlockExpr |  |
+| variables.rs:477:5:477:32 | ExprStmt | variables.rs:477:6:477:9 | PathExpr |  |
+| variables.rs:477:6:477:9 | PathExpr | variables.rs:477:5:477:9 | * ... |  |
+| variables.rs:477:13:477:31 | RecordExpr | variables.rs:477:5:477:31 | ... = ... |  |
+| variables.rs:477:29:477:29 | 3 | variables.rs:477:13:477:31 | RecordExpr |  |
+| variables.rs:481:1:486:1 | enter ref_methodcall_receiver | variables.rs:482:3:482:34 | LetStmt |  |
+| variables.rs:481:1:486:1 | exit ref_methodcall_receiver (normal) | variables.rs:481:1:486:1 | exit ref_methodcall_receiver |  |
+| variables.rs:481:30:486:1 | BlockExpr | variables.rs:481:1:486:1 | exit ref_methodcall_receiver (normal) |  |
+| variables.rs:482:3:482:34 | LetStmt | variables.rs:482:31:482:31 | 1 |  |
+| variables.rs:482:7:482:11 | a | variables.rs:483:3:483:10 | ExprStmt | match |
+| variables.rs:482:15:482:33 | RecordExpr | variables.rs:482:7:482:11 | a |  |
+| variables.rs:482:31:482:31 | 1 | variables.rs:482:15:482:33 | RecordExpr |  |
+| variables.rs:483:3:483:3 | a | variables.rs:483:3:483:9 | MethodCallExpr |  |
+| variables.rs:483:3:483:9 | MethodCallExpr | variables.rs:485:3:485:19 | ExprStmt |  |
+| variables.rs:483:3:483:10 | ExprStmt | variables.rs:483:3:483:3 | a |  |
+| variables.rs:485:3:485:11 | PathExpr | variables.rs:485:13:485:13 | a |  |
+| variables.rs:485:3:485:18 | CallExpr | variables.rs:481:30:486:1 | BlockExpr |  |
+| variables.rs:485:3:485:19 | ExprStmt | variables.rs:485:3:485:11 | PathExpr |  |
+| variables.rs:485:13:485:13 | a | variables.rs:485:13:485:17 | FieldExpr |  |
+| variables.rs:485:13:485:17 | FieldExpr | variables.rs:485:3:485:18 | CallExpr |  |
+| variables.rs:488:1:520:1 | enter main | variables.rs:489:5:489:25 | ExprStmt |  |
+| variables.rs:488:1:520:1 | exit main (normal) | variables.rs:488:1:520:1 | exit main |  |
+| variables.rs:488:11:520:1 | BlockExpr | variables.rs:488:1:520:1 | exit main (normal) |  |
+| variables.rs:489:5:489:22 | PathExpr | variables.rs:489:5:489:24 | CallExpr |  |
+| variables.rs:489:5:489:24 | CallExpr | variables.rs:490:5:490:23 | ExprStmt |  |
+| variables.rs:489:5:489:25 | ExprStmt | variables.rs:489:5:489:22 | PathExpr |  |
+| variables.rs:490:5:490:20 | PathExpr | variables.rs:490:5:490:22 | CallExpr |  |
+| variables.rs:490:5:490:22 | CallExpr | variables.rs:491:5:491:23 | ExprStmt |  |
+| variables.rs:490:5:490:23 | ExprStmt | variables.rs:490:5:490:20 | PathExpr |  |
+| variables.rs:491:5:491:20 | PathExpr | variables.rs:491:5:491:22 | CallExpr |  |
+| variables.rs:491:5:491:22 | CallExpr | variables.rs:492:5:492:23 | ExprStmt |  |
+| variables.rs:491:5:491:23 | ExprStmt | variables.rs:491:5:491:20 | PathExpr |  |
+| variables.rs:492:5:492:20 | PathExpr | variables.rs:492:5:492:22 | CallExpr |  |
+| variables.rs:492:5:492:22 | CallExpr | variables.rs:493:5:493:19 | ExprStmt |  |
+| variables.rs:492:5:492:23 | ExprStmt | variables.rs:492:5:492:20 | PathExpr |  |
+| variables.rs:493:5:493:16 | PathExpr | variables.rs:493:5:493:18 | CallExpr |  |
+| variables.rs:493:5:493:18 | CallExpr | variables.rs:494:5:494:19 | ExprStmt |  |
+| variables.rs:493:5:493:19 | ExprStmt | variables.rs:493:5:493:16 | PathExpr |  |
+| variables.rs:494:5:494:16 | PathExpr | variables.rs:494:5:494:18 | CallExpr |  |
+| variables.rs:494:5:494:18 | CallExpr | variables.rs:495:5:495:19 | ExprStmt |  |
+| variables.rs:494:5:494:19 | ExprStmt | variables.rs:494:5:494:16 | PathExpr |  |
+| variables.rs:495:5:495:16 | PathExpr | variables.rs:495:5:495:18 | CallExpr |  |
+| variables.rs:495:5:495:18 | CallExpr | variables.rs:496:5:496:19 | ExprStmt |  |
+| variables.rs:495:5:495:19 | ExprStmt | variables.rs:495:5:495:16 | PathExpr |  |
+| variables.rs:496:5:496:16 | PathExpr | variables.rs:496:5:496:18 | CallExpr |  |
+| variables.rs:496:5:496:18 | CallExpr | variables.rs:497:5:497:21 | ExprStmt |  |
+| variables.rs:496:5:496:19 | ExprStmt | variables.rs:496:5:496:16 | PathExpr |  |
+| variables.rs:497:5:497:18 | PathExpr | variables.rs:497:5:497:20 | CallExpr |  |
+| variables.rs:497:5:497:20 | CallExpr | variables.rs:498:5:498:21 | ExprStmt |  |
+| variables.rs:497:5:497:21 | ExprStmt | variables.rs:497:5:497:18 | PathExpr |  |
+| variables.rs:498:5:498:18 | PathExpr | variables.rs:498:5:498:20 | CallExpr |  |
+| variables.rs:498:5:498:20 | CallExpr | variables.rs:499:5:499:21 | ExprStmt |  |
+| variables.rs:498:5:498:21 | ExprStmt | variables.rs:498:5:498:18 | PathExpr |  |
+| variables.rs:499:5:499:18 | PathExpr | variables.rs:499:5:499:20 | CallExpr |  |
+| variables.rs:499:5:499:20 | CallExpr | variables.rs:500:5:500:21 | ExprStmt |  |
+| variables.rs:499:5:499:21 | ExprStmt | variables.rs:499:5:499:18 | PathExpr |  |
+| variables.rs:500:5:500:18 | PathExpr | variables.rs:500:5:500:20 | CallExpr |  |
+| variables.rs:500:5:500:20 | CallExpr | variables.rs:501:5:501:21 | ExprStmt |  |
+| variables.rs:500:5:500:21 | ExprStmt | variables.rs:500:5:500:18 | PathExpr |  |
+| variables.rs:501:5:501:18 | PathExpr | variables.rs:501:5:501:20 | CallExpr |  |
+| variables.rs:501:5:501:20 | CallExpr | variables.rs:502:5:502:21 | ExprStmt |  |
+| variables.rs:501:5:501:21 | ExprStmt | variables.rs:501:5:501:18 | PathExpr |  |
+| variables.rs:502:5:502:18 | PathExpr | variables.rs:502:5:502:20 | CallExpr |  |
+| variables.rs:502:5:502:20 | CallExpr | variables.rs:503:5:503:21 | ExprStmt |  |
+| variables.rs:502:5:502:21 | ExprStmt | variables.rs:502:5:502:18 | PathExpr |  |
+| variables.rs:503:5:503:18 | PathExpr | variables.rs:503:5:503:20 | CallExpr |  |
+| variables.rs:503:5:503:20 | CallExpr | variables.rs:504:5:504:21 | ExprStmt |  |
+| variables.rs:503:5:503:21 | ExprStmt | variables.rs:503:5:503:18 | PathExpr |  |
+| variables.rs:504:5:504:18 | PathExpr | variables.rs:504:5:504:20 | CallExpr |  |
+| variables.rs:504:5:504:20 | CallExpr | variables.rs:505:5:505:21 | ExprStmt |  |
+| variables.rs:504:5:504:21 | ExprStmt | variables.rs:504:5:504:18 | PathExpr |  |
+| variables.rs:505:5:505:18 | PathExpr | variables.rs:505:5:505:20 | CallExpr |  |
+| variables.rs:505:5:505:20 | CallExpr | variables.rs:506:5:506:36 | ExprStmt |  |
+| variables.rs:505:5:505:21 | ExprStmt | variables.rs:505:5:505:18 | PathExpr |  |
+| variables.rs:506:5:506:18 | PathExpr | variables.rs:506:20:506:22 | "a" |  |
+| variables.rs:506:5:506:35 | CallExpr | variables.rs:507:5:507:37 | ExprStmt |  |
+| variables.rs:506:5:506:36 | ExprStmt | variables.rs:506:5:506:18 | PathExpr |  |
+| variables.rs:506:20:506:22 | "a" | variables.rs:506:26:506:28 | "b" |  |
+| variables.rs:506:25:506:34 | TupleExpr | variables.rs:506:5:506:35 | CallExpr |  |
+| variables.rs:506:26:506:28 | "b" | variables.rs:506:31:506:33 | "c" |  |
+| variables.rs:506:31:506:33 | "c" | variables.rs:506:25:506:34 | TupleExpr |  |
+| variables.rs:507:5:507:18 | PathExpr | variables.rs:507:20:507:31 | PathExpr |  |
+| variables.rs:507:5:507:36 | CallExpr | variables.rs:508:5:508:26 | ExprStmt |  |
+| variables.rs:507:5:507:37 | ExprStmt | variables.rs:507:5:507:18 | PathExpr |  |
+| variables.rs:507:20:507:31 | PathExpr | variables.rs:507:33:507:34 | 45 |  |
+| variables.rs:507:20:507:35 | CallExpr | variables.rs:507:5:507:36 | CallExpr |  |
+| variables.rs:507:33:507:34 | 45 | variables.rs:507:20:507:35 | CallExpr |  |
+| variables.rs:508:5:508:23 | PathExpr | variables.rs:508:5:508:25 | CallExpr |  |
+| variables.rs:508:5:508:25 | CallExpr | variables.rs:509:5:509:23 | ExprStmt |  |
+| variables.rs:508:5:508:26 | ExprStmt | variables.rs:508:5:508:23 | PathExpr |  |
+| variables.rs:509:5:509:20 | PathExpr | variables.rs:509:5:509:22 | CallExpr |  |
+| variables.rs:509:5:509:22 | CallExpr | variables.rs:510:5:510:19 | ExprStmt |  |
+| variables.rs:509:5:509:23 | ExprStmt | variables.rs:509:5:509:20 | PathExpr |  |
+| variables.rs:510:5:510:16 | PathExpr | variables.rs:510:5:510:18 | CallExpr |  |
+| variables.rs:510:5:510:18 | CallExpr | variables.rs:511:5:511:17 | ExprStmt |  |
+| variables.rs:510:5:510:19 | ExprStmt | variables.rs:510:5:510:16 | PathExpr |  |
+| variables.rs:511:5:511:14 | PathExpr | variables.rs:511:5:511:16 | CallExpr |  |
+| variables.rs:511:5:511:16 | CallExpr | variables.rs:512:5:512:13 | ExprStmt |  |
+| variables.rs:511:5:511:17 | ExprStmt | variables.rs:511:5:511:14 | PathExpr |  |
+| variables.rs:512:5:512:10 | PathExpr | variables.rs:512:5:512:12 | CallExpr |  |
+| variables.rs:512:5:512:12 | CallExpr | variables.rs:513:5:513:17 | ExprStmt |  |
+| variables.rs:512:5:512:13 | ExprStmt | variables.rs:512:5:512:10 | PathExpr |  |
+| variables.rs:513:5:513:14 | PathExpr | variables.rs:513:5:513:16 | CallExpr |  |
+| variables.rs:513:5:513:16 | CallExpr | variables.rs:514:5:514:12 | ExprStmt |  |
+| variables.rs:513:5:513:17 | ExprStmt | variables.rs:513:5:513:14 | PathExpr |  |
+| variables.rs:514:5:514:9 | PathExpr | variables.rs:514:5:514:11 | CallExpr |  |
+| variables.rs:514:5:514:11 | CallExpr | variables.rs:515:5:515:18 | ExprStmt |  |
+| variables.rs:514:5:514:12 | ExprStmt | variables.rs:514:5:514:9 | PathExpr |  |
+| variables.rs:515:5:515:15 | PathExpr | variables.rs:515:5:515:17 | CallExpr |  |
+| variables.rs:515:5:515:17 | CallExpr | variables.rs:516:5:516:20 | ExprStmt |  |
+| variables.rs:515:5:515:18 | ExprStmt | variables.rs:515:5:515:15 | PathExpr |  |
+| variables.rs:516:5:516:17 | PathExpr | variables.rs:516:5:516:19 | CallExpr |  |
+| variables.rs:516:5:516:19 | CallExpr | variables.rs:517:5:517:14 | ExprStmt |  |
+| variables.rs:516:5:516:20 | ExprStmt | variables.rs:516:5:516:17 | PathExpr |  |
+| variables.rs:517:5:517:11 | PathExpr | variables.rs:517:5:517:13 | CallExpr |  |
+| variables.rs:517:5:517:13 | CallExpr | variables.rs:518:5:518:14 | ExprStmt |  |
+| variables.rs:517:5:517:14 | ExprStmt | variables.rs:517:5:517:11 | PathExpr |  |
+| variables.rs:518:5:518:11 | PathExpr | variables.rs:518:5:518:13 | CallExpr |  |
+| variables.rs:518:5:518:13 | CallExpr | variables.rs:519:5:519:30 | ExprStmt |  |
+| variables.rs:518:5:518:14 | ExprStmt | variables.rs:518:5:518:11 | PathExpr |  |
+| variables.rs:519:5:519:27 | PathExpr | variables.rs:519:5:519:29 | CallExpr |  |
+| variables.rs:519:5:519:29 | CallExpr | variables.rs:488:11:520:1 | BlockExpr |  |
+| variables.rs:519:5:519:30 | ExprStmt | variables.rs:519:5:519:27 | PathExpr |  |
 breakTarget
 continueTarget
diff --git a/rust/ql/test/library-tests/variables/variables.expected b/rust/ql/test/library-tests/variables/variables.expected
index 7751d42911b4..c752e862c818 100644
--- a/rust/ql/test/library-tests/variables/variables.expected
+++ b/rust/ql/test/library-tests/variables/variables.expected
@@ -1,4 +1,6 @@
 testFailures
+| variables.rs:452:5:452:5 | a | Unexpected result: write_access=a |
+| variables.rs:452:16:452:33 | Comment | Missing result:read_access=a |
 failures
 variable
 | variables.rs:3:14:3:14 | s |
@@ -70,11 +72,28 @@ variable
 | variables.rs:338:13:338:13 | i |
 | variables.rs:339:9:339:13 | ref_i |
 | variables.rs:345:17:345:17 | x |
-| variables.rs:352:13:352:13 | x |
-| variables.rs:358:13:358:13 | x |
-| variables.rs:359:9:359:9 | y |
-| variables.rs:366:13:366:13 | x |
-| variables.rs:367:13:367:15 | cap |
+| variables.rs:352:22:352:22 | x |
+| variables.rs:352:39:352:39 | y |
+| variables.rs:361:13:361:13 | x |
+| variables.rs:362:9:362:9 | y |
+| variables.rs:368:13:368:13 | z |
+| variables.rs:369:9:369:9 | w |
+| variables.rs:381:13:381:13 | x |
+| variables.rs:382:9:382:9 | y |
+| variables.rs:389:13:389:13 | x |
+| variables.rs:390:13:390:15 | cap |
+| variables.rs:399:9:399:9 | x |
+| variables.rs:400:13:400:15 | cap |
+| variables.rs:407:8:407:8 | b |
+| variables.rs:408:13:408:13 | x |
+| variables.rs:423:13:423:14 | b1 |
+| variables.rs:423:24:423:25 | b2 |
+| variables.rs:424:9:424:9 | x |
+| variables.rs:450:13:450:13 | a |
+| variables.rs:458:14:458:14 | x |
+| variables.rs:463:9:463:9 | x |
+| variables.rs:467:9:467:9 | z |
+| variables.rs:482:11:482:11 | a |
 variableAccess
 | variables.rs:4:20:4:20 | s | variables.rs:3:14:3:14 | s |
 | variables.rs:8:20:8:20 | i | variables.rs:7:14:7:14 | i |
@@ -170,20 +189,66 @@ variableAccess
 | variables.rs:346:6:346:6 | x | variables.rs:345:17:345:17 | x |
 | variables.rs:347:10:347:10 | x | variables.rs:345:17:345:17 | x |
 | variables.rs:348:10:348:10 | x | variables.rs:345:17:345:17 | x |
-| variables.rs:353:23:353:23 | x | variables.rs:352:13:352:13 | x |
-| variables.rs:354:15:354:15 | x | variables.rs:352:13:352:13 | x |
-| variables.rs:360:14:360:14 | x | variables.rs:358:13:358:13 | x |
-| variables.rs:361:6:361:6 | y | variables.rs:359:9:359:9 | y |
-| variables.rs:362:15:362:15 | x | variables.rs:358:13:358:13 | x |
-| variables.rs:368:19:368:19 | x | variables.rs:366:13:366:13 | x |
-| variables.rs:369:9:369:9 | x | variables.rs:366:13:366:13 | x |
-| variables.rs:371:5:371:7 | cap | variables.rs:367:13:367:15 | cap |
-| variables.rs:372:15:372:15 | x | variables.rs:366:13:366:13 | x |
+| variables.rs:349:12:349:12 | x | variables.rs:345:17:345:17 | x |
+| variables.rs:353:6:353:6 | x | variables.rs:352:22:352:22 | x |
+| variables.rs:354:10:354:10 | x | variables.rs:352:22:352:22 | x |
+| variables.rs:355:10:355:10 | x | variables.rs:352:22:352:22 | x |
+| variables.rs:356:6:356:6 | y | variables.rs:352:39:352:39 | y |
+| variables.rs:357:9:357:9 | x | variables.rs:352:22:352:22 | x |
+| variables.rs:363:27:363:27 | x | variables.rs:361:13:361:13 | x |
+| variables.rs:364:6:364:6 | y | variables.rs:362:9:362:9 | y |
+| variables.rs:366:15:366:15 | x | variables.rs:361:13:361:13 | x |
+| variables.rs:370:19:370:19 | x | variables.rs:361:13:361:13 | x |
+| variables.rs:372:14:372:14 | z | variables.rs:368:13:368:13 | z |
+| variables.rs:373:9:373:9 | w | variables.rs:369:9:369:9 | w |
+| variables.rs:375:7:375:7 | w | variables.rs:369:9:369:9 | w |
+| variables.rs:377:15:377:15 | z | variables.rs:368:13:368:13 | z |
+| variables.rs:383:14:383:14 | x | variables.rs:381:13:381:13 | x |
+| variables.rs:384:6:384:6 | y | variables.rs:382:9:382:9 | y |
+| variables.rs:385:15:385:15 | x | variables.rs:381:13:381:13 | x |
+| variables.rs:391:19:391:19 | x | variables.rs:389:13:389:13 | x |
+| variables.rs:392:9:392:9 | x | variables.rs:389:13:389:13 | x |
+| variables.rs:394:5:394:7 | cap | variables.rs:390:13:390:15 | cap |
+| variables.rs:395:15:395:15 | x | variables.rs:389:13:389:13 | x |
+| variables.rs:401:19:401:19 | x | variables.rs:399:9:399:9 | x |
+| variables.rs:403:5:403:7 | cap | variables.rs:400:13:400:15 | cap |
+| variables.rs:404:15:404:15 | x | variables.rs:399:9:399:9 | x |
+| variables.rs:409:15:409:15 | x | variables.rs:408:13:408:13 | x |
+| variables.rs:410:15:410:15 | x | variables.rs:408:13:408:13 | x |
+| variables.rs:411:8:411:8 | b | variables.rs:407:8:407:8 | b |
+| variables.rs:412:9:412:9 | x | variables.rs:408:13:408:13 | x |
+| variables.rs:413:19:413:19 | x | variables.rs:408:13:408:13 | x |
+| variables.rs:414:19:414:19 | x | variables.rs:408:13:408:13 | x |
+| variables.rs:416:9:416:9 | x | variables.rs:408:13:408:13 | x |
+| variables.rs:417:19:417:19 | x | variables.rs:408:13:408:13 | x |
+| variables.rs:418:19:418:19 | x | variables.rs:408:13:408:13 | x |
+| variables.rs:420:15:420:15 | x | variables.rs:408:13:408:13 | x |
+| variables.rs:425:8:425:9 | b1 | variables.rs:423:13:423:14 | b1 |
+| variables.rs:426:19:426:19 | x | variables.rs:424:9:424:9 | x |
+| variables.rs:428:19:428:19 | x | variables.rs:424:9:424:9 | x |
+| variables.rs:431:8:431:9 | b2 | variables.rs:423:24:423:25 | b2 |
+| variables.rs:432:19:432:19 | x | variables.rs:424:9:424:9 | x |
+| variables.rs:434:19:434:19 | x | variables.rs:424:9:424:9 | x |
+| variables.rs:451:15:451:15 | a | variables.rs:450:13:450:13 | a |
+| variables.rs:452:5:452:5 | a | variables.rs:450:13:450:13 | a |
+| variables.rs:453:15:453:15 | a | variables.rs:450:13:450:13 | a |
+| variables.rs:454:5:454:5 | a | variables.rs:450:13:450:13 | a |
+| variables.rs:455:15:455:15 | a | variables.rs:450:13:450:13 | a |
+| variables.rs:459:16:459:16 | x | variables.rs:458:14:458:14 | x |
+| variables.rs:464:16:464:16 | x | variables.rs:463:9:463:9 | x |
+| variables.rs:465:15:465:15 | x | variables.rs:463:9:463:9 | x |
+| variables.rs:468:16:468:16 | z | variables.rs:467:9:467:9 | z |
+| variables.rs:483:3:483:3 | a | variables.rs:482:11:482:11 | a |
+| variables.rs:485:13:485:13 | a | variables.rs:482:11:482:11 | a |
 variableWriteAccess
 | variables.rs:19:5:19:6 | x2 | variables.rs:17:13:17:14 | x2 |
 | variables.rs:277:9:277:10 | c2 | variables.rs:270:13:270:14 | c2 |
 | variables.rs:278:9:278:10 | b4 | variables.rs:269:13:269:14 | b4 |
 | variables.rs:279:9:279:11 | a10 | variables.rs:268:13:268:15 | a10 |
+| variables.rs:412:9:412:9 | x | variables.rs:408:13:408:13 | x |
+| variables.rs:416:9:416:9 | x | variables.rs:408:13:408:13 | x |
+| variables.rs:452:5:452:5 | a | variables.rs:450:13:450:13 | a |
+| variables.rs:454:5:454:5 | a | variables.rs:450:13:450:13 | a |
 variableReadAccess
 | variables.rs:4:20:4:20 | s | variables.rs:3:14:3:14 | s |
 | variables.rs:8:20:8:20 | i | variables.rs:7:14:7:14 | i |
@@ -272,12 +337,46 @@ variableReadAccess
 | variables.rs:346:6:346:6 | x | variables.rs:345:17:345:17 | x |
 | variables.rs:347:10:347:10 | x | variables.rs:345:17:345:17 | x |
 | variables.rs:348:10:348:10 | x | variables.rs:345:17:345:17 | x |
-| variables.rs:354:15:354:15 | x | variables.rs:352:13:352:13 | x |
-| variables.rs:361:6:361:6 | y | variables.rs:359:9:359:9 | y |
-| variables.rs:362:15:362:15 | x | variables.rs:358:13:358:13 | x |
-| variables.rs:368:19:368:19 | x | variables.rs:366:13:366:13 | x |
-| variables.rs:371:5:371:7 | cap | variables.rs:367:13:367:15 | cap |
-| variables.rs:372:15:372:15 | x | variables.rs:366:13:366:13 | x |
+| variables.rs:349:12:349:12 | x | variables.rs:345:17:345:17 | x |
+| variables.rs:353:6:353:6 | x | variables.rs:352:22:352:22 | x |
+| variables.rs:354:10:354:10 | x | variables.rs:352:22:352:22 | x |
+| variables.rs:355:10:355:10 | x | variables.rs:352:22:352:22 | x |
+| variables.rs:356:6:356:6 | y | variables.rs:352:39:352:39 | y |
+| variables.rs:357:9:357:9 | x | variables.rs:352:22:352:22 | x |
+| variables.rs:364:6:364:6 | y | variables.rs:362:9:362:9 | y |
+| variables.rs:366:15:366:15 | x | variables.rs:361:13:361:13 | x |
+| variables.rs:373:9:373:9 | w | variables.rs:369:9:369:9 | w |
+| variables.rs:375:7:375:7 | w | variables.rs:369:9:369:9 | w |
+| variables.rs:377:15:377:15 | z | variables.rs:368:13:368:13 | z |
+| variables.rs:384:6:384:6 | y | variables.rs:382:9:382:9 | y |
+| variables.rs:385:15:385:15 | x | variables.rs:381:13:381:13 | x |
+| variables.rs:391:19:391:19 | x | variables.rs:389:13:389:13 | x |
+| variables.rs:394:5:394:7 | cap | variables.rs:390:13:390:15 | cap |
+| variables.rs:395:15:395:15 | x | variables.rs:389:13:389:13 | x |
+| variables.rs:401:19:401:19 | x | variables.rs:399:9:399:9 | x |
+| variables.rs:403:5:403:7 | cap | variables.rs:400:13:400:15 | cap |
+| variables.rs:404:15:404:15 | x | variables.rs:399:9:399:9 | x |
+| variables.rs:409:15:409:15 | x | variables.rs:408:13:408:13 | x |
+| variables.rs:410:15:410:15 | x | variables.rs:408:13:408:13 | x |
+| variables.rs:411:8:411:8 | b | variables.rs:407:8:407:8 | b |
+| variables.rs:413:19:413:19 | x | variables.rs:408:13:408:13 | x |
+| variables.rs:414:19:414:19 | x | variables.rs:408:13:408:13 | x |
+| variables.rs:417:19:417:19 | x | variables.rs:408:13:408:13 | x |
+| variables.rs:418:19:418:19 | x | variables.rs:408:13:408:13 | x |
+| variables.rs:420:15:420:15 | x | variables.rs:408:13:408:13 | x |
+| variables.rs:425:8:425:9 | b1 | variables.rs:423:13:423:14 | b1 |
+| variables.rs:426:19:426:19 | x | variables.rs:424:9:424:9 | x |
+| variables.rs:428:19:428:19 | x | variables.rs:424:9:424:9 | x |
+| variables.rs:431:8:431:9 | b2 | variables.rs:423:24:423:25 | b2 |
+| variables.rs:432:19:432:19 | x | variables.rs:424:9:424:9 | x |
+| variables.rs:434:19:434:19 | x | variables.rs:424:9:424:9 | x |
+| variables.rs:451:15:451:15 | a | variables.rs:450:13:450:13 | a |
+| variables.rs:453:15:453:15 | a | variables.rs:450:13:450:13 | a |
+| variables.rs:455:15:455:15 | a | variables.rs:450:13:450:13 | a |
+| variables.rs:459:16:459:16 | x | variables.rs:458:14:458:14 | x |
+| variables.rs:465:15:465:15 | x | variables.rs:463:9:463:9 | x |
+| variables.rs:483:3:483:3 | a | variables.rs:482:11:482:11 | a |
+| variables.rs:485:13:485:13 | a | variables.rs:482:11:482:11 | a |
 variableInitializer
 | variables.rs:12:9:12:10 | x1 | variables.rs:12:14:12:16 | "a" |
 | variables.rs:17:13:17:14 | x2 | variables.rs:17:18:17:18 | 4 |
@@ -306,13 +405,26 @@ variableInitializer
 | variables.rs:330:13:330:13 | a | variables.rs:330:17:330:17 | 0 |
 | variables.rs:338:13:338:13 | i | variables.rs:338:17:338:17 | 1 |
 | variables.rs:339:9:339:13 | ref_i | variables.rs:340:9:340:14 | RefExpr |
-| variables.rs:352:13:352:13 | x | variables.rs:352:17:352:17 | 2 |
-| variables.rs:358:13:358:13 | x | variables.rs:358:17:358:17 | 1 |
-| variables.rs:359:9:359:9 | y | variables.rs:360:9:360:14 | RefExpr |
-| variables.rs:366:13:366:13 | x | variables.rs:366:17:366:18 | 10 |
-| variables.rs:367:13:367:15 | cap | variables.rs:367:19:370:5 | ClosureExpr |
+| variables.rs:361:13:361:13 | x | variables.rs:361:17:361:17 | 2 |
+| variables.rs:362:9:362:9 | y | variables.rs:363:9:363:28 | CallExpr |
+| variables.rs:368:13:368:13 | z | variables.rs:368:17:368:17 | 4 |
+| variables.rs:369:9:369:9 | w | variables.rs:370:9:370:19 | RefExpr |
+| variables.rs:381:13:381:13 | x | variables.rs:381:17:381:17 | 1 |
+| variables.rs:382:9:382:9 | y | variables.rs:383:9:383:14 | RefExpr |
+| variables.rs:389:13:389:13 | x | variables.rs:389:17:389:18 | 10 |
+| variables.rs:390:13:390:15 | cap | variables.rs:390:19:393:5 | ClosureExpr |
+| variables.rs:399:9:399:9 | x | variables.rs:399:13:399:15 | 100 |
+| variables.rs:400:13:400:15 | cap | variables.rs:400:19:402:5 | ClosureExpr |
+| variables.rs:408:13:408:13 | x | variables.rs:408:17:408:17 | 1 |
+| variables.rs:424:9:424:9 | x | variables.rs:424:13:424:13 | 1 |
+| variables.rs:450:13:450:13 | a | variables.rs:450:17:450:35 | RecordExpr |
+| variables.rs:463:9:463:9 | x | variables.rs:463:13:463:14 | 16 |
+| variables.rs:467:9:467:9 | z | variables.rs:467:13:467:14 | 17 |
+| variables.rs:482:11:482:11 | a | variables.rs:482:15:482:33 | RecordExpr |
 capturedVariable
-| variables.rs:366:13:366:13 | x |
+| variables.rs:389:13:389:13 | x |
+| variables.rs:399:9:399:9 | x |
 capturedAccess
-| variables.rs:368:19:368:19 | x |
-| variables.rs:369:9:369:9 | x |
+| variables.rs:391:19:391:19 | x |
+| variables.rs:392:9:392:9 | x |
+| variables.rs:401:19:401:19 | x |
diff --git a/rust/ql/test/library-tests/variables/variables.rs b/rust/ql/test/library-tests/variables/variables.rs
index dbc3fd4cab5c..a94d83c87b23 100644
--- a/rust/ql/test/library-tests/variables/variables.rs
+++ b/rust/ql/test/library-tests/variables/variables.rs
@@ -342,16 +342,39 @@ fn mutate() {
     print_i64(i); // $ read_access=i
 }
 
-fn mutate_param(x : &mut i64) { // x
+fn mutate_param(x : &mut i64) -> &mut i64 {
     *x = // $ read_access=x
         *x + // $ read_access=x
         *x; // $ read_access=x
+    return x; // $ read_access=x
+}
+
+fn mutate_param2<'a>(x : &'a mut i64, y :&mut &'a mut i64) {
+    *x = // $ read_access=x
+        *x + // $ read_access=x
+        *x; // $ read_access=x
+    *y = // $ read_access=y
+        x; // $ read_access=x
 }
 
 fn mutate_arg() {
     let mut x = 2; // x
-    mutate_param(&mut x); // $ access=x
+    let y = // y
+        mutate_param(&mut x); // $ access=x
+    *y = 10; // $ read_access=y
+    // prints 10, not 4
     print_i64(x); // $ read_access=x
+
+    let mut z = 4; // z
+    let w = // w
+        &mut &mut x; // $ access=x
+    mutate_param2(
+        &mut z, // $ access=z
+        w // $ read_access=w
+    );
+    **w = 11; // $ read_access=w
+    // prints 11, not 8
+    print_i64(z); // $ read_access=z
 }
 
 fn alias() {
@@ -362,7 +385,7 @@ fn alias() {
     print_i64(x); // $ read_access=x
 }
 
-fn capture() {
+fn capture_mut() {
     let mut x = 10; // x
     let mut cap = || {
         print_i64(x); // $ read_access=x
@@ -372,6 +395,96 @@ fn capture() {
     print_i64(x); // $ read_access=x
 }
 
+fn capture_immut() {
+    let x = 100; // x
+    let mut cap = || {
+        print_i64(x); // $ read_access=x
+    };
+    cap(); // $ read_access=cap
+    print_i64(x); // $ read_access=x
+}
+
+fn phi(b : bool) {
+    let mut x = 1; // x
+    print_i64(x); // $ read_access=x
+    print_i64(x + 1); // $ read_access=x
+    if b { // $ read_access=b
+        x = 2; // $ write_access=x
+        print_i64(x); // $ read_access=x
+        print_i64(x + 1); // $ read_access=x
+    } else {
+        x = 3; // $ write_access=x
+        print_i64(x); // $ read_access=x
+        print_i64(x + 1); // $ read_access=x
+    }
+    print_i64(x); // $ read_access=x
+}
+
+fn phi_read(b1 : bool, b2 : bool) {
+    let x = 1; // x
+    if b1 { // $ read_access=b1
+        print_i64(x); // $ read_access=x
+    } else {
+        print_i64(x); // $ read_access=x
+    }
+
+    if b2 { // $ read_access=b2
+        print_i64(x); // $ read_access=x
+    } else {
+        print_i64(x); // $ read_access=x
+    }
+}
+
+#[derive(Debug)]
+struct MyStruct {
+    val: i64,
+}
+
+impl MyStruct {
+    fn my_get(&mut self) -> i64 {
+        return self.val;
+    }
+}
+
+fn structs() {
+    let mut a = MyStruct { val: 1 }; // a
+    print_i64(a.my_get()); // $ read_access=a
+    a.val = 5; // $ read_access=a
+    print_i64(a.my_get()); // $ read_access=a
+    a = MyStruct { val: 2 }; // $ write_access=a
+    print_i64(a.my_get()); // $ read_access=a
+}
+
+fn ref_param(x: &i64) {
+    print_i64(*x) // $ read_access=x
+}
+
+fn ref_arg() {
+    let x = 16; // x
+    ref_param(&x); // $ access=x
+    print_i64(x); // $ read_access=x
+
+    let z = 17; // z
+    ref_param(&z); // $ access=z
+}
+
+trait Bar {
+  fn bar(&self);
+}
+
+impl MyStruct {
+  fn bar(&mut self) {
+    *self = MyStruct { val: 3 };
+  }
+}
+
+fn ref_methodcall_receiver() {
+  let mut a = MyStruct { val: 1 }; // a
+  a.bar(); // $ read_access=a
+  // prints 3, not 1
+  print_i64(a.val); // $ read_access=a
+}
+
 fn main() {
     immutable_variable();
     mutable_variable();
@@ -399,5 +512,9 @@ fn main() {
     mutate();
     mutate_arg();
     alias();
-    capture();
+    capture_mut();
+    capture_immut();
+    structs();
+    ref_arg();
+    ref_methodcall_receiver();
 }

From 6290be2922ff6665320d8df08c1aa1460a3ae933 Mon Sep 17 00:00:00 2001
From: Tom Hvitved <hvitved@github.com>
Date: Fri, 11 Oct 2024 10:40:15 +0200
Subject: [PATCH 322/347] Rust: Initial SSA implementation

---
 rust/ql/consistency-queries/SsaConsistency.ql |  19 +
 rust/ql/lib/codeql/rust/dataflow/Ssa.qll      | 340 ++++++++++++
 .../codeql/rust/dataflow/internal/SsaImpl.qll | 332 +++++++++++
 .../rust/elements/internal/VariableImpl.qll   | 124 +++--
 .../test/library-tests/variables/Ssa.expected | 524 ++++++++++++++++++
 rust/ql/test/library-tests/variables/Ssa.ql   |  52 ++
 .../variables/variables.expected              |   4 +-
 7 files changed, 1341 insertions(+), 54 deletions(-)
 create mode 100644 rust/ql/consistency-queries/SsaConsistency.ql
 create mode 100644 rust/ql/lib/codeql/rust/dataflow/Ssa.qll
 create mode 100644 rust/ql/lib/codeql/rust/dataflow/internal/SsaImpl.qll
 create mode 100644 rust/ql/test/library-tests/variables/Ssa.expected
 create mode 100644 rust/ql/test/library-tests/variables/Ssa.ql

diff --git a/rust/ql/consistency-queries/SsaConsistency.ql b/rust/ql/consistency-queries/SsaConsistency.ql
new file mode 100644
index 000000000000..0764842dac37
--- /dev/null
+++ b/rust/ql/consistency-queries/SsaConsistency.ql
@@ -0,0 +1,19 @@
+import codeql.rust.dataflow.Ssa
+import codeql.rust.dataflow.internal.SsaImpl
+import Consistency
+
+class MyRelevantDefinition extends RelevantDefinition, Ssa::Definition {
+  override predicate hasLocationInfo(
+    string filepath, int startline, int startcolumn, int endline, int endcolumn
+  ) {
+    this.getLocation().hasLocationInfo(filepath, startline, startcolumn, endline, endcolumn)
+  }
+}
+
+class MyRelevantDefinitionExt extends RelevantDefinitionExt, DefinitionExt {
+  override predicate hasLocationInfo(
+    string filepath, int startline, int startcolumn, int endline, int endcolumn
+  ) {
+    this.getLocation().hasLocationInfo(filepath, startline, startcolumn, endline, endcolumn)
+  }
+}
diff --git a/rust/ql/lib/codeql/rust/dataflow/Ssa.qll b/rust/ql/lib/codeql/rust/dataflow/Ssa.qll
new file mode 100644
index 000000000000..ff1aae058aaa
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/dataflow/Ssa.qll
@@ -0,0 +1,340 @@
+/**
+ * Provides the module `Ssa` for working with static single assignment (SSA) form.
+ */
+
+/**
+ * Provides classes for working with static single assignment (SSA) form.
+ */
+module Ssa {
+  private import rust
+  private import codeql.rust.controlflow.BasicBlocks
+  private import codeql.rust.controlflow.ControlFlowGraph
+  private import codeql.rust.controlflow.internal.ControlFlowGraphImpl as CfgImpl
+  private import internal.SsaImpl as SsaImpl
+
+  class Variable = SsaImpl::SsaInput::SourceVariable;
+
+  /** A static single assignment (SSA) definition. */
+  class Definition extends SsaImpl::Definition {
+    /**
+     * Gets the control flow node of this SSA definition, if any. Phi nodes are
+     * examples of SSA definitions without a control flow node, as they are
+     * modeled at index `-1` in the relevant basic block.
+     */
+    final CfgNode getControlFlowNode() {
+      exists(BasicBlock bb, int i | this.definesAt(_, bb, i) | result = bb.getNode(i))
+    }
+
+    /**
+     * Gets a control-flow node that reads the value of this SSA definition.
+     *
+     * Example:
+     *
+     * ```rust
+     * fn phi(b : bool) {              // defines b_0
+     *      let mut x = 1;             // defines x_0
+     *      println!("{}", x);         // reads x_0
+     *      println!("{}", x + 1);     // reads x_0
+     *
+     *      if b {                     // reads b_0
+     *          x = 2;                 // defines x_1
+     *          println!("{}", x);     // reads x_1
+     *          println!("{}", x + 1); // reads x_1
+     *      } else {
+     *          x = 3;                 // defines x_2
+     *          println!("{}", x);     // reads x_2
+     *          println!("{}", x + 1); // reads x_2
+     *      }
+     *                                 // defines x_3 = phi(x_1, x_2)
+     *      println!("{}", x);         // reads x_3
+     * }
+     * ```
+     */
+    final CfgNode getARead() { result = SsaImpl::getARead(this) }
+
+    /**
+     * Gets a first control-flow node that reads the value of this SSA definition.
+     * That is, a read that can be reached from this definition without passing
+     * through other reads.
+     *
+     * Example:
+     *
+     * ```rust
+     * fn phi(b : bool) {              // defines b_0
+     *      let mut x = 1;             // defines x_0
+     *      println!("{}", x);         // first read of x_0
+     *      println!("{}", x + 1);
+     *
+     *      if b {                     // first read of b_0
+     *          x = 2;                 // defines x_1
+     *          println!("{}", x);     // first read of x_1
+     *          println!("{}", x + 1);
+     *      } else {
+     *          x = 3;                 // defines x_2
+     *          println!("{}", x);     // first read of x_2
+     *          println!("{}", x + 1);
+     *      }
+     *                                 // defines x_3 = phi(x_1, x_2)
+     *      println!("{}", x);         // first read of x_3
+     * }
+     * ```
+     */
+    final CfgNode getAFirstRead() { SsaImpl::firstRead(this, result) }
+
+    /**
+     * Gets a last control-flow node that reads the value of this SSA definition.
+     * That is, a read that can reach the end of the enclosing CFG scope, or another
+     * SSA definition for the source variable, without passing through any other read.
+     *
+     * Example:
+     *
+     * ```rust
+     * fn phi(b : bool) {              // defines b_0
+     *      let mut x = 1;             // defines x_0
+     *      println!("{}", x);
+     *      println!("{}", x + 1);     // last read of x_0
+     *
+     *      if b {                     // last read of b_0
+     *          x = 2;                 // defines x_1
+     *          println!("{}", x);
+     *          println!("{}", x + 1); // last read of x_1
+     *      } else {
+     *          x = 3;                 // defines x_2
+     *          println!("{}", x);
+     *          println!("{}", x + 1); // last read of x_2
+     *      }
+     *                                 // defines x_3 = phi(x_1, x_2)
+     *      println!("{}", x);         // last read of x_3
+     * }
+     * ```
+     */
+    final CfgNode getALastRead() { SsaImpl::lastRead(this, result) }
+
+    /**
+     * Holds if `read1` and `read2` are adjacent reads of this SSA definition.
+     * That is, `read2` can be reached from `read1` without passing through
+     * another read.
+     *
+     * Example:
+     *
+     * ```rust
+     * fn phi(b : bool) {
+     *      let mut x = 1;             // defines x_0
+     *      println!("{}", x);         // reads x_0 (read1)
+     *      println!("{}", x + 1);     // reads x_0 (read2)
+     *
+     *      if b {
+     *          x = 2;                 // defines x_1
+     *          println!("{}", x);     // reads x_1 (read1)
+     *          println!("{}", x + 1); // reads x_1 (read2)
+     *      } else {
+     *          x = 3;                 // defines x_2
+     *          println!("{}", x);     // reads x_2 (read1)
+     *          println!("{}", x + 1); // reads x_2 (read2)
+     *      }
+     *      println!("{}", x);
+     * }
+     * ```
+     */
+    final predicate hasAdjacentReads(CfgNode read1, CfgNode read2) {
+      SsaImpl::adjacentReadPair(this, read1, read2)
+    }
+
+    /**
+     * Gets an SSA definition whose value can flow to this one in one step. This
+     * includes inputs to phi nodes and the prior definitions of uncertain writes.
+     */
+    private Definition getAPhiInputOrPriorDefinition() {
+      result = this.(PhiDefinition).getAnInput()
+    }
+
+    /**
+     * Gets a definition that ultimately defines this SSA definition and is
+     * not itself a phi node.
+     *
+     * Example:
+     *
+     * ```rust
+     * fn phi(b : bool) {
+     *      let mut x = 1;             // defines x_0
+     *      println!("{}", x);
+     *      println!("{}", x + 1);
+     *
+     *      if b {
+     *          x = 2;                 // defines x_1
+     *          println!("{}", x);
+     *          println!("{}", x + 1);
+     *      } else {
+     *          x = 3;                 // defines x_2
+     *          println!("{}", x);
+     *          println!("{}", x + 1);
+     *      }
+     *                                 // defines x_3 = phi(x_1, x_2); ultimate definitions are x_1 and x_2
+     *      println!("{}", x);
+     * }
+     * ```
+     */
+    final Definition getAnUltimateDefinition() {
+      result = this.getAPhiInputOrPriorDefinition*() and
+      not result instanceof PhiDefinition
+    }
+
+    override string toString() { result = this.getControlFlowNode().toString() }
+
+    /** Gets the scope of this SSA definition. */
+    CfgScope getScope() { result = this.getBasicBlock().getScope() }
+  }
+
+  /**
+   * An SSA definition that corresponds to a write. Example:
+   *
+   * ```rust
+   * fn m(i : i64) {     // writes `i`
+   *     let mut x = i;  // writes `x`
+   *     x = 11;         // writes `x`
+   * }
+   * ```
+   */
+  class WriteDefinition extends Definition, SsaImpl::WriteDefinition {
+    private CfgNode write;
+
+    WriteDefinition() {
+      exists(BasicBlock bb, int i, Variable v |
+        this.definesAt(v, bb, i) and
+        SsaImpl::variableWriteActual(bb, i, v, write)
+      )
+    }
+
+    /** Gets the underlying write access. */
+    final CfgNode getWriteAccess() { result = write }
+
+    /**
+     * Holds if this SSA definition assigns `value` to the underlying variable.
+     *
+     * This is either a direct assignment, `x = value`, or an assignment via
+     * simple pattern matching
+     *
+     * ```rb
+     * case value
+     *  in Foo => x then ...
+     *  in y => then ...
+     * end
+     * ```
+     */
+    predicate assigns(CfgNode value) {
+      exists(AssignmentExpr ae, BasicBlock bb, int i |
+        this.definesAt(_, bb, i) and
+        ae.getLhs() = bb.getNode(i).getAstNode() and
+        value.getAstNode() = ae.getRhs()
+      )
+    }
+
+    final override string toString() { result = write.toString() }
+
+    final override Location getLocation() { result = write.getLocation() }
+  }
+
+  /**
+   * A phi definition. For example, in
+   *
+   * ```rust
+   * if b {
+   *   x = 0
+   * } else {
+   *   x = 1
+   * }
+   * println!("{}", x);
+   * ```
+   *
+   * a phi definition for `x` is inserted just before the call to `println!`.
+   */
+  class PhiDefinition extends Definition, SsaImpl::PhiDefinition {
+    /**
+     * Gets an input of this phi definition.
+     *
+     * Example:
+     *
+     * ```rust
+     * fn phi(b : bool) {
+     *      let mut x = 1;             // defines x_0
+     *      println!("{}", x);
+     *      println!("{}", x + 1);
+     *
+     *      if b {
+     *          x = 2;                 // defines x_1
+     *          println!("{}", x);
+     *          println!("{}", x + 1);
+     *      } else {
+     *          x = 3;                 // defines x_2
+     *          println!("{}", x);
+     *          println!("{}", x + 1);
+     *      }
+     *                                 // defines x_3 = phi(x_1, x_2); inputs are x_1 and x_2
+     *      println!("{}", x);
+     * }
+     * ```
+     */
+    final Definition getAnInput() { this.hasInputFromBlock(result, _) }
+
+    /** Holds if `inp` is an input to this phi definition along the edge originating in `bb`. */
+    predicate hasInputFromBlock(Definition inp, BasicBlock bb) {
+      inp = SsaImpl::phiHasInputFromBlock(this, bb)
+    }
+
+    private string getSplitString() {
+      result = this.getBasicBlock().getFirstNode().(CfgImpl::AstCfgNode).getSplitsString()
+    }
+
+    override string toString() {
+      exists(string prefix |
+        prefix = "[" + this.getSplitString() + "] "
+        or
+        not exists(this.getSplitString()) and
+        prefix = ""
+      |
+        result = prefix + "phi"
+      )
+    }
+
+    /*
+     * The location of a phi definition is the same as the location of the first node
+     * in the basic block in which it is defined.
+     *
+     * Strictly speaking, the node is *before* the first node, but such a location
+     * does not exist in the source program.
+     */
+
+    final override Location getLocation() {
+      result = this.getBasicBlock().getFirstNode().getLocation()
+    }
+  }
+
+  /**
+   * An SSA definition inserted at the beginning of a scope to represent a
+   * captured local variable. For example, in
+   *
+   * ```rust
+   * fn capture_immut() {
+   *     let x = 100;
+   *     let mut cap = || {
+   *         println!("{}", x);
+   *     };
+   *     cap();
+   * }
+   * ```
+   *
+   * an entry definition for `x` is inserted at the start of the CFG for `cap`.
+   */
+  class CapturedEntryDefinition extends Definition, SsaImpl::WriteDefinition {
+    CapturedEntryDefinition() {
+      exists(BasicBlock bb, int i, Variable v |
+        this.definesAt(v, bb, i) and
+        SsaImpl::capturedEntryWrite(bb, i, v)
+      )
+    }
+
+    final override string toString() { result = "<captured entry> " + this.getSourceVariable() }
+
+    override Location getLocation() { result = this.getBasicBlock().getLocation() }
+  }
+}
diff --git a/rust/ql/lib/codeql/rust/dataflow/internal/SsaImpl.qll b/rust/ql/lib/codeql/rust/dataflow/internal/SsaImpl.qll
new file mode 100644
index 000000000000..cbd638384d8f
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/dataflow/internal/SsaImpl.qll
@@ -0,0 +1,332 @@
+private import rust
+private import codeql.rust.controlflow.BasicBlocks as BasicBlocks
+private import BasicBlocks
+private import codeql.rust.controlflow.ControlFlowGraph as Cfg
+private import Cfg
+private import codeql.rust.controlflow.internal.ControlFlowGraphImpl as ControlFlowGraphImpl
+private import codeql.ssa.Ssa as SsaImplCommon
+
+/** Holds if `v` is introduced like `let v : i64;`. */
+private predicate isUnitializedLet(IdentPat pat, Variable v) {
+  pat = v.getPat() and
+  exists(LetStmt let |
+    let = v.getLetStmt() and
+    not let.hasInitializer()
+  )
+}
+
+/** Holds if `write` writes to variable `v`. */
+predicate variableWrite(AstNode write, Variable v) {
+  exists(IdentPat pat |
+    pat = write and
+    pat = v.getPat() and
+    not isUnitializedLet(pat, v)
+  )
+  or
+  exists(VariableAccess access |
+    access = write and
+    access.getVariable() = v
+  |
+    access instanceof VariableWriteAccess
+    or
+    // Although compound assignments, like `x += y`, may in fact not update `x`,
+    // it makes sense to treat them as such
+    access = any(CompoundAssignmentExpr cae).getLhs()
+  )
+}
+
+module SsaInput implements SsaImplCommon::InputSig<Location> {
+  class BasicBlock = BasicBlocks::BasicBlock;
+
+  class ControlFlowNode = CfgNode;
+
+  BasicBlock getImmediateBasicBlockDominator(BasicBlock bb) { result = bb.getImmediateDominator() }
+
+  BasicBlock getABasicBlockSuccessor(BasicBlock bb) { result = bb.getASuccessor() }
+
+  class ExitBasicBlock = BasicBlocks::ExitBasicBlock;
+
+  /**
+   * A variable amenable to SSA construction.
+   *
+   * All immutable variables are amenable. Mutable variables are restricted
+   * to those that are not captured by closures, and are not borrowed
+   * (either explicitly using `& mut`, or (potentially) implicit as borrowed
+   * receivers in a method call).
+   */
+  class SourceVariable extends Variable {
+    SourceVariable() {
+      this.isImmutable()
+      or
+      this.isMutable() and
+      not this.isCaptured() and
+      forall(VariableAccess va | va = this.getAnAccess() |
+        va instanceof VariableReadAccess and
+        // receivers can be borrowed implicitly, cf.
+        // https://doc.rust-lang.org/reference/expressions/method-call-expr.html
+        not va = any(MethodCallExpr mce).getReceiver()
+        or
+        variableWrite(va, this)
+      )
+    }
+  }
+
+  predicate variableWrite(BasicBlock bb, int i, SourceVariable v, boolean certain) {
+    (
+      variableWriteActual(bb, i, v, _)
+      or
+      capturedEntryWrite(bb, i, v)
+    ) and
+    certain = true
+  }
+
+  predicate variableRead(BasicBlock bb, int i, SourceVariable v, boolean certain) {
+    exists(VariableAccess va |
+      bb.getNode(i).getAstNode() = va and
+      va = v.getAnAccess()
+    |
+      va instanceof VariableReadAccess
+      or
+      // Although compound assignments, like `x += y`, may in fact not read `x`,
+      // it makes sense to treat them as such
+      va = any(CompoundAssignmentExpr cae).getLhs()
+    ) and
+    certain = true
+    or
+    // For immutable variables, we model a read when they are borrowed (although the
+    // actual read happens later, if at all). This only affects the SSA liveness
+    // analysis.
+    exists(VariableAccess va |
+      va = any(RefExpr re).getExpr() and
+      va = bb.getNode(i).getAstNode() and
+      v = va.getVariable() and
+      certain = false
+    )
+  }
+}
+
+import SsaImplCommon::Make<Location, SsaInput> as Impl
+
+class Definition = Impl::Definition;
+
+class WriteDefinition = Impl::WriteDefinition;
+
+class UncertainWriteDefinition = Impl::UncertainWriteDefinition;
+
+class PhiDefinition = Impl::PhiNode;
+
+module Consistency = Impl::Consistency;
+
+module ExposedForTestingOnly {
+  predicate ssaDefReachesReadExt = Impl::ssaDefReachesReadExt/4;
+
+  predicate phiHasInputFromBlockExt = Impl::phiHasInputFromBlockExt/3;
+}
+
+pragma[noinline]
+private predicate adjacentDefRead(
+  Definition def, BasicBlock bb1, int i1, BasicBlock bb2, int i2, SsaInput::SourceVariable v
+) {
+  Impl::adjacentDefRead(def, bb1, i1, bb2, i2) and
+  v = def.getSourceVariable()
+}
+
+pragma[noinline]
+private predicate adjacentDefReadExt(
+  DefinitionExt def, BasicBlock bb1, int i1, BasicBlock bb2, int i2, SsaInput::SourceVariable v
+) {
+  Impl::adjacentDefReadExt(def, _, bb1, i1, bb2, i2) and
+  v = def.getSourceVariable()
+}
+
+/** Holds if `v` is read at index `i` in basic block `bb`. */
+private predicate variableReadActual(BasicBlock bb, int i, Variable v) {
+  exists(VariableReadAccess read |
+    read.getVariable() = v and
+    read = bb.getNode(i).getAstNode()
+  )
+}
+
+private predicate adjacentDefReachesRead(
+  Definition def, BasicBlock bb1, int i1, BasicBlock bb2, int i2
+) {
+  exists(SsaInput::SourceVariable v | adjacentDefRead(def, bb1, i1, bb2, i2, v) |
+    def.definesAt(v, bb1, i1)
+    or
+    SsaInput::variableRead(bb1, i1, v, true)
+  )
+  or
+  exists(BasicBlock bb3, int i3 |
+    adjacentDefReachesRead(def, bb1, i1, bb3, i3) and
+    SsaInput::variableRead(bb3, i3, _, false) and
+    Impl::adjacentDefRead(def, bb3, i3, bb2, i2)
+  )
+}
+
+private predicate adjacentDefReachesReadExt(
+  DefinitionExt def, BasicBlock bb1, int i1, BasicBlock bb2, int i2
+) {
+  exists(SsaInput::SourceVariable v | adjacentDefReadExt(def, bb1, i1, bb2, i2, v) |
+    def.definesAt(v, bb1, i1, _)
+    or
+    SsaInput::variableRead(bb1, i1, v, true)
+  )
+  or
+  exists(BasicBlock bb3, int i3 |
+    adjacentDefReachesReadExt(def, bb1, i1, bb3, i3) and
+    SsaInput::variableRead(bb3, i3, _, false) and
+    Impl::adjacentDefReadExt(def, _, bb3, i3, bb2, i2)
+  )
+}
+
+/** Same as `adjacentDefRead`, but skips uncertain reads. */
+pragma[nomagic]
+private predicate adjacentDefSkipUncertainReads(
+  Definition def, BasicBlock bb1, int i1, BasicBlock bb2, int i2
+) {
+  adjacentDefReachesRead(def, bb1, i1, bb2, i2) and
+  SsaInput::variableRead(bb2, i2, _, true)
+}
+
+private predicate adjacentDefReachesUncertainReadExt(
+  DefinitionExt def, BasicBlock bb1, int i1, BasicBlock bb2, int i2
+) {
+  adjacentDefReachesReadExt(def, bb1, i1, bb2, i2) and
+  SsaInput::variableRead(bb2, i2, _, false)
+}
+
+/** Same as `lastRefRedef`, but skips uncertain reads. */
+pragma[nomagic]
+private predicate lastRefSkipUncertainReadsExt(DefinitionExt def, BasicBlock bb, int i) {
+  Impl::lastRef(def, bb, i) and
+  not SsaInput::variableRead(bb, i, def.getSourceVariable(), false)
+  or
+  exists(BasicBlock bb0, int i0 |
+    Impl::lastRef(def, bb0, i0) and
+    adjacentDefReachesUncertainReadExt(def, bb, i, bb0, i0)
+  )
+}
+
+/** Holds if `bb` contains a captured access to variable `v`. */
+pragma[nomagic]
+private predicate hasCapturedVariableAccess(BasicBlock bb, Variable v) {
+  exists(VariableAccess read |
+    read = bb.getANode().getAstNode() and
+    read.isCapture() and
+    read.getVariable() = v
+  )
+}
+
+cached
+private module Cached {
+  /**
+   * Holds if an entry definition is needed for captured variable `v` at index
+   * `i` in entry block `bb`.
+   */
+  cached
+  predicate capturedEntryWrite(EntryBasicBlock bb, int i, Variable v) {
+    hasCapturedVariableAccess(bb.getASuccessor*(), v) and
+    i = -1
+  }
+
+  /**
+   * Holds if `v` is written at index `i` in basic block `bb`, and the corresponding
+   * AST write access is `write`.
+   */
+  cached
+  predicate variableWriteActual(BasicBlock bb, int i, Variable v, CfgNode write) {
+    bb.getNode(i) = write and
+    variableWrite(write.getAstNode(), v)
+  }
+
+  cached
+  CfgNode getARead(Definition def) {
+    exists(Variable v, BasicBlock bb, int i |
+      Impl::ssaDefReachesRead(v, def, bb, i) and
+      variableReadActual(bb, i, v) and
+      result = bb.getNode(i)
+    )
+  }
+
+  cached
+  Definition phiHasInputFromBlock(PhiDefinition phi, BasicBlock bb) {
+    Impl::phiHasInputFromBlock(phi, result, bb)
+  }
+
+  /**
+   * Holds if the value defined at SSA definition `def` can reach a read at `read`,
+   * without passing through any other non-pseudo read.
+   */
+  cached
+  predicate firstRead(Definition def, CfgNode read) {
+    exists(BasicBlock bb1, int i1, BasicBlock bb2, int i2 |
+      def.definesAt(_, bb1, i1) and
+      adjacentDefSkipUncertainReads(def, bb1, i1, bb2, i2) and
+      read = bb2.getNode(i2)
+    )
+  }
+
+  /**
+   * Holds if the read at `read2` is a read of the same SSA definition `def`
+   * as the read at `read1`, and `read2` can be reached from `read1` without
+   * passing through another non-pseudo read.
+   */
+  cached
+  predicate adjacentReadPair(Definition def, CfgNode read1, CfgNode read2) {
+    exists(BasicBlock bb1, int i1, BasicBlock bb2, int i2 |
+      read1 = bb1.getNode(i1) and
+      variableReadActual(bb1, i1, _) and
+      adjacentDefSkipUncertainReads(def, bb1, i1, bb2, i2) and
+      read2 = bb2.getNode(i2)
+    )
+  }
+
+  /**
+   * Holds if the read of `def` at `read` may be a last read. That is, `read`
+   * can either reach another definition of the underlying source variable or
+   * the end of the CFG scope, without passing through another non-pseudo read.
+   */
+  cached
+  predicate lastRead(Definition def, CfgNode read) {
+    exists(BasicBlock bb, int i |
+      lastRefSkipUncertainReadsExt(def, bb, i) and
+      variableReadActual(bb, i, _) and
+      read = bb.getNode(i)
+    )
+  }
+
+  cached
+  Definition uncertainWriteDefinitionInput(UncertainWriteDefinition def) {
+    Impl::uncertainWriteDefinitionInput(def, result)
+  }
+}
+
+import Cached
+private import codeql.rust.dataflow.Ssa
+
+/**
+ * An extended static single assignment (SSA) definition.
+ *
+ * This is either a normal SSA definition (`Definition`) or a
+ * phi-read node (`PhiReadNode`).
+ *
+ * Only intended for internal use.
+ */
+class DefinitionExt extends Impl::DefinitionExt {
+  CfgNode getARead() { result = getARead(this) }
+
+  override string toString() { result = this.(Ssa::Definition).toString() }
+
+  override Location getLocation() { result = this.(Ssa::Definition).getLocation() }
+}
+
+/**
+ * A phi-read node.
+ *
+ * Only intended for internal use.
+ */
+class PhiReadNode extends DefinitionExt, Impl::PhiReadNode {
+  override string toString() { result = "SSA phi read(" + this.getSourceVariable() + ")" }
+
+  override Location getLocation() { result = Impl::PhiReadNode.super.getLocation() }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/VariableImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/VariableImpl.qll
index 7c387c966281..2895a33d94bd 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/VariableImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/VariableImpl.qll
@@ -118,16 +118,23 @@ module Impl {
      */
     IdentPat getPat() { variableDecl(definingNode, result, name) }
 
+    /** Gets the `let` statement that introduces this variable, if any. */
+    LetStmt getLetStmt() { this.getPat() = result.getPat() }
+
     /** Gets the initial value of this variable, if any. */
-    Expr getInitializer() {
-      exists(LetStmt let |
-        this.getPat() = let.getPat() and
-        result = let.getInitializer()
-      )
-    }
+    Expr getInitializer() { result = this.getLetStmt().getInitializer() }
 
     /** Holds if this variable is captured. */
     predicate isCaptured() { this.getAnAccess().isCapture() }
+
+    /** Gets the parameter that introduces this variable, if any. */
+    Param getParameter() { parameterDeclInScope(result, this, _) }
+
+    /** Hold is this variable is mutable. */
+    predicate isMutable() { this.getPat().isMut() }
+
+    /** Hold is this variable is immutable. */
+    predicate isImmutable() { not this.isMutable() }
   }
 
   /** A path expression that may access a local variable. */
@@ -180,6 +187,27 @@ module Impl {
     )
   }
 
+  /**
+   * Holds if parameter `p` introduces the variable `v` inside variable scope
+   * `scope`.
+   */
+  private predicate parameterDeclInScope(Param p, Variable v, VariableScope scope) {
+    exists(Pat pat |
+      pat = getAVariablePatAncestor(v) and
+      p.getPat() = pat
+    |
+      exists(Function f |
+        f.getParamList().getAParam() = p and
+        scope = f.getBody()
+      )
+      or
+      exists(ClosureExpr ce |
+        ce.getParamList().getAParam() = p and
+        scope = ce.getBody()
+      )
+    )
+  }
+
   /**
    * Holds if `v` is named `name` and is declared inside variable scope
    * `scope`, and `v` is bound starting from `(line, column)`.
@@ -188,51 +216,44 @@ module Impl {
     Variable v, VariableScope scope, string name, int line, int column
   ) {
     name = v.getName() and
-    exists(Pat pat | pat = getAVariablePatAncestor(v) |
-      scope =
-        any(MatchArmScope arm |
-          arm.getPat() = pat and
-          arm.getLocation().hasLocationInfo(_, line, column, _, _)
-        )
-      or
-      exists(Function f |
-        f.getParamList().getAParam().getPat() = pat and
-        scope = f.getBody() and
-        scope.getLocation().hasLocationInfo(_, line, column, _, _)
-      )
-      or
-      exists(LetStmt let |
-        let.getPat() = pat and
-        scope = getEnclosingScope(let) and
-        // for `let` statements, variables are bound _after_ the statement, i.e.
-        // not in the RHS
-        let.getLocation().hasLocationInfo(_, _, _, line, column)
-      )
-      or
-      exists(IfExpr ie, LetExpr let |
-        let.getPat() = pat and
-        ie.getCondition() = let and
-        scope = ie.getThen() and
-        scope.getLocation().hasLocationInfo(_, line, column, _, _)
-      )
-      or
-      exists(ForExpr fe |
-        fe.getPat() = pat and
-        scope = fe.getLoopBody() and
-        scope.getLocation().hasLocationInfo(_, line, column, _, _)
-      )
-      or
-      exists(ClosureExpr ce |
-        ce.getParamList().getAParam().getPat() = pat and
-        scope = ce.getBody() and
-        scope.getLocation().hasLocationInfo(_, line, column, _, _)
-      )
+    (
+      parameterDeclInScope(_, v, scope) and
+      scope.getLocation().hasLocationInfo(_, line, column, _, _)
       or
-      exists(WhileExpr we, LetExpr let |
-        let.getPat() = pat and
-        we.getCondition() = let and
-        scope = we.getLoopBody() and
-        scope.getLocation().hasLocationInfo(_, line, column, _, _)
+      exists(Pat pat | pat = getAVariablePatAncestor(v) |
+        scope =
+          any(MatchArmScope arm |
+            arm.getPat() = pat and
+            arm.getLocation().hasLocationInfo(_, line, column, _, _)
+          )
+        or
+        exists(LetStmt let |
+          let.getPat() = pat and
+          scope = getEnclosingScope(let) and
+          // for `let` statements, variables are bound _after_ the statement, i.e.
+          // not in the RHS
+          let.getLocation().hasLocationInfo(_, _, _, line, column)
+        )
+        or
+        exists(IfExpr ie, LetExpr let |
+          let.getPat() = pat and
+          ie.getCondition() = let and
+          scope = ie.getThen() and
+          scope.getLocation().hasLocationInfo(_, line, column, _, _)
+        )
+        or
+        exists(ForExpr fe |
+          fe.getPat() = pat and
+          scope = fe.getLoopBody() and
+          scope.getLocation().hasLocationInfo(_, line, column, _, _)
+        )
+        or
+        exists(WhileExpr we, LetExpr let |
+          let.getPat() = pat and
+          we.getCondition() = let and
+          scope = we.getLoopBody() and
+          scope.getLocation().hasLocationInfo(_, line, column, _, _)
+        )
       )
     )
   }
@@ -427,7 +448,8 @@ module Impl {
     exists(Expr mid |
       assignmentExprDescendant(mid) and
       getImmediateParent(e) = mid and
-      not mid.(PrefixExpr).getOperatorName() = "*"
+      not mid.(PrefixExpr).getOperatorName() = "*" and
+      not mid instanceof FieldExpr
     )
   }
 
diff --git a/rust/ql/test/library-tests/variables/Ssa.expected b/rust/ql/test/library-tests/variables/Ssa.expected
new file mode 100644
index 000000000000..8b2ac3109ba2
--- /dev/null
+++ b/rust/ql/test/library-tests/variables/Ssa.expected
@@ -0,0 +1,524 @@
+nonSsaVariable
+| variables.rs:330:13:330:13 | a |
+| variables.rs:338:13:338:13 | i |
+| variables.rs:361:13:361:13 | x |
+| variables.rs:368:13:368:13 | z |
+| variables.rs:381:13:381:13 | x |
+| variables.rs:389:13:389:13 | x |
+| variables.rs:450:13:450:13 | a |
+| variables.rs:482:11:482:11 | a |
+definition
+| variables.rs:3:14:3:14 | s | variables.rs:3:14:3:14 | s |
+| variables.rs:7:14:7:14 | i | variables.rs:7:14:7:14 | i |
+| variables.rs:12:9:12:10 | x1 | variables.rs:12:9:12:10 | x1 |
+| variables.rs:17:9:17:14 | x2 | variables.rs:17:13:17:14 | x2 |
+| variables.rs:19:5:19:6 | x2 | variables.rs:17:13:17:14 | x2 |
+| variables.rs:24:9:24:10 | x3 | variables.rs:24:9:24:10 | x3 |
+| variables.rs:26:9:26:10 | x3 | variables.rs:26:9:26:10 | x3 |
+| variables.rs:32:9:32:10 | x4 | variables.rs:32:9:32:10 | x4 |
+| variables.rs:35:13:35:14 | x4 | variables.rs:35:13:35:14 | x4 |
+| variables.rs:49:13:49:14 | a1 | variables.rs:49:13:49:14 | a1 |
+| variables.rs:50:13:50:14 | b1 | variables.rs:50:13:50:14 | b1 |
+| variables.rs:53:13:53:13 | x | variables.rs:53:13:53:13 | x |
+| variables.rs:54:13:54:13 | y | variables.rs:54:13:54:13 | y |
+| variables.rs:64:9:64:10 | p1 | variables.rs:64:9:64:10 | p1 |
+| variables.rs:66:12:66:13 | a2 | variables.rs:66:12:66:13 | a2 |
+| variables.rs:67:12:67:13 | b2 | variables.rs:67:12:67:13 | b2 |
+| variables.rs:74:9:74:10 | s1 | variables.rs:74:9:74:10 | s1 |
+| variables.rs:76:17:76:22 | s2 | variables.rs:76:21:76:22 | s2 |
+| variables.rs:83:14:83:15 | x5 | variables.rs:83:14:83:15 | x5 |
+| variables.rs:91:9:91:10 | s1 | variables.rs:91:9:91:10 | s1 |
+| variables.rs:93:20:93:25 | s2 | variables.rs:93:24:93:25 | s2 |
+| variables.rs:100:9:100:10 | x6 | variables.rs:100:9:100:10 | x6 |
+| variables.rs:101:9:101:10 | y1 | variables.rs:101:9:101:10 | y1 |
+| variables.rs:105:14:105:15 | y1 | variables.rs:105:14:105:15 | y1 |
+| variables.rs:117:9:117:15 | numbers | variables.rs:117:9:117:15 | numbers |
+| variables.rs:121:13:121:17 | first | variables.rs:121:13:121:17 | first |
+| variables.rs:122:13:122:17 | third | variables.rs:122:13:122:17 | third |
+| variables.rs:123:13:123:17 | fifth | variables.rs:123:13:123:17 | fifth |
+| variables.rs:133:13:133:17 | first | variables.rs:133:13:133:17 | first |
+| variables.rs:135:13:135:16 | last | variables.rs:135:13:135:16 | last |
+| variables.rs:144:9:144:10 | p2 | variables.rs:144:9:144:10 | p2 |
+| variables.rs:148:16:148:17 | x7 | variables.rs:148:16:148:17 | x7 |
+| variables.rs:158:9:158:11 | msg | variables.rs:158:9:158:11 | msg |
+| variables.rs:162:17:162:35 | [match(true)] id_variable | variables.rs:162:17:162:27 | id_variable |
+| variables.rs:167:26:167:27 | id | variables.rs:167:26:167:27 | id |
+| variables.rs:178:9:178:14 | either | variables.rs:178:9:178:14 | either |
+| variables.rs:180:9:180:44 | [match(true)] phi | variables.rs:180:9:180:44 | a3 |
+| variables.rs:180:22:180:23 | a3 | variables.rs:180:9:180:44 | a3 |
+| variables.rs:180:42:180:43 | a3 | variables.rs:180:9:180:44 | a3 |
+| variables.rs:192:9:192:10 | tv | variables.rs:192:9:192:10 | tv |
+| variables.rs:194:9:194:81 | [match(true)] phi | variables.rs:194:9:194:81 | a4 |
+| variables.rs:194:28:194:29 | a4 | variables.rs:194:9:194:81 | a4 |
+| variables.rs:194:54:194:55 | a4 | variables.rs:194:9:194:81 | a4 |
+| variables.rs:194:79:194:80 | a4 | variables.rs:194:9:194:81 | a4 |
+| variables.rs:198:9:198:83 | [match(true)] phi | variables.rs:198:9:198:83 | a5 |
+| variables.rs:198:10:198:57 | [match(true)] phi | variables.rs:198:9:198:83 | a5 |
+| variables.rs:198:29:198:30 | a5 | variables.rs:198:9:198:83 | a5 |
+| variables.rs:198:55:198:56 | a5 | variables.rs:198:9:198:83 | a5 |
+| variables.rs:198:81:198:82 | a5 | variables.rs:198:9:198:83 | a5 |
+| variables.rs:202:9:202:83 | [match(true)] phi | variables.rs:202:9:202:83 | a6 |
+| variables.rs:202:28:202:29 | a6 | variables.rs:202:9:202:83 | a6 |
+| variables.rs:202:35:202:82 | [match(true)] phi | variables.rs:202:9:202:83 | a6 |
+| variables.rs:202:55:202:56 | a6 | variables.rs:202:9:202:83 | a6 |
+| variables.rs:202:80:202:81 | a6 | variables.rs:202:9:202:83 | a6 |
+| variables.rs:208:9:208:14 | either | variables.rs:208:9:208:14 | either |
+| variables.rs:210:9:210:44 | [match(true)] phi | variables.rs:210:9:210:44 | a7 |
+| variables.rs:210:22:210:23 | a7 | variables.rs:210:9:210:44 | a7 |
+| variables.rs:210:42:210:43 | a7 | variables.rs:210:9:210:44 | a7 |
+| variables.rs:218:9:218:14 | either | variables.rs:218:9:218:14 | either |
+| variables.rs:221:9:222:52 | [match(true)] e | variables.rs:221:13:221:13 | e |
+| variables.rs:222:14:222:51 | [match(true)] phi | variables.rs:222:14:222:51 | a11 |
+| variables.rs:222:27:222:29 | a11 | variables.rs:222:14:222:51 | a11 |
+| variables.rs:222:48:222:50 | a11 | variables.rs:222:14:222:51 | a11 |
+| variables.rs:225:33:225:35 | a12 | variables.rs:225:33:225:35 | a12 |
+| variables.rs:242:9:242:10 | fv | variables.rs:242:9:242:10 | fv |
+| variables.rs:244:9:244:109 | [match(true)] phi | variables.rs:244:9:244:109 | a13 |
+| variables.rs:244:27:244:29 | a13 | variables.rs:244:9:244:109 | a13 |
+| variables.rs:244:35:244:82 | [match(true)] phi | variables.rs:244:9:244:109 | a13 |
+| variables.rs:244:54:244:56 | a13 | variables.rs:244:9:244:109 | a13 |
+| variables.rs:244:79:244:81 | a13 | variables.rs:244:9:244:109 | a13 |
+| variables.rs:244:106:244:108 | a13 | variables.rs:244:9:244:109 | a13 |
+| variables.rs:250:5:250:6 | a8 | variables.rs:250:5:250:6 | a8 |
+| variables.rs:252:9:252:10 | b3 | variables.rs:252:9:252:10 | b3 |
+| variables.rs:253:9:253:10 | c1 | variables.rs:253:9:253:10 | c1 |
+| variables.rs:261:6:261:41 | [match(true)] phi | variables.rs:261:6:261:41 | a9 |
+| variables.rs:261:19:261:20 | a9 | variables.rs:261:6:261:41 | a9 |
+| variables.rs:261:39:261:40 | a9 | variables.rs:261:6:261:41 | a9 |
+| variables.rs:268:9:268:15 | a10 | variables.rs:268:13:268:15 | a10 |
+| variables.rs:269:9:269:14 | b4 | variables.rs:269:13:269:14 | b4 |
+| variables.rs:270:9:270:14 | c2 | variables.rs:270:13:270:14 | c2 |
+| variables.rs:277:9:277:10 | c2 | variables.rs:270:13:270:14 | c2 |
+| variables.rs:278:9:278:10 | b4 | variables.rs:269:13:269:14 | b4 |
+| variables.rs:279:9:279:11 | a10 | variables.rs:268:13:268:15 | a10 |
+| variables.rs:291:13:291:15 | a10 | variables.rs:291:13:291:15 | a10 |
+| variables.rs:292:13:292:14 | b4 | variables.rs:292:13:292:14 | b4 |
+| variables.rs:304:9:304:23 | example_closure | variables.rs:304:9:304:23 | example_closure |
+| variables.rs:305:10:305:10 | x | variables.rs:305:10:305:10 | x |
+| variables.rs:307:9:307:10 | n1 | variables.rs:307:9:307:10 | n1 |
+| variables.rs:312:9:312:26 | immutable_variable | variables.rs:312:9:312:26 | immutable_variable |
+| variables.rs:313:10:313:10 | x | variables.rs:313:10:313:10 | x |
+| variables.rs:315:9:315:10 | n2 | variables.rs:315:9:315:10 | n2 |
+| variables.rs:321:9:321:9 | v | variables.rs:321:9:321:9 | v |
+| variables.rs:323:9:323:12 | text | variables.rs:323:9:323:12 | text |
+| variables.rs:339:9:339:13 | ref_i | variables.rs:339:9:339:13 | ref_i |
+| variables.rs:345:17:345:17 | x | variables.rs:345:17:345:17 | x |
+| variables.rs:352:22:352:22 | x | variables.rs:352:22:352:22 | x |
+| variables.rs:352:39:352:39 | y | variables.rs:352:39:352:39 | y |
+| variables.rs:362:9:362:9 | y | variables.rs:362:9:362:9 | y |
+| variables.rs:369:9:369:9 | w | variables.rs:369:9:369:9 | w |
+| variables.rs:382:9:382:9 | y | variables.rs:382:9:382:9 | y |
+| variables.rs:390:9:390:15 | cap | variables.rs:390:13:390:15 | cap |
+| variables.rs:399:9:399:9 | x | variables.rs:399:9:399:9 | x |
+| variables.rs:400:9:400:15 | cap | variables.rs:400:13:400:15 | cap |
+| variables.rs:400:19:402:5 | <captured entry> x | variables.rs:399:9:399:9 | x |
+| variables.rs:407:8:407:8 | b | variables.rs:407:8:407:8 | b |
+| variables.rs:408:9:408:13 | x | variables.rs:408:13:408:13 | x |
+| variables.rs:411:5:419:5 | phi | variables.rs:408:13:408:13 | x |
+| variables.rs:412:9:412:9 | x | variables.rs:408:13:408:13 | x |
+| variables.rs:416:9:416:9 | x | variables.rs:408:13:408:13 | x |
+| variables.rs:423:13:423:14 | b1 | variables.rs:423:13:423:14 | b1 |
+| variables.rs:423:24:423:25 | b2 | variables.rs:423:24:423:25 | b2 |
+| variables.rs:424:9:424:9 | x | variables.rs:424:9:424:9 | x |
+| variables.rs:458:14:458:14 | x | variables.rs:458:14:458:14 | x |
+| variables.rs:463:9:463:9 | x | variables.rs:463:9:463:9 | x |
+| variables.rs:467:9:467:9 | z | variables.rs:467:9:467:9 | z |
+read
+| variables.rs:3:14:3:14 | s | variables.rs:3:14:3:14 | s | variables.rs:4:20:4:20 | s |
+| variables.rs:7:14:7:14 | i | variables.rs:7:14:7:14 | i | variables.rs:8:20:8:20 | i |
+| variables.rs:12:9:12:10 | x1 | variables.rs:12:9:12:10 | x1 | variables.rs:13:15:13:16 | x1 |
+| variables.rs:17:9:17:14 | x2 | variables.rs:17:13:17:14 | x2 | variables.rs:18:15:18:16 | x2 |
+| variables.rs:19:5:19:6 | x2 | variables.rs:17:13:17:14 | x2 | variables.rs:20:15:20:16 | x2 |
+| variables.rs:24:9:24:10 | x3 | variables.rs:24:9:24:10 | x3 | variables.rs:25:15:25:16 | x3 |
+| variables.rs:24:9:24:10 | x3 | variables.rs:24:9:24:10 | x3 | variables.rs:27:9:27:10 | x3 |
+| variables.rs:26:9:26:10 | x3 | variables.rs:26:9:26:10 | x3 | variables.rs:28:15:28:16 | x3 |
+| variables.rs:32:9:32:10 | x4 | variables.rs:32:9:32:10 | x4 | variables.rs:33:15:33:16 | x4 |
+| variables.rs:32:9:32:10 | x4 | variables.rs:32:9:32:10 | x4 | variables.rs:38:15:38:16 | x4 |
+| variables.rs:35:13:35:14 | x4 | variables.rs:35:13:35:14 | x4 | variables.rs:36:19:36:20 | x4 |
+| variables.rs:49:13:49:14 | a1 | variables.rs:49:13:49:14 | a1 | variables.rs:57:15:57:16 | a1 |
+| variables.rs:50:13:50:14 | b1 | variables.rs:50:13:50:14 | b1 | variables.rs:58:15:58:16 | b1 |
+| variables.rs:53:13:53:13 | x | variables.rs:53:13:53:13 | x | variables.rs:59:15:59:15 | x |
+| variables.rs:54:13:54:13 | y | variables.rs:54:13:54:13 | y | variables.rs:60:15:60:15 | y |
+| variables.rs:64:9:64:10 | p1 | variables.rs:64:9:64:10 | p1 | variables.rs:68:9:68:10 | p1 |
+| variables.rs:66:12:66:13 | a2 | variables.rs:66:12:66:13 | a2 | variables.rs:69:15:69:16 | a2 |
+| variables.rs:67:12:67:13 | b2 | variables.rs:67:12:67:13 | b2 | variables.rs:70:15:70:16 | b2 |
+| variables.rs:74:9:74:10 | s1 | variables.rs:74:9:74:10 | s1 | variables.rs:77:11:77:12 | s1 |
+| variables.rs:76:17:76:22 | s2 | variables.rs:76:21:76:22 | s2 | variables.rs:78:19:78:20 | s2 |
+| variables.rs:83:14:83:15 | x5 | variables.rs:83:14:83:15 | x5 | variables.rs:87:15:87:16 | x5 |
+| variables.rs:91:9:91:10 | s1 | variables.rs:91:9:91:10 | s1 | variables.rs:94:11:94:12 | s1 |
+| variables.rs:93:20:93:25 | s2 | variables.rs:93:24:93:25 | s2 | variables.rs:95:19:95:20 | s2 |
+| variables.rs:100:9:100:10 | x6 | variables.rs:100:9:100:10 | x6 | variables.rs:103:11:103:12 | x6 |
+| variables.rs:101:9:101:10 | y1 | variables.rs:101:9:101:10 | y1 | variables.rs:113:15:113:16 | y1 |
+| variables.rs:105:14:105:15 | y1 | variables.rs:105:14:105:15 | y1 | variables.rs:108:23:108:24 | y1 |
+| variables.rs:117:9:117:15 | numbers | variables.rs:117:9:117:15 | numbers | variables.rs:119:11:119:17 | numbers |
+| variables.rs:117:9:117:15 | numbers | variables.rs:117:9:117:15 | numbers | variables.rs:131:11:131:17 | numbers |
+| variables.rs:121:13:121:17 | first | variables.rs:121:13:121:17 | first | variables.rs:125:23:125:27 | first |
+| variables.rs:122:13:122:17 | third | variables.rs:122:13:122:17 | third | variables.rs:126:23:126:27 | third |
+| variables.rs:123:13:123:17 | fifth | variables.rs:123:13:123:17 | fifth | variables.rs:127:23:127:27 | fifth |
+| variables.rs:133:13:133:17 | first | variables.rs:133:13:133:17 | first | variables.rs:137:23:137:27 | first |
+| variables.rs:135:13:135:16 | last | variables.rs:135:13:135:16 | last | variables.rs:138:23:138:26 | last |
+| variables.rs:144:9:144:10 | p2 | variables.rs:144:9:144:10 | p2 | variables.rs:146:11:146:12 | p2 |
+| variables.rs:148:16:148:17 | x7 | variables.rs:148:16:148:17 | x7 | variables.rs:149:24:149:25 | x7 |
+| variables.rs:158:9:158:11 | msg | variables.rs:158:9:158:11 | msg | variables.rs:160:11:160:13 | msg |
+| variables.rs:162:17:162:35 | [match(true)] id_variable | variables.rs:162:17:162:27 | id_variable | variables.rs:163:24:163:34 | id_variable |
+| variables.rs:167:26:167:27 | id | variables.rs:167:26:167:27 | id | variables.rs:168:23:168:24 | id |
+| variables.rs:178:9:178:14 | either | variables.rs:178:9:178:14 | either | variables.rs:179:11:179:16 | either |
+| variables.rs:180:9:180:44 | [match(true)] phi | variables.rs:180:9:180:44 | a3 | variables.rs:181:26:181:27 | a3 |
+| variables.rs:192:9:192:10 | tv | variables.rs:192:9:192:10 | tv | variables.rs:193:11:193:12 | tv |
+| variables.rs:192:9:192:10 | tv | variables.rs:192:9:192:10 | tv | variables.rs:197:11:197:12 | tv |
+| variables.rs:192:9:192:10 | tv | variables.rs:192:9:192:10 | tv | variables.rs:201:11:201:12 | tv |
+| variables.rs:194:9:194:81 | [match(true)] phi | variables.rs:194:9:194:81 | a4 | variables.rs:195:26:195:27 | a4 |
+| variables.rs:198:9:198:83 | [match(true)] phi | variables.rs:198:9:198:83 | a5 | variables.rs:199:26:199:27 | a5 |
+| variables.rs:202:9:202:83 | [match(true)] phi | variables.rs:202:9:202:83 | a6 | variables.rs:203:26:203:27 | a6 |
+| variables.rs:208:9:208:14 | either | variables.rs:208:9:208:14 | either | variables.rs:209:11:209:16 | either |
+| variables.rs:210:9:210:44 | [match(true)] phi | variables.rs:210:9:210:44 | a7 | variables.rs:211:16:211:17 | a7 |
+| variables.rs:210:9:210:44 | [match(true)] phi | variables.rs:210:9:210:44 | a7 | variables.rs:212:26:212:27 | a7 |
+| variables.rs:218:9:218:14 | either | variables.rs:218:9:218:14 | either | variables.rs:220:11:220:16 | either |
+| variables.rs:221:9:222:52 | [match(true)] e | variables.rs:221:13:221:13 | e | variables.rs:226:15:226:15 | e |
+| variables.rs:222:14:222:51 | [match(true)] phi | variables.rs:222:14:222:51 | a11 | variables.rs:224:23:224:25 | a11 |
+| variables.rs:225:33:225:35 | a12 | variables.rs:225:33:225:35 | a12 | variables.rs:227:28:227:30 | a12 |
+| variables.rs:242:9:242:10 | fv | variables.rs:242:9:242:10 | fv | variables.rs:243:11:243:12 | fv |
+| variables.rs:244:9:244:109 | [match(true)] phi | variables.rs:244:9:244:109 | a13 | variables.rs:245:26:245:28 | a13 |
+| variables.rs:250:5:250:6 | a8 | variables.rs:250:5:250:6 | a8 | variables.rs:255:15:255:16 | a8 |
+| variables.rs:252:9:252:10 | b3 | variables.rs:252:9:252:10 | b3 | variables.rs:256:15:256:16 | b3 |
+| variables.rs:253:9:253:10 | c1 | variables.rs:253:9:253:10 | c1 | variables.rs:257:15:257:16 | c1 |
+| variables.rs:261:6:261:41 | [match(true)] phi | variables.rs:261:6:261:41 | a9 | variables.rs:263:15:263:16 | a9 |
+| variables.rs:268:9:268:15 | a10 | variables.rs:268:13:268:15 | a10 | variables.rs:272:15:272:17 | a10 |
+| variables.rs:269:9:269:14 | b4 | variables.rs:269:13:269:14 | b4 | variables.rs:273:15:273:16 | b4 |
+| variables.rs:270:9:270:14 | c2 | variables.rs:270:13:270:14 | c2 | variables.rs:274:15:274:16 | c2 |
+| variables.rs:277:9:277:10 | c2 | variables.rs:270:13:270:14 | c2 | variables.rs:283:9:283:10 | c2 |
+| variables.rs:277:9:277:10 | c2 | variables.rs:270:13:270:14 | c2 | variables.rs:287:15:287:16 | c2 |
+| variables.rs:278:9:278:10 | b4 | variables.rs:269:13:269:14 | b4 | variables.rs:282:9:282:10 | b4 |
+| variables.rs:278:9:278:10 | b4 | variables.rs:269:13:269:14 | b4 | variables.rs:286:15:286:16 | b4 |
+| variables.rs:278:9:278:10 | b4 | variables.rs:269:13:269:14 | b4 | variables.rs:300:15:300:16 | b4 |
+| variables.rs:279:9:279:11 | a10 | variables.rs:268:13:268:15 | a10 | variables.rs:281:9:281:11 | a10 |
+| variables.rs:279:9:279:11 | a10 | variables.rs:268:13:268:15 | a10 | variables.rs:285:15:285:17 | a10 |
+| variables.rs:279:9:279:11 | a10 | variables.rs:268:13:268:15 | a10 | variables.rs:299:15:299:17 | a10 |
+| variables.rs:291:13:291:15 | a10 | variables.rs:291:13:291:15 | a10 | variables.rs:294:23:294:25 | a10 |
+| variables.rs:292:13:292:14 | b4 | variables.rs:292:13:292:14 | b4 | variables.rs:295:23:295:24 | b4 |
+| variables.rs:304:9:304:23 | example_closure | variables.rs:304:9:304:23 | example_closure | variables.rs:308:9:308:23 | example_closure |
+| variables.rs:305:10:305:10 | x | variables.rs:305:10:305:10 | x | variables.rs:306:9:306:9 | x |
+| variables.rs:307:9:307:10 | n1 | variables.rs:307:9:307:10 | n1 | variables.rs:309:15:309:16 | n1 |
+| variables.rs:312:9:312:26 | immutable_variable | variables.rs:312:9:312:26 | immutable_variable | variables.rs:316:9:316:26 | immutable_variable |
+| variables.rs:313:10:313:10 | x | variables.rs:313:10:313:10 | x | variables.rs:314:9:314:9 | x |
+| variables.rs:315:9:315:10 | n2 | variables.rs:315:9:315:10 | n2 | variables.rs:317:15:317:16 | n2 |
+| variables.rs:321:9:321:9 | v | variables.rs:321:9:321:9 | v | variables.rs:324:12:324:12 | v |
+| variables.rs:323:9:323:12 | text | variables.rs:323:9:323:12 | text | variables.rs:325:19:325:22 | text |
+| variables.rs:339:9:339:13 | ref_i | variables.rs:339:9:339:13 | ref_i | variables.rs:341:6:341:10 | ref_i |
+| variables.rs:345:17:345:17 | x | variables.rs:345:17:345:17 | x | variables.rs:346:6:346:6 | x |
+| variables.rs:345:17:345:17 | x | variables.rs:345:17:345:17 | x | variables.rs:347:10:347:10 | x |
+| variables.rs:345:17:345:17 | x | variables.rs:345:17:345:17 | x | variables.rs:348:10:348:10 | x |
+| variables.rs:345:17:345:17 | x | variables.rs:345:17:345:17 | x | variables.rs:349:12:349:12 | x |
+| variables.rs:352:22:352:22 | x | variables.rs:352:22:352:22 | x | variables.rs:353:6:353:6 | x |
+| variables.rs:352:22:352:22 | x | variables.rs:352:22:352:22 | x | variables.rs:354:10:354:10 | x |
+| variables.rs:352:22:352:22 | x | variables.rs:352:22:352:22 | x | variables.rs:355:10:355:10 | x |
+| variables.rs:352:22:352:22 | x | variables.rs:352:22:352:22 | x | variables.rs:357:9:357:9 | x |
+| variables.rs:352:39:352:39 | y | variables.rs:352:39:352:39 | y | variables.rs:356:6:356:6 | y |
+| variables.rs:362:9:362:9 | y | variables.rs:362:9:362:9 | y | variables.rs:364:6:364:6 | y |
+| variables.rs:369:9:369:9 | w | variables.rs:369:9:369:9 | w | variables.rs:373:9:373:9 | w |
+| variables.rs:369:9:369:9 | w | variables.rs:369:9:369:9 | w | variables.rs:375:7:375:7 | w |
+| variables.rs:382:9:382:9 | y | variables.rs:382:9:382:9 | y | variables.rs:384:6:384:6 | y |
+| variables.rs:390:9:390:15 | cap | variables.rs:390:13:390:15 | cap | variables.rs:394:5:394:7 | cap |
+| variables.rs:399:9:399:9 | x | variables.rs:399:9:399:9 | x | variables.rs:404:15:404:15 | x |
+| variables.rs:400:9:400:15 | cap | variables.rs:400:13:400:15 | cap | variables.rs:403:5:403:7 | cap |
+| variables.rs:400:19:402:5 | <captured entry> x | variables.rs:399:9:399:9 | x | variables.rs:401:19:401:19 | x |
+| variables.rs:407:8:407:8 | b | variables.rs:407:8:407:8 | b | variables.rs:411:8:411:8 | b |
+| variables.rs:408:9:408:13 | x | variables.rs:408:13:408:13 | x | variables.rs:409:15:409:15 | x |
+| variables.rs:408:9:408:13 | x | variables.rs:408:13:408:13 | x | variables.rs:410:15:410:15 | x |
+| variables.rs:411:5:419:5 | phi | variables.rs:408:13:408:13 | x | variables.rs:420:15:420:15 | x |
+| variables.rs:412:9:412:9 | x | variables.rs:408:13:408:13 | x | variables.rs:413:19:413:19 | x |
+| variables.rs:412:9:412:9 | x | variables.rs:408:13:408:13 | x | variables.rs:414:19:414:19 | x |
+| variables.rs:416:9:416:9 | x | variables.rs:408:13:408:13 | x | variables.rs:417:19:417:19 | x |
+| variables.rs:416:9:416:9 | x | variables.rs:408:13:408:13 | x | variables.rs:418:19:418:19 | x |
+| variables.rs:423:13:423:14 | b1 | variables.rs:423:13:423:14 | b1 | variables.rs:425:8:425:9 | b1 |
+| variables.rs:423:24:423:25 | b2 | variables.rs:423:24:423:25 | b2 | variables.rs:431:8:431:9 | b2 |
+| variables.rs:424:9:424:9 | x | variables.rs:424:9:424:9 | x | variables.rs:426:19:426:19 | x |
+| variables.rs:424:9:424:9 | x | variables.rs:424:9:424:9 | x | variables.rs:428:19:428:19 | x |
+| variables.rs:424:9:424:9 | x | variables.rs:424:9:424:9 | x | variables.rs:432:19:432:19 | x |
+| variables.rs:424:9:424:9 | x | variables.rs:424:9:424:9 | x | variables.rs:434:19:434:19 | x |
+| variables.rs:458:14:458:14 | x | variables.rs:458:14:458:14 | x | variables.rs:459:16:459:16 | x |
+| variables.rs:463:9:463:9 | x | variables.rs:463:9:463:9 | x | variables.rs:465:15:465:15 | x |
+firstRead
+| variables.rs:3:14:3:14 | s | variables.rs:3:14:3:14 | s | variables.rs:4:20:4:20 | s |
+| variables.rs:7:14:7:14 | i | variables.rs:7:14:7:14 | i | variables.rs:8:20:8:20 | i |
+| variables.rs:12:9:12:10 | x1 | variables.rs:12:9:12:10 | x1 | variables.rs:13:15:13:16 | x1 |
+| variables.rs:17:9:17:14 | x2 | variables.rs:17:13:17:14 | x2 | variables.rs:18:15:18:16 | x2 |
+| variables.rs:19:5:19:6 | x2 | variables.rs:17:13:17:14 | x2 | variables.rs:20:15:20:16 | x2 |
+| variables.rs:24:9:24:10 | x3 | variables.rs:24:9:24:10 | x3 | variables.rs:25:15:25:16 | x3 |
+| variables.rs:26:9:26:10 | x3 | variables.rs:26:9:26:10 | x3 | variables.rs:28:15:28:16 | x3 |
+| variables.rs:32:9:32:10 | x4 | variables.rs:32:9:32:10 | x4 | variables.rs:33:15:33:16 | x4 |
+| variables.rs:35:13:35:14 | x4 | variables.rs:35:13:35:14 | x4 | variables.rs:36:19:36:20 | x4 |
+| variables.rs:49:13:49:14 | a1 | variables.rs:49:13:49:14 | a1 | variables.rs:57:15:57:16 | a1 |
+| variables.rs:50:13:50:14 | b1 | variables.rs:50:13:50:14 | b1 | variables.rs:58:15:58:16 | b1 |
+| variables.rs:53:13:53:13 | x | variables.rs:53:13:53:13 | x | variables.rs:59:15:59:15 | x |
+| variables.rs:54:13:54:13 | y | variables.rs:54:13:54:13 | y | variables.rs:60:15:60:15 | y |
+| variables.rs:64:9:64:10 | p1 | variables.rs:64:9:64:10 | p1 | variables.rs:68:9:68:10 | p1 |
+| variables.rs:66:12:66:13 | a2 | variables.rs:66:12:66:13 | a2 | variables.rs:69:15:69:16 | a2 |
+| variables.rs:67:12:67:13 | b2 | variables.rs:67:12:67:13 | b2 | variables.rs:70:15:70:16 | b2 |
+| variables.rs:74:9:74:10 | s1 | variables.rs:74:9:74:10 | s1 | variables.rs:77:11:77:12 | s1 |
+| variables.rs:76:17:76:22 | s2 | variables.rs:76:21:76:22 | s2 | variables.rs:78:19:78:20 | s2 |
+| variables.rs:83:14:83:15 | x5 | variables.rs:83:14:83:15 | x5 | variables.rs:87:15:87:16 | x5 |
+| variables.rs:91:9:91:10 | s1 | variables.rs:91:9:91:10 | s1 | variables.rs:94:11:94:12 | s1 |
+| variables.rs:93:20:93:25 | s2 | variables.rs:93:24:93:25 | s2 | variables.rs:95:19:95:20 | s2 |
+| variables.rs:100:9:100:10 | x6 | variables.rs:100:9:100:10 | x6 | variables.rs:103:11:103:12 | x6 |
+| variables.rs:101:9:101:10 | y1 | variables.rs:101:9:101:10 | y1 | variables.rs:113:15:113:16 | y1 |
+| variables.rs:105:14:105:15 | y1 | variables.rs:105:14:105:15 | y1 | variables.rs:108:23:108:24 | y1 |
+| variables.rs:117:9:117:15 | numbers | variables.rs:117:9:117:15 | numbers | variables.rs:119:11:119:17 | numbers |
+| variables.rs:121:13:121:17 | first | variables.rs:121:13:121:17 | first | variables.rs:125:23:125:27 | first |
+| variables.rs:122:13:122:17 | third | variables.rs:122:13:122:17 | third | variables.rs:126:23:126:27 | third |
+| variables.rs:123:13:123:17 | fifth | variables.rs:123:13:123:17 | fifth | variables.rs:127:23:127:27 | fifth |
+| variables.rs:133:13:133:17 | first | variables.rs:133:13:133:17 | first | variables.rs:137:23:137:27 | first |
+| variables.rs:135:13:135:16 | last | variables.rs:135:13:135:16 | last | variables.rs:138:23:138:26 | last |
+| variables.rs:144:9:144:10 | p2 | variables.rs:144:9:144:10 | p2 | variables.rs:146:11:146:12 | p2 |
+| variables.rs:148:16:148:17 | x7 | variables.rs:148:16:148:17 | x7 | variables.rs:149:24:149:25 | x7 |
+| variables.rs:158:9:158:11 | msg | variables.rs:158:9:158:11 | msg | variables.rs:160:11:160:13 | msg |
+| variables.rs:162:17:162:35 | [match(true)] id_variable | variables.rs:162:17:162:27 | id_variable | variables.rs:163:24:163:34 | id_variable |
+| variables.rs:167:26:167:27 | id | variables.rs:167:26:167:27 | id | variables.rs:168:23:168:24 | id |
+| variables.rs:178:9:178:14 | either | variables.rs:178:9:178:14 | either | variables.rs:179:11:179:16 | either |
+| variables.rs:180:9:180:44 | [match(true)] phi | variables.rs:180:9:180:44 | a3 | variables.rs:181:26:181:27 | a3 |
+| variables.rs:192:9:192:10 | tv | variables.rs:192:9:192:10 | tv | variables.rs:193:11:193:12 | tv |
+| variables.rs:194:9:194:81 | [match(true)] phi | variables.rs:194:9:194:81 | a4 | variables.rs:195:26:195:27 | a4 |
+| variables.rs:198:9:198:83 | [match(true)] phi | variables.rs:198:9:198:83 | a5 | variables.rs:199:26:199:27 | a5 |
+| variables.rs:202:9:202:83 | [match(true)] phi | variables.rs:202:9:202:83 | a6 | variables.rs:203:26:203:27 | a6 |
+| variables.rs:208:9:208:14 | either | variables.rs:208:9:208:14 | either | variables.rs:209:11:209:16 | either |
+| variables.rs:210:9:210:44 | [match(true)] phi | variables.rs:210:9:210:44 | a7 | variables.rs:211:16:211:17 | a7 |
+| variables.rs:218:9:218:14 | either | variables.rs:218:9:218:14 | either | variables.rs:220:11:220:16 | either |
+| variables.rs:221:9:222:52 | [match(true)] e | variables.rs:221:13:221:13 | e | variables.rs:226:15:226:15 | e |
+| variables.rs:222:14:222:51 | [match(true)] phi | variables.rs:222:14:222:51 | a11 | variables.rs:224:23:224:25 | a11 |
+| variables.rs:225:33:225:35 | a12 | variables.rs:225:33:225:35 | a12 | variables.rs:227:28:227:30 | a12 |
+| variables.rs:242:9:242:10 | fv | variables.rs:242:9:242:10 | fv | variables.rs:243:11:243:12 | fv |
+| variables.rs:244:9:244:109 | [match(true)] phi | variables.rs:244:9:244:109 | a13 | variables.rs:245:26:245:28 | a13 |
+| variables.rs:250:5:250:6 | a8 | variables.rs:250:5:250:6 | a8 | variables.rs:255:15:255:16 | a8 |
+| variables.rs:252:9:252:10 | b3 | variables.rs:252:9:252:10 | b3 | variables.rs:256:15:256:16 | b3 |
+| variables.rs:253:9:253:10 | c1 | variables.rs:253:9:253:10 | c1 | variables.rs:257:15:257:16 | c1 |
+| variables.rs:261:6:261:41 | [match(true)] phi | variables.rs:261:6:261:41 | a9 | variables.rs:263:15:263:16 | a9 |
+| variables.rs:268:9:268:15 | a10 | variables.rs:268:13:268:15 | a10 | variables.rs:272:15:272:17 | a10 |
+| variables.rs:269:9:269:14 | b4 | variables.rs:269:13:269:14 | b4 | variables.rs:273:15:273:16 | b4 |
+| variables.rs:270:9:270:14 | c2 | variables.rs:270:13:270:14 | c2 | variables.rs:274:15:274:16 | c2 |
+| variables.rs:277:9:277:10 | c2 | variables.rs:270:13:270:14 | c2 | variables.rs:283:9:283:10 | c2 |
+| variables.rs:278:9:278:10 | b4 | variables.rs:269:13:269:14 | b4 | variables.rs:282:9:282:10 | b4 |
+| variables.rs:279:9:279:11 | a10 | variables.rs:268:13:268:15 | a10 | variables.rs:281:9:281:11 | a10 |
+| variables.rs:291:13:291:15 | a10 | variables.rs:291:13:291:15 | a10 | variables.rs:294:23:294:25 | a10 |
+| variables.rs:292:13:292:14 | b4 | variables.rs:292:13:292:14 | b4 | variables.rs:295:23:295:24 | b4 |
+| variables.rs:304:9:304:23 | example_closure | variables.rs:304:9:304:23 | example_closure | variables.rs:308:9:308:23 | example_closure |
+| variables.rs:305:10:305:10 | x | variables.rs:305:10:305:10 | x | variables.rs:306:9:306:9 | x |
+| variables.rs:307:9:307:10 | n1 | variables.rs:307:9:307:10 | n1 | variables.rs:309:15:309:16 | n1 |
+| variables.rs:312:9:312:26 | immutable_variable | variables.rs:312:9:312:26 | immutable_variable | variables.rs:316:9:316:26 | immutable_variable |
+| variables.rs:313:10:313:10 | x | variables.rs:313:10:313:10 | x | variables.rs:314:9:314:9 | x |
+| variables.rs:315:9:315:10 | n2 | variables.rs:315:9:315:10 | n2 | variables.rs:317:15:317:16 | n2 |
+| variables.rs:321:9:321:9 | v | variables.rs:321:9:321:9 | v | variables.rs:324:12:324:12 | v |
+| variables.rs:323:9:323:12 | text | variables.rs:323:9:323:12 | text | variables.rs:325:19:325:22 | text |
+| variables.rs:339:9:339:13 | ref_i | variables.rs:339:9:339:13 | ref_i | variables.rs:341:6:341:10 | ref_i |
+| variables.rs:345:17:345:17 | x | variables.rs:345:17:345:17 | x | variables.rs:346:6:346:6 | x |
+| variables.rs:352:22:352:22 | x | variables.rs:352:22:352:22 | x | variables.rs:353:6:353:6 | x |
+| variables.rs:352:39:352:39 | y | variables.rs:352:39:352:39 | y | variables.rs:356:6:356:6 | y |
+| variables.rs:362:9:362:9 | y | variables.rs:362:9:362:9 | y | variables.rs:364:6:364:6 | y |
+| variables.rs:369:9:369:9 | w | variables.rs:369:9:369:9 | w | variables.rs:373:9:373:9 | w |
+| variables.rs:382:9:382:9 | y | variables.rs:382:9:382:9 | y | variables.rs:384:6:384:6 | y |
+| variables.rs:390:9:390:15 | cap | variables.rs:390:13:390:15 | cap | variables.rs:394:5:394:7 | cap |
+| variables.rs:399:9:399:9 | x | variables.rs:399:9:399:9 | x | variables.rs:404:15:404:15 | x |
+| variables.rs:400:9:400:15 | cap | variables.rs:400:13:400:15 | cap | variables.rs:403:5:403:7 | cap |
+| variables.rs:400:19:402:5 | <captured entry> x | variables.rs:399:9:399:9 | x | variables.rs:401:19:401:19 | x |
+| variables.rs:407:8:407:8 | b | variables.rs:407:8:407:8 | b | variables.rs:411:8:411:8 | b |
+| variables.rs:408:9:408:13 | x | variables.rs:408:13:408:13 | x | variables.rs:409:15:409:15 | x |
+| variables.rs:411:5:419:5 | phi | variables.rs:408:13:408:13 | x | variables.rs:420:15:420:15 | x |
+| variables.rs:412:9:412:9 | x | variables.rs:408:13:408:13 | x | variables.rs:413:19:413:19 | x |
+| variables.rs:416:9:416:9 | x | variables.rs:408:13:408:13 | x | variables.rs:417:19:417:19 | x |
+| variables.rs:423:13:423:14 | b1 | variables.rs:423:13:423:14 | b1 | variables.rs:425:8:425:9 | b1 |
+| variables.rs:423:24:423:25 | b2 | variables.rs:423:24:423:25 | b2 | variables.rs:431:8:431:9 | b2 |
+| variables.rs:424:9:424:9 | x | variables.rs:424:9:424:9 | x | variables.rs:426:19:426:19 | x |
+| variables.rs:424:9:424:9 | x | variables.rs:424:9:424:9 | x | variables.rs:428:19:428:19 | x |
+| variables.rs:458:14:458:14 | x | variables.rs:458:14:458:14 | x | variables.rs:459:16:459:16 | x |
+| variables.rs:463:9:463:9 | x | variables.rs:463:9:463:9 | x | variables.rs:465:15:465:15 | x |
+lastRead
+| variables.rs:3:14:3:14 | s | variables.rs:3:14:3:14 | s | variables.rs:4:20:4:20 | s |
+| variables.rs:7:14:7:14 | i | variables.rs:7:14:7:14 | i | variables.rs:8:20:8:20 | i |
+| variables.rs:12:9:12:10 | x1 | variables.rs:12:9:12:10 | x1 | variables.rs:13:15:13:16 | x1 |
+| variables.rs:17:9:17:14 | x2 | variables.rs:17:13:17:14 | x2 | variables.rs:18:15:18:16 | x2 |
+| variables.rs:19:5:19:6 | x2 | variables.rs:17:13:17:14 | x2 | variables.rs:20:15:20:16 | x2 |
+| variables.rs:24:9:24:10 | x3 | variables.rs:24:9:24:10 | x3 | variables.rs:27:9:27:10 | x3 |
+| variables.rs:26:9:26:10 | x3 | variables.rs:26:9:26:10 | x3 | variables.rs:28:15:28:16 | x3 |
+| variables.rs:32:9:32:10 | x4 | variables.rs:32:9:32:10 | x4 | variables.rs:38:15:38:16 | x4 |
+| variables.rs:35:13:35:14 | x4 | variables.rs:35:13:35:14 | x4 | variables.rs:36:19:36:20 | x4 |
+| variables.rs:49:13:49:14 | a1 | variables.rs:49:13:49:14 | a1 | variables.rs:57:15:57:16 | a1 |
+| variables.rs:50:13:50:14 | b1 | variables.rs:50:13:50:14 | b1 | variables.rs:58:15:58:16 | b1 |
+| variables.rs:53:13:53:13 | x | variables.rs:53:13:53:13 | x | variables.rs:59:15:59:15 | x |
+| variables.rs:54:13:54:13 | y | variables.rs:54:13:54:13 | y | variables.rs:60:15:60:15 | y |
+| variables.rs:64:9:64:10 | p1 | variables.rs:64:9:64:10 | p1 | variables.rs:68:9:68:10 | p1 |
+| variables.rs:66:12:66:13 | a2 | variables.rs:66:12:66:13 | a2 | variables.rs:69:15:69:16 | a2 |
+| variables.rs:67:12:67:13 | b2 | variables.rs:67:12:67:13 | b2 | variables.rs:70:15:70:16 | b2 |
+| variables.rs:74:9:74:10 | s1 | variables.rs:74:9:74:10 | s1 | variables.rs:77:11:77:12 | s1 |
+| variables.rs:76:17:76:22 | s2 | variables.rs:76:21:76:22 | s2 | variables.rs:78:19:78:20 | s2 |
+| variables.rs:83:14:83:15 | x5 | variables.rs:83:14:83:15 | x5 | variables.rs:87:15:87:16 | x5 |
+| variables.rs:91:9:91:10 | s1 | variables.rs:91:9:91:10 | s1 | variables.rs:94:11:94:12 | s1 |
+| variables.rs:93:20:93:25 | s2 | variables.rs:93:24:93:25 | s2 | variables.rs:95:19:95:20 | s2 |
+| variables.rs:100:9:100:10 | x6 | variables.rs:100:9:100:10 | x6 | variables.rs:103:11:103:12 | x6 |
+| variables.rs:101:9:101:10 | y1 | variables.rs:101:9:101:10 | y1 | variables.rs:113:15:113:16 | y1 |
+| variables.rs:105:14:105:15 | y1 | variables.rs:105:14:105:15 | y1 | variables.rs:108:23:108:24 | y1 |
+| variables.rs:117:9:117:15 | numbers | variables.rs:117:9:117:15 | numbers | variables.rs:131:11:131:17 | numbers |
+| variables.rs:121:13:121:17 | first | variables.rs:121:13:121:17 | first | variables.rs:125:23:125:27 | first |
+| variables.rs:122:13:122:17 | third | variables.rs:122:13:122:17 | third | variables.rs:126:23:126:27 | third |
+| variables.rs:123:13:123:17 | fifth | variables.rs:123:13:123:17 | fifth | variables.rs:127:23:127:27 | fifth |
+| variables.rs:133:13:133:17 | first | variables.rs:133:13:133:17 | first | variables.rs:137:23:137:27 | first |
+| variables.rs:135:13:135:16 | last | variables.rs:135:13:135:16 | last | variables.rs:138:23:138:26 | last |
+| variables.rs:144:9:144:10 | p2 | variables.rs:144:9:144:10 | p2 | variables.rs:146:11:146:12 | p2 |
+| variables.rs:148:16:148:17 | x7 | variables.rs:148:16:148:17 | x7 | variables.rs:149:24:149:25 | x7 |
+| variables.rs:158:9:158:11 | msg | variables.rs:158:9:158:11 | msg | variables.rs:160:11:160:13 | msg |
+| variables.rs:162:17:162:35 | [match(true)] id_variable | variables.rs:162:17:162:27 | id_variable | variables.rs:163:24:163:34 | id_variable |
+| variables.rs:167:26:167:27 | id | variables.rs:167:26:167:27 | id | variables.rs:168:23:168:24 | id |
+| variables.rs:178:9:178:14 | either | variables.rs:178:9:178:14 | either | variables.rs:179:11:179:16 | either |
+| variables.rs:180:9:180:44 | [match(true)] phi | variables.rs:180:9:180:44 | a3 | variables.rs:181:26:181:27 | a3 |
+| variables.rs:192:9:192:10 | tv | variables.rs:192:9:192:10 | tv | variables.rs:201:11:201:12 | tv |
+| variables.rs:194:9:194:81 | [match(true)] phi | variables.rs:194:9:194:81 | a4 | variables.rs:195:26:195:27 | a4 |
+| variables.rs:198:9:198:83 | [match(true)] phi | variables.rs:198:9:198:83 | a5 | variables.rs:199:26:199:27 | a5 |
+| variables.rs:202:9:202:83 | [match(true)] phi | variables.rs:202:9:202:83 | a6 | variables.rs:203:26:203:27 | a6 |
+| variables.rs:208:9:208:14 | either | variables.rs:208:9:208:14 | either | variables.rs:209:11:209:16 | either |
+| variables.rs:210:9:210:44 | [match(true)] phi | variables.rs:210:9:210:44 | a7 | variables.rs:211:16:211:17 | a7 |
+| variables.rs:210:9:210:44 | [match(true)] phi | variables.rs:210:9:210:44 | a7 | variables.rs:212:26:212:27 | a7 |
+| variables.rs:218:9:218:14 | either | variables.rs:218:9:218:14 | either | variables.rs:220:11:220:16 | either |
+| variables.rs:221:9:222:52 | [match(true)] e | variables.rs:221:13:221:13 | e | variables.rs:226:15:226:15 | e |
+| variables.rs:222:14:222:51 | [match(true)] phi | variables.rs:222:14:222:51 | a11 | variables.rs:224:23:224:25 | a11 |
+| variables.rs:225:33:225:35 | a12 | variables.rs:225:33:225:35 | a12 | variables.rs:227:28:227:30 | a12 |
+| variables.rs:242:9:242:10 | fv | variables.rs:242:9:242:10 | fv | variables.rs:243:11:243:12 | fv |
+| variables.rs:244:9:244:109 | [match(true)] phi | variables.rs:244:9:244:109 | a13 | variables.rs:245:26:245:28 | a13 |
+| variables.rs:250:5:250:6 | a8 | variables.rs:250:5:250:6 | a8 | variables.rs:255:15:255:16 | a8 |
+| variables.rs:252:9:252:10 | b3 | variables.rs:252:9:252:10 | b3 | variables.rs:256:15:256:16 | b3 |
+| variables.rs:253:9:253:10 | c1 | variables.rs:253:9:253:10 | c1 | variables.rs:257:15:257:16 | c1 |
+| variables.rs:261:6:261:41 | [match(true)] phi | variables.rs:261:6:261:41 | a9 | variables.rs:263:15:263:16 | a9 |
+| variables.rs:268:9:268:15 | a10 | variables.rs:268:13:268:15 | a10 | variables.rs:272:15:272:17 | a10 |
+| variables.rs:269:9:269:14 | b4 | variables.rs:269:13:269:14 | b4 | variables.rs:273:15:273:16 | b4 |
+| variables.rs:270:9:270:14 | c2 | variables.rs:270:13:270:14 | c2 | variables.rs:274:15:274:16 | c2 |
+| variables.rs:277:9:277:10 | c2 | variables.rs:270:13:270:14 | c2 | variables.rs:287:15:287:16 | c2 |
+| variables.rs:278:9:278:10 | b4 | variables.rs:269:13:269:14 | b4 | variables.rs:300:15:300:16 | b4 |
+| variables.rs:279:9:279:11 | a10 | variables.rs:268:13:268:15 | a10 | variables.rs:299:15:299:17 | a10 |
+| variables.rs:291:13:291:15 | a10 | variables.rs:291:13:291:15 | a10 | variables.rs:294:23:294:25 | a10 |
+| variables.rs:292:13:292:14 | b4 | variables.rs:292:13:292:14 | b4 | variables.rs:295:23:295:24 | b4 |
+| variables.rs:304:9:304:23 | example_closure | variables.rs:304:9:304:23 | example_closure | variables.rs:308:9:308:23 | example_closure |
+| variables.rs:305:10:305:10 | x | variables.rs:305:10:305:10 | x | variables.rs:306:9:306:9 | x |
+| variables.rs:307:9:307:10 | n1 | variables.rs:307:9:307:10 | n1 | variables.rs:309:15:309:16 | n1 |
+| variables.rs:312:9:312:26 | immutable_variable | variables.rs:312:9:312:26 | immutable_variable | variables.rs:316:9:316:26 | immutable_variable |
+| variables.rs:313:10:313:10 | x | variables.rs:313:10:313:10 | x | variables.rs:314:9:314:9 | x |
+| variables.rs:315:9:315:10 | n2 | variables.rs:315:9:315:10 | n2 | variables.rs:317:15:317:16 | n2 |
+| variables.rs:321:9:321:9 | v | variables.rs:321:9:321:9 | v | variables.rs:324:12:324:12 | v |
+| variables.rs:323:9:323:12 | text | variables.rs:323:9:323:12 | text | variables.rs:325:19:325:22 | text |
+| variables.rs:339:9:339:13 | ref_i | variables.rs:339:9:339:13 | ref_i | variables.rs:341:6:341:10 | ref_i |
+| variables.rs:345:17:345:17 | x | variables.rs:345:17:345:17 | x | variables.rs:349:12:349:12 | x |
+| variables.rs:352:22:352:22 | x | variables.rs:352:22:352:22 | x | variables.rs:357:9:357:9 | x |
+| variables.rs:352:39:352:39 | y | variables.rs:352:39:352:39 | y | variables.rs:356:6:356:6 | y |
+| variables.rs:362:9:362:9 | y | variables.rs:362:9:362:9 | y | variables.rs:364:6:364:6 | y |
+| variables.rs:369:9:369:9 | w | variables.rs:369:9:369:9 | w | variables.rs:375:7:375:7 | w |
+| variables.rs:382:9:382:9 | y | variables.rs:382:9:382:9 | y | variables.rs:384:6:384:6 | y |
+| variables.rs:390:9:390:15 | cap | variables.rs:390:13:390:15 | cap | variables.rs:394:5:394:7 | cap |
+| variables.rs:399:9:399:9 | x | variables.rs:399:9:399:9 | x | variables.rs:404:15:404:15 | x |
+| variables.rs:400:9:400:15 | cap | variables.rs:400:13:400:15 | cap | variables.rs:403:5:403:7 | cap |
+| variables.rs:400:19:402:5 | <captured entry> x | variables.rs:399:9:399:9 | x | variables.rs:401:19:401:19 | x |
+| variables.rs:407:8:407:8 | b | variables.rs:407:8:407:8 | b | variables.rs:411:8:411:8 | b |
+| variables.rs:408:9:408:13 | x | variables.rs:408:13:408:13 | x | variables.rs:410:15:410:15 | x |
+| variables.rs:411:5:419:5 | phi | variables.rs:408:13:408:13 | x | variables.rs:420:15:420:15 | x |
+| variables.rs:412:9:412:9 | x | variables.rs:408:13:408:13 | x | variables.rs:414:19:414:19 | x |
+| variables.rs:416:9:416:9 | x | variables.rs:408:13:408:13 | x | variables.rs:418:19:418:19 | x |
+| variables.rs:423:13:423:14 | b1 | variables.rs:423:13:423:14 | b1 | variables.rs:425:8:425:9 | b1 |
+| variables.rs:423:24:423:25 | b2 | variables.rs:423:24:423:25 | b2 | variables.rs:431:8:431:9 | b2 |
+| variables.rs:424:9:424:9 | x | variables.rs:424:9:424:9 | x | variables.rs:432:19:432:19 | x |
+| variables.rs:424:9:424:9 | x | variables.rs:424:9:424:9 | x | variables.rs:434:19:434:19 | x |
+| variables.rs:458:14:458:14 | x | variables.rs:458:14:458:14 | x | variables.rs:459:16:459:16 | x |
+| variables.rs:463:9:463:9 | x | variables.rs:463:9:463:9 | x | variables.rs:465:15:465:15 | x |
+adjacentReads
+| variables.rs:24:9:24:10 | x3 | variables.rs:24:9:24:10 | x3 | variables.rs:25:15:25:16 | x3 | variables.rs:27:9:27:10 | x3 |
+| variables.rs:32:9:32:10 | x4 | variables.rs:32:9:32:10 | x4 | variables.rs:33:15:33:16 | x4 | variables.rs:38:15:38:16 | x4 |
+| variables.rs:91:9:91:10 | s1 | variables.rs:91:9:91:10 | s1 | variables.rs:94:11:94:12 | s1 | variables.rs:94:11:94:12 | s1 |
+| variables.rs:117:9:117:15 | numbers | variables.rs:117:9:117:15 | numbers | variables.rs:119:11:119:17 | numbers | variables.rs:131:11:131:17 | numbers |
+| variables.rs:192:9:192:10 | tv | variables.rs:192:9:192:10 | tv | variables.rs:193:11:193:12 | tv | variables.rs:197:11:197:12 | tv |
+| variables.rs:192:9:192:10 | tv | variables.rs:192:9:192:10 | tv | variables.rs:197:11:197:12 | tv | variables.rs:201:11:201:12 | tv |
+| variables.rs:210:9:210:44 | [match(true)] phi | variables.rs:210:9:210:44 | a7 | variables.rs:211:16:211:17 | a7 | variables.rs:212:26:212:27 | a7 |
+| variables.rs:277:9:277:10 | c2 | variables.rs:270:13:270:14 | c2 | variables.rs:283:9:283:10 | c2 | variables.rs:287:15:287:16 | c2 |
+| variables.rs:278:9:278:10 | b4 | variables.rs:269:13:269:14 | b4 | variables.rs:282:9:282:10 | b4 | variables.rs:286:15:286:16 | b4 |
+| variables.rs:278:9:278:10 | b4 | variables.rs:269:13:269:14 | b4 | variables.rs:286:15:286:16 | b4 | variables.rs:300:15:300:16 | b4 |
+| variables.rs:279:9:279:11 | a10 | variables.rs:268:13:268:15 | a10 | variables.rs:281:9:281:11 | a10 | variables.rs:285:15:285:17 | a10 |
+| variables.rs:279:9:279:11 | a10 | variables.rs:268:13:268:15 | a10 | variables.rs:285:15:285:17 | a10 | variables.rs:299:15:299:17 | a10 |
+| variables.rs:345:17:345:17 | x | variables.rs:345:17:345:17 | x | variables.rs:346:6:346:6 | x | variables.rs:347:10:347:10 | x |
+| variables.rs:345:17:345:17 | x | variables.rs:345:17:345:17 | x | variables.rs:347:10:347:10 | x | variables.rs:348:10:348:10 | x |
+| variables.rs:345:17:345:17 | x | variables.rs:345:17:345:17 | x | variables.rs:348:10:348:10 | x | variables.rs:349:12:349:12 | x |
+| variables.rs:352:22:352:22 | x | variables.rs:352:22:352:22 | x | variables.rs:353:6:353:6 | x | variables.rs:354:10:354:10 | x |
+| variables.rs:352:22:352:22 | x | variables.rs:352:22:352:22 | x | variables.rs:354:10:354:10 | x | variables.rs:355:10:355:10 | x |
+| variables.rs:352:22:352:22 | x | variables.rs:352:22:352:22 | x | variables.rs:355:10:355:10 | x | variables.rs:357:9:357:9 | x |
+| variables.rs:369:9:369:9 | w | variables.rs:369:9:369:9 | w | variables.rs:373:9:373:9 | w | variables.rs:375:7:375:7 | w |
+| variables.rs:408:9:408:13 | x | variables.rs:408:13:408:13 | x | variables.rs:409:15:409:15 | x | variables.rs:410:15:410:15 | x |
+| variables.rs:412:9:412:9 | x | variables.rs:408:13:408:13 | x | variables.rs:413:19:413:19 | x | variables.rs:414:19:414:19 | x |
+| variables.rs:416:9:416:9 | x | variables.rs:408:13:408:13 | x | variables.rs:417:19:417:19 | x | variables.rs:418:19:418:19 | x |
+| variables.rs:424:9:424:9 | x | variables.rs:424:9:424:9 | x | variables.rs:426:19:426:19 | x | variables.rs:432:19:432:19 | x |
+| variables.rs:424:9:424:9 | x | variables.rs:424:9:424:9 | x | variables.rs:426:19:426:19 | x | variables.rs:434:19:434:19 | x |
+| variables.rs:424:9:424:9 | x | variables.rs:424:9:424:9 | x | variables.rs:428:19:428:19 | x | variables.rs:432:19:432:19 | x |
+| variables.rs:424:9:424:9 | x | variables.rs:424:9:424:9 | x | variables.rs:428:19:428:19 | x | variables.rs:434:19:434:19 | x |
+phi
+| variables.rs:180:9:180:44 | [match(true)] phi | variables.rs:180:9:180:44 | a3 | variables.rs:180:22:180:23 | a3 |
+| variables.rs:180:9:180:44 | [match(true)] phi | variables.rs:180:9:180:44 | a3 | variables.rs:180:42:180:43 | a3 |
+| variables.rs:194:9:194:81 | [match(true)] phi | variables.rs:194:9:194:81 | a4 | variables.rs:194:28:194:29 | a4 |
+| variables.rs:194:9:194:81 | [match(true)] phi | variables.rs:194:9:194:81 | a4 | variables.rs:194:54:194:55 | a4 |
+| variables.rs:194:9:194:81 | [match(true)] phi | variables.rs:194:9:194:81 | a4 | variables.rs:194:79:194:80 | a4 |
+| variables.rs:198:9:198:83 | [match(true)] phi | variables.rs:198:9:198:83 | a5 | variables.rs:198:10:198:57 | [match(true)] phi |
+| variables.rs:198:9:198:83 | [match(true)] phi | variables.rs:198:9:198:83 | a5 | variables.rs:198:81:198:82 | a5 |
+| variables.rs:198:10:198:57 | [match(true)] phi | variables.rs:198:9:198:83 | a5 | variables.rs:198:29:198:30 | a5 |
+| variables.rs:198:10:198:57 | [match(true)] phi | variables.rs:198:9:198:83 | a5 | variables.rs:198:55:198:56 | a5 |
+| variables.rs:202:9:202:83 | [match(true)] phi | variables.rs:202:9:202:83 | a6 | variables.rs:202:28:202:29 | a6 |
+| variables.rs:202:9:202:83 | [match(true)] phi | variables.rs:202:9:202:83 | a6 | variables.rs:202:35:202:82 | [match(true)] phi |
+| variables.rs:202:35:202:82 | [match(true)] phi | variables.rs:202:9:202:83 | a6 | variables.rs:202:55:202:56 | a6 |
+| variables.rs:202:35:202:82 | [match(true)] phi | variables.rs:202:9:202:83 | a6 | variables.rs:202:80:202:81 | a6 |
+| variables.rs:210:9:210:44 | [match(true)] phi | variables.rs:210:9:210:44 | a7 | variables.rs:210:22:210:23 | a7 |
+| variables.rs:210:9:210:44 | [match(true)] phi | variables.rs:210:9:210:44 | a7 | variables.rs:210:42:210:43 | a7 |
+| variables.rs:222:14:222:51 | [match(true)] phi | variables.rs:222:14:222:51 | a11 | variables.rs:222:27:222:29 | a11 |
+| variables.rs:222:14:222:51 | [match(true)] phi | variables.rs:222:14:222:51 | a11 | variables.rs:222:48:222:50 | a11 |
+| variables.rs:244:9:244:109 | [match(true)] phi | variables.rs:244:9:244:109 | a13 | variables.rs:244:27:244:29 | a13 |
+| variables.rs:244:9:244:109 | [match(true)] phi | variables.rs:244:9:244:109 | a13 | variables.rs:244:35:244:82 | [match(true)] phi |
+| variables.rs:244:9:244:109 | [match(true)] phi | variables.rs:244:9:244:109 | a13 | variables.rs:244:106:244:108 | a13 |
+| variables.rs:244:35:244:82 | [match(true)] phi | variables.rs:244:9:244:109 | a13 | variables.rs:244:54:244:56 | a13 |
+| variables.rs:244:35:244:82 | [match(true)] phi | variables.rs:244:9:244:109 | a13 | variables.rs:244:79:244:81 | a13 |
+| variables.rs:261:6:261:41 | [match(true)] phi | variables.rs:261:6:261:41 | a9 | variables.rs:261:19:261:20 | a9 |
+| variables.rs:261:6:261:41 | [match(true)] phi | variables.rs:261:6:261:41 | a9 | variables.rs:261:39:261:40 | a9 |
+| variables.rs:411:5:419:5 | phi | variables.rs:408:13:408:13 | x | variables.rs:412:9:412:9 | x |
+| variables.rs:411:5:419:5 | phi | variables.rs:408:13:408:13 | x | variables.rs:416:9:416:9 | x |
+phiReadNode
+| variables.rs:93:11:94:12 | SSA phi read(s1) | variables.rs:91:9:91:10 | s1 |
+| variables.rs:425:5:429:5 | SSA phi read(x) | variables.rs:424:9:424:9 | x |
+phiReadNodeRead
+| variables.rs:93:11:94:12 | SSA phi read(s1) | variables.rs:91:9:91:10 | s1 | variables.rs:94:11:94:12 | s1 |
+| variables.rs:425:5:429:5 | SSA phi read(x) | variables.rs:424:9:424:9 | x | variables.rs:432:19:432:19 | x |
+| variables.rs:425:5:429:5 | SSA phi read(x) | variables.rs:424:9:424:9 | x | variables.rs:434:19:434:19 | x |
+phiReadInput
+| variables.rs:93:11:94:12 | SSA phi read(s1) | variables.rs:91:9:91:10 | s1 |
+| variables.rs:93:11:94:12 | SSA phi read(s1) | variables.rs:93:11:94:12 | SSA phi read(s1) |
+| variables.rs:425:5:429:5 | SSA phi read(x) | variables.rs:424:9:424:9 | x |
+ultimateDef
+| variables.rs:180:9:180:44 | [match(true)] phi | variables.rs:180:22:180:23 | a3 |
+| variables.rs:180:9:180:44 | [match(true)] phi | variables.rs:180:42:180:43 | a3 |
+| variables.rs:194:9:194:81 | [match(true)] phi | variables.rs:194:28:194:29 | a4 |
+| variables.rs:194:9:194:81 | [match(true)] phi | variables.rs:194:54:194:55 | a4 |
+| variables.rs:194:9:194:81 | [match(true)] phi | variables.rs:194:79:194:80 | a4 |
+| variables.rs:198:9:198:83 | [match(true)] phi | variables.rs:198:29:198:30 | a5 |
+| variables.rs:198:9:198:83 | [match(true)] phi | variables.rs:198:55:198:56 | a5 |
+| variables.rs:198:9:198:83 | [match(true)] phi | variables.rs:198:81:198:82 | a5 |
+| variables.rs:198:10:198:57 | [match(true)] phi | variables.rs:198:29:198:30 | a5 |
+| variables.rs:198:10:198:57 | [match(true)] phi | variables.rs:198:55:198:56 | a5 |
+| variables.rs:202:9:202:83 | [match(true)] phi | variables.rs:202:28:202:29 | a6 |
+| variables.rs:202:9:202:83 | [match(true)] phi | variables.rs:202:55:202:56 | a6 |
+| variables.rs:202:9:202:83 | [match(true)] phi | variables.rs:202:80:202:81 | a6 |
+| variables.rs:202:35:202:82 | [match(true)] phi | variables.rs:202:55:202:56 | a6 |
+| variables.rs:202:35:202:82 | [match(true)] phi | variables.rs:202:80:202:81 | a6 |
+| variables.rs:210:9:210:44 | [match(true)] phi | variables.rs:210:22:210:23 | a7 |
+| variables.rs:210:9:210:44 | [match(true)] phi | variables.rs:210:42:210:43 | a7 |
+| variables.rs:222:14:222:51 | [match(true)] phi | variables.rs:222:27:222:29 | a11 |
+| variables.rs:222:14:222:51 | [match(true)] phi | variables.rs:222:48:222:50 | a11 |
+| variables.rs:244:9:244:109 | [match(true)] phi | variables.rs:244:27:244:29 | a13 |
+| variables.rs:244:9:244:109 | [match(true)] phi | variables.rs:244:54:244:56 | a13 |
+| variables.rs:244:9:244:109 | [match(true)] phi | variables.rs:244:79:244:81 | a13 |
+| variables.rs:244:9:244:109 | [match(true)] phi | variables.rs:244:106:244:108 | a13 |
+| variables.rs:244:35:244:82 | [match(true)] phi | variables.rs:244:54:244:56 | a13 |
+| variables.rs:244:35:244:82 | [match(true)] phi | variables.rs:244:79:244:81 | a13 |
+| variables.rs:261:6:261:41 | [match(true)] phi | variables.rs:261:19:261:20 | a9 |
+| variables.rs:261:6:261:41 | [match(true)] phi | variables.rs:261:39:261:40 | a9 |
+| variables.rs:411:5:419:5 | phi | variables.rs:412:9:412:9 | x |
+| variables.rs:411:5:419:5 | phi | variables.rs:416:9:416:9 | x |
+assigns
+| variables.rs:19:5:19:6 | x2 | variables.rs:19:10:19:10 | 5 |
+| variables.rs:412:9:412:9 | x | variables.rs:412:13:412:13 | 2 |
+| variables.rs:416:9:416:9 | x | variables.rs:416:13:416:13 | 3 |
diff --git a/rust/ql/test/library-tests/variables/Ssa.ql b/rust/ql/test/library-tests/variables/Ssa.ql
new file mode 100644
index 000000000000..750aa8f666b4
--- /dev/null
+++ b/rust/ql/test/library-tests/variables/Ssa.ql
@@ -0,0 +1,52 @@
+import rust
+import codeql.rust.controlflow.BasicBlocks
+import codeql.rust.controlflow.ControlFlowGraph
+import codeql.rust.dataflow.Ssa
+import codeql.rust.dataflow.internal.SsaImpl
+import ExposedForTestingOnly
+
+query predicate nonSsaVariable(Variable v) { not v instanceof Ssa::Variable }
+
+query predicate definition(Ssa::Definition def, Variable v) { def.getSourceVariable() = v }
+
+query predicate read(Ssa::Definition def, Variable v, CfgNode read) {
+  def.getSourceVariable() = v and read = def.getARead()
+}
+
+query predicate firstRead(Ssa::Definition def, Variable v, CfgNode read) {
+  def.getSourceVariable() = v and read = def.getAFirstRead()
+}
+
+query predicate lastRead(Ssa::Definition def, Variable v, CfgNode read) {
+  def.getSourceVariable() = v and read = def.getALastRead()
+}
+
+query predicate adjacentReads(Ssa::Definition def, Variable v, CfgNode read1, CfgNode read2) {
+  def.getSourceVariable() = v and
+  def.hasAdjacentReads(read1, read2)
+}
+
+query predicate phi(Ssa::PhiDefinition phi, Variable v, Ssa::Definition input) {
+  phi.getSourceVariable() = v and input = phi.getAnInput()
+}
+
+query predicate phiReadNode(PhiReadNode phi, Variable v) { phi.getSourceVariable() = v }
+
+query predicate phiReadNodeRead(PhiReadNode phi, Variable v, CfgNode read) {
+  phi.getSourceVariable() = v and
+  exists(BasicBlock bb, int i |
+    ssaDefReachesReadExt(v, phi, bb, i) and
+    read = bb.getNode(i)
+  )
+}
+
+query predicate phiReadInput(PhiReadNode phi, DefinitionExt inp) {
+  phiHasInputFromBlockExt(phi, inp, _)
+}
+
+query predicate ultimateDef(Ssa::Definition def, Definition ult) {
+  ult = def.getAnUltimateDefinition() and
+  ult != def
+}
+
+query predicate assigns(Ssa::WriteDefinition def, CfgNode value) { def.assigns(value) }
diff --git a/rust/ql/test/library-tests/variables/variables.expected b/rust/ql/test/library-tests/variables/variables.expected
index c752e862c818..aad2c9e40f9e 100644
--- a/rust/ql/test/library-tests/variables/variables.expected
+++ b/rust/ql/test/library-tests/variables/variables.expected
@@ -1,6 +1,4 @@
 testFailures
-| variables.rs:452:5:452:5 | a | Unexpected result: write_access=a |
-| variables.rs:452:16:452:33 | Comment | Missing result:read_access=a |
 failures
 variable
 | variables.rs:3:14:3:14 | s |
@@ -247,7 +245,6 @@ variableWriteAccess
 | variables.rs:279:9:279:11 | a10 | variables.rs:268:13:268:15 | a10 |
 | variables.rs:412:9:412:9 | x | variables.rs:408:13:408:13 | x |
 | variables.rs:416:9:416:9 | x | variables.rs:408:13:408:13 | x |
-| variables.rs:452:5:452:5 | a | variables.rs:450:13:450:13 | a |
 | variables.rs:454:5:454:5 | a | variables.rs:450:13:450:13 | a |
 variableReadAccess
 | variables.rs:4:20:4:20 | s | variables.rs:3:14:3:14 | s |
@@ -371,6 +368,7 @@ variableReadAccess
 | variables.rs:432:19:432:19 | x | variables.rs:424:9:424:9 | x |
 | variables.rs:434:19:434:19 | x | variables.rs:424:9:424:9 | x |
 | variables.rs:451:15:451:15 | a | variables.rs:450:13:450:13 | a |
+| variables.rs:452:5:452:5 | a | variables.rs:450:13:450:13 | a |
 | variables.rs:453:15:453:15 | a | variables.rs:450:13:450:13 | a |
 | variables.rs:455:15:455:15 | a | variables.rs:450:13:450:13 | a |
 | variables.rs:459:16:459:16 | x | variables.rs:458:14:458:14 | x |

From 1456ec21196fdcbea4cd78b9a98ebf207cd77d90 Mon Sep 17 00:00:00 2001
From: Owen Mansel-Chan <owen-mc@github.com>
Date: Sun, 13 Oct 2024 14:27:51 +0100
Subject: [PATCH 323/347] Fix bad join order in SummarizedParameterNode.gettype

Specifically the disjunct for this.getPos() != -1. Running on
uber/aresdb, before we had this:

   2403   ~1%    {3} r6 = JOIN `DataFlowUtil::SummarizedParameterNode.getPos/0#dispred#70a2aab4` WITH `DataFlowPrivate::FlowSummaryNode.getSummarizedCallable/0#dispred#e79ea9be` ON FIRST 1 OUTPUT Lhs.1, Lhs.0, Rhs.1
9149774   ~5%    {4}    | JOIN WITH `Types::SignatureType.getParameterType/1#dispred#2c11bb7b_102#join_rhs` ON FIRST 1 OUTPUT Lhs.2, Rhs.1, Lhs.1, Rhs.2
    923   ~9%    {2}    | JOIN WITH `Scopes::Callable.getType/0#dispred#55a0e6a2` ON FIRST 2 OUTPUT Lhs.2, Lhs.3

We add a binding pragma to make it not bind on this.getPos() until
necessary. After we have this:

   2403   ~0%    {3} r6 = JOIN `DataFlowUtil::SummarizedParameterNode.getPos/0#dispred#70a2aab4` WITH `DataFlowPrivate::FlowSummaryNode.getSummarizedCallable/0#dispred#e79ea9be` ON FIRST 1 OUTPUT Rhs.1, Lhs.0, Lhs.1
   2373   ~0%    {3}    | JOIN WITH `Scopes::Callable.getType/0#dispred#55a0e6a2` ON FIRST 1 OUTPUT Rhs.1, Lhs.2, Lhs.1
    923   ~9%    {2}    | JOIN WITH `Types::SignatureType.getParameterType/1#dispred#2c11bb7b` ON FIRST 2 OUTPUT Lhs.2, Rhs.2
---
 go/ql/lib/semmle/go/dataflow/internal/DataFlowNodes.qll | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/go/ql/lib/semmle/go/dataflow/internal/DataFlowNodes.qll b/go/ql/lib/semmle/go/dataflow/internal/DataFlowNodes.qll
index 0aa517b3fdad..cc353ab64df5 100644
--- a/go/ql/lib/semmle/go/dataflow/internal/DataFlowNodes.qll
+++ b/go/ql/lib/semmle/go/dataflow/internal/DataFlowNodes.qll
@@ -727,7 +727,10 @@ module Public {
     override string getNodeKind() { result = "external parameter node" }
 
     override Type getType() {
-      result = this.getSummarizedCallable().getType().getParameterType(this.getPos())
+      result =
+        this.getSummarizedCallable()
+            .getType()
+            .getParameterType(pragma[only_bind_into](this.getPos()))
       or
       this.getPos() = -1 and
       result = this.getSummarizedCallable().asFunction().(Method).getReceiverType()

From 23ee7b955ce4b7b20d93c2d19c9b0d895ddd7dfd Mon Sep 17 00:00:00 2001
From: Simon Friis Vindum <simonfv@gmail.com>
Date: Mon, 14 Oct 2024 11:27:32 +0200
Subject: [PATCH 324/347] Rust: Add CFG tests for question mark operator and
 scrutinee with return

---
 .../library-tests/controlflow/Cfg.expected    | 273 ++++++++++--------
 .../ql/test/library-tests/controlflow/test.rs |  42 ++-
 2 files changed, 187 insertions(+), 128 deletions(-)

diff --git a/rust/ql/test/library-tests/controlflow/Cfg.expected b/rust/ql/test/library-tests/controlflow/Cfg.expected
index 0862f5f3415f..6b8a47953986 100644
--- a/rust/ql/test/library-tests/controlflow/Cfg.expected
+++ b/rust/ql/test/library-tests/controlflow/Cfg.expected
@@ -554,124 +554,155 @@ edges
 | test.rs:244:13:244:16 | true | test.rs:243:15:245:9 | BlockExpr |  |
 | test.rs:245:16:247:9 | BlockExpr | test.rs:243:9:247:9 | IfExpr |  |
 | test.rs:246:13:246:17 | false | test.rs:245:16:247:9 | BlockExpr |  |
-| test.rs:251:1:257:1 | enter test_match | test.rs:251:15:251:25 | maybe_digit |  |
-| test.rs:251:1:257:1 | exit test_match (normal) | test.rs:251:1:257:1 | exit test_match |  |
-| test.rs:251:15:251:25 | maybe_digit | test.rs:251:15:251:38 | Param | match |
-| test.rs:251:15:251:38 | Param | test.rs:252:11:252:21 | maybe_digit |  |
-| test.rs:251:48:257:1 | BlockExpr | test.rs:251:1:257:1 | exit test_match (normal) |  |
-| test.rs:252:5:256:5 | MatchExpr | test.rs:251:48:257:1 | BlockExpr |  |
-| test.rs:252:11:252:21 | maybe_digit | test.rs:253:9:253:23 | TupleStructPat |  |
-| test.rs:253:9:253:23 | TupleStructPat | test.rs:253:22:253:22 | x | match |
-| test.rs:253:9:253:23 | TupleStructPat | test.rs:254:9:254:23 | TupleStructPat | no-match |
-| test.rs:253:22:253:22 | x | test.rs:253:28:253:28 | x | match |
-| test.rs:253:28:253:28 | x | test.rs:253:32:253:33 | 10 |  |
-| test.rs:253:28:253:33 | ... < ... | test.rs:253:38:253:38 | x | true |
-| test.rs:253:28:253:33 | ... < ... | test.rs:254:9:254:23 | TupleStructPat | false |
-| test.rs:253:32:253:33 | 10 | test.rs:253:28:253:33 | ... < ... |  |
-| test.rs:253:38:253:38 | x | test.rs:253:42:253:42 | 5 |  |
-| test.rs:253:38:253:42 | ... + ... | test.rs:252:5:256:5 | MatchExpr |  |
-| test.rs:253:42:253:42 | 5 | test.rs:253:38:253:42 | ... + ... |  |
-| test.rs:254:9:254:23 | TupleStructPat | test.rs:254:22:254:22 | x | match |
-| test.rs:254:9:254:23 | TupleStructPat | test.rs:255:9:255:20 | PathPat | no-match |
-| test.rs:254:22:254:22 | x | test.rs:254:28:254:28 | x | match |
-| test.rs:254:28:254:28 | x | test.rs:252:5:256:5 | MatchExpr |  |
-| test.rs:255:9:255:20 | PathPat | test.rs:255:25:255:25 | 5 | match |
-| test.rs:255:25:255:25 | 5 | test.rs:252:5:256:5 | MatchExpr |  |
-| test.rs:260:5:265:5 | enter test_infinite_loop | test.rs:261:9:263:9 | ExprStmt |  |
-| test.rs:261:9:263:9 | ExprStmt | test.rs:262:13:262:13 | 1 |  |
-| test.rs:261:14:263:9 | BlockExpr | test.rs:262:13:262:13 | 1 |  |
-| test.rs:262:13:262:13 | 1 | test.rs:261:14:263:9 | BlockExpr |  |
-| test.rs:267:5:270:5 | enter test_let_match | test.rs:267:23:267:23 | a |  |
-| test.rs:267:5:270:5 | exit test_let_match (normal) | test.rs:267:5:270:5 | exit test_let_match |  |
-| test.rs:267:23:267:23 | a | test.rs:267:23:267:36 | Param | match |
-| test.rs:267:23:267:36 | Param | test.rs:268:9:268:49 | LetStmt |  |
-| test.rs:267:39:270:5 | BlockExpr | test.rs:267:5:270:5 | exit test_let_match (normal) |  |
-| test.rs:268:9:268:49 | LetStmt | test.rs:268:23:268:23 | a |  |
-| test.rs:268:13:268:19 | TupleStructPat | test.rs:268:18:268:18 | n | match |
-| test.rs:268:13:268:19 | TupleStructPat | test.rs:268:32:268:46 | "Expected some" | no-match |
-| test.rs:268:18:268:18 | n | test.rs:269:9:269:9 | n | match |
-| test.rs:268:23:268:23 | a | test.rs:268:13:268:19 | TupleStructPat |  |
-| test.rs:268:32:268:46 | "Expected some" | test.rs:268:30:268:48 | BlockExpr |  |
-| test.rs:269:9:269:9 | n | test.rs:267:39:270:5 | BlockExpr |  |
-| test.rs:273:1:278:1 | enter dead_code | test.rs:274:5:276:5 | ExprStmt |  |
-| test.rs:273:1:278:1 | exit dead_code (normal) | test.rs:273:1:278:1 | exit dead_code |  |
-| test.rs:274:5:276:5 | ExprStmt | test.rs:274:9:274:12 | true |  |
-| test.rs:274:9:274:12 | true | test.rs:275:9:275:17 | ExprStmt | true |
-| test.rs:275:9:275:16 | ReturnExpr | test.rs:273:1:278:1 | exit dead_code (normal) | return |
-| test.rs:275:9:275:17 | ExprStmt | test.rs:275:16:275:16 | 0 |  |
-| test.rs:275:16:275:16 | 0 | test.rs:275:9:275:16 | ReturnExpr |  |
-| test.rs:280:1:293:1 | enter labelled_block1 | test.rs:281:5:292:6 | LetStmt |  |
-| test.rs:280:1:293:1 | exit labelled_block1 (normal) | test.rs:280:1:293:1 | exit labelled_block1 |  |
-| test.rs:280:29:293:1 | BlockExpr | test.rs:280:1:293:1 | exit labelled_block1 (normal) |  |
-| test.rs:281:5:292:6 | LetStmt | test.rs:282:9:282:19 | ExprStmt |  |
-| test.rs:281:9:281:14 | result | test.rs:280:29:293:1 | BlockExpr | match |
-| test.rs:281:18:292:5 | BlockExpr | test.rs:281:9:281:14 | result |  |
-| test.rs:282:9:282:16 | PathExpr | test.rs:282:9:282:18 | CallExpr |  |
-| test.rs:282:9:282:18 | CallExpr | test.rs:283:9:285:9 | ExprStmt |  |
-| test.rs:282:9:282:19 | ExprStmt | test.rs:282:9:282:16 | PathExpr |  |
-| test.rs:283:9:285:9 | ExprStmt | test.rs:283:12:283:28 | PathExpr |  |
-| test.rs:283:9:285:9 | IfExpr | test.rs:286:9:286:24 | ExprStmt |  |
-| test.rs:283:12:283:28 | PathExpr | test.rs:283:12:283:30 | CallExpr |  |
-| test.rs:283:12:283:30 | CallExpr | test.rs:283:9:285:9 | IfExpr | false |
-| test.rs:283:12:283:30 | CallExpr | test.rs:284:13:284:27 | ExprStmt | true |
-| test.rs:284:13:284:26 | BreakExpr | test.rs:281:18:292:5 | BlockExpr | break |
-| test.rs:284:13:284:27 | ExprStmt | test.rs:284:26:284:26 | 1 |  |
-| test.rs:284:26:284:26 | 1 | test.rs:284:13:284:26 | BreakExpr |  |
-| test.rs:286:9:286:21 | PathExpr | test.rs:286:9:286:23 | CallExpr |  |
-| test.rs:286:9:286:23 | CallExpr | test.rs:287:9:289:9 | ExprStmt |  |
-| test.rs:286:9:286:24 | ExprStmt | test.rs:286:9:286:21 | PathExpr |  |
-| test.rs:287:9:289:9 | ExprStmt | test.rs:287:12:287:28 | PathExpr |  |
-| test.rs:287:9:289:9 | IfExpr | test.rs:290:9:290:24 | ExprStmt |  |
-| test.rs:287:12:287:28 | PathExpr | test.rs:287:12:287:30 | CallExpr |  |
-| test.rs:287:12:287:30 | CallExpr | test.rs:287:9:289:9 | IfExpr | false |
-| test.rs:287:12:287:30 | CallExpr | test.rs:288:13:288:27 | ExprStmt | true |
-| test.rs:288:13:288:26 | BreakExpr | test.rs:281:18:292:5 | BlockExpr | break |
-| test.rs:288:13:288:27 | ExprStmt | test.rs:288:26:288:26 | 2 |  |
-| test.rs:288:26:288:26 | 2 | test.rs:288:13:288:26 | BreakExpr |  |
-| test.rs:290:9:290:21 | PathExpr | test.rs:290:9:290:23 | CallExpr |  |
-| test.rs:290:9:290:23 | CallExpr | test.rs:291:9:291:9 | 3 |  |
-| test.rs:290:9:290:24 | ExprStmt | test.rs:290:9:290:21 | PathExpr |  |
-| test.rs:291:9:291:9 | 3 | test.rs:281:18:292:5 | BlockExpr |  |
-| test.rs:295:1:303:1 | enter labelled_block2 | test.rs:296:5:302:6 | LetStmt |  |
-| test.rs:295:1:303:1 | exit labelled_block2 (normal) | test.rs:295:1:303:1 | exit labelled_block2 |  |
-| test.rs:295:29:303:1 | BlockExpr | test.rs:295:1:303:1 | exit labelled_block2 (normal) |  |
-| test.rs:296:5:302:6 | LetStmt | test.rs:297:9:297:34 | LetStmt |  |
-| test.rs:296:9:296:14 | result | test.rs:295:29:303:1 | BlockExpr | match |
-| test.rs:296:18:302:5 | BlockExpr | test.rs:296:9:296:14 | result |  |
-| test.rs:297:9:297:34 | LetStmt | test.rs:297:30:297:33 | PathExpr |  |
-| test.rs:297:13:297:13 | x | test.rs:298:9:300:10 | LetStmt | match |
-| test.rs:297:30:297:33 | PathExpr | test.rs:297:13:297:13 | x |  |
-| test.rs:298:9:300:10 | LetStmt | test.rs:298:23:298:23 | x |  |
-| test.rs:298:13:298:19 | TupleStructPat | test.rs:298:18:298:18 | y | match |
-| test.rs:298:13:298:19 | TupleStructPat | test.rs:299:13:299:27 | ExprStmt | no-match |
-| test.rs:298:18:298:18 | y | test.rs:301:9:301:9 | x | match |
-| test.rs:298:23:298:23 | x | test.rs:298:13:298:19 | TupleStructPat |  |
-| test.rs:299:13:299:26 | BreakExpr | test.rs:296:18:302:5 | BlockExpr | break |
-| test.rs:299:13:299:27 | ExprStmt | test.rs:299:26:299:26 | 1 |  |
-| test.rs:299:26:299:26 | 1 | test.rs:299:13:299:26 | BreakExpr |  |
-| test.rs:301:9:301:9 | x | test.rs:296:18:302:5 | BlockExpr |  |
-| test.rs:305:1:311:1 | enter test_nested_function | test.rs:306:5:306:18 | LetStmt |  |
-| test.rs:305:1:311:1 | exit test_nested_function (normal) | test.rs:305:1:311:1 | exit test_nested_function |  |
-| test.rs:305:27:311:1 | BlockExpr | test.rs:305:1:311:1 | exit test_nested_function (normal) |  |
-| test.rs:306:5:306:18 | LetStmt | test.rs:306:17:306:17 | 0 |  |
-| test.rs:306:9:306:13 | x | test.rs:307:5:309:5 | nested | match |
-| test.rs:306:17:306:17 | 0 | test.rs:306:9:306:13 | x |  |
-| test.rs:307:5:309:5 | enter nested | test.rs:307:15:307:15 | x |  |
-| test.rs:307:5:309:5 | exit nested (normal) | test.rs:307:5:309:5 | exit nested |  |
-| test.rs:307:5:309:5 | nested | test.rs:310:5:310:19 | ExprStmt |  |
-| test.rs:307:15:307:15 | x | test.rs:307:15:307:26 | Param | match |
-| test.rs:307:15:307:26 | Param | test.rs:308:9:308:16 | ExprStmt |  |
-| test.rs:307:29:309:5 | BlockExpr | test.rs:307:5:309:5 | exit nested (normal) |  |
-| test.rs:308:9:308:10 | * ... | test.rs:308:15:308:15 | 1 |  |
-| test.rs:308:9:308:15 | ... += ... | test.rs:307:29:309:5 | BlockExpr |  |
-| test.rs:308:9:308:16 | ExprStmt | test.rs:308:10:308:10 | x |  |
-| test.rs:308:10:308:10 | x | test.rs:308:9:308:10 | * ... |  |
-| test.rs:308:15:308:15 | 1 | test.rs:308:9:308:15 | ... += ... |  |
-| test.rs:310:5:310:10 | PathExpr | test.rs:310:17:310:17 | x |  |
-| test.rs:310:5:310:18 | CallExpr | test.rs:305:27:311:1 | BlockExpr |  |
-| test.rs:310:5:310:19 | ExprStmt | test.rs:310:5:310:10 | PathExpr |  |
-| test.rs:310:12:310:17 | RefExpr | test.rs:310:5:310:18 | CallExpr |  |
-| test.rs:310:17:310:17 | x | test.rs:310:12:310:17 | RefExpr |  |
+| test.rs:253:5:255:5 | enter test_question_mark_operator_1 | test.rs:253:38:253:38 | s |  |
+| test.rs:253:38:253:38 | s | test.rs:253:38:253:44 | Param | match |
+| test.rs:257:5:262:5 | enter test_question_mark_operator_2 | test.rs:257:38:257:38 | b |  |
+| test.rs:257:38:257:38 | b | test.rs:257:38:257:52 | Param | match |
+| test.rs:267:5:273:5 | enter test_match | test.rs:267:19:267:29 | maybe_digit |  |
+| test.rs:267:5:273:5 | exit test_match (normal) | test.rs:267:5:273:5 | exit test_match |  |
+| test.rs:267:19:267:29 | maybe_digit | test.rs:267:19:267:42 | Param | match |
+| test.rs:267:19:267:42 | Param | test.rs:268:15:268:25 | maybe_digit |  |
+| test.rs:267:52:273:5 | BlockExpr | test.rs:267:5:273:5 | exit test_match (normal) |  |
+| test.rs:268:9:272:9 | MatchExpr | test.rs:267:52:273:5 | BlockExpr |  |
+| test.rs:268:15:268:25 | maybe_digit | test.rs:269:13:269:27 | TupleStructPat |  |
+| test.rs:269:13:269:27 | TupleStructPat | test.rs:269:26:269:26 | x | match |
+| test.rs:269:13:269:27 | TupleStructPat | test.rs:270:13:270:27 | TupleStructPat | no-match |
+| test.rs:269:26:269:26 | x | test.rs:269:32:269:32 | x | match |
+| test.rs:269:32:269:32 | x | test.rs:269:36:269:37 | 10 |  |
+| test.rs:269:32:269:37 | ... < ... | test.rs:269:42:269:42 | x | true |
+| test.rs:269:32:269:37 | ... < ... | test.rs:270:13:270:27 | TupleStructPat | false |
+| test.rs:269:36:269:37 | 10 | test.rs:269:32:269:37 | ... < ... |  |
+| test.rs:269:42:269:42 | x | test.rs:269:46:269:46 | 5 |  |
+| test.rs:269:42:269:46 | ... + ... | test.rs:268:9:272:9 | MatchExpr |  |
+| test.rs:269:46:269:46 | 5 | test.rs:269:42:269:46 | ... + ... |  |
+| test.rs:270:13:270:27 | TupleStructPat | test.rs:270:26:270:26 | x | match |
+| test.rs:270:13:270:27 | TupleStructPat | test.rs:271:13:271:24 | PathPat | no-match |
+| test.rs:270:26:270:26 | x | test.rs:270:32:270:32 | x | match |
+| test.rs:270:32:270:32 | x | test.rs:268:9:272:9 | MatchExpr |  |
+| test.rs:271:13:271:24 | PathPat | test.rs:271:29:271:29 | 5 | match |
+| test.rs:271:29:271:29 | 5 | test.rs:268:9:272:9 | MatchExpr |  |
+| test.rs:275:5:284:5 | enter test_match_with_return_in_scrutinee | test.rs:275:44:275:54 | maybe_digit |  |
+| test.rs:275:5:284:5 | exit test_match_with_return_in_scrutinee (normal) | test.rs:275:5:284:5 | exit test_match_with_return_in_scrutinee |  |
+| test.rs:275:44:275:54 | maybe_digit | test.rs:275:44:275:67 | Param | match |
+| test.rs:275:44:275:67 | Param | test.rs:276:19:276:29 | maybe_digit |  |
+| test.rs:275:77:284:5 | BlockExpr | test.rs:275:5:284:5 | exit test_match_with_return_in_scrutinee (normal) |  |
+| test.rs:276:9:283:9 | MatchExpr | test.rs:275:77:284:5 | BlockExpr |  |
+| test.rs:276:16:280:9 | IfExpr | test.rs:281:13:281:27 | TupleStructPat |  |
+| test.rs:276:19:276:29 | maybe_digit | test.rs:276:34:276:37 | PathExpr |  |
+| test.rs:276:19:276:40 | ... == ... | test.rs:277:13:277:21 | ExprStmt | true |
+| test.rs:276:19:276:40 | ... == ... | test.rs:279:13:279:23 | maybe_digit | false |
+| test.rs:276:34:276:37 | PathExpr | test.rs:276:39:276:39 | 3 |  |
+| test.rs:276:34:276:40 | CallExpr | test.rs:276:19:276:40 | ... == ... |  |
+| test.rs:276:39:276:39 | 3 | test.rs:276:34:276:40 | CallExpr |  |
+| test.rs:277:13:277:20 | ReturnExpr | test.rs:275:5:284:5 | exit test_match_with_return_in_scrutinee (normal) | return |
+| test.rs:277:13:277:20 | ReturnExpr | test.rs:281:13:281:27 | TupleStructPat | return |
+| test.rs:277:13:277:21 | ExprStmt | test.rs:277:20:277:20 | 3 |  |
+| test.rs:277:20:277:20 | 3 | test.rs:277:13:277:20 | ReturnExpr |  |
+| test.rs:278:16:280:9 | BlockExpr | test.rs:276:16:280:9 | IfExpr |  |
+| test.rs:279:13:279:23 | maybe_digit | test.rs:278:16:280:9 | BlockExpr |  |
+| test.rs:281:13:281:27 | TupleStructPat | test.rs:281:26:281:26 | x | match |
+| test.rs:281:13:281:27 | TupleStructPat | test.rs:282:13:282:24 | PathPat | no-match |
+| test.rs:281:26:281:26 | x | test.rs:281:32:281:32 | x | match |
+| test.rs:281:32:281:32 | x | test.rs:281:36:281:36 | 5 |  |
+| test.rs:281:32:281:36 | ... + ... | test.rs:276:9:283:9 | MatchExpr |  |
+| test.rs:281:36:281:36 | 5 | test.rs:281:32:281:36 | ... + ... |  |
+| test.rs:282:13:282:24 | PathPat | test.rs:282:29:282:29 | 5 | match |
+| test.rs:282:29:282:29 | 5 | test.rs:276:9:283:9 | MatchExpr |  |
+| test.rs:288:5:293:5 | enter test_infinite_loop | test.rs:289:9:291:9 | ExprStmt |  |
+| test.rs:289:9:291:9 | ExprStmt | test.rs:290:13:290:13 | 1 |  |
+| test.rs:289:14:291:9 | BlockExpr | test.rs:290:13:290:13 | 1 |  |
+| test.rs:290:13:290:13 | 1 | test.rs:289:14:291:9 | BlockExpr |  |
+| test.rs:295:5:298:5 | enter test_let_match | test.rs:295:23:295:23 | a |  |
+| test.rs:295:5:298:5 | exit test_let_match (normal) | test.rs:295:5:298:5 | exit test_let_match |  |
+| test.rs:295:23:295:23 | a | test.rs:295:23:295:36 | Param | match |
+| test.rs:295:23:295:36 | Param | test.rs:296:9:296:49 | LetStmt |  |
+| test.rs:295:39:298:5 | BlockExpr | test.rs:295:5:298:5 | exit test_let_match (normal) |  |
+| test.rs:296:9:296:49 | LetStmt | test.rs:296:23:296:23 | a |  |
+| test.rs:296:13:296:19 | TupleStructPat | test.rs:296:18:296:18 | n | match |
+| test.rs:296:13:296:19 | TupleStructPat | test.rs:296:32:296:46 | "Expected some" | no-match |
+| test.rs:296:18:296:18 | n | test.rs:297:9:297:9 | n | match |
+| test.rs:296:23:296:23 | a | test.rs:296:13:296:19 | TupleStructPat |  |
+| test.rs:296:32:296:46 | "Expected some" | test.rs:296:30:296:48 | BlockExpr |  |
+| test.rs:297:9:297:9 | n | test.rs:295:39:298:5 | BlockExpr |  |
+| test.rs:301:1:306:1 | enter dead_code | test.rs:302:5:304:5 | ExprStmt |  |
+| test.rs:301:1:306:1 | exit dead_code (normal) | test.rs:301:1:306:1 | exit dead_code |  |
+| test.rs:302:5:304:5 | ExprStmt | test.rs:302:9:302:12 | true |  |
+| test.rs:302:9:302:12 | true | test.rs:303:9:303:17 | ExprStmt | true |
+| test.rs:303:9:303:16 | ReturnExpr | test.rs:301:1:306:1 | exit dead_code (normal) | return |
+| test.rs:303:9:303:17 | ExprStmt | test.rs:303:16:303:16 | 0 |  |
+| test.rs:303:16:303:16 | 0 | test.rs:303:9:303:16 | ReturnExpr |  |
+| test.rs:308:1:321:1 | enter labelled_block1 | test.rs:309:5:320:6 | LetStmt |  |
+| test.rs:308:1:321:1 | exit labelled_block1 (normal) | test.rs:308:1:321:1 | exit labelled_block1 |  |
+| test.rs:308:29:321:1 | BlockExpr | test.rs:308:1:321:1 | exit labelled_block1 (normal) |  |
+| test.rs:309:5:320:6 | LetStmt | test.rs:310:9:310:19 | ExprStmt |  |
+| test.rs:309:9:309:14 | result | test.rs:308:29:321:1 | BlockExpr | match |
+| test.rs:309:18:320:5 | BlockExpr | test.rs:309:9:309:14 | result |  |
+| test.rs:310:9:310:16 | PathExpr | test.rs:310:9:310:18 | CallExpr |  |
+| test.rs:310:9:310:18 | CallExpr | test.rs:311:9:313:9 | ExprStmt |  |
+| test.rs:310:9:310:19 | ExprStmt | test.rs:310:9:310:16 | PathExpr |  |
+| test.rs:311:9:313:9 | ExprStmt | test.rs:311:12:311:28 | PathExpr |  |
+| test.rs:311:9:313:9 | IfExpr | test.rs:314:9:314:24 | ExprStmt |  |
+| test.rs:311:12:311:28 | PathExpr | test.rs:311:12:311:30 | CallExpr |  |
+| test.rs:311:12:311:30 | CallExpr | test.rs:311:9:313:9 | IfExpr | false |
+| test.rs:311:12:311:30 | CallExpr | test.rs:312:13:312:27 | ExprStmt | true |
+| test.rs:312:13:312:26 | BreakExpr | test.rs:309:18:320:5 | BlockExpr | break |
+| test.rs:312:13:312:27 | ExprStmt | test.rs:312:26:312:26 | 1 |  |
+| test.rs:312:26:312:26 | 1 | test.rs:312:13:312:26 | BreakExpr |  |
+| test.rs:314:9:314:21 | PathExpr | test.rs:314:9:314:23 | CallExpr |  |
+| test.rs:314:9:314:23 | CallExpr | test.rs:315:9:317:9 | ExprStmt |  |
+| test.rs:314:9:314:24 | ExprStmt | test.rs:314:9:314:21 | PathExpr |  |
+| test.rs:315:9:317:9 | ExprStmt | test.rs:315:12:315:28 | PathExpr |  |
+| test.rs:315:9:317:9 | IfExpr | test.rs:318:9:318:24 | ExprStmt |  |
+| test.rs:315:12:315:28 | PathExpr | test.rs:315:12:315:30 | CallExpr |  |
+| test.rs:315:12:315:30 | CallExpr | test.rs:315:9:317:9 | IfExpr | false |
+| test.rs:315:12:315:30 | CallExpr | test.rs:316:13:316:27 | ExprStmt | true |
+| test.rs:316:13:316:26 | BreakExpr | test.rs:309:18:320:5 | BlockExpr | break |
+| test.rs:316:13:316:27 | ExprStmt | test.rs:316:26:316:26 | 2 |  |
+| test.rs:316:26:316:26 | 2 | test.rs:316:13:316:26 | BreakExpr |  |
+| test.rs:318:9:318:21 | PathExpr | test.rs:318:9:318:23 | CallExpr |  |
+| test.rs:318:9:318:23 | CallExpr | test.rs:319:9:319:9 | 3 |  |
+| test.rs:318:9:318:24 | ExprStmt | test.rs:318:9:318:21 | PathExpr |  |
+| test.rs:319:9:319:9 | 3 | test.rs:309:18:320:5 | BlockExpr |  |
+| test.rs:323:1:331:1 | enter labelled_block2 | test.rs:324:5:330:6 | LetStmt |  |
+| test.rs:323:1:331:1 | exit labelled_block2 (normal) | test.rs:323:1:331:1 | exit labelled_block2 |  |
+| test.rs:323:29:331:1 | BlockExpr | test.rs:323:1:331:1 | exit labelled_block2 (normal) |  |
+| test.rs:324:5:330:6 | LetStmt | test.rs:325:9:325:34 | LetStmt |  |
+| test.rs:324:9:324:14 | result | test.rs:323:29:331:1 | BlockExpr | match |
+| test.rs:324:18:330:5 | BlockExpr | test.rs:324:9:324:14 | result |  |
+| test.rs:325:9:325:34 | LetStmt | test.rs:325:30:325:33 | PathExpr |  |
+| test.rs:325:13:325:13 | x | test.rs:326:9:328:10 | LetStmt | match |
+| test.rs:325:30:325:33 | PathExpr | test.rs:325:13:325:13 | x |  |
+| test.rs:326:9:328:10 | LetStmt | test.rs:326:23:326:23 | x |  |
+| test.rs:326:13:326:19 | TupleStructPat | test.rs:326:18:326:18 | y | match |
+| test.rs:326:13:326:19 | TupleStructPat | test.rs:327:13:327:27 | ExprStmt | no-match |
+| test.rs:326:18:326:18 | y | test.rs:329:9:329:9 | x | match |
+| test.rs:326:23:326:23 | x | test.rs:326:13:326:19 | TupleStructPat |  |
+| test.rs:327:13:327:26 | BreakExpr | test.rs:324:18:330:5 | BlockExpr | break |
+| test.rs:327:13:327:27 | ExprStmt | test.rs:327:26:327:26 | 1 |  |
+| test.rs:327:26:327:26 | 1 | test.rs:327:13:327:26 | BreakExpr |  |
+| test.rs:329:9:329:9 | x | test.rs:324:18:330:5 | BlockExpr |  |
+| test.rs:333:1:339:1 | enter test_nested_function | test.rs:334:5:334:18 | LetStmt |  |
+| test.rs:333:1:339:1 | exit test_nested_function (normal) | test.rs:333:1:339:1 | exit test_nested_function |  |
+| test.rs:333:27:339:1 | BlockExpr | test.rs:333:1:339:1 | exit test_nested_function (normal) |  |
+| test.rs:334:5:334:18 | LetStmt | test.rs:334:17:334:17 | 0 |  |
+| test.rs:334:9:334:13 | x | test.rs:335:5:337:5 | nested | match |
+| test.rs:334:17:334:17 | 0 | test.rs:334:9:334:13 | x |  |
+| test.rs:335:5:337:5 | enter nested | test.rs:335:15:335:15 | x |  |
+| test.rs:335:5:337:5 | exit nested (normal) | test.rs:335:5:337:5 | exit nested |  |
+| test.rs:335:5:337:5 | nested | test.rs:338:5:338:19 | ExprStmt |  |
+| test.rs:335:15:335:15 | x | test.rs:335:15:335:25 | Param | match |
+| test.rs:335:15:335:25 | Param | test.rs:336:9:336:16 | ExprStmt |  |
+| test.rs:335:28:337:5 | BlockExpr | test.rs:335:5:337:5 | exit nested (normal) |  |
+| test.rs:336:9:336:10 | * ... | test.rs:336:15:336:15 | 1 |  |
+| test.rs:336:9:336:15 | ... += ... | test.rs:335:28:337:5 | BlockExpr |  |
+| test.rs:336:9:336:16 | ExprStmt | test.rs:336:10:336:10 | x |  |
+| test.rs:336:10:336:10 | x | test.rs:336:9:336:10 | * ... |  |
+| test.rs:336:15:336:15 | 1 | test.rs:336:9:336:15 | ... += ... |  |
+| test.rs:338:5:338:10 | PathExpr | test.rs:338:17:338:17 | x |  |
+| test.rs:338:5:338:18 | CallExpr | test.rs:333:27:339:1 | BlockExpr |  |
+| test.rs:338:5:338:19 | ExprStmt | test.rs:338:5:338:10 | PathExpr |  |
+| test.rs:338:12:338:17 | RefExpr | test.rs:338:5:338:18 | CallExpr |  |
+| test.rs:338:17:338:17 | x | test.rs:338:12:338:17 | RefExpr |  |
 breakTarget
 | test.rs:16:17:16:21 | BreakExpr | test.rs:10:9:22:9 | LoopExpr |
 | test.rs:30:21:30:25 | BreakExpr | test.rs:28:13:35:13 | LoopExpr |
@@ -683,9 +714,9 @@ breakTarget
 | test.rs:170:17:170:28 | BreakExpr | test.rs:168:13:173:9 | LoopExpr |
 | test.rs:183:17:183:35 | BreakExpr | test.rs:181:13:186:9 | LoopExpr |
 | test.rs:195:13:195:30 | BreakExpr | test.rs:194:13:196:9 | BlockExpr |
-| test.rs:284:13:284:26 | BreakExpr | test.rs:281:18:292:5 | BlockExpr |
-| test.rs:288:13:288:26 | BreakExpr | test.rs:281:18:292:5 | BlockExpr |
-| test.rs:299:13:299:26 | BreakExpr | test.rs:296:18:302:5 | BlockExpr |
+| test.rs:312:13:312:26 | BreakExpr | test.rs:309:18:320:5 | BlockExpr |
+| test.rs:316:13:316:26 | BreakExpr | test.rs:309:18:320:5 | BlockExpr |
+| test.rs:327:13:327:26 | BreakExpr | test.rs:324:18:330:5 | BlockExpr |
 continueTarget
 | test.rs:19:17:19:24 | ContinueExpr | test.rs:10:9:22:9 | LoopExpr |
 | test.rs:45:21:45:28 | ContinueExpr | test.rs:43:13:50:13 | LoopExpr |
diff --git a/rust/ql/test/library-tests/controlflow/test.rs b/rust/ql/test/library-tests/controlflow/test.rs
index 74a8589181c3..674c697f7154 100644
--- a/rust/ql/test/library-tests/controlflow/test.rs
+++ b/rust/ql/test/library-tests/controlflow/test.rs
@@ -248,11 +248,39 @@ mod logical_operators {
     }
 }
 
-fn test_match(maybe_digit: Option<i64>) -> i64 {
-    match maybe_digit {
-        Option::Some(x) if x < 10 => x + 5,
-        Option::Some(x) => x,
-        Option::None => 5,
+mod question_mark_operator {
+
+    fn test_question_mark_operator_1(s: &str) -> Option<i32> {
+        str.parse::<u32>()? + 4
+    }
+
+    fn test_question_mark_operator_2(b: Option<bool>) -> Option<bool> {
+        match b? {
+            true => Some(false),
+            false => Some(true),
+        }
+    }
+}
+
+mod match_expression {
+
+    fn test_match(maybe_digit: Option<i64>) -> i64 {
+        match maybe_digit {
+            Option::Some(x) if x < 10 => x + 5,
+            Option::Some(x) => x,
+            Option::None => 5,
+        }
+    }
+
+    fn test_match_with_return_in_scrutinee(maybe_digit: Option<i64>) -> i64 {
+        match (if maybe_digit == Some(3) {
+            return 3;
+        } else {
+            maybe_digit
+        }) {
+            Option::Some(x) => x + 5,
+            Option::None => 5,
+        }
     }
 }
 
@@ -304,8 +332,8 @@ fn labelled_block2() -> i64 {
 
 fn test_nested_function() {
     let mut x = 0;
-    fn nested(x : &mut i64) {
+    fn nested(x: &mut i64) {
         *x += 1;
     }
     nested(&mut x);
-}
\ No newline at end of file
+}

From 2f07f1c730f32defe5f8f7e0f314da1702c6ad17 Mon Sep 17 00:00:00 2001
From: Simon Friis Vindum <simonfv@gmail.com>
Date: Mon, 14 Oct 2024 11:32:22 +0200
Subject: [PATCH 325/347] Rust: Abnormal completion in scrutinee does not
 continue to match arms

---
 .../codeql/rust/controlflow/internal/ControlFlowGraphImpl.qll  | 3 ++-
 rust/ql/test/library-tests/controlflow/Cfg.expected            | 1 -
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/rust/ql/lib/codeql/rust/controlflow/internal/ControlFlowGraphImpl.qll b/rust/ql/lib/codeql/rust/controlflow/internal/ControlFlowGraphImpl.qll
index 795ae50d363d..a430d074ec25 100644
--- a/rust/ql/lib/codeql/rust/controlflow/internal/ControlFlowGraphImpl.qll
+++ b/rust/ql/lib/codeql/rust/controlflow/internal/ControlFlowGraphImpl.qll
@@ -504,7 +504,8 @@ class MatchExprTree extends PostOrderTree instanceof MatchExpr {
   override predicate succ(AstNode pred, AstNode succ, Completion c) {
     // Edge from the scrutinee to the first arm.
     last(super.getExpr(), pred, c) and
-    first(super.getArm(0).getPat(), succ)
+    first(super.getArm(0).getPat(), succ) and
+    completionIsNormal(c)
     or
     // Edge from a failed match/guard in one arm to the beginning of the next arm.
     exists(int i |
diff --git a/rust/ql/test/library-tests/controlflow/Cfg.expected b/rust/ql/test/library-tests/controlflow/Cfg.expected
index 6b8a47953986..c260604236c9 100644
--- a/rust/ql/test/library-tests/controlflow/Cfg.expected
+++ b/rust/ql/test/library-tests/controlflow/Cfg.expected
@@ -595,7 +595,6 @@ edges
 | test.rs:276:34:276:40 | CallExpr | test.rs:276:19:276:40 | ... == ... |  |
 | test.rs:276:39:276:39 | 3 | test.rs:276:34:276:40 | CallExpr |  |
 | test.rs:277:13:277:20 | ReturnExpr | test.rs:275:5:284:5 | exit test_match_with_return_in_scrutinee (normal) | return |
-| test.rs:277:13:277:20 | ReturnExpr | test.rs:281:13:281:27 | TupleStructPat | return |
 | test.rs:277:13:277:21 | ExprStmt | test.rs:277:20:277:20 | 3 |  |
 | test.rs:277:20:277:20 | 3 | test.rs:277:13:277:20 | ReturnExpr |  |
 | test.rs:278:16:280:9 | BlockExpr | test.rs:276:16:280:9 | IfExpr |  |

From 8e4e663739a13e3a08230c1bd5139ecfb9637e6f Mon Sep 17 00:00:00 2001
From: Simon Friis Vindum <simonfv@gmail.com>
Date: Mon, 14 Oct 2024 11:38:35 +0200
Subject: [PATCH 326/347] Rust: Handle question mark operator in CFG

---
 .../rust/controlflow/internal/Completion.qll  | 12 +++++++--
 .../internal/ControlFlowGraphImpl.qll         |  4 +++
 .../library-tests/controlflow/Cfg.expected    | 25 +++++++++++++++++++
 3 files changed, 39 insertions(+), 2 deletions(-)

diff --git a/rust/ql/lib/codeql/rust/controlflow/internal/Completion.qll b/rust/ql/lib/codeql/rust/controlflow/internal/Completion.qll
index 256b058f823e..487426e53325 100644
--- a/rust/ql/lib/codeql/rust/controlflow/internal/Completion.qll
+++ b/rust/ql/lib/codeql/rust/controlflow/internal/Completion.qll
@@ -36,7 +36,13 @@ class SimpleCompletion extends NormalCompletion, TSimpleCompletion {
 
   // `SimpleCompletion` is the "default" completion type, thus it is valid for
   // any node where there isn't another more specific completion type.
-  override predicate isValidFor(AstNode e) { not any(Completion c).isValidForSpecific(e) }
+  override predicate isValidFor(AstNode e) {
+    not any(Completion c).isValidForSpecific(e)
+    or
+    // A `?` expression can both proceed normally or cause an early return, so
+    // we explicitly allow the former here.
+    e instanceof TryExpr
+  }
 
   override string toString() { result = "simple" }
 }
@@ -204,7 +210,9 @@ class ContinueCompletion extends TContinueCompletion, Completion {
 class ReturnCompletion extends TReturnCompletion, Completion {
   override ReturnSuccessor getAMatchingSuccessorType() { any() }
 
-  override predicate isValidForSpecific(AstNode e) { e instanceof ReturnExpr }
+  override predicate isValidForSpecific(AstNode e) {
+    e instanceof ReturnExpr or e instanceof TryExpr
+  }
 
   override string toString() { result = "return" }
 }
diff --git a/rust/ql/lib/codeql/rust/controlflow/internal/ControlFlowGraphImpl.qll b/rust/ql/lib/codeql/rust/controlflow/internal/ControlFlowGraphImpl.qll
index a430d074ec25..678c2203ec2f 100644
--- a/rust/ql/lib/codeql/rust/controlflow/internal/ControlFlowGraphImpl.qll
+++ b/rust/ql/lib/codeql/rust/controlflow/internal/ControlFlowGraphImpl.qll
@@ -586,6 +586,10 @@ class ReturnExprTree extends PostOrderTree instanceof ReturnExpr {
   }
 }
 
+class TryExprTree extends StandardPostOrderTree instanceof TryExpr {
+  override AstNode getChildNode(int i) { i = 0 and result = super.getExpr() }
+}
+
 class TupleExprTree extends StandardPostOrderTree instanceof TupleExpr {
   override AstNode getChildNode(int i) { result = super.getField(i) }
 }
diff --git a/rust/ql/test/library-tests/controlflow/Cfg.expected b/rust/ql/test/library-tests/controlflow/Cfg.expected
index c260604236c9..42f39dfec830 100644
--- a/rust/ql/test/library-tests/controlflow/Cfg.expected
+++ b/rust/ql/test/library-tests/controlflow/Cfg.expected
@@ -555,9 +555,34 @@ edges
 | test.rs:245:16:247:9 | BlockExpr | test.rs:243:9:247:9 | IfExpr |  |
 | test.rs:246:13:246:17 | false | test.rs:245:16:247:9 | BlockExpr |  |
 | test.rs:253:5:255:5 | enter test_question_mark_operator_1 | test.rs:253:38:253:38 | s |  |
+| test.rs:253:5:255:5 | exit test_question_mark_operator_1 (normal) | test.rs:253:5:255:5 | exit test_question_mark_operator_1 |  |
 | test.rs:253:38:253:38 | s | test.rs:253:38:253:44 | Param | match |
+| test.rs:253:38:253:44 | Param | test.rs:254:9:254:11 | PathExpr |  |
+| test.rs:253:62:255:5 | BlockExpr | test.rs:253:5:255:5 | exit test_question_mark_operator_1 (normal) |  |
+| test.rs:254:9:254:11 | PathExpr | test.rs:254:9:254:26 | MethodCallExpr |  |
+| test.rs:254:9:254:26 | MethodCallExpr | test.rs:254:9:254:27 | TryExpr |  |
+| test.rs:254:9:254:27 | TryExpr | test.rs:253:5:255:5 | exit test_question_mark_operator_1 (normal) | return |
+| test.rs:254:9:254:27 | TryExpr | test.rs:254:31:254:31 | 4 |  |
+| test.rs:254:9:254:31 | ... + ... | test.rs:253:62:255:5 | BlockExpr |  |
+| test.rs:254:31:254:31 | 4 | test.rs:254:9:254:31 | ... + ... |  |
 | test.rs:257:5:262:5 | enter test_question_mark_operator_2 | test.rs:257:38:257:38 | b |  |
+| test.rs:257:5:262:5 | exit test_question_mark_operator_2 (normal) | test.rs:257:5:262:5 | exit test_question_mark_operator_2 |  |
 | test.rs:257:38:257:38 | b | test.rs:257:38:257:52 | Param | match |
+| test.rs:257:38:257:52 | Param | test.rs:258:15:258:15 | b |  |
+| test.rs:257:71:262:5 | BlockExpr | test.rs:257:5:262:5 | exit test_question_mark_operator_2 (normal) |  |
+| test.rs:258:9:261:9 | MatchExpr | test.rs:257:71:262:5 | BlockExpr |  |
+| test.rs:258:15:258:15 | b | test.rs:258:15:258:16 | TryExpr |  |
+| test.rs:258:15:258:16 | TryExpr | test.rs:257:5:262:5 | exit test_question_mark_operator_2 (normal) | return |
+| test.rs:258:15:258:16 | TryExpr | test.rs:259:13:259:16 | LiteralPat |  |
+| test.rs:259:13:259:16 | LiteralPat | test.rs:259:21:259:24 | PathExpr | match |
+| test.rs:259:13:259:16 | LiteralPat | test.rs:260:13:260:17 | LiteralPat | no-match |
+| test.rs:259:21:259:24 | PathExpr | test.rs:259:26:259:30 | false |  |
+| test.rs:259:21:259:31 | CallExpr | test.rs:258:9:261:9 | MatchExpr |  |
+| test.rs:259:26:259:30 | false | test.rs:259:21:259:31 | CallExpr |  |
+| test.rs:260:13:260:17 | LiteralPat | test.rs:260:22:260:25 | PathExpr | match |
+| test.rs:260:22:260:25 | PathExpr | test.rs:260:27:260:30 | true |  |
+| test.rs:260:22:260:31 | CallExpr | test.rs:258:9:261:9 | MatchExpr |  |
+| test.rs:260:27:260:30 | true | test.rs:260:22:260:31 | CallExpr |  |
 | test.rs:267:5:273:5 | enter test_match | test.rs:267:19:267:29 | maybe_digit |  |
 | test.rs:267:5:273:5 | exit test_match (normal) | test.rs:267:5:273:5 | exit test_match |  |
 | test.rs:267:19:267:29 | maybe_digit | test.rs:267:19:267:42 | Param | match |

From e83f1d17bfc9e5a21df7e6bc856502cbe4a732b0 Mon Sep 17 00:00:00 2001
From: Simon Friis Vindum <simonfv@gmail.com>
Date: Mon, 14 Oct 2024 11:40:35 +0200
Subject: [PATCH 327/347] Rust: Simplify return implementation in CFG

---
 .../controlflow/internal/ControlFlowGraphImpl.qll  | 14 ++------------
 1 file changed, 2 insertions(+), 12 deletions(-)

diff --git a/rust/ql/lib/codeql/rust/controlflow/internal/ControlFlowGraphImpl.qll b/rust/ql/lib/codeql/rust/controlflow/internal/ControlFlowGraphImpl.qll
index 678c2203ec2f..f6587bf76554 100644
--- a/rust/ql/lib/codeql/rust/controlflow/internal/ControlFlowGraphImpl.qll
+++ b/rust/ql/lib/codeql/rust/controlflow/internal/ControlFlowGraphImpl.qll
@@ -572,18 +572,8 @@ class RefExprTree extends StandardPostOrderTree instanceof RefExpr {
   override AstNode getChildNode(int i) { i = 0 and result = super.getExpr() }
 }
 
-class ReturnExprTree extends PostOrderTree instanceof ReturnExpr {
-  override predicate propagatesAbnormal(AstNode child) { child = super.getExpr() }
-
-  override predicate first(AstNode node) {
-    first(super.getExpr(), node)
-    or
-    not super.hasExpr() and node = this
-  }
-
-  override predicate succ(AstNode pred, AstNode succ, Completion c) {
-    last(super.getExpr(), pred, c) and succ = this and completionIsNormal(c)
-  }
+class ReturnExprTree extends StandardPostOrderTree instanceof ReturnExpr {
+  override AstNode getChildNode(int i) { i = 0 and result = super.getExpr() }
 }
 
 class TryExprTree extends StandardPostOrderTree instanceof TryExpr {

From 3402a729d00ab642075ae6b720a2778f4503d6ba Mon Sep 17 00:00:00 2001
From: Rasmus Lerchedahl Petersen <yoff@github.com>
Date: Mon, 14 Oct 2024 12:36:56 +0200
Subject: [PATCH 328/347] Python: adjust test expectations for extractor test

---
 .../python-2-deprecation/query.without-python2.expected          | 1 -
 1 file changed, 1 deletion(-)

diff --git a/python/extractor/cli-integration-test/python-2-deprecation/query.without-python2.expected b/python/extractor/cli-integration-test/python-2-deprecation/query.without-python2.expected
index 3fa1f24a7853..d43fc3e2a7e6 100644
--- a/python/extractor/cli-integration-test/python-2-deprecation/query.without-python2.expected
+++ b/python/extractor/cli-integration-test/python-2-deprecation/query.without-python2.expected
@@ -1,4 +1,3 @@
 | name |
 +------+
-| stat |
 | test |

From 22261c1480ffaf454c6d68580b0ee9ffd6ad7017 Mon Sep 17 00:00:00 2001
From: Simon Friis Vindum <simonfv@gmail.com>
Date: Mon, 14 Oct 2024 13:43:57 +0200
Subject: [PATCH 329/347] Rust: Rename isIrrefutablePattern to
 isExhaustiveMatch

---
 .../rust/controlflow/internal/Completion.qll       | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/rust/ql/lib/codeql/rust/controlflow/internal/Completion.qll b/rust/ql/lib/codeql/rust/controlflow/internal/Completion.qll
index 487426e53325..faf3508379b8 100644
--- a/rust/ql/lib/codeql/rust/controlflow/internal/Completion.qll
+++ b/rust/ql/lib/codeql/rust/controlflow/internal/Completion.qll
@@ -123,9 +123,9 @@ class BooleanCompletion extends ConditionalCompletion, TBooleanCompletion {
   override string toString() { result = "boolean(" + value + ")" }
 }
 
-/** Holds if `pat` is guaranteed to match. */
+/** Holds if `pat` is guaranteed to match at the point in the AST where it occurs. */
 pragma[nomagic]
-private predicate isIrrefutablePattern(Pat pat) {
+private predicate isExhaustiveMatch(Pat pat) {
   (
     pat instanceof WildcardPat
     or
@@ -133,18 +133,18 @@ private predicate isIrrefutablePattern(Pat pat) {
     or
     pat instanceof RestPat
     or
-    // `let` statements without an `else` branch must be irrefutible
+    // `let` statements without an `else` branch must be exhaustive
     pat = any(LetStmt let | not let.hasLetElse()).getPat()
     or
-    // `match` expressions must be irrefutible, so last arm cannot fail
+    // `match` expressions must be exhaustive, so last arm cannot fail
     pat = any(MatchExpr me).getLastArm().getPat()
     or
-    // parameter patterns must be irrefutible
+    // parameter patterns must be exhaustive
     pat = any(Param p).getPat()
   ) and
   not pat = any(ForExpr for).getPat() // workaround until `for` loops are desugared
   or
-  exists(Pat parent | isIrrefutablePattern(parent) |
+  exists(Pat parent | isExhaustiveMatch(parent) |
     pat = parent.(BoxPat).getPat()
     or
     pat = parent.(IdentPat).getPat()
@@ -171,7 +171,7 @@ class MatchCompletion extends TMatchCompletion, ConditionalCompletion {
 
   override predicate isValidForSpecific(AstNode e) {
     e instanceof Pat and
-    if isIrrefutablePattern(e) then value = true else any()
+    if isExhaustiveMatch(e) then value = true else any()
   }
 
   override MatchSuccessor getAMatchingSuccessorType() { result.getValue() = value }

From 493a68a2328a027557dc97e6e7a7a2125476be40 Mon Sep 17 00:00:00 2001
From: Arthur Baars <aibaars@github.com>
Date: Sat, 12 Oct 2024 10:49:59 +0200
Subject: [PATCH 330/347] Rust: add MacroPat to isExhaustiveMatch

---
 rust/ql/lib/codeql/rust/controlflow/internal/Completion.qll | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/rust/ql/lib/codeql/rust/controlflow/internal/Completion.qll b/rust/ql/lib/codeql/rust/controlflow/internal/Completion.qll
index faf3508379b8..ca74a10fe4ba 100644
--- a/rust/ql/lib/codeql/rust/controlflow/internal/Completion.qll
+++ b/rust/ql/lib/codeql/rust/controlflow/internal/Completion.qll
@@ -139,6 +139,9 @@ private predicate isExhaustiveMatch(Pat pat) {
     // `match` expressions must be exhaustive, so last arm cannot fail
     pat = any(MatchExpr me).getLastArm().getPat()
     or
+    // macro patterns is exhaustive if its expansion is
+    pat = any(MacroPat mp | isExhaustiveMatch(mp.getMacroCall().getExpanded()))
+    or
     // parameter patterns must be exhaustive
     pat = any(Param p).getPat()
   ) and
@@ -149,6 +152,8 @@ private predicate isExhaustiveMatch(Pat pat) {
     or
     pat = parent.(IdentPat).getPat()
     or
+    pat = parent.(MacroPat).getMacroCall().getExpanded()
+    or
     pat = parent.(ParenPat).getPat()
     or
     pat = parent.(RecordPat).getRecordPatFieldList().getField(_).getPat()

From ae7afa7aff0f8cca10885faaccaea5648f2eaef0 Mon Sep 17 00:00:00 2001
From: Arthur Baars <aibaars@github.com>
Date: Mon, 14 Oct 2024 15:20:43 +0200
Subject: [PATCH 331/347] Update
 rust/ql/lib/codeql/rust/controlflow/internal/Completion.qll

Co-authored-by: Simon Friis Vindum <simonfv@gmail.com>
---
 rust/ql/lib/codeql/rust/controlflow/internal/Completion.qll | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rust/ql/lib/codeql/rust/controlflow/internal/Completion.qll b/rust/ql/lib/codeql/rust/controlflow/internal/Completion.qll
index ca74a10fe4ba..a72b904dcf1b 100644
--- a/rust/ql/lib/codeql/rust/controlflow/internal/Completion.qll
+++ b/rust/ql/lib/codeql/rust/controlflow/internal/Completion.qll
@@ -139,7 +139,7 @@ private predicate isExhaustiveMatch(Pat pat) {
     // `match` expressions must be exhaustive, so last arm cannot fail
     pat = any(MatchExpr me).getLastArm().getPat()
     or
-    // macro patterns is exhaustive if its expansion is
+    // macro invocations are exhaustive if their expansion is
     pat = any(MacroPat mp | isExhaustiveMatch(mp.getMacroCall().getExpanded()))
     or
     // parameter patterns must be exhaustive

From 9d8d7ab237bd3277261ca6f8666581952f233df4 Mon Sep 17 00:00:00 2001
From: yoff <yoff@github.com>
Date: Mon, 14 Oct 2024 14:14:40 +0000
Subject: [PATCH 332/347] python: update extractor expectations

---
 .../python-2-deprecation/query.only-python2.expected     | 5 -----
 .../query.python2-using-python3.expected                 | 9 ++++-----
 2 files changed, 4 insertions(+), 10 deletions(-)
 delete mode 100644 python/extractor/cli-integration-test/python-2-deprecation/query.only-python2.expected

diff --git a/python/extractor/cli-integration-test/python-2-deprecation/query.only-python2.expected b/python/extractor/cli-integration-test/python-2-deprecation/query.only-python2.expected
deleted file mode 100644
index 75bc50740598..000000000000
--- a/python/extractor/cli-integration-test/python-2-deprecation/query.only-python2.expected
+++ /dev/null
@@ -1,5 +0,0 @@
-|   name   |
-+----------+
-| dircache |
-| stat     |
-| test     |
diff --git a/python/extractor/cli-integration-test/python-2-deprecation/query.python2-using-python3.expected b/python/extractor/cli-integration-test/python-2-deprecation/query.python2-using-python3.expected
index 75bc50740598..3fa1f24a7853 100644
--- a/python/extractor/cli-integration-test/python-2-deprecation/query.python2-using-python3.expected
+++ b/python/extractor/cli-integration-test/python-2-deprecation/query.python2-using-python3.expected
@@ -1,5 +1,4 @@
-|   name   |
-+----------+
-| dircache |
-| stat     |
-| test     |
+| name |
++------+
+| stat |
+| test |

From da5e9ac18c8b6de8c292e47437159f5be7f26158 Mon Sep 17 00:00:00 2001
From: yoff <yoff@github.com>
Date: Mon, 14 Oct 2024 14:54:33 +0000
Subject: [PATCH 333/347] python: more adjustments...

---
 .../python-2-deprecation/query.python2-using-python3.expected    | 1 -
 1 file changed, 1 deletion(-)

diff --git a/python/extractor/cli-integration-test/python-2-deprecation/query.python2-using-python3.expected b/python/extractor/cli-integration-test/python-2-deprecation/query.python2-using-python3.expected
index 3fa1f24a7853..d43fc3e2a7e6 100644
--- a/python/extractor/cli-integration-test/python-2-deprecation/query.python2-using-python3.expected
+++ b/python/extractor/cli-integration-test/python-2-deprecation/query.python2-using-python3.expected
@@ -1,4 +1,3 @@
 | name |
 +------+
-| stat |
 | test |

From 134539060d16d4f86cc4edcb8a586c3be5f67275 Mon Sep 17 00:00:00 2001
From: Geoffrey White <40627776+geoffw0@users.noreply.github.com>
Date: Mon, 14 Oct 2024 12:38:30 +0100
Subject: [PATCH 334/347] Rust: correct some 'spurious' annotations that are
 off by one line.

---
 rust/ql/test/query-tests/unusedentities/unreachable.rs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/rust/ql/test/query-tests/unusedentities/unreachable.rs b/rust/ql/test/query-tests/unusedentities/unreachable.rs
index 8a8fbcf70bdb..05163d4a082b 100644
--- a/rust/ql/test/query-tests/unusedentities/unreachable.rs
+++ b/rust/ql/test/query-tests/unusedentities/unreachable.rs
@@ -97,16 +97,16 @@ fn unreachable_panic() {
 
 	if cond() {
 		do_something();
-		_ = false && panic!(); // does not panic due to short-circuiting
-		do_something(); // SPURIOUS: unreachable
+		_ = false && panic!(); // does not panic due to short-circuiting SPURIOUS: unreachable
+		do_something();
 		_ = false || panic!();
 		do_something(); // BAD: unreachable code [NOT DETECTED]
 	}
 
 	if cond() {
 		do_something();
-		_ = true || panic!(); // does not panic due to short-circuiting
-		do_something(); // SPURIOUS: unreachable
+		_ = true || panic!(); // does not panic due to short-circuiting SPURIOUS: unreachable
+		do_something();
 		_ = true && panic!();
 		do_something(); // BAD: unreachable code [NOT DETECTED]
 	}

From 528641c55a588fbe784ce287de0132f25dd55636 Mon Sep 17 00:00:00 2001
From: Geoffrey White <40627776+geoffw0@users.noreply.github.com>
Date: Mon, 14 Oct 2024 12:22:44 +0100
Subject: [PATCH 335/347] Rust: Test spacing.

---
 .../unusedentities/UnreachableCode.expected   |  18 +--
 .../unusedentities/UnusedVariable.expected    |  26 ++--
 .../test/query-tests/unusedentities/main.rs   | 122 ++++++++++++++++++
 .../query-tests/unusedentities/unreachable.rs |   6 +
 4 files changed, 150 insertions(+), 22 deletions(-)

diff --git a/rust/ql/test/query-tests/unusedentities/UnreachableCode.expected b/rust/ql/test/query-tests/unusedentities/UnreachableCode.expected
index 18831b723278..fa463c47fc35 100644
--- a/rust/ql/test/query-tests/unusedentities/UnreachableCode.expected
+++ b/rust/ql/test/query-tests/unusedentities/UnreachableCode.expected
@@ -3,12 +3,12 @@
 | unreachable.rs:32:3:32:17 | ExprStmt | This code is never reached. |
 | unreachable.rs:39:3:39:17 | ExprStmt | This code is never reached. |
 | unreachable.rs:60:2:60:16 | ExprStmt | This code is never reached. |
-| unreachable.rs:100:16:100:23 | ExprStmt | This code is never reached. |
-| unreachable.rs:108:15:108:22 | ExprStmt | This code is never reached. |
-| unreachable.rs:124:2:124:16 | ExprStmt | This code is never reached. |
-| unreachable.rs:134:2:134:16 | ExprStmt | This code is never reached. |
-| unreachable.rs:141:3:141:17 | ExprStmt | This code is never reached. |
-| unreachable.rs:150:4:150:18 | ExprStmt | This code is never reached. |
-| unreachable.rs:156:3:156:17 | ExprStmt | This code is never reached. |
-| unreachable.rs:162:4:162:18 | ExprStmt | This code is never reached. |
-| unreachable.rs:165:2:165:16 | ExprStmt | This code is never reached. |
+| unreachable.rs:106:16:106:23 | ExprStmt | This code is never reached. |
+| unreachable.rs:114:15:114:22 | ExprStmt | This code is never reached. |
+| unreachable.rs:130:2:130:16 | ExprStmt | This code is never reached. |
+| unreachable.rs:140:2:140:16 | ExprStmt | This code is never reached. |
+| unreachable.rs:147:3:147:17 | ExprStmt | This code is never reached. |
+| unreachable.rs:156:4:156:18 | ExprStmt | This code is never reached. |
+| unreachable.rs:162:3:162:17 | ExprStmt | This code is never reached. |
+| unreachable.rs:168:4:168:18 | ExprStmt | This code is never reached. |
+| unreachable.rs:171:2:171:16 | ExprStmt | This code is never reached. |
diff --git a/rust/ql/test/query-tests/unusedentities/UnusedVariable.expected b/rust/ql/test/query-tests/unusedentities/UnusedVariable.expected
index 8203501f3a23..ee87d297230b 100644
--- a/rust/ql/test/query-tests/unusedentities/UnusedVariable.expected
+++ b/rust/ql/test/query-tests/unusedentities/UnusedVariable.expected
@@ -1,16 +1,16 @@
 | main.rs:25:9:25:9 | a | Variable is not used. |
 | main.rs:90:13:90:13 | d | Variable is not used. |
 | main.rs:141:5:141:5 | y | Variable is not used. |
-| main.rs:164:9:164:9 | x | Variable is not used. |
-| main.rs:202:17:202:17 | a | Variable is not used. |
-| main.rs:210:20:210:22 | val | Variable is not used. |
-| main.rs:223:14:223:16 | val | Variable is not used. |
-| main.rs:240:22:240:24 | val | Variable is not used. |
-| main.rs:248:24:248:26 | val | Variable is not used. |
-| main.rs:257:13:257:15 | num | Variable is not used. |
-| main.rs:272:12:272:12 | j | Variable is not used. |
-| main.rs:294:25:294:25 | y | Variable is not used. |
-| main.rs:298:28:298:28 | a | Variable is not used. |
-| main.rs:302:9:302:9 | p | Variable is not used. |
-| main.rs:309:13:309:13 | y | Variable is not used. |
-| main.rs:317:21:317:21 | y | Variable is not used. |
+| main.rs:168:9:168:9 | x | Variable is not used. |
+| main.rs:250:17:250:17 | a | Variable is not used. |
+| main.rs:258:20:258:22 | val | Variable is not used. |
+| main.rs:271:14:271:16 | val | Variable is not used. |
+| main.rs:288:22:288:24 | val | Variable is not used. |
+| main.rs:296:24:296:26 | val | Variable is not used. |
+| main.rs:305:13:305:15 | num | Variable is not used. |
+| main.rs:320:12:320:12 | j | Variable is not used. |
+| main.rs:342:25:342:25 | y | Variable is not used. |
+| main.rs:346:28:346:28 | a | Variable is not used. |
+| main.rs:350:9:350:9 | p | Variable is not used. |
+| main.rs:378:13:378:13 | y | Variable is not used. |
+| main.rs:386:21:386:21 | y | Variable is not used. |
diff --git a/rust/ql/test/query-tests/unusedentities/main.rs b/rust/ql/test/query-tests/unusedentities/main.rs
index 9b4fdb0cdd19..a3bfa2caa7b8 100644
--- a/rust/ql/test/query-tests/unusedentities/main.rs
+++ b/rust/ql/test/query-tests/unusedentities/main.rs
@@ -146,6 +146,10 @@ fn parameters(
 
 // --- loops ---
 
+
+
+
+
 fn loops() {
     let mut a: i64 = 10;
     let b: i64 = 20;
@@ -171,10 +175,54 @@ fn loops() {
         println!("x is {}", x);
     }
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
     for x
     in 1..10 {
         assert!(x != 11);
     }
+
+
+
+
+
+
+
+
+
+
 }
 
 // --- lets ---
@@ -302,6 +350,27 @@ fn if_lets_matches() {
         p => { // BAD: unused variable
         }
     }
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 }
 
 fn shadowing() -> i32 {
@@ -322,7 +391,58 @@ fn shadowing() -> i32 {
     }
 }
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 // --- main ---
+
 fn main() {
     locals_1();
     locals_2();
@@ -334,6 +454,8 @@ fn main() {
     if_lets_matches();
     shadowing();
 
+
+
 	unreachable_if();
 	unreachable_panic();
 	unreachable_match();
diff --git a/rust/ql/test/query-tests/unusedentities/unreachable.rs b/rust/ql/test/query-tests/unusedentities/unreachable.rs
index 05163d4a082b..8ac1907faaa3 100644
--- a/rust/ql/test/query-tests/unusedentities/unreachable.rs
+++ b/rust/ql/test/query-tests/unusedentities/unreachable.rs
@@ -79,6 +79,12 @@ fn unreachable_panic() {
 		do_something(); // BAD: unreachable code [NOT DETECTED]
 	}
 
+
+
+
+
+
+
 	if cond() {
 		let mut maybe;
 

From e5885f65dba02e3fb76d86b4ae06e8fce9be9a87 Mon Sep 17 00:00:00 2001
From: Geoffrey White <40627776+geoffw0@users.noreply.github.com>
Date: Mon, 14 Oct 2024 14:10:23 +0100
Subject: [PATCH 336/347] Rust: Add more test cases for unused variables and
 unreachable code.

---
 .../unusedentities/UnusedVariable.expected    |   6 +
 .../test/query-tests/unusedentities/main.rs   | 186 +++++++++---------
 .../query-tests/unusedentities/unreachable.rs |  10 +-
 3 files changed, 104 insertions(+), 98 deletions(-)

diff --git a/rust/ql/test/query-tests/unusedentities/UnusedVariable.expected b/rust/ql/test/query-tests/unusedentities/UnusedVariable.expected
index ee87d297230b..2c570b315070 100644
--- a/rust/ql/test/query-tests/unusedentities/UnusedVariable.expected
+++ b/rust/ql/test/query-tests/unusedentities/UnusedVariable.expected
@@ -2,6 +2,8 @@
 | main.rs:90:13:90:13 | d | Variable is not used. |
 | main.rs:141:5:141:5 | y | Variable is not used. |
 | main.rs:168:9:168:9 | x | Variable is not used. |
+| main.rs:196:9:196:9 | x | Variable is not used. |
+| main.rs:201:9:201:9 | x | Variable is not used. |
 | main.rs:250:17:250:17 | a | Variable is not used. |
 | main.rs:258:20:258:22 | val | Variable is not used. |
 | main.rs:271:14:271:16 | val | Variable is not used. |
@@ -12,5 +14,9 @@
 | main.rs:342:25:342:25 | y | Variable is not used. |
 | main.rs:346:28:346:28 | a | Variable is not used. |
 | main.rs:350:9:350:9 | p | Variable is not used. |
+| main.rs:365:9:365:13 | right | Variable is not used. |
+| main.rs:371:9:371:14 | right2 | Variable is not used. |
 | main.rs:378:13:378:13 | y | Variable is not used. |
 | main.rs:386:21:386:21 | y | Variable is not used. |
+| main.rs:434:27:434:29 | val | Variable is not used. |
+| main.rs:437:22:437:24 | acc | Variable is not used. |
diff --git a/rust/ql/test/query-tests/unusedentities/main.rs b/rust/ql/test/query-tests/unusedentities/main.rs
index a3bfa2caa7b8..2edcc4b87160 100644
--- a/rust/ql/test/query-tests/unusedentities/main.rs
+++ b/rust/ql/test/query-tests/unusedentities/main.rs
@@ -146,9 +146,9 @@ fn parameters(
 
 // --- loops ---
 
-
-
-
+fn id(v: i32) -> i32 {
+    return v;
+}
 
 fn loops() {
     let mut a: i64 = 10;
@@ -175,53 +175,53 @@ fn loops() {
         println!("x is {}", x);
     }
 
+    for x
+    in 1..10 {
+        println!("x is {:?}", x);
+    }
 
+    for x
+    in 1..10 {
+        println!("x + 1 is {}", x + 1);
+    }
 
+    for x
+    in 1..10 {
+        for y
+        in 1..x {
+            println!("y is {}", y);
+        }
+    }
 
+    for x // SPURIOUS: unused variable
+    in 1..10 {
+        println!("x is {x}");
+    }
 
+    for x // SPURIOUS: unused variable
+    in 1..10 {
+        _ = format!("x is {x}");
+    }
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+    for x
+    in 1..10 {
+        println!("x is {val}", val = x);
+    }
 
     for x
     in 1..10 {
         assert!(x != 11);
     }
 
+    for x
+    in 1..10 {
+        assert_eq!(x, 1);
+    }
 
-
-
-
-
-
-
-
+    for x
+    in 1..10 {
+        assert_eq!(id(x), id(1));
+    }
 
 }
 
@@ -351,26 +351,26 @@ fn if_lets_matches() {
         }
     }
 
+    let duration1 = std::time::Duration::new(10, 0); // ten seconds
+    assert_eq!(duration1.as_secs(), 10);
 
+    let duration2:Result<std::time::Duration, String> =
+        Ok(std::time::Duration::new(10, 0));
+    match (duration2) {
+        Ok(n) => { println!("duration was {} seconds", n.as_secs()); }
+        Err(_) => { println!("failed"); }
+    }
 
+    let(left,
+        right) = // BAD: unused value [NOT DETECTED] SPURIOUS: unused variable
+        (1, 2);
+    _ = left;
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+    let pair = (1, 2);
+    let(left2,
+        right2) = // BAD: unused value [NOT DETECTED] SPURIOUS: unused variable
+        pair;
+    _ = left2;
 }
 
 fn shadowing() -> i32 {
@@ -391,55 +391,55 @@ fn shadowing() -> i32 {
     }
 }
 
+// --- function pointers ---
 
+type FuncPtr = fn(i32) -> i32;
 
+fn increment(x: i32) -> i32 {
+    return x + 1;
+}
 
+fn func_ptrs() {
+    let MyFunc: FuncPtr = increment;
 
+    for x
+    in 1..10 {
+        _ = x + 1;
+    }
 
+    for x
+    in 1..10 {
+        _ = increment(x);
+    }
 
+    for x
+    in 1..10 {
+        _ = MyFunc(x);
+    }
+}
 
+// --- folds and closures ---
 
+fn folds_and_closures() {
+    let a1 = 1..10;
+    _ = a1.sum::<i32>();
 
+    let a2 = 1..10;
+    _ = a2.fold(0, | acc: i32, val: i32 | -> i32 { acc + val } );
 
+    let a3 = 1..10;
+    _ = a3.fold(0, | acc, val | acc + val);
 
+    let a4 = 1..10;
+    _ = a4.fold(0, | acc, val | acc); // BAD: unused variable
 
+    let a5 = 1..10;
+    _ = a5.fold(0, | acc, val | val); // BAD: unused variable
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+    let i6 = 1;
+    let a6 = 1..10;
+    _ = a6.fold(0, | acc, val | acc + val + i6);
+}
 
 // --- main ---
 
@@ -453,8 +453,8 @@ fn main() {
     loops();
     if_lets_matches();
     shadowing();
-
-
+    func_ptrs();
+    folds_and_closures();
 
 	unreachable_if();
 	unreachable_panic();
diff --git a/rust/ql/test/query-tests/unusedentities/unreachable.rs b/rust/ql/test/query-tests/unusedentities/unreachable.rs
index 8ac1907faaa3..328c6edf0ea0 100644
--- a/rust/ql/test/query-tests/unusedentities/unreachable.rs
+++ b/rust/ql/test/query-tests/unusedentities/unreachable.rs
@@ -79,11 +79,11 @@ fn unreachable_panic() {
 		do_something(); // BAD: unreachable code [NOT DETECTED]
 	}
 
-
-
-
-
-
+	if cond() {
+		do_something();
+		unreachable!();
+		do_something(); // BAD: unreachable code [NOT DETECTED]
+	}
 
 	if cond() {
 		let mut maybe;

From 57875554f4c90d4ea37c9b79ad204f190fd2d808 Mon Sep 17 00:00:00 2001
From: Geoffrey White <40627776+geoffw0@users.noreply.github.com>
Date: Mon, 14 Oct 2024 17:06:55 +0100
Subject: [PATCH 337/347] Rust: Accept consistency failures in the new test
 cases.

---
 .../CONSISTENCY/CfgConsistency.expected               | 11 +++++++++++
 1 file changed, 11 insertions(+)
 create mode 100644 rust/ql/test/query-tests/unusedentities/CONSISTENCY/CfgConsistency.expected

diff --git a/rust/ql/test/query-tests/unusedentities/CONSISTENCY/CfgConsistency.expected b/rust/ql/test/query-tests/unusedentities/CONSISTENCY/CfgConsistency.expected
new file mode 100644
index 000000000000..bdd995b19f3e
--- /dev/null
+++ b/rust/ql/test/query-tests/unusedentities/CONSISTENCY/CfgConsistency.expected
@@ -0,0 +1,11 @@
+multipleSuccessors
+| main.rs:428:17:428:17 | 0 | successor | main.rs:428:9:428:10 | a2 |
+| main.rs:428:17:428:17 | 0 | successor | main.rs:428:20:428:62 | ClosureExpr |
+| main.rs:431:17:431:17 | 0 | successor | main.rs:431:9:431:10 | a3 |
+| main.rs:431:17:431:17 | 0 | successor | main.rs:431:20:431:41 | ClosureExpr |
+| main.rs:434:17:434:17 | 0 | successor | main.rs:434:9:434:10 | a4 |
+| main.rs:434:17:434:17 | 0 | successor | main.rs:434:20:434:35 | ClosureExpr |
+| main.rs:437:17:437:17 | 0 | successor | main.rs:437:9:437:10 | a5 |
+| main.rs:437:17:437:17 | 0 | successor | main.rs:437:20:437:35 | ClosureExpr |
+| main.rs:441:17:441:17 | 0 | successor | main.rs:441:9:441:10 | a6 |
+| main.rs:441:17:441:17 | 0 | successor | main.rs:441:20:441:46 | ClosureExpr |

From 8169ccd21ede3fd97e8677b71ab0879f89e4628b Mon Sep 17 00:00:00 2001
From: Geoffrey White <40627776+geoffw0@users.noreply.github.com>
Date: Tue, 15 Oct 2024 09:36:09 +0100
Subject: [PATCH 338/347] Apply suggestions from code review

Co-authored-by: Simon Friis Vindum <paldepind@github.com>
---
 rust/ql/test/query-tests/unusedentities/main.rs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/rust/ql/test/query-tests/unusedentities/main.rs b/rust/ql/test/query-tests/unusedentities/main.rs
index 2edcc4b87160..21403ac3ddf1 100644
--- a/rust/ql/test/query-tests/unusedentities/main.rs
+++ b/rust/ql/test/query-tests/unusedentities/main.rs
@@ -356,7 +356,7 @@ fn if_lets_matches() {
 
     let duration2:Result<std::time::Duration, String> =
         Ok(std::time::Duration::new(10, 0));
-    match (duration2) {
+    match duration2 {
         Ok(n) => { println!("duration was {} seconds", n.as_secs()); }
         Err(_) => { println!("failed"); }
     }
@@ -400,7 +400,7 @@ fn increment(x: i32) -> i32 {
 }
 
 fn func_ptrs() {
-    let MyFunc: FuncPtr = increment;
+    let my_func: FuncPtr = increment;
 
     for x
     in 1..10 {
@@ -414,7 +414,7 @@ fn func_ptrs() {
 
     for x
     in 1..10 {
-        _ = MyFunc(x);
+        _ = my_func(x);
     }
 }
 

From 5e33d9a14586ad05b4262fadab71494abe857423 Mon Sep 17 00:00:00 2001
From: Geoffrey White <40627776+geoffw0@users.noreply.github.com>
Date: Tue, 15 Oct 2024 09:37:43 +0100
Subject: [PATCH 339/347] Rust: Further changes from code review.

---
 rust/ql/test/query-tests/unusedentities/main.rs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/rust/ql/test/query-tests/unusedentities/main.rs b/rust/ql/test/query-tests/unusedentities/main.rs
index 21403ac3ddf1..3b81b0db54a9 100644
--- a/rust/ql/test/query-tests/unusedentities/main.rs
+++ b/rust/ql/test/query-tests/unusedentities/main.rs
@@ -361,13 +361,13 @@ fn if_lets_matches() {
         Err(_) => { println!("failed"); }
     }
 
-    let(left,
+    let (left,
         right) = // BAD: unused value [NOT DETECTED] SPURIOUS: unused variable
         (1, 2);
     _ = left;
 
     let pair = (1, 2);
-    let(left2,
+    let (left2,
         right2) = // BAD: unused value [NOT DETECTED] SPURIOUS: unused variable
         pair;
     _ = left2;

From 255f55cf1ab0739fa521598b959db26b4397d72a Mon Sep 17 00:00:00 2001
From: "github-actions[bot]" <github-actions@github.com>
Date: Tue, 15 Oct 2024 10:29:25 +0000
Subject: [PATCH 340/347] Release preparation for version 2.19.2

---
 cpp/ql/lib/CHANGELOG.md                                |  7 +++++++
 .../change-notes/2024-10-07-range-analysis-of-getc.md  |  4 ----
 cpp/ql/lib/change-notes/2024-10-09-fopen-taint.md      |  4 ----
 cpp/ql/lib/change-notes/released/2.0.2.md              |  6 ++++++
 cpp/ql/lib/codeql-pack.release.yml                     |  2 +-
 cpp/ql/lib/qlpack.yml                                  |  2 +-
 cpp/ql/src/CHANGELOG.md                                |  9 +++++++++
 .../2024-09-26-wcharcharconversion-false-positives.md  |  5 -----
 .../src/change-notes/2024-10-02-uninitialized-local.md |  4 ----
 .../2024-10-07-unclear-array-index-validation.md       |  4 ----
 cpp/ql/src/change-notes/released/1.2.5.md              |  8 ++++++++
 cpp/ql/src/codeql-pack.release.yml                     |  2 +-
 cpp/ql/src/qlpack.yml                                  |  2 +-
 csharp/ql/campaigns/Solorigate/lib/CHANGELOG.md        |  4 ++++
 .../Solorigate/lib/change-notes/released/1.7.27.md     |  3 +++
 .../campaigns/Solorigate/lib/codeql-pack.release.yml   |  2 +-
 csharp/ql/campaigns/Solorigate/lib/qlpack.yml          |  2 +-
 csharp/ql/campaigns/Solorigate/src/CHANGELOG.md        |  4 ++++
 .../Solorigate/src/change-notes/released/1.7.27.md     |  3 +++
 .../campaigns/Solorigate/src/codeql-pack.release.yml   |  2 +-
 csharp/ql/campaigns/Solorigate/src/qlpack.yml          |  2 +-
 csharp/ql/lib/CHANGELOG.md                             |  4 ++++
 csharp/ql/lib/change-notes/released/3.0.1.md           |  3 +++
 csharp/ql/lib/codeql-pack.release.yml                  |  2 +-
 csharp/ql/lib/qlpack.yml                               |  2 +-
 csharp/ql/src/CHANGELOG.md                             |  4 ++++
 csharp/ql/src/change-notes/released/1.0.10.md          |  3 +++
 csharp/ql/src/codeql-pack.release.yml                  |  2 +-
 csharp/ql/src/qlpack.yml                               |  2 +-
 go/ql/consistency-queries/CHANGELOG.md                 |  4 ++++
 .../change-notes/released/1.0.10.md                    |  3 +++
 go/ql/consistency-queries/codeql-pack.release.yml      |  2 +-
 go/ql/consistency-queries/qlpack.yml                   |  2 +-
 go/ql/lib/CHANGELOG.md                                 |  8 ++++++++
 .../change-notes/2024-09-03-tags-and-interface-ids.md  |  5 -----
 .../2.1.1.md}                                          |  9 ++++++---
 go/ql/lib/codeql-pack.release.yml                      |  2 +-
 go/ql/lib/qlpack.yml                                   |  2 +-
 go/ql/src/CHANGELOG.md                                 |  4 ++++
 go/ql/src/change-notes/released/1.1.1.md               |  3 +++
 go/ql/src/codeql-pack.release.yml                      |  2 +-
 go/ql/src/qlpack.yml                                   |  2 +-
 java/ql/automodel/src/CHANGELOG.md                     |  4 ++++
 java/ql/automodel/src/change-notes/released/1.0.10.md  |  3 +++
 java/ql/automodel/src/codeql-pack.release.yml          |  2 +-
 java/ql/automodel/src/qlpack.yml                       |  2 +-
 java/ql/lib/CHANGELOG.md                               |  4 ++++
 java/ql/lib/change-notes/released/4.1.1.md             |  3 +++
 java/ql/lib/codeql-pack.release.yml                    |  2 +-
 java/ql/lib/qlpack.yml                                 |  2 +-
 java/ql/src/CHANGELOG.md                               |  4 ++++
 java/ql/src/change-notes/released/1.1.7.md             |  3 +++
 java/ql/src/codeql-pack.release.yml                    |  2 +-
 java/ql/src/qlpack.yml                                 |  2 +-
 javascript/ql/lib/CHANGELOG.md                         |  4 ++++
 javascript/ql/lib/change-notes/released/2.0.2.md       |  3 +++
 javascript/ql/lib/codeql-pack.release.yml              |  2 +-
 javascript/ql/lib/qlpack.yml                           |  2 +-
 javascript/ql/src/CHANGELOG.md                         |  4 ++++
 javascript/ql/src/change-notes/released/1.2.2.md       |  3 +++
 javascript/ql/src/codeql-pack.release.yml              |  2 +-
 javascript/ql/src/qlpack.yml                           |  2 +-
 misc/suite-helpers/CHANGELOG.md                        |  4 ++++
 misc/suite-helpers/change-notes/released/1.0.10.md     |  3 +++
 misc/suite-helpers/codeql-pack.release.yml             |  2 +-
 misc/suite-helpers/qlpack.yml                          |  2 +-
 python/ql/lib/CHANGELOG.md                             | 10 ++++++++++
 .../ql/lib/change-notes/2024-09-24-std-lib-models.md   |  4 ----
 .../lib/change-notes/2024-10-01-comprehension-flow.md  |  5 -----
 .../2024-10-03-typetracking-through-comprehensions.md  |  4 ----
 .../ql/lib/change-notes/2024-10-09-finditer-match.md   |  4 ----
 python/ql/lib/change-notes/released/2.1.1.md           |  9 +++++++++
 python/ql/lib/codeql-pack.release.yml                  |  2 +-
 python/ql/lib/qlpack.yml                               |  2 +-
 python/ql/src/CHANGELOG.md                             |  6 +++++-
 python/ql/src/change-notes/released/1.3.1.md           |  3 +++
 python/ql/src/codeql-pack.release.yml                  |  2 +-
 python/ql/src/qlpack.yml                               |  2 +-
 ruby/ql/lib/CHANGELOG.md                               |  6 ++++++
 .../2.0.2.md}                                          |  7 ++++---
 ruby/ql/lib/codeql-pack.release.yml                    |  2 +-
 ruby/ql/lib/qlpack.yml                                 |  2 +-
 ruby/ql/src/CHANGELOG.md                               |  6 ++++++
 .../1.1.5.md}                                          |  7 ++++---
 ruby/ql/src/codeql-pack.release.yml                    |  2 +-
 ruby/ql/src/qlpack.yml                                 |  2 +-
 shared/controlflow/CHANGELOG.md                        |  4 ++++
 shared/controlflow/change-notes/released/1.0.10.md     |  3 +++
 shared/controlflow/codeql-pack.release.yml             |  2 +-
 shared/controlflow/qlpack.yml                          |  2 +-
 shared/dataflow/CHANGELOG.md                           |  4 ++++
 shared/dataflow/change-notes/released/1.1.4.md         |  3 +++
 shared/dataflow/codeql-pack.release.yml                |  2 +-
 shared/dataflow/qlpack.yml                             |  2 +-
 shared/mad/CHANGELOG.md                                |  4 ++++
 shared/mad/change-notes/released/1.0.10.md             |  3 +++
 shared/mad/codeql-pack.release.yml                     |  2 +-
 shared/mad/qlpack.yml                                  |  2 +-
 shared/rangeanalysis/CHANGELOG.md                      |  4 ++++
 shared/rangeanalysis/change-notes/released/1.0.10.md   |  3 +++
 shared/rangeanalysis/codeql-pack.release.yml           |  2 +-
 shared/rangeanalysis/qlpack.yml                        |  2 +-
 shared/regex/CHANGELOG.md                              |  4 ++++
 shared/regex/change-notes/released/1.0.10.md           |  3 +++
 shared/regex/codeql-pack.release.yml                   |  2 +-
 shared/regex/qlpack.yml                                |  2 +-
 shared/ssa/CHANGELOG.md                                |  4 ++++
 shared/ssa/change-notes/released/1.0.10.md             |  3 +++
 shared/ssa/codeql-pack.release.yml                     |  2 +-
 shared/ssa/qlpack.yml                                  |  2 +-
 shared/threat-models/CHANGELOG.md                      |  4 ++++
 shared/threat-models/change-notes/released/1.0.10.md   |  3 +++
 shared/threat-models/codeql-pack.release.yml           |  2 +-
 shared/threat-models/qlpack.yml                        |  2 +-
 shared/tutorial/CHANGELOG.md                           |  4 ++++
 shared/tutorial/change-notes/released/1.0.10.md        |  3 +++
 shared/tutorial/codeql-pack.release.yml                |  2 +-
 shared/tutorial/qlpack.yml                             |  2 +-
 shared/typeflow/CHANGELOG.md                           |  4 ++++
 shared/typeflow/change-notes/released/1.0.10.md        |  3 +++
 shared/typeflow/codeql-pack.release.yml                |  2 +-
 shared/typeflow/qlpack.yml                             |  2 +-
 shared/typetracking/CHANGELOG.md                       |  4 ++++
 shared/typetracking/change-notes/released/1.0.10.md    |  3 +++
 shared/typetracking/codeql-pack.release.yml            |  2 +-
 shared/typetracking/qlpack.yml                         |  2 +-
 shared/typos/CHANGELOG.md                              |  4 ++++
 shared/typos/change-notes/released/1.0.10.md           |  3 +++
 shared/typos/codeql-pack.release.yml                   |  2 +-
 shared/typos/qlpack.yml                                |  2 +-
 shared/util/CHANGELOG.md                               |  4 ++++
 shared/util/change-notes/released/1.0.10.md            |  3 +++
 shared/util/codeql-pack.release.yml                    |  2 +-
 shared/util/qlpack.yml                                 |  2 +-
 shared/xml/CHANGELOG.md                                |  4 ++++
 shared/xml/change-notes/released/1.0.10.md             |  3 +++
 shared/xml/codeql-pack.release.yml                     |  2 +-
 shared/xml/qlpack.yml                                  |  2 +-
 shared/yaml/CHANGELOG.md                               |  4 ++++
 shared/yaml/change-notes/released/1.0.10.md            |  3 +++
 shared/yaml/codeql-pack.release.yml                    |  2 +-
 shared/yaml/qlpack.yml                                 |  2 +-
 swift/ql/lib/CHANGELOG.md                              |  4 ++++
 swift/ql/lib/change-notes/released/2.0.2.md            |  3 +++
 swift/ql/lib/codeql-pack.release.yml                   |  2 +-
 swift/ql/lib/qlpack.yml                                |  2 +-
 swift/ql/src/CHANGELOG.md                              |  4 ++++
 swift/ql/src/change-notes/released/1.0.10.md           |  3 +++
 swift/ql/src/codeql-pack.release.yml                   |  2 +-
 swift/ql/src/qlpack.yml                                |  2 +-
 150 files changed, 357 insertions(+), 123 deletions(-)
 delete mode 100644 cpp/ql/lib/change-notes/2024-10-07-range-analysis-of-getc.md
 delete mode 100644 cpp/ql/lib/change-notes/2024-10-09-fopen-taint.md
 create mode 100644 cpp/ql/lib/change-notes/released/2.0.2.md
 delete mode 100644 cpp/ql/src/change-notes/2024-09-26-wcharcharconversion-false-positives.md
 delete mode 100644 cpp/ql/src/change-notes/2024-10-02-uninitialized-local.md
 delete mode 100644 cpp/ql/src/change-notes/2024-10-07-unclear-array-index-validation.md
 create mode 100644 cpp/ql/src/change-notes/released/1.2.5.md
 create mode 100644 csharp/ql/campaigns/Solorigate/lib/change-notes/released/1.7.27.md
 create mode 100644 csharp/ql/campaigns/Solorigate/src/change-notes/released/1.7.27.md
 create mode 100644 csharp/ql/lib/change-notes/released/3.0.1.md
 create mode 100644 csharp/ql/src/change-notes/released/1.0.10.md
 create mode 100644 go/ql/consistency-queries/change-notes/released/1.0.10.md
 delete mode 100644 go/ql/lib/change-notes/2024-09-03-tags-and-interface-ids.md
 rename go/ql/lib/change-notes/{2024-08-29-add-stdin-threat-models.md => released/2.1.1.md} (64%)
 create mode 100644 go/ql/src/change-notes/released/1.1.1.md
 create mode 100644 java/ql/automodel/src/change-notes/released/1.0.10.md
 create mode 100644 java/ql/lib/change-notes/released/4.1.1.md
 create mode 100644 java/ql/src/change-notes/released/1.1.7.md
 create mode 100644 javascript/ql/lib/change-notes/released/2.0.2.md
 create mode 100644 javascript/ql/src/change-notes/released/1.2.2.md
 create mode 100644 misc/suite-helpers/change-notes/released/1.0.10.md
 delete mode 100644 python/ql/lib/change-notes/2024-09-24-std-lib-models.md
 delete mode 100644 python/ql/lib/change-notes/2024-10-01-comprehension-flow.md
 delete mode 100644 python/ql/lib/change-notes/2024-10-03-typetracking-through-comprehensions.md
 delete mode 100644 python/ql/lib/change-notes/2024-10-09-finditer-match.md
 create mode 100644 python/ql/lib/change-notes/released/2.1.1.md
 create mode 100644 python/ql/src/change-notes/released/1.3.1.md
 rename ruby/ql/lib/change-notes/{2024-10-03-extraction-warnings.md => released/2.0.2.md} (77%)
 rename ruby/ql/src/change-notes/{2024-10-03-extraction-warnings.md => released/1.1.5.md} (82%)
 create mode 100644 shared/controlflow/change-notes/released/1.0.10.md
 create mode 100644 shared/dataflow/change-notes/released/1.1.4.md
 create mode 100644 shared/mad/change-notes/released/1.0.10.md
 create mode 100644 shared/rangeanalysis/change-notes/released/1.0.10.md
 create mode 100644 shared/regex/change-notes/released/1.0.10.md
 create mode 100644 shared/ssa/change-notes/released/1.0.10.md
 create mode 100644 shared/threat-models/change-notes/released/1.0.10.md
 create mode 100644 shared/tutorial/change-notes/released/1.0.10.md
 create mode 100644 shared/typeflow/change-notes/released/1.0.10.md
 create mode 100644 shared/typetracking/change-notes/released/1.0.10.md
 create mode 100644 shared/typos/change-notes/released/1.0.10.md
 create mode 100644 shared/util/change-notes/released/1.0.10.md
 create mode 100644 shared/xml/change-notes/released/1.0.10.md
 create mode 100644 shared/yaml/change-notes/released/1.0.10.md
 create mode 100644 swift/ql/lib/change-notes/released/2.0.2.md
 create mode 100644 swift/ql/src/change-notes/released/1.0.10.md

diff --git a/cpp/ql/lib/CHANGELOG.md b/cpp/ql/lib/CHANGELOG.md
index 5d39629f62b0..73c42c5dfa07 100644
--- a/cpp/ql/lib/CHANGELOG.md
+++ b/cpp/ql/lib/CHANGELOG.md
@@ -1,3 +1,10 @@
+## 2.0.2
+
+### Minor Analysis Improvements
+
+* Added taint flow model for `fopen` and related functions.
+* The `SimpleRangeAnalysis` library (`semmle.code.cpp.rangeanalysis.SimpleRangeAnalysis`) now generates more precise ranges for calls to `fgetc` and `getc`.
+
 ## 2.0.1
 
 No user-facing changes.
diff --git a/cpp/ql/lib/change-notes/2024-10-07-range-analysis-of-getc.md b/cpp/ql/lib/change-notes/2024-10-07-range-analysis-of-getc.md
deleted file mode 100644
index f796fba2ece2..000000000000
--- a/cpp/ql/lib/change-notes/2024-10-07-range-analysis-of-getc.md
+++ /dev/null
@@ -1,4 +0,0 @@
----
-category: minorAnalysis
----
-* The `SimpleRangeAnalysis` library (`semmle.code.cpp.rangeanalysis.SimpleRangeAnalysis`) now generates more precise ranges for calls to `fgetc` and `getc`.
\ No newline at end of file
diff --git a/cpp/ql/lib/change-notes/2024-10-09-fopen-taint.md b/cpp/ql/lib/change-notes/2024-10-09-fopen-taint.md
deleted file mode 100644
index d2516859a910..000000000000
--- a/cpp/ql/lib/change-notes/2024-10-09-fopen-taint.md
+++ /dev/null
@@ -1,4 +0,0 @@
----
-category: minorAnalysis
----
-* Added taint flow model for `fopen` and related functions.
\ No newline at end of file
diff --git a/cpp/ql/lib/change-notes/released/2.0.2.md b/cpp/ql/lib/change-notes/released/2.0.2.md
new file mode 100644
index 000000000000..db3a11e55a8e
--- /dev/null
+++ b/cpp/ql/lib/change-notes/released/2.0.2.md
@@ -0,0 +1,6 @@
+## 2.0.2
+
+### Minor Analysis Improvements
+
+* Added taint flow model for `fopen` and related functions.
+* The `SimpleRangeAnalysis` library (`semmle.code.cpp.rangeanalysis.SimpleRangeAnalysis`) now generates more precise ranges for calls to `fgetc` and `getc`.
diff --git a/cpp/ql/lib/codeql-pack.release.yml b/cpp/ql/lib/codeql-pack.release.yml
index fe974a4dbf37..81c7f1dbc13c 100644
--- a/cpp/ql/lib/codeql-pack.release.yml
+++ b/cpp/ql/lib/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 2.0.1
+lastReleaseVersion: 2.0.2
diff --git a/cpp/ql/lib/qlpack.yml b/cpp/ql/lib/qlpack.yml
index ba5db8c6e6f9..91af68ed6411 100644
--- a/cpp/ql/lib/qlpack.yml
+++ b/cpp/ql/lib/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/cpp-all
-version: 2.0.2-dev
+version: 2.0.2
 groups: cpp
 dbscheme: semmlecode.cpp.dbscheme
 extractor: cpp
diff --git a/cpp/ql/src/CHANGELOG.md b/cpp/ql/src/CHANGELOG.md
index 8eaccb0404dc..7896479549fc 100644
--- a/cpp/ql/src/CHANGELOG.md
+++ b/cpp/ql/src/CHANGELOG.md
@@ -1,3 +1,12 @@
+## 1.2.5
+
+### Minor Analysis Improvements
+
+* The `cpp/unclear-array-index-validation` ("Unclear validation of array index") query has been improved to reduce false positives increase true positives.
+* Fixed false positives in the `cpp/uninitialized-local` ("Potentially uninitialized local variable") query if there are extraction errors in the function.
+* The `cpp/incorrect-string-type-conversion` query now produces fewer false positives caused by failure to detect byte arrays.
+* The `cpp/incorrect-string-type-conversion` query now produces fewer false positives caused by failure to recognize dynamic checks prior to possible dangerous widening.
+
 ## 1.2.4
 
 ### Minor Analysis Improvements
diff --git a/cpp/ql/src/change-notes/2024-09-26-wcharcharconversion-false-positives.md b/cpp/ql/src/change-notes/2024-09-26-wcharcharconversion-false-positives.md
deleted file mode 100644
index b0fa7a953c59..000000000000
--- a/cpp/ql/src/change-notes/2024-09-26-wcharcharconversion-false-positives.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-category: minorAnalysis
----
-* The `cpp/incorrect-string-type-conversion` query now produces fewer false positives caused by failure to detect byte arrays.
-* The `cpp/incorrect-string-type-conversion` query now produces fewer false positives caused by failure to recognize dynamic checks prior to possible dangerous widening.
\ No newline at end of file
diff --git a/cpp/ql/src/change-notes/2024-10-02-uninitialized-local.md b/cpp/ql/src/change-notes/2024-10-02-uninitialized-local.md
deleted file mode 100644
index e34a942f38a6..000000000000
--- a/cpp/ql/src/change-notes/2024-10-02-uninitialized-local.md
+++ /dev/null
@@ -1,4 +0,0 @@
----
-category: minorAnalysis
----
-* Fixed false positives in the `cpp/uninitialized-local` ("Potentially uninitialized local variable") query if there are extraction errors in the function.
diff --git a/cpp/ql/src/change-notes/2024-10-07-unclear-array-index-validation.md b/cpp/ql/src/change-notes/2024-10-07-unclear-array-index-validation.md
deleted file mode 100644
index b237afdd6be8..000000000000
--- a/cpp/ql/src/change-notes/2024-10-07-unclear-array-index-validation.md
+++ /dev/null
@@ -1,4 +0,0 @@
----
-category: minorAnalysis
----
-* The `cpp/unclear-array-index-validation` ("Unclear validation of array index") query has been improved to reduce false positives increase true positives.
\ No newline at end of file
diff --git a/cpp/ql/src/change-notes/released/1.2.5.md b/cpp/ql/src/change-notes/released/1.2.5.md
new file mode 100644
index 000000000000..cf937d43e6b3
--- /dev/null
+++ b/cpp/ql/src/change-notes/released/1.2.5.md
@@ -0,0 +1,8 @@
+## 1.2.5
+
+### Minor Analysis Improvements
+
+* The `cpp/unclear-array-index-validation` ("Unclear validation of array index") query has been improved to reduce false positives increase true positives.
+* Fixed false positives in the `cpp/uninitialized-local` ("Potentially uninitialized local variable") query if there are extraction errors in the function.
+* The `cpp/incorrect-string-type-conversion` query now produces fewer false positives caused by failure to detect byte arrays.
+* The `cpp/incorrect-string-type-conversion` query now produces fewer false positives caused by failure to recognize dynamic checks prior to possible dangerous widening.
diff --git a/cpp/ql/src/codeql-pack.release.yml b/cpp/ql/src/codeql-pack.release.yml
index 172090f46b6d..40355f0807f9 100644
--- a/cpp/ql/src/codeql-pack.release.yml
+++ b/cpp/ql/src/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 1.2.4
+lastReleaseVersion: 1.2.5
diff --git a/cpp/ql/src/qlpack.yml b/cpp/ql/src/qlpack.yml
index d01ac2f048c2..eee6e064b22f 100644
--- a/cpp/ql/src/qlpack.yml
+++ b/cpp/ql/src/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/cpp-queries
-version: 1.2.5-dev
+version: 1.2.5
 groups:
   - cpp
   - queries
diff --git a/csharp/ql/campaigns/Solorigate/lib/CHANGELOG.md b/csharp/ql/campaigns/Solorigate/lib/CHANGELOG.md
index 989d5e74408f..eb646b9ce77f 100644
--- a/csharp/ql/campaigns/Solorigate/lib/CHANGELOG.md
+++ b/csharp/ql/campaigns/Solorigate/lib/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 1.7.27
+
+No user-facing changes.
+
 ## 1.7.26
 
 No user-facing changes.
diff --git a/csharp/ql/campaigns/Solorigate/lib/change-notes/released/1.7.27.md b/csharp/ql/campaigns/Solorigate/lib/change-notes/released/1.7.27.md
new file mode 100644
index 000000000000..7d323c891002
--- /dev/null
+++ b/csharp/ql/campaigns/Solorigate/lib/change-notes/released/1.7.27.md
@@ -0,0 +1,3 @@
+## 1.7.27
+
+No user-facing changes.
diff --git a/csharp/ql/campaigns/Solorigate/lib/codeql-pack.release.yml b/csharp/ql/campaigns/Solorigate/lib/codeql-pack.release.yml
index ca4c34e70d1b..5c0490dbda8e 100644
--- a/csharp/ql/campaigns/Solorigate/lib/codeql-pack.release.yml
+++ b/csharp/ql/campaigns/Solorigate/lib/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 1.7.26
+lastReleaseVersion: 1.7.27
diff --git a/csharp/ql/campaigns/Solorigate/lib/qlpack.yml b/csharp/ql/campaigns/Solorigate/lib/qlpack.yml
index 3cab08a0f3ec..e02f2f0733ce 100644
--- a/csharp/ql/campaigns/Solorigate/lib/qlpack.yml
+++ b/csharp/ql/campaigns/Solorigate/lib/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/csharp-solorigate-all
-version: 1.7.27-dev
+version: 1.7.27
 groups:
   - csharp
   - solorigate
diff --git a/csharp/ql/campaigns/Solorigate/src/CHANGELOG.md b/csharp/ql/campaigns/Solorigate/src/CHANGELOG.md
index 989d5e74408f..eb646b9ce77f 100644
--- a/csharp/ql/campaigns/Solorigate/src/CHANGELOG.md
+++ b/csharp/ql/campaigns/Solorigate/src/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 1.7.27
+
+No user-facing changes.
+
 ## 1.7.26
 
 No user-facing changes.
diff --git a/csharp/ql/campaigns/Solorigate/src/change-notes/released/1.7.27.md b/csharp/ql/campaigns/Solorigate/src/change-notes/released/1.7.27.md
new file mode 100644
index 000000000000..7d323c891002
--- /dev/null
+++ b/csharp/ql/campaigns/Solorigate/src/change-notes/released/1.7.27.md
@@ -0,0 +1,3 @@
+## 1.7.27
+
+No user-facing changes.
diff --git a/csharp/ql/campaigns/Solorigate/src/codeql-pack.release.yml b/csharp/ql/campaigns/Solorigate/src/codeql-pack.release.yml
index ca4c34e70d1b..5c0490dbda8e 100644
--- a/csharp/ql/campaigns/Solorigate/src/codeql-pack.release.yml
+++ b/csharp/ql/campaigns/Solorigate/src/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 1.7.26
+lastReleaseVersion: 1.7.27
diff --git a/csharp/ql/campaigns/Solorigate/src/qlpack.yml b/csharp/ql/campaigns/Solorigate/src/qlpack.yml
index c46baf0b2518..d94e11459d4c 100644
--- a/csharp/ql/campaigns/Solorigate/src/qlpack.yml
+++ b/csharp/ql/campaigns/Solorigate/src/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/csharp-solorigate-queries
-version: 1.7.27-dev
+version: 1.7.27
 groups:
   - csharp
   - solorigate
diff --git a/csharp/ql/lib/CHANGELOG.md b/csharp/ql/lib/CHANGELOG.md
index 7e8378798830..302087e4f147 100644
--- a/csharp/ql/lib/CHANGELOG.md
+++ b/csharp/ql/lib/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 3.0.1
+
+No user-facing changes.
+
 ## 3.0.0
 
 ### Breaking Changes
diff --git a/csharp/ql/lib/change-notes/released/3.0.1.md b/csharp/ql/lib/change-notes/released/3.0.1.md
new file mode 100644
index 000000000000..ac5998ace618
--- /dev/null
+++ b/csharp/ql/lib/change-notes/released/3.0.1.md
@@ -0,0 +1,3 @@
+## 3.0.1
+
+No user-facing changes.
diff --git a/csharp/ql/lib/codeql-pack.release.yml b/csharp/ql/lib/codeql-pack.release.yml
index 33d3a2cd1139..e3b15d965db6 100644
--- a/csharp/ql/lib/codeql-pack.release.yml
+++ b/csharp/ql/lib/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 3.0.0
+lastReleaseVersion: 3.0.1
diff --git a/csharp/ql/lib/qlpack.yml b/csharp/ql/lib/qlpack.yml
index 55a99929ac87..1515544bc960 100644
--- a/csharp/ql/lib/qlpack.yml
+++ b/csharp/ql/lib/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/csharp-all
-version: 3.0.1-dev
+version: 3.0.1
 groups: csharp
 dbscheme: semmlecode.csharp.dbscheme
 extractor: csharp
diff --git a/csharp/ql/src/CHANGELOG.md b/csharp/ql/src/CHANGELOG.md
index 4c162b64d8f7..59a98aca72a2 100644
--- a/csharp/ql/src/CHANGELOG.md
+++ b/csharp/ql/src/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 1.0.10
+
+No user-facing changes.
+
 ## 1.0.9
 
 ### Minor Analysis Improvements
diff --git a/csharp/ql/src/change-notes/released/1.0.10.md b/csharp/ql/src/change-notes/released/1.0.10.md
new file mode 100644
index 000000000000..b601d8784532
--- /dev/null
+++ b/csharp/ql/src/change-notes/released/1.0.10.md
@@ -0,0 +1,3 @@
+## 1.0.10
+
+No user-facing changes.
diff --git a/csharp/ql/src/codeql-pack.release.yml b/csharp/ql/src/codeql-pack.release.yml
index fb813c5ee050..3865dbcf4b2a 100644
--- a/csharp/ql/src/codeql-pack.release.yml
+++ b/csharp/ql/src/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 1.0.9
+lastReleaseVersion: 1.0.10
diff --git a/csharp/ql/src/qlpack.yml b/csharp/ql/src/qlpack.yml
index 6209cc5f88d5..90e7ec11d865 100644
--- a/csharp/ql/src/qlpack.yml
+++ b/csharp/ql/src/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/csharp-queries
-version: 1.0.10-dev
+version: 1.0.10
 groups:
   - csharp
   - queries
diff --git a/go/ql/consistency-queries/CHANGELOG.md b/go/ql/consistency-queries/CHANGELOG.md
index 9589b67148fa..b62e06e3dff0 100644
--- a/go/ql/consistency-queries/CHANGELOG.md
+++ b/go/ql/consistency-queries/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 1.0.10
+
+No user-facing changes.
+
 ## 1.0.9
 
 No user-facing changes.
diff --git a/go/ql/consistency-queries/change-notes/released/1.0.10.md b/go/ql/consistency-queries/change-notes/released/1.0.10.md
new file mode 100644
index 000000000000..b601d8784532
--- /dev/null
+++ b/go/ql/consistency-queries/change-notes/released/1.0.10.md
@@ -0,0 +1,3 @@
+## 1.0.10
+
+No user-facing changes.
diff --git a/go/ql/consistency-queries/codeql-pack.release.yml b/go/ql/consistency-queries/codeql-pack.release.yml
index fb813c5ee050..3865dbcf4b2a 100644
--- a/go/ql/consistency-queries/codeql-pack.release.yml
+++ b/go/ql/consistency-queries/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 1.0.9
+lastReleaseVersion: 1.0.10
diff --git a/go/ql/consistency-queries/qlpack.yml b/go/ql/consistency-queries/qlpack.yml
index 5a7ca8082a53..726aa918f891 100644
--- a/go/ql/consistency-queries/qlpack.yml
+++ b/go/ql/consistency-queries/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql-go-consistency-queries
-version: 1.0.10-dev
+version: 1.0.10
 groups:
   - go
   - queries
diff --git a/go/ql/lib/CHANGELOG.md b/go/ql/lib/CHANGELOG.md
index a9a8190e6acc..d3c6fcd4a611 100644
--- a/go/ql/lib/CHANGELOG.md
+++ b/go/ql/lib/CHANGELOG.md
@@ -1,3 +1,11 @@
+## 2.1.1
+
+### Minor Analysis Improvements
+
+* Added member predicates `StructTag.hasOwnFieldWithTag` and `Field.getTag`, which enable CodeQL queries to examine struct field tags.
+* Added member predicate `InterfaceType.hasPrivateMethodWithQualifiedName`, which enables CodeQL queries to distinguish interfaces with matching non-exported method names that are declared in different packages, and are therefore incompatible.
+* Local source models with the `stdin` source kind have been added for the variable `os.Stdin` and the functions `fmt.Scan`, `fmt.Scanf` and `fmt.Scanln`. You can optionally include threat models as appropriate when using the CodeQL CLI and in GitHub code scanning. For more information, see [Analyzing your code with CodeQL queries](https://docs.github.com/code-security/codeql-cli/getting-started-with-the-codeql-cli/analyzing-your-code-with-codeql-queries#including-model-packs-to-add-potential-sources-of-tainted-data>) and [Customizing your advanced setup for code scanning](https://docs.github.com/code-security/code-scanning/creating-an-advanced-setup-for-code-scanning/customizing-your-advanced-setup-for-code-scanning#extending-codeql-coverage-with-threat-models).
+
 ## 2.1.0
 
 ### Deprecated APIs
diff --git a/go/ql/lib/change-notes/2024-09-03-tags-and-interface-ids.md b/go/ql/lib/change-notes/2024-09-03-tags-and-interface-ids.md
deleted file mode 100644
index 749ae4cde998..000000000000
--- a/go/ql/lib/change-notes/2024-09-03-tags-and-interface-ids.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-category: minorAnalysis
----
-* Added member predicates `StructTag.hasOwnFieldWithTag` and `Field.getTag`, which enable CodeQL queries to examine struct field tags.
-* Added member predicate `InterfaceType.hasPrivateMethodWithQualifiedName`, which enables CodeQL queries to distinguish interfaces with matching non-exported method names that are declared in different packages, and are therefore incompatible.
diff --git a/go/ql/lib/change-notes/2024-08-29-add-stdin-threat-models.md b/go/ql/lib/change-notes/released/2.1.1.md
similarity index 64%
rename from go/ql/lib/change-notes/2024-08-29-add-stdin-threat-models.md
rename to go/ql/lib/change-notes/released/2.1.1.md
index d98ac68f1edc..7319120fd3cb 100644
--- a/go/ql/lib/change-notes/2024-08-29-add-stdin-threat-models.md
+++ b/go/ql/lib/change-notes/released/2.1.1.md
@@ -1,4 +1,7 @@
----
-category: minorAnalysis
----
+## 2.1.1
+
+### Minor Analysis Improvements
+
+* Added member predicates `StructTag.hasOwnFieldWithTag` and `Field.getTag`, which enable CodeQL queries to examine struct field tags.
+* Added member predicate `InterfaceType.hasPrivateMethodWithQualifiedName`, which enables CodeQL queries to distinguish interfaces with matching non-exported method names that are declared in different packages, and are therefore incompatible.
 * Local source models with the `stdin` source kind have been added for the variable `os.Stdin` and the functions `fmt.Scan`, `fmt.Scanf` and `fmt.Scanln`. You can optionally include threat models as appropriate when using the CodeQL CLI and in GitHub code scanning. For more information, see [Analyzing your code with CodeQL queries](https://docs.github.com/code-security/codeql-cli/getting-started-with-the-codeql-cli/analyzing-your-code-with-codeql-queries#including-model-packs-to-add-potential-sources-of-tainted-data>) and [Customizing your advanced setup for code scanning](https://docs.github.com/code-security/code-scanning/creating-an-advanced-setup-for-code-scanning/customizing-your-advanced-setup-for-code-scanning#extending-codeql-coverage-with-threat-models).
diff --git a/go/ql/lib/codeql-pack.release.yml b/go/ql/lib/codeql-pack.release.yml
index 487a1a58b2b8..576c2ea18d68 100644
--- a/go/ql/lib/codeql-pack.release.yml
+++ b/go/ql/lib/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 2.1.0
+lastReleaseVersion: 2.1.1
diff --git a/go/ql/lib/qlpack.yml b/go/ql/lib/qlpack.yml
index 9cb5e3620117..ba6a48a29d49 100644
--- a/go/ql/lib/qlpack.yml
+++ b/go/ql/lib/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/go-all
-version: 2.1.1-dev
+version: 2.1.1
 groups: go
 dbscheme: go.dbscheme
 extractor: go
diff --git a/go/ql/src/CHANGELOG.md b/go/ql/src/CHANGELOG.md
index 69a5ed3e9f83..bdb40a2d2bb4 100644
--- a/go/ql/src/CHANGELOG.md
+++ b/go/ql/src/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 1.1.1
+
+No user-facing changes.
+
 ## 1.1.0
 
 ### Query Metadata Changes
diff --git a/go/ql/src/change-notes/released/1.1.1.md b/go/ql/src/change-notes/released/1.1.1.md
new file mode 100644
index 000000000000..7fb56d366105
--- /dev/null
+++ b/go/ql/src/change-notes/released/1.1.1.md
@@ -0,0 +1,3 @@
+## 1.1.1
+
+No user-facing changes.
diff --git a/go/ql/src/codeql-pack.release.yml b/go/ql/src/codeql-pack.release.yml
index 2ac15439f561..1a19084be3f7 100644
--- a/go/ql/src/codeql-pack.release.yml
+++ b/go/ql/src/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 1.1.0
+lastReleaseVersion: 1.1.1
diff --git a/go/ql/src/qlpack.yml b/go/ql/src/qlpack.yml
index 0b3f5076bb6d..0dbc1fe67fae 100644
--- a/go/ql/src/qlpack.yml
+++ b/go/ql/src/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/go-queries
-version: 1.1.1-dev
+version: 1.1.1
 groups:
   - go
   - queries
diff --git a/java/ql/automodel/src/CHANGELOG.md b/java/ql/automodel/src/CHANGELOG.md
index 4d632a2ae2d2..537e84b2c0e5 100644
--- a/java/ql/automodel/src/CHANGELOG.md
+++ b/java/ql/automodel/src/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 1.0.10
+
+No user-facing changes.
+
 ## 1.0.9
 
 No user-facing changes.
diff --git a/java/ql/automodel/src/change-notes/released/1.0.10.md b/java/ql/automodel/src/change-notes/released/1.0.10.md
new file mode 100644
index 000000000000..b601d8784532
--- /dev/null
+++ b/java/ql/automodel/src/change-notes/released/1.0.10.md
@@ -0,0 +1,3 @@
+## 1.0.10
+
+No user-facing changes.
diff --git a/java/ql/automodel/src/codeql-pack.release.yml b/java/ql/automodel/src/codeql-pack.release.yml
index fb813c5ee050..3865dbcf4b2a 100644
--- a/java/ql/automodel/src/codeql-pack.release.yml
+++ b/java/ql/automodel/src/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 1.0.9
+lastReleaseVersion: 1.0.10
diff --git a/java/ql/automodel/src/qlpack.yml b/java/ql/automodel/src/qlpack.yml
index fe961cb4392c..7621f1900d53 100644
--- a/java/ql/automodel/src/qlpack.yml
+++ b/java/ql/automodel/src/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/java-automodel-queries
-version: 1.0.10-dev
+version: 1.0.10
 groups:
     - java
     - automodel
diff --git a/java/ql/lib/CHANGELOG.md b/java/ql/lib/CHANGELOG.md
index 5441126d72c9..6be0cdc10e5a 100644
--- a/java/ql/lib/CHANGELOG.md
+++ b/java/ql/lib/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 4.1.1
+
+No user-facing changes.
+
 ## 4.1.0
 
 ### Deprecated APIs
diff --git a/java/ql/lib/change-notes/released/4.1.1.md b/java/ql/lib/change-notes/released/4.1.1.md
new file mode 100644
index 000000000000..23583cbad734
--- /dev/null
+++ b/java/ql/lib/change-notes/released/4.1.1.md
@@ -0,0 +1,3 @@
+## 4.1.1
+
+No user-facing changes.
diff --git a/java/ql/lib/codeql-pack.release.yml b/java/ql/lib/codeql-pack.release.yml
index d5b1bf88d10e..9c871cefc42c 100644
--- a/java/ql/lib/codeql-pack.release.yml
+++ b/java/ql/lib/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 4.1.0
+lastReleaseVersion: 4.1.1
diff --git a/java/ql/lib/qlpack.yml b/java/ql/lib/qlpack.yml
index 0d4f67146c1b..23871cfb7d82 100644
--- a/java/ql/lib/qlpack.yml
+++ b/java/ql/lib/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/java-all
-version: 4.1.1-dev
+version: 4.1.1
 groups: java
 dbscheme: config/semmlecode.dbscheme
 extractor: java
diff --git a/java/ql/src/CHANGELOG.md b/java/ql/src/CHANGELOG.md
index 20e7a248aebb..a034dc0abf90 100644
--- a/java/ql/src/CHANGELOG.md
+++ b/java/ql/src/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 1.1.7
+
+No user-facing changes.
+
 ## 1.1.6
 
 ### Minor Analysis Improvements
diff --git a/java/ql/src/change-notes/released/1.1.7.md b/java/ql/src/change-notes/released/1.1.7.md
new file mode 100644
index 000000000000..81505c0507a2
--- /dev/null
+++ b/java/ql/src/change-notes/released/1.1.7.md
@@ -0,0 +1,3 @@
+## 1.1.7
+
+No user-facing changes.
diff --git a/java/ql/src/codeql-pack.release.yml b/java/ql/src/codeql-pack.release.yml
index 9e712a00a21d..759105565166 100644
--- a/java/ql/src/codeql-pack.release.yml
+++ b/java/ql/src/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 1.1.6
+lastReleaseVersion: 1.1.7
diff --git a/java/ql/src/qlpack.yml b/java/ql/src/qlpack.yml
index c8e95f52ca4a..82b14986199e 100644
--- a/java/ql/src/qlpack.yml
+++ b/java/ql/src/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/java-queries
-version: 1.1.7-dev
+version: 1.1.7
 groups:
   - java
   - queries
diff --git a/javascript/ql/lib/CHANGELOG.md b/javascript/ql/lib/CHANGELOG.md
index bb77b4f1f496..6068cf26319d 100644
--- a/javascript/ql/lib/CHANGELOG.md
+++ b/javascript/ql/lib/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 2.0.2
+
+No user-facing changes.
+
 ## 2.0.1
 
 No user-facing changes.
diff --git a/javascript/ql/lib/change-notes/released/2.0.2.md b/javascript/ql/lib/change-notes/released/2.0.2.md
new file mode 100644
index 000000000000..862ef0e9df7c
--- /dev/null
+++ b/javascript/ql/lib/change-notes/released/2.0.2.md
@@ -0,0 +1,3 @@
+## 2.0.2
+
+No user-facing changes.
diff --git a/javascript/ql/lib/codeql-pack.release.yml b/javascript/ql/lib/codeql-pack.release.yml
index fe974a4dbf37..81c7f1dbc13c 100644
--- a/javascript/ql/lib/codeql-pack.release.yml
+++ b/javascript/ql/lib/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 2.0.1
+lastReleaseVersion: 2.0.2
diff --git a/javascript/ql/lib/qlpack.yml b/javascript/ql/lib/qlpack.yml
index bea3bbacd5fa..8cf13a5240ce 100644
--- a/javascript/ql/lib/qlpack.yml
+++ b/javascript/ql/lib/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/javascript-all
-version: 2.0.2-dev
+version: 2.0.2
 groups: javascript
 dbscheme: semmlecode.javascript.dbscheme
 extractor: javascript
diff --git a/javascript/ql/src/CHANGELOG.md b/javascript/ql/src/CHANGELOG.md
index adf7daa3eb43..df7becd46de5 100644
--- a/javascript/ql/src/CHANGELOG.md
+++ b/javascript/ql/src/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 1.2.2
+
+No user-facing changes.
+
 ## 1.2.1
 
 No user-facing changes.
diff --git a/javascript/ql/src/change-notes/released/1.2.2.md b/javascript/ql/src/change-notes/released/1.2.2.md
new file mode 100644
index 000000000000..7b520f6c258f
--- /dev/null
+++ b/javascript/ql/src/change-notes/released/1.2.2.md
@@ -0,0 +1,3 @@
+## 1.2.2
+
+No user-facing changes.
diff --git a/javascript/ql/src/codeql-pack.release.yml b/javascript/ql/src/codeql-pack.release.yml
index 73dd403938c9..0a70a9a01a7e 100644
--- a/javascript/ql/src/codeql-pack.release.yml
+++ b/javascript/ql/src/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 1.2.1
+lastReleaseVersion: 1.2.2
diff --git a/javascript/ql/src/qlpack.yml b/javascript/ql/src/qlpack.yml
index 407aa03f7802..5aee59e9b015 100644
--- a/javascript/ql/src/qlpack.yml
+++ b/javascript/ql/src/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/javascript-queries
-version: 1.2.2-dev
+version: 1.2.2
 groups:
   - javascript
   - queries
diff --git a/misc/suite-helpers/CHANGELOG.md b/misc/suite-helpers/CHANGELOG.md
index 729794553521..e9c580c60cef 100644
--- a/misc/suite-helpers/CHANGELOG.md
+++ b/misc/suite-helpers/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 1.0.10
+
+No user-facing changes.
+
 ## 1.0.9
 
 No user-facing changes.
diff --git a/misc/suite-helpers/change-notes/released/1.0.10.md b/misc/suite-helpers/change-notes/released/1.0.10.md
new file mode 100644
index 000000000000..b601d8784532
--- /dev/null
+++ b/misc/suite-helpers/change-notes/released/1.0.10.md
@@ -0,0 +1,3 @@
+## 1.0.10
+
+No user-facing changes.
diff --git a/misc/suite-helpers/codeql-pack.release.yml b/misc/suite-helpers/codeql-pack.release.yml
index fb813c5ee050..3865dbcf4b2a 100644
--- a/misc/suite-helpers/codeql-pack.release.yml
+++ b/misc/suite-helpers/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 1.0.9
+lastReleaseVersion: 1.0.10
diff --git a/misc/suite-helpers/qlpack.yml b/misc/suite-helpers/qlpack.yml
index 76c86b26be6b..6b8eb63063ba 100644
--- a/misc/suite-helpers/qlpack.yml
+++ b/misc/suite-helpers/qlpack.yml
@@ -1,4 +1,4 @@
 name: codeql/suite-helpers
-version: 1.0.10-dev
+version: 1.0.10
 groups: shared
 warnOnImplicitThis: true
diff --git a/python/ql/lib/CHANGELOG.md b/python/ql/lib/CHANGELOG.md
index 4cadb40bc2f5..4832015d920d 100644
--- a/python/ql/lib/CHANGELOG.md
+++ b/python/ql/lib/CHANGELOG.md
@@ -1,3 +1,13 @@
+## 2.1.1
+
+### Minor Analysis Improvements
+
+* Modelled that `re.finditer` returns an iterable of `re.Match` objects. This is now understood by the API graph in many cases.
+* Type tracking, and hence the API graph, is now able to correctly trace trough comprehensions.
+* More precise modelling of the dataflow through comprehensions. In particular, captured variables are now handled correctly.
+* Dataflow out of yield is added, allowing proper tracing through generators.
+* Added several models of standard library functions and classes, in anticipation of no longer extracting the standard library in a future release.
+
 ## 2.1.0
 
 ### New Features
diff --git a/python/ql/lib/change-notes/2024-09-24-std-lib-models.md b/python/ql/lib/change-notes/2024-09-24-std-lib-models.md
deleted file mode 100644
index 3166e0c8ff0f..000000000000
--- a/python/ql/lib/change-notes/2024-09-24-std-lib-models.md
+++ /dev/null
@@ -1,4 +0,0 @@
----
-category: minorAnalysis
----
-* Added several models of standard library functions and classes, in anticipation of no longer extracting the standard library in a future release.
\ No newline at end of file
diff --git a/python/ql/lib/change-notes/2024-10-01-comprehension-flow.md b/python/ql/lib/change-notes/2024-10-01-comprehension-flow.md
deleted file mode 100644
index bc3165f05f33..000000000000
--- a/python/ql/lib/change-notes/2024-10-01-comprehension-flow.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-category: minorAnalysis
----
-* More precise modelling of the dataflow through comprehensions. In particular, captured variables are now handled correctly.
-* Dataflow out of yield is added, allowing proper tracing through generators.
\ No newline at end of file
diff --git a/python/ql/lib/change-notes/2024-10-03-typetracking-through-comprehensions.md b/python/ql/lib/change-notes/2024-10-03-typetracking-through-comprehensions.md
deleted file mode 100644
index 72d853460305..000000000000
--- a/python/ql/lib/change-notes/2024-10-03-typetracking-through-comprehensions.md
+++ /dev/null
@@ -1,4 +0,0 @@
----
-category: minorAnalysis
----
-* Type tracking, and hence the API graph, is now able to correctly trace trough comprehensions.
\ No newline at end of file
diff --git a/python/ql/lib/change-notes/2024-10-09-finditer-match.md b/python/ql/lib/change-notes/2024-10-09-finditer-match.md
deleted file mode 100644
index ee2ccc1119a4..000000000000
--- a/python/ql/lib/change-notes/2024-10-09-finditer-match.md
+++ /dev/null
@@ -1,4 +0,0 @@
----
-category: minorAnalysis
----
-* Modelled that `re.finditer` returns an iterable of `re.Match` objects. This is now understood by the API graph in many cases.
\ No newline at end of file
diff --git a/python/ql/lib/change-notes/released/2.1.1.md b/python/ql/lib/change-notes/released/2.1.1.md
new file mode 100644
index 000000000000..949fcd07f7aa
--- /dev/null
+++ b/python/ql/lib/change-notes/released/2.1.1.md
@@ -0,0 +1,9 @@
+## 2.1.1
+
+### Minor Analysis Improvements
+
+* Modelled that `re.finditer` returns an iterable of `re.Match` objects. This is now understood by the API graph in many cases.
+* Type tracking, and hence the API graph, is now able to correctly trace trough comprehensions.
+* More precise modelling of the dataflow through comprehensions. In particular, captured variables are now handled correctly.
+* Dataflow out of yield is added, allowing proper tracing through generators.
+* Added several models of standard library functions and classes, in anticipation of no longer extracting the standard library in a future release.
diff --git a/python/ql/lib/codeql-pack.release.yml b/python/ql/lib/codeql-pack.release.yml
index 487a1a58b2b8..576c2ea18d68 100644
--- a/python/ql/lib/codeql-pack.release.yml
+++ b/python/ql/lib/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 2.1.0
+lastReleaseVersion: 2.1.1
diff --git a/python/ql/lib/qlpack.yml b/python/ql/lib/qlpack.yml
index 445940cdd889..dd92c1068daf 100644
--- a/python/ql/lib/qlpack.yml
+++ b/python/ql/lib/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/python-all
-version: 2.1.1-dev
+version: 2.1.1
 groups: python
 dbscheme: semmlecode.python.dbscheme
 extractor: python
diff --git a/python/ql/src/CHANGELOG.md b/python/ql/src/CHANGELOG.md
index 21c9ebcf16f9..ea236eb11ba5 100644
--- a/python/ql/src/CHANGELOG.md
+++ b/python/ql/src/CHANGELOG.md
@@ -1,8 +1,12 @@
+## 1.3.1
+
+No user-facing changes.
+
 ## 1.3.0
 
 ### New Queries
 
-* The `py/cors-misconfiguration-with-credentials` query, which finds insecure CORS middleware configurations.
+* The experimental `py/cors-misconfiguration-with-credentials` query, which finds insecure CORS middleware configurations.
 
 ## 1.2.2
 
diff --git a/python/ql/src/change-notes/released/1.3.1.md b/python/ql/src/change-notes/released/1.3.1.md
new file mode 100644
index 000000000000..8dd9964197cb
--- /dev/null
+++ b/python/ql/src/change-notes/released/1.3.1.md
@@ -0,0 +1,3 @@
+## 1.3.1
+
+No user-facing changes.
diff --git a/python/ql/src/codeql-pack.release.yml b/python/ql/src/codeql-pack.release.yml
index ec16350ed6fd..e71b6d081f15 100644
--- a/python/ql/src/codeql-pack.release.yml
+++ b/python/ql/src/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 1.3.0
+lastReleaseVersion: 1.3.1
diff --git a/python/ql/src/qlpack.yml b/python/ql/src/qlpack.yml
index 3f5ee4e78041..52d6ee0b6032 100644
--- a/python/ql/src/qlpack.yml
+++ b/python/ql/src/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/python-queries
-version: 1.3.1-dev
+version: 1.3.1
 groups:
   - python
   - queries
diff --git a/ruby/ql/lib/CHANGELOG.md b/ruby/ql/lib/CHANGELOG.md
index 59c058c1c45c..fcfaf0238c21 100644
--- a/ruby/ql/lib/CHANGELOG.md
+++ b/ruby/ql/lib/CHANGELOG.md
@@ -1,3 +1,9 @@
+## 2.0.2
+
+### Minor Analysis Improvements
+
+* The `ExtractionError` class has been split into `ExtractionError` and `ExtractionWarning`, reporting extraction errors and warnings respectively.
+
 ## 2.0.1
 
 No user-facing changes.
diff --git a/ruby/ql/lib/change-notes/2024-10-03-extraction-warnings.md b/ruby/ql/lib/change-notes/released/2.0.2.md
similarity index 77%
rename from ruby/ql/lib/change-notes/2024-10-03-extraction-warnings.md
rename to ruby/ql/lib/change-notes/released/2.0.2.md
index 5d6128354c3b..9d7757a2e03e 100644
--- a/ruby/ql/lib/change-notes/2024-10-03-extraction-warnings.md
+++ b/ruby/ql/lib/change-notes/released/2.0.2.md
@@ -1,4 +1,5 @@
----
-category: minorAnalysis
----
+## 2.0.2
+
+### Minor Analysis Improvements
+
 * The `ExtractionError` class has been split into `ExtractionError` and `ExtractionWarning`, reporting extraction errors and warnings respectively.
diff --git a/ruby/ql/lib/codeql-pack.release.yml b/ruby/ql/lib/codeql-pack.release.yml
index fe974a4dbf37..81c7f1dbc13c 100644
--- a/ruby/ql/lib/codeql-pack.release.yml
+++ b/ruby/ql/lib/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 2.0.1
+lastReleaseVersion: 2.0.2
diff --git a/ruby/ql/lib/qlpack.yml b/ruby/ql/lib/qlpack.yml
index dc0b471a171d..53ea89afe3b1 100644
--- a/ruby/ql/lib/qlpack.yml
+++ b/ruby/ql/lib/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/ruby-all
-version: 2.0.2-dev
+version: 2.0.2
 groups: ruby
 extractor: ruby
 dbscheme: ruby.dbscheme
diff --git a/ruby/ql/src/CHANGELOG.md b/ruby/ql/src/CHANGELOG.md
index 5e9c68a56a01..363b517dec19 100644
--- a/ruby/ql/src/CHANGELOG.md
+++ b/ruby/ql/src/CHANGELOG.md
@@ -1,3 +1,9 @@
+## 1.1.5
+
+### Minor Analysis Improvements
+
+* The `rb/diagnostics/extraction-errors` diagnostic query has been split into `rb/diagnostics/extraction-errors` and `rb/diagnostics/extraction-warnings`, counting extraction errors and warnings respectively.
+
 ## 1.1.4
 
 No user-facing changes.
diff --git a/ruby/ql/src/change-notes/2024-10-03-extraction-warnings.md b/ruby/ql/src/change-notes/released/1.1.5.md
similarity index 82%
rename from ruby/ql/src/change-notes/2024-10-03-extraction-warnings.md
rename to ruby/ql/src/change-notes/released/1.1.5.md
index ac97cd1e7ba2..fd55457a718c 100644
--- a/ruby/ql/src/change-notes/2024-10-03-extraction-warnings.md
+++ b/ruby/ql/src/change-notes/released/1.1.5.md
@@ -1,4 +1,5 @@
----
-category: minorAnalysis
----
+## 1.1.5
+
+### Minor Analysis Improvements
+
 * The `rb/diagnostics/extraction-errors` diagnostic query has been split into `rb/diagnostics/extraction-errors` and `rb/diagnostics/extraction-warnings`, counting extraction errors and warnings respectively.
diff --git a/ruby/ql/src/codeql-pack.release.yml b/ruby/ql/src/codeql-pack.release.yml
index 26cbcd3f123b..df39a9de059d 100644
--- a/ruby/ql/src/codeql-pack.release.yml
+++ b/ruby/ql/src/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 1.1.4
+lastReleaseVersion: 1.1.5
diff --git a/ruby/ql/src/qlpack.yml b/ruby/ql/src/qlpack.yml
index b7eee713fbaa..2c0ea256429e 100644
--- a/ruby/ql/src/qlpack.yml
+++ b/ruby/ql/src/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/ruby-queries
-version: 1.1.5-dev
+version: 1.1.5
 groups:
   - ruby
   - queries
diff --git a/shared/controlflow/CHANGELOG.md b/shared/controlflow/CHANGELOG.md
index 52b731626290..7aaa7597d5bb 100644
--- a/shared/controlflow/CHANGELOG.md
+++ b/shared/controlflow/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 1.0.10
+
+No user-facing changes.
+
 ## 1.0.9
 
 No user-facing changes.
diff --git a/shared/controlflow/change-notes/released/1.0.10.md b/shared/controlflow/change-notes/released/1.0.10.md
new file mode 100644
index 000000000000..b601d8784532
--- /dev/null
+++ b/shared/controlflow/change-notes/released/1.0.10.md
@@ -0,0 +1,3 @@
+## 1.0.10
+
+No user-facing changes.
diff --git a/shared/controlflow/codeql-pack.release.yml b/shared/controlflow/codeql-pack.release.yml
index fb813c5ee050..3865dbcf4b2a 100644
--- a/shared/controlflow/codeql-pack.release.yml
+++ b/shared/controlflow/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 1.0.9
+lastReleaseVersion: 1.0.10
diff --git a/shared/controlflow/qlpack.yml b/shared/controlflow/qlpack.yml
index 532b2fa69a09..0d1248c09815 100644
--- a/shared/controlflow/qlpack.yml
+++ b/shared/controlflow/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/controlflow
-version: 1.0.10-dev
+version: 1.0.10
 groups: shared
 library: true
 dependencies:
diff --git a/shared/dataflow/CHANGELOG.md b/shared/dataflow/CHANGELOG.md
index 360dc9cc8bff..c9f031d51134 100644
--- a/shared/dataflow/CHANGELOG.md
+++ b/shared/dataflow/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 1.1.4
+
+No user-facing changes.
+
 ## 1.1.3
 
 No user-facing changes.
diff --git a/shared/dataflow/change-notes/released/1.1.4.md b/shared/dataflow/change-notes/released/1.1.4.md
new file mode 100644
index 000000000000..b95051903c5a
--- /dev/null
+++ b/shared/dataflow/change-notes/released/1.1.4.md
@@ -0,0 +1,3 @@
+## 1.1.4
+
+No user-facing changes.
diff --git a/shared/dataflow/codeql-pack.release.yml b/shared/dataflow/codeql-pack.release.yml
index 35e710ab1bf0..26cbcd3f123b 100644
--- a/shared/dataflow/codeql-pack.release.yml
+++ b/shared/dataflow/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 1.1.3
+lastReleaseVersion: 1.1.4
diff --git a/shared/dataflow/qlpack.yml b/shared/dataflow/qlpack.yml
index df5c8c4c38af..3d21af7c256b 100644
--- a/shared/dataflow/qlpack.yml
+++ b/shared/dataflow/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/dataflow
-version: 1.1.4-dev
+version: 1.1.4
 groups: shared
 library: true
 dependencies:
diff --git a/shared/mad/CHANGELOG.md b/shared/mad/CHANGELOG.md
index 7857f62905c7..02a3541df616 100644
--- a/shared/mad/CHANGELOG.md
+++ b/shared/mad/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 1.0.10
+
+No user-facing changes.
+
 ## 1.0.9
 
 No user-facing changes.
diff --git a/shared/mad/change-notes/released/1.0.10.md b/shared/mad/change-notes/released/1.0.10.md
new file mode 100644
index 000000000000..b601d8784532
--- /dev/null
+++ b/shared/mad/change-notes/released/1.0.10.md
@@ -0,0 +1,3 @@
+## 1.0.10
+
+No user-facing changes.
diff --git a/shared/mad/codeql-pack.release.yml b/shared/mad/codeql-pack.release.yml
index fb813c5ee050..3865dbcf4b2a 100644
--- a/shared/mad/codeql-pack.release.yml
+++ b/shared/mad/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 1.0.9
+lastReleaseVersion: 1.0.10
diff --git a/shared/mad/qlpack.yml b/shared/mad/qlpack.yml
index ef3755c80bc4..b45f7415c81a 100644
--- a/shared/mad/qlpack.yml
+++ b/shared/mad/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/mad
-version: 1.0.10-dev
+version: 1.0.10
 groups: shared
 library: true
 dependencies:
diff --git a/shared/rangeanalysis/CHANGELOG.md b/shared/rangeanalysis/CHANGELOG.md
index 5878f9b564c0..992ad108bcd6 100644
--- a/shared/rangeanalysis/CHANGELOG.md
+++ b/shared/rangeanalysis/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 1.0.10
+
+No user-facing changes.
+
 ## 1.0.9
 
 No user-facing changes.
diff --git a/shared/rangeanalysis/change-notes/released/1.0.10.md b/shared/rangeanalysis/change-notes/released/1.0.10.md
new file mode 100644
index 000000000000..b601d8784532
--- /dev/null
+++ b/shared/rangeanalysis/change-notes/released/1.0.10.md
@@ -0,0 +1,3 @@
+## 1.0.10
+
+No user-facing changes.
diff --git a/shared/rangeanalysis/codeql-pack.release.yml b/shared/rangeanalysis/codeql-pack.release.yml
index fb813c5ee050..3865dbcf4b2a 100644
--- a/shared/rangeanalysis/codeql-pack.release.yml
+++ b/shared/rangeanalysis/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 1.0.9
+lastReleaseVersion: 1.0.10
diff --git a/shared/rangeanalysis/qlpack.yml b/shared/rangeanalysis/qlpack.yml
index b4deed51c9d8..a11b83edace6 100644
--- a/shared/rangeanalysis/qlpack.yml
+++ b/shared/rangeanalysis/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/rangeanalysis
-version: 1.0.10-dev
+version: 1.0.10
 groups: shared
 library: true
 dependencies:
diff --git a/shared/regex/CHANGELOG.md b/shared/regex/CHANGELOG.md
index 01154f6c5f52..3a71d968b43c 100644
--- a/shared/regex/CHANGELOG.md
+++ b/shared/regex/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 1.0.10
+
+No user-facing changes.
+
 ## 1.0.9
 
 No user-facing changes.
diff --git a/shared/regex/change-notes/released/1.0.10.md b/shared/regex/change-notes/released/1.0.10.md
new file mode 100644
index 000000000000..b601d8784532
--- /dev/null
+++ b/shared/regex/change-notes/released/1.0.10.md
@@ -0,0 +1,3 @@
+## 1.0.10
+
+No user-facing changes.
diff --git a/shared/regex/codeql-pack.release.yml b/shared/regex/codeql-pack.release.yml
index fb813c5ee050..3865dbcf4b2a 100644
--- a/shared/regex/codeql-pack.release.yml
+++ b/shared/regex/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 1.0.9
+lastReleaseVersion: 1.0.10
diff --git a/shared/regex/qlpack.yml b/shared/regex/qlpack.yml
index 5593197f674b..bfb63fdee77f 100644
--- a/shared/regex/qlpack.yml
+++ b/shared/regex/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/regex
-version: 1.0.10-dev
+version: 1.0.10
 groups: shared
 library: true
 dependencies:
diff --git a/shared/ssa/CHANGELOG.md b/shared/ssa/CHANGELOG.md
index 85bef6a32845..76edd23e4428 100644
--- a/shared/ssa/CHANGELOG.md
+++ b/shared/ssa/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 1.0.10
+
+No user-facing changes.
+
 ## 1.0.9
 
 No user-facing changes.
diff --git a/shared/ssa/change-notes/released/1.0.10.md b/shared/ssa/change-notes/released/1.0.10.md
new file mode 100644
index 000000000000..b601d8784532
--- /dev/null
+++ b/shared/ssa/change-notes/released/1.0.10.md
@@ -0,0 +1,3 @@
+## 1.0.10
+
+No user-facing changes.
diff --git a/shared/ssa/codeql-pack.release.yml b/shared/ssa/codeql-pack.release.yml
index fb813c5ee050..3865dbcf4b2a 100644
--- a/shared/ssa/codeql-pack.release.yml
+++ b/shared/ssa/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 1.0.9
+lastReleaseVersion: 1.0.10
diff --git a/shared/ssa/qlpack.yml b/shared/ssa/qlpack.yml
index 7bc3773a575f..7e09739a333a 100644
--- a/shared/ssa/qlpack.yml
+++ b/shared/ssa/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/ssa
-version: 1.0.10-dev
+version: 1.0.10
 groups: shared
 library: true
 dependencies:
diff --git a/shared/threat-models/CHANGELOG.md b/shared/threat-models/CHANGELOG.md
index 9589b67148fa..b62e06e3dff0 100644
--- a/shared/threat-models/CHANGELOG.md
+++ b/shared/threat-models/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 1.0.10
+
+No user-facing changes.
+
 ## 1.0.9
 
 No user-facing changes.
diff --git a/shared/threat-models/change-notes/released/1.0.10.md b/shared/threat-models/change-notes/released/1.0.10.md
new file mode 100644
index 000000000000..b601d8784532
--- /dev/null
+++ b/shared/threat-models/change-notes/released/1.0.10.md
@@ -0,0 +1,3 @@
+## 1.0.10
+
+No user-facing changes.
diff --git a/shared/threat-models/codeql-pack.release.yml b/shared/threat-models/codeql-pack.release.yml
index fb813c5ee050..3865dbcf4b2a 100644
--- a/shared/threat-models/codeql-pack.release.yml
+++ b/shared/threat-models/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 1.0.9
+lastReleaseVersion: 1.0.10
diff --git a/shared/threat-models/qlpack.yml b/shared/threat-models/qlpack.yml
index dd4331d7e749..7609a088b6e9 100644
--- a/shared/threat-models/qlpack.yml
+++ b/shared/threat-models/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/threat-models
-version: 1.0.10-dev
+version: 1.0.10
 library: true
 groups: shared
 dataExtensions:
diff --git a/shared/tutorial/CHANGELOG.md b/shared/tutorial/CHANGELOG.md
index ba77e020439d..676b469b866a 100644
--- a/shared/tutorial/CHANGELOG.md
+++ b/shared/tutorial/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 1.0.10
+
+No user-facing changes.
+
 ## 1.0.9
 
 No user-facing changes.
diff --git a/shared/tutorial/change-notes/released/1.0.10.md b/shared/tutorial/change-notes/released/1.0.10.md
new file mode 100644
index 000000000000..b601d8784532
--- /dev/null
+++ b/shared/tutorial/change-notes/released/1.0.10.md
@@ -0,0 +1,3 @@
+## 1.0.10
+
+No user-facing changes.
diff --git a/shared/tutorial/codeql-pack.release.yml b/shared/tutorial/codeql-pack.release.yml
index fb813c5ee050..3865dbcf4b2a 100644
--- a/shared/tutorial/codeql-pack.release.yml
+++ b/shared/tutorial/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 1.0.9
+lastReleaseVersion: 1.0.10
diff --git a/shared/tutorial/qlpack.yml b/shared/tutorial/qlpack.yml
index 2390ce7ad116..1cfbfb40c91c 100644
--- a/shared/tutorial/qlpack.yml
+++ b/shared/tutorial/qlpack.yml
@@ -1,7 +1,7 @@
 name: codeql/tutorial
 description: Library for the CodeQL detective tutorials, helping new users learn to
   write CodeQL queries.
-version: 1.0.10-dev
+version: 1.0.10
 groups: shared
 library: true
 warnOnImplicitThis: true
diff --git a/shared/typeflow/CHANGELOG.md b/shared/typeflow/CHANGELOG.md
index 93c030dee3e4..19badb815f98 100644
--- a/shared/typeflow/CHANGELOG.md
+++ b/shared/typeflow/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 1.0.10
+
+No user-facing changes.
+
 ## 1.0.9
 
 No user-facing changes.
diff --git a/shared/typeflow/change-notes/released/1.0.10.md b/shared/typeflow/change-notes/released/1.0.10.md
new file mode 100644
index 000000000000..b601d8784532
--- /dev/null
+++ b/shared/typeflow/change-notes/released/1.0.10.md
@@ -0,0 +1,3 @@
+## 1.0.10
+
+No user-facing changes.
diff --git a/shared/typeflow/codeql-pack.release.yml b/shared/typeflow/codeql-pack.release.yml
index fb813c5ee050..3865dbcf4b2a 100644
--- a/shared/typeflow/codeql-pack.release.yml
+++ b/shared/typeflow/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 1.0.9
+lastReleaseVersion: 1.0.10
diff --git a/shared/typeflow/qlpack.yml b/shared/typeflow/qlpack.yml
index 04f843aacb5f..430f9e468126 100644
--- a/shared/typeflow/qlpack.yml
+++ b/shared/typeflow/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/typeflow
-version: 1.0.10-dev
+version: 1.0.10
 groups: shared
 library: true
 dependencies:
diff --git a/shared/typetracking/CHANGELOG.md b/shared/typetracking/CHANGELOG.md
index a4e57c221876..29b2bdbb3dae 100644
--- a/shared/typetracking/CHANGELOG.md
+++ b/shared/typetracking/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 1.0.10
+
+No user-facing changes.
+
 ## 1.0.9
 
 No user-facing changes.
diff --git a/shared/typetracking/change-notes/released/1.0.10.md b/shared/typetracking/change-notes/released/1.0.10.md
new file mode 100644
index 000000000000..b601d8784532
--- /dev/null
+++ b/shared/typetracking/change-notes/released/1.0.10.md
@@ -0,0 +1,3 @@
+## 1.0.10
+
+No user-facing changes.
diff --git a/shared/typetracking/codeql-pack.release.yml b/shared/typetracking/codeql-pack.release.yml
index fb813c5ee050..3865dbcf4b2a 100644
--- a/shared/typetracking/codeql-pack.release.yml
+++ b/shared/typetracking/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 1.0.9
+lastReleaseVersion: 1.0.10
diff --git a/shared/typetracking/qlpack.yml b/shared/typetracking/qlpack.yml
index e48446dc3e0b..d29f0c0bd6e4 100644
--- a/shared/typetracking/qlpack.yml
+++ b/shared/typetracking/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/typetracking
-version: 1.0.10-dev
+version: 1.0.10
 groups: shared
 library: true
 dependencies:
diff --git a/shared/typos/CHANGELOG.md b/shared/typos/CHANGELOG.md
index acee82ce867b..0f6b529e512c 100644
--- a/shared/typos/CHANGELOG.md
+++ b/shared/typos/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 1.0.10
+
+No user-facing changes.
+
 ## 1.0.9
 
 No user-facing changes.
diff --git a/shared/typos/change-notes/released/1.0.10.md b/shared/typos/change-notes/released/1.0.10.md
new file mode 100644
index 000000000000..b601d8784532
--- /dev/null
+++ b/shared/typos/change-notes/released/1.0.10.md
@@ -0,0 +1,3 @@
+## 1.0.10
+
+No user-facing changes.
diff --git a/shared/typos/codeql-pack.release.yml b/shared/typos/codeql-pack.release.yml
index fb813c5ee050..3865dbcf4b2a 100644
--- a/shared/typos/codeql-pack.release.yml
+++ b/shared/typos/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 1.0.9
+lastReleaseVersion: 1.0.10
diff --git a/shared/typos/qlpack.yml b/shared/typos/qlpack.yml
index 5eccd54b2afa..4e15f26a72c5 100644
--- a/shared/typos/qlpack.yml
+++ b/shared/typos/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/typos
-version: 1.0.10-dev
+version: 1.0.10
 groups: shared
 library: true
 warnOnImplicitThis: true
diff --git a/shared/util/CHANGELOG.md b/shared/util/CHANGELOG.md
index 2f918fd0416f..f81ed05cc13b 100644
--- a/shared/util/CHANGELOG.md
+++ b/shared/util/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 1.0.10
+
+No user-facing changes.
+
 ## 1.0.9
 
 No user-facing changes.
diff --git a/shared/util/change-notes/released/1.0.10.md b/shared/util/change-notes/released/1.0.10.md
new file mode 100644
index 000000000000..b601d8784532
--- /dev/null
+++ b/shared/util/change-notes/released/1.0.10.md
@@ -0,0 +1,3 @@
+## 1.0.10
+
+No user-facing changes.
diff --git a/shared/util/codeql-pack.release.yml b/shared/util/codeql-pack.release.yml
index fb813c5ee050..3865dbcf4b2a 100644
--- a/shared/util/codeql-pack.release.yml
+++ b/shared/util/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 1.0.9
+lastReleaseVersion: 1.0.10
diff --git a/shared/util/qlpack.yml b/shared/util/qlpack.yml
index 508143471db4..d73aee511702 100644
--- a/shared/util/qlpack.yml
+++ b/shared/util/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/util
-version: 1.0.10-dev
+version: 1.0.10
 groups: shared
 library: true
 dependencies: null
diff --git a/shared/xml/CHANGELOG.md b/shared/xml/CHANGELOG.md
index 90afd761e7d4..bc002596b451 100644
--- a/shared/xml/CHANGELOG.md
+++ b/shared/xml/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 1.0.10
+
+No user-facing changes.
+
 ## 1.0.9
 
 No user-facing changes.
diff --git a/shared/xml/change-notes/released/1.0.10.md b/shared/xml/change-notes/released/1.0.10.md
new file mode 100644
index 000000000000..b601d8784532
--- /dev/null
+++ b/shared/xml/change-notes/released/1.0.10.md
@@ -0,0 +1,3 @@
+## 1.0.10
+
+No user-facing changes.
diff --git a/shared/xml/codeql-pack.release.yml b/shared/xml/codeql-pack.release.yml
index fb813c5ee050..3865dbcf4b2a 100644
--- a/shared/xml/codeql-pack.release.yml
+++ b/shared/xml/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 1.0.9
+lastReleaseVersion: 1.0.10
diff --git a/shared/xml/qlpack.yml b/shared/xml/qlpack.yml
index a81184e65886..56f477c27e19 100644
--- a/shared/xml/qlpack.yml
+++ b/shared/xml/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/xml
-version: 1.0.10-dev
+version: 1.0.10
 groups: shared
 library: true
 dependencies:
diff --git a/shared/yaml/CHANGELOG.md b/shared/yaml/CHANGELOG.md
index 222c0ec037c6..a6804be01273 100644
--- a/shared/yaml/CHANGELOG.md
+++ b/shared/yaml/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 1.0.10
+
+No user-facing changes.
+
 ## 1.0.9
 
 No user-facing changes.
diff --git a/shared/yaml/change-notes/released/1.0.10.md b/shared/yaml/change-notes/released/1.0.10.md
new file mode 100644
index 000000000000..b601d8784532
--- /dev/null
+++ b/shared/yaml/change-notes/released/1.0.10.md
@@ -0,0 +1,3 @@
+## 1.0.10
+
+No user-facing changes.
diff --git a/shared/yaml/codeql-pack.release.yml b/shared/yaml/codeql-pack.release.yml
index fb813c5ee050..3865dbcf4b2a 100644
--- a/shared/yaml/codeql-pack.release.yml
+++ b/shared/yaml/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 1.0.9
+lastReleaseVersion: 1.0.10
diff --git a/shared/yaml/qlpack.yml b/shared/yaml/qlpack.yml
index 1df4193b862f..b1e351ce1968 100644
--- a/shared/yaml/qlpack.yml
+++ b/shared/yaml/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/yaml
-version: 1.0.10-dev
+version: 1.0.10
 groups: shared
 library: true
 warnOnImplicitThis: true
diff --git a/swift/ql/lib/CHANGELOG.md b/swift/ql/lib/CHANGELOG.md
index 5602ebc7d231..004e85afa62d 100644
--- a/swift/ql/lib/CHANGELOG.md
+++ b/swift/ql/lib/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 2.0.2
+
+No user-facing changes.
+
 ## 2.0.1
 
 ### Minor Analysis Improvements
diff --git a/swift/ql/lib/change-notes/released/2.0.2.md b/swift/ql/lib/change-notes/released/2.0.2.md
new file mode 100644
index 000000000000..862ef0e9df7c
--- /dev/null
+++ b/swift/ql/lib/change-notes/released/2.0.2.md
@@ -0,0 +1,3 @@
+## 2.0.2
+
+No user-facing changes.
diff --git a/swift/ql/lib/codeql-pack.release.yml b/swift/ql/lib/codeql-pack.release.yml
index fe974a4dbf37..81c7f1dbc13c 100644
--- a/swift/ql/lib/codeql-pack.release.yml
+++ b/swift/ql/lib/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 2.0.1
+lastReleaseVersion: 2.0.2
diff --git a/swift/ql/lib/qlpack.yml b/swift/ql/lib/qlpack.yml
index 1904a1b1ca48..31dd6d915f3d 100644
--- a/swift/ql/lib/qlpack.yml
+++ b/swift/ql/lib/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/swift-all
-version: 2.0.2-dev
+version: 2.0.2
 groups: swift
 extractor: swift
 dbscheme: swift.dbscheme
diff --git a/swift/ql/src/CHANGELOG.md b/swift/ql/src/CHANGELOG.md
index b47f96f9eb9e..daeeee421ba8 100644
--- a/swift/ql/src/CHANGELOG.md
+++ b/swift/ql/src/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 1.0.10
+
+No user-facing changes.
+
 ## 1.0.9
 
 No user-facing changes.
diff --git a/swift/ql/src/change-notes/released/1.0.10.md b/swift/ql/src/change-notes/released/1.0.10.md
new file mode 100644
index 000000000000..b601d8784532
--- /dev/null
+++ b/swift/ql/src/change-notes/released/1.0.10.md
@@ -0,0 +1,3 @@
+## 1.0.10
+
+No user-facing changes.
diff --git a/swift/ql/src/codeql-pack.release.yml b/swift/ql/src/codeql-pack.release.yml
index fb813c5ee050..3865dbcf4b2a 100644
--- a/swift/ql/src/codeql-pack.release.yml
+++ b/swift/ql/src/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 1.0.9
+lastReleaseVersion: 1.0.10
diff --git a/swift/ql/src/qlpack.yml b/swift/ql/src/qlpack.yml
index 6fbae9403605..17bf94f219d8 100644
--- a/swift/ql/src/qlpack.yml
+++ b/swift/ql/src/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/swift-queries
-version: 1.0.10-dev
+version: 1.0.10
 groups:
   - swift
   - queries

From 9ba804583774092cbb1634160cb74a3da7efb679 Mon Sep 17 00:00:00 2001
From: Arthur Baars <aibaars@github.com>
Date: Tue, 15 Oct 2024 11:06:20 +0000
Subject: [PATCH 341/347] Fix typos in changelog entries

---
 cpp/ql/src/CHANGELOG.md                      | 2 +-
 cpp/ql/src/change-notes/released/1.2.5.md    | 2 +-
 python/ql/lib/CHANGELOG.md                   | 2 +-
 python/ql/lib/change-notes/released/2.1.1.md | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/cpp/ql/src/CHANGELOG.md b/cpp/ql/src/CHANGELOG.md
index 7896479549fc..e73850bbfe96 100644
--- a/cpp/ql/src/CHANGELOG.md
+++ b/cpp/ql/src/CHANGELOG.md
@@ -2,7 +2,7 @@
 
 ### Minor Analysis Improvements
 
-* The `cpp/unclear-array-index-validation` ("Unclear validation of array index") query has been improved to reduce false positives increase true positives.
+* The `cpp/unclear-array-index-validation` ("Unclear validation of array index") query has been improved to reduce false positives and increase true positives.
 * Fixed false positives in the `cpp/uninitialized-local` ("Potentially uninitialized local variable") query if there are extraction errors in the function.
 * The `cpp/incorrect-string-type-conversion` query now produces fewer false positives caused by failure to detect byte arrays.
 * The `cpp/incorrect-string-type-conversion` query now produces fewer false positives caused by failure to recognize dynamic checks prior to possible dangerous widening.
diff --git a/cpp/ql/src/change-notes/released/1.2.5.md b/cpp/ql/src/change-notes/released/1.2.5.md
index cf937d43e6b3..04aead25cb99 100644
--- a/cpp/ql/src/change-notes/released/1.2.5.md
+++ b/cpp/ql/src/change-notes/released/1.2.5.md
@@ -2,7 +2,7 @@
 
 ### Minor Analysis Improvements
 
-* The `cpp/unclear-array-index-validation` ("Unclear validation of array index") query has been improved to reduce false positives increase true positives.
+* The `cpp/unclear-array-index-validation` ("Unclear validation of array index") query has been improved to reduce false positives and increase true positives.
 * Fixed false positives in the `cpp/uninitialized-local` ("Potentially uninitialized local variable") query if there are extraction errors in the function.
 * The `cpp/incorrect-string-type-conversion` query now produces fewer false positives caused by failure to detect byte arrays.
 * The `cpp/incorrect-string-type-conversion` query now produces fewer false positives caused by failure to recognize dynamic checks prior to possible dangerous widening.
diff --git a/python/ql/lib/CHANGELOG.md b/python/ql/lib/CHANGELOG.md
index 4832015d920d..c1f3765162e0 100644
--- a/python/ql/lib/CHANGELOG.md
+++ b/python/ql/lib/CHANGELOG.md
@@ -3,7 +3,7 @@
 ### Minor Analysis Improvements
 
 * Modelled that `re.finditer` returns an iterable of `re.Match` objects. This is now understood by the API graph in many cases.
-* Type tracking, and hence the API graph, is now able to correctly trace trough comprehensions.
+* Type tracking, and hence the API graph, is now able to correctly trace through comprehensions.
 * More precise modelling of the dataflow through comprehensions. In particular, captured variables are now handled correctly.
 * Dataflow out of yield is added, allowing proper tracing through generators.
 * Added several models of standard library functions and classes, in anticipation of no longer extracting the standard library in a future release.
diff --git a/python/ql/lib/change-notes/released/2.1.1.md b/python/ql/lib/change-notes/released/2.1.1.md
index 949fcd07f7aa..bd2b31a218d9 100644
--- a/python/ql/lib/change-notes/released/2.1.1.md
+++ b/python/ql/lib/change-notes/released/2.1.1.md
@@ -3,7 +3,7 @@
 ### Minor Analysis Improvements
 
 * Modelled that `re.finditer` returns an iterable of `re.Match` objects. This is now understood by the API graph in many cases.
-* Type tracking, and hence the API graph, is now able to correctly trace trough comprehensions.
+* Type tracking, and hence the API graph, is now able to correctly trace through comprehensions.
 * More precise modelling of the dataflow through comprehensions. In particular, captured variables are now handled correctly.
 * Dataflow out of yield is added, allowing proper tracing through generators.
 * Added several models of standard library functions and classes, in anticipation of no longer extracting the standard library in a future release.

From af6fc676ce821830608b65b0308a26804ed40d8c Mon Sep 17 00:00:00 2001
From: Arthur Baars <aibaars@github.com>
Date: Tue, 15 Oct 2024 13:34:38 +0200
Subject: [PATCH 342/347] Fix CWE coverage link in main index

---
 docs/codeql/index.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/codeql/index.html b/docs/codeql/index.html
index 2f9dcd451ef7..981599627bd6 100644
--- a/docs/codeql/index.html
+++ b/docs/codeql/index.html
@@ -101,7 +101,7 @@ <h2 class="Box-title text-mono f2 text-center">
                             latest version of CodeQL...</div>
                     </div>
                     <div class="Subhead border-0">
-                        <a href="query-help/codeql-cwe-coverage/">
+                        <a href="../codeql-query-help/codeql-cwe-coverage/">
                             <div class="Subhead-heading f4 text-center">CodeQL coverage of CWEs</div>
                         </a>
                         <div class="Subhead-description">Detailed information on the coverage of Common Weakness Enumerations (CWEs) in the latest release...</div>

From 30053da70db08643ef3fab1ffa543b6f8ebd0477 Mon Sep 17 00:00:00 2001
From: Rasmus Lerchedahl Petersen <yoff@github.com>
Date: Fri, 18 Oct 2024 13:32:24 +0200
Subject: [PATCH 343/347] Python: extra modelling of stdlib as a reaction to
 the latest QA run

---
 python/ql/lib/semmle/python/frameworks/Stdlib.model.yml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/python/ql/lib/semmle/python/frameworks/Stdlib.model.yml b/python/ql/lib/semmle/python/frameworks/Stdlib.model.yml
index 683b0aa9b3df..2969fbfb1ae7 100644
--- a/python/ql/lib/semmle/python/frameworks/Stdlib.model.yml
+++ b/python/ql/lib/semmle/python/frameworks/Stdlib.model.yml
@@ -65,6 +65,10 @@ extensions:
       - ["getopt", "Member[getopt]", "Argument[1,shortopts:,2,longopts:]", "ReturnValue.TupleElement[0].ListElement.TupleElement[0]", "taint"]
       # See https://docs.python.org/3/library/gettext.html#gettext.gettext
       - ["gettext", "Member[gettext]", "Argument[0,message:]", "ReturnValue", "taint"]
+      # See 
+      #  - https://docs.python.org/3/library/glob.html#glob.glob
+      #  - https://docs.python.org/3/library/glob.html#glob.iglob
+      - ["glob", "Member[glob,iglob]", "Argument[0,pathname:]", "ReturnValue", "taint"]
       # See https://docs.python.org/3/library/gzip.html#gzip.GzipFile
       - ["gzip.GzipFile!", "Subclass.Call", "Argument[0,filename:]", "ReturnValue", "taint"]
       # See
@@ -88,6 +92,8 @@ extensions:
       - ["nturl2path", "Member[url2pathname]", "Argument[0,url:]", "ReturnValue", "taint"]
       # See https://docs.python.org/3/library/optparse.html#optparse.OptionParser.parse_args
       - ["optparse.OptionParser", "Member[parse_args]", "Argument[0,args:,1,values:]", "ReturnValue.TupleElement[0,1]", "taint"]
+      # See https://docs.python.org/3/library/os.html#os.walk
+      - ["os", "Member[walk]", "Argument[0,top:]", "ReturnValue", "taint"]
       # See https://github.com/python/cpython/blob/3.10/Lib/pathlib.py#L972-L973
       - ["pathlib.Path", ".Member[__enter__]", "Argument[self]", "ReturnValue", "taint"]
       # See https://docs.python.org/3/library/os.html#os.PathLike.__fspath__

From 30e5a1223095896584f9a74c7287da306a42402c Mon Sep 17 00:00:00 2001
From: Rasmus Lerchedahl Petersen <yoff@github.com>
Date: Fri, 18 Oct 2024 15:14:51 +0200
Subject: [PATCH 344/347] Python: udate expectations

---
 .../CWE-022-UnsafeUnpacking/UnsafeUnpack.expected      |  2 +-
 .../Security/CWE-409/DecompressionBombs.expected       | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/python/ql/test/experimental/query-tests/Security/CWE-022-UnsafeUnpacking/UnsafeUnpack.expected b/python/ql/test/experimental/query-tests/Security/CWE-022-UnsafeUnpacking/UnsafeUnpack.expected
index 38d8719bfd0a..0f334d45ea83 100644
--- a/python/ql/test/experimental/query-tests/Security/CWE-022-UnsafeUnpacking/UnsafeUnpack.expected
+++ b/python/ql/test/experimental/query-tests/Security/CWE-022-UnsafeUnpacking/UnsafeUnpack.expected
@@ -75,7 +75,7 @@ edges
 | UnsafeUnpack.py:161:19:161:21 | ControlFlowNode for tar | UnsafeUnpack.py:163:33:163:35 | ControlFlowNode for tar | provenance |  |
 | UnsafeUnpack.py:161:25:161:46 | ControlFlowNode for Attribute() | UnsafeUnpack.py:161:19:161:21 | ControlFlowNode for tar | provenance |  |
 | UnsafeUnpack.py:161:38:161:45 | ControlFlowNode for savepath | UnsafeUnpack.py:161:25:161:46 | ControlFlowNode for Attribute() | provenance | Config |
-| UnsafeUnpack.py:161:38:161:45 | ControlFlowNode for savepath | UnsafeUnpack.py:161:25:161:46 | ControlFlowNode for Attribute() | provenance | MaD:67 |
+| UnsafeUnpack.py:161:38:161:45 | ControlFlowNode for savepath | UnsafeUnpack.py:161:25:161:46 | ControlFlowNode for Attribute() | provenance | MaD:69 |
 | UnsafeUnpack.py:163:23:163:28 | ControlFlowNode for member | UnsafeUnpack.py:166:37:166:42 | ControlFlowNode for member | provenance |  |
 | UnsafeUnpack.py:163:33:163:35 | ControlFlowNode for tar | UnsafeUnpack.py:163:23:163:28 | ControlFlowNode for member | provenance |  |
 | UnsafeUnpack.py:166:23:166:28 | [post] ControlFlowNode for result | UnsafeUnpack.py:167:67:167:72 | ControlFlowNode for result | provenance |  |
diff --git a/python/ql/test/experimental/query-tests/Security/CWE-409/DecompressionBombs.expected b/python/ql/test/experimental/query-tests/Security/CWE-409/DecompressionBombs.expected
index 7763cf2ad151..12d1b8282c73 100644
--- a/python/ql/test/experimental/query-tests/Security/CWE-409/DecompressionBombs.expected
+++ b/python/ql/test/experimental/query-tests/Security/CWE-409/DecompressionBombs.expected
@@ -1,23 +1,23 @@
 edges
 | test.py:10:16:10:24 | ControlFlowNode for file_path | test.py:11:21:11:29 | ControlFlowNode for file_path | provenance |  |
 | test.py:11:5:11:35 | ControlFlowNode for Attribute() | test.py:11:5:11:52 | ControlFlowNode for Attribute() | provenance | Config |
-| test.py:11:21:11:29 | ControlFlowNode for file_path | test.py:11:5:11:35 | ControlFlowNode for Attribute() | provenance | MaD:83 |
+| test.py:11:21:11:29 | ControlFlowNode for file_path | test.py:11:5:11:35 | ControlFlowNode for Attribute() | provenance | MaD:85 |
 | test.py:11:21:11:29 | ControlFlowNode for file_path | test.py:11:5:11:52 | ControlFlowNode for Attribute() | provenance | Config |
 | test.py:11:21:11:29 | ControlFlowNode for file_path | test.py:12:21:12:29 | ControlFlowNode for file_path | provenance |  |
 | test.py:12:5:12:35 | ControlFlowNode for Attribute() | test.py:12:5:12:48 | ControlFlowNode for Attribute() | provenance | Config |
-| test.py:12:21:12:29 | ControlFlowNode for file_path | test.py:12:5:12:35 | ControlFlowNode for Attribute() | provenance | MaD:83 |
+| test.py:12:21:12:29 | ControlFlowNode for file_path | test.py:12:5:12:35 | ControlFlowNode for Attribute() | provenance | MaD:85 |
 | test.py:12:21:12:29 | ControlFlowNode for file_path | test.py:12:5:12:48 | ControlFlowNode for Attribute() | provenance | Config |
 | test.py:12:21:12:29 | ControlFlowNode for file_path | test.py:14:26:14:34 | ControlFlowNode for file_path | provenance |  |
 | test.py:14:10:14:35 | ControlFlowNode for Attribute() | test.py:15:14:15:29 | ControlFlowNode for Attribute() | provenance | Config |
-| test.py:14:26:14:34 | ControlFlowNode for file_path | test.py:14:10:14:35 | ControlFlowNode for Attribute() | provenance | MaD:83 |
+| test.py:14:26:14:34 | ControlFlowNode for file_path | test.py:14:10:14:35 | ControlFlowNode for Attribute() | provenance | MaD:85 |
 | test.py:14:26:14:34 | ControlFlowNode for file_path | test.py:15:14:15:29 | ControlFlowNode for Attribute() | provenance | Config |
 | test.py:14:26:14:34 | ControlFlowNode for file_path | test.py:18:26:18:34 | ControlFlowNode for file_path | provenance |  |
 | test.py:18:10:18:35 | ControlFlowNode for Attribute() | test.py:19:14:19:39 | ControlFlowNode for Attribute() | provenance | Config |
-| test.py:18:26:18:34 | ControlFlowNode for file_path | test.py:18:10:18:35 | ControlFlowNode for Attribute() | provenance | MaD:83 |
+| test.py:18:26:18:34 | ControlFlowNode for file_path | test.py:18:10:18:35 | ControlFlowNode for Attribute() | provenance | MaD:85 |
 | test.py:18:26:18:34 | ControlFlowNode for file_path | test.py:19:14:19:39 | ControlFlowNode for Attribute() | provenance | Config |
 | test.py:18:26:18:34 | ControlFlowNode for file_path | test.py:22:21:22:29 | ControlFlowNode for file_path | provenance |  |
 | test.py:22:5:22:30 | ControlFlowNode for Attribute() | test.py:22:5:22:60 | ControlFlowNode for Attribute() | provenance | Config |
-| test.py:22:21:22:29 | ControlFlowNode for file_path | test.py:22:5:22:30 | ControlFlowNode for Attribute() | provenance | MaD:83 |
+| test.py:22:21:22:29 | ControlFlowNode for file_path | test.py:22:5:22:30 | ControlFlowNode for Attribute() | provenance | MaD:85 |
 | test.py:22:21:22:29 | ControlFlowNode for file_path | test.py:22:5:22:60 | ControlFlowNode for Attribute() | provenance | Config |
 | test.py:22:21:22:29 | ControlFlowNode for file_path | test.py:24:18:24:26 | ControlFlowNode for file_path | provenance |  |
 | test.py:24:18:24:26 | ControlFlowNode for file_path | test.py:24:5:24:52 | ControlFlowNode for Attribute() | provenance | Config |

From eb515f884bd478a26c00ba96be8f5de81aa21eb8 Mon Sep 17 00:00:00 2001
From: Arthur Baars <aibaars@github.com>
Date: Fri, 18 Oct 2024 17:06:20 +0200
Subject: [PATCH 345/347] Revert "Release preparation for version 2.19.2"

---
 cpp/ql/lib/CHANGELOG.md                                |  7 -------
 .../change-notes/2024-10-07-range-analysis-of-getc.md  |  4 ++++
 cpp/ql/lib/change-notes/2024-10-09-fopen-taint.md      |  4 ++++
 cpp/ql/lib/change-notes/released/2.0.2.md              |  6 ------
 cpp/ql/lib/codeql-pack.release.yml                     |  2 +-
 cpp/ql/lib/qlpack.yml                                  |  2 +-
 cpp/ql/src/CHANGELOG.md                                |  9 ---------
 .../2024-09-26-wcharcharconversion-false-positives.md  |  5 +++++
 .../src/change-notes/2024-10-02-uninitialized-local.md |  4 ++++
 .../2024-10-07-unclear-array-index-validation.md       |  4 ++++
 cpp/ql/src/change-notes/released/1.2.5.md              |  8 --------
 cpp/ql/src/codeql-pack.release.yml                     |  2 +-
 cpp/ql/src/qlpack.yml                                  |  2 +-
 csharp/ql/campaigns/Solorigate/lib/CHANGELOG.md        |  4 ----
 .../Solorigate/lib/change-notes/released/1.7.27.md     |  3 ---
 .../campaigns/Solorigate/lib/codeql-pack.release.yml   |  2 +-
 csharp/ql/campaigns/Solorigate/lib/qlpack.yml          |  2 +-
 csharp/ql/campaigns/Solorigate/src/CHANGELOG.md        |  4 ----
 .../Solorigate/src/change-notes/released/1.7.27.md     |  3 ---
 .../campaigns/Solorigate/src/codeql-pack.release.yml   |  2 +-
 csharp/ql/campaigns/Solorigate/src/qlpack.yml          |  2 +-
 csharp/ql/lib/CHANGELOG.md                             |  4 ----
 csharp/ql/lib/change-notes/released/3.0.1.md           |  3 ---
 csharp/ql/lib/codeql-pack.release.yml                  |  2 +-
 csharp/ql/lib/qlpack.yml                               |  2 +-
 csharp/ql/src/CHANGELOG.md                             |  4 ----
 csharp/ql/src/change-notes/released/1.0.10.md          |  3 ---
 csharp/ql/src/codeql-pack.release.yml                  |  2 +-
 csharp/ql/src/qlpack.yml                               |  2 +-
 go/ql/consistency-queries/CHANGELOG.md                 |  4 ----
 .../change-notes/released/1.0.10.md                    |  3 ---
 go/ql/consistency-queries/codeql-pack.release.yml      |  2 +-
 go/ql/consistency-queries/qlpack.yml                   |  2 +-
 go/ql/lib/CHANGELOG.md                                 |  8 --------
 .../2.1.1.md => 2024-08-29-add-stdin-threat-models.md} |  9 +++------
 .../change-notes/2024-09-03-tags-and-interface-ids.md  |  5 +++++
 go/ql/lib/codeql-pack.release.yml                      |  2 +-
 go/ql/lib/qlpack.yml                                   |  2 +-
 go/ql/src/CHANGELOG.md                                 |  4 ----
 go/ql/src/change-notes/released/1.1.1.md               |  3 ---
 go/ql/src/codeql-pack.release.yml                      |  2 +-
 go/ql/src/qlpack.yml                                   |  2 +-
 java/ql/automodel/src/CHANGELOG.md                     |  4 ----
 java/ql/automodel/src/change-notes/released/1.0.10.md  |  3 ---
 java/ql/automodel/src/codeql-pack.release.yml          |  2 +-
 java/ql/automodel/src/qlpack.yml                       |  2 +-
 java/ql/lib/CHANGELOG.md                               |  4 ----
 java/ql/lib/change-notes/released/4.1.1.md             |  3 ---
 java/ql/lib/codeql-pack.release.yml                    |  2 +-
 java/ql/lib/qlpack.yml                                 |  2 +-
 java/ql/src/CHANGELOG.md                               |  4 ----
 java/ql/src/change-notes/released/1.1.7.md             |  3 ---
 java/ql/src/codeql-pack.release.yml                    |  2 +-
 java/ql/src/qlpack.yml                                 |  2 +-
 javascript/ql/lib/CHANGELOG.md                         |  4 ----
 javascript/ql/lib/change-notes/released/2.0.2.md       |  3 ---
 javascript/ql/lib/codeql-pack.release.yml              |  2 +-
 javascript/ql/lib/qlpack.yml                           |  2 +-
 javascript/ql/src/CHANGELOG.md                         |  4 ----
 javascript/ql/src/change-notes/released/1.2.2.md       |  3 ---
 javascript/ql/src/codeql-pack.release.yml              |  2 +-
 javascript/ql/src/qlpack.yml                           |  2 +-
 misc/suite-helpers/CHANGELOG.md                        |  4 ----
 misc/suite-helpers/change-notes/released/1.0.10.md     |  3 ---
 misc/suite-helpers/codeql-pack.release.yml             |  2 +-
 misc/suite-helpers/qlpack.yml                          |  2 +-
 python/ql/lib/CHANGELOG.md                             | 10 ----------
 .../ql/lib/change-notes/2024-09-24-std-lib-models.md   |  4 ++++
 .../lib/change-notes/2024-10-01-comprehension-flow.md  |  5 +++++
 .../2024-10-03-typetracking-through-comprehensions.md  |  4 ++++
 .../ql/lib/change-notes/2024-10-09-finditer-match.md   |  4 ++++
 python/ql/lib/change-notes/released/2.1.1.md           |  9 ---------
 python/ql/lib/codeql-pack.release.yml                  |  2 +-
 python/ql/lib/qlpack.yml                               |  2 +-
 python/ql/src/CHANGELOG.md                             |  6 +-----
 python/ql/src/change-notes/released/1.3.1.md           |  3 ---
 python/ql/src/codeql-pack.release.yml                  |  2 +-
 python/ql/src/qlpack.yml                               |  2 +-
 ruby/ql/lib/CHANGELOG.md                               |  6 ------
 .../2.0.2.md => 2024-10-03-extraction-warnings.md}     |  7 +++----
 ruby/ql/lib/codeql-pack.release.yml                    |  2 +-
 ruby/ql/lib/qlpack.yml                                 |  2 +-
 ruby/ql/src/CHANGELOG.md                               |  6 ------
 .../1.1.5.md => 2024-10-03-extraction-warnings.md}     |  7 +++----
 ruby/ql/src/codeql-pack.release.yml                    |  2 +-
 ruby/ql/src/qlpack.yml                                 |  2 +-
 shared/controlflow/CHANGELOG.md                        |  4 ----
 shared/controlflow/change-notes/released/1.0.10.md     |  3 ---
 shared/controlflow/codeql-pack.release.yml             |  2 +-
 shared/controlflow/qlpack.yml                          |  2 +-
 shared/dataflow/CHANGELOG.md                           |  4 ----
 shared/dataflow/change-notes/released/1.1.4.md         |  3 ---
 shared/dataflow/codeql-pack.release.yml                |  2 +-
 shared/dataflow/qlpack.yml                             |  2 +-
 shared/mad/CHANGELOG.md                                |  4 ----
 shared/mad/change-notes/released/1.0.10.md             |  3 ---
 shared/mad/codeql-pack.release.yml                     |  2 +-
 shared/mad/qlpack.yml                                  |  2 +-
 shared/rangeanalysis/CHANGELOG.md                      |  4 ----
 shared/rangeanalysis/change-notes/released/1.0.10.md   |  3 ---
 shared/rangeanalysis/codeql-pack.release.yml           |  2 +-
 shared/rangeanalysis/qlpack.yml                        |  2 +-
 shared/regex/CHANGELOG.md                              |  4 ----
 shared/regex/change-notes/released/1.0.10.md           |  3 ---
 shared/regex/codeql-pack.release.yml                   |  2 +-
 shared/regex/qlpack.yml                                |  2 +-
 shared/ssa/CHANGELOG.md                                |  4 ----
 shared/ssa/change-notes/released/1.0.10.md             |  3 ---
 shared/ssa/codeql-pack.release.yml                     |  2 +-
 shared/ssa/qlpack.yml                                  |  2 +-
 shared/threat-models/CHANGELOG.md                      |  4 ----
 shared/threat-models/change-notes/released/1.0.10.md   |  3 ---
 shared/threat-models/codeql-pack.release.yml           |  2 +-
 shared/threat-models/qlpack.yml                        |  2 +-
 shared/tutorial/CHANGELOG.md                           |  4 ----
 shared/tutorial/change-notes/released/1.0.10.md        |  3 ---
 shared/tutorial/codeql-pack.release.yml                |  2 +-
 shared/tutorial/qlpack.yml                             |  2 +-
 shared/typeflow/CHANGELOG.md                           |  4 ----
 shared/typeflow/change-notes/released/1.0.10.md        |  3 ---
 shared/typeflow/codeql-pack.release.yml                |  2 +-
 shared/typeflow/qlpack.yml                             |  2 +-
 shared/typetracking/CHANGELOG.md                       |  4 ----
 shared/typetracking/change-notes/released/1.0.10.md    |  3 ---
 shared/typetracking/codeql-pack.release.yml            |  2 +-
 shared/typetracking/qlpack.yml                         |  2 +-
 shared/typos/CHANGELOG.md                              |  4 ----
 shared/typos/change-notes/released/1.0.10.md           |  3 ---
 shared/typos/codeql-pack.release.yml                   |  2 +-
 shared/typos/qlpack.yml                                |  2 +-
 shared/util/CHANGELOG.md                               |  4 ----
 shared/util/change-notes/released/1.0.10.md            |  3 ---
 shared/util/codeql-pack.release.yml                    |  2 +-
 shared/util/qlpack.yml                                 |  2 +-
 shared/xml/CHANGELOG.md                                |  4 ----
 shared/xml/change-notes/released/1.0.10.md             |  3 ---
 shared/xml/codeql-pack.release.yml                     |  2 +-
 shared/xml/qlpack.yml                                  |  2 +-
 shared/yaml/CHANGELOG.md                               |  4 ----
 shared/yaml/change-notes/released/1.0.10.md            |  3 ---
 shared/yaml/codeql-pack.release.yml                    |  2 +-
 shared/yaml/qlpack.yml                                 |  2 +-
 swift/ql/lib/CHANGELOG.md                              |  4 ----
 swift/ql/lib/change-notes/released/2.0.2.md            |  3 ---
 swift/ql/lib/codeql-pack.release.yml                   |  2 +-
 swift/ql/lib/qlpack.yml                                |  2 +-
 swift/ql/src/CHANGELOG.md                              |  4 ----
 swift/ql/src/change-notes/released/1.0.10.md           |  3 ---
 swift/ql/src/codeql-pack.release.yml                   |  2 +-
 swift/ql/src/qlpack.yml                                |  2 +-
 150 files changed, 123 insertions(+), 357 deletions(-)
 create mode 100644 cpp/ql/lib/change-notes/2024-10-07-range-analysis-of-getc.md
 create mode 100644 cpp/ql/lib/change-notes/2024-10-09-fopen-taint.md
 delete mode 100644 cpp/ql/lib/change-notes/released/2.0.2.md
 create mode 100644 cpp/ql/src/change-notes/2024-09-26-wcharcharconversion-false-positives.md
 create mode 100644 cpp/ql/src/change-notes/2024-10-02-uninitialized-local.md
 create mode 100644 cpp/ql/src/change-notes/2024-10-07-unclear-array-index-validation.md
 delete mode 100644 cpp/ql/src/change-notes/released/1.2.5.md
 delete mode 100644 csharp/ql/campaigns/Solorigate/lib/change-notes/released/1.7.27.md
 delete mode 100644 csharp/ql/campaigns/Solorigate/src/change-notes/released/1.7.27.md
 delete mode 100644 csharp/ql/lib/change-notes/released/3.0.1.md
 delete mode 100644 csharp/ql/src/change-notes/released/1.0.10.md
 delete mode 100644 go/ql/consistency-queries/change-notes/released/1.0.10.md
 rename go/ql/lib/change-notes/{released/2.1.1.md => 2024-08-29-add-stdin-threat-models.md} (64%)
 create mode 100644 go/ql/lib/change-notes/2024-09-03-tags-and-interface-ids.md
 delete mode 100644 go/ql/src/change-notes/released/1.1.1.md
 delete mode 100644 java/ql/automodel/src/change-notes/released/1.0.10.md
 delete mode 100644 java/ql/lib/change-notes/released/4.1.1.md
 delete mode 100644 java/ql/src/change-notes/released/1.1.7.md
 delete mode 100644 javascript/ql/lib/change-notes/released/2.0.2.md
 delete mode 100644 javascript/ql/src/change-notes/released/1.2.2.md
 delete mode 100644 misc/suite-helpers/change-notes/released/1.0.10.md
 create mode 100644 python/ql/lib/change-notes/2024-09-24-std-lib-models.md
 create mode 100644 python/ql/lib/change-notes/2024-10-01-comprehension-flow.md
 create mode 100644 python/ql/lib/change-notes/2024-10-03-typetracking-through-comprehensions.md
 create mode 100644 python/ql/lib/change-notes/2024-10-09-finditer-match.md
 delete mode 100644 python/ql/lib/change-notes/released/2.1.1.md
 delete mode 100644 python/ql/src/change-notes/released/1.3.1.md
 rename ruby/ql/lib/change-notes/{released/2.0.2.md => 2024-10-03-extraction-warnings.md} (77%)
 rename ruby/ql/src/change-notes/{released/1.1.5.md => 2024-10-03-extraction-warnings.md} (82%)
 delete mode 100644 shared/controlflow/change-notes/released/1.0.10.md
 delete mode 100644 shared/dataflow/change-notes/released/1.1.4.md
 delete mode 100644 shared/mad/change-notes/released/1.0.10.md
 delete mode 100644 shared/rangeanalysis/change-notes/released/1.0.10.md
 delete mode 100644 shared/regex/change-notes/released/1.0.10.md
 delete mode 100644 shared/ssa/change-notes/released/1.0.10.md
 delete mode 100644 shared/threat-models/change-notes/released/1.0.10.md
 delete mode 100644 shared/tutorial/change-notes/released/1.0.10.md
 delete mode 100644 shared/typeflow/change-notes/released/1.0.10.md
 delete mode 100644 shared/typetracking/change-notes/released/1.0.10.md
 delete mode 100644 shared/typos/change-notes/released/1.0.10.md
 delete mode 100644 shared/util/change-notes/released/1.0.10.md
 delete mode 100644 shared/xml/change-notes/released/1.0.10.md
 delete mode 100644 shared/yaml/change-notes/released/1.0.10.md
 delete mode 100644 swift/ql/lib/change-notes/released/2.0.2.md
 delete mode 100644 swift/ql/src/change-notes/released/1.0.10.md

diff --git a/cpp/ql/lib/CHANGELOG.md b/cpp/ql/lib/CHANGELOG.md
index 73c42c5dfa07..5d39629f62b0 100644
--- a/cpp/ql/lib/CHANGELOG.md
+++ b/cpp/ql/lib/CHANGELOG.md
@@ -1,10 +1,3 @@
-## 2.0.2
-
-### Minor Analysis Improvements
-
-* Added taint flow model for `fopen` and related functions.
-* The `SimpleRangeAnalysis` library (`semmle.code.cpp.rangeanalysis.SimpleRangeAnalysis`) now generates more precise ranges for calls to `fgetc` and `getc`.
-
 ## 2.0.1
 
 No user-facing changes.
diff --git a/cpp/ql/lib/change-notes/2024-10-07-range-analysis-of-getc.md b/cpp/ql/lib/change-notes/2024-10-07-range-analysis-of-getc.md
new file mode 100644
index 000000000000..f796fba2ece2
--- /dev/null
+++ b/cpp/ql/lib/change-notes/2024-10-07-range-analysis-of-getc.md
@@ -0,0 +1,4 @@
+---
+category: minorAnalysis
+---
+* The `SimpleRangeAnalysis` library (`semmle.code.cpp.rangeanalysis.SimpleRangeAnalysis`) now generates more precise ranges for calls to `fgetc` and `getc`.
\ No newline at end of file
diff --git a/cpp/ql/lib/change-notes/2024-10-09-fopen-taint.md b/cpp/ql/lib/change-notes/2024-10-09-fopen-taint.md
new file mode 100644
index 000000000000..d2516859a910
--- /dev/null
+++ b/cpp/ql/lib/change-notes/2024-10-09-fopen-taint.md
@@ -0,0 +1,4 @@
+---
+category: minorAnalysis
+---
+* Added taint flow model for `fopen` and related functions.
\ No newline at end of file
diff --git a/cpp/ql/lib/change-notes/released/2.0.2.md b/cpp/ql/lib/change-notes/released/2.0.2.md
deleted file mode 100644
index db3a11e55a8e..000000000000
--- a/cpp/ql/lib/change-notes/released/2.0.2.md
+++ /dev/null
@@ -1,6 +0,0 @@
-## 2.0.2
-
-### Minor Analysis Improvements
-
-* Added taint flow model for `fopen` and related functions.
-* The `SimpleRangeAnalysis` library (`semmle.code.cpp.rangeanalysis.SimpleRangeAnalysis`) now generates more precise ranges for calls to `fgetc` and `getc`.
diff --git a/cpp/ql/lib/codeql-pack.release.yml b/cpp/ql/lib/codeql-pack.release.yml
index 81c7f1dbc13c..fe974a4dbf37 100644
--- a/cpp/ql/lib/codeql-pack.release.yml
+++ b/cpp/ql/lib/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 2.0.2
+lastReleaseVersion: 2.0.1
diff --git a/cpp/ql/lib/qlpack.yml b/cpp/ql/lib/qlpack.yml
index 91af68ed6411..ba5db8c6e6f9 100644
--- a/cpp/ql/lib/qlpack.yml
+++ b/cpp/ql/lib/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/cpp-all
-version: 2.0.2
+version: 2.0.2-dev
 groups: cpp
 dbscheme: semmlecode.cpp.dbscheme
 extractor: cpp
diff --git a/cpp/ql/src/CHANGELOG.md b/cpp/ql/src/CHANGELOG.md
index e73850bbfe96..8eaccb0404dc 100644
--- a/cpp/ql/src/CHANGELOG.md
+++ b/cpp/ql/src/CHANGELOG.md
@@ -1,12 +1,3 @@
-## 1.2.5
-
-### Minor Analysis Improvements
-
-* The `cpp/unclear-array-index-validation` ("Unclear validation of array index") query has been improved to reduce false positives and increase true positives.
-* Fixed false positives in the `cpp/uninitialized-local` ("Potentially uninitialized local variable") query if there are extraction errors in the function.
-* The `cpp/incorrect-string-type-conversion` query now produces fewer false positives caused by failure to detect byte arrays.
-* The `cpp/incorrect-string-type-conversion` query now produces fewer false positives caused by failure to recognize dynamic checks prior to possible dangerous widening.
-
 ## 1.2.4
 
 ### Minor Analysis Improvements
diff --git a/cpp/ql/src/change-notes/2024-09-26-wcharcharconversion-false-positives.md b/cpp/ql/src/change-notes/2024-09-26-wcharcharconversion-false-positives.md
new file mode 100644
index 000000000000..b0fa7a953c59
--- /dev/null
+++ b/cpp/ql/src/change-notes/2024-09-26-wcharcharconversion-false-positives.md
@@ -0,0 +1,5 @@
+---
+category: minorAnalysis
+---
+* The `cpp/incorrect-string-type-conversion` query now produces fewer false positives caused by failure to detect byte arrays.
+* The `cpp/incorrect-string-type-conversion` query now produces fewer false positives caused by failure to recognize dynamic checks prior to possible dangerous widening.
\ No newline at end of file
diff --git a/cpp/ql/src/change-notes/2024-10-02-uninitialized-local.md b/cpp/ql/src/change-notes/2024-10-02-uninitialized-local.md
new file mode 100644
index 000000000000..e34a942f38a6
--- /dev/null
+++ b/cpp/ql/src/change-notes/2024-10-02-uninitialized-local.md
@@ -0,0 +1,4 @@
+---
+category: minorAnalysis
+---
+* Fixed false positives in the `cpp/uninitialized-local` ("Potentially uninitialized local variable") query if there are extraction errors in the function.
diff --git a/cpp/ql/src/change-notes/2024-10-07-unclear-array-index-validation.md b/cpp/ql/src/change-notes/2024-10-07-unclear-array-index-validation.md
new file mode 100644
index 000000000000..b237afdd6be8
--- /dev/null
+++ b/cpp/ql/src/change-notes/2024-10-07-unclear-array-index-validation.md
@@ -0,0 +1,4 @@
+---
+category: minorAnalysis
+---
+* The `cpp/unclear-array-index-validation` ("Unclear validation of array index") query has been improved to reduce false positives increase true positives.
\ No newline at end of file
diff --git a/cpp/ql/src/change-notes/released/1.2.5.md b/cpp/ql/src/change-notes/released/1.2.5.md
deleted file mode 100644
index 04aead25cb99..000000000000
--- a/cpp/ql/src/change-notes/released/1.2.5.md
+++ /dev/null
@@ -1,8 +0,0 @@
-## 1.2.5
-
-### Minor Analysis Improvements
-
-* The `cpp/unclear-array-index-validation` ("Unclear validation of array index") query has been improved to reduce false positives and increase true positives.
-* Fixed false positives in the `cpp/uninitialized-local` ("Potentially uninitialized local variable") query if there are extraction errors in the function.
-* The `cpp/incorrect-string-type-conversion` query now produces fewer false positives caused by failure to detect byte arrays.
-* The `cpp/incorrect-string-type-conversion` query now produces fewer false positives caused by failure to recognize dynamic checks prior to possible dangerous widening.
diff --git a/cpp/ql/src/codeql-pack.release.yml b/cpp/ql/src/codeql-pack.release.yml
index 40355f0807f9..172090f46b6d 100644
--- a/cpp/ql/src/codeql-pack.release.yml
+++ b/cpp/ql/src/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 1.2.5
+lastReleaseVersion: 1.2.4
diff --git a/cpp/ql/src/qlpack.yml b/cpp/ql/src/qlpack.yml
index eee6e064b22f..d01ac2f048c2 100644
--- a/cpp/ql/src/qlpack.yml
+++ b/cpp/ql/src/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/cpp-queries
-version: 1.2.5
+version: 1.2.5-dev
 groups:
   - cpp
   - queries
diff --git a/csharp/ql/campaigns/Solorigate/lib/CHANGELOG.md b/csharp/ql/campaigns/Solorigate/lib/CHANGELOG.md
index eb646b9ce77f..989d5e74408f 100644
--- a/csharp/ql/campaigns/Solorigate/lib/CHANGELOG.md
+++ b/csharp/ql/campaigns/Solorigate/lib/CHANGELOG.md
@@ -1,7 +1,3 @@
-## 1.7.27
-
-No user-facing changes.
-
 ## 1.7.26
 
 No user-facing changes.
diff --git a/csharp/ql/campaigns/Solorigate/lib/change-notes/released/1.7.27.md b/csharp/ql/campaigns/Solorigate/lib/change-notes/released/1.7.27.md
deleted file mode 100644
index 7d323c891002..000000000000
--- a/csharp/ql/campaigns/Solorigate/lib/change-notes/released/1.7.27.md
+++ /dev/null
@@ -1,3 +0,0 @@
-## 1.7.27
-
-No user-facing changes.
diff --git a/csharp/ql/campaigns/Solorigate/lib/codeql-pack.release.yml b/csharp/ql/campaigns/Solorigate/lib/codeql-pack.release.yml
index 5c0490dbda8e..ca4c34e70d1b 100644
--- a/csharp/ql/campaigns/Solorigate/lib/codeql-pack.release.yml
+++ b/csharp/ql/campaigns/Solorigate/lib/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 1.7.27
+lastReleaseVersion: 1.7.26
diff --git a/csharp/ql/campaigns/Solorigate/lib/qlpack.yml b/csharp/ql/campaigns/Solorigate/lib/qlpack.yml
index e02f2f0733ce..3cab08a0f3ec 100644
--- a/csharp/ql/campaigns/Solorigate/lib/qlpack.yml
+++ b/csharp/ql/campaigns/Solorigate/lib/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/csharp-solorigate-all
-version: 1.7.27
+version: 1.7.27-dev
 groups:
   - csharp
   - solorigate
diff --git a/csharp/ql/campaigns/Solorigate/src/CHANGELOG.md b/csharp/ql/campaigns/Solorigate/src/CHANGELOG.md
index eb646b9ce77f..989d5e74408f 100644
--- a/csharp/ql/campaigns/Solorigate/src/CHANGELOG.md
+++ b/csharp/ql/campaigns/Solorigate/src/CHANGELOG.md
@@ -1,7 +1,3 @@
-## 1.7.27
-
-No user-facing changes.
-
 ## 1.7.26
 
 No user-facing changes.
diff --git a/csharp/ql/campaigns/Solorigate/src/change-notes/released/1.7.27.md b/csharp/ql/campaigns/Solorigate/src/change-notes/released/1.7.27.md
deleted file mode 100644
index 7d323c891002..000000000000
--- a/csharp/ql/campaigns/Solorigate/src/change-notes/released/1.7.27.md
+++ /dev/null
@@ -1,3 +0,0 @@
-## 1.7.27
-
-No user-facing changes.
diff --git a/csharp/ql/campaigns/Solorigate/src/codeql-pack.release.yml b/csharp/ql/campaigns/Solorigate/src/codeql-pack.release.yml
index 5c0490dbda8e..ca4c34e70d1b 100644
--- a/csharp/ql/campaigns/Solorigate/src/codeql-pack.release.yml
+++ b/csharp/ql/campaigns/Solorigate/src/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 1.7.27
+lastReleaseVersion: 1.7.26
diff --git a/csharp/ql/campaigns/Solorigate/src/qlpack.yml b/csharp/ql/campaigns/Solorigate/src/qlpack.yml
index d94e11459d4c..c46baf0b2518 100644
--- a/csharp/ql/campaigns/Solorigate/src/qlpack.yml
+++ b/csharp/ql/campaigns/Solorigate/src/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/csharp-solorigate-queries
-version: 1.7.27
+version: 1.7.27-dev
 groups:
   - csharp
   - solorigate
diff --git a/csharp/ql/lib/CHANGELOG.md b/csharp/ql/lib/CHANGELOG.md
index 302087e4f147..7e8378798830 100644
--- a/csharp/ql/lib/CHANGELOG.md
+++ b/csharp/ql/lib/CHANGELOG.md
@@ -1,7 +1,3 @@
-## 3.0.1
-
-No user-facing changes.
-
 ## 3.0.0
 
 ### Breaking Changes
diff --git a/csharp/ql/lib/change-notes/released/3.0.1.md b/csharp/ql/lib/change-notes/released/3.0.1.md
deleted file mode 100644
index ac5998ace618..000000000000
--- a/csharp/ql/lib/change-notes/released/3.0.1.md
+++ /dev/null
@@ -1,3 +0,0 @@
-## 3.0.1
-
-No user-facing changes.
diff --git a/csharp/ql/lib/codeql-pack.release.yml b/csharp/ql/lib/codeql-pack.release.yml
index e3b15d965db6..33d3a2cd1139 100644
--- a/csharp/ql/lib/codeql-pack.release.yml
+++ b/csharp/ql/lib/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 3.0.1
+lastReleaseVersion: 3.0.0
diff --git a/csharp/ql/lib/qlpack.yml b/csharp/ql/lib/qlpack.yml
index 1515544bc960..55a99929ac87 100644
--- a/csharp/ql/lib/qlpack.yml
+++ b/csharp/ql/lib/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/csharp-all
-version: 3.0.1
+version: 3.0.1-dev
 groups: csharp
 dbscheme: semmlecode.csharp.dbscheme
 extractor: csharp
diff --git a/csharp/ql/src/CHANGELOG.md b/csharp/ql/src/CHANGELOG.md
index 59a98aca72a2..4c162b64d8f7 100644
--- a/csharp/ql/src/CHANGELOG.md
+++ b/csharp/ql/src/CHANGELOG.md
@@ -1,7 +1,3 @@
-## 1.0.10
-
-No user-facing changes.
-
 ## 1.0.9
 
 ### Minor Analysis Improvements
diff --git a/csharp/ql/src/change-notes/released/1.0.10.md b/csharp/ql/src/change-notes/released/1.0.10.md
deleted file mode 100644
index b601d8784532..000000000000
--- a/csharp/ql/src/change-notes/released/1.0.10.md
+++ /dev/null
@@ -1,3 +0,0 @@
-## 1.0.10
-
-No user-facing changes.
diff --git a/csharp/ql/src/codeql-pack.release.yml b/csharp/ql/src/codeql-pack.release.yml
index 3865dbcf4b2a..fb813c5ee050 100644
--- a/csharp/ql/src/codeql-pack.release.yml
+++ b/csharp/ql/src/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 1.0.10
+lastReleaseVersion: 1.0.9
diff --git a/csharp/ql/src/qlpack.yml b/csharp/ql/src/qlpack.yml
index 90e7ec11d865..6209cc5f88d5 100644
--- a/csharp/ql/src/qlpack.yml
+++ b/csharp/ql/src/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/csharp-queries
-version: 1.0.10
+version: 1.0.10-dev
 groups:
   - csharp
   - queries
diff --git a/go/ql/consistency-queries/CHANGELOG.md b/go/ql/consistency-queries/CHANGELOG.md
index b62e06e3dff0..9589b67148fa 100644
--- a/go/ql/consistency-queries/CHANGELOG.md
+++ b/go/ql/consistency-queries/CHANGELOG.md
@@ -1,7 +1,3 @@
-## 1.0.10
-
-No user-facing changes.
-
 ## 1.0.9
 
 No user-facing changes.
diff --git a/go/ql/consistency-queries/change-notes/released/1.0.10.md b/go/ql/consistency-queries/change-notes/released/1.0.10.md
deleted file mode 100644
index b601d8784532..000000000000
--- a/go/ql/consistency-queries/change-notes/released/1.0.10.md
+++ /dev/null
@@ -1,3 +0,0 @@
-## 1.0.10
-
-No user-facing changes.
diff --git a/go/ql/consistency-queries/codeql-pack.release.yml b/go/ql/consistency-queries/codeql-pack.release.yml
index 3865dbcf4b2a..fb813c5ee050 100644
--- a/go/ql/consistency-queries/codeql-pack.release.yml
+++ b/go/ql/consistency-queries/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 1.0.10
+lastReleaseVersion: 1.0.9
diff --git a/go/ql/consistency-queries/qlpack.yml b/go/ql/consistency-queries/qlpack.yml
index 726aa918f891..5a7ca8082a53 100644
--- a/go/ql/consistency-queries/qlpack.yml
+++ b/go/ql/consistency-queries/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql-go-consistency-queries
-version: 1.0.10
+version: 1.0.10-dev
 groups:
   - go
   - queries
diff --git a/go/ql/lib/CHANGELOG.md b/go/ql/lib/CHANGELOG.md
index d3c6fcd4a611..a9a8190e6acc 100644
--- a/go/ql/lib/CHANGELOG.md
+++ b/go/ql/lib/CHANGELOG.md
@@ -1,11 +1,3 @@
-## 2.1.1
-
-### Minor Analysis Improvements
-
-* Added member predicates `StructTag.hasOwnFieldWithTag` and `Field.getTag`, which enable CodeQL queries to examine struct field tags.
-* Added member predicate `InterfaceType.hasPrivateMethodWithQualifiedName`, which enables CodeQL queries to distinguish interfaces with matching non-exported method names that are declared in different packages, and are therefore incompatible.
-* Local source models with the `stdin` source kind have been added for the variable `os.Stdin` and the functions `fmt.Scan`, `fmt.Scanf` and `fmt.Scanln`. You can optionally include threat models as appropriate when using the CodeQL CLI and in GitHub code scanning. For more information, see [Analyzing your code with CodeQL queries](https://docs.github.com/code-security/codeql-cli/getting-started-with-the-codeql-cli/analyzing-your-code-with-codeql-queries#including-model-packs-to-add-potential-sources-of-tainted-data>) and [Customizing your advanced setup for code scanning](https://docs.github.com/code-security/code-scanning/creating-an-advanced-setup-for-code-scanning/customizing-your-advanced-setup-for-code-scanning#extending-codeql-coverage-with-threat-models).
-
 ## 2.1.0
 
 ### Deprecated APIs
diff --git a/go/ql/lib/change-notes/released/2.1.1.md b/go/ql/lib/change-notes/2024-08-29-add-stdin-threat-models.md
similarity index 64%
rename from go/ql/lib/change-notes/released/2.1.1.md
rename to go/ql/lib/change-notes/2024-08-29-add-stdin-threat-models.md
index 7319120fd3cb..d98ac68f1edc 100644
--- a/go/ql/lib/change-notes/released/2.1.1.md
+++ b/go/ql/lib/change-notes/2024-08-29-add-stdin-threat-models.md
@@ -1,7 +1,4 @@
-## 2.1.1
-
-### Minor Analysis Improvements
-
-* Added member predicates `StructTag.hasOwnFieldWithTag` and `Field.getTag`, which enable CodeQL queries to examine struct field tags.
-* Added member predicate `InterfaceType.hasPrivateMethodWithQualifiedName`, which enables CodeQL queries to distinguish interfaces with matching non-exported method names that are declared in different packages, and are therefore incompatible.
+---
+category: minorAnalysis
+---
 * Local source models with the `stdin` source kind have been added for the variable `os.Stdin` and the functions `fmt.Scan`, `fmt.Scanf` and `fmt.Scanln`. You can optionally include threat models as appropriate when using the CodeQL CLI and in GitHub code scanning. For more information, see [Analyzing your code with CodeQL queries](https://docs.github.com/code-security/codeql-cli/getting-started-with-the-codeql-cli/analyzing-your-code-with-codeql-queries#including-model-packs-to-add-potential-sources-of-tainted-data>) and [Customizing your advanced setup for code scanning](https://docs.github.com/code-security/code-scanning/creating-an-advanced-setup-for-code-scanning/customizing-your-advanced-setup-for-code-scanning#extending-codeql-coverage-with-threat-models).
diff --git a/go/ql/lib/change-notes/2024-09-03-tags-and-interface-ids.md b/go/ql/lib/change-notes/2024-09-03-tags-and-interface-ids.md
new file mode 100644
index 000000000000..749ae4cde998
--- /dev/null
+++ b/go/ql/lib/change-notes/2024-09-03-tags-and-interface-ids.md
@@ -0,0 +1,5 @@
+---
+category: minorAnalysis
+---
+* Added member predicates `StructTag.hasOwnFieldWithTag` and `Field.getTag`, which enable CodeQL queries to examine struct field tags.
+* Added member predicate `InterfaceType.hasPrivateMethodWithQualifiedName`, which enables CodeQL queries to distinguish interfaces with matching non-exported method names that are declared in different packages, and are therefore incompatible.
diff --git a/go/ql/lib/codeql-pack.release.yml b/go/ql/lib/codeql-pack.release.yml
index 576c2ea18d68..487a1a58b2b8 100644
--- a/go/ql/lib/codeql-pack.release.yml
+++ b/go/ql/lib/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 2.1.1
+lastReleaseVersion: 2.1.0
diff --git a/go/ql/lib/qlpack.yml b/go/ql/lib/qlpack.yml
index ba6a48a29d49..9cb5e3620117 100644
--- a/go/ql/lib/qlpack.yml
+++ b/go/ql/lib/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/go-all
-version: 2.1.1
+version: 2.1.1-dev
 groups: go
 dbscheme: go.dbscheme
 extractor: go
diff --git a/go/ql/src/CHANGELOG.md b/go/ql/src/CHANGELOG.md
index bdb40a2d2bb4..69a5ed3e9f83 100644
--- a/go/ql/src/CHANGELOG.md
+++ b/go/ql/src/CHANGELOG.md
@@ -1,7 +1,3 @@
-## 1.1.1
-
-No user-facing changes.
-
 ## 1.1.0
 
 ### Query Metadata Changes
diff --git a/go/ql/src/change-notes/released/1.1.1.md b/go/ql/src/change-notes/released/1.1.1.md
deleted file mode 100644
index 7fb56d366105..000000000000
--- a/go/ql/src/change-notes/released/1.1.1.md
+++ /dev/null
@@ -1,3 +0,0 @@
-## 1.1.1
-
-No user-facing changes.
diff --git a/go/ql/src/codeql-pack.release.yml b/go/ql/src/codeql-pack.release.yml
index 1a19084be3f7..2ac15439f561 100644
--- a/go/ql/src/codeql-pack.release.yml
+++ b/go/ql/src/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 1.1.1
+lastReleaseVersion: 1.1.0
diff --git a/go/ql/src/qlpack.yml b/go/ql/src/qlpack.yml
index 0dbc1fe67fae..0b3f5076bb6d 100644
--- a/go/ql/src/qlpack.yml
+++ b/go/ql/src/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/go-queries
-version: 1.1.1
+version: 1.1.1-dev
 groups:
   - go
   - queries
diff --git a/java/ql/automodel/src/CHANGELOG.md b/java/ql/automodel/src/CHANGELOG.md
index 537e84b2c0e5..4d632a2ae2d2 100644
--- a/java/ql/automodel/src/CHANGELOG.md
+++ b/java/ql/automodel/src/CHANGELOG.md
@@ -1,7 +1,3 @@
-## 1.0.10
-
-No user-facing changes.
-
 ## 1.0.9
 
 No user-facing changes.
diff --git a/java/ql/automodel/src/change-notes/released/1.0.10.md b/java/ql/automodel/src/change-notes/released/1.0.10.md
deleted file mode 100644
index b601d8784532..000000000000
--- a/java/ql/automodel/src/change-notes/released/1.0.10.md
+++ /dev/null
@@ -1,3 +0,0 @@
-## 1.0.10
-
-No user-facing changes.
diff --git a/java/ql/automodel/src/codeql-pack.release.yml b/java/ql/automodel/src/codeql-pack.release.yml
index 3865dbcf4b2a..fb813c5ee050 100644
--- a/java/ql/automodel/src/codeql-pack.release.yml
+++ b/java/ql/automodel/src/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 1.0.10
+lastReleaseVersion: 1.0.9
diff --git a/java/ql/automodel/src/qlpack.yml b/java/ql/automodel/src/qlpack.yml
index 7621f1900d53..fe961cb4392c 100644
--- a/java/ql/automodel/src/qlpack.yml
+++ b/java/ql/automodel/src/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/java-automodel-queries
-version: 1.0.10
+version: 1.0.10-dev
 groups:
     - java
     - automodel
diff --git a/java/ql/lib/CHANGELOG.md b/java/ql/lib/CHANGELOG.md
index 6be0cdc10e5a..5441126d72c9 100644
--- a/java/ql/lib/CHANGELOG.md
+++ b/java/ql/lib/CHANGELOG.md
@@ -1,7 +1,3 @@
-## 4.1.1
-
-No user-facing changes.
-
 ## 4.1.0
 
 ### Deprecated APIs
diff --git a/java/ql/lib/change-notes/released/4.1.1.md b/java/ql/lib/change-notes/released/4.1.1.md
deleted file mode 100644
index 23583cbad734..000000000000
--- a/java/ql/lib/change-notes/released/4.1.1.md
+++ /dev/null
@@ -1,3 +0,0 @@
-## 4.1.1
-
-No user-facing changes.
diff --git a/java/ql/lib/codeql-pack.release.yml b/java/ql/lib/codeql-pack.release.yml
index 9c871cefc42c..d5b1bf88d10e 100644
--- a/java/ql/lib/codeql-pack.release.yml
+++ b/java/ql/lib/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 4.1.1
+lastReleaseVersion: 4.1.0
diff --git a/java/ql/lib/qlpack.yml b/java/ql/lib/qlpack.yml
index 23871cfb7d82..0d4f67146c1b 100644
--- a/java/ql/lib/qlpack.yml
+++ b/java/ql/lib/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/java-all
-version: 4.1.1
+version: 4.1.1-dev
 groups: java
 dbscheme: config/semmlecode.dbscheme
 extractor: java
diff --git a/java/ql/src/CHANGELOG.md b/java/ql/src/CHANGELOG.md
index a034dc0abf90..20e7a248aebb 100644
--- a/java/ql/src/CHANGELOG.md
+++ b/java/ql/src/CHANGELOG.md
@@ -1,7 +1,3 @@
-## 1.1.7
-
-No user-facing changes.
-
 ## 1.1.6
 
 ### Minor Analysis Improvements
diff --git a/java/ql/src/change-notes/released/1.1.7.md b/java/ql/src/change-notes/released/1.1.7.md
deleted file mode 100644
index 81505c0507a2..000000000000
--- a/java/ql/src/change-notes/released/1.1.7.md
+++ /dev/null
@@ -1,3 +0,0 @@
-## 1.1.7
-
-No user-facing changes.
diff --git a/java/ql/src/codeql-pack.release.yml b/java/ql/src/codeql-pack.release.yml
index 759105565166..9e712a00a21d 100644
--- a/java/ql/src/codeql-pack.release.yml
+++ b/java/ql/src/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 1.1.7
+lastReleaseVersion: 1.1.6
diff --git a/java/ql/src/qlpack.yml b/java/ql/src/qlpack.yml
index 82b14986199e..c8e95f52ca4a 100644
--- a/java/ql/src/qlpack.yml
+++ b/java/ql/src/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/java-queries
-version: 1.1.7
+version: 1.1.7-dev
 groups:
   - java
   - queries
diff --git a/javascript/ql/lib/CHANGELOG.md b/javascript/ql/lib/CHANGELOG.md
index 6068cf26319d..bb77b4f1f496 100644
--- a/javascript/ql/lib/CHANGELOG.md
+++ b/javascript/ql/lib/CHANGELOG.md
@@ -1,7 +1,3 @@
-## 2.0.2
-
-No user-facing changes.
-
 ## 2.0.1
 
 No user-facing changes.
diff --git a/javascript/ql/lib/change-notes/released/2.0.2.md b/javascript/ql/lib/change-notes/released/2.0.2.md
deleted file mode 100644
index 862ef0e9df7c..000000000000
--- a/javascript/ql/lib/change-notes/released/2.0.2.md
+++ /dev/null
@@ -1,3 +0,0 @@
-## 2.0.2
-
-No user-facing changes.
diff --git a/javascript/ql/lib/codeql-pack.release.yml b/javascript/ql/lib/codeql-pack.release.yml
index 81c7f1dbc13c..fe974a4dbf37 100644
--- a/javascript/ql/lib/codeql-pack.release.yml
+++ b/javascript/ql/lib/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 2.0.2
+lastReleaseVersion: 2.0.1
diff --git a/javascript/ql/lib/qlpack.yml b/javascript/ql/lib/qlpack.yml
index 8cf13a5240ce..bea3bbacd5fa 100644
--- a/javascript/ql/lib/qlpack.yml
+++ b/javascript/ql/lib/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/javascript-all
-version: 2.0.2
+version: 2.0.2-dev
 groups: javascript
 dbscheme: semmlecode.javascript.dbscheme
 extractor: javascript
diff --git a/javascript/ql/src/CHANGELOG.md b/javascript/ql/src/CHANGELOG.md
index df7becd46de5..adf7daa3eb43 100644
--- a/javascript/ql/src/CHANGELOG.md
+++ b/javascript/ql/src/CHANGELOG.md
@@ -1,7 +1,3 @@
-## 1.2.2
-
-No user-facing changes.
-
 ## 1.2.1
 
 No user-facing changes.
diff --git a/javascript/ql/src/change-notes/released/1.2.2.md b/javascript/ql/src/change-notes/released/1.2.2.md
deleted file mode 100644
index 7b520f6c258f..000000000000
--- a/javascript/ql/src/change-notes/released/1.2.2.md
+++ /dev/null
@@ -1,3 +0,0 @@
-## 1.2.2
-
-No user-facing changes.
diff --git a/javascript/ql/src/codeql-pack.release.yml b/javascript/ql/src/codeql-pack.release.yml
index 0a70a9a01a7e..73dd403938c9 100644
--- a/javascript/ql/src/codeql-pack.release.yml
+++ b/javascript/ql/src/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 1.2.2
+lastReleaseVersion: 1.2.1
diff --git a/javascript/ql/src/qlpack.yml b/javascript/ql/src/qlpack.yml
index 5aee59e9b015..407aa03f7802 100644
--- a/javascript/ql/src/qlpack.yml
+++ b/javascript/ql/src/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/javascript-queries
-version: 1.2.2
+version: 1.2.2-dev
 groups:
   - javascript
   - queries
diff --git a/misc/suite-helpers/CHANGELOG.md b/misc/suite-helpers/CHANGELOG.md
index e9c580c60cef..729794553521 100644
--- a/misc/suite-helpers/CHANGELOG.md
+++ b/misc/suite-helpers/CHANGELOG.md
@@ -1,7 +1,3 @@
-## 1.0.10
-
-No user-facing changes.
-
 ## 1.0.9
 
 No user-facing changes.
diff --git a/misc/suite-helpers/change-notes/released/1.0.10.md b/misc/suite-helpers/change-notes/released/1.0.10.md
deleted file mode 100644
index b601d8784532..000000000000
--- a/misc/suite-helpers/change-notes/released/1.0.10.md
+++ /dev/null
@@ -1,3 +0,0 @@
-## 1.0.10
-
-No user-facing changes.
diff --git a/misc/suite-helpers/codeql-pack.release.yml b/misc/suite-helpers/codeql-pack.release.yml
index 3865dbcf4b2a..fb813c5ee050 100644
--- a/misc/suite-helpers/codeql-pack.release.yml
+++ b/misc/suite-helpers/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 1.0.10
+lastReleaseVersion: 1.0.9
diff --git a/misc/suite-helpers/qlpack.yml b/misc/suite-helpers/qlpack.yml
index 6b8eb63063ba..76c86b26be6b 100644
--- a/misc/suite-helpers/qlpack.yml
+++ b/misc/suite-helpers/qlpack.yml
@@ -1,4 +1,4 @@
 name: codeql/suite-helpers
-version: 1.0.10
+version: 1.0.10-dev
 groups: shared
 warnOnImplicitThis: true
diff --git a/python/ql/lib/CHANGELOG.md b/python/ql/lib/CHANGELOG.md
index c1f3765162e0..4cadb40bc2f5 100644
--- a/python/ql/lib/CHANGELOG.md
+++ b/python/ql/lib/CHANGELOG.md
@@ -1,13 +1,3 @@
-## 2.1.1
-
-### Minor Analysis Improvements
-
-* Modelled that `re.finditer` returns an iterable of `re.Match` objects. This is now understood by the API graph in many cases.
-* Type tracking, and hence the API graph, is now able to correctly trace through comprehensions.
-* More precise modelling of the dataflow through comprehensions. In particular, captured variables are now handled correctly.
-* Dataflow out of yield is added, allowing proper tracing through generators.
-* Added several models of standard library functions and classes, in anticipation of no longer extracting the standard library in a future release.
-
 ## 2.1.0
 
 ### New Features
diff --git a/python/ql/lib/change-notes/2024-09-24-std-lib-models.md b/python/ql/lib/change-notes/2024-09-24-std-lib-models.md
new file mode 100644
index 000000000000..3166e0c8ff0f
--- /dev/null
+++ b/python/ql/lib/change-notes/2024-09-24-std-lib-models.md
@@ -0,0 +1,4 @@
+---
+category: minorAnalysis
+---
+* Added several models of standard library functions and classes, in anticipation of no longer extracting the standard library in a future release.
\ No newline at end of file
diff --git a/python/ql/lib/change-notes/2024-10-01-comprehension-flow.md b/python/ql/lib/change-notes/2024-10-01-comprehension-flow.md
new file mode 100644
index 000000000000..bc3165f05f33
--- /dev/null
+++ b/python/ql/lib/change-notes/2024-10-01-comprehension-flow.md
@@ -0,0 +1,5 @@
+---
+category: minorAnalysis
+---
+* More precise modelling of the dataflow through comprehensions. In particular, captured variables are now handled correctly.
+* Dataflow out of yield is added, allowing proper tracing through generators.
\ No newline at end of file
diff --git a/python/ql/lib/change-notes/2024-10-03-typetracking-through-comprehensions.md b/python/ql/lib/change-notes/2024-10-03-typetracking-through-comprehensions.md
new file mode 100644
index 000000000000..72d853460305
--- /dev/null
+++ b/python/ql/lib/change-notes/2024-10-03-typetracking-through-comprehensions.md
@@ -0,0 +1,4 @@
+---
+category: minorAnalysis
+---
+* Type tracking, and hence the API graph, is now able to correctly trace trough comprehensions.
\ No newline at end of file
diff --git a/python/ql/lib/change-notes/2024-10-09-finditer-match.md b/python/ql/lib/change-notes/2024-10-09-finditer-match.md
new file mode 100644
index 000000000000..ee2ccc1119a4
--- /dev/null
+++ b/python/ql/lib/change-notes/2024-10-09-finditer-match.md
@@ -0,0 +1,4 @@
+---
+category: minorAnalysis
+---
+* Modelled that `re.finditer` returns an iterable of `re.Match` objects. This is now understood by the API graph in many cases.
\ No newline at end of file
diff --git a/python/ql/lib/change-notes/released/2.1.1.md b/python/ql/lib/change-notes/released/2.1.1.md
deleted file mode 100644
index bd2b31a218d9..000000000000
--- a/python/ql/lib/change-notes/released/2.1.1.md
+++ /dev/null
@@ -1,9 +0,0 @@
-## 2.1.1
-
-### Minor Analysis Improvements
-
-* Modelled that `re.finditer` returns an iterable of `re.Match` objects. This is now understood by the API graph in many cases.
-* Type tracking, and hence the API graph, is now able to correctly trace through comprehensions.
-* More precise modelling of the dataflow through comprehensions. In particular, captured variables are now handled correctly.
-* Dataflow out of yield is added, allowing proper tracing through generators.
-* Added several models of standard library functions and classes, in anticipation of no longer extracting the standard library in a future release.
diff --git a/python/ql/lib/codeql-pack.release.yml b/python/ql/lib/codeql-pack.release.yml
index 576c2ea18d68..487a1a58b2b8 100644
--- a/python/ql/lib/codeql-pack.release.yml
+++ b/python/ql/lib/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 2.1.1
+lastReleaseVersion: 2.1.0
diff --git a/python/ql/lib/qlpack.yml b/python/ql/lib/qlpack.yml
index dd92c1068daf..445940cdd889 100644
--- a/python/ql/lib/qlpack.yml
+++ b/python/ql/lib/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/python-all
-version: 2.1.1
+version: 2.1.1-dev
 groups: python
 dbscheme: semmlecode.python.dbscheme
 extractor: python
diff --git a/python/ql/src/CHANGELOG.md b/python/ql/src/CHANGELOG.md
index ea236eb11ba5..21c9ebcf16f9 100644
--- a/python/ql/src/CHANGELOG.md
+++ b/python/ql/src/CHANGELOG.md
@@ -1,12 +1,8 @@
-## 1.3.1
-
-No user-facing changes.
-
 ## 1.3.0
 
 ### New Queries
 
-* The experimental `py/cors-misconfiguration-with-credentials` query, which finds insecure CORS middleware configurations.
+* The `py/cors-misconfiguration-with-credentials` query, which finds insecure CORS middleware configurations.
 
 ## 1.2.2
 
diff --git a/python/ql/src/change-notes/released/1.3.1.md b/python/ql/src/change-notes/released/1.3.1.md
deleted file mode 100644
index 8dd9964197cb..000000000000
--- a/python/ql/src/change-notes/released/1.3.1.md
+++ /dev/null
@@ -1,3 +0,0 @@
-## 1.3.1
-
-No user-facing changes.
diff --git a/python/ql/src/codeql-pack.release.yml b/python/ql/src/codeql-pack.release.yml
index e71b6d081f15..ec16350ed6fd 100644
--- a/python/ql/src/codeql-pack.release.yml
+++ b/python/ql/src/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 1.3.1
+lastReleaseVersion: 1.3.0
diff --git a/python/ql/src/qlpack.yml b/python/ql/src/qlpack.yml
index 52d6ee0b6032..3f5ee4e78041 100644
--- a/python/ql/src/qlpack.yml
+++ b/python/ql/src/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/python-queries
-version: 1.3.1
+version: 1.3.1-dev
 groups:
   - python
   - queries
diff --git a/ruby/ql/lib/CHANGELOG.md b/ruby/ql/lib/CHANGELOG.md
index fcfaf0238c21..59c058c1c45c 100644
--- a/ruby/ql/lib/CHANGELOG.md
+++ b/ruby/ql/lib/CHANGELOG.md
@@ -1,9 +1,3 @@
-## 2.0.2
-
-### Minor Analysis Improvements
-
-* The `ExtractionError` class has been split into `ExtractionError` and `ExtractionWarning`, reporting extraction errors and warnings respectively.
-
 ## 2.0.1
 
 No user-facing changes.
diff --git a/ruby/ql/lib/change-notes/released/2.0.2.md b/ruby/ql/lib/change-notes/2024-10-03-extraction-warnings.md
similarity index 77%
rename from ruby/ql/lib/change-notes/released/2.0.2.md
rename to ruby/ql/lib/change-notes/2024-10-03-extraction-warnings.md
index 9d7757a2e03e..5d6128354c3b 100644
--- a/ruby/ql/lib/change-notes/released/2.0.2.md
+++ b/ruby/ql/lib/change-notes/2024-10-03-extraction-warnings.md
@@ -1,5 +1,4 @@
-## 2.0.2
-
-### Minor Analysis Improvements
-
+---
+category: minorAnalysis
+---
 * The `ExtractionError` class has been split into `ExtractionError` and `ExtractionWarning`, reporting extraction errors and warnings respectively.
diff --git a/ruby/ql/lib/codeql-pack.release.yml b/ruby/ql/lib/codeql-pack.release.yml
index 81c7f1dbc13c..fe974a4dbf37 100644
--- a/ruby/ql/lib/codeql-pack.release.yml
+++ b/ruby/ql/lib/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 2.0.2
+lastReleaseVersion: 2.0.1
diff --git a/ruby/ql/lib/qlpack.yml b/ruby/ql/lib/qlpack.yml
index 53ea89afe3b1..dc0b471a171d 100644
--- a/ruby/ql/lib/qlpack.yml
+++ b/ruby/ql/lib/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/ruby-all
-version: 2.0.2
+version: 2.0.2-dev
 groups: ruby
 extractor: ruby
 dbscheme: ruby.dbscheme
diff --git a/ruby/ql/src/CHANGELOG.md b/ruby/ql/src/CHANGELOG.md
index 363b517dec19..5e9c68a56a01 100644
--- a/ruby/ql/src/CHANGELOG.md
+++ b/ruby/ql/src/CHANGELOG.md
@@ -1,9 +1,3 @@
-## 1.1.5
-
-### Minor Analysis Improvements
-
-* The `rb/diagnostics/extraction-errors` diagnostic query has been split into `rb/diagnostics/extraction-errors` and `rb/diagnostics/extraction-warnings`, counting extraction errors and warnings respectively.
-
 ## 1.1.4
 
 No user-facing changes.
diff --git a/ruby/ql/src/change-notes/released/1.1.5.md b/ruby/ql/src/change-notes/2024-10-03-extraction-warnings.md
similarity index 82%
rename from ruby/ql/src/change-notes/released/1.1.5.md
rename to ruby/ql/src/change-notes/2024-10-03-extraction-warnings.md
index fd55457a718c..ac97cd1e7ba2 100644
--- a/ruby/ql/src/change-notes/released/1.1.5.md
+++ b/ruby/ql/src/change-notes/2024-10-03-extraction-warnings.md
@@ -1,5 +1,4 @@
-## 1.1.5
-
-### Minor Analysis Improvements
-
+---
+category: minorAnalysis
+---
 * The `rb/diagnostics/extraction-errors` diagnostic query has been split into `rb/diagnostics/extraction-errors` and `rb/diagnostics/extraction-warnings`, counting extraction errors and warnings respectively.
diff --git a/ruby/ql/src/codeql-pack.release.yml b/ruby/ql/src/codeql-pack.release.yml
index df39a9de059d..26cbcd3f123b 100644
--- a/ruby/ql/src/codeql-pack.release.yml
+++ b/ruby/ql/src/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 1.1.5
+lastReleaseVersion: 1.1.4
diff --git a/ruby/ql/src/qlpack.yml b/ruby/ql/src/qlpack.yml
index 2c0ea256429e..b7eee713fbaa 100644
--- a/ruby/ql/src/qlpack.yml
+++ b/ruby/ql/src/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/ruby-queries
-version: 1.1.5
+version: 1.1.5-dev
 groups:
   - ruby
   - queries
diff --git a/shared/controlflow/CHANGELOG.md b/shared/controlflow/CHANGELOG.md
index 7aaa7597d5bb..52b731626290 100644
--- a/shared/controlflow/CHANGELOG.md
+++ b/shared/controlflow/CHANGELOG.md
@@ -1,7 +1,3 @@
-## 1.0.10
-
-No user-facing changes.
-
 ## 1.0.9
 
 No user-facing changes.
diff --git a/shared/controlflow/change-notes/released/1.0.10.md b/shared/controlflow/change-notes/released/1.0.10.md
deleted file mode 100644
index b601d8784532..000000000000
--- a/shared/controlflow/change-notes/released/1.0.10.md
+++ /dev/null
@@ -1,3 +0,0 @@
-## 1.0.10
-
-No user-facing changes.
diff --git a/shared/controlflow/codeql-pack.release.yml b/shared/controlflow/codeql-pack.release.yml
index 3865dbcf4b2a..fb813c5ee050 100644
--- a/shared/controlflow/codeql-pack.release.yml
+++ b/shared/controlflow/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 1.0.10
+lastReleaseVersion: 1.0.9
diff --git a/shared/controlflow/qlpack.yml b/shared/controlflow/qlpack.yml
index 0d1248c09815..532b2fa69a09 100644
--- a/shared/controlflow/qlpack.yml
+++ b/shared/controlflow/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/controlflow
-version: 1.0.10
+version: 1.0.10-dev
 groups: shared
 library: true
 dependencies:
diff --git a/shared/dataflow/CHANGELOG.md b/shared/dataflow/CHANGELOG.md
index c9f031d51134..360dc9cc8bff 100644
--- a/shared/dataflow/CHANGELOG.md
+++ b/shared/dataflow/CHANGELOG.md
@@ -1,7 +1,3 @@
-## 1.1.4
-
-No user-facing changes.
-
 ## 1.1.3
 
 No user-facing changes.
diff --git a/shared/dataflow/change-notes/released/1.1.4.md b/shared/dataflow/change-notes/released/1.1.4.md
deleted file mode 100644
index b95051903c5a..000000000000
--- a/shared/dataflow/change-notes/released/1.1.4.md
+++ /dev/null
@@ -1,3 +0,0 @@
-## 1.1.4
-
-No user-facing changes.
diff --git a/shared/dataflow/codeql-pack.release.yml b/shared/dataflow/codeql-pack.release.yml
index 26cbcd3f123b..35e710ab1bf0 100644
--- a/shared/dataflow/codeql-pack.release.yml
+++ b/shared/dataflow/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 1.1.4
+lastReleaseVersion: 1.1.3
diff --git a/shared/dataflow/qlpack.yml b/shared/dataflow/qlpack.yml
index 3d21af7c256b..df5c8c4c38af 100644
--- a/shared/dataflow/qlpack.yml
+++ b/shared/dataflow/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/dataflow
-version: 1.1.4
+version: 1.1.4-dev
 groups: shared
 library: true
 dependencies:
diff --git a/shared/mad/CHANGELOG.md b/shared/mad/CHANGELOG.md
index 02a3541df616..7857f62905c7 100644
--- a/shared/mad/CHANGELOG.md
+++ b/shared/mad/CHANGELOG.md
@@ -1,7 +1,3 @@
-## 1.0.10
-
-No user-facing changes.
-
 ## 1.0.9
 
 No user-facing changes.
diff --git a/shared/mad/change-notes/released/1.0.10.md b/shared/mad/change-notes/released/1.0.10.md
deleted file mode 100644
index b601d8784532..000000000000
--- a/shared/mad/change-notes/released/1.0.10.md
+++ /dev/null
@@ -1,3 +0,0 @@
-## 1.0.10
-
-No user-facing changes.
diff --git a/shared/mad/codeql-pack.release.yml b/shared/mad/codeql-pack.release.yml
index 3865dbcf4b2a..fb813c5ee050 100644
--- a/shared/mad/codeql-pack.release.yml
+++ b/shared/mad/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 1.0.10
+lastReleaseVersion: 1.0.9
diff --git a/shared/mad/qlpack.yml b/shared/mad/qlpack.yml
index b45f7415c81a..ef3755c80bc4 100644
--- a/shared/mad/qlpack.yml
+++ b/shared/mad/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/mad
-version: 1.0.10
+version: 1.0.10-dev
 groups: shared
 library: true
 dependencies:
diff --git a/shared/rangeanalysis/CHANGELOG.md b/shared/rangeanalysis/CHANGELOG.md
index 992ad108bcd6..5878f9b564c0 100644
--- a/shared/rangeanalysis/CHANGELOG.md
+++ b/shared/rangeanalysis/CHANGELOG.md
@@ -1,7 +1,3 @@
-## 1.0.10
-
-No user-facing changes.
-
 ## 1.0.9
 
 No user-facing changes.
diff --git a/shared/rangeanalysis/change-notes/released/1.0.10.md b/shared/rangeanalysis/change-notes/released/1.0.10.md
deleted file mode 100644
index b601d8784532..000000000000
--- a/shared/rangeanalysis/change-notes/released/1.0.10.md
+++ /dev/null
@@ -1,3 +0,0 @@
-## 1.0.10
-
-No user-facing changes.
diff --git a/shared/rangeanalysis/codeql-pack.release.yml b/shared/rangeanalysis/codeql-pack.release.yml
index 3865dbcf4b2a..fb813c5ee050 100644
--- a/shared/rangeanalysis/codeql-pack.release.yml
+++ b/shared/rangeanalysis/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 1.0.10
+lastReleaseVersion: 1.0.9
diff --git a/shared/rangeanalysis/qlpack.yml b/shared/rangeanalysis/qlpack.yml
index a11b83edace6..b4deed51c9d8 100644
--- a/shared/rangeanalysis/qlpack.yml
+++ b/shared/rangeanalysis/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/rangeanalysis
-version: 1.0.10
+version: 1.0.10-dev
 groups: shared
 library: true
 dependencies:
diff --git a/shared/regex/CHANGELOG.md b/shared/regex/CHANGELOG.md
index 3a71d968b43c..01154f6c5f52 100644
--- a/shared/regex/CHANGELOG.md
+++ b/shared/regex/CHANGELOG.md
@@ -1,7 +1,3 @@
-## 1.0.10
-
-No user-facing changes.
-
 ## 1.0.9
 
 No user-facing changes.
diff --git a/shared/regex/change-notes/released/1.0.10.md b/shared/regex/change-notes/released/1.0.10.md
deleted file mode 100644
index b601d8784532..000000000000
--- a/shared/regex/change-notes/released/1.0.10.md
+++ /dev/null
@@ -1,3 +0,0 @@
-## 1.0.10
-
-No user-facing changes.
diff --git a/shared/regex/codeql-pack.release.yml b/shared/regex/codeql-pack.release.yml
index 3865dbcf4b2a..fb813c5ee050 100644
--- a/shared/regex/codeql-pack.release.yml
+++ b/shared/regex/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 1.0.10
+lastReleaseVersion: 1.0.9
diff --git a/shared/regex/qlpack.yml b/shared/regex/qlpack.yml
index bfb63fdee77f..5593197f674b 100644
--- a/shared/regex/qlpack.yml
+++ b/shared/regex/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/regex
-version: 1.0.10
+version: 1.0.10-dev
 groups: shared
 library: true
 dependencies:
diff --git a/shared/ssa/CHANGELOG.md b/shared/ssa/CHANGELOG.md
index 76edd23e4428..85bef6a32845 100644
--- a/shared/ssa/CHANGELOG.md
+++ b/shared/ssa/CHANGELOG.md
@@ -1,7 +1,3 @@
-## 1.0.10
-
-No user-facing changes.
-
 ## 1.0.9
 
 No user-facing changes.
diff --git a/shared/ssa/change-notes/released/1.0.10.md b/shared/ssa/change-notes/released/1.0.10.md
deleted file mode 100644
index b601d8784532..000000000000
--- a/shared/ssa/change-notes/released/1.0.10.md
+++ /dev/null
@@ -1,3 +0,0 @@
-## 1.0.10
-
-No user-facing changes.
diff --git a/shared/ssa/codeql-pack.release.yml b/shared/ssa/codeql-pack.release.yml
index 3865dbcf4b2a..fb813c5ee050 100644
--- a/shared/ssa/codeql-pack.release.yml
+++ b/shared/ssa/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 1.0.10
+lastReleaseVersion: 1.0.9
diff --git a/shared/ssa/qlpack.yml b/shared/ssa/qlpack.yml
index 7e09739a333a..7bc3773a575f 100644
--- a/shared/ssa/qlpack.yml
+++ b/shared/ssa/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/ssa
-version: 1.0.10
+version: 1.0.10-dev
 groups: shared
 library: true
 dependencies:
diff --git a/shared/threat-models/CHANGELOG.md b/shared/threat-models/CHANGELOG.md
index b62e06e3dff0..9589b67148fa 100644
--- a/shared/threat-models/CHANGELOG.md
+++ b/shared/threat-models/CHANGELOG.md
@@ -1,7 +1,3 @@
-## 1.0.10
-
-No user-facing changes.
-
 ## 1.0.9
 
 No user-facing changes.
diff --git a/shared/threat-models/change-notes/released/1.0.10.md b/shared/threat-models/change-notes/released/1.0.10.md
deleted file mode 100644
index b601d8784532..000000000000
--- a/shared/threat-models/change-notes/released/1.0.10.md
+++ /dev/null
@@ -1,3 +0,0 @@
-## 1.0.10
-
-No user-facing changes.
diff --git a/shared/threat-models/codeql-pack.release.yml b/shared/threat-models/codeql-pack.release.yml
index 3865dbcf4b2a..fb813c5ee050 100644
--- a/shared/threat-models/codeql-pack.release.yml
+++ b/shared/threat-models/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 1.0.10
+lastReleaseVersion: 1.0.9
diff --git a/shared/threat-models/qlpack.yml b/shared/threat-models/qlpack.yml
index 7609a088b6e9..dd4331d7e749 100644
--- a/shared/threat-models/qlpack.yml
+++ b/shared/threat-models/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/threat-models
-version: 1.0.10
+version: 1.0.10-dev
 library: true
 groups: shared
 dataExtensions:
diff --git a/shared/tutorial/CHANGELOG.md b/shared/tutorial/CHANGELOG.md
index 676b469b866a..ba77e020439d 100644
--- a/shared/tutorial/CHANGELOG.md
+++ b/shared/tutorial/CHANGELOG.md
@@ -1,7 +1,3 @@
-## 1.0.10
-
-No user-facing changes.
-
 ## 1.0.9
 
 No user-facing changes.
diff --git a/shared/tutorial/change-notes/released/1.0.10.md b/shared/tutorial/change-notes/released/1.0.10.md
deleted file mode 100644
index b601d8784532..000000000000
--- a/shared/tutorial/change-notes/released/1.0.10.md
+++ /dev/null
@@ -1,3 +0,0 @@
-## 1.0.10
-
-No user-facing changes.
diff --git a/shared/tutorial/codeql-pack.release.yml b/shared/tutorial/codeql-pack.release.yml
index 3865dbcf4b2a..fb813c5ee050 100644
--- a/shared/tutorial/codeql-pack.release.yml
+++ b/shared/tutorial/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 1.0.10
+lastReleaseVersion: 1.0.9
diff --git a/shared/tutorial/qlpack.yml b/shared/tutorial/qlpack.yml
index 1cfbfb40c91c..2390ce7ad116 100644
--- a/shared/tutorial/qlpack.yml
+++ b/shared/tutorial/qlpack.yml
@@ -1,7 +1,7 @@
 name: codeql/tutorial
 description: Library for the CodeQL detective tutorials, helping new users learn to
   write CodeQL queries.
-version: 1.0.10
+version: 1.0.10-dev
 groups: shared
 library: true
 warnOnImplicitThis: true
diff --git a/shared/typeflow/CHANGELOG.md b/shared/typeflow/CHANGELOG.md
index 19badb815f98..93c030dee3e4 100644
--- a/shared/typeflow/CHANGELOG.md
+++ b/shared/typeflow/CHANGELOG.md
@@ -1,7 +1,3 @@
-## 1.0.10
-
-No user-facing changes.
-
 ## 1.0.9
 
 No user-facing changes.
diff --git a/shared/typeflow/change-notes/released/1.0.10.md b/shared/typeflow/change-notes/released/1.0.10.md
deleted file mode 100644
index b601d8784532..000000000000
--- a/shared/typeflow/change-notes/released/1.0.10.md
+++ /dev/null
@@ -1,3 +0,0 @@
-## 1.0.10
-
-No user-facing changes.
diff --git a/shared/typeflow/codeql-pack.release.yml b/shared/typeflow/codeql-pack.release.yml
index 3865dbcf4b2a..fb813c5ee050 100644
--- a/shared/typeflow/codeql-pack.release.yml
+++ b/shared/typeflow/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 1.0.10
+lastReleaseVersion: 1.0.9
diff --git a/shared/typeflow/qlpack.yml b/shared/typeflow/qlpack.yml
index 430f9e468126..04f843aacb5f 100644
--- a/shared/typeflow/qlpack.yml
+++ b/shared/typeflow/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/typeflow
-version: 1.0.10
+version: 1.0.10-dev
 groups: shared
 library: true
 dependencies:
diff --git a/shared/typetracking/CHANGELOG.md b/shared/typetracking/CHANGELOG.md
index 29b2bdbb3dae..a4e57c221876 100644
--- a/shared/typetracking/CHANGELOG.md
+++ b/shared/typetracking/CHANGELOG.md
@@ -1,7 +1,3 @@
-## 1.0.10
-
-No user-facing changes.
-
 ## 1.0.9
 
 No user-facing changes.
diff --git a/shared/typetracking/change-notes/released/1.0.10.md b/shared/typetracking/change-notes/released/1.0.10.md
deleted file mode 100644
index b601d8784532..000000000000
--- a/shared/typetracking/change-notes/released/1.0.10.md
+++ /dev/null
@@ -1,3 +0,0 @@
-## 1.0.10
-
-No user-facing changes.
diff --git a/shared/typetracking/codeql-pack.release.yml b/shared/typetracking/codeql-pack.release.yml
index 3865dbcf4b2a..fb813c5ee050 100644
--- a/shared/typetracking/codeql-pack.release.yml
+++ b/shared/typetracking/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 1.0.10
+lastReleaseVersion: 1.0.9
diff --git a/shared/typetracking/qlpack.yml b/shared/typetracking/qlpack.yml
index d29f0c0bd6e4..e48446dc3e0b 100644
--- a/shared/typetracking/qlpack.yml
+++ b/shared/typetracking/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/typetracking
-version: 1.0.10
+version: 1.0.10-dev
 groups: shared
 library: true
 dependencies:
diff --git a/shared/typos/CHANGELOG.md b/shared/typos/CHANGELOG.md
index 0f6b529e512c..acee82ce867b 100644
--- a/shared/typos/CHANGELOG.md
+++ b/shared/typos/CHANGELOG.md
@@ -1,7 +1,3 @@
-## 1.0.10
-
-No user-facing changes.
-
 ## 1.0.9
 
 No user-facing changes.
diff --git a/shared/typos/change-notes/released/1.0.10.md b/shared/typos/change-notes/released/1.0.10.md
deleted file mode 100644
index b601d8784532..000000000000
--- a/shared/typos/change-notes/released/1.0.10.md
+++ /dev/null
@@ -1,3 +0,0 @@
-## 1.0.10
-
-No user-facing changes.
diff --git a/shared/typos/codeql-pack.release.yml b/shared/typos/codeql-pack.release.yml
index 3865dbcf4b2a..fb813c5ee050 100644
--- a/shared/typos/codeql-pack.release.yml
+++ b/shared/typos/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 1.0.10
+lastReleaseVersion: 1.0.9
diff --git a/shared/typos/qlpack.yml b/shared/typos/qlpack.yml
index 4e15f26a72c5..5eccd54b2afa 100644
--- a/shared/typos/qlpack.yml
+++ b/shared/typos/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/typos
-version: 1.0.10
+version: 1.0.10-dev
 groups: shared
 library: true
 warnOnImplicitThis: true
diff --git a/shared/util/CHANGELOG.md b/shared/util/CHANGELOG.md
index f81ed05cc13b..2f918fd0416f 100644
--- a/shared/util/CHANGELOG.md
+++ b/shared/util/CHANGELOG.md
@@ -1,7 +1,3 @@
-## 1.0.10
-
-No user-facing changes.
-
 ## 1.0.9
 
 No user-facing changes.
diff --git a/shared/util/change-notes/released/1.0.10.md b/shared/util/change-notes/released/1.0.10.md
deleted file mode 100644
index b601d8784532..000000000000
--- a/shared/util/change-notes/released/1.0.10.md
+++ /dev/null
@@ -1,3 +0,0 @@
-## 1.0.10
-
-No user-facing changes.
diff --git a/shared/util/codeql-pack.release.yml b/shared/util/codeql-pack.release.yml
index 3865dbcf4b2a..fb813c5ee050 100644
--- a/shared/util/codeql-pack.release.yml
+++ b/shared/util/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 1.0.10
+lastReleaseVersion: 1.0.9
diff --git a/shared/util/qlpack.yml b/shared/util/qlpack.yml
index d73aee511702..508143471db4 100644
--- a/shared/util/qlpack.yml
+++ b/shared/util/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/util
-version: 1.0.10
+version: 1.0.10-dev
 groups: shared
 library: true
 dependencies: null
diff --git a/shared/xml/CHANGELOG.md b/shared/xml/CHANGELOG.md
index bc002596b451..90afd761e7d4 100644
--- a/shared/xml/CHANGELOG.md
+++ b/shared/xml/CHANGELOG.md
@@ -1,7 +1,3 @@
-## 1.0.10
-
-No user-facing changes.
-
 ## 1.0.9
 
 No user-facing changes.
diff --git a/shared/xml/change-notes/released/1.0.10.md b/shared/xml/change-notes/released/1.0.10.md
deleted file mode 100644
index b601d8784532..000000000000
--- a/shared/xml/change-notes/released/1.0.10.md
+++ /dev/null
@@ -1,3 +0,0 @@
-## 1.0.10
-
-No user-facing changes.
diff --git a/shared/xml/codeql-pack.release.yml b/shared/xml/codeql-pack.release.yml
index 3865dbcf4b2a..fb813c5ee050 100644
--- a/shared/xml/codeql-pack.release.yml
+++ b/shared/xml/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 1.0.10
+lastReleaseVersion: 1.0.9
diff --git a/shared/xml/qlpack.yml b/shared/xml/qlpack.yml
index 56f477c27e19..a81184e65886 100644
--- a/shared/xml/qlpack.yml
+++ b/shared/xml/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/xml
-version: 1.0.10
+version: 1.0.10-dev
 groups: shared
 library: true
 dependencies:
diff --git a/shared/yaml/CHANGELOG.md b/shared/yaml/CHANGELOG.md
index a6804be01273..222c0ec037c6 100644
--- a/shared/yaml/CHANGELOG.md
+++ b/shared/yaml/CHANGELOG.md
@@ -1,7 +1,3 @@
-## 1.0.10
-
-No user-facing changes.
-
 ## 1.0.9
 
 No user-facing changes.
diff --git a/shared/yaml/change-notes/released/1.0.10.md b/shared/yaml/change-notes/released/1.0.10.md
deleted file mode 100644
index b601d8784532..000000000000
--- a/shared/yaml/change-notes/released/1.0.10.md
+++ /dev/null
@@ -1,3 +0,0 @@
-## 1.0.10
-
-No user-facing changes.
diff --git a/shared/yaml/codeql-pack.release.yml b/shared/yaml/codeql-pack.release.yml
index 3865dbcf4b2a..fb813c5ee050 100644
--- a/shared/yaml/codeql-pack.release.yml
+++ b/shared/yaml/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 1.0.10
+lastReleaseVersion: 1.0.9
diff --git a/shared/yaml/qlpack.yml b/shared/yaml/qlpack.yml
index b1e351ce1968..1df4193b862f 100644
--- a/shared/yaml/qlpack.yml
+++ b/shared/yaml/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/yaml
-version: 1.0.10
+version: 1.0.10-dev
 groups: shared
 library: true
 warnOnImplicitThis: true
diff --git a/swift/ql/lib/CHANGELOG.md b/swift/ql/lib/CHANGELOG.md
index 004e85afa62d..5602ebc7d231 100644
--- a/swift/ql/lib/CHANGELOG.md
+++ b/swift/ql/lib/CHANGELOG.md
@@ -1,7 +1,3 @@
-## 2.0.2
-
-No user-facing changes.
-
 ## 2.0.1
 
 ### Minor Analysis Improvements
diff --git a/swift/ql/lib/change-notes/released/2.0.2.md b/swift/ql/lib/change-notes/released/2.0.2.md
deleted file mode 100644
index 862ef0e9df7c..000000000000
--- a/swift/ql/lib/change-notes/released/2.0.2.md
+++ /dev/null
@@ -1,3 +0,0 @@
-## 2.0.2
-
-No user-facing changes.
diff --git a/swift/ql/lib/codeql-pack.release.yml b/swift/ql/lib/codeql-pack.release.yml
index 81c7f1dbc13c..fe974a4dbf37 100644
--- a/swift/ql/lib/codeql-pack.release.yml
+++ b/swift/ql/lib/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 2.0.2
+lastReleaseVersion: 2.0.1
diff --git a/swift/ql/lib/qlpack.yml b/swift/ql/lib/qlpack.yml
index 31dd6d915f3d..1904a1b1ca48 100644
--- a/swift/ql/lib/qlpack.yml
+++ b/swift/ql/lib/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/swift-all
-version: 2.0.2
+version: 2.0.2-dev
 groups: swift
 extractor: swift
 dbscheme: swift.dbscheme
diff --git a/swift/ql/src/CHANGELOG.md b/swift/ql/src/CHANGELOG.md
index daeeee421ba8..b47f96f9eb9e 100644
--- a/swift/ql/src/CHANGELOG.md
+++ b/swift/ql/src/CHANGELOG.md
@@ -1,7 +1,3 @@
-## 1.0.10
-
-No user-facing changes.
-
 ## 1.0.9
 
 No user-facing changes.
diff --git a/swift/ql/src/change-notes/released/1.0.10.md b/swift/ql/src/change-notes/released/1.0.10.md
deleted file mode 100644
index b601d8784532..000000000000
--- a/swift/ql/src/change-notes/released/1.0.10.md
+++ /dev/null
@@ -1,3 +0,0 @@
-## 1.0.10
-
-No user-facing changes.
diff --git a/swift/ql/src/codeql-pack.release.yml b/swift/ql/src/codeql-pack.release.yml
index 3865dbcf4b2a..fb813c5ee050 100644
--- a/swift/ql/src/codeql-pack.release.yml
+++ b/swift/ql/src/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 1.0.10
+lastReleaseVersion: 1.0.9
diff --git a/swift/ql/src/qlpack.yml b/swift/ql/src/qlpack.yml
index 17bf94f219d8..6fbae9403605 100644
--- a/swift/ql/src/qlpack.yml
+++ b/swift/ql/src/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/swift-queries
-version: 1.0.10
+version: 1.0.10-dev
 groups:
   - swift
   - queries

From ca0345324e93a2c97af8d0fc2fd41fdfae270d74 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]" <github-actions@github.com>
Date: Fri, 18 Oct 2024 15:16:21 +0000
Subject: [PATCH 346/347] Release preparation for version 2.19.2

---
 cpp/ql/lib/CHANGELOG.md                                |  7 +++++++
 .../change-notes/2024-10-07-range-analysis-of-getc.md  |  4 ----
 cpp/ql/lib/change-notes/2024-10-09-fopen-taint.md      |  4 ----
 cpp/ql/lib/change-notes/released/2.0.2.md              |  6 ++++++
 cpp/ql/lib/codeql-pack.release.yml                     |  2 +-
 cpp/ql/lib/qlpack.yml                                  |  2 +-
 cpp/ql/src/CHANGELOG.md                                |  9 +++++++++
 .../2024-09-26-wcharcharconversion-false-positives.md  |  5 -----
 .../src/change-notes/2024-10-02-uninitialized-local.md |  4 ----
 .../2024-10-07-unclear-array-index-validation.md       |  4 ----
 cpp/ql/src/change-notes/released/1.2.5.md              |  8 ++++++++
 cpp/ql/src/codeql-pack.release.yml                     |  2 +-
 cpp/ql/src/qlpack.yml                                  |  2 +-
 csharp/ql/campaigns/Solorigate/lib/CHANGELOG.md        |  4 ++++
 .../Solorigate/lib/change-notes/released/1.7.27.md     |  3 +++
 .../campaigns/Solorigate/lib/codeql-pack.release.yml   |  2 +-
 csharp/ql/campaigns/Solorigate/lib/qlpack.yml          |  2 +-
 csharp/ql/campaigns/Solorigate/src/CHANGELOG.md        |  4 ++++
 .../Solorigate/src/change-notes/released/1.7.27.md     |  3 +++
 .../campaigns/Solorigate/src/codeql-pack.release.yml   |  2 +-
 csharp/ql/campaigns/Solorigate/src/qlpack.yml          |  2 +-
 csharp/ql/lib/CHANGELOG.md                             |  4 ++++
 csharp/ql/lib/change-notes/released/3.0.1.md           |  3 +++
 csharp/ql/lib/codeql-pack.release.yml                  |  2 +-
 csharp/ql/lib/qlpack.yml                               |  2 +-
 csharp/ql/src/CHANGELOG.md                             |  4 ++++
 csharp/ql/src/change-notes/released/1.0.10.md          |  3 +++
 csharp/ql/src/codeql-pack.release.yml                  |  2 +-
 csharp/ql/src/qlpack.yml                               |  2 +-
 go/ql/consistency-queries/CHANGELOG.md                 |  4 ++++
 .../change-notes/released/1.0.10.md                    |  3 +++
 go/ql/consistency-queries/codeql-pack.release.yml      |  2 +-
 go/ql/consistency-queries/qlpack.yml                   |  2 +-
 go/ql/lib/CHANGELOG.md                                 |  8 ++++++++
 .../change-notes/2024-09-03-tags-and-interface-ids.md  |  5 -----
 .../2.1.1.md}                                          |  9 ++++++---
 go/ql/lib/codeql-pack.release.yml                      |  2 +-
 go/ql/lib/qlpack.yml                                   |  2 +-
 go/ql/src/CHANGELOG.md                                 |  4 ++++
 go/ql/src/change-notes/released/1.1.1.md               |  3 +++
 go/ql/src/codeql-pack.release.yml                      |  2 +-
 go/ql/src/qlpack.yml                                   |  2 +-
 java/ql/automodel/src/CHANGELOG.md                     |  4 ++++
 java/ql/automodel/src/change-notes/released/1.0.10.md  |  3 +++
 java/ql/automodel/src/codeql-pack.release.yml          |  2 +-
 java/ql/automodel/src/qlpack.yml                       |  2 +-
 java/ql/lib/CHANGELOG.md                               |  4 ++++
 java/ql/lib/change-notes/released/4.1.1.md             |  3 +++
 java/ql/lib/codeql-pack.release.yml                    |  2 +-
 java/ql/lib/qlpack.yml                                 |  2 +-
 java/ql/src/CHANGELOG.md                               |  4 ++++
 java/ql/src/change-notes/released/1.1.7.md             |  3 +++
 java/ql/src/codeql-pack.release.yml                    |  2 +-
 java/ql/src/qlpack.yml                                 |  2 +-
 javascript/ql/lib/CHANGELOG.md                         |  4 ++++
 javascript/ql/lib/change-notes/released/2.0.2.md       |  3 +++
 javascript/ql/lib/codeql-pack.release.yml              |  2 +-
 javascript/ql/lib/qlpack.yml                           |  2 +-
 javascript/ql/src/CHANGELOG.md                         |  4 ++++
 javascript/ql/src/change-notes/released/1.2.2.md       |  3 +++
 javascript/ql/src/codeql-pack.release.yml              |  2 +-
 javascript/ql/src/qlpack.yml                           |  2 +-
 misc/suite-helpers/CHANGELOG.md                        |  4 ++++
 misc/suite-helpers/change-notes/released/1.0.10.md     |  3 +++
 misc/suite-helpers/codeql-pack.release.yml             |  2 +-
 misc/suite-helpers/qlpack.yml                          |  2 +-
 python/ql/lib/CHANGELOG.md                             | 10 ++++++++++
 .../ql/lib/change-notes/2024-09-24-std-lib-models.md   |  4 ----
 .../lib/change-notes/2024-10-01-comprehension-flow.md  |  5 -----
 .../2024-10-03-typetracking-through-comprehensions.md  |  4 ----
 .../ql/lib/change-notes/2024-10-09-finditer-match.md   |  4 ----
 python/ql/lib/change-notes/released/2.1.1.md           |  9 +++++++++
 python/ql/lib/codeql-pack.release.yml                  |  2 +-
 python/ql/lib/qlpack.yml                               |  2 +-
 python/ql/src/CHANGELOG.md                             |  6 +++++-
 python/ql/src/change-notes/released/1.3.1.md           |  3 +++
 python/ql/src/codeql-pack.release.yml                  |  2 +-
 python/ql/src/qlpack.yml                               |  2 +-
 ruby/ql/lib/CHANGELOG.md                               |  6 ++++++
 .../2.0.2.md}                                          |  7 ++++---
 ruby/ql/lib/codeql-pack.release.yml                    |  2 +-
 ruby/ql/lib/qlpack.yml                                 |  2 +-
 ruby/ql/src/CHANGELOG.md                               |  6 ++++++
 .../1.1.5.md}                                          |  7 ++++---
 ruby/ql/src/codeql-pack.release.yml                    |  2 +-
 ruby/ql/src/qlpack.yml                                 |  2 +-
 shared/controlflow/CHANGELOG.md                        |  4 ++++
 shared/controlflow/change-notes/released/1.0.10.md     |  3 +++
 shared/controlflow/codeql-pack.release.yml             |  2 +-
 shared/controlflow/qlpack.yml                          |  2 +-
 shared/dataflow/CHANGELOG.md                           |  4 ++++
 shared/dataflow/change-notes/released/1.1.4.md         |  3 +++
 shared/dataflow/codeql-pack.release.yml                |  2 +-
 shared/dataflow/qlpack.yml                             |  2 +-
 shared/mad/CHANGELOG.md                                |  4 ++++
 shared/mad/change-notes/released/1.0.10.md             |  3 +++
 shared/mad/codeql-pack.release.yml                     |  2 +-
 shared/mad/qlpack.yml                                  |  2 +-
 shared/rangeanalysis/CHANGELOG.md                      |  4 ++++
 shared/rangeanalysis/change-notes/released/1.0.10.md   |  3 +++
 shared/rangeanalysis/codeql-pack.release.yml           |  2 +-
 shared/rangeanalysis/qlpack.yml                        |  2 +-
 shared/regex/CHANGELOG.md                              |  4 ++++
 shared/regex/change-notes/released/1.0.10.md           |  3 +++
 shared/regex/codeql-pack.release.yml                   |  2 +-
 shared/regex/qlpack.yml                                |  2 +-
 shared/ssa/CHANGELOG.md                                |  4 ++++
 shared/ssa/change-notes/released/1.0.10.md             |  3 +++
 shared/ssa/codeql-pack.release.yml                     |  2 +-
 shared/ssa/qlpack.yml                                  |  2 +-
 shared/threat-models/CHANGELOG.md                      |  4 ++++
 shared/threat-models/change-notes/released/1.0.10.md   |  3 +++
 shared/threat-models/codeql-pack.release.yml           |  2 +-
 shared/threat-models/qlpack.yml                        |  2 +-
 shared/tutorial/CHANGELOG.md                           |  4 ++++
 shared/tutorial/change-notes/released/1.0.10.md        |  3 +++
 shared/tutorial/codeql-pack.release.yml                |  2 +-
 shared/tutorial/qlpack.yml                             |  2 +-
 shared/typeflow/CHANGELOG.md                           |  4 ++++
 shared/typeflow/change-notes/released/1.0.10.md        |  3 +++
 shared/typeflow/codeql-pack.release.yml                |  2 +-
 shared/typeflow/qlpack.yml                             |  2 +-
 shared/typetracking/CHANGELOG.md                       |  4 ++++
 shared/typetracking/change-notes/released/1.0.10.md    |  3 +++
 shared/typetracking/codeql-pack.release.yml            |  2 +-
 shared/typetracking/qlpack.yml                         |  2 +-
 shared/typos/CHANGELOG.md                              |  4 ++++
 shared/typos/change-notes/released/1.0.10.md           |  3 +++
 shared/typos/codeql-pack.release.yml                   |  2 +-
 shared/typos/qlpack.yml                                |  2 +-
 shared/util/CHANGELOG.md                               |  4 ++++
 shared/util/change-notes/released/1.0.10.md            |  3 +++
 shared/util/codeql-pack.release.yml                    |  2 +-
 shared/util/qlpack.yml                                 |  2 +-
 shared/xml/CHANGELOG.md                                |  4 ++++
 shared/xml/change-notes/released/1.0.10.md             |  3 +++
 shared/xml/codeql-pack.release.yml                     |  2 +-
 shared/xml/qlpack.yml                                  |  2 +-
 shared/yaml/CHANGELOG.md                               |  4 ++++
 shared/yaml/change-notes/released/1.0.10.md            |  3 +++
 shared/yaml/codeql-pack.release.yml                    |  2 +-
 shared/yaml/qlpack.yml                                 |  2 +-
 swift/ql/lib/CHANGELOG.md                              |  4 ++++
 swift/ql/lib/change-notes/released/2.0.2.md            |  3 +++
 swift/ql/lib/codeql-pack.release.yml                   |  2 +-
 swift/ql/lib/qlpack.yml                                |  2 +-
 swift/ql/src/CHANGELOG.md                              |  4 ++++
 swift/ql/src/change-notes/released/1.0.10.md           |  3 +++
 swift/ql/src/codeql-pack.release.yml                   |  2 +-
 swift/ql/src/qlpack.yml                                |  2 +-
 150 files changed, 357 insertions(+), 123 deletions(-)
 delete mode 100644 cpp/ql/lib/change-notes/2024-10-07-range-analysis-of-getc.md
 delete mode 100644 cpp/ql/lib/change-notes/2024-10-09-fopen-taint.md
 create mode 100644 cpp/ql/lib/change-notes/released/2.0.2.md
 delete mode 100644 cpp/ql/src/change-notes/2024-09-26-wcharcharconversion-false-positives.md
 delete mode 100644 cpp/ql/src/change-notes/2024-10-02-uninitialized-local.md
 delete mode 100644 cpp/ql/src/change-notes/2024-10-07-unclear-array-index-validation.md
 create mode 100644 cpp/ql/src/change-notes/released/1.2.5.md
 create mode 100644 csharp/ql/campaigns/Solorigate/lib/change-notes/released/1.7.27.md
 create mode 100644 csharp/ql/campaigns/Solorigate/src/change-notes/released/1.7.27.md
 create mode 100644 csharp/ql/lib/change-notes/released/3.0.1.md
 create mode 100644 csharp/ql/src/change-notes/released/1.0.10.md
 create mode 100644 go/ql/consistency-queries/change-notes/released/1.0.10.md
 delete mode 100644 go/ql/lib/change-notes/2024-09-03-tags-and-interface-ids.md
 rename go/ql/lib/change-notes/{2024-08-29-add-stdin-threat-models.md => released/2.1.1.md} (64%)
 create mode 100644 go/ql/src/change-notes/released/1.1.1.md
 create mode 100644 java/ql/automodel/src/change-notes/released/1.0.10.md
 create mode 100644 java/ql/lib/change-notes/released/4.1.1.md
 create mode 100644 java/ql/src/change-notes/released/1.1.7.md
 create mode 100644 javascript/ql/lib/change-notes/released/2.0.2.md
 create mode 100644 javascript/ql/src/change-notes/released/1.2.2.md
 create mode 100644 misc/suite-helpers/change-notes/released/1.0.10.md
 delete mode 100644 python/ql/lib/change-notes/2024-09-24-std-lib-models.md
 delete mode 100644 python/ql/lib/change-notes/2024-10-01-comprehension-flow.md
 delete mode 100644 python/ql/lib/change-notes/2024-10-03-typetracking-through-comprehensions.md
 delete mode 100644 python/ql/lib/change-notes/2024-10-09-finditer-match.md
 create mode 100644 python/ql/lib/change-notes/released/2.1.1.md
 create mode 100644 python/ql/src/change-notes/released/1.3.1.md
 rename ruby/ql/lib/change-notes/{2024-10-03-extraction-warnings.md => released/2.0.2.md} (77%)
 rename ruby/ql/src/change-notes/{2024-10-03-extraction-warnings.md => released/1.1.5.md} (82%)
 create mode 100644 shared/controlflow/change-notes/released/1.0.10.md
 create mode 100644 shared/dataflow/change-notes/released/1.1.4.md
 create mode 100644 shared/mad/change-notes/released/1.0.10.md
 create mode 100644 shared/rangeanalysis/change-notes/released/1.0.10.md
 create mode 100644 shared/regex/change-notes/released/1.0.10.md
 create mode 100644 shared/ssa/change-notes/released/1.0.10.md
 create mode 100644 shared/threat-models/change-notes/released/1.0.10.md
 create mode 100644 shared/tutorial/change-notes/released/1.0.10.md
 create mode 100644 shared/typeflow/change-notes/released/1.0.10.md
 create mode 100644 shared/typetracking/change-notes/released/1.0.10.md
 create mode 100644 shared/typos/change-notes/released/1.0.10.md
 create mode 100644 shared/util/change-notes/released/1.0.10.md
 create mode 100644 shared/xml/change-notes/released/1.0.10.md
 create mode 100644 shared/yaml/change-notes/released/1.0.10.md
 create mode 100644 swift/ql/lib/change-notes/released/2.0.2.md
 create mode 100644 swift/ql/src/change-notes/released/1.0.10.md

diff --git a/cpp/ql/lib/CHANGELOG.md b/cpp/ql/lib/CHANGELOG.md
index 5d39629f62b0..73c42c5dfa07 100644
--- a/cpp/ql/lib/CHANGELOG.md
+++ b/cpp/ql/lib/CHANGELOG.md
@@ -1,3 +1,10 @@
+## 2.0.2
+
+### Minor Analysis Improvements
+
+* Added taint flow model for `fopen` and related functions.
+* The `SimpleRangeAnalysis` library (`semmle.code.cpp.rangeanalysis.SimpleRangeAnalysis`) now generates more precise ranges for calls to `fgetc` and `getc`.
+
 ## 2.0.1
 
 No user-facing changes.
diff --git a/cpp/ql/lib/change-notes/2024-10-07-range-analysis-of-getc.md b/cpp/ql/lib/change-notes/2024-10-07-range-analysis-of-getc.md
deleted file mode 100644
index f796fba2ece2..000000000000
--- a/cpp/ql/lib/change-notes/2024-10-07-range-analysis-of-getc.md
+++ /dev/null
@@ -1,4 +0,0 @@
----
-category: minorAnalysis
----
-* The `SimpleRangeAnalysis` library (`semmle.code.cpp.rangeanalysis.SimpleRangeAnalysis`) now generates more precise ranges for calls to `fgetc` and `getc`.
\ No newline at end of file
diff --git a/cpp/ql/lib/change-notes/2024-10-09-fopen-taint.md b/cpp/ql/lib/change-notes/2024-10-09-fopen-taint.md
deleted file mode 100644
index d2516859a910..000000000000
--- a/cpp/ql/lib/change-notes/2024-10-09-fopen-taint.md
+++ /dev/null
@@ -1,4 +0,0 @@
----
-category: minorAnalysis
----
-* Added taint flow model for `fopen` and related functions.
\ No newline at end of file
diff --git a/cpp/ql/lib/change-notes/released/2.0.2.md b/cpp/ql/lib/change-notes/released/2.0.2.md
new file mode 100644
index 000000000000..db3a11e55a8e
--- /dev/null
+++ b/cpp/ql/lib/change-notes/released/2.0.2.md
@@ -0,0 +1,6 @@
+## 2.0.2
+
+### Minor Analysis Improvements
+
+* Added taint flow model for `fopen` and related functions.
+* The `SimpleRangeAnalysis` library (`semmle.code.cpp.rangeanalysis.SimpleRangeAnalysis`) now generates more precise ranges for calls to `fgetc` and `getc`.
diff --git a/cpp/ql/lib/codeql-pack.release.yml b/cpp/ql/lib/codeql-pack.release.yml
index fe974a4dbf37..81c7f1dbc13c 100644
--- a/cpp/ql/lib/codeql-pack.release.yml
+++ b/cpp/ql/lib/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 2.0.1
+lastReleaseVersion: 2.0.2
diff --git a/cpp/ql/lib/qlpack.yml b/cpp/ql/lib/qlpack.yml
index ba5db8c6e6f9..91af68ed6411 100644
--- a/cpp/ql/lib/qlpack.yml
+++ b/cpp/ql/lib/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/cpp-all
-version: 2.0.2-dev
+version: 2.0.2
 groups: cpp
 dbscheme: semmlecode.cpp.dbscheme
 extractor: cpp
diff --git a/cpp/ql/src/CHANGELOG.md b/cpp/ql/src/CHANGELOG.md
index 8eaccb0404dc..7896479549fc 100644
--- a/cpp/ql/src/CHANGELOG.md
+++ b/cpp/ql/src/CHANGELOG.md
@@ -1,3 +1,12 @@
+## 1.2.5
+
+### Minor Analysis Improvements
+
+* The `cpp/unclear-array-index-validation` ("Unclear validation of array index") query has been improved to reduce false positives increase true positives.
+* Fixed false positives in the `cpp/uninitialized-local` ("Potentially uninitialized local variable") query if there are extraction errors in the function.
+* The `cpp/incorrect-string-type-conversion` query now produces fewer false positives caused by failure to detect byte arrays.
+* The `cpp/incorrect-string-type-conversion` query now produces fewer false positives caused by failure to recognize dynamic checks prior to possible dangerous widening.
+
 ## 1.2.4
 
 ### Minor Analysis Improvements
diff --git a/cpp/ql/src/change-notes/2024-09-26-wcharcharconversion-false-positives.md b/cpp/ql/src/change-notes/2024-09-26-wcharcharconversion-false-positives.md
deleted file mode 100644
index b0fa7a953c59..000000000000
--- a/cpp/ql/src/change-notes/2024-09-26-wcharcharconversion-false-positives.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-category: minorAnalysis
----
-* The `cpp/incorrect-string-type-conversion` query now produces fewer false positives caused by failure to detect byte arrays.
-* The `cpp/incorrect-string-type-conversion` query now produces fewer false positives caused by failure to recognize dynamic checks prior to possible dangerous widening.
\ No newline at end of file
diff --git a/cpp/ql/src/change-notes/2024-10-02-uninitialized-local.md b/cpp/ql/src/change-notes/2024-10-02-uninitialized-local.md
deleted file mode 100644
index e34a942f38a6..000000000000
--- a/cpp/ql/src/change-notes/2024-10-02-uninitialized-local.md
+++ /dev/null
@@ -1,4 +0,0 @@
----
-category: minorAnalysis
----
-* Fixed false positives in the `cpp/uninitialized-local` ("Potentially uninitialized local variable") query if there are extraction errors in the function.
diff --git a/cpp/ql/src/change-notes/2024-10-07-unclear-array-index-validation.md b/cpp/ql/src/change-notes/2024-10-07-unclear-array-index-validation.md
deleted file mode 100644
index b237afdd6be8..000000000000
--- a/cpp/ql/src/change-notes/2024-10-07-unclear-array-index-validation.md
+++ /dev/null
@@ -1,4 +0,0 @@
----
-category: minorAnalysis
----
-* The `cpp/unclear-array-index-validation` ("Unclear validation of array index") query has been improved to reduce false positives increase true positives.
\ No newline at end of file
diff --git a/cpp/ql/src/change-notes/released/1.2.5.md b/cpp/ql/src/change-notes/released/1.2.5.md
new file mode 100644
index 000000000000..cf937d43e6b3
--- /dev/null
+++ b/cpp/ql/src/change-notes/released/1.2.5.md
@@ -0,0 +1,8 @@
+## 1.2.5
+
+### Minor Analysis Improvements
+
+* The `cpp/unclear-array-index-validation` ("Unclear validation of array index") query has been improved to reduce false positives increase true positives.
+* Fixed false positives in the `cpp/uninitialized-local` ("Potentially uninitialized local variable") query if there are extraction errors in the function.
+* The `cpp/incorrect-string-type-conversion` query now produces fewer false positives caused by failure to detect byte arrays.
+* The `cpp/incorrect-string-type-conversion` query now produces fewer false positives caused by failure to recognize dynamic checks prior to possible dangerous widening.
diff --git a/cpp/ql/src/codeql-pack.release.yml b/cpp/ql/src/codeql-pack.release.yml
index 172090f46b6d..40355f0807f9 100644
--- a/cpp/ql/src/codeql-pack.release.yml
+++ b/cpp/ql/src/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 1.2.4
+lastReleaseVersion: 1.2.5
diff --git a/cpp/ql/src/qlpack.yml b/cpp/ql/src/qlpack.yml
index d01ac2f048c2..eee6e064b22f 100644
--- a/cpp/ql/src/qlpack.yml
+++ b/cpp/ql/src/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/cpp-queries
-version: 1.2.5-dev
+version: 1.2.5
 groups:
   - cpp
   - queries
diff --git a/csharp/ql/campaigns/Solorigate/lib/CHANGELOG.md b/csharp/ql/campaigns/Solorigate/lib/CHANGELOG.md
index 989d5e74408f..eb646b9ce77f 100644
--- a/csharp/ql/campaigns/Solorigate/lib/CHANGELOG.md
+++ b/csharp/ql/campaigns/Solorigate/lib/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 1.7.27
+
+No user-facing changes.
+
 ## 1.7.26
 
 No user-facing changes.
diff --git a/csharp/ql/campaigns/Solorigate/lib/change-notes/released/1.7.27.md b/csharp/ql/campaigns/Solorigate/lib/change-notes/released/1.7.27.md
new file mode 100644
index 000000000000..7d323c891002
--- /dev/null
+++ b/csharp/ql/campaigns/Solorigate/lib/change-notes/released/1.7.27.md
@@ -0,0 +1,3 @@
+## 1.7.27
+
+No user-facing changes.
diff --git a/csharp/ql/campaigns/Solorigate/lib/codeql-pack.release.yml b/csharp/ql/campaigns/Solorigate/lib/codeql-pack.release.yml
index ca4c34e70d1b..5c0490dbda8e 100644
--- a/csharp/ql/campaigns/Solorigate/lib/codeql-pack.release.yml
+++ b/csharp/ql/campaigns/Solorigate/lib/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 1.7.26
+lastReleaseVersion: 1.7.27
diff --git a/csharp/ql/campaigns/Solorigate/lib/qlpack.yml b/csharp/ql/campaigns/Solorigate/lib/qlpack.yml
index 3cab08a0f3ec..e02f2f0733ce 100644
--- a/csharp/ql/campaigns/Solorigate/lib/qlpack.yml
+++ b/csharp/ql/campaigns/Solorigate/lib/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/csharp-solorigate-all
-version: 1.7.27-dev
+version: 1.7.27
 groups:
   - csharp
   - solorigate
diff --git a/csharp/ql/campaigns/Solorigate/src/CHANGELOG.md b/csharp/ql/campaigns/Solorigate/src/CHANGELOG.md
index 989d5e74408f..eb646b9ce77f 100644
--- a/csharp/ql/campaigns/Solorigate/src/CHANGELOG.md
+++ b/csharp/ql/campaigns/Solorigate/src/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 1.7.27
+
+No user-facing changes.
+
 ## 1.7.26
 
 No user-facing changes.
diff --git a/csharp/ql/campaigns/Solorigate/src/change-notes/released/1.7.27.md b/csharp/ql/campaigns/Solorigate/src/change-notes/released/1.7.27.md
new file mode 100644
index 000000000000..7d323c891002
--- /dev/null
+++ b/csharp/ql/campaigns/Solorigate/src/change-notes/released/1.7.27.md
@@ -0,0 +1,3 @@
+## 1.7.27
+
+No user-facing changes.
diff --git a/csharp/ql/campaigns/Solorigate/src/codeql-pack.release.yml b/csharp/ql/campaigns/Solorigate/src/codeql-pack.release.yml
index ca4c34e70d1b..5c0490dbda8e 100644
--- a/csharp/ql/campaigns/Solorigate/src/codeql-pack.release.yml
+++ b/csharp/ql/campaigns/Solorigate/src/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 1.7.26
+lastReleaseVersion: 1.7.27
diff --git a/csharp/ql/campaigns/Solorigate/src/qlpack.yml b/csharp/ql/campaigns/Solorigate/src/qlpack.yml
index c46baf0b2518..d94e11459d4c 100644
--- a/csharp/ql/campaigns/Solorigate/src/qlpack.yml
+++ b/csharp/ql/campaigns/Solorigate/src/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/csharp-solorigate-queries
-version: 1.7.27-dev
+version: 1.7.27
 groups:
   - csharp
   - solorigate
diff --git a/csharp/ql/lib/CHANGELOG.md b/csharp/ql/lib/CHANGELOG.md
index 7e8378798830..302087e4f147 100644
--- a/csharp/ql/lib/CHANGELOG.md
+++ b/csharp/ql/lib/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 3.0.1
+
+No user-facing changes.
+
 ## 3.0.0
 
 ### Breaking Changes
diff --git a/csharp/ql/lib/change-notes/released/3.0.1.md b/csharp/ql/lib/change-notes/released/3.0.1.md
new file mode 100644
index 000000000000..ac5998ace618
--- /dev/null
+++ b/csharp/ql/lib/change-notes/released/3.0.1.md
@@ -0,0 +1,3 @@
+## 3.0.1
+
+No user-facing changes.
diff --git a/csharp/ql/lib/codeql-pack.release.yml b/csharp/ql/lib/codeql-pack.release.yml
index 33d3a2cd1139..e3b15d965db6 100644
--- a/csharp/ql/lib/codeql-pack.release.yml
+++ b/csharp/ql/lib/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 3.0.0
+lastReleaseVersion: 3.0.1
diff --git a/csharp/ql/lib/qlpack.yml b/csharp/ql/lib/qlpack.yml
index 55a99929ac87..1515544bc960 100644
--- a/csharp/ql/lib/qlpack.yml
+++ b/csharp/ql/lib/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/csharp-all
-version: 3.0.1-dev
+version: 3.0.1
 groups: csharp
 dbscheme: semmlecode.csharp.dbscheme
 extractor: csharp
diff --git a/csharp/ql/src/CHANGELOG.md b/csharp/ql/src/CHANGELOG.md
index 4c162b64d8f7..59a98aca72a2 100644
--- a/csharp/ql/src/CHANGELOG.md
+++ b/csharp/ql/src/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 1.0.10
+
+No user-facing changes.
+
 ## 1.0.9
 
 ### Minor Analysis Improvements
diff --git a/csharp/ql/src/change-notes/released/1.0.10.md b/csharp/ql/src/change-notes/released/1.0.10.md
new file mode 100644
index 000000000000..b601d8784532
--- /dev/null
+++ b/csharp/ql/src/change-notes/released/1.0.10.md
@@ -0,0 +1,3 @@
+## 1.0.10
+
+No user-facing changes.
diff --git a/csharp/ql/src/codeql-pack.release.yml b/csharp/ql/src/codeql-pack.release.yml
index fb813c5ee050..3865dbcf4b2a 100644
--- a/csharp/ql/src/codeql-pack.release.yml
+++ b/csharp/ql/src/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 1.0.9
+lastReleaseVersion: 1.0.10
diff --git a/csharp/ql/src/qlpack.yml b/csharp/ql/src/qlpack.yml
index 6209cc5f88d5..90e7ec11d865 100644
--- a/csharp/ql/src/qlpack.yml
+++ b/csharp/ql/src/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/csharp-queries
-version: 1.0.10-dev
+version: 1.0.10
 groups:
   - csharp
   - queries
diff --git a/go/ql/consistency-queries/CHANGELOG.md b/go/ql/consistency-queries/CHANGELOG.md
index 9589b67148fa..b62e06e3dff0 100644
--- a/go/ql/consistency-queries/CHANGELOG.md
+++ b/go/ql/consistency-queries/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 1.0.10
+
+No user-facing changes.
+
 ## 1.0.9
 
 No user-facing changes.
diff --git a/go/ql/consistency-queries/change-notes/released/1.0.10.md b/go/ql/consistency-queries/change-notes/released/1.0.10.md
new file mode 100644
index 000000000000..b601d8784532
--- /dev/null
+++ b/go/ql/consistency-queries/change-notes/released/1.0.10.md
@@ -0,0 +1,3 @@
+## 1.0.10
+
+No user-facing changes.
diff --git a/go/ql/consistency-queries/codeql-pack.release.yml b/go/ql/consistency-queries/codeql-pack.release.yml
index fb813c5ee050..3865dbcf4b2a 100644
--- a/go/ql/consistency-queries/codeql-pack.release.yml
+++ b/go/ql/consistency-queries/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 1.0.9
+lastReleaseVersion: 1.0.10
diff --git a/go/ql/consistency-queries/qlpack.yml b/go/ql/consistency-queries/qlpack.yml
index 5a7ca8082a53..726aa918f891 100644
--- a/go/ql/consistency-queries/qlpack.yml
+++ b/go/ql/consistency-queries/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql-go-consistency-queries
-version: 1.0.10-dev
+version: 1.0.10
 groups:
   - go
   - queries
diff --git a/go/ql/lib/CHANGELOG.md b/go/ql/lib/CHANGELOG.md
index a9a8190e6acc..d3c6fcd4a611 100644
--- a/go/ql/lib/CHANGELOG.md
+++ b/go/ql/lib/CHANGELOG.md
@@ -1,3 +1,11 @@
+## 2.1.1
+
+### Minor Analysis Improvements
+
+* Added member predicates `StructTag.hasOwnFieldWithTag` and `Field.getTag`, which enable CodeQL queries to examine struct field tags.
+* Added member predicate `InterfaceType.hasPrivateMethodWithQualifiedName`, which enables CodeQL queries to distinguish interfaces with matching non-exported method names that are declared in different packages, and are therefore incompatible.
+* Local source models with the `stdin` source kind have been added for the variable `os.Stdin` and the functions `fmt.Scan`, `fmt.Scanf` and `fmt.Scanln`. You can optionally include threat models as appropriate when using the CodeQL CLI and in GitHub code scanning. For more information, see [Analyzing your code with CodeQL queries](https://docs.github.com/code-security/codeql-cli/getting-started-with-the-codeql-cli/analyzing-your-code-with-codeql-queries#including-model-packs-to-add-potential-sources-of-tainted-data>) and [Customizing your advanced setup for code scanning](https://docs.github.com/code-security/code-scanning/creating-an-advanced-setup-for-code-scanning/customizing-your-advanced-setup-for-code-scanning#extending-codeql-coverage-with-threat-models).
+
 ## 2.1.0
 
 ### Deprecated APIs
diff --git a/go/ql/lib/change-notes/2024-09-03-tags-and-interface-ids.md b/go/ql/lib/change-notes/2024-09-03-tags-and-interface-ids.md
deleted file mode 100644
index 749ae4cde998..000000000000
--- a/go/ql/lib/change-notes/2024-09-03-tags-and-interface-ids.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-category: minorAnalysis
----
-* Added member predicates `StructTag.hasOwnFieldWithTag` and `Field.getTag`, which enable CodeQL queries to examine struct field tags.
-* Added member predicate `InterfaceType.hasPrivateMethodWithQualifiedName`, which enables CodeQL queries to distinguish interfaces with matching non-exported method names that are declared in different packages, and are therefore incompatible.
diff --git a/go/ql/lib/change-notes/2024-08-29-add-stdin-threat-models.md b/go/ql/lib/change-notes/released/2.1.1.md
similarity index 64%
rename from go/ql/lib/change-notes/2024-08-29-add-stdin-threat-models.md
rename to go/ql/lib/change-notes/released/2.1.1.md
index d98ac68f1edc..7319120fd3cb 100644
--- a/go/ql/lib/change-notes/2024-08-29-add-stdin-threat-models.md
+++ b/go/ql/lib/change-notes/released/2.1.1.md
@@ -1,4 +1,7 @@
----
-category: minorAnalysis
----
+## 2.1.1
+
+### Minor Analysis Improvements
+
+* Added member predicates `StructTag.hasOwnFieldWithTag` and `Field.getTag`, which enable CodeQL queries to examine struct field tags.
+* Added member predicate `InterfaceType.hasPrivateMethodWithQualifiedName`, which enables CodeQL queries to distinguish interfaces with matching non-exported method names that are declared in different packages, and are therefore incompatible.
 * Local source models with the `stdin` source kind have been added for the variable `os.Stdin` and the functions `fmt.Scan`, `fmt.Scanf` and `fmt.Scanln`. You can optionally include threat models as appropriate when using the CodeQL CLI and in GitHub code scanning. For more information, see [Analyzing your code with CodeQL queries](https://docs.github.com/code-security/codeql-cli/getting-started-with-the-codeql-cli/analyzing-your-code-with-codeql-queries#including-model-packs-to-add-potential-sources-of-tainted-data>) and [Customizing your advanced setup for code scanning](https://docs.github.com/code-security/code-scanning/creating-an-advanced-setup-for-code-scanning/customizing-your-advanced-setup-for-code-scanning#extending-codeql-coverage-with-threat-models).
diff --git a/go/ql/lib/codeql-pack.release.yml b/go/ql/lib/codeql-pack.release.yml
index 487a1a58b2b8..576c2ea18d68 100644
--- a/go/ql/lib/codeql-pack.release.yml
+++ b/go/ql/lib/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 2.1.0
+lastReleaseVersion: 2.1.1
diff --git a/go/ql/lib/qlpack.yml b/go/ql/lib/qlpack.yml
index 9cb5e3620117..ba6a48a29d49 100644
--- a/go/ql/lib/qlpack.yml
+++ b/go/ql/lib/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/go-all
-version: 2.1.1-dev
+version: 2.1.1
 groups: go
 dbscheme: go.dbscheme
 extractor: go
diff --git a/go/ql/src/CHANGELOG.md b/go/ql/src/CHANGELOG.md
index 69a5ed3e9f83..bdb40a2d2bb4 100644
--- a/go/ql/src/CHANGELOG.md
+++ b/go/ql/src/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 1.1.1
+
+No user-facing changes.
+
 ## 1.1.0
 
 ### Query Metadata Changes
diff --git a/go/ql/src/change-notes/released/1.1.1.md b/go/ql/src/change-notes/released/1.1.1.md
new file mode 100644
index 000000000000..7fb56d366105
--- /dev/null
+++ b/go/ql/src/change-notes/released/1.1.1.md
@@ -0,0 +1,3 @@
+## 1.1.1
+
+No user-facing changes.
diff --git a/go/ql/src/codeql-pack.release.yml b/go/ql/src/codeql-pack.release.yml
index 2ac15439f561..1a19084be3f7 100644
--- a/go/ql/src/codeql-pack.release.yml
+++ b/go/ql/src/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 1.1.0
+lastReleaseVersion: 1.1.1
diff --git a/go/ql/src/qlpack.yml b/go/ql/src/qlpack.yml
index 0b3f5076bb6d..0dbc1fe67fae 100644
--- a/go/ql/src/qlpack.yml
+++ b/go/ql/src/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/go-queries
-version: 1.1.1-dev
+version: 1.1.1
 groups:
   - go
   - queries
diff --git a/java/ql/automodel/src/CHANGELOG.md b/java/ql/automodel/src/CHANGELOG.md
index 4d632a2ae2d2..537e84b2c0e5 100644
--- a/java/ql/automodel/src/CHANGELOG.md
+++ b/java/ql/automodel/src/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 1.0.10
+
+No user-facing changes.
+
 ## 1.0.9
 
 No user-facing changes.
diff --git a/java/ql/automodel/src/change-notes/released/1.0.10.md b/java/ql/automodel/src/change-notes/released/1.0.10.md
new file mode 100644
index 000000000000..b601d8784532
--- /dev/null
+++ b/java/ql/automodel/src/change-notes/released/1.0.10.md
@@ -0,0 +1,3 @@
+## 1.0.10
+
+No user-facing changes.
diff --git a/java/ql/automodel/src/codeql-pack.release.yml b/java/ql/automodel/src/codeql-pack.release.yml
index fb813c5ee050..3865dbcf4b2a 100644
--- a/java/ql/automodel/src/codeql-pack.release.yml
+++ b/java/ql/automodel/src/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 1.0.9
+lastReleaseVersion: 1.0.10
diff --git a/java/ql/automodel/src/qlpack.yml b/java/ql/automodel/src/qlpack.yml
index fe961cb4392c..7621f1900d53 100644
--- a/java/ql/automodel/src/qlpack.yml
+++ b/java/ql/automodel/src/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/java-automodel-queries
-version: 1.0.10-dev
+version: 1.0.10
 groups:
     - java
     - automodel
diff --git a/java/ql/lib/CHANGELOG.md b/java/ql/lib/CHANGELOG.md
index 5441126d72c9..6be0cdc10e5a 100644
--- a/java/ql/lib/CHANGELOG.md
+++ b/java/ql/lib/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 4.1.1
+
+No user-facing changes.
+
 ## 4.1.0
 
 ### Deprecated APIs
diff --git a/java/ql/lib/change-notes/released/4.1.1.md b/java/ql/lib/change-notes/released/4.1.1.md
new file mode 100644
index 000000000000..23583cbad734
--- /dev/null
+++ b/java/ql/lib/change-notes/released/4.1.1.md
@@ -0,0 +1,3 @@
+## 4.1.1
+
+No user-facing changes.
diff --git a/java/ql/lib/codeql-pack.release.yml b/java/ql/lib/codeql-pack.release.yml
index d5b1bf88d10e..9c871cefc42c 100644
--- a/java/ql/lib/codeql-pack.release.yml
+++ b/java/ql/lib/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 4.1.0
+lastReleaseVersion: 4.1.1
diff --git a/java/ql/lib/qlpack.yml b/java/ql/lib/qlpack.yml
index 0d4f67146c1b..23871cfb7d82 100644
--- a/java/ql/lib/qlpack.yml
+++ b/java/ql/lib/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/java-all
-version: 4.1.1-dev
+version: 4.1.1
 groups: java
 dbscheme: config/semmlecode.dbscheme
 extractor: java
diff --git a/java/ql/src/CHANGELOG.md b/java/ql/src/CHANGELOG.md
index 20e7a248aebb..a034dc0abf90 100644
--- a/java/ql/src/CHANGELOG.md
+++ b/java/ql/src/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 1.1.7
+
+No user-facing changes.
+
 ## 1.1.6
 
 ### Minor Analysis Improvements
diff --git a/java/ql/src/change-notes/released/1.1.7.md b/java/ql/src/change-notes/released/1.1.7.md
new file mode 100644
index 000000000000..81505c0507a2
--- /dev/null
+++ b/java/ql/src/change-notes/released/1.1.7.md
@@ -0,0 +1,3 @@
+## 1.1.7
+
+No user-facing changes.
diff --git a/java/ql/src/codeql-pack.release.yml b/java/ql/src/codeql-pack.release.yml
index 9e712a00a21d..759105565166 100644
--- a/java/ql/src/codeql-pack.release.yml
+++ b/java/ql/src/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 1.1.6
+lastReleaseVersion: 1.1.7
diff --git a/java/ql/src/qlpack.yml b/java/ql/src/qlpack.yml
index c8e95f52ca4a..82b14986199e 100644
--- a/java/ql/src/qlpack.yml
+++ b/java/ql/src/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/java-queries
-version: 1.1.7-dev
+version: 1.1.7
 groups:
   - java
   - queries
diff --git a/javascript/ql/lib/CHANGELOG.md b/javascript/ql/lib/CHANGELOG.md
index bb77b4f1f496..6068cf26319d 100644
--- a/javascript/ql/lib/CHANGELOG.md
+++ b/javascript/ql/lib/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 2.0.2
+
+No user-facing changes.
+
 ## 2.0.1
 
 No user-facing changes.
diff --git a/javascript/ql/lib/change-notes/released/2.0.2.md b/javascript/ql/lib/change-notes/released/2.0.2.md
new file mode 100644
index 000000000000..862ef0e9df7c
--- /dev/null
+++ b/javascript/ql/lib/change-notes/released/2.0.2.md
@@ -0,0 +1,3 @@
+## 2.0.2
+
+No user-facing changes.
diff --git a/javascript/ql/lib/codeql-pack.release.yml b/javascript/ql/lib/codeql-pack.release.yml
index fe974a4dbf37..81c7f1dbc13c 100644
--- a/javascript/ql/lib/codeql-pack.release.yml
+++ b/javascript/ql/lib/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 2.0.1
+lastReleaseVersion: 2.0.2
diff --git a/javascript/ql/lib/qlpack.yml b/javascript/ql/lib/qlpack.yml
index bea3bbacd5fa..8cf13a5240ce 100644
--- a/javascript/ql/lib/qlpack.yml
+++ b/javascript/ql/lib/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/javascript-all
-version: 2.0.2-dev
+version: 2.0.2
 groups: javascript
 dbscheme: semmlecode.javascript.dbscheme
 extractor: javascript
diff --git a/javascript/ql/src/CHANGELOG.md b/javascript/ql/src/CHANGELOG.md
index adf7daa3eb43..df7becd46de5 100644
--- a/javascript/ql/src/CHANGELOG.md
+++ b/javascript/ql/src/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 1.2.2
+
+No user-facing changes.
+
 ## 1.2.1
 
 No user-facing changes.
diff --git a/javascript/ql/src/change-notes/released/1.2.2.md b/javascript/ql/src/change-notes/released/1.2.2.md
new file mode 100644
index 000000000000..7b520f6c258f
--- /dev/null
+++ b/javascript/ql/src/change-notes/released/1.2.2.md
@@ -0,0 +1,3 @@
+## 1.2.2
+
+No user-facing changes.
diff --git a/javascript/ql/src/codeql-pack.release.yml b/javascript/ql/src/codeql-pack.release.yml
index 73dd403938c9..0a70a9a01a7e 100644
--- a/javascript/ql/src/codeql-pack.release.yml
+++ b/javascript/ql/src/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 1.2.1
+lastReleaseVersion: 1.2.2
diff --git a/javascript/ql/src/qlpack.yml b/javascript/ql/src/qlpack.yml
index 407aa03f7802..5aee59e9b015 100644
--- a/javascript/ql/src/qlpack.yml
+++ b/javascript/ql/src/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/javascript-queries
-version: 1.2.2-dev
+version: 1.2.2
 groups:
   - javascript
   - queries
diff --git a/misc/suite-helpers/CHANGELOG.md b/misc/suite-helpers/CHANGELOG.md
index 729794553521..e9c580c60cef 100644
--- a/misc/suite-helpers/CHANGELOG.md
+++ b/misc/suite-helpers/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 1.0.10
+
+No user-facing changes.
+
 ## 1.0.9
 
 No user-facing changes.
diff --git a/misc/suite-helpers/change-notes/released/1.0.10.md b/misc/suite-helpers/change-notes/released/1.0.10.md
new file mode 100644
index 000000000000..b601d8784532
--- /dev/null
+++ b/misc/suite-helpers/change-notes/released/1.0.10.md
@@ -0,0 +1,3 @@
+## 1.0.10
+
+No user-facing changes.
diff --git a/misc/suite-helpers/codeql-pack.release.yml b/misc/suite-helpers/codeql-pack.release.yml
index fb813c5ee050..3865dbcf4b2a 100644
--- a/misc/suite-helpers/codeql-pack.release.yml
+++ b/misc/suite-helpers/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 1.0.9
+lastReleaseVersion: 1.0.10
diff --git a/misc/suite-helpers/qlpack.yml b/misc/suite-helpers/qlpack.yml
index 76c86b26be6b..6b8eb63063ba 100644
--- a/misc/suite-helpers/qlpack.yml
+++ b/misc/suite-helpers/qlpack.yml
@@ -1,4 +1,4 @@
 name: codeql/suite-helpers
-version: 1.0.10-dev
+version: 1.0.10
 groups: shared
 warnOnImplicitThis: true
diff --git a/python/ql/lib/CHANGELOG.md b/python/ql/lib/CHANGELOG.md
index 4cadb40bc2f5..4832015d920d 100644
--- a/python/ql/lib/CHANGELOG.md
+++ b/python/ql/lib/CHANGELOG.md
@@ -1,3 +1,13 @@
+## 2.1.1
+
+### Minor Analysis Improvements
+
+* Modelled that `re.finditer` returns an iterable of `re.Match` objects. This is now understood by the API graph in many cases.
+* Type tracking, and hence the API graph, is now able to correctly trace trough comprehensions.
+* More precise modelling of the dataflow through comprehensions. In particular, captured variables are now handled correctly.
+* Dataflow out of yield is added, allowing proper tracing through generators.
+* Added several models of standard library functions and classes, in anticipation of no longer extracting the standard library in a future release.
+
 ## 2.1.0
 
 ### New Features
diff --git a/python/ql/lib/change-notes/2024-09-24-std-lib-models.md b/python/ql/lib/change-notes/2024-09-24-std-lib-models.md
deleted file mode 100644
index 3166e0c8ff0f..000000000000
--- a/python/ql/lib/change-notes/2024-09-24-std-lib-models.md
+++ /dev/null
@@ -1,4 +0,0 @@
----
-category: minorAnalysis
----
-* Added several models of standard library functions and classes, in anticipation of no longer extracting the standard library in a future release.
\ No newline at end of file
diff --git a/python/ql/lib/change-notes/2024-10-01-comprehension-flow.md b/python/ql/lib/change-notes/2024-10-01-comprehension-flow.md
deleted file mode 100644
index bc3165f05f33..000000000000
--- a/python/ql/lib/change-notes/2024-10-01-comprehension-flow.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-category: minorAnalysis
----
-* More precise modelling of the dataflow through comprehensions. In particular, captured variables are now handled correctly.
-* Dataflow out of yield is added, allowing proper tracing through generators.
\ No newline at end of file
diff --git a/python/ql/lib/change-notes/2024-10-03-typetracking-through-comprehensions.md b/python/ql/lib/change-notes/2024-10-03-typetracking-through-comprehensions.md
deleted file mode 100644
index 72d853460305..000000000000
--- a/python/ql/lib/change-notes/2024-10-03-typetracking-through-comprehensions.md
+++ /dev/null
@@ -1,4 +0,0 @@
----
-category: minorAnalysis
----
-* Type tracking, and hence the API graph, is now able to correctly trace trough comprehensions.
\ No newline at end of file
diff --git a/python/ql/lib/change-notes/2024-10-09-finditer-match.md b/python/ql/lib/change-notes/2024-10-09-finditer-match.md
deleted file mode 100644
index ee2ccc1119a4..000000000000
--- a/python/ql/lib/change-notes/2024-10-09-finditer-match.md
+++ /dev/null
@@ -1,4 +0,0 @@
----
-category: minorAnalysis
----
-* Modelled that `re.finditer` returns an iterable of `re.Match` objects. This is now understood by the API graph in many cases.
\ No newline at end of file
diff --git a/python/ql/lib/change-notes/released/2.1.1.md b/python/ql/lib/change-notes/released/2.1.1.md
new file mode 100644
index 000000000000..949fcd07f7aa
--- /dev/null
+++ b/python/ql/lib/change-notes/released/2.1.1.md
@@ -0,0 +1,9 @@
+## 2.1.1
+
+### Minor Analysis Improvements
+
+* Modelled that `re.finditer` returns an iterable of `re.Match` objects. This is now understood by the API graph in many cases.
+* Type tracking, and hence the API graph, is now able to correctly trace trough comprehensions.
+* More precise modelling of the dataflow through comprehensions. In particular, captured variables are now handled correctly.
+* Dataflow out of yield is added, allowing proper tracing through generators.
+* Added several models of standard library functions and classes, in anticipation of no longer extracting the standard library in a future release.
diff --git a/python/ql/lib/codeql-pack.release.yml b/python/ql/lib/codeql-pack.release.yml
index 487a1a58b2b8..576c2ea18d68 100644
--- a/python/ql/lib/codeql-pack.release.yml
+++ b/python/ql/lib/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 2.1.0
+lastReleaseVersion: 2.1.1
diff --git a/python/ql/lib/qlpack.yml b/python/ql/lib/qlpack.yml
index 445940cdd889..dd92c1068daf 100644
--- a/python/ql/lib/qlpack.yml
+++ b/python/ql/lib/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/python-all
-version: 2.1.1-dev
+version: 2.1.1
 groups: python
 dbscheme: semmlecode.python.dbscheme
 extractor: python
diff --git a/python/ql/src/CHANGELOG.md b/python/ql/src/CHANGELOG.md
index 21c9ebcf16f9..ea236eb11ba5 100644
--- a/python/ql/src/CHANGELOG.md
+++ b/python/ql/src/CHANGELOG.md
@@ -1,8 +1,12 @@
+## 1.3.1
+
+No user-facing changes.
+
 ## 1.3.0
 
 ### New Queries
 
-* The `py/cors-misconfiguration-with-credentials` query, which finds insecure CORS middleware configurations.
+* The experimental `py/cors-misconfiguration-with-credentials` query, which finds insecure CORS middleware configurations.
 
 ## 1.2.2
 
diff --git a/python/ql/src/change-notes/released/1.3.1.md b/python/ql/src/change-notes/released/1.3.1.md
new file mode 100644
index 000000000000..8dd9964197cb
--- /dev/null
+++ b/python/ql/src/change-notes/released/1.3.1.md
@@ -0,0 +1,3 @@
+## 1.3.1
+
+No user-facing changes.
diff --git a/python/ql/src/codeql-pack.release.yml b/python/ql/src/codeql-pack.release.yml
index ec16350ed6fd..e71b6d081f15 100644
--- a/python/ql/src/codeql-pack.release.yml
+++ b/python/ql/src/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 1.3.0
+lastReleaseVersion: 1.3.1
diff --git a/python/ql/src/qlpack.yml b/python/ql/src/qlpack.yml
index 3f5ee4e78041..52d6ee0b6032 100644
--- a/python/ql/src/qlpack.yml
+++ b/python/ql/src/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/python-queries
-version: 1.3.1-dev
+version: 1.3.1
 groups:
   - python
   - queries
diff --git a/ruby/ql/lib/CHANGELOG.md b/ruby/ql/lib/CHANGELOG.md
index 59c058c1c45c..fcfaf0238c21 100644
--- a/ruby/ql/lib/CHANGELOG.md
+++ b/ruby/ql/lib/CHANGELOG.md
@@ -1,3 +1,9 @@
+## 2.0.2
+
+### Minor Analysis Improvements
+
+* The `ExtractionError` class has been split into `ExtractionError` and `ExtractionWarning`, reporting extraction errors and warnings respectively.
+
 ## 2.0.1
 
 No user-facing changes.
diff --git a/ruby/ql/lib/change-notes/2024-10-03-extraction-warnings.md b/ruby/ql/lib/change-notes/released/2.0.2.md
similarity index 77%
rename from ruby/ql/lib/change-notes/2024-10-03-extraction-warnings.md
rename to ruby/ql/lib/change-notes/released/2.0.2.md
index 5d6128354c3b..9d7757a2e03e 100644
--- a/ruby/ql/lib/change-notes/2024-10-03-extraction-warnings.md
+++ b/ruby/ql/lib/change-notes/released/2.0.2.md
@@ -1,4 +1,5 @@
----
-category: minorAnalysis
----
+## 2.0.2
+
+### Minor Analysis Improvements
+
 * The `ExtractionError` class has been split into `ExtractionError` and `ExtractionWarning`, reporting extraction errors and warnings respectively.
diff --git a/ruby/ql/lib/codeql-pack.release.yml b/ruby/ql/lib/codeql-pack.release.yml
index fe974a4dbf37..81c7f1dbc13c 100644
--- a/ruby/ql/lib/codeql-pack.release.yml
+++ b/ruby/ql/lib/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 2.0.1
+lastReleaseVersion: 2.0.2
diff --git a/ruby/ql/lib/qlpack.yml b/ruby/ql/lib/qlpack.yml
index dc0b471a171d..53ea89afe3b1 100644
--- a/ruby/ql/lib/qlpack.yml
+++ b/ruby/ql/lib/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/ruby-all
-version: 2.0.2-dev
+version: 2.0.2
 groups: ruby
 extractor: ruby
 dbscheme: ruby.dbscheme
diff --git a/ruby/ql/src/CHANGELOG.md b/ruby/ql/src/CHANGELOG.md
index 5e9c68a56a01..363b517dec19 100644
--- a/ruby/ql/src/CHANGELOG.md
+++ b/ruby/ql/src/CHANGELOG.md
@@ -1,3 +1,9 @@
+## 1.1.5
+
+### Minor Analysis Improvements
+
+* The `rb/diagnostics/extraction-errors` diagnostic query has been split into `rb/diagnostics/extraction-errors` and `rb/diagnostics/extraction-warnings`, counting extraction errors and warnings respectively.
+
 ## 1.1.4
 
 No user-facing changes.
diff --git a/ruby/ql/src/change-notes/2024-10-03-extraction-warnings.md b/ruby/ql/src/change-notes/released/1.1.5.md
similarity index 82%
rename from ruby/ql/src/change-notes/2024-10-03-extraction-warnings.md
rename to ruby/ql/src/change-notes/released/1.1.5.md
index ac97cd1e7ba2..fd55457a718c 100644
--- a/ruby/ql/src/change-notes/2024-10-03-extraction-warnings.md
+++ b/ruby/ql/src/change-notes/released/1.1.5.md
@@ -1,4 +1,5 @@
----
-category: minorAnalysis
----
+## 1.1.5
+
+### Minor Analysis Improvements
+
 * The `rb/diagnostics/extraction-errors` diagnostic query has been split into `rb/diagnostics/extraction-errors` and `rb/diagnostics/extraction-warnings`, counting extraction errors and warnings respectively.
diff --git a/ruby/ql/src/codeql-pack.release.yml b/ruby/ql/src/codeql-pack.release.yml
index 26cbcd3f123b..df39a9de059d 100644
--- a/ruby/ql/src/codeql-pack.release.yml
+++ b/ruby/ql/src/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 1.1.4
+lastReleaseVersion: 1.1.5
diff --git a/ruby/ql/src/qlpack.yml b/ruby/ql/src/qlpack.yml
index b7eee713fbaa..2c0ea256429e 100644
--- a/ruby/ql/src/qlpack.yml
+++ b/ruby/ql/src/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/ruby-queries
-version: 1.1.5-dev
+version: 1.1.5
 groups:
   - ruby
   - queries
diff --git a/shared/controlflow/CHANGELOG.md b/shared/controlflow/CHANGELOG.md
index 52b731626290..7aaa7597d5bb 100644
--- a/shared/controlflow/CHANGELOG.md
+++ b/shared/controlflow/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 1.0.10
+
+No user-facing changes.
+
 ## 1.0.9
 
 No user-facing changes.
diff --git a/shared/controlflow/change-notes/released/1.0.10.md b/shared/controlflow/change-notes/released/1.0.10.md
new file mode 100644
index 000000000000..b601d8784532
--- /dev/null
+++ b/shared/controlflow/change-notes/released/1.0.10.md
@@ -0,0 +1,3 @@
+## 1.0.10
+
+No user-facing changes.
diff --git a/shared/controlflow/codeql-pack.release.yml b/shared/controlflow/codeql-pack.release.yml
index fb813c5ee050..3865dbcf4b2a 100644
--- a/shared/controlflow/codeql-pack.release.yml
+++ b/shared/controlflow/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 1.0.9
+lastReleaseVersion: 1.0.10
diff --git a/shared/controlflow/qlpack.yml b/shared/controlflow/qlpack.yml
index 532b2fa69a09..0d1248c09815 100644
--- a/shared/controlflow/qlpack.yml
+++ b/shared/controlflow/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/controlflow
-version: 1.0.10-dev
+version: 1.0.10
 groups: shared
 library: true
 dependencies:
diff --git a/shared/dataflow/CHANGELOG.md b/shared/dataflow/CHANGELOG.md
index 360dc9cc8bff..c9f031d51134 100644
--- a/shared/dataflow/CHANGELOG.md
+++ b/shared/dataflow/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 1.1.4
+
+No user-facing changes.
+
 ## 1.1.3
 
 No user-facing changes.
diff --git a/shared/dataflow/change-notes/released/1.1.4.md b/shared/dataflow/change-notes/released/1.1.4.md
new file mode 100644
index 000000000000..b95051903c5a
--- /dev/null
+++ b/shared/dataflow/change-notes/released/1.1.4.md
@@ -0,0 +1,3 @@
+## 1.1.4
+
+No user-facing changes.
diff --git a/shared/dataflow/codeql-pack.release.yml b/shared/dataflow/codeql-pack.release.yml
index 35e710ab1bf0..26cbcd3f123b 100644
--- a/shared/dataflow/codeql-pack.release.yml
+++ b/shared/dataflow/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 1.1.3
+lastReleaseVersion: 1.1.4
diff --git a/shared/dataflow/qlpack.yml b/shared/dataflow/qlpack.yml
index df5c8c4c38af..3d21af7c256b 100644
--- a/shared/dataflow/qlpack.yml
+++ b/shared/dataflow/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/dataflow
-version: 1.1.4-dev
+version: 1.1.4
 groups: shared
 library: true
 dependencies:
diff --git a/shared/mad/CHANGELOG.md b/shared/mad/CHANGELOG.md
index 7857f62905c7..02a3541df616 100644
--- a/shared/mad/CHANGELOG.md
+++ b/shared/mad/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 1.0.10
+
+No user-facing changes.
+
 ## 1.0.9
 
 No user-facing changes.
diff --git a/shared/mad/change-notes/released/1.0.10.md b/shared/mad/change-notes/released/1.0.10.md
new file mode 100644
index 000000000000..b601d8784532
--- /dev/null
+++ b/shared/mad/change-notes/released/1.0.10.md
@@ -0,0 +1,3 @@
+## 1.0.10
+
+No user-facing changes.
diff --git a/shared/mad/codeql-pack.release.yml b/shared/mad/codeql-pack.release.yml
index fb813c5ee050..3865dbcf4b2a 100644
--- a/shared/mad/codeql-pack.release.yml
+++ b/shared/mad/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 1.0.9
+lastReleaseVersion: 1.0.10
diff --git a/shared/mad/qlpack.yml b/shared/mad/qlpack.yml
index ef3755c80bc4..b45f7415c81a 100644
--- a/shared/mad/qlpack.yml
+++ b/shared/mad/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/mad
-version: 1.0.10-dev
+version: 1.0.10
 groups: shared
 library: true
 dependencies:
diff --git a/shared/rangeanalysis/CHANGELOG.md b/shared/rangeanalysis/CHANGELOG.md
index 5878f9b564c0..992ad108bcd6 100644
--- a/shared/rangeanalysis/CHANGELOG.md
+++ b/shared/rangeanalysis/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 1.0.10
+
+No user-facing changes.
+
 ## 1.0.9
 
 No user-facing changes.
diff --git a/shared/rangeanalysis/change-notes/released/1.0.10.md b/shared/rangeanalysis/change-notes/released/1.0.10.md
new file mode 100644
index 000000000000..b601d8784532
--- /dev/null
+++ b/shared/rangeanalysis/change-notes/released/1.0.10.md
@@ -0,0 +1,3 @@
+## 1.0.10
+
+No user-facing changes.
diff --git a/shared/rangeanalysis/codeql-pack.release.yml b/shared/rangeanalysis/codeql-pack.release.yml
index fb813c5ee050..3865dbcf4b2a 100644
--- a/shared/rangeanalysis/codeql-pack.release.yml
+++ b/shared/rangeanalysis/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 1.0.9
+lastReleaseVersion: 1.0.10
diff --git a/shared/rangeanalysis/qlpack.yml b/shared/rangeanalysis/qlpack.yml
index b4deed51c9d8..a11b83edace6 100644
--- a/shared/rangeanalysis/qlpack.yml
+++ b/shared/rangeanalysis/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/rangeanalysis
-version: 1.0.10-dev
+version: 1.0.10
 groups: shared
 library: true
 dependencies:
diff --git a/shared/regex/CHANGELOG.md b/shared/regex/CHANGELOG.md
index 01154f6c5f52..3a71d968b43c 100644
--- a/shared/regex/CHANGELOG.md
+++ b/shared/regex/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 1.0.10
+
+No user-facing changes.
+
 ## 1.0.9
 
 No user-facing changes.
diff --git a/shared/regex/change-notes/released/1.0.10.md b/shared/regex/change-notes/released/1.0.10.md
new file mode 100644
index 000000000000..b601d8784532
--- /dev/null
+++ b/shared/regex/change-notes/released/1.0.10.md
@@ -0,0 +1,3 @@
+## 1.0.10
+
+No user-facing changes.
diff --git a/shared/regex/codeql-pack.release.yml b/shared/regex/codeql-pack.release.yml
index fb813c5ee050..3865dbcf4b2a 100644
--- a/shared/regex/codeql-pack.release.yml
+++ b/shared/regex/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 1.0.9
+lastReleaseVersion: 1.0.10
diff --git a/shared/regex/qlpack.yml b/shared/regex/qlpack.yml
index 5593197f674b..bfb63fdee77f 100644
--- a/shared/regex/qlpack.yml
+++ b/shared/regex/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/regex
-version: 1.0.10-dev
+version: 1.0.10
 groups: shared
 library: true
 dependencies:
diff --git a/shared/ssa/CHANGELOG.md b/shared/ssa/CHANGELOG.md
index 85bef6a32845..76edd23e4428 100644
--- a/shared/ssa/CHANGELOG.md
+++ b/shared/ssa/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 1.0.10
+
+No user-facing changes.
+
 ## 1.0.9
 
 No user-facing changes.
diff --git a/shared/ssa/change-notes/released/1.0.10.md b/shared/ssa/change-notes/released/1.0.10.md
new file mode 100644
index 000000000000..b601d8784532
--- /dev/null
+++ b/shared/ssa/change-notes/released/1.0.10.md
@@ -0,0 +1,3 @@
+## 1.0.10
+
+No user-facing changes.
diff --git a/shared/ssa/codeql-pack.release.yml b/shared/ssa/codeql-pack.release.yml
index fb813c5ee050..3865dbcf4b2a 100644
--- a/shared/ssa/codeql-pack.release.yml
+++ b/shared/ssa/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 1.0.9
+lastReleaseVersion: 1.0.10
diff --git a/shared/ssa/qlpack.yml b/shared/ssa/qlpack.yml
index 7bc3773a575f..7e09739a333a 100644
--- a/shared/ssa/qlpack.yml
+++ b/shared/ssa/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/ssa
-version: 1.0.10-dev
+version: 1.0.10
 groups: shared
 library: true
 dependencies:
diff --git a/shared/threat-models/CHANGELOG.md b/shared/threat-models/CHANGELOG.md
index 9589b67148fa..b62e06e3dff0 100644
--- a/shared/threat-models/CHANGELOG.md
+++ b/shared/threat-models/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 1.0.10
+
+No user-facing changes.
+
 ## 1.0.9
 
 No user-facing changes.
diff --git a/shared/threat-models/change-notes/released/1.0.10.md b/shared/threat-models/change-notes/released/1.0.10.md
new file mode 100644
index 000000000000..b601d8784532
--- /dev/null
+++ b/shared/threat-models/change-notes/released/1.0.10.md
@@ -0,0 +1,3 @@
+## 1.0.10
+
+No user-facing changes.
diff --git a/shared/threat-models/codeql-pack.release.yml b/shared/threat-models/codeql-pack.release.yml
index fb813c5ee050..3865dbcf4b2a 100644
--- a/shared/threat-models/codeql-pack.release.yml
+++ b/shared/threat-models/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 1.0.9
+lastReleaseVersion: 1.0.10
diff --git a/shared/threat-models/qlpack.yml b/shared/threat-models/qlpack.yml
index dd4331d7e749..7609a088b6e9 100644
--- a/shared/threat-models/qlpack.yml
+++ b/shared/threat-models/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/threat-models
-version: 1.0.10-dev
+version: 1.0.10
 library: true
 groups: shared
 dataExtensions:
diff --git a/shared/tutorial/CHANGELOG.md b/shared/tutorial/CHANGELOG.md
index ba77e020439d..676b469b866a 100644
--- a/shared/tutorial/CHANGELOG.md
+++ b/shared/tutorial/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 1.0.10
+
+No user-facing changes.
+
 ## 1.0.9
 
 No user-facing changes.
diff --git a/shared/tutorial/change-notes/released/1.0.10.md b/shared/tutorial/change-notes/released/1.0.10.md
new file mode 100644
index 000000000000..b601d8784532
--- /dev/null
+++ b/shared/tutorial/change-notes/released/1.0.10.md
@@ -0,0 +1,3 @@
+## 1.0.10
+
+No user-facing changes.
diff --git a/shared/tutorial/codeql-pack.release.yml b/shared/tutorial/codeql-pack.release.yml
index fb813c5ee050..3865dbcf4b2a 100644
--- a/shared/tutorial/codeql-pack.release.yml
+++ b/shared/tutorial/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 1.0.9
+lastReleaseVersion: 1.0.10
diff --git a/shared/tutorial/qlpack.yml b/shared/tutorial/qlpack.yml
index 2390ce7ad116..1cfbfb40c91c 100644
--- a/shared/tutorial/qlpack.yml
+++ b/shared/tutorial/qlpack.yml
@@ -1,7 +1,7 @@
 name: codeql/tutorial
 description: Library for the CodeQL detective tutorials, helping new users learn to
   write CodeQL queries.
-version: 1.0.10-dev
+version: 1.0.10
 groups: shared
 library: true
 warnOnImplicitThis: true
diff --git a/shared/typeflow/CHANGELOG.md b/shared/typeflow/CHANGELOG.md
index 93c030dee3e4..19badb815f98 100644
--- a/shared/typeflow/CHANGELOG.md
+++ b/shared/typeflow/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 1.0.10
+
+No user-facing changes.
+
 ## 1.0.9
 
 No user-facing changes.
diff --git a/shared/typeflow/change-notes/released/1.0.10.md b/shared/typeflow/change-notes/released/1.0.10.md
new file mode 100644
index 000000000000..b601d8784532
--- /dev/null
+++ b/shared/typeflow/change-notes/released/1.0.10.md
@@ -0,0 +1,3 @@
+## 1.0.10
+
+No user-facing changes.
diff --git a/shared/typeflow/codeql-pack.release.yml b/shared/typeflow/codeql-pack.release.yml
index fb813c5ee050..3865dbcf4b2a 100644
--- a/shared/typeflow/codeql-pack.release.yml
+++ b/shared/typeflow/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 1.0.9
+lastReleaseVersion: 1.0.10
diff --git a/shared/typeflow/qlpack.yml b/shared/typeflow/qlpack.yml
index 04f843aacb5f..430f9e468126 100644
--- a/shared/typeflow/qlpack.yml
+++ b/shared/typeflow/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/typeflow
-version: 1.0.10-dev
+version: 1.0.10
 groups: shared
 library: true
 dependencies:
diff --git a/shared/typetracking/CHANGELOG.md b/shared/typetracking/CHANGELOG.md
index a4e57c221876..29b2bdbb3dae 100644
--- a/shared/typetracking/CHANGELOG.md
+++ b/shared/typetracking/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 1.0.10
+
+No user-facing changes.
+
 ## 1.0.9
 
 No user-facing changes.
diff --git a/shared/typetracking/change-notes/released/1.0.10.md b/shared/typetracking/change-notes/released/1.0.10.md
new file mode 100644
index 000000000000..b601d8784532
--- /dev/null
+++ b/shared/typetracking/change-notes/released/1.0.10.md
@@ -0,0 +1,3 @@
+## 1.0.10
+
+No user-facing changes.
diff --git a/shared/typetracking/codeql-pack.release.yml b/shared/typetracking/codeql-pack.release.yml
index fb813c5ee050..3865dbcf4b2a 100644
--- a/shared/typetracking/codeql-pack.release.yml
+++ b/shared/typetracking/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 1.0.9
+lastReleaseVersion: 1.0.10
diff --git a/shared/typetracking/qlpack.yml b/shared/typetracking/qlpack.yml
index e48446dc3e0b..d29f0c0bd6e4 100644
--- a/shared/typetracking/qlpack.yml
+++ b/shared/typetracking/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/typetracking
-version: 1.0.10-dev
+version: 1.0.10
 groups: shared
 library: true
 dependencies:
diff --git a/shared/typos/CHANGELOG.md b/shared/typos/CHANGELOG.md
index acee82ce867b..0f6b529e512c 100644
--- a/shared/typos/CHANGELOG.md
+++ b/shared/typos/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 1.0.10
+
+No user-facing changes.
+
 ## 1.0.9
 
 No user-facing changes.
diff --git a/shared/typos/change-notes/released/1.0.10.md b/shared/typos/change-notes/released/1.0.10.md
new file mode 100644
index 000000000000..b601d8784532
--- /dev/null
+++ b/shared/typos/change-notes/released/1.0.10.md
@@ -0,0 +1,3 @@
+## 1.0.10
+
+No user-facing changes.
diff --git a/shared/typos/codeql-pack.release.yml b/shared/typos/codeql-pack.release.yml
index fb813c5ee050..3865dbcf4b2a 100644
--- a/shared/typos/codeql-pack.release.yml
+++ b/shared/typos/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 1.0.9
+lastReleaseVersion: 1.0.10
diff --git a/shared/typos/qlpack.yml b/shared/typos/qlpack.yml
index 5eccd54b2afa..4e15f26a72c5 100644
--- a/shared/typos/qlpack.yml
+++ b/shared/typos/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/typos
-version: 1.0.10-dev
+version: 1.0.10
 groups: shared
 library: true
 warnOnImplicitThis: true
diff --git a/shared/util/CHANGELOG.md b/shared/util/CHANGELOG.md
index 2f918fd0416f..f81ed05cc13b 100644
--- a/shared/util/CHANGELOG.md
+++ b/shared/util/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 1.0.10
+
+No user-facing changes.
+
 ## 1.0.9
 
 No user-facing changes.
diff --git a/shared/util/change-notes/released/1.0.10.md b/shared/util/change-notes/released/1.0.10.md
new file mode 100644
index 000000000000..b601d8784532
--- /dev/null
+++ b/shared/util/change-notes/released/1.0.10.md
@@ -0,0 +1,3 @@
+## 1.0.10
+
+No user-facing changes.
diff --git a/shared/util/codeql-pack.release.yml b/shared/util/codeql-pack.release.yml
index fb813c5ee050..3865dbcf4b2a 100644
--- a/shared/util/codeql-pack.release.yml
+++ b/shared/util/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 1.0.9
+lastReleaseVersion: 1.0.10
diff --git a/shared/util/qlpack.yml b/shared/util/qlpack.yml
index 508143471db4..d73aee511702 100644
--- a/shared/util/qlpack.yml
+++ b/shared/util/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/util
-version: 1.0.10-dev
+version: 1.0.10
 groups: shared
 library: true
 dependencies: null
diff --git a/shared/xml/CHANGELOG.md b/shared/xml/CHANGELOG.md
index 90afd761e7d4..bc002596b451 100644
--- a/shared/xml/CHANGELOG.md
+++ b/shared/xml/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 1.0.10
+
+No user-facing changes.
+
 ## 1.0.9
 
 No user-facing changes.
diff --git a/shared/xml/change-notes/released/1.0.10.md b/shared/xml/change-notes/released/1.0.10.md
new file mode 100644
index 000000000000..b601d8784532
--- /dev/null
+++ b/shared/xml/change-notes/released/1.0.10.md
@@ -0,0 +1,3 @@
+## 1.0.10
+
+No user-facing changes.
diff --git a/shared/xml/codeql-pack.release.yml b/shared/xml/codeql-pack.release.yml
index fb813c5ee050..3865dbcf4b2a 100644
--- a/shared/xml/codeql-pack.release.yml
+++ b/shared/xml/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 1.0.9
+lastReleaseVersion: 1.0.10
diff --git a/shared/xml/qlpack.yml b/shared/xml/qlpack.yml
index a81184e65886..56f477c27e19 100644
--- a/shared/xml/qlpack.yml
+++ b/shared/xml/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/xml
-version: 1.0.10-dev
+version: 1.0.10
 groups: shared
 library: true
 dependencies:
diff --git a/shared/yaml/CHANGELOG.md b/shared/yaml/CHANGELOG.md
index 222c0ec037c6..a6804be01273 100644
--- a/shared/yaml/CHANGELOG.md
+++ b/shared/yaml/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 1.0.10
+
+No user-facing changes.
+
 ## 1.0.9
 
 No user-facing changes.
diff --git a/shared/yaml/change-notes/released/1.0.10.md b/shared/yaml/change-notes/released/1.0.10.md
new file mode 100644
index 000000000000..b601d8784532
--- /dev/null
+++ b/shared/yaml/change-notes/released/1.0.10.md
@@ -0,0 +1,3 @@
+## 1.0.10
+
+No user-facing changes.
diff --git a/shared/yaml/codeql-pack.release.yml b/shared/yaml/codeql-pack.release.yml
index fb813c5ee050..3865dbcf4b2a 100644
--- a/shared/yaml/codeql-pack.release.yml
+++ b/shared/yaml/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 1.0.9
+lastReleaseVersion: 1.0.10
diff --git a/shared/yaml/qlpack.yml b/shared/yaml/qlpack.yml
index 1df4193b862f..b1e351ce1968 100644
--- a/shared/yaml/qlpack.yml
+++ b/shared/yaml/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/yaml
-version: 1.0.10-dev
+version: 1.0.10
 groups: shared
 library: true
 warnOnImplicitThis: true
diff --git a/swift/ql/lib/CHANGELOG.md b/swift/ql/lib/CHANGELOG.md
index 5602ebc7d231..004e85afa62d 100644
--- a/swift/ql/lib/CHANGELOG.md
+++ b/swift/ql/lib/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 2.0.2
+
+No user-facing changes.
+
 ## 2.0.1
 
 ### Minor Analysis Improvements
diff --git a/swift/ql/lib/change-notes/released/2.0.2.md b/swift/ql/lib/change-notes/released/2.0.2.md
new file mode 100644
index 000000000000..862ef0e9df7c
--- /dev/null
+++ b/swift/ql/lib/change-notes/released/2.0.2.md
@@ -0,0 +1,3 @@
+## 2.0.2
+
+No user-facing changes.
diff --git a/swift/ql/lib/codeql-pack.release.yml b/swift/ql/lib/codeql-pack.release.yml
index fe974a4dbf37..81c7f1dbc13c 100644
--- a/swift/ql/lib/codeql-pack.release.yml
+++ b/swift/ql/lib/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 2.0.1
+lastReleaseVersion: 2.0.2
diff --git a/swift/ql/lib/qlpack.yml b/swift/ql/lib/qlpack.yml
index 1904a1b1ca48..31dd6d915f3d 100644
--- a/swift/ql/lib/qlpack.yml
+++ b/swift/ql/lib/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/swift-all
-version: 2.0.2-dev
+version: 2.0.2
 groups: swift
 extractor: swift
 dbscheme: swift.dbscheme
diff --git a/swift/ql/src/CHANGELOG.md b/swift/ql/src/CHANGELOG.md
index b47f96f9eb9e..daeeee421ba8 100644
--- a/swift/ql/src/CHANGELOG.md
+++ b/swift/ql/src/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 1.0.10
+
+No user-facing changes.
+
 ## 1.0.9
 
 No user-facing changes.
diff --git a/swift/ql/src/change-notes/released/1.0.10.md b/swift/ql/src/change-notes/released/1.0.10.md
new file mode 100644
index 000000000000..b601d8784532
--- /dev/null
+++ b/swift/ql/src/change-notes/released/1.0.10.md
@@ -0,0 +1,3 @@
+## 1.0.10
+
+No user-facing changes.
diff --git a/swift/ql/src/codeql-pack.release.yml b/swift/ql/src/codeql-pack.release.yml
index fb813c5ee050..3865dbcf4b2a 100644
--- a/swift/ql/src/codeql-pack.release.yml
+++ b/swift/ql/src/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 1.0.9
+lastReleaseVersion: 1.0.10
diff --git a/swift/ql/src/qlpack.yml b/swift/ql/src/qlpack.yml
index 6fbae9403605..17bf94f219d8 100644
--- a/swift/ql/src/qlpack.yml
+++ b/swift/ql/src/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/swift-queries
-version: 1.0.10-dev
+version: 1.0.10
 groups:
   - swift
   - queries

From aaf220d41e9c76fff506b501f2b5dcf657f7add0 Mon Sep 17 00:00:00 2001
From: Arthur Baars <aibaars@github.com>
Date: Fri, 18 Oct 2024 15:28:05 +0000
Subject: [PATCH 347/347] Fix typos in changelogs

---
 cpp/ql/src/CHANGELOG.md                      | 2 +-
 cpp/ql/src/change-notes/released/1.2.5.md    | 2 +-
 python/ql/lib/CHANGELOG.md                   | 2 +-
 python/ql/lib/change-notes/released/2.1.1.md | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/cpp/ql/src/CHANGELOG.md b/cpp/ql/src/CHANGELOG.md
index 7896479549fc..e73850bbfe96 100644
--- a/cpp/ql/src/CHANGELOG.md
+++ b/cpp/ql/src/CHANGELOG.md
@@ -2,7 +2,7 @@
 
 ### Minor Analysis Improvements
 
-* The `cpp/unclear-array-index-validation` ("Unclear validation of array index") query has been improved to reduce false positives increase true positives.
+* The `cpp/unclear-array-index-validation` ("Unclear validation of array index") query has been improved to reduce false positives and increase true positives.
 * Fixed false positives in the `cpp/uninitialized-local` ("Potentially uninitialized local variable") query if there are extraction errors in the function.
 * The `cpp/incorrect-string-type-conversion` query now produces fewer false positives caused by failure to detect byte arrays.
 * The `cpp/incorrect-string-type-conversion` query now produces fewer false positives caused by failure to recognize dynamic checks prior to possible dangerous widening.
diff --git a/cpp/ql/src/change-notes/released/1.2.5.md b/cpp/ql/src/change-notes/released/1.2.5.md
index cf937d43e6b3..04aead25cb99 100644
--- a/cpp/ql/src/change-notes/released/1.2.5.md
+++ b/cpp/ql/src/change-notes/released/1.2.5.md
@@ -2,7 +2,7 @@
 
 ### Minor Analysis Improvements
 
-* The `cpp/unclear-array-index-validation` ("Unclear validation of array index") query has been improved to reduce false positives increase true positives.
+* The `cpp/unclear-array-index-validation` ("Unclear validation of array index") query has been improved to reduce false positives and increase true positives.
 * Fixed false positives in the `cpp/uninitialized-local` ("Potentially uninitialized local variable") query if there are extraction errors in the function.
 * The `cpp/incorrect-string-type-conversion` query now produces fewer false positives caused by failure to detect byte arrays.
 * The `cpp/incorrect-string-type-conversion` query now produces fewer false positives caused by failure to recognize dynamic checks prior to possible dangerous widening.
diff --git a/python/ql/lib/CHANGELOG.md b/python/ql/lib/CHANGELOG.md
index 4832015d920d..c1f3765162e0 100644
--- a/python/ql/lib/CHANGELOG.md
+++ b/python/ql/lib/CHANGELOG.md
@@ -3,7 +3,7 @@
 ### Minor Analysis Improvements
 
 * Modelled that `re.finditer` returns an iterable of `re.Match` objects. This is now understood by the API graph in many cases.
-* Type tracking, and hence the API graph, is now able to correctly trace trough comprehensions.
+* Type tracking, and hence the API graph, is now able to correctly trace through comprehensions.
 * More precise modelling of the dataflow through comprehensions. In particular, captured variables are now handled correctly.
 * Dataflow out of yield is added, allowing proper tracing through generators.
 * Added several models of standard library functions and classes, in anticipation of no longer extracting the standard library in a future release.
diff --git a/python/ql/lib/change-notes/released/2.1.1.md b/python/ql/lib/change-notes/released/2.1.1.md
index 949fcd07f7aa..bd2b31a218d9 100644
--- a/python/ql/lib/change-notes/released/2.1.1.md
+++ b/python/ql/lib/change-notes/released/2.1.1.md
@@ -3,7 +3,7 @@
 ### Minor Analysis Improvements
 
 * Modelled that `re.finditer` returns an iterable of `re.Match` objects. This is now understood by the API graph in many cases.
-* Type tracking, and hence the API graph, is now able to correctly trace trough comprehensions.
+* Type tracking, and hence the API graph, is now able to correctly trace through comprehensions.
 * More precise modelling of the dataflow through comprehensions. In particular, captured variables are now handled correctly.
 * Dataflow out of yield is added, allowing proper tracing through generators.
 * Added several models of standard library functions and classes, in anticipation of no longer extracting the standard library in a future release.