From 7a4de55ac239f94fce2f57f100de5ddf11645714 Mon Sep 17 00:00:00 2001
From: idrissrio <idrissrio@github.com>
Date: Wed, 11 Jun 2025 14:35:19 +0200
Subject: [PATCH 1/7] C++: Add leave statement to dbscheme

---
 cpp/ql/lib/semmlecode.cpp.dbscheme | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/cpp/ql/lib/semmlecode.cpp.dbscheme b/cpp/ql/lib/semmlecode.cpp.dbscheme
index 3c45f8b9e71e..a8c2176e9a5c 100644
--- a/cpp/ql/lib/semmlecode.cpp.dbscheme
+++ b/cpp/ql/lib/semmlecode.cpp.dbscheme
@@ -2213,6 +2213,7 @@ case @stmt.kind of
 |  37 = @stmt_co_return
 |  38 = @stmt_consteval_if
 |  39 = @stmt_not_consteval_if
+|  40 = @stmt_leave
 ;
 
 type_vla(
@@ -2349,7 +2350,7 @@ blockscope(
     int enclosing: @parameterized_element ref
 );
 
-@jump = @stmt_goto | @stmt_break | @stmt_continue;
+@jump = @stmt_goto | @stmt_break | @stmt_continue | @stmt_leave;
 
 @jumporlabel = @jump | @stmt_label | @literal;
 

From f6fa707770cd30b5b4158d5416d3fa0b444e87e1 Mon Sep 17 00:00:00 2001
From: idrissrio <idrissrio@github.com>
Date: Wed, 11 Jun 2025 14:37:17 +0200
Subject: [PATCH 2/7] C++: Add `LeaveStmt` class

---
 cpp/ql/lib/semmle/code/cpp/stmts/Stmt.qll | 35 +++++++++++++++++++++++
 1 file changed, 35 insertions(+)

diff --git a/cpp/ql/lib/semmle/code/cpp/stmts/Stmt.qll b/cpp/ql/lib/semmle/code/cpp/stmts/Stmt.qll
index aa6a585ea4b3..5305c8ca58f6 100644
--- a/cpp/ql/lib/semmle/code/cpp/stmts/Stmt.qll
+++ b/cpp/ql/lib/semmle/code/cpp/stmts/Stmt.qll
@@ -841,6 +841,41 @@ private Stmt getEnclosingBreakable(Stmt s) {
   else result = getEnclosingBreakable(s.getParent().getEnclosingStmt())
 }
 
+/**
+ * A Microsoft C/C++ `__leave` statement.
+ *
+ * For example, the `__leave` statement in the following code:
+ * ```
+ * __try {
+ *   if (err) __leave;
+ *   ...
+ * }
+ * __finally {
+ *
+ * }
+ * ```
+ */
+class LeaveStmt extends JumpStmt, @stmt_leave {
+  override string getAPrimaryQlClass() { result = "LeaveStmt" }
+
+  override string toString() { result = "__leave;" }
+
+  override predicate mayBeImpure() { none() }
+
+  override predicate mayBeGloballyImpure() { none() }
+
+  /**
+   * Gets the `__try` statement that this `__leave` exits.
+   */
+  MicrosoftTryStmt getEnclosingTry() { result = getEnclosingTry(this) }
+}
+
+private MicrosoftTryStmt getEnclosingTry(Stmt s) {
+  if s.getParent().getEnclosingStmt() instanceof MicrosoftTryStmt
+  then result = s.getParent().getEnclosingStmt()
+  else result = getEnclosingTry(s.getParent().getEnclosingStmt())
+}
+
 /**
  * A C/C++ 'label' statement.
  *

From a6b3310f77ed75dd2c6b0a3346ebf5c68650ac5a Mon Sep 17 00:00:00 2001
From: idrissrio <idrissrio@github.com>
Date: Wed, 11 Jun 2025 15:52:45 +0200
Subject: [PATCH 3/7] C++: test new class `LeaveStmt`

---
 .../test/library-tests/stmt/leave/leave.cpp   | 28 +++++++++++++++++++
 .../library-tests/stmt/leave/leave.expected   |  3 ++
 cpp/ql/test/library-tests/stmt/leave/leave.ql |  4 +++
 3 files changed, 35 insertions(+)
 create mode 100644 cpp/ql/test/library-tests/stmt/leave/leave.cpp
 create mode 100644 cpp/ql/test/library-tests/stmt/leave/leave.expected
 create mode 100644 cpp/ql/test/library-tests/stmt/leave/leave.ql

diff --git a/cpp/ql/test/library-tests/stmt/leave/leave.cpp b/cpp/ql/test/library-tests/stmt/leave/leave.cpp
new file mode 100644
index 000000000000..f81f63d4a922
--- /dev/null
+++ b/cpp/ql/test/library-tests/stmt/leave/leave.cpp
@@ -0,0 +1,28 @@
+//semmle-extractor-options: --microsoft
+void leave_try_finally_test(bool condition){
+    __try {
+    if(condition){
+       __leave;
+      }
+    }
+    __finally {
+    }
+}
+
+int except_handler();
+
+void leave_try_except_test(bool condition){
+    __try {
+        try {
+            if(condition)
+                __leave;
+        }
+        catch(...) {
+        }
+        if(condition){
+            __leave;
+        }
+    }
+    __except (except_handler()) {
+    }
+}
diff --git a/cpp/ql/test/library-tests/stmt/leave/leave.expected b/cpp/ql/test/library-tests/stmt/leave/leave.expected
new file mode 100644
index 000000000000..d33c0876597f
--- /dev/null
+++ b/cpp/ql/test/library-tests/stmt/leave/leave.expected
@@ -0,0 +1,3 @@
+| leave.cpp:5:8:5:15 | __leave; | leave.cpp:3:5:7:5 | __try { ... } __finally { ... } |
+| leave.cpp:18:17:18:24 | __leave; | leave.cpp:15:5:25:5 | __try { ... } __except( ... ) { ... } |
+| leave.cpp:23:13:23:20 | __leave; | leave.cpp:15:5:25:5 | __try { ... } __except( ... ) { ... } |
diff --git a/cpp/ql/test/library-tests/stmt/leave/leave.ql b/cpp/ql/test/library-tests/stmt/leave/leave.ql
new file mode 100644
index 000000000000..c863b64d3510
--- /dev/null
+++ b/cpp/ql/test/library-tests/stmt/leave/leave.ql
@@ -0,0 +1,4 @@
+import cpp
+
+from LeaveStmt s
+select s, s.getEnclosingTry()

From e6faebf8507fb958f826e4549d77f0605aa15a20 Mon Sep 17 00:00:00 2001
From: idrissrio <idrissrio@github.com>
Date: Wed, 11 Jun 2025 16:00:51 +0200
Subject: [PATCH 4/7] C++: add change note for `LeaveStmt`

---
 cpp/ql/lib/change-notes/2025-06-11-leave-stmt.md | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 cpp/ql/lib/change-notes/2025-06-11-leave-stmt.md

diff --git a/cpp/ql/lib/change-notes/2025-06-11-leave-stmt.md b/cpp/ql/lib/change-notes/2025-06-11-leave-stmt.md
new file mode 100644
index 000000000000..3e410e574480
--- /dev/null
+++ b/cpp/ql/lib/change-notes/2025-06-11-leave-stmt.md
@@ -0,0 +1,5 @@
+---
+category: feature
+---
+* The Microsoft-specific `__leave` statement is now supported.
+* A new class `LeaveStmt` extending `JumpStmt` was added to represent these statements.
\ No newline at end of file

From 7152e68a4d1a6b4cc67119f6910b470c3cd8e26a Mon Sep 17 00:00:00 2001
From: idrissrio <idrissrio@github.com>
Date: Thu, 12 Jun 2025 14:27:23 +0200
Subject: [PATCH 5/7] C++: add upgrade and downgrade scripts

---
 .../old.dbscheme                              | 2494 +++++++++++++++++
 .../semmlecode.cpp.dbscheme                   | 2493 ++++++++++++++++
 .../stmts.ql                                  |   13 +
 .../upgrade.properties                        |    3 +
 .../old.dbscheme                              | 2493 ++++++++++++++++
 .../semmlecode.cpp.dbscheme                   | 2494 +++++++++++++++++
 .../upgrade.properties                        |    2 +
 7 files changed, 9992 insertions(+)
 create mode 100644 cpp/downgrades/a8c2176e9a5cf9be8d17053a4c8e7e56b5aced6d/old.dbscheme
 create mode 100644 cpp/downgrades/a8c2176e9a5cf9be8d17053a4c8e7e56b5aced6d/semmlecode.cpp.dbscheme
 create mode 100644 cpp/downgrades/a8c2176e9a5cf9be8d17053a4c8e7e56b5aced6d/stmts.ql
 create mode 100644 cpp/downgrades/a8c2176e9a5cf9be8d17053a4c8e7e56b5aced6d/upgrade.properties
 create mode 100644 cpp/ql/lib/upgrades/3c45f8b9e71ec723bf50c40581e1f18f4f25e290/old.dbscheme
 create mode 100644 cpp/ql/lib/upgrades/3c45f8b9e71ec723bf50c40581e1f18f4f25e290/semmlecode.cpp.dbscheme
 create mode 100644 cpp/ql/lib/upgrades/3c45f8b9e71ec723bf50c40581e1f18f4f25e290/upgrade.properties

diff --git a/cpp/downgrades/a8c2176e9a5cf9be8d17053a4c8e7e56b5aced6d/old.dbscheme b/cpp/downgrades/a8c2176e9a5cf9be8d17053a4c8e7e56b5aced6d/old.dbscheme
new file mode 100644
index 000000000000..a8c2176e9a5c
--- /dev/null
+++ b/cpp/downgrades/a8c2176e9a5cf9be8d17053a4c8e7e56b5aced6d/old.dbscheme
@@ -0,0 +1,2494 @@
+
+/**
+ * An invocation of the compiler. Note that more than one file may be
+ * compiled per invocation. For example, this command compiles three
+ * source files:
+ *
+ *   gcc -c f1.c f2.c f3.c
+ *
+ * The `id` simply identifies the invocation, while `cwd` is the working
+ * directory from which the compiler was invoked.
+ */
+compilations(
+    /**
+     * An invocation of the compiler. Note that more than one file may
+     * be compiled per invocation. For example, this command compiles
+     * three source files:
+     *
+     *   gcc -c f1.c f2.c f3.c
+     */
+    unique int id : @compilation,
+    string cwd : string ref
+);
+
+/**
+ * The arguments that were passed to the extractor for a compiler
+ * invocation. If `id` is for the compiler invocation
+ *
+ *   gcc -c f1.c f2.c f3.c
+ *
+ * then typically there will be rows for
+ *
+ * num | arg
+ * --- | ---
+ * 0   | *path to extractor*
+ * 1   | `--mimic`
+ * 2   | `/usr/bin/gcc`
+ * 3   | `-c`
+ * 4   | f1.c
+ * 5   | f2.c
+ * 6   | f3.c
+ */
+#keyset[id, num]
+compilation_args(
+    int id : @compilation ref,
+    int num : int ref,
+    string arg : string ref
+);
+
+/**
+ * Optionally, record the build mode for each compilation.
+ */
+compilation_build_mode(
+    unique int id : @compilation ref,
+    int mode : int ref
+);
+
+/*
+case @compilation_build_mode.mode of
+  0 = @build_mode_none
+| 1 = @build_mode_manual
+| 2 = @build_mode_auto
+;
+*/
+
+/**
+ * The source files that are compiled by a compiler invocation.
+ * If `id` is for the compiler invocation
+ *
+ *   gcc -c f1.c f2.c f3.c
+ *
+ * then there will be rows for
+ *
+ * num | arg
+ * --- | ---
+ * 0   | f1.c
+ * 1   | f2.c
+ * 2   | f3.c
+ *
+ * Note that even if those files `#include` headers, those headers
+ * do not appear as rows.
+ */
+#keyset[id, num]
+compilation_compiling_files(
+    int id : @compilation ref,
+    int num : int ref,
+    int file : @file ref
+);
+
+/**
+ * The time taken by the extractor for a compiler invocation.
+ *
+ * For each file `num`, there will be rows for
+ *
+ * kind | seconds
+ * ---- | ---
+ * 1    | CPU seconds used by the extractor frontend
+ * 2    | Elapsed seconds during the extractor frontend
+ * 3    | CPU seconds used by the extractor backend
+ * 4    | Elapsed seconds during the extractor backend
+ */
+#keyset[id, num, kind]
+compilation_time(
+    int id : @compilation ref,
+    int num : int ref,
+    /* kind:
+       1 = frontend_cpu_seconds
+       2 = frontend_elapsed_seconds
+       3 = extractor_cpu_seconds
+       4 = extractor_elapsed_seconds
+    */
+    int kind : int ref,
+    float seconds : float ref
+);
+
+/**
+ * An error or warning generated by the extractor.
+ * The diagnostic message `diagnostic` was generated during compiler
+ * invocation `compilation`, and is the `file_number_diagnostic_number`th
+ * message generated while extracting the `file_number`th file of that
+ * invocation.
+ */
+#keyset[compilation, file_number, file_number_diagnostic_number]
+diagnostic_for(
+    int diagnostic : @diagnostic ref,
+    int compilation : @compilation ref,
+    int file_number : int ref,
+    int file_number_diagnostic_number : int ref
+);
+
+/**
+ * If extraction was successful, then `cpu_seconds` and
+ * `elapsed_seconds` are the CPU time and elapsed time (respectively)
+ * that extraction took for compiler invocation `id`.
+ */
+compilation_finished(
+    unique int id : @compilation ref,
+    float cpu_seconds : float ref,
+    float elapsed_seconds : float ref
+);
+
+
+/**
+ * External data, 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
+);
+
+/*
+case @fun_requires.kind of
+  1 = @template_attached
+| 2 = @function_attached
+;
+*/
+
+fun_requires(
+    int id: @fun_decl ref,
+    int kind: int ref,
+    int constraint: @expr ref
+);
+
+param_decl_bind(
+    unique int id: @var_decl ref,
+    int index: int ref,
+    int fun_decl: @fun_decl ref
+);
+
+#keyset[id, type_id]
+var_decls(
+    int id: @var_decl,
+    int variable: @variable ref,
+    int type_id: @type ref,
+    string name: string ref,
+    int location: @location_default ref
+);
+var_def(unique int id: @var_decl ref);
+var_specialized(int id: @var_decl ref);
+var_decl_specifiers(
+    int id: @var_decl ref,
+    string name: string ref
+)
+is_structured_binding(unique int id: @variable ref);
+var_requires(
+    int id: @var_decl ref,
+    int constraint: @expr ref
+);
+
+type_decls(
+    unique int id: @type_decl,
+    int type_id: @type ref,
+    int location: @location_default ref
+);
+type_def(unique int id: @type_decl ref);
+type_decl_top(
+    unique int type_decl: @type_decl ref
+);
+type_requires(
+    int id: @type_decl ref,
+    int constraint: @expr ref
+);
+
+namespace_decls(
+    unique int id: @namespace_decl,
+    int namespace_id: @namespace ref,
+    int location: @location_default ref,
+    int bodylocation: @location_default ref
+);
+
+case @using.kind of
+  1 = @using_declaration
+| 2 = @using_directive
+| 3 = @using_enum_declaration
+;
+
+usings(
+    unique int id: @using,
+    int element_id: @element ref,
+    int location: @location_default ref,
+    int kind: int ref
+);
+
+/** The element which contains the `using` declaration. */
+using_container(
+    int parent: @element ref,
+    int child: @using ref
+);
+
+static_asserts(
+    unique int id: @static_assert,
+    int condition : @expr ref,
+    string message : string ref,
+    int location: @location_default ref,
+    int enclosing : @element ref
+);
+
+// each function has an ordered list of parameters
+#keyset[id, type_id]
+#keyset[function, index, type_id]
+params(
+    int id: @parameter,
+    int function: @parameterized_element ref,
+    int index: int ref,
+    int type_id: @type ref
+);
+
+overrides(
+    int new: @function ref,
+    int old: @function ref
+);
+
+#keyset[id, type_id]
+membervariables(
+    int id: @membervariable,
+    int type_id: @type ref,
+    string name: string ref
+);
+
+#keyset[id, type_id]
+globalvariables(
+    int id: @globalvariable,
+    int type_id: @type ref,
+    string name: string ref
+);
+
+#keyset[id, type_id]
+localvariables(
+    int id: @localvariable,
+    int type_id: @type ref,
+    string name: string ref
+);
+
+autoderivation(
+    unique int var: @variable ref,
+    int derivation_type: @type ref
+);
+
+orphaned_variables(
+    int var: @localvariable ref,
+    int function: @function ref
+)
+
+enumconstants(
+    unique int id: @enumconstant,
+    int parent: @usertype ref,
+    int index: int ref,
+    int type_id: @type ref,
+    string name: string ref,
+    int location: @location_default ref
+);
+
+@variable = @localscopevariable | @globalvariable | @membervariable;
+
+@localscopevariable = @localvariable | @parameter;
+
+/**
+ * Built-in types are the fundamental types, e.g., integral, floating, and void.
+ */
+case @builtintype.kind of
+   1 = @errortype
+|  2 = @unknowntype
+|  3 = @void
+|  4 = @boolean
+|  5 = @char
+|  6 = @unsigned_char
+|  7 = @signed_char
+|  8 = @short
+|  9 = @unsigned_short
+| 10 = @signed_short
+| 11 = @int
+| 12 = @unsigned_int
+| 13 = @signed_int
+| 14 = @long
+| 15 = @unsigned_long
+| 16 = @signed_long
+| 17 = @long_long
+| 18 = @unsigned_long_long
+| 19 = @signed_long_long
+// ... 20 Microsoft-specific __int8
+// ... 21 Microsoft-specific __int16
+// ... 22 Microsoft-specific __int32
+// ... 23 Microsoft-specific __int64
+| 24 = @float
+| 25 = @double
+| 26 = @long_double
+| 27 = @complex_float         // C99-specific _Complex float
+| 28 = @complex_double        // C99-specific _Complex double
+| 29 = @complex_long_double   // C99-specific _Complex long double
+| 30 = @imaginary_float       // C99-specific _Imaginary float
+| 31 = @imaginary_double      // C99-specific _Imaginary double
+| 32 = @imaginary_long_double // C99-specific _Imaginary long double
+| 33 = @wchar_t               // Microsoft-specific
+| 34 = @decltype_nullptr      // C++11
+| 35 = @int128                // __int128
+| 36 = @unsigned_int128       // unsigned __int128
+| 37 = @signed_int128         // signed __int128
+| 38 = @float128              // __float128
+| 39 = @complex_float128      // _Complex __float128
+| 40 = @decimal32             // _Decimal32
+| 41 = @decimal64             // _Decimal64
+| 42 = @decimal128            // _Decimal128
+| 43 = @char16_t
+| 44 = @char32_t
+| 45 = @std_float32           // _Float32
+| 46 = @float32x              // _Float32x
+| 47 = @std_float64           // _Float64
+| 48 = @float64x              // _Float64x
+| 49 = @std_float128          // _Float128
+// ... 50 _Float128x
+| 51 = @char8_t
+| 52 = @float16               // _Float16
+| 53 = @complex_float16       // _Complex _Float16
+| 54 = @fp16                  // __fp16
+| 55 = @std_bfloat16          // __bf16
+| 56 = @std_float16           // std::float16_t
+| 57 = @complex_std_float32   // _Complex _Float32
+| 58 = @complex_float32x      // _Complex _Float32x
+| 59 = @complex_std_float64   // _Complex _Float64
+| 60 = @complex_float64x      // _Complex _Float64x
+| 61 = @complex_std_float128  // _Complex _Float128
+| 62 = @mfp8                  // __mfp8
+;
+
+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 or C23 `typeof`/`typeof_unqual`
+ * operator taking an expression as its argument.  For example:
+ * ```
+ * int a;
+ * decltype(1+a) b;
+ * typeof(1+a) c;
+ * ```
+ * Here `expr` is `1+a`.
+ *
+ * Sometimes an additional pair of parentheses around the expression
+ * changes the semantics of the decltype, e.g.
+ * ```
+ * struct A { double x; };
+ * const A* a = new A();
+ * decltype( a->x ); // type is double
+ * decltype((a->x)); // type is const double&
+ * ```
+ * (Please consult the C++11 standard for more details).
+ * `parentheses_would_change_meaning` is `true` iff that is the case.
+ */
+
+/*
+case @decltype.kind of
+|  0 = @decltype
+|  1 = @typeof // The frontend does not differentiate between typeof and typeof_unqual
+;
+*/
+
+#keyset[id, expr]
+decltypes(
+    int id: @decltype,
+    int expr: @expr ref,
+    int kind: int ref,
+    int base_type: @type ref,
+    boolean parentheses_would_change_meaning: boolean ref
+);
+
+/*
+case @type_operator.kind of
+|  0 = @typeof // The frontend does not differentiate between typeof and typeof_unqual
+|  1 = @underlying_type
+|  2 = @bases
+|  3 = @direct_bases
+|  4 = @add_lvalue_reference
+|  5 = @add_pointer
+|  6 = @add_rvalue_reference
+|  7 = @decay
+|  8 = @make_signed
+|  9 = @make_unsigned
+| 10 = @remove_all_extents
+| 11 = @remove_const
+| 12 = @remove_cv
+| 13 = @remove_cvref
+| 14 = @remove_extent
+| 15 = @remove_pointer
+| 16 = @remove_reference_t
+| 17 = @remove_restrict
+| 18 = @remove_volatile
+| 19 = @remove_reference
+;
+*/
+
+type_operators(
+    unique int id: @type_operator,
+    int arg_type: @type ref,
+    int kind: int ref,
+    int base_type: @type ref
+)
+
+/*
+case @usertype.kind of
+|  0 = @unknown_usertype
+|  1 = @struct
+|  2 = @class
+|  3 = @union
+|  4 = @enum
+// ... 5 = @typedef deprecated        // classic C: typedef typedef type name
+// ... 6 = @template deprecated
+|  7 = @template_parameter
+|  8 = @template_template_parameter
+|  9 = @proxy_class                   // a proxy class associated with a template parameter
+// ... 10 objc_class deprecated
+// ... 11 objc_protocol deprecated
+// ... 12 objc_category deprecated
+| 13 = @scoped_enum
+// ... 14 = @using_alias deprecated   // a using name = type style typedef
+| 15 = @template_struct
+| 16 = @template_class
+| 17 = @template_union
+| 18 = @alias
+;
+*/
+
+usertypes(
+    unique int id: @usertype,
+    string name: string ref,
+    int kind: int ref
+);
+
+usertypesize(
+    unique int id: @usertype ref,
+    int size: int ref,
+    int alignment: int ref
+);
+
+usertype_final(unique int id: @usertype ref);
+
+usertype_uuid(
+    unique int id: @usertype ref,
+    string uuid: string ref
+);
+
+/*
+case @usertype.alias_kind of
+| 0 = @typedef
+| 1 = @alias
+*/
+
+usertype_alias_kind(
+    int id: @usertype ref,
+    int alias_kind: int ref
+)
+
+nontype_template_parameters(
+    int id: @expr ref
+);
+
+type_template_type_constraint(
+    int id: @usertype ref,
+    int constraint: @expr ref
+);
+
+mangled_name(
+    unique int id: @declaration ref,
+    int mangled_name : @mangledname,
+    boolean is_complete: boolean ref
+);
+
+is_pod_class(unique int id: @usertype ref);
+is_standard_layout_class(unique int id: @usertype ref);
+
+is_complete(unique int id: @usertype ref);
+
+is_class_template(unique int id: @usertype ref);
+class_instantiation(
+    int to: @usertype ref,
+    int from: @usertype ref
+);
+class_template_argument(
+    int type_id: @usertype ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+class_template_argument_value(
+    int type_id: @usertype ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+
+@user_or_decltype = @usertype | @decltype;
+
+is_proxy_class_for(
+    unique int id: @usertype ref,
+    int templ_param_id: @user_or_decltype ref
+);
+
+type_mentions(
+    unique int id: @type_mention,
+    int type_id: @type ref,
+    int location: @location ref,
+    // a_symbol_reference_kind from the frontend.
+    int kind: int ref
+);
+
+is_function_template(unique int id: @function ref);
+function_instantiation(
+    unique int to: @function ref,
+    int from: @function ref
+);
+function_template_argument(
+    int function_id: @function ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+function_template_argument_value(
+    int function_id: @function ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+
+is_variable_template(unique int id: @variable ref);
+variable_instantiation(
+    unique int to: @variable ref,
+    int from: @variable ref
+);
+variable_template_argument(
+    int variable_id: @variable ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+variable_template_argument_value(
+    int variable_id: @variable ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+
+template_template_instantiation(
+    int to: @usertype ref,
+    int from: @usertype ref
+);
+template_template_argument(
+    int type_id: @usertype ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+template_template_argument_value(
+    int type_id: @usertype ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+
+@concept = @concept_template | @concept_id;
+
+concept_templates(
+    unique int concept_id: @concept_template,
+    string name: string ref,
+    int location: @location_default ref
+);
+concept_instantiation(
+    unique int to: @concept_id ref,
+    int from: @concept_template ref
+);
+is_type_constraint(int concept_id: @concept_id ref);
+concept_template_argument(
+    int concept_id: @concept ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+concept_template_argument_value(
+    int concept_id: @concept ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+
+routinetypes(
+    unique int id: @routinetype,
+    int return_type: @type ref
+);
+
+routinetypeargs(
+    int routine: @routinetype ref,
+    int index: int ref,
+    int type_id: @type ref
+);
+
+ptrtomembers(
+    unique int id: @ptrtomember,
+    int type_id: @type ref,
+    int class_id: @type ref
+);
+
+/*
+ specifiers for types, functions, and variables
+
+    "public",
+    "protected",
+    "private",
+
+    "const",
+    "volatile",
+    "static",
+
+    "pure",
+    "virtual",
+    "sealed", // Microsoft
+    "__interface", // Microsoft
+    "inline",
+    "explicit",
+
+    "near", // near far extension
+    "far", // near far extension
+    "__ptr32", // Microsoft
+    "__ptr64", // Microsoft
+    "__sptr", // Microsoft
+    "__uptr", // Microsoft
+    "dllimport", // Microsoft
+    "dllexport", // Microsoft
+    "thread", // Microsoft
+    "naked", // Microsoft
+    "microsoft_inline", // Microsoft
+    "forceinline", // Microsoft
+    "selectany", // Microsoft
+    "nothrow", // Microsoft
+    "novtable", // Microsoft
+    "noreturn", // Microsoft
+    "noinline", // Microsoft
+    "noalias", // Microsoft
+    "restrict", // Microsoft
+*/
+
+specifiers(
+    unique int id: @specifier,
+    unique string str: string ref
+);
+
+typespecifiers(
+    int type_id: @type ref,
+    int spec_id: @specifier ref
+);
+
+funspecifiers(
+    int func_id: @function ref,
+    int spec_id: @specifier ref
+);
+
+varspecifiers(
+    int var_id: @accessible ref,
+    int spec_id: @specifier ref
+);
+
+explicit_specifier_exprs(
+    unique int func_id: @function ref,
+    int constant: @expr ref
+)
+
+attributes(
+    unique int id: @attribute,
+    int kind: int ref,
+    string name: string ref,
+    string name_space: string ref,
+    int location: @location_default ref
+);
+
+case @attribute.kind of
+  0 = @gnuattribute
+| 1 = @stdattribute
+| 2 = @declspec
+| 3 = @msattribute
+| 4 = @alignas
+// ... 5 @objc_propertyattribute deprecated
+;
+
+attribute_args(
+    unique int id: @attribute_arg,
+    int kind: int ref,
+    int attribute: @attribute ref,
+    int index: int ref,
+    int location: @location_default ref
+);
+
+case @attribute_arg.kind of
+  0 = @attribute_arg_empty
+| 1 = @attribute_arg_token
+| 2 = @attribute_arg_constant
+| 3 = @attribute_arg_type
+| 4 = @attribute_arg_constant_expr
+| 5 = @attribute_arg_expr
+;
+
+attribute_arg_value(
+    unique int arg: @attribute_arg ref,
+    string value: string ref
+);
+attribute_arg_type(
+    unique int arg: @attribute_arg ref,
+    int type_id: @type ref
+);
+attribute_arg_constant(
+    unique int arg: @attribute_arg ref,
+    int constant: @expr ref
+)
+attribute_arg_expr(
+    unique int arg: @attribute_arg ref,
+    int expr: @expr ref
+)
+attribute_arg_name(
+    unique int arg: @attribute_arg ref,
+    string name: string ref
+);
+
+typeattributes(
+    int type_id: @type ref,
+    int spec_id: @attribute ref
+);
+
+funcattributes(
+    int func_id: @function ref,
+    int spec_id: @attribute ref
+);
+
+varattributes(
+    int var_id: @accessible ref,
+    int spec_id: @attribute ref
+);
+
+stmtattributes(
+    int stmt_id: @stmt ref,
+    int spec_id: @attribute ref
+);
+
+@type = @builtintype
+      | @derivedtype
+      | @usertype
+      | @routinetype
+      | @ptrtomember
+      | @decltype
+      | @type_operator;
+
+unspecifiedtype(
+    unique int type_id: @type ref,
+    int unspecified_type_id: @type ref
+);
+
+member(
+    int parent: @type ref,
+    int index: int ref,
+    int child: @member ref
+);
+
+@enclosingfunction_child = @usertype | @variable | @namespace
+
+enclosingfunction(
+    unique int child: @enclosingfunction_child ref,
+    int parent: @function ref
+);
+
+derivations(
+    unique int derivation: @derivation,
+    int sub: @type ref,
+    int index: int ref,
+    int super: @type ref,
+    int location: @location_default ref
+);
+
+derspecifiers(
+    int der_id: @derivation ref,
+    int spec_id: @specifier ref
+);
+
+/**
+ * Contains the byte offset of the base class subobject within the derived
+ * class. Only holds for non-virtual base classes, but see table
+ * `virtual_base_offsets` for offsets of virtual base class subobjects.
+ */
+direct_base_offsets(
+    unique int der_id: @derivation ref,
+    int offset: int ref
+);
+
+/**
+ * Contains the byte offset of the virtual base class subobject for class
+ * `super` within a most-derived object of class `sub`. `super` can be either a
+ * direct or indirect base class.
+ */
+#keyset[sub, super]
+virtual_base_offsets(
+    int sub: @usertype ref,
+    int super: @usertype ref,
+    int offset: int ref
+);
+
+frienddecls(
+    unique int id: @frienddecl,
+    int type_id: @type ref,
+    int decl_id: @declaration ref,
+    int location: @location_default ref
+);
+
+@declaredtype = @usertype ;
+
+@declaration = @function
+             | @declaredtype
+             | @variable
+             | @enumconstant
+             | @frienddecl
+             | @concept_template;
+
+@member = @membervariable
+        | @function
+        | @declaredtype
+        | @enumconstant;
+
+@locatable = @diagnostic
+           | @declaration
+           | @ppd_include
+           | @ppd_define
+           | @macroinvocation
+           /*| @funcall*/
+           | @xmllocatable
+           | @attribute
+           | @attribute_arg;
+
+@namedscope = @namespace | @usertype;
+
+@element = @locatable
+         | @file
+         | @folder
+         | @specifier
+         | @type
+         | @expr
+         | @namespace
+         | @initialiser
+         | @stmt
+         | @derivation
+         | @comment
+         | @preprocdirect
+         | @fun_decl
+         | @var_decl
+         | @type_decl
+         | @namespace_decl
+         | @using
+         | @namequalifier
+         | @specialnamequalifyingelement
+         | @static_assert
+         | @type_mention
+         | @lambdacapture;
+
+@exprparent = @element;
+
+comments(
+    unique int id: @comment,
+    string contents: string ref,
+    int location: @location_default ref
+);
+
+commentbinding(
+    int id: @comment ref,
+    int element: @element ref
+);
+
+exprconv(
+    int converted: @expr ref,
+    unique int conversion: @expr ref
+);
+
+compgenerated(unique int id: @element ref);
+
+/**
+ * `destructor_call` destructs the `i`'th entity that should be
+ * destructed following `element`. Note that entities should be
+ * destructed in reverse construction order, so for a given `element`
+ * these should be called from highest to lowest `i`.
+ */
+#keyset[element, destructor_call]
+#keyset[element, i]
+synthetic_destructor_call(
+    int element: @element ref,
+    int i: int ref,
+    int destructor_call: @routineexpr ref
+);
+
+namespaces(
+    unique int id: @namespace,
+    string name: string ref
+);
+
+namespace_inline(
+    unique int id: @namespace ref
+);
+
+namespacembrs(
+    int parentid: @namespace ref,
+    unique int memberid: @namespacembr ref
+);
+
+@namespacembr = @declaration | @namespace;
+
+exprparents(
+    int expr_id: @expr ref,
+    int child_index: int ref,
+    int parent_id: @exprparent ref
+);
+
+expr_isload(unique int expr_id: @expr ref);
+
+@cast = @c_style_cast
+      | @const_cast
+      | @dynamic_cast
+      | @reinterpret_cast
+      | @static_cast
+      ;
+
+/*
+case @conversion.kind of
+  0 = @simple_conversion           // a numeric conversion, qualification conversion, or a reinterpret_cast
+| 1 = @bool_conversion             // conversion to 'bool'
+| 2 = @base_class_conversion       // a derived-to-base conversion
+| 3 = @derived_class_conversion    // a base-to-derived conversion
+| 4 = @pm_base_class_conversion    // a derived-to-base conversion of a pointer to member
+| 5 = @pm_derived_class_conversion // a base-to-derived conversion of a pointer to member
+| 6 = @glvalue_adjust              // an adjustment of the type of a glvalue
+| 7 = @prvalue_adjust              // an adjustment of the type of a prvalue
+;
+*/
+/**
+ * Describes the semantics represented by a cast expression. This is largely
+ * independent of the source syntax of the cast, so it is separate from the
+ * regular expression kind.
+ */
+conversionkinds(
+    unique int expr_id: @cast ref,
+    int kind: int ref
+);
+
+@conversion = @cast
+            | @array_to_pointer
+            | @parexpr
+            | @reference_to
+            | @ref_indirect
+            | @temp_init
+            | @c11_generic
+            ;
+
+/*
+case @funbindexpr.kind of
+  0 = @normal_call  // a normal call
+| 1 = @virtual_call // a virtual call
+| 2 = @adl_call     // a call whose target is only found by ADL
+;
+*/
+iscall(
+    unique int caller: @funbindexpr ref,
+    int kind: int ref
+);
+
+numtemplatearguments(
+    unique int expr_id: @expr ref,
+    int num: int ref
+);
+
+specialnamequalifyingelements(
+    unique int id: @specialnamequalifyingelement,
+    unique string name: string ref
+);
+
+@namequalifiableelement = @expr | @namequalifier;
+@namequalifyingelement = @namespace
+                       | @specialnamequalifyingelement
+                       | @usertype;
+
+namequalifiers(
+    unique int id: @namequalifier,
+    unique int qualifiableelement: @namequalifiableelement ref,
+    int qualifyingelement: @namequalifyingelement ref,
+    int location: @location_default ref
+);
+
+varbind(
+    int expr: @varbindexpr ref,
+    int var: @accessible ref
+);
+
+funbind(
+    int expr: @funbindexpr ref,
+    int fun: @function ref
+);
+
+@any_new_expr = @new_expr
+              | @new_array_expr;
+
+@new_or_delete_expr = @any_new_expr
+                    | @delete_expr
+                    | @delete_array_expr;
+
+@prefix_crement_expr = @preincrexpr | @predecrexpr;
+
+@postfix_crement_expr = @postincrexpr | @postdecrexpr;
+
+@increment_expr = @preincrexpr | @postincrexpr;
+
+@decrement_expr = @predecrexpr | @postdecrexpr;
+
+@crement_expr = @increment_expr | @decrement_expr;
+
+@un_arith_op_expr = @arithnegexpr
+                  | @unaryplusexpr
+                  | @conjugation
+                  | @realpartexpr
+                  | @imagpartexpr
+                  | @crement_expr
+                  ;
+
+@un_bitwise_op_expr = @complementexpr;
+
+@un_log_op_expr = @notexpr;
+
+@un_op_expr = @address_of
+            | @indirect
+            | @un_arith_op_expr
+            | @un_bitwise_op_expr
+            | @builtinaddressof
+            | @vec_fill
+            | @un_log_op_expr
+            | @co_await
+            | @co_yield
+            ;
+
+@bin_log_op_expr = @andlogicalexpr | @orlogicalexpr;
+
+@cmp_op_expr = @eq_op_expr | @rel_op_expr;
+
+@eq_op_expr = @eqexpr | @neexpr;
+
+@rel_op_expr = @gtexpr
+             | @ltexpr
+             | @geexpr
+             | @leexpr
+             | @spaceshipexpr
+             ;
+
+@bin_bitwise_op_expr = @lshiftexpr
+                     | @rshiftexpr
+                     | @andexpr
+                     | @orexpr
+                     | @xorexpr
+                     ;
+
+@p_arith_op_expr = @paddexpr
+                 | @psubexpr
+                 | @pdiffexpr
+                 ;
+
+@bin_arith_op_expr = @addexpr
+                   | @subexpr
+                   | @mulexpr
+                   | @divexpr
+                   | @remexpr
+                   | @jmulexpr
+                   | @jdivexpr
+                   | @fjaddexpr
+                   | @jfaddexpr
+                   | @fjsubexpr
+                   | @jfsubexpr
+                   | @minexpr
+                   | @maxexpr
+                   | @p_arith_op_expr
+                   ;
+
+@bin_op_expr = @bin_arith_op_expr
+             | @bin_bitwise_op_expr
+             | @cmp_op_expr
+             | @bin_log_op_expr
+             ;
+
+@op_expr = @un_op_expr
+         | @bin_op_expr
+         | @assign_expr
+         | @conditionalexpr
+         ;
+
+@assign_arith_expr = @assignaddexpr
+                   | @assignsubexpr
+                   | @assignmulexpr
+                   | @assigndivexpr
+                   | @assignremexpr
+                   ;
+
+@assign_bitwise_expr = @assignandexpr
+                     | @assignorexpr
+                     | @assignxorexpr
+                     | @assignlshiftexpr
+                     | @assignrshiftexpr
+                     ;
+
+@assign_pointer_expr = @assignpaddexpr
+                     | @assignpsubexpr
+                     ;
+
+@assign_op_expr = @assign_arith_expr
+                | @assign_bitwise_expr
+                | @assign_pointer_expr
+                ;
+
+@assign_expr = @assignexpr | @assign_op_expr | @blockassignexpr
+
+/*
+  Binary encoding of the allocator form.
+
+  case @allocator.form of
+    0 = plain
+  | 1 = alignment
+  ;
+*/
+
+/**
+ * The allocator function associated with a `new` or `new[]` expression.
+ * The `form` column specified whether the allocation call contains an alignment
+ * argument.
+ */
+expr_allocator(
+    unique int expr: @any_new_expr ref,
+    int func: @function ref,
+    int form: int ref
+);
+
+/*
+  Binary encoding of the deallocator form.
+
+  case @deallocator.form of
+    0 = plain
+  | 1 = size
+  | 2 = alignment
+  | 4 = destroying_delete
+  ;
+*/
+
+/**
+ * The deallocator function associated with a `delete`, `delete[]`, `new`, or
+ * `new[]` expression. For a `new` or `new[]` expression, the deallocator is the
+ * one used to free memory if the initialization throws an exception.
+ * The `form` column specifies whether the deallocation call contains a size
+ * argument, and alignment argument, or both.
+ */
+expr_deallocator(
+    unique int expr: @new_or_delete_expr ref,
+    int func: @function ref,
+    int form: int ref
+);
+
+/**
+ * Holds if the `@conditionalexpr` is of the two operand form
+ * `guard ? : false`.
+ */
+expr_cond_two_operand(
+    unique int cond: @conditionalexpr ref
+);
+
+/**
+ * The guard of `@conditionalexpr` `guard ? true : false`
+ */
+expr_cond_guard(
+    unique int cond: @conditionalexpr ref,
+    int guard: @expr ref
+);
+
+/**
+ * The expression used when the guard of `@conditionalexpr`
+ * `guard ? true : false` holds. For the two operand form
+ * `guard ?: false` consider using `expr_cond_guard` instead.
+ */
+expr_cond_true(
+    unique int cond: @conditionalexpr ref,
+    int true: @expr ref
+);
+
+/**
+ * The expression used when the guard of `@conditionalexpr`
+ * `guard ? true : false` does not hold.
+ */
+expr_cond_false(
+    unique int cond: @conditionalexpr ref,
+    int false: @expr ref
+);
+
+/** A string representation of the value. */
+values(
+    unique int id: @value,
+    string str: string ref
+);
+
+/** The actual text in the source code for the value, if any. */
+valuetext(
+    unique int id: @value ref,
+    string text: string ref
+);
+
+valuebind(
+    int val: @value ref,
+    unique int expr: @expr ref
+);
+
+fieldoffsets(
+    unique int id: @variable ref,
+    int byteoffset: int ref,
+    int bitoffset: int ref
+);
+
+bitfield(
+    unique int id: @variable ref,
+    int bits: int ref,
+    int declared_bits: int ref
+);
+
+/* TODO
+memberprefix(
+    int member: @expr ref,
+    int prefix: @expr ref
+);
+*/
+
+/*
+   kind(1) = mbrcallexpr
+   kind(2) = mbrptrcallexpr
+   kind(3) = mbrptrmbrcallexpr
+   kind(4) = ptrmbrptrmbrcallexpr
+   kind(5) = mbrreadexpr // x.y
+   kind(6) = mbrptrreadexpr // p->y
+   kind(7) = mbrptrmbrreadexpr // x.*pm
+   kind(8) = mbrptrmbrptrreadexpr // x->*pm
+   kind(9) = staticmbrreadexpr // static x.y
+   kind(10) = staticmbrptrreadexpr // static p->y
+*/
+/* TODO
+memberaccess(
+    int member: @expr ref,
+    int kind: int ref
+);
+*/
+
+initialisers(
+    unique int init: @initialiser,
+    int var: @accessible ref,
+    unique int expr: @expr ref,
+    int location: @location_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
+| 391 = @nested_requirement
+| 392 = @compound_requirement
+| 393 = @concept_id
+;
+
+@var_args_expr = @vastartexpr
+               | @vaendexpr
+               | @vaargexpr
+               | @vacopyexpr
+               ;
+
+@builtin_op = @var_args_expr
+            | @noopexpr
+            | @offsetofexpr
+            | @intaddrexpr
+            | @hasassignexpr
+            | @hascopyexpr
+            | @hasnothrowassign
+            | @hasnothrowconstr
+            | @hasnothrowcopy
+            | @hastrivialassign
+            | @hastrivialconstr
+            | @hastrivialcopy
+            | @hastrivialdestructor
+            | @hasuserdestr
+            | @hasvirtualdestr
+            | @isabstractexpr
+            | @isbaseofexpr
+            | @isclassexpr
+            | @isconvtoexpr
+            | @isemptyexpr
+            | @isenumexpr
+            | @ispodexpr
+            | @ispolyexpr
+            | @isunionexpr
+            | @typescompexpr
+            | @builtinshufflevector
+            | @builtinconvertvector
+            | @builtinaddressof
+            | @istriviallyconstructibleexpr
+            | @isdestructibleexpr
+            | @isnothrowdestructibleexpr
+            | @istriviallydestructibleexpr
+            | @istriviallyassignableexpr
+            | @isnothrowassignableexpr
+            | @istrivialexpr
+            | @isstandardlayoutexpr
+            | @istriviallycopyableexpr
+            | @isliteraltypeexpr
+            | @hastrivialmoveconstructorexpr
+            | @hastrivialmoveassignexpr
+            | @hasnothrowmoveassignexpr
+            | @isconstructibleexpr
+            | @isnothrowconstructibleexpr
+            | @hasfinalizerexpr
+            | @isdelegateexpr
+            | @isinterfaceclassexpr
+            | @isrefarrayexpr
+            | @isrefclassexpr
+            | @issealedexpr
+            | @issimplevalueclassexpr
+            | @isvalueclassexpr
+            | @isfinalexpr
+            | @builtinchooseexpr
+            | @builtincomplex
+            | @isassignable
+            | @isaggregate
+            | @hasuniqueobjectrepresentations
+            | @builtinbitcast
+            | @builtinshuffle
+            | @issame
+            | @isfunction
+            | @islayoutcompatible
+            | @ispointerinterconvertiblebaseof
+            | @isarray
+            | @arrayrank
+            | @arrayextent
+            | @isarithmetic
+            | @iscompletetype
+            | @iscompound
+            | @isconst
+            | @isfloatingpoint
+            | @isfundamental
+            | @isintegral
+            | @islvaluereference
+            | @ismemberfunctionpointer
+            | @ismemberobjectpointer
+            | @ismemberpointer
+            | @isobject
+            | @ispointer
+            | @isreference
+            | @isrvaluereference
+            | @isscalar
+            | @issigned
+            | @isunsigned
+            | @isvoid
+            | @isvolatile
+            | @istriviallycopyassignable
+            | @isassignablenopreconditioncheck
+            | @referencebindstotemporary
+            | @issameas
+            | @builtinhasattribute
+            | @ispointerinterconvertiblewithclass
+            | @builtinispointerinterconvertiblewithclass
+            | @iscorrespondingmember
+            | @builtiniscorrespondingmember
+            | @isboundedarray
+            | @isunboundedarray
+            | @isreferenceable
+            | @isnothrowconvertible
+            | @referenceconstructsfromtemporary
+            | @referenceconvertsfromtemporary
+            | @isconvertible
+            | @isvalidwinrttype
+            | @iswinclass
+            | @iswininterface
+            | @istriviallyequalitycomparable
+            | @isscopedenum
+            | @istriviallyrelocatable
+            ;
+
+compound_requirement_is_noexcept(
+    int expr: @compound_requirement ref
+);
+
+new_allocated_type(
+    unique int expr: @new_expr ref,
+    int type_id: @type ref
+);
+
+new_array_allocated_type(
+    unique int expr: @new_array_expr ref,
+    int type_id: @type ref
+);
+
+/**
+ * The field being initialized by an initializer expression within an aggregate
+ * initializer for a class/struct/union. Position is used to sort repeated initializers.
+ */
+#keyset[aggregate, position]
+aggregate_field_init(
+    int aggregate: @aggregateliteral ref,
+    int initializer: @expr ref,
+    int field: @membervariable ref,
+    int position: int ref,
+    boolean is_designated: boolean ref
+);
+
+/**
+ * The index of the element being initialized by an initializer expression
+ * within an aggregate initializer for an array. Position is used to sort repeated initializers.
+ */
+#keyset[aggregate, position]
+aggregate_array_init(
+    int aggregate: @aggregateliteral ref,
+    int initializer: @expr ref,
+    int element_index: int ref,
+    int position: int ref,
+    boolean is_designated: boolean ref
+);
+
+@ctorinit = @ctordirectinit
+          | @ctorvirtualinit
+          | @ctorfieldinit
+          | @ctordelegatinginit;
+@dtordestruct = @dtordirectdestruct
+              | @dtorvirtualdestruct
+              | @dtorfielddestruct;
+
+
+condition_decl_bind(
+    unique int expr: @condition_decl ref,
+    unique int decl: @declaration ref
+);
+
+typeid_bind(
+    unique int expr: @type_id ref,
+    int type_id: @type ref
+);
+
+uuidof_bind(
+    unique int expr: @uuidof ref,
+    int type_id: @type ref
+);
+
+@sizeof_or_alignof = @runtime_sizeof | @runtime_alignof | @datasizeof | @sizeof_pack;
+
+sizeof_bind(
+    unique int expr: @sizeof_or_alignof ref,
+    int type_id: @type ref
+);
+
+code_block(
+    unique int block: @literal ref,
+    unique int routine: @function ref
+);
+
+lambdas(
+    unique int expr: @lambdaexpr ref,
+    string default_capture: string ref,
+    boolean has_explicit_return_type: boolean ref,
+    boolean has_explicit_parameter_list: boolean ref
+);
+
+lambda_capture(
+    unique int id: @lambdacapture,
+    int lambda: @lambdaexpr ref,
+    int index: int ref,
+    int field: @membervariable ref,
+    boolean captured_by_reference: boolean ref,
+    boolean is_implicit: boolean ref,
+    int location: @location_default ref
+);
+
+@funbindexpr = @routineexpr
+             | @new_expr
+             | @delete_expr
+             | @delete_array_expr
+             | @ctordirectinit
+             | @ctorvirtualinit
+             | @ctordelegatinginit
+             | @dtordirectdestruct
+             | @dtorvirtualdestruct;
+
+@varbindexpr = @varaccess | @ctorfieldinit | @dtorfielddestruct;
+@addressable = @function | @variable ;
+@accessible = @addressable | @enumconstant ;
+
+@access = @varaccess | @routineexpr ;
+
+fold(
+    int expr: @foldexpr ref,
+    string operator: string ref,
+    boolean is_left_fold: boolean ref
+);
+
+stmts(
+    unique int id: @stmt,
+    int kind: int ref,
+    int location: @location_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
+|  38 = @stmt_consteval_if
+|  39 = @stmt_not_consteval_if
+|  40 = @stmt_leave
+;
+
+type_vla(
+    int type_id: @type ref,
+    int decl: @stmt_vla_decl ref
+);
+
+variable_vla(
+    int var: @variable ref,
+    int decl: @stmt_vla_decl ref
+);
+
+type_is_vla(unique int type_id: @derivedtype ref)
+
+if_initialization(
+    unique int if_stmt: @stmt_if ref,
+    int init_id: @stmt ref
+);
+
+if_then(
+    unique int if_stmt: @stmt_if ref,
+    int then_id: @stmt ref
+);
+
+if_else(
+    unique int if_stmt: @stmt_if ref,
+    int else_id: @stmt ref
+);
+
+constexpr_if_initialization(
+    unique int constexpr_if_stmt: @stmt_constexpr_if ref,
+    int init_id: @stmt ref
+);
+
+constexpr_if_then(
+    unique int constexpr_if_stmt: @stmt_constexpr_if ref,
+    int then_id: @stmt ref
+);
+
+constexpr_if_else(
+    unique int constexpr_if_stmt: @stmt_constexpr_if ref,
+    int else_id: @stmt ref
+);
+
+@stmt_consteval_or_not_consteval_if = @stmt_consteval_if | @stmt_not_consteval_if;
+
+consteval_if_then(
+    unique int constexpr_if_stmt: @stmt_consteval_or_not_consteval_if ref,
+    int then_id: @stmt ref
+);
+
+consteval_if_else(
+    unique int constexpr_if_stmt: @stmt_consteval_or_not_consteval_if ref,
+    int else_id: @stmt ref
+);
+
+while_body(
+    unique int while_stmt: @stmt_while ref,
+    int body_id: @stmt ref
+);
+
+do_body(
+    unique int do_stmt: @stmt_end_test_while ref,
+    int body_id: @stmt ref
+);
+
+switch_initialization(
+    unique int switch_stmt: @stmt_switch ref,
+    int init_id: @stmt ref
+);
+
+#keyset[switch_stmt, index]
+switch_case(
+    int switch_stmt: @stmt_switch ref,
+    int index: int ref,
+    int case_id: @stmt_switch_case ref
+);
+
+switch_body(
+    unique int switch_stmt: @stmt_switch ref,
+    int body_id: @stmt ref
+);
+
+@stmt_for_or_range_based_for = @stmt_for
+                             | @stmt_range_based_for;
+
+for_initialization(
+    unique int for_stmt: @stmt_for_or_range_based_for ref,
+    int init_id: @stmt ref
+);
+
+for_condition(
+    unique int for_stmt: @stmt_for ref,
+    int condition_id: @expr ref
+);
+
+for_update(
+    unique int for_stmt: @stmt_for ref,
+    int update_id: @expr ref
+);
+
+for_body(
+    unique int for_stmt: @stmt_for ref,
+    int body_id: @stmt ref
+);
+
+@stmtparent = @stmt | @expr_stmt ;
+stmtparents(
+    unique int id: @stmt ref,
+    int index: int ref,
+    int parent: @stmtparent ref
+);
+
+ishandler(unique int block: @stmt_block ref);
+
+@cfgnode = @stmt | @expr | @function | @initialiser ;
+
+stmt_decl_bind(
+    int stmt: @stmt_decl ref,
+    int num: int ref,
+    int decl: @declaration ref
+);
+
+stmt_decl_entry_bind(
+    int stmt: @stmt_decl ref,
+    int num: int ref,
+    int decl_entry: @element ref
+);
+
+@parameterized_element = @function | @stmt_block | @requires_expr;
+
+blockscope(
+    unique int block: @stmt_block ref,
+    int enclosing: @parameterized_element ref
+);
+
+@jump = @stmt_goto | @stmt_break | @stmt_continue | @stmt_leave;
+
+@jumporlabel = @jump | @stmt_label | @literal;
+
+jumpinfo(
+    unique int id: @jumporlabel ref,
+    string str: string ref,
+    int target: @stmt ref
+);
+
+preprocdirects(
+    unique int id: @preprocdirect,
+    int kind: int ref,
+    int location: @location_default ref
+);
+case @preprocdirect.kind of
+   0 = @ppd_if
+|  1 = @ppd_ifdef
+|  2 = @ppd_ifndef
+|  3 = @ppd_elif
+|  4 = @ppd_else
+|  5 = @ppd_endif
+|  6 = @ppd_plain_include
+|  7 = @ppd_define
+|  8 = @ppd_undef
+|  9 = @ppd_line
+| 10 = @ppd_error
+| 11 = @ppd_pragma
+| 12 = @ppd_objc_import
+| 13 = @ppd_include_next
+| 14 = @ppd_ms_import
+| 15 = @ppd_elifdef
+| 16 = @ppd_elifndef
+| 18 = @ppd_warning
+;
+
+@ppd_include = @ppd_plain_include | @ppd_objc_import | @ppd_include_next | @ppd_ms_import;
+
+@ppd_branch = @ppd_if | @ppd_ifdef | @ppd_ifndef | @ppd_elif | @ppd_elifdef | @ppd_elifndef;
+
+preprocpair(
+    int begin : @ppd_branch ref,
+    int elseelifend : @preprocdirect ref
+);
+
+preproctrue(int branch : @ppd_branch ref);
+preprocfalse(int branch : @ppd_branch ref);
+
+preproctext(
+    unique int id: @preprocdirect ref,
+    string head: string ref,
+    string body: string ref
+);
+
+includes(
+    unique int id: @ppd_include ref,
+    int included: @file ref
+);
+
+link_targets(
+    int id: @link_target,
+    int binary: @file ref
+);
+
+link_parent(
+    int element : @element ref,
+    int link_target : @link_target ref
+);
+
+/* XML Files */
+
+xmlEncoding(unique int id: @file ref, string encoding: string ref);
+
+xmlDTDs(
+    unique int id: @xmldtd,
+    string root: string ref,
+    string publicId: string ref,
+    string systemId: string ref,
+    int fileid: @file ref
+);
+
+xmlElements(
+    unique int id: @xmlelement,
+    string name: string ref,
+    int parentid: @xmlparent ref,
+    int idx: int ref,
+    int fileid: @file ref
+);
+
+xmlAttrs(
+    unique int id: @xmlattribute,
+    int elementid: @xmlelement ref,
+    string name: string ref,
+    string value: string ref,
+    int idx: int ref,
+    int fileid: @file ref
+);
+
+xmlNs(
+    int id: @xmlnamespace,
+    string prefixName: string ref,
+    string URI: string ref,
+    int fileid: @file ref
+);
+
+xmlHasNs(
+    int elementId: @xmlnamespaceable ref,
+    int nsId: @xmlnamespace ref,
+    int fileid: @file ref
+);
+
+xmlComments(
+    unique int id: @xmlcomment,
+    string text: string ref,
+    int parentid: @xmlparent ref,
+    int fileid: @file ref
+);
+
+xmlChars(
+    unique int id: @xmlcharacters,
+    string text: string ref,
+    int parentid: @xmlparent ref,
+    int idx: int ref,
+    int isCDATA: int ref,
+    int fileid: @file ref
+);
+
+@xmlparent = @file | @xmlelement;
+@xmlnamespaceable = @xmlelement | @xmlattribute;
+
+xmllocations(
+    int xmlElement: @xmllocatable ref,
+    int location: @location_default ref
+);
+
+@xmllocatable = @xmlcharacters
+              | @xmlelement
+              | @xmlcomment
+              | @xmlattribute
+              | @xmldtd
+              | @file
+              | @xmlnamespace;
diff --git a/cpp/downgrades/a8c2176e9a5cf9be8d17053a4c8e7e56b5aced6d/semmlecode.cpp.dbscheme b/cpp/downgrades/a8c2176e9a5cf9be8d17053a4c8e7e56b5aced6d/semmlecode.cpp.dbscheme
new file mode 100644
index 000000000000..3c45f8b9e71e
--- /dev/null
+++ b/cpp/downgrades/a8c2176e9a5cf9be8d17053a4c8e7e56b5aced6d/semmlecode.cpp.dbscheme
@@ -0,0 +1,2493 @@
+
+/**
+ * An invocation of the compiler. Note that more than one file may be
+ * compiled per invocation. For example, this command compiles three
+ * source files:
+ *
+ *   gcc -c f1.c f2.c f3.c
+ *
+ * The `id` simply identifies the invocation, while `cwd` is the working
+ * directory from which the compiler was invoked.
+ */
+compilations(
+    /**
+     * An invocation of the compiler. Note that more than one file may
+     * be compiled per invocation. For example, this command compiles
+     * three source files:
+     *
+     *   gcc -c f1.c f2.c f3.c
+     */
+    unique int id : @compilation,
+    string cwd : string ref
+);
+
+/**
+ * The arguments that were passed to the extractor for a compiler
+ * invocation. If `id` is for the compiler invocation
+ *
+ *   gcc -c f1.c f2.c f3.c
+ *
+ * then typically there will be rows for
+ *
+ * num | arg
+ * --- | ---
+ * 0   | *path to extractor*
+ * 1   | `--mimic`
+ * 2   | `/usr/bin/gcc`
+ * 3   | `-c`
+ * 4   | f1.c
+ * 5   | f2.c
+ * 6   | f3.c
+ */
+#keyset[id, num]
+compilation_args(
+    int id : @compilation ref,
+    int num : int ref,
+    string arg : string ref
+);
+
+/**
+ * Optionally, record the build mode for each compilation.
+ */
+compilation_build_mode(
+    unique int id : @compilation ref,
+    int mode : int ref
+);
+
+/*
+case @compilation_build_mode.mode of
+  0 = @build_mode_none
+| 1 = @build_mode_manual
+| 2 = @build_mode_auto
+;
+*/
+
+/**
+ * The source files that are compiled by a compiler invocation.
+ * If `id` is for the compiler invocation
+ *
+ *   gcc -c f1.c f2.c f3.c
+ *
+ * then there will be rows for
+ *
+ * num | arg
+ * --- | ---
+ * 0   | f1.c
+ * 1   | f2.c
+ * 2   | f3.c
+ *
+ * Note that even if those files `#include` headers, those headers
+ * do not appear as rows.
+ */
+#keyset[id, num]
+compilation_compiling_files(
+    int id : @compilation ref,
+    int num : int ref,
+    int file : @file ref
+);
+
+/**
+ * The time taken by the extractor for a compiler invocation.
+ *
+ * For each file `num`, there will be rows for
+ *
+ * kind | seconds
+ * ---- | ---
+ * 1    | CPU seconds used by the extractor frontend
+ * 2    | Elapsed seconds during the extractor frontend
+ * 3    | CPU seconds used by the extractor backend
+ * 4    | Elapsed seconds during the extractor backend
+ */
+#keyset[id, num, kind]
+compilation_time(
+    int id : @compilation ref,
+    int num : int ref,
+    /* kind:
+       1 = frontend_cpu_seconds
+       2 = frontend_elapsed_seconds
+       3 = extractor_cpu_seconds
+       4 = extractor_elapsed_seconds
+    */
+    int kind : int ref,
+    float seconds : float ref
+);
+
+/**
+ * An error or warning generated by the extractor.
+ * The diagnostic message `diagnostic` was generated during compiler
+ * invocation `compilation`, and is the `file_number_diagnostic_number`th
+ * message generated while extracting the `file_number`th file of that
+ * invocation.
+ */
+#keyset[compilation, file_number, file_number_diagnostic_number]
+diagnostic_for(
+    int diagnostic : @diagnostic ref,
+    int compilation : @compilation ref,
+    int file_number : int ref,
+    int file_number_diagnostic_number : int ref
+);
+
+/**
+ * If extraction was successful, then `cpu_seconds` and
+ * `elapsed_seconds` are the CPU time and elapsed time (respectively)
+ * that extraction took for compiler invocation `id`.
+ */
+compilation_finished(
+    unique int id : @compilation ref,
+    float cpu_seconds : float ref,
+    float elapsed_seconds : float ref
+);
+
+
+/**
+ * External data, 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
+);
+
+/*
+case @fun_requires.kind of
+  1 = @template_attached
+| 2 = @function_attached
+;
+*/
+
+fun_requires(
+    int id: @fun_decl ref,
+    int kind: int ref,
+    int constraint: @expr ref
+);
+
+param_decl_bind(
+    unique int id: @var_decl ref,
+    int index: int ref,
+    int fun_decl: @fun_decl ref
+);
+
+#keyset[id, type_id]
+var_decls(
+    int id: @var_decl,
+    int variable: @variable ref,
+    int type_id: @type ref,
+    string name: string ref,
+    int location: @location_default ref
+);
+var_def(unique int id: @var_decl ref);
+var_specialized(int id: @var_decl ref);
+var_decl_specifiers(
+    int id: @var_decl ref,
+    string name: string ref
+)
+is_structured_binding(unique int id: @variable ref);
+var_requires(
+    int id: @var_decl ref,
+    int constraint: @expr ref
+);
+
+type_decls(
+    unique int id: @type_decl,
+    int type_id: @type ref,
+    int location: @location_default ref
+);
+type_def(unique int id: @type_decl ref);
+type_decl_top(
+    unique int type_decl: @type_decl ref
+);
+type_requires(
+    int id: @type_decl ref,
+    int constraint: @expr ref
+);
+
+namespace_decls(
+    unique int id: @namespace_decl,
+    int namespace_id: @namespace ref,
+    int location: @location_default ref,
+    int bodylocation: @location_default ref
+);
+
+case @using.kind of
+  1 = @using_declaration
+| 2 = @using_directive
+| 3 = @using_enum_declaration
+;
+
+usings(
+    unique int id: @using,
+    int element_id: @element ref,
+    int location: @location_default ref,
+    int kind: int ref
+);
+
+/** The element which contains the `using` declaration. */
+using_container(
+    int parent: @element ref,
+    int child: @using ref
+);
+
+static_asserts(
+    unique int id: @static_assert,
+    int condition : @expr ref,
+    string message : string ref,
+    int location: @location_default ref,
+    int enclosing : @element ref
+);
+
+// each function has an ordered list of parameters
+#keyset[id, type_id]
+#keyset[function, index, type_id]
+params(
+    int id: @parameter,
+    int function: @parameterized_element ref,
+    int index: int ref,
+    int type_id: @type ref
+);
+
+overrides(
+    int new: @function ref,
+    int old: @function ref
+);
+
+#keyset[id, type_id]
+membervariables(
+    int id: @membervariable,
+    int type_id: @type ref,
+    string name: string ref
+);
+
+#keyset[id, type_id]
+globalvariables(
+    int id: @globalvariable,
+    int type_id: @type ref,
+    string name: string ref
+);
+
+#keyset[id, type_id]
+localvariables(
+    int id: @localvariable,
+    int type_id: @type ref,
+    string name: string ref
+);
+
+autoderivation(
+    unique int var: @variable ref,
+    int derivation_type: @type ref
+);
+
+orphaned_variables(
+    int var: @localvariable ref,
+    int function: @function ref
+)
+
+enumconstants(
+    unique int id: @enumconstant,
+    int parent: @usertype ref,
+    int index: int ref,
+    int type_id: @type ref,
+    string name: string ref,
+    int location: @location_default ref
+);
+
+@variable = @localscopevariable | @globalvariable | @membervariable;
+
+@localscopevariable = @localvariable | @parameter;
+
+/**
+ * Built-in types are the fundamental types, e.g., integral, floating, and void.
+ */
+case @builtintype.kind of
+   1 = @errortype
+|  2 = @unknowntype
+|  3 = @void
+|  4 = @boolean
+|  5 = @char
+|  6 = @unsigned_char
+|  7 = @signed_char
+|  8 = @short
+|  9 = @unsigned_short
+| 10 = @signed_short
+| 11 = @int
+| 12 = @unsigned_int
+| 13 = @signed_int
+| 14 = @long
+| 15 = @unsigned_long
+| 16 = @signed_long
+| 17 = @long_long
+| 18 = @unsigned_long_long
+| 19 = @signed_long_long
+// ... 20 Microsoft-specific __int8
+// ... 21 Microsoft-specific __int16
+// ... 22 Microsoft-specific __int32
+// ... 23 Microsoft-specific __int64
+| 24 = @float
+| 25 = @double
+| 26 = @long_double
+| 27 = @complex_float         // C99-specific _Complex float
+| 28 = @complex_double        // C99-specific _Complex double
+| 29 = @complex_long_double   // C99-specific _Complex long double
+| 30 = @imaginary_float       // C99-specific _Imaginary float
+| 31 = @imaginary_double      // C99-specific _Imaginary double
+| 32 = @imaginary_long_double // C99-specific _Imaginary long double
+| 33 = @wchar_t               // Microsoft-specific
+| 34 = @decltype_nullptr      // C++11
+| 35 = @int128                // __int128
+| 36 = @unsigned_int128       // unsigned __int128
+| 37 = @signed_int128         // signed __int128
+| 38 = @float128              // __float128
+| 39 = @complex_float128      // _Complex __float128
+| 40 = @decimal32             // _Decimal32
+| 41 = @decimal64             // _Decimal64
+| 42 = @decimal128            // _Decimal128
+| 43 = @char16_t
+| 44 = @char32_t
+| 45 = @std_float32           // _Float32
+| 46 = @float32x              // _Float32x
+| 47 = @std_float64           // _Float64
+| 48 = @float64x              // _Float64x
+| 49 = @std_float128          // _Float128
+// ... 50 _Float128x
+| 51 = @char8_t
+| 52 = @float16               // _Float16
+| 53 = @complex_float16       // _Complex _Float16
+| 54 = @fp16                  // __fp16
+| 55 = @std_bfloat16          // __bf16
+| 56 = @std_float16           // std::float16_t
+| 57 = @complex_std_float32   // _Complex _Float32
+| 58 = @complex_float32x      // _Complex _Float32x
+| 59 = @complex_std_float64   // _Complex _Float64
+| 60 = @complex_float64x      // _Complex _Float64x
+| 61 = @complex_std_float128  // _Complex _Float128
+| 62 = @mfp8                  // __mfp8
+;
+
+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 or C23 `typeof`/`typeof_unqual`
+ * operator taking an expression as its argument.  For example:
+ * ```
+ * int a;
+ * decltype(1+a) b;
+ * typeof(1+a) c;
+ * ```
+ * Here `expr` is `1+a`.
+ *
+ * Sometimes an additional pair of parentheses around the expression
+ * changes the semantics of the decltype, e.g.
+ * ```
+ * struct A { double x; };
+ * const A* a = new A();
+ * decltype( a->x ); // type is double
+ * decltype((a->x)); // type is const double&
+ * ```
+ * (Please consult the C++11 standard for more details).
+ * `parentheses_would_change_meaning` is `true` iff that is the case.
+ */
+
+/*
+case @decltype.kind of
+|  0 = @decltype
+|  1 = @typeof // The frontend does not differentiate between typeof and typeof_unqual
+;
+*/
+
+#keyset[id, expr]
+decltypes(
+    int id: @decltype,
+    int expr: @expr ref,
+    int kind: int ref,
+    int base_type: @type ref,
+    boolean parentheses_would_change_meaning: boolean ref
+);
+
+/*
+case @type_operator.kind of
+|  0 = @typeof // The frontend does not differentiate between typeof and typeof_unqual
+|  1 = @underlying_type
+|  2 = @bases
+|  3 = @direct_bases
+|  4 = @add_lvalue_reference
+|  5 = @add_pointer
+|  6 = @add_rvalue_reference
+|  7 = @decay
+|  8 = @make_signed
+|  9 = @make_unsigned
+| 10 = @remove_all_extents
+| 11 = @remove_const
+| 12 = @remove_cv
+| 13 = @remove_cvref
+| 14 = @remove_extent
+| 15 = @remove_pointer
+| 16 = @remove_reference_t
+| 17 = @remove_restrict
+| 18 = @remove_volatile
+| 19 = @remove_reference
+;
+*/
+
+type_operators(
+    unique int id: @type_operator,
+    int arg_type: @type ref,
+    int kind: int ref,
+    int base_type: @type ref
+)
+
+/*
+case @usertype.kind of
+|  0 = @unknown_usertype
+|  1 = @struct
+|  2 = @class
+|  3 = @union
+|  4 = @enum
+// ... 5 = @typedef deprecated        // classic C: typedef typedef type name
+// ... 6 = @template deprecated
+|  7 = @template_parameter
+|  8 = @template_template_parameter
+|  9 = @proxy_class                   // a proxy class associated with a template parameter
+// ... 10 objc_class deprecated
+// ... 11 objc_protocol deprecated
+// ... 12 objc_category deprecated
+| 13 = @scoped_enum
+// ... 14 = @using_alias deprecated   // a using name = type style typedef
+| 15 = @template_struct
+| 16 = @template_class
+| 17 = @template_union
+| 18 = @alias
+;
+*/
+
+usertypes(
+    unique int id: @usertype,
+    string name: string ref,
+    int kind: int ref
+);
+
+usertypesize(
+    unique int id: @usertype ref,
+    int size: int ref,
+    int alignment: int ref
+);
+
+usertype_final(unique int id: @usertype ref);
+
+usertype_uuid(
+    unique int id: @usertype ref,
+    string uuid: string ref
+);
+
+/*
+case @usertype.alias_kind of
+| 0 = @typedef
+| 1 = @alias
+*/
+
+usertype_alias_kind(
+    int id: @usertype ref,
+    int alias_kind: int ref
+)
+
+nontype_template_parameters(
+    int id: @expr ref
+);
+
+type_template_type_constraint(
+    int id: @usertype ref,
+    int constraint: @expr ref
+);
+
+mangled_name(
+    unique int id: @declaration ref,
+    int mangled_name : @mangledname,
+    boolean is_complete: boolean ref
+);
+
+is_pod_class(unique int id: @usertype ref);
+is_standard_layout_class(unique int id: @usertype ref);
+
+is_complete(unique int id: @usertype ref);
+
+is_class_template(unique int id: @usertype ref);
+class_instantiation(
+    int to: @usertype ref,
+    int from: @usertype ref
+);
+class_template_argument(
+    int type_id: @usertype ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+class_template_argument_value(
+    int type_id: @usertype ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+
+@user_or_decltype = @usertype | @decltype;
+
+is_proxy_class_for(
+    unique int id: @usertype ref,
+    int templ_param_id: @user_or_decltype ref
+);
+
+type_mentions(
+    unique int id: @type_mention,
+    int type_id: @type ref,
+    int location: @location ref,
+    // a_symbol_reference_kind from the frontend.
+    int kind: int ref
+);
+
+is_function_template(unique int id: @function ref);
+function_instantiation(
+    unique int to: @function ref,
+    int from: @function ref
+);
+function_template_argument(
+    int function_id: @function ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+function_template_argument_value(
+    int function_id: @function ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+
+is_variable_template(unique int id: @variable ref);
+variable_instantiation(
+    unique int to: @variable ref,
+    int from: @variable ref
+);
+variable_template_argument(
+    int variable_id: @variable ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+variable_template_argument_value(
+    int variable_id: @variable ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+
+template_template_instantiation(
+    int to: @usertype ref,
+    int from: @usertype ref
+);
+template_template_argument(
+    int type_id: @usertype ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+template_template_argument_value(
+    int type_id: @usertype ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+
+@concept = @concept_template | @concept_id;
+
+concept_templates(
+    unique int concept_id: @concept_template,
+    string name: string ref,
+    int location: @location_default ref
+);
+concept_instantiation(
+    unique int to: @concept_id ref,
+    int from: @concept_template ref
+);
+is_type_constraint(int concept_id: @concept_id ref);
+concept_template_argument(
+    int concept_id: @concept ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+concept_template_argument_value(
+    int concept_id: @concept ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+
+routinetypes(
+    unique int id: @routinetype,
+    int return_type: @type ref
+);
+
+routinetypeargs(
+    int routine: @routinetype ref,
+    int index: int ref,
+    int type_id: @type ref
+);
+
+ptrtomembers(
+    unique int id: @ptrtomember,
+    int type_id: @type ref,
+    int class_id: @type ref
+);
+
+/*
+ specifiers for types, functions, and variables
+
+    "public",
+    "protected",
+    "private",
+
+    "const",
+    "volatile",
+    "static",
+
+    "pure",
+    "virtual",
+    "sealed", // Microsoft
+    "__interface", // Microsoft
+    "inline",
+    "explicit",
+
+    "near", // near far extension
+    "far", // near far extension
+    "__ptr32", // Microsoft
+    "__ptr64", // Microsoft
+    "__sptr", // Microsoft
+    "__uptr", // Microsoft
+    "dllimport", // Microsoft
+    "dllexport", // Microsoft
+    "thread", // Microsoft
+    "naked", // Microsoft
+    "microsoft_inline", // Microsoft
+    "forceinline", // Microsoft
+    "selectany", // Microsoft
+    "nothrow", // Microsoft
+    "novtable", // Microsoft
+    "noreturn", // Microsoft
+    "noinline", // Microsoft
+    "noalias", // Microsoft
+    "restrict", // Microsoft
+*/
+
+specifiers(
+    unique int id: @specifier,
+    unique string str: string ref
+);
+
+typespecifiers(
+    int type_id: @type ref,
+    int spec_id: @specifier ref
+);
+
+funspecifiers(
+    int func_id: @function ref,
+    int spec_id: @specifier ref
+);
+
+varspecifiers(
+    int var_id: @accessible ref,
+    int spec_id: @specifier ref
+);
+
+explicit_specifier_exprs(
+    unique int func_id: @function ref,
+    int constant: @expr ref
+)
+
+attributes(
+    unique int id: @attribute,
+    int kind: int ref,
+    string name: string ref,
+    string name_space: string ref,
+    int location: @location_default ref
+);
+
+case @attribute.kind of
+  0 = @gnuattribute
+| 1 = @stdattribute
+| 2 = @declspec
+| 3 = @msattribute
+| 4 = @alignas
+// ... 5 @objc_propertyattribute deprecated
+;
+
+attribute_args(
+    unique int id: @attribute_arg,
+    int kind: int ref,
+    int attribute: @attribute ref,
+    int index: int ref,
+    int location: @location_default ref
+);
+
+case @attribute_arg.kind of
+  0 = @attribute_arg_empty
+| 1 = @attribute_arg_token
+| 2 = @attribute_arg_constant
+| 3 = @attribute_arg_type
+| 4 = @attribute_arg_constant_expr
+| 5 = @attribute_arg_expr
+;
+
+attribute_arg_value(
+    unique int arg: @attribute_arg ref,
+    string value: string ref
+);
+attribute_arg_type(
+    unique int arg: @attribute_arg ref,
+    int type_id: @type ref
+);
+attribute_arg_constant(
+    unique int arg: @attribute_arg ref,
+    int constant: @expr ref
+)
+attribute_arg_expr(
+    unique int arg: @attribute_arg ref,
+    int expr: @expr ref
+)
+attribute_arg_name(
+    unique int arg: @attribute_arg ref,
+    string name: string ref
+);
+
+typeattributes(
+    int type_id: @type ref,
+    int spec_id: @attribute ref
+);
+
+funcattributes(
+    int func_id: @function ref,
+    int spec_id: @attribute ref
+);
+
+varattributes(
+    int var_id: @accessible ref,
+    int spec_id: @attribute ref
+);
+
+stmtattributes(
+    int stmt_id: @stmt ref,
+    int spec_id: @attribute ref
+);
+
+@type = @builtintype
+      | @derivedtype
+      | @usertype
+      | @routinetype
+      | @ptrtomember
+      | @decltype
+      | @type_operator;
+
+unspecifiedtype(
+    unique int type_id: @type ref,
+    int unspecified_type_id: @type ref
+);
+
+member(
+    int parent: @type ref,
+    int index: int ref,
+    int child: @member ref
+);
+
+@enclosingfunction_child = @usertype | @variable | @namespace
+
+enclosingfunction(
+    unique int child: @enclosingfunction_child ref,
+    int parent: @function ref
+);
+
+derivations(
+    unique int derivation: @derivation,
+    int sub: @type ref,
+    int index: int ref,
+    int super: @type ref,
+    int location: @location_default ref
+);
+
+derspecifiers(
+    int der_id: @derivation ref,
+    int spec_id: @specifier ref
+);
+
+/**
+ * Contains the byte offset of the base class subobject within the derived
+ * class. Only holds for non-virtual base classes, but see table
+ * `virtual_base_offsets` for offsets of virtual base class subobjects.
+ */
+direct_base_offsets(
+    unique int der_id: @derivation ref,
+    int offset: int ref
+);
+
+/**
+ * Contains the byte offset of the virtual base class subobject for class
+ * `super` within a most-derived object of class `sub`. `super` can be either a
+ * direct or indirect base class.
+ */
+#keyset[sub, super]
+virtual_base_offsets(
+    int sub: @usertype ref,
+    int super: @usertype ref,
+    int offset: int ref
+);
+
+frienddecls(
+    unique int id: @frienddecl,
+    int type_id: @type ref,
+    int decl_id: @declaration ref,
+    int location: @location_default ref
+);
+
+@declaredtype = @usertype ;
+
+@declaration = @function
+             | @declaredtype
+             | @variable
+             | @enumconstant
+             | @frienddecl
+             | @concept_template;
+
+@member = @membervariable
+        | @function
+        | @declaredtype
+        | @enumconstant;
+
+@locatable = @diagnostic
+           | @declaration
+           | @ppd_include
+           | @ppd_define
+           | @macroinvocation
+           /*| @funcall*/
+           | @xmllocatable
+           | @attribute
+           | @attribute_arg;
+
+@namedscope = @namespace | @usertype;
+
+@element = @locatable
+         | @file
+         | @folder
+         | @specifier
+         | @type
+         | @expr
+         | @namespace
+         | @initialiser
+         | @stmt
+         | @derivation
+         | @comment
+         | @preprocdirect
+         | @fun_decl
+         | @var_decl
+         | @type_decl
+         | @namespace_decl
+         | @using
+         | @namequalifier
+         | @specialnamequalifyingelement
+         | @static_assert
+         | @type_mention
+         | @lambdacapture;
+
+@exprparent = @element;
+
+comments(
+    unique int id: @comment,
+    string contents: string ref,
+    int location: @location_default ref
+);
+
+commentbinding(
+    int id: @comment ref,
+    int element: @element ref
+);
+
+exprconv(
+    int converted: @expr ref,
+    unique int conversion: @expr ref
+);
+
+compgenerated(unique int id: @element ref);
+
+/**
+ * `destructor_call` destructs the `i`'th entity that should be
+ * destructed following `element`. Note that entities should be
+ * destructed in reverse construction order, so for a given `element`
+ * these should be called from highest to lowest `i`.
+ */
+#keyset[element, destructor_call]
+#keyset[element, i]
+synthetic_destructor_call(
+    int element: @element ref,
+    int i: int ref,
+    int destructor_call: @routineexpr ref
+);
+
+namespaces(
+    unique int id: @namespace,
+    string name: string ref
+);
+
+namespace_inline(
+    unique int id: @namespace ref
+);
+
+namespacembrs(
+    int parentid: @namespace ref,
+    unique int memberid: @namespacembr ref
+);
+
+@namespacembr = @declaration | @namespace;
+
+exprparents(
+    int expr_id: @expr ref,
+    int child_index: int ref,
+    int parent_id: @exprparent ref
+);
+
+expr_isload(unique int expr_id: @expr ref);
+
+@cast = @c_style_cast
+      | @const_cast
+      | @dynamic_cast
+      | @reinterpret_cast
+      | @static_cast
+      ;
+
+/*
+case @conversion.kind of
+  0 = @simple_conversion           // a numeric conversion, qualification conversion, or a reinterpret_cast
+| 1 = @bool_conversion             // conversion to 'bool'
+| 2 = @base_class_conversion       // a derived-to-base conversion
+| 3 = @derived_class_conversion    // a base-to-derived conversion
+| 4 = @pm_base_class_conversion    // a derived-to-base conversion of a pointer to member
+| 5 = @pm_derived_class_conversion // a base-to-derived conversion of a pointer to member
+| 6 = @glvalue_adjust              // an adjustment of the type of a glvalue
+| 7 = @prvalue_adjust              // an adjustment of the type of a prvalue
+;
+*/
+/**
+ * Describes the semantics represented by a cast expression. This is largely
+ * independent of the source syntax of the cast, so it is separate from the
+ * regular expression kind.
+ */
+conversionkinds(
+    unique int expr_id: @cast ref,
+    int kind: int ref
+);
+
+@conversion = @cast
+            | @array_to_pointer
+            | @parexpr
+            | @reference_to
+            | @ref_indirect
+            | @temp_init
+            | @c11_generic
+            ;
+
+/*
+case @funbindexpr.kind of
+  0 = @normal_call  // a normal call
+| 1 = @virtual_call // a virtual call
+| 2 = @adl_call     // a call whose target is only found by ADL
+;
+*/
+iscall(
+    unique int caller: @funbindexpr ref,
+    int kind: int ref
+);
+
+numtemplatearguments(
+    unique int expr_id: @expr ref,
+    int num: int ref
+);
+
+specialnamequalifyingelements(
+    unique int id: @specialnamequalifyingelement,
+    unique string name: string ref
+);
+
+@namequalifiableelement = @expr | @namequalifier;
+@namequalifyingelement = @namespace
+                       | @specialnamequalifyingelement
+                       | @usertype;
+
+namequalifiers(
+    unique int id: @namequalifier,
+    unique int qualifiableelement: @namequalifiableelement ref,
+    int qualifyingelement: @namequalifyingelement ref,
+    int location: @location_default ref
+);
+
+varbind(
+    int expr: @varbindexpr ref,
+    int var: @accessible ref
+);
+
+funbind(
+    int expr: @funbindexpr ref,
+    int fun: @function ref
+);
+
+@any_new_expr = @new_expr
+              | @new_array_expr;
+
+@new_or_delete_expr = @any_new_expr
+                    | @delete_expr
+                    | @delete_array_expr;
+
+@prefix_crement_expr = @preincrexpr | @predecrexpr;
+
+@postfix_crement_expr = @postincrexpr | @postdecrexpr;
+
+@increment_expr = @preincrexpr | @postincrexpr;
+
+@decrement_expr = @predecrexpr | @postdecrexpr;
+
+@crement_expr = @increment_expr | @decrement_expr;
+
+@un_arith_op_expr = @arithnegexpr
+                  | @unaryplusexpr
+                  | @conjugation
+                  | @realpartexpr
+                  | @imagpartexpr
+                  | @crement_expr
+                  ;
+
+@un_bitwise_op_expr = @complementexpr;
+
+@un_log_op_expr = @notexpr;
+
+@un_op_expr = @address_of
+            | @indirect
+            | @un_arith_op_expr
+            | @un_bitwise_op_expr
+            | @builtinaddressof
+            | @vec_fill
+            | @un_log_op_expr
+            | @co_await
+            | @co_yield
+            ;
+
+@bin_log_op_expr = @andlogicalexpr | @orlogicalexpr;
+
+@cmp_op_expr = @eq_op_expr | @rel_op_expr;
+
+@eq_op_expr = @eqexpr | @neexpr;
+
+@rel_op_expr = @gtexpr
+             | @ltexpr
+             | @geexpr
+             | @leexpr
+             | @spaceshipexpr
+             ;
+
+@bin_bitwise_op_expr = @lshiftexpr
+                     | @rshiftexpr
+                     | @andexpr
+                     | @orexpr
+                     | @xorexpr
+                     ;
+
+@p_arith_op_expr = @paddexpr
+                 | @psubexpr
+                 | @pdiffexpr
+                 ;
+
+@bin_arith_op_expr = @addexpr
+                   | @subexpr
+                   | @mulexpr
+                   | @divexpr
+                   | @remexpr
+                   | @jmulexpr
+                   | @jdivexpr
+                   | @fjaddexpr
+                   | @jfaddexpr
+                   | @fjsubexpr
+                   | @jfsubexpr
+                   | @minexpr
+                   | @maxexpr
+                   | @p_arith_op_expr
+                   ;
+
+@bin_op_expr = @bin_arith_op_expr
+             | @bin_bitwise_op_expr
+             | @cmp_op_expr
+             | @bin_log_op_expr
+             ;
+
+@op_expr = @un_op_expr
+         | @bin_op_expr
+         | @assign_expr
+         | @conditionalexpr
+         ;
+
+@assign_arith_expr = @assignaddexpr
+                   | @assignsubexpr
+                   | @assignmulexpr
+                   | @assigndivexpr
+                   | @assignremexpr
+                   ;
+
+@assign_bitwise_expr = @assignandexpr
+                     | @assignorexpr
+                     | @assignxorexpr
+                     | @assignlshiftexpr
+                     | @assignrshiftexpr
+                     ;
+
+@assign_pointer_expr = @assignpaddexpr
+                     | @assignpsubexpr
+                     ;
+
+@assign_op_expr = @assign_arith_expr
+                | @assign_bitwise_expr
+                | @assign_pointer_expr
+                ;
+
+@assign_expr = @assignexpr | @assign_op_expr | @blockassignexpr
+
+/*
+  Binary encoding of the allocator form.
+
+  case @allocator.form of
+    0 = plain
+  | 1 = alignment
+  ;
+*/
+
+/**
+ * The allocator function associated with a `new` or `new[]` expression.
+ * The `form` column specified whether the allocation call contains an alignment
+ * argument.
+ */
+expr_allocator(
+    unique int expr: @any_new_expr ref,
+    int func: @function ref,
+    int form: int ref
+);
+
+/*
+  Binary encoding of the deallocator form.
+
+  case @deallocator.form of
+    0 = plain
+  | 1 = size
+  | 2 = alignment
+  | 4 = destroying_delete
+  ;
+*/
+
+/**
+ * The deallocator function associated with a `delete`, `delete[]`, `new`, or
+ * `new[]` expression. For a `new` or `new[]` expression, the deallocator is the
+ * one used to free memory if the initialization throws an exception.
+ * The `form` column specifies whether the deallocation call contains a size
+ * argument, and alignment argument, or both.
+ */
+expr_deallocator(
+    unique int expr: @new_or_delete_expr ref,
+    int func: @function ref,
+    int form: int ref
+);
+
+/**
+ * Holds if the `@conditionalexpr` is of the two operand form
+ * `guard ? : false`.
+ */
+expr_cond_two_operand(
+    unique int cond: @conditionalexpr ref
+);
+
+/**
+ * The guard of `@conditionalexpr` `guard ? true : false`
+ */
+expr_cond_guard(
+    unique int cond: @conditionalexpr ref,
+    int guard: @expr ref
+);
+
+/**
+ * The expression used when the guard of `@conditionalexpr`
+ * `guard ? true : false` holds. For the two operand form
+ * `guard ?: false` consider using `expr_cond_guard` instead.
+ */
+expr_cond_true(
+    unique int cond: @conditionalexpr ref,
+    int true: @expr ref
+);
+
+/**
+ * The expression used when the guard of `@conditionalexpr`
+ * `guard ? true : false` does not hold.
+ */
+expr_cond_false(
+    unique int cond: @conditionalexpr ref,
+    int false: @expr ref
+);
+
+/** A string representation of the value. */
+values(
+    unique int id: @value,
+    string str: string ref
+);
+
+/** The actual text in the source code for the value, if any. */
+valuetext(
+    unique int id: @value ref,
+    string text: string ref
+);
+
+valuebind(
+    int val: @value ref,
+    unique int expr: @expr ref
+);
+
+fieldoffsets(
+    unique int id: @variable ref,
+    int byteoffset: int ref,
+    int bitoffset: int ref
+);
+
+bitfield(
+    unique int id: @variable ref,
+    int bits: int ref,
+    int declared_bits: int ref
+);
+
+/* TODO
+memberprefix(
+    int member: @expr ref,
+    int prefix: @expr ref
+);
+*/
+
+/*
+   kind(1) = mbrcallexpr
+   kind(2) = mbrptrcallexpr
+   kind(3) = mbrptrmbrcallexpr
+   kind(4) = ptrmbrptrmbrcallexpr
+   kind(5) = mbrreadexpr // x.y
+   kind(6) = mbrptrreadexpr // p->y
+   kind(7) = mbrptrmbrreadexpr // x.*pm
+   kind(8) = mbrptrmbrptrreadexpr // x->*pm
+   kind(9) = staticmbrreadexpr // static x.y
+   kind(10) = staticmbrptrreadexpr // static p->y
+*/
+/* TODO
+memberaccess(
+    int member: @expr ref,
+    int kind: int ref
+);
+*/
+
+initialisers(
+    unique int init: @initialiser,
+    int var: @accessible ref,
+    unique int expr: @expr ref,
+    int location: @location_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
+| 391 = @nested_requirement
+| 392 = @compound_requirement
+| 393 = @concept_id
+;
+
+@var_args_expr = @vastartexpr
+               | @vaendexpr
+               | @vaargexpr
+               | @vacopyexpr
+               ;
+
+@builtin_op = @var_args_expr
+            | @noopexpr
+            | @offsetofexpr
+            | @intaddrexpr
+            | @hasassignexpr
+            | @hascopyexpr
+            | @hasnothrowassign
+            | @hasnothrowconstr
+            | @hasnothrowcopy
+            | @hastrivialassign
+            | @hastrivialconstr
+            | @hastrivialcopy
+            | @hastrivialdestructor
+            | @hasuserdestr
+            | @hasvirtualdestr
+            | @isabstractexpr
+            | @isbaseofexpr
+            | @isclassexpr
+            | @isconvtoexpr
+            | @isemptyexpr
+            | @isenumexpr
+            | @ispodexpr
+            | @ispolyexpr
+            | @isunionexpr
+            | @typescompexpr
+            | @builtinshufflevector
+            | @builtinconvertvector
+            | @builtinaddressof
+            | @istriviallyconstructibleexpr
+            | @isdestructibleexpr
+            | @isnothrowdestructibleexpr
+            | @istriviallydestructibleexpr
+            | @istriviallyassignableexpr
+            | @isnothrowassignableexpr
+            | @istrivialexpr
+            | @isstandardlayoutexpr
+            | @istriviallycopyableexpr
+            | @isliteraltypeexpr
+            | @hastrivialmoveconstructorexpr
+            | @hastrivialmoveassignexpr
+            | @hasnothrowmoveassignexpr
+            | @isconstructibleexpr
+            | @isnothrowconstructibleexpr
+            | @hasfinalizerexpr
+            | @isdelegateexpr
+            | @isinterfaceclassexpr
+            | @isrefarrayexpr
+            | @isrefclassexpr
+            | @issealedexpr
+            | @issimplevalueclassexpr
+            | @isvalueclassexpr
+            | @isfinalexpr
+            | @builtinchooseexpr
+            | @builtincomplex
+            | @isassignable
+            | @isaggregate
+            | @hasuniqueobjectrepresentations
+            | @builtinbitcast
+            | @builtinshuffle
+            | @issame
+            | @isfunction
+            | @islayoutcompatible
+            | @ispointerinterconvertiblebaseof
+            | @isarray
+            | @arrayrank
+            | @arrayextent
+            | @isarithmetic
+            | @iscompletetype
+            | @iscompound
+            | @isconst
+            | @isfloatingpoint
+            | @isfundamental
+            | @isintegral
+            | @islvaluereference
+            | @ismemberfunctionpointer
+            | @ismemberobjectpointer
+            | @ismemberpointer
+            | @isobject
+            | @ispointer
+            | @isreference
+            | @isrvaluereference
+            | @isscalar
+            | @issigned
+            | @isunsigned
+            | @isvoid
+            | @isvolatile
+            | @istriviallycopyassignable
+            | @isassignablenopreconditioncheck
+            | @referencebindstotemporary
+            | @issameas
+            | @builtinhasattribute
+            | @ispointerinterconvertiblewithclass
+            | @builtinispointerinterconvertiblewithclass
+            | @iscorrespondingmember
+            | @builtiniscorrespondingmember
+            | @isboundedarray
+            | @isunboundedarray
+            | @isreferenceable
+            | @isnothrowconvertible
+            | @referenceconstructsfromtemporary
+            | @referenceconvertsfromtemporary
+            | @isconvertible
+            | @isvalidwinrttype
+            | @iswinclass
+            | @iswininterface
+            | @istriviallyequalitycomparable
+            | @isscopedenum
+            | @istriviallyrelocatable
+            ;
+
+compound_requirement_is_noexcept(
+    int expr: @compound_requirement ref
+);
+
+new_allocated_type(
+    unique int expr: @new_expr ref,
+    int type_id: @type ref
+);
+
+new_array_allocated_type(
+    unique int expr: @new_array_expr ref,
+    int type_id: @type ref
+);
+
+/**
+ * The field being initialized by an initializer expression within an aggregate
+ * initializer for a class/struct/union. Position is used to sort repeated initializers.
+ */
+#keyset[aggregate, position]
+aggregate_field_init(
+    int aggregate: @aggregateliteral ref,
+    int initializer: @expr ref,
+    int field: @membervariable ref,
+    int position: int ref,
+    boolean is_designated: boolean ref
+);
+
+/**
+ * The index of the element being initialized by an initializer expression
+ * within an aggregate initializer for an array. Position is used to sort repeated initializers.
+ */
+#keyset[aggregate, position]
+aggregate_array_init(
+    int aggregate: @aggregateliteral ref,
+    int initializer: @expr ref,
+    int element_index: int ref,
+    int position: int ref,
+    boolean is_designated: boolean ref
+);
+
+@ctorinit = @ctordirectinit
+          | @ctorvirtualinit
+          | @ctorfieldinit
+          | @ctordelegatinginit;
+@dtordestruct = @dtordirectdestruct
+              | @dtorvirtualdestruct
+              | @dtorfielddestruct;
+
+
+condition_decl_bind(
+    unique int expr: @condition_decl ref,
+    unique int decl: @declaration ref
+);
+
+typeid_bind(
+    unique int expr: @type_id ref,
+    int type_id: @type ref
+);
+
+uuidof_bind(
+    unique int expr: @uuidof ref,
+    int type_id: @type ref
+);
+
+@sizeof_or_alignof = @runtime_sizeof | @runtime_alignof | @datasizeof | @sizeof_pack;
+
+sizeof_bind(
+    unique int expr: @sizeof_or_alignof ref,
+    int type_id: @type ref
+);
+
+code_block(
+    unique int block: @literal ref,
+    unique int routine: @function ref
+);
+
+lambdas(
+    unique int expr: @lambdaexpr ref,
+    string default_capture: string ref,
+    boolean has_explicit_return_type: boolean ref,
+    boolean has_explicit_parameter_list: boolean ref
+);
+
+lambda_capture(
+    unique int id: @lambdacapture,
+    int lambda: @lambdaexpr ref,
+    int index: int ref,
+    int field: @membervariable ref,
+    boolean captured_by_reference: boolean ref,
+    boolean is_implicit: boolean ref,
+    int location: @location_default ref
+);
+
+@funbindexpr = @routineexpr
+             | @new_expr
+             | @delete_expr
+             | @delete_array_expr
+             | @ctordirectinit
+             | @ctorvirtualinit
+             | @ctordelegatinginit
+             | @dtordirectdestruct
+             | @dtorvirtualdestruct;
+
+@varbindexpr = @varaccess | @ctorfieldinit | @dtorfielddestruct;
+@addressable = @function | @variable ;
+@accessible = @addressable | @enumconstant ;
+
+@access = @varaccess | @routineexpr ;
+
+fold(
+    int expr: @foldexpr ref,
+    string operator: string ref,
+    boolean is_left_fold: boolean ref
+);
+
+stmts(
+    unique int id: @stmt,
+    int kind: int ref,
+    int location: @location_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
+|  38 = @stmt_consteval_if
+|  39 = @stmt_not_consteval_if
+;
+
+type_vla(
+    int type_id: @type ref,
+    int decl: @stmt_vla_decl ref
+);
+
+variable_vla(
+    int var: @variable ref,
+    int decl: @stmt_vla_decl ref
+);
+
+type_is_vla(unique int type_id: @derivedtype ref)
+
+if_initialization(
+    unique int if_stmt: @stmt_if ref,
+    int init_id: @stmt ref
+);
+
+if_then(
+    unique int if_stmt: @stmt_if ref,
+    int then_id: @stmt ref
+);
+
+if_else(
+    unique int if_stmt: @stmt_if ref,
+    int else_id: @stmt ref
+);
+
+constexpr_if_initialization(
+    unique int constexpr_if_stmt: @stmt_constexpr_if ref,
+    int init_id: @stmt ref
+);
+
+constexpr_if_then(
+    unique int constexpr_if_stmt: @stmt_constexpr_if ref,
+    int then_id: @stmt ref
+);
+
+constexpr_if_else(
+    unique int constexpr_if_stmt: @stmt_constexpr_if ref,
+    int else_id: @stmt ref
+);
+
+@stmt_consteval_or_not_consteval_if = @stmt_consteval_if | @stmt_not_consteval_if;
+
+consteval_if_then(
+    unique int constexpr_if_stmt: @stmt_consteval_or_not_consteval_if ref,
+    int then_id: @stmt ref
+);
+
+consteval_if_else(
+    unique int constexpr_if_stmt: @stmt_consteval_or_not_consteval_if ref,
+    int else_id: @stmt ref
+);
+
+while_body(
+    unique int while_stmt: @stmt_while ref,
+    int body_id: @stmt ref
+);
+
+do_body(
+    unique int do_stmt: @stmt_end_test_while ref,
+    int body_id: @stmt ref
+);
+
+switch_initialization(
+    unique int switch_stmt: @stmt_switch ref,
+    int init_id: @stmt ref
+);
+
+#keyset[switch_stmt, index]
+switch_case(
+    int switch_stmt: @stmt_switch ref,
+    int index: int ref,
+    int case_id: @stmt_switch_case ref
+);
+
+switch_body(
+    unique int switch_stmt: @stmt_switch ref,
+    int body_id: @stmt ref
+);
+
+@stmt_for_or_range_based_for = @stmt_for
+                             | @stmt_range_based_for;
+
+for_initialization(
+    unique int for_stmt: @stmt_for_or_range_based_for ref,
+    int init_id: @stmt ref
+);
+
+for_condition(
+    unique int for_stmt: @stmt_for ref,
+    int condition_id: @expr ref
+);
+
+for_update(
+    unique int for_stmt: @stmt_for ref,
+    int update_id: @expr ref
+);
+
+for_body(
+    unique int for_stmt: @stmt_for ref,
+    int body_id: @stmt ref
+);
+
+@stmtparent = @stmt | @expr_stmt ;
+stmtparents(
+    unique int id: @stmt ref,
+    int index: int ref,
+    int parent: @stmtparent ref
+);
+
+ishandler(unique int block: @stmt_block ref);
+
+@cfgnode = @stmt | @expr | @function | @initialiser ;
+
+stmt_decl_bind(
+    int stmt: @stmt_decl ref,
+    int num: int ref,
+    int decl: @declaration ref
+);
+
+stmt_decl_entry_bind(
+    int stmt: @stmt_decl ref,
+    int num: int ref,
+    int decl_entry: @element ref
+);
+
+@parameterized_element = @function | @stmt_block | @requires_expr;
+
+blockscope(
+    unique int block: @stmt_block ref,
+    int enclosing: @parameterized_element ref
+);
+
+@jump = @stmt_goto | @stmt_break | @stmt_continue;
+
+@jumporlabel = @jump | @stmt_label | @literal;
+
+jumpinfo(
+    unique int id: @jumporlabel ref,
+    string str: string ref,
+    int target: @stmt ref
+);
+
+preprocdirects(
+    unique int id: @preprocdirect,
+    int kind: int ref,
+    int location: @location_default ref
+);
+case @preprocdirect.kind of
+   0 = @ppd_if
+|  1 = @ppd_ifdef
+|  2 = @ppd_ifndef
+|  3 = @ppd_elif
+|  4 = @ppd_else
+|  5 = @ppd_endif
+|  6 = @ppd_plain_include
+|  7 = @ppd_define
+|  8 = @ppd_undef
+|  9 = @ppd_line
+| 10 = @ppd_error
+| 11 = @ppd_pragma
+| 12 = @ppd_objc_import
+| 13 = @ppd_include_next
+| 14 = @ppd_ms_import
+| 15 = @ppd_elifdef
+| 16 = @ppd_elifndef
+| 18 = @ppd_warning
+;
+
+@ppd_include = @ppd_plain_include | @ppd_objc_import | @ppd_include_next | @ppd_ms_import;
+
+@ppd_branch = @ppd_if | @ppd_ifdef | @ppd_ifndef | @ppd_elif | @ppd_elifdef | @ppd_elifndef;
+
+preprocpair(
+    int begin : @ppd_branch ref,
+    int elseelifend : @preprocdirect ref
+);
+
+preproctrue(int branch : @ppd_branch ref);
+preprocfalse(int branch : @ppd_branch ref);
+
+preproctext(
+    unique int id: @preprocdirect ref,
+    string head: string ref,
+    string body: string ref
+);
+
+includes(
+    unique int id: @ppd_include ref,
+    int included: @file ref
+);
+
+link_targets(
+    int id: @link_target,
+    int binary: @file ref
+);
+
+link_parent(
+    int element : @element ref,
+    int link_target : @link_target ref
+);
+
+/* XML Files */
+
+xmlEncoding(unique int id: @file ref, string encoding: string ref);
+
+xmlDTDs(
+    unique int id: @xmldtd,
+    string root: string ref,
+    string publicId: string ref,
+    string systemId: string ref,
+    int fileid: @file ref
+);
+
+xmlElements(
+    unique int id: @xmlelement,
+    string name: string ref,
+    int parentid: @xmlparent ref,
+    int idx: int ref,
+    int fileid: @file ref
+);
+
+xmlAttrs(
+    unique int id: @xmlattribute,
+    int elementid: @xmlelement ref,
+    string name: string ref,
+    string value: string ref,
+    int idx: int ref,
+    int fileid: @file ref
+);
+
+xmlNs(
+    int id: @xmlnamespace,
+    string prefixName: string ref,
+    string URI: string ref,
+    int fileid: @file ref
+);
+
+xmlHasNs(
+    int elementId: @xmlnamespaceable ref,
+    int nsId: @xmlnamespace ref,
+    int fileid: @file ref
+);
+
+xmlComments(
+    unique int id: @xmlcomment,
+    string text: string ref,
+    int parentid: @xmlparent ref,
+    int fileid: @file ref
+);
+
+xmlChars(
+    unique int id: @xmlcharacters,
+    string text: string ref,
+    int parentid: @xmlparent ref,
+    int idx: int ref,
+    int isCDATA: int ref,
+    int fileid: @file ref
+);
+
+@xmlparent = @file | @xmlelement;
+@xmlnamespaceable = @xmlelement | @xmlattribute;
+
+xmllocations(
+    int xmlElement: @xmllocatable ref,
+    int location: @location_default ref
+);
+
+@xmllocatable = @xmlcharacters
+              | @xmlelement
+              | @xmlcomment
+              | @xmlattribute
+              | @xmldtd
+              | @file
+              | @xmlnamespace;
diff --git a/cpp/downgrades/a8c2176e9a5cf9be8d17053a4c8e7e56b5aced6d/stmts.ql b/cpp/downgrades/a8c2176e9a5cf9be8d17053a4c8e7e56b5aced6d/stmts.ql
new file mode 100644
index 000000000000..41c2ac1b7704
--- /dev/null
+++ b/cpp/downgrades/a8c2176e9a5cf9be8d17053a4c8e7e56b5aced6d/stmts.ql
@@ -0,0 +1,13 @@
+class Stmt extends @stmt {
+  string toString() { none() }
+}
+
+class Location extends @location_stmt {
+  string toString() { none() }
+}
+
+from Stmt id, int kind, Location loc, int new_kind
+where
+  stmts(id, kind, loc) and
+  if kind = 40 then new_kind = 4 else new_kind = kind
+select id, new_kind, loc
diff --git a/cpp/downgrades/a8c2176e9a5cf9be8d17053a4c8e7e56b5aced6d/upgrade.properties b/cpp/downgrades/a8c2176e9a5cf9be8d17053a4c8e7e56b5aced6d/upgrade.properties
new file mode 100644
index 000000000000..05a32c107602
--- /dev/null
+++ b/cpp/downgrades/a8c2176e9a5cf9be8d17053a4c8e7e56b5aced6d/upgrade.properties
@@ -0,0 +1,3 @@
+description: Support `__leave` statement
+compatibility: backwards
+stmts.rel: run stmts.qlo
diff --git a/cpp/ql/lib/upgrades/3c45f8b9e71ec723bf50c40581e1f18f4f25e290/old.dbscheme b/cpp/ql/lib/upgrades/3c45f8b9e71ec723bf50c40581e1f18f4f25e290/old.dbscheme
new file mode 100644
index 000000000000..3c45f8b9e71e
--- /dev/null
+++ b/cpp/ql/lib/upgrades/3c45f8b9e71ec723bf50c40581e1f18f4f25e290/old.dbscheme
@@ -0,0 +1,2493 @@
+
+/**
+ * An invocation of the compiler. Note that more than one file may be
+ * compiled per invocation. For example, this command compiles three
+ * source files:
+ *
+ *   gcc -c f1.c f2.c f3.c
+ *
+ * The `id` simply identifies the invocation, while `cwd` is the working
+ * directory from which the compiler was invoked.
+ */
+compilations(
+    /**
+     * An invocation of the compiler. Note that more than one file may
+     * be compiled per invocation. For example, this command compiles
+     * three source files:
+     *
+     *   gcc -c f1.c f2.c f3.c
+     */
+    unique int id : @compilation,
+    string cwd : string ref
+);
+
+/**
+ * The arguments that were passed to the extractor for a compiler
+ * invocation. If `id` is for the compiler invocation
+ *
+ *   gcc -c f1.c f2.c f3.c
+ *
+ * then typically there will be rows for
+ *
+ * num | arg
+ * --- | ---
+ * 0   | *path to extractor*
+ * 1   | `--mimic`
+ * 2   | `/usr/bin/gcc`
+ * 3   | `-c`
+ * 4   | f1.c
+ * 5   | f2.c
+ * 6   | f3.c
+ */
+#keyset[id, num]
+compilation_args(
+    int id : @compilation ref,
+    int num : int ref,
+    string arg : string ref
+);
+
+/**
+ * Optionally, record the build mode for each compilation.
+ */
+compilation_build_mode(
+    unique int id : @compilation ref,
+    int mode : int ref
+);
+
+/*
+case @compilation_build_mode.mode of
+  0 = @build_mode_none
+| 1 = @build_mode_manual
+| 2 = @build_mode_auto
+;
+*/
+
+/**
+ * The source files that are compiled by a compiler invocation.
+ * If `id` is for the compiler invocation
+ *
+ *   gcc -c f1.c f2.c f3.c
+ *
+ * then there will be rows for
+ *
+ * num | arg
+ * --- | ---
+ * 0   | f1.c
+ * 1   | f2.c
+ * 2   | f3.c
+ *
+ * Note that even if those files `#include` headers, those headers
+ * do not appear as rows.
+ */
+#keyset[id, num]
+compilation_compiling_files(
+    int id : @compilation ref,
+    int num : int ref,
+    int file : @file ref
+);
+
+/**
+ * The time taken by the extractor for a compiler invocation.
+ *
+ * For each file `num`, there will be rows for
+ *
+ * kind | seconds
+ * ---- | ---
+ * 1    | CPU seconds used by the extractor frontend
+ * 2    | Elapsed seconds during the extractor frontend
+ * 3    | CPU seconds used by the extractor backend
+ * 4    | Elapsed seconds during the extractor backend
+ */
+#keyset[id, num, kind]
+compilation_time(
+    int id : @compilation ref,
+    int num : int ref,
+    /* kind:
+       1 = frontend_cpu_seconds
+       2 = frontend_elapsed_seconds
+       3 = extractor_cpu_seconds
+       4 = extractor_elapsed_seconds
+    */
+    int kind : int ref,
+    float seconds : float ref
+);
+
+/**
+ * An error or warning generated by the extractor.
+ * The diagnostic message `diagnostic` was generated during compiler
+ * invocation `compilation`, and is the `file_number_diagnostic_number`th
+ * message generated while extracting the `file_number`th file of that
+ * invocation.
+ */
+#keyset[compilation, file_number, file_number_diagnostic_number]
+diagnostic_for(
+    int diagnostic : @diagnostic ref,
+    int compilation : @compilation ref,
+    int file_number : int ref,
+    int file_number_diagnostic_number : int ref
+);
+
+/**
+ * If extraction was successful, then `cpu_seconds` and
+ * `elapsed_seconds` are the CPU time and elapsed time (respectively)
+ * that extraction took for compiler invocation `id`.
+ */
+compilation_finished(
+    unique int id : @compilation ref,
+    float cpu_seconds : float ref,
+    float elapsed_seconds : float ref
+);
+
+
+/**
+ * External data, 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
+);
+
+/*
+case @fun_requires.kind of
+  1 = @template_attached
+| 2 = @function_attached
+;
+*/
+
+fun_requires(
+    int id: @fun_decl ref,
+    int kind: int ref,
+    int constraint: @expr ref
+);
+
+param_decl_bind(
+    unique int id: @var_decl ref,
+    int index: int ref,
+    int fun_decl: @fun_decl ref
+);
+
+#keyset[id, type_id]
+var_decls(
+    int id: @var_decl,
+    int variable: @variable ref,
+    int type_id: @type ref,
+    string name: string ref,
+    int location: @location_default ref
+);
+var_def(unique int id: @var_decl ref);
+var_specialized(int id: @var_decl ref);
+var_decl_specifiers(
+    int id: @var_decl ref,
+    string name: string ref
+)
+is_structured_binding(unique int id: @variable ref);
+var_requires(
+    int id: @var_decl ref,
+    int constraint: @expr ref
+);
+
+type_decls(
+    unique int id: @type_decl,
+    int type_id: @type ref,
+    int location: @location_default ref
+);
+type_def(unique int id: @type_decl ref);
+type_decl_top(
+    unique int type_decl: @type_decl ref
+);
+type_requires(
+    int id: @type_decl ref,
+    int constraint: @expr ref
+);
+
+namespace_decls(
+    unique int id: @namespace_decl,
+    int namespace_id: @namespace ref,
+    int location: @location_default ref,
+    int bodylocation: @location_default ref
+);
+
+case @using.kind of
+  1 = @using_declaration
+| 2 = @using_directive
+| 3 = @using_enum_declaration
+;
+
+usings(
+    unique int id: @using,
+    int element_id: @element ref,
+    int location: @location_default ref,
+    int kind: int ref
+);
+
+/** The element which contains the `using` declaration. */
+using_container(
+    int parent: @element ref,
+    int child: @using ref
+);
+
+static_asserts(
+    unique int id: @static_assert,
+    int condition : @expr ref,
+    string message : string ref,
+    int location: @location_default ref,
+    int enclosing : @element ref
+);
+
+// each function has an ordered list of parameters
+#keyset[id, type_id]
+#keyset[function, index, type_id]
+params(
+    int id: @parameter,
+    int function: @parameterized_element ref,
+    int index: int ref,
+    int type_id: @type ref
+);
+
+overrides(
+    int new: @function ref,
+    int old: @function ref
+);
+
+#keyset[id, type_id]
+membervariables(
+    int id: @membervariable,
+    int type_id: @type ref,
+    string name: string ref
+);
+
+#keyset[id, type_id]
+globalvariables(
+    int id: @globalvariable,
+    int type_id: @type ref,
+    string name: string ref
+);
+
+#keyset[id, type_id]
+localvariables(
+    int id: @localvariable,
+    int type_id: @type ref,
+    string name: string ref
+);
+
+autoderivation(
+    unique int var: @variable ref,
+    int derivation_type: @type ref
+);
+
+orphaned_variables(
+    int var: @localvariable ref,
+    int function: @function ref
+)
+
+enumconstants(
+    unique int id: @enumconstant,
+    int parent: @usertype ref,
+    int index: int ref,
+    int type_id: @type ref,
+    string name: string ref,
+    int location: @location_default ref
+);
+
+@variable = @localscopevariable | @globalvariable | @membervariable;
+
+@localscopevariable = @localvariable | @parameter;
+
+/**
+ * Built-in types are the fundamental types, e.g., integral, floating, and void.
+ */
+case @builtintype.kind of
+   1 = @errortype
+|  2 = @unknowntype
+|  3 = @void
+|  4 = @boolean
+|  5 = @char
+|  6 = @unsigned_char
+|  7 = @signed_char
+|  8 = @short
+|  9 = @unsigned_short
+| 10 = @signed_short
+| 11 = @int
+| 12 = @unsigned_int
+| 13 = @signed_int
+| 14 = @long
+| 15 = @unsigned_long
+| 16 = @signed_long
+| 17 = @long_long
+| 18 = @unsigned_long_long
+| 19 = @signed_long_long
+// ... 20 Microsoft-specific __int8
+// ... 21 Microsoft-specific __int16
+// ... 22 Microsoft-specific __int32
+// ... 23 Microsoft-specific __int64
+| 24 = @float
+| 25 = @double
+| 26 = @long_double
+| 27 = @complex_float         // C99-specific _Complex float
+| 28 = @complex_double        // C99-specific _Complex double
+| 29 = @complex_long_double   // C99-specific _Complex long double
+| 30 = @imaginary_float       // C99-specific _Imaginary float
+| 31 = @imaginary_double      // C99-specific _Imaginary double
+| 32 = @imaginary_long_double // C99-specific _Imaginary long double
+| 33 = @wchar_t               // Microsoft-specific
+| 34 = @decltype_nullptr      // C++11
+| 35 = @int128                // __int128
+| 36 = @unsigned_int128       // unsigned __int128
+| 37 = @signed_int128         // signed __int128
+| 38 = @float128              // __float128
+| 39 = @complex_float128      // _Complex __float128
+| 40 = @decimal32             // _Decimal32
+| 41 = @decimal64             // _Decimal64
+| 42 = @decimal128            // _Decimal128
+| 43 = @char16_t
+| 44 = @char32_t
+| 45 = @std_float32           // _Float32
+| 46 = @float32x              // _Float32x
+| 47 = @std_float64           // _Float64
+| 48 = @float64x              // _Float64x
+| 49 = @std_float128          // _Float128
+// ... 50 _Float128x
+| 51 = @char8_t
+| 52 = @float16               // _Float16
+| 53 = @complex_float16       // _Complex _Float16
+| 54 = @fp16                  // __fp16
+| 55 = @std_bfloat16          // __bf16
+| 56 = @std_float16           // std::float16_t
+| 57 = @complex_std_float32   // _Complex _Float32
+| 58 = @complex_float32x      // _Complex _Float32x
+| 59 = @complex_std_float64   // _Complex _Float64
+| 60 = @complex_float64x      // _Complex _Float64x
+| 61 = @complex_std_float128  // _Complex _Float128
+| 62 = @mfp8                  // __mfp8
+;
+
+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 or C23 `typeof`/`typeof_unqual`
+ * operator taking an expression as its argument.  For example:
+ * ```
+ * int a;
+ * decltype(1+a) b;
+ * typeof(1+a) c;
+ * ```
+ * Here `expr` is `1+a`.
+ *
+ * Sometimes an additional pair of parentheses around the expression
+ * changes the semantics of the decltype, e.g.
+ * ```
+ * struct A { double x; };
+ * const A* a = new A();
+ * decltype( a->x ); // type is double
+ * decltype((a->x)); // type is const double&
+ * ```
+ * (Please consult the C++11 standard for more details).
+ * `parentheses_would_change_meaning` is `true` iff that is the case.
+ */
+
+/*
+case @decltype.kind of
+|  0 = @decltype
+|  1 = @typeof // The frontend does not differentiate between typeof and typeof_unqual
+;
+*/
+
+#keyset[id, expr]
+decltypes(
+    int id: @decltype,
+    int expr: @expr ref,
+    int kind: int ref,
+    int base_type: @type ref,
+    boolean parentheses_would_change_meaning: boolean ref
+);
+
+/*
+case @type_operator.kind of
+|  0 = @typeof // The frontend does not differentiate between typeof and typeof_unqual
+|  1 = @underlying_type
+|  2 = @bases
+|  3 = @direct_bases
+|  4 = @add_lvalue_reference
+|  5 = @add_pointer
+|  6 = @add_rvalue_reference
+|  7 = @decay
+|  8 = @make_signed
+|  9 = @make_unsigned
+| 10 = @remove_all_extents
+| 11 = @remove_const
+| 12 = @remove_cv
+| 13 = @remove_cvref
+| 14 = @remove_extent
+| 15 = @remove_pointer
+| 16 = @remove_reference_t
+| 17 = @remove_restrict
+| 18 = @remove_volatile
+| 19 = @remove_reference
+;
+*/
+
+type_operators(
+    unique int id: @type_operator,
+    int arg_type: @type ref,
+    int kind: int ref,
+    int base_type: @type ref
+)
+
+/*
+case @usertype.kind of
+|  0 = @unknown_usertype
+|  1 = @struct
+|  2 = @class
+|  3 = @union
+|  4 = @enum
+// ... 5 = @typedef deprecated        // classic C: typedef typedef type name
+// ... 6 = @template deprecated
+|  7 = @template_parameter
+|  8 = @template_template_parameter
+|  9 = @proxy_class                   // a proxy class associated with a template parameter
+// ... 10 objc_class deprecated
+// ... 11 objc_protocol deprecated
+// ... 12 objc_category deprecated
+| 13 = @scoped_enum
+// ... 14 = @using_alias deprecated   // a using name = type style typedef
+| 15 = @template_struct
+| 16 = @template_class
+| 17 = @template_union
+| 18 = @alias
+;
+*/
+
+usertypes(
+    unique int id: @usertype,
+    string name: string ref,
+    int kind: int ref
+);
+
+usertypesize(
+    unique int id: @usertype ref,
+    int size: int ref,
+    int alignment: int ref
+);
+
+usertype_final(unique int id: @usertype ref);
+
+usertype_uuid(
+    unique int id: @usertype ref,
+    string uuid: string ref
+);
+
+/*
+case @usertype.alias_kind of
+| 0 = @typedef
+| 1 = @alias
+*/
+
+usertype_alias_kind(
+    int id: @usertype ref,
+    int alias_kind: int ref
+)
+
+nontype_template_parameters(
+    int id: @expr ref
+);
+
+type_template_type_constraint(
+    int id: @usertype ref,
+    int constraint: @expr ref
+);
+
+mangled_name(
+    unique int id: @declaration ref,
+    int mangled_name : @mangledname,
+    boolean is_complete: boolean ref
+);
+
+is_pod_class(unique int id: @usertype ref);
+is_standard_layout_class(unique int id: @usertype ref);
+
+is_complete(unique int id: @usertype ref);
+
+is_class_template(unique int id: @usertype ref);
+class_instantiation(
+    int to: @usertype ref,
+    int from: @usertype ref
+);
+class_template_argument(
+    int type_id: @usertype ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+class_template_argument_value(
+    int type_id: @usertype ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+
+@user_or_decltype = @usertype | @decltype;
+
+is_proxy_class_for(
+    unique int id: @usertype ref,
+    int templ_param_id: @user_or_decltype ref
+);
+
+type_mentions(
+    unique int id: @type_mention,
+    int type_id: @type ref,
+    int location: @location ref,
+    // a_symbol_reference_kind from the frontend.
+    int kind: int ref
+);
+
+is_function_template(unique int id: @function ref);
+function_instantiation(
+    unique int to: @function ref,
+    int from: @function ref
+);
+function_template_argument(
+    int function_id: @function ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+function_template_argument_value(
+    int function_id: @function ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+
+is_variable_template(unique int id: @variable ref);
+variable_instantiation(
+    unique int to: @variable ref,
+    int from: @variable ref
+);
+variable_template_argument(
+    int variable_id: @variable ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+variable_template_argument_value(
+    int variable_id: @variable ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+
+template_template_instantiation(
+    int to: @usertype ref,
+    int from: @usertype ref
+);
+template_template_argument(
+    int type_id: @usertype ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+template_template_argument_value(
+    int type_id: @usertype ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+
+@concept = @concept_template | @concept_id;
+
+concept_templates(
+    unique int concept_id: @concept_template,
+    string name: string ref,
+    int location: @location_default ref
+);
+concept_instantiation(
+    unique int to: @concept_id ref,
+    int from: @concept_template ref
+);
+is_type_constraint(int concept_id: @concept_id ref);
+concept_template_argument(
+    int concept_id: @concept ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+concept_template_argument_value(
+    int concept_id: @concept ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+
+routinetypes(
+    unique int id: @routinetype,
+    int return_type: @type ref
+);
+
+routinetypeargs(
+    int routine: @routinetype ref,
+    int index: int ref,
+    int type_id: @type ref
+);
+
+ptrtomembers(
+    unique int id: @ptrtomember,
+    int type_id: @type ref,
+    int class_id: @type ref
+);
+
+/*
+ specifiers for types, functions, and variables
+
+    "public",
+    "protected",
+    "private",
+
+    "const",
+    "volatile",
+    "static",
+
+    "pure",
+    "virtual",
+    "sealed", // Microsoft
+    "__interface", // Microsoft
+    "inline",
+    "explicit",
+
+    "near", // near far extension
+    "far", // near far extension
+    "__ptr32", // Microsoft
+    "__ptr64", // Microsoft
+    "__sptr", // Microsoft
+    "__uptr", // Microsoft
+    "dllimport", // Microsoft
+    "dllexport", // Microsoft
+    "thread", // Microsoft
+    "naked", // Microsoft
+    "microsoft_inline", // Microsoft
+    "forceinline", // Microsoft
+    "selectany", // Microsoft
+    "nothrow", // Microsoft
+    "novtable", // Microsoft
+    "noreturn", // Microsoft
+    "noinline", // Microsoft
+    "noalias", // Microsoft
+    "restrict", // Microsoft
+*/
+
+specifiers(
+    unique int id: @specifier,
+    unique string str: string ref
+);
+
+typespecifiers(
+    int type_id: @type ref,
+    int spec_id: @specifier ref
+);
+
+funspecifiers(
+    int func_id: @function ref,
+    int spec_id: @specifier ref
+);
+
+varspecifiers(
+    int var_id: @accessible ref,
+    int spec_id: @specifier ref
+);
+
+explicit_specifier_exprs(
+    unique int func_id: @function ref,
+    int constant: @expr ref
+)
+
+attributes(
+    unique int id: @attribute,
+    int kind: int ref,
+    string name: string ref,
+    string name_space: string ref,
+    int location: @location_default ref
+);
+
+case @attribute.kind of
+  0 = @gnuattribute
+| 1 = @stdattribute
+| 2 = @declspec
+| 3 = @msattribute
+| 4 = @alignas
+// ... 5 @objc_propertyattribute deprecated
+;
+
+attribute_args(
+    unique int id: @attribute_arg,
+    int kind: int ref,
+    int attribute: @attribute ref,
+    int index: int ref,
+    int location: @location_default ref
+);
+
+case @attribute_arg.kind of
+  0 = @attribute_arg_empty
+| 1 = @attribute_arg_token
+| 2 = @attribute_arg_constant
+| 3 = @attribute_arg_type
+| 4 = @attribute_arg_constant_expr
+| 5 = @attribute_arg_expr
+;
+
+attribute_arg_value(
+    unique int arg: @attribute_arg ref,
+    string value: string ref
+);
+attribute_arg_type(
+    unique int arg: @attribute_arg ref,
+    int type_id: @type ref
+);
+attribute_arg_constant(
+    unique int arg: @attribute_arg ref,
+    int constant: @expr ref
+)
+attribute_arg_expr(
+    unique int arg: @attribute_arg ref,
+    int expr: @expr ref
+)
+attribute_arg_name(
+    unique int arg: @attribute_arg ref,
+    string name: string ref
+);
+
+typeattributes(
+    int type_id: @type ref,
+    int spec_id: @attribute ref
+);
+
+funcattributes(
+    int func_id: @function ref,
+    int spec_id: @attribute ref
+);
+
+varattributes(
+    int var_id: @accessible ref,
+    int spec_id: @attribute ref
+);
+
+stmtattributes(
+    int stmt_id: @stmt ref,
+    int spec_id: @attribute ref
+);
+
+@type = @builtintype
+      | @derivedtype
+      | @usertype
+      | @routinetype
+      | @ptrtomember
+      | @decltype
+      | @type_operator;
+
+unspecifiedtype(
+    unique int type_id: @type ref,
+    int unspecified_type_id: @type ref
+);
+
+member(
+    int parent: @type ref,
+    int index: int ref,
+    int child: @member ref
+);
+
+@enclosingfunction_child = @usertype | @variable | @namespace
+
+enclosingfunction(
+    unique int child: @enclosingfunction_child ref,
+    int parent: @function ref
+);
+
+derivations(
+    unique int derivation: @derivation,
+    int sub: @type ref,
+    int index: int ref,
+    int super: @type ref,
+    int location: @location_default ref
+);
+
+derspecifiers(
+    int der_id: @derivation ref,
+    int spec_id: @specifier ref
+);
+
+/**
+ * Contains the byte offset of the base class subobject within the derived
+ * class. Only holds for non-virtual base classes, but see table
+ * `virtual_base_offsets` for offsets of virtual base class subobjects.
+ */
+direct_base_offsets(
+    unique int der_id: @derivation ref,
+    int offset: int ref
+);
+
+/**
+ * Contains the byte offset of the virtual base class subobject for class
+ * `super` within a most-derived object of class `sub`. `super` can be either a
+ * direct or indirect base class.
+ */
+#keyset[sub, super]
+virtual_base_offsets(
+    int sub: @usertype ref,
+    int super: @usertype ref,
+    int offset: int ref
+);
+
+frienddecls(
+    unique int id: @frienddecl,
+    int type_id: @type ref,
+    int decl_id: @declaration ref,
+    int location: @location_default ref
+);
+
+@declaredtype = @usertype ;
+
+@declaration = @function
+             | @declaredtype
+             | @variable
+             | @enumconstant
+             | @frienddecl
+             | @concept_template;
+
+@member = @membervariable
+        | @function
+        | @declaredtype
+        | @enumconstant;
+
+@locatable = @diagnostic
+           | @declaration
+           | @ppd_include
+           | @ppd_define
+           | @macroinvocation
+           /*| @funcall*/
+           | @xmllocatable
+           | @attribute
+           | @attribute_arg;
+
+@namedscope = @namespace | @usertype;
+
+@element = @locatable
+         | @file
+         | @folder
+         | @specifier
+         | @type
+         | @expr
+         | @namespace
+         | @initialiser
+         | @stmt
+         | @derivation
+         | @comment
+         | @preprocdirect
+         | @fun_decl
+         | @var_decl
+         | @type_decl
+         | @namespace_decl
+         | @using
+         | @namequalifier
+         | @specialnamequalifyingelement
+         | @static_assert
+         | @type_mention
+         | @lambdacapture;
+
+@exprparent = @element;
+
+comments(
+    unique int id: @comment,
+    string contents: string ref,
+    int location: @location_default ref
+);
+
+commentbinding(
+    int id: @comment ref,
+    int element: @element ref
+);
+
+exprconv(
+    int converted: @expr ref,
+    unique int conversion: @expr ref
+);
+
+compgenerated(unique int id: @element ref);
+
+/**
+ * `destructor_call` destructs the `i`'th entity that should be
+ * destructed following `element`. Note that entities should be
+ * destructed in reverse construction order, so for a given `element`
+ * these should be called from highest to lowest `i`.
+ */
+#keyset[element, destructor_call]
+#keyset[element, i]
+synthetic_destructor_call(
+    int element: @element ref,
+    int i: int ref,
+    int destructor_call: @routineexpr ref
+);
+
+namespaces(
+    unique int id: @namespace,
+    string name: string ref
+);
+
+namespace_inline(
+    unique int id: @namespace ref
+);
+
+namespacembrs(
+    int parentid: @namespace ref,
+    unique int memberid: @namespacembr ref
+);
+
+@namespacembr = @declaration | @namespace;
+
+exprparents(
+    int expr_id: @expr ref,
+    int child_index: int ref,
+    int parent_id: @exprparent ref
+);
+
+expr_isload(unique int expr_id: @expr ref);
+
+@cast = @c_style_cast
+      | @const_cast
+      | @dynamic_cast
+      | @reinterpret_cast
+      | @static_cast
+      ;
+
+/*
+case @conversion.kind of
+  0 = @simple_conversion           // a numeric conversion, qualification conversion, or a reinterpret_cast
+| 1 = @bool_conversion             // conversion to 'bool'
+| 2 = @base_class_conversion       // a derived-to-base conversion
+| 3 = @derived_class_conversion    // a base-to-derived conversion
+| 4 = @pm_base_class_conversion    // a derived-to-base conversion of a pointer to member
+| 5 = @pm_derived_class_conversion // a base-to-derived conversion of a pointer to member
+| 6 = @glvalue_adjust              // an adjustment of the type of a glvalue
+| 7 = @prvalue_adjust              // an adjustment of the type of a prvalue
+;
+*/
+/**
+ * Describes the semantics represented by a cast expression. This is largely
+ * independent of the source syntax of the cast, so it is separate from the
+ * regular expression kind.
+ */
+conversionkinds(
+    unique int expr_id: @cast ref,
+    int kind: int ref
+);
+
+@conversion = @cast
+            | @array_to_pointer
+            | @parexpr
+            | @reference_to
+            | @ref_indirect
+            | @temp_init
+            | @c11_generic
+            ;
+
+/*
+case @funbindexpr.kind of
+  0 = @normal_call  // a normal call
+| 1 = @virtual_call // a virtual call
+| 2 = @adl_call     // a call whose target is only found by ADL
+;
+*/
+iscall(
+    unique int caller: @funbindexpr ref,
+    int kind: int ref
+);
+
+numtemplatearguments(
+    unique int expr_id: @expr ref,
+    int num: int ref
+);
+
+specialnamequalifyingelements(
+    unique int id: @specialnamequalifyingelement,
+    unique string name: string ref
+);
+
+@namequalifiableelement = @expr | @namequalifier;
+@namequalifyingelement = @namespace
+                       | @specialnamequalifyingelement
+                       | @usertype;
+
+namequalifiers(
+    unique int id: @namequalifier,
+    unique int qualifiableelement: @namequalifiableelement ref,
+    int qualifyingelement: @namequalifyingelement ref,
+    int location: @location_default ref
+);
+
+varbind(
+    int expr: @varbindexpr ref,
+    int var: @accessible ref
+);
+
+funbind(
+    int expr: @funbindexpr ref,
+    int fun: @function ref
+);
+
+@any_new_expr = @new_expr
+              | @new_array_expr;
+
+@new_or_delete_expr = @any_new_expr
+                    | @delete_expr
+                    | @delete_array_expr;
+
+@prefix_crement_expr = @preincrexpr | @predecrexpr;
+
+@postfix_crement_expr = @postincrexpr | @postdecrexpr;
+
+@increment_expr = @preincrexpr | @postincrexpr;
+
+@decrement_expr = @predecrexpr | @postdecrexpr;
+
+@crement_expr = @increment_expr | @decrement_expr;
+
+@un_arith_op_expr = @arithnegexpr
+                  | @unaryplusexpr
+                  | @conjugation
+                  | @realpartexpr
+                  | @imagpartexpr
+                  | @crement_expr
+                  ;
+
+@un_bitwise_op_expr = @complementexpr;
+
+@un_log_op_expr = @notexpr;
+
+@un_op_expr = @address_of
+            | @indirect
+            | @un_arith_op_expr
+            | @un_bitwise_op_expr
+            | @builtinaddressof
+            | @vec_fill
+            | @un_log_op_expr
+            | @co_await
+            | @co_yield
+            ;
+
+@bin_log_op_expr = @andlogicalexpr | @orlogicalexpr;
+
+@cmp_op_expr = @eq_op_expr | @rel_op_expr;
+
+@eq_op_expr = @eqexpr | @neexpr;
+
+@rel_op_expr = @gtexpr
+             | @ltexpr
+             | @geexpr
+             | @leexpr
+             | @spaceshipexpr
+             ;
+
+@bin_bitwise_op_expr = @lshiftexpr
+                     | @rshiftexpr
+                     | @andexpr
+                     | @orexpr
+                     | @xorexpr
+                     ;
+
+@p_arith_op_expr = @paddexpr
+                 | @psubexpr
+                 | @pdiffexpr
+                 ;
+
+@bin_arith_op_expr = @addexpr
+                   | @subexpr
+                   | @mulexpr
+                   | @divexpr
+                   | @remexpr
+                   | @jmulexpr
+                   | @jdivexpr
+                   | @fjaddexpr
+                   | @jfaddexpr
+                   | @fjsubexpr
+                   | @jfsubexpr
+                   | @minexpr
+                   | @maxexpr
+                   | @p_arith_op_expr
+                   ;
+
+@bin_op_expr = @bin_arith_op_expr
+             | @bin_bitwise_op_expr
+             | @cmp_op_expr
+             | @bin_log_op_expr
+             ;
+
+@op_expr = @un_op_expr
+         | @bin_op_expr
+         | @assign_expr
+         | @conditionalexpr
+         ;
+
+@assign_arith_expr = @assignaddexpr
+                   | @assignsubexpr
+                   | @assignmulexpr
+                   | @assigndivexpr
+                   | @assignremexpr
+                   ;
+
+@assign_bitwise_expr = @assignandexpr
+                     | @assignorexpr
+                     | @assignxorexpr
+                     | @assignlshiftexpr
+                     | @assignrshiftexpr
+                     ;
+
+@assign_pointer_expr = @assignpaddexpr
+                     | @assignpsubexpr
+                     ;
+
+@assign_op_expr = @assign_arith_expr
+                | @assign_bitwise_expr
+                | @assign_pointer_expr
+                ;
+
+@assign_expr = @assignexpr | @assign_op_expr | @blockassignexpr
+
+/*
+  Binary encoding of the allocator form.
+
+  case @allocator.form of
+    0 = plain
+  | 1 = alignment
+  ;
+*/
+
+/**
+ * The allocator function associated with a `new` or `new[]` expression.
+ * The `form` column specified whether the allocation call contains an alignment
+ * argument.
+ */
+expr_allocator(
+    unique int expr: @any_new_expr ref,
+    int func: @function ref,
+    int form: int ref
+);
+
+/*
+  Binary encoding of the deallocator form.
+
+  case @deallocator.form of
+    0 = plain
+  | 1 = size
+  | 2 = alignment
+  | 4 = destroying_delete
+  ;
+*/
+
+/**
+ * The deallocator function associated with a `delete`, `delete[]`, `new`, or
+ * `new[]` expression. For a `new` or `new[]` expression, the deallocator is the
+ * one used to free memory if the initialization throws an exception.
+ * The `form` column specifies whether the deallocation call contains a size
+ * argument, and alignment argument, or both.
+ */
+expr_deallocator(
+    unique int expr: @new_or_delete_expr ref,
+    int func: @function ref,
+    int form: int ref
+);
+
+/**
+ * Holds if the `@conditionalexpr` is of the two operand form
+ * `guard ? : false`.
+ */
+expr_cond_two_operand(
+    unique int cond: @conditionalexpr ref
+);
+
+/**
+ * The guard of `@conditionalexpr` `guard ? true : false`
+ */
+expr_cond_guard(
+    unique int cond: @conditionalexpr ref,
+    int guard: @expr ref
+);
+
+/**
+ * The expression used when the guard of `@conditionalexpr`
+ * `guard ? true : false` holds. For the two operand form
+ * `guard ?: false` consider using `expr_cond_guard` instead.
+ */
+expr_cond_true(
+    unique int cond: @conditionalexpr ref,
+    int true: @expr ref
+);
+
+/**
+ * The expression used when the guard of `@conditionalexpr`
+ * `guard ? true : false` does not hold.
+ */
+expr_cond_false(
+    unique int cond: @conditionalexpr ref,
+    int false: @expr ref
+);
+
+/** A string representation of the value. */
+values(
+    unique int id: @value,
+    string str: string ref
+);
+
+/** The actual text in the source code for the value, if any. */
+valuetext(
+    unique int id: @value ref,
+    string text: string ref
+);
+
+valuebind(
+    int val: @value ref,
+    unique int expr: @expr ref
+);
+
+fieldoffsets(
+    unique int id: @variable ref,
+    int byteoffset: int ref,
+    int bitoffset: int ref
+);
+
+bitfield(
+    unique int id: @variable ref,
+    int bits: int ref,
+    int declared_bits: int ref
+);
+
+/* TODO
+memberprefix(
+    int member: @expr ref,
+    int prefix: @expr ref
+);
+*/
+
+/*
+   kind(1) = mbrcallexpr
+   kind(2) = mbrptrcallexpr
+   kind(3) = mbrptrmbrcallexpr
+   kind(4) = ptrmbrptrmbrcallexpr
+   kind(5) = mbrreadexpr // x.y
+   kind(6) = mbrptrreadexpr // p->y
+   kind(7) = mbrptrmbrreadexpr // x.*pm
+   kind(8) = mbrptrmbrptrreadexpr // x->*pm
+   kind(9) = staticmbrreadexpr // static x.y
+   kind(10) = staticmbrptrreadexpr // static p->y
+*/
+/* TODO
+memberaccess(
+    int member: @expr ref,
+    int kind: int ref
+);
+*/
+
+initialisers(
+    unique int init: @initialiser,
+    int var: @accessible ref,
+    unique int expr: @expr ref,
+    int location: @location_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
+| 391 = @nested_requirement
+| 392 = @compound_requirement
+| 393 = @concept_id
+;
+
+@var_args_expr = @vastartexpr
+               | @vaendexpr
+               | @vaargexpr
+               | @vacopyexpr
+               ;
+
+@builtin_op = @var_args_expr
+            | @noopexpr
+            | @offsetofexpr
+            | @intaddrexpr
+            | @hasassignexpr
+            | @hascopyexpr
+            | @hasnothrowassign
+            | @hasnothrowconstr
+            | @hasnothrowcopy
+            | @hastrivialassign
+            | @hastrivialconstr
+            | @hastrivialcopy
+            | @hastrivialdestructor
+            | @hasuserdestr
+            | @hasvirtualdestr
+            | @isabstractexpr
+            | @isbaseofexpr
+            | @isclassexpr
+            | @isconvtoexpr
+            | @isemptyexpr
+            | @isenumexpr
+            | @ispodexpr
+            | @ispolyexpr
+            | @isunionexpr
+            | @typescompexpr
+            | @builtinshufflevector
+            | @builtinconvertvector
+            | @builtinaddressof
+            | @istriviallyconstructibleexpr
+            | @isdestructibleexpr
+            | @isnothrowdestructibleexpr
+            | @istriviallydestructibleexpr
+            | @istriviallyassignableexpr
+            | @isnothrowassignableexpr
+            | @istrivialexpr
+            | @isstandardlayoutexpr
+            | @istriviallycopyableexpr
+            | @isliteraltypeexpr
+            | @hastrivialmoveconstructorexpr
+            | @hastrivialmoveassignexpr
+            | @hasnothrowmoveassignexpr
+            | @isconstructibleexpr
+            | @isnothrowconstructibleexpr
+            | @hasfinalizerexpr
+            | @isdelegateexpr
+            | @isinterfaceclassexpr
+            | @isrefarrayexpr
+            | @isrefclassexpr
+            | @issealedexpr
+            | @issimplevalueclassexpr
+            | @isvalueclassexpr
+            | @isfinalexpr
+            | @builtinchooseexpr
+            | @builtincomplex
+            | @isassignable
+            | @isaggregate
+            | @hasuniqueobjectrepresentations
+            | @builtinbitcast
+            | @builtinshuffle
+            | @issame
+            | @isfunction
+            | @islayoutcompatible
+            | @ispointerinterconvertiblebaseof
+            | @isarray
+            | @arrayrank
+            | @arrayextent
+            | @isarithmetic
+            | @iscompletetype
+            | @iscompound
+            | @isconst
+            | @isfloatingpoint
+            | @isfundamental
+            | @isintegral
+            | @islvaluereference
+            | @ismemberfunctionpointer
+            | @ismemberobjectpointer
+            | @ismemberpointer
+            | @isobject
+            | @ispointer
+            | @isreference
+            | @isrvaluereference
+            | @isscalar
+            | @issigned
+            | @isunsigned
+            | @isvoid
+            | @isvolatile
+            | @istriviallycopyassignable
+            | @isassignablenopreconditioncheck
+            | @referencebindstotemporary
+            | @issameas
+            | @builtinhasattribute
+            | @ispointerinterconvertiblewithclass
+            | @builtinispointerinterconvertiblewithclass
+            | @iscorrespondingmember
+            | @builtiniscorrespondingmember
+            | @isboundedarray
+            | @isunboundedarray
+            | @isreferenceable
+            | @isnothrowconvertible
+            | @referenceconstructsfromtemporary
+            | @referenceconvertsfromtemporary
+            | @isconvertible
+            | @isvalidwinrttype
+            | @iswinclass
+            | @iswininterface
+            | @istriviallyequalitycomparable
+            | @isscopedenum
+            | @istriviallyrelocatable
+            ;
+
+compound_requirement_is_noexcept(
+    int expr: @compound_requirement ref
+);
+
+new_allocated_type(
+    unique int expr: @new_expr ref,
+    int type_id: @type ref
+);
+
+new_array_allocated_type(
+    unique int expr: @new_array_expr ref,
+    int type_id: @type ref
+);
+
+/**
+ * The field being initialized by an initializer expression within an aggregate
+ * initializer for a class/struct/union. Position is used to sort repeated initializers.
+ */
+#keyset[aggregate, position]
+aggregate_field_init(
+    int aggregate: @aggregateliteral ref,
+    int initializer: @expr ref,
+    int field: @membervariable ref,
+    int position: int ref,
+    boolean is_designated: boolean ref
+);
+
+/**
+ * The index of the element being initialized by an initializer expression
+ * within an aggregate initializer for an array. Position is used to sort repeated initializers.
+ */
+#keyset[aggregate, position]
+aggregate_array_init(
+    int aggregate: @aggregateliteral ref,
+    int initializer: @expr ref,
+    int element_index: int ref,
+    int position: int ref,
+    boolean is_designated: boolean ref
+);
+
+@ctorinit = @ctordirectinit
+          | @ctorvirtualinit
+          | @ctorfieldinit
+          | @ctordelegatinginit;
+@dtordestruct = @dtordirectdestruct
+              | @dtorvirtualdestruct
+              | @dtorfielddestruct;
+
+
+condition_decl_bind(
+    unique int expr: @condition_decl ref,
+    unique int decl: @declaration ref
+);
+
+typeid_bind(
+    unique int expr: @type_id ref,
+    int type_id: @type ref
+);
+
+uuidof_bind(
+    unique int expr: @uuidof ref,
+    int type_id: @type ref
+);
+
+@sizeof_or_alignof = @runtime_sizeof | @runtime_alignof | @datasizeof | @sizeof_pack;
+
+sizeof_bind(
+    unique int expr: @sizeof_or_alignof ref,
+    int type_id: @type ref
+);
+
+code_block(
+    unique int block: @literal ref,
+    unique int routine: @function ref
+);
+
+lambdas(
+    unique int expr: @lambdaexpr ref,
+    string default_capture: string ref,
+    boolean has_explicit_return_type: boolean ref,
+    boolean has_explicit_parameter_list: boolean ref
+);
+
+lambda_capture(
+    unique int id: @lambdacapture,
+    int lambda: @lambdaexpr ref,
+    int index: int ref,
+    int field: @membervariable ref,
+    boolean captured_by_reference: boolean ref,
+    boolean is_implicit: boolean ref,
+    int location: @location_default ref
+);
+
+@funbindexpr = @routineexpr
+             | @new_expr
+             | @delete_expr
+             | @delete_array_expr
+             | @ctordirectinit
+             | @ctorvirtualinit
+             | @ctordelegatinginit
+             | @dtordirectdestruct
+             | @dtorvirtualdestruct;
+
+@varbindexpr = @varaccess | @ctorfieldinit | @dtorfielddestruct;
+@addressable = @function | @variable ;
+@accessible = @addressable | @enumconstant ;
+
+@access = @varaccess | @routineexpr ;
+
+fold(
+    int expr: @foldexpr ref,
+    string operator: string ref,
+    boolean is_left_fold: boolean ref
+);
+
+stmts(
+    unique int id: @stmt,
+    int kind: int ref,
+    int location: @location_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
+|  38 = @stmt_consteval_if
+|  39 = @stmt_not_consteval_if
+;
+
+type_vla(
+    int type_id: @type ref,
+    int decl: @stmt_vla_decl ref
+);
+
+variable_vla(
+    int var: @variable ref,
+    int decl: @stmt_vla_decl ref
+);
+
+type_is_vla(unique int type_id: @derivedtype ref)
+
+if_initialization(
+    unique int if_stmt: @stmt_if ref,
+    int init_id: @stmt ref
+);
+
+if_then(
+    unique int if_stmt: @stmt_if ref,
+    int then_id: @stmt ref
+);
+
+if_else(
+    unique int if_stmt: @stmt_if ref,
+    int else_id: @stmt ref
+);
+
+constexpr_if_initialization(
+    unique int constexpr_if_stmt: @stmt_constexpr_if ref,
+    int init_id: @stmt ref
+);
+
+constexpr_if_then(
+    unique int constexpr_if_stmt: @stmt_constexpr_if ref,
+    int then_id: @stmt ref
+);
+
+constexpr_if_else(
+    unique int constexpr_if_stmt: @stmt_constexpr_if ref,
+    int else_id: @stmt ref
+);
+
+@stmt_consteval_or_not_consteval_if = @stmt_consteval_if | @stmt_not_consteval_if;
+
+consteval_if_then(
+    unique int constexpr_if_stmt: @stmt_consteval_or_not_consteval_if ref,
+    int then_id: @stmt ref
+);
+
+consteval_if_else(
+    unique int constexpr_if_stmt: @stmt_consteval_or_not_consteval_if ref,
+    int else_id: @stmt ref
+);
+
+while_body(
+    unique int while_stmt: @stmt_while ref,
+    int body_id: @stmt ref
+);
+
+do_body(
+    unique int do_stmt: @stmt_end_test_while ref,
+    int body_id: @stmt ref
+);
+
+switch_initialization(
+    unique int switch_stmt: @stmt_switch ref,
+    int init_id: @stmt ref
+);
+
+#keyset[switch_stmt, index]
+switch_case(
+    int switch_stmt: @stmt_switch ref,
+    int index: int ref,
+    int case_id: @stmt_switch_case ref
+);
+
+switch_body(
+    unique int switch_stmt: @stmt_switch ref,
+    int body_id: @stmt ref
+);
+
+@stmt_for_or_range_based_for = @stmt_for
+                             | @stmt_range_based_for;
+
+for_initialization(
+    unique int for_stmt: @stmt_for_or_range_based_for ref,
+    int init_id: @stmt ref
+);
+
+for_condition(
+    unique int for_stmt: @stmt_for ref,
+    int condition_id: @expr ref
+);
+
+for_update(
+    unique int for_stmt: @stmt_for ref,
+    int update_id: @expr ref
+);
+
+for_body(
+    unique int for_stmt: @stmt_for ref,
+    int body_id: @stmt ref
+);
+
+@stmtparent = @stmt | @expr_stmt ;
+stmtparents(
+    unique int id: @stmt ref,
+    int index: int ref,
+    int parent: @stmtparent ref
+);
+
+ishandler(unique int block: @stmt_block ref);
+
+@cfgnode = @stmt | @expr | @function | @initialiser ;
+
+stmt_decl_bind(
+    int stmt: @stmt_decl ref,
+    int num: int ref,
+    int decl: @declaration ref
+);
+
+stmt_decl_entry_bind(
+    int stmt: @stmt_decl ref,
+    int num: int ref,
+    int decl_entry: @element ref
+);
+
+@parameterized_element = @function | @stmt_block | @requires_expr;
+
+blockscope(
+    unique int block: @stmt_block ref,
+    int enclosing: @parameterized_element ref
+);
+
+@jump = @stmt_goto | @stmt_break | @stmt_continue;
+
+@jumporlabel = @jump | @stmt_label | @literal;
+
+jumpinfo(
+    unique int id: @jumporlabel ref,
+    string str: string ref,
+    int target: @stmt ref
+);
+
+preprocdirects(
+    unique int id: @preprocdirect,
+    int kind: int ref,
+    int location: @location_default ref
+);
+case @preprocdirect.kind of
+   0 = @ppd_if
+|  1 = @ppd_ifdef
+|  2 = @ppd_ifndef
+|  3 = @ppd_elif
+|  4 = @ppd_else
+|  5 = @ppd_endif
+|  6 = @ppd_plain_include
+|  7 = @ppd_define
+|  8 = @ppd_undef
+|  9 = @ppd_line
+| 10 = @ppd_error
+| 11 = @ppd_pragma
+| 12 = @ppd_objc_import
+| 13 = @ppd_include_next
+| 14 = @ppd_ms_import
+| 15 = @ppd_elifdef
+| 16 = @ppd_elifndef
+| 18 = @ppd_warning
+;
+
+@ppd_include = @ppd_plain_include | @ppd_objc_import | @ppd_include_next | @ppd_ms_import;
+
+@ppd_branch = @ppd_if | @ppd_ifdef | @ppd_ifndef | @ppd_elif | @ppd_elifdef | @ppd_elifndef;
+
+preprocpair(
+    int begin : @ppd_branch ref,
+    int elseelifend : @preprocdirect ref
+);
+
+preproctrue(int branch : @ppd_branch ref);
+preprocfalse(int branch : @ppd_branch ref);
+
+preproctext(
+    unique int id: @preprocdirect ref,
+    string head: string ref,
+    string body: string ref
+);
+
+includes(
+    unique int id: @ppd_include ref,
+    int included: @file ref
+);
+
+link_targets(
+    int id: @link_target,
+    int binary: @file ref
+);
+
+link_parent(
+    int element : @element ref,
+    int link_target : @link_target ref
+);
+
+/* XML Files */
+
+xmlEncoding(unique int id: @file ref, string encoding: string ref);
+
+xmlDTDs(
+    unique int id: @xmldtd,
+    string root: string ref,
+    string publicId: string ref,
+    string systemId: string ref,
+    int fileid: @file ref
+);
+
+xmlElements(
+    unique int id: @xmlelement,
+    string name: string ref,
+    int parentid: @xmlparent ref,
+    int idx: int ref,
+    int fileid: @file ref
+);
+
+xmlAttrs(
+    unique int id: @xmlattribute,
+    int elementid: @xmlelement ref,
+    string name: string ref,
+    string value: string ref,
+    int idx: int ref,
+    int fileid: @file ref
+);
+
+xmlNs(
+    int id: @xmlnamespace,
+    string prefixName: string ref,
+    string URI: string ref,
+    int fileid: @file ref
+);
+
+xmlHasNs(
+    int elementId: @xmlnamespaceable ref,
+    int nsId: @xmlnamespace ref,
+    int fileid: @file ref
+);
+
+xmlComments(
+    unique int id: @xmlcomment,
+    string text: string ref,
+    int parentid: @xmlparent ref,
+    int fileid: @file ref
+);
+
+xmlChars(
+    unique int id: @xmlcharacters,
+    string text: string ref,
+    int parentid: @xmlparent ref,
+    int idx: int ref,
+    int isCDATA: int ref,
+    int fileid: @file ref
+);
+
+@xmlparent = @file | @xmlelement;
+@xmlnamespaceable = @xmlelement | @xmlattribute;
+
+xmllocations(
+    int xmlElement: @xmllocatable ref,
+    int location: @location_default ref
+);
+
+@xmllocatable = @xmlcharacters
+              | @xmlelement
+              | @xmlcomment
+              | @xmlattribute
+              | @xmldtd
+              | @file
+              | @xmlnamespace;
diff --git a/cpp/ql/lib/upgrades/3c45f8b9e71ec723bf50c40581e1f18f4f25e290/semmlecode.cpp.dbscheme b/cpp/ql/lib/upgrades/3c45f8b9e71ec723bf50c40581e1f18f4f25e290/semmlecode.cpp.dbscheme
new file mode 100644
index 000000000000..a8c2176e9a5c
--- /dev/null
+++ b/cpp/ql/lib/upgrades/3c45f8b9e71ec723bf50c40581e1f18f4f25e290/semmlecode.cpp.dbscheme
@@ -0,0 +1,2494 @@
+
+/**
+ * An invocation of the compiler. Note that more than one file may be
+ * compiled per invocation. For example, this command compiles three
+ * source files:
+ *
+ *   gcc -c f1.c f2.c f3.c
+ *
+ * The `id` simply identifies the invocation, while `cwd` is the working
+ * directory from which the compiler was invoked.
+ */
+compilations(
+    /**
+     * An invocation of the compiler. Note that more than one file may
+     * be compiled per invocation. For example, this command compiles
+     * three source files:
+     *
+     *   gcc -c f1.c f2.c f3.c
+     */
+    unique int id : @compilation,
+    string cwd : string ref
+);
+
+/**
+ * The arguments that were passed to the extractor for a compiler
+ * invocation. If `id` is for the compiler invocation
+ *
+ *   gcc -c f1.c f2.c f3.c
+ *
+ * then typically there will be rows for
+ *
+ * num | arg
+ * --- | ---
+ * 0   | *path to extractor*
+ * 1   | `--mimic`
+ * 2   | `/usr/bin/gcc`
+ * 3   | `-c`
+ * 4   | f1.c
+ * 5   | f2.c
+ * 6   | f3.c
+ */
+#keyset[id, num]
+compilation_args(
+    int id : @compilation ref,
+    int num : int ref,
+    string arg : string ref
+);
+
+/**
+ * Optionally, record the build mode for each compilation.
+ */
+compilation_build_mode(
+    unique int id : @compilation ref,
+    int mode : int ref
+);
+
+/*
+case @compilation_build_mode.mode of
+  0 = @build_mode_none
+| 1 = @build_mode_manual
+| 2 = @build_mode_auto
+;
+*/
+
+/**
+ * The source files that are compiled by a compiler invocation.
+ * If `id` is for the compiler invocation
+ *
+ *   gcc -c f1.c f2.c f3.c
+ *
+ * then there will be rows for
+ *
+ * num | arg
+ * --- | ---
+ * 0   | f1.c
+ * 1   | f2.c
+ * 2   | f3.c
+ *
+ * Note that even if those files `#include` headers, those headers
+ * do not appear as rows.
+ */
+#keyset[id, num]
+compilation_compiling_files(
+    int id : @compilation ref,
+    int num : int ref,
+    int file : @file ref
+);
+
+/**
+ * The time taken by the extractor for a compiler invocation.
+ *
+ * For each file `num`, there will be rows for
+ *
+ * kind | seconds
+ * ---- | ---
+ * 1    | CPU seconds used by the extractor frontend
+ * 2    | Elapsed seconds during the extractor frontend
+ * 3    | CPU seconds used by the extractor backend
+ * 4    | Elapsed seconds during the extractor backend
+ */
+#keyset[id, num, kind]
+compilation_time(
+    int id : @compilation ref,
+    int num : int ref,
+    /* kind:
+       1 = frontend_cpu_seconds
+       2 = frontend_elapsed_seconds
+       3 = extractor_cpu_seconds
+       4 = extractor_elapsed_seconds
+    */
+    int kind : int ref,
+    float seconds : float ref
+);
+
+/**
+ * An error or warning generated by the extractor.
+ * The diagnostic message `diagnostic` was generated during compiler
+ * invocation `compilation`, and is the `file_number_diagnostic_number`th
+ * message generated while extracting the `file_number`th file of that
+ * invocation.
+ */
+#keyset[compilation, file_number, file_number_diagnostic_number]
+diagnostic_for(
+    int diagnostic : @diagnostic ref,
+    int compilation : @compilation ref,
+    int file_number : int ref,
+    int file_number_diagnostic_number : int ref
+);
+
+/**
+ * If extraction was successful, then `cpu_seconds` and
+ * `elapsed_seconds` are the CPU time and elapsed time (respectively)
+ * that extraction took for compiler invocation `id`.
+ */
+compilation_finished(
+    unique int id : @compilation ref,
+    float cpu_seconds : float ref,
+    float elapsed_seconds : float ref
+);
+
+
+/**
+ * External data, 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
+);
+
+/*
+case @fun_requires.kind of
+  1 = @template_attached
+| 2 = @function_attached
+;
+*/
+
+fun_requires(
+    int id: @fun_decl ref,
+    int kind: int ref,
+    int constraint: @expr ref
+);
+
+param_decl_bind(
+    unique int id: @var_decl ref,
+    int index: int ref,
+    int fun_decl: @fun_decl ref
+);
+
+#keyset[id, type_id]
+var_decls(
+    int id: @var_decl,
+    int variable: @variable ref,
+    int type_id: @type ref,
+    string name: string ref,
+    int location: @location_default ref
+);
+var_def(unique int id: @var_decl ref);
+var_specialized(int id: @var_decl ref);
+var_decl_specifiers(
+    int id: @var_decl ref,
+    string name: string ref
+)
+is_structured_binding(unique int id: @variable ref);
+var_requires(
+    int id: @var_decl ref,
+    int constraint: @expr ref
+);
+
+type_decls(
+    unique int id: @type_decl,
+    int type_id: @type ref,
+    int location: @location_default ref
+);
+type_def(unique int id: @type_decl ref);
+type_decl_top(
+    unique int type_decl: @type_decl ref
+);
+type_requires(
+    int id: @type_decl ref,
+    int constraint: @expr ref
+);
+
+namespace_decls(
+    unique int id: @namespace_decl,
+    int namespace_id: @namespace ref,
+    int location: @location_default ref,
+    int bodylocation: @location_default ref
+);
+
+case @using.kind of
+  1 = @using_declaration
+| 2 = @using_directive
+| 3 = @using_enum_declaration
+;
+
+usings(
+    unique int id: @using,
+    int element_id: @element ref,
+    int location: @location_default ref,
+    int kind: int ref
+);
+
+/** The element which contains the `using` declaration. */
+using_container(
+    int parent: @element ref,
+    int child: @using ref
+);
+
+static_asserts(
+    unique int id: @static_assert,
+    int condition : @expr ref,
+    string message : string ref,
+    int location: @location_default ref,
+    int enclosing : @element ref
+);
+
+// each function has an ordered list of parameters
+#keyset[id, type_id]
+#keyset[function, index, type_id]
+params(
+    int id: @parameter,
+    int function: @parameterized_element ref,
+    int index: int ref,
+    int type_id: @type ref
+);
+
+overrides(
+    int new: @function ref,
+    int old: @function ref
+);
+
+#keyset[id, type_id]
+membervariables(
+    int id: @membervariable,
+    int type_id: @type ref,
+    string name: string ref
+);
+
+#keyset[id, type_id]
+globalvariables(
+    int id: @globalvariable,
+    int type_id: @type ref,
+    string name: string ref
+);
+
+#keyset[id, type_id]
+localvariables(
+    int id: @localvariable,
+    int type_id: @type ref,
+    string name: string ref
+);
+
+autoderivation(
+    unique int var: @variable ref,
+    int derivation_type: @type ref
+);
+
+orphaned_variables(
+    int var: @localvariable ref,
+    int function: @function ref
+)
+
+enumconstants(
+    unique int id: @enumconstant,
+    int parent: @usertype ref,
+    int index: int ref,
+    int type_id: @type ref,
+    string name: string ref,
+    int location: @location_default ref
+);
+
+@variable = @localscopevariable | @globalvariable | @membervariable;
+
+@localscopevariable = @localvariable | @parameter;
+
+/**
+ * Built-in types are the fundamental types, e.g., integral, floating, and void.
+ */
+case @builtintype.kind of
+   1 = @errortype
+|  2 = @unknowntype
+|  3 = @void
+|  4 = @boolean
+|  5 = @char
+|  6 = @unsigned_char
+|  7 = @signed_char
+|  8 = @short
+|  9 = @unsigned_short
+| 10 = @signed_short
+| 11 = @int
+| 12 = @unsigned_int
+| 13 = @signed_int
+| 14 = @long
+| 15 = @unsigned_long
+| 16 = @signed_long
+| 17 = @long_long
+| 18 = @unsigned_long_long
+| 19 = @signed_long_long
+// ... 20 Microsoft-specific __int8
+// ... 21 Microsoft-specific __int16
+// ... 22 Microsoft-specific __int32
+// ... 23 Microsoft-specific __int64
+| 24 = @float
+| 25 = @double
+| 26 = @long_double
+| 27 = @complex_float         // C99-specific _Complex float
+| 28 = @complex_double        // C99-specific _Complex double
+| 29 = @complex_long_double   // C99-specific _Complex long double
+| 30 = @imaginary_float       // C99-specific _Imaginary float
+| 31 = @imaginary_double      // C99-specific _Imaginary double
+| 32 = @imaginary_long_double // C99-specific _Imaginary long double
+| 33 = @wchar_t               // Microsoft-specific
+| 34 = @decltype_nullptr      // C++11
+| 35 = @int128                // __int128
+| 36 = @unsigned_int128       // unsigned __int128
+| 37 = @signed_int128         // signed __int128
+| 38 = @float128              // __float128
+| 39 = @complex_float128      // _Complex __float128
+| 40 = @decimal32             // _Decimal32
+| 41 = @decimal64             // _Decimal64
+| 42 = @decimal128            // _Decimal128
+| 43 = @char16_t
+| 44 = @char32_t
+| 45 = @std_float32           // _Float32
+| 46 = @float32x              // _Float32x
+| 47 = @std_float64           // _Float64
+| 48 = @float64x              // _Float64x
+| 49 = @std_float128          // _Float128
+// ... 50 _Float128x
+| 51 = @char8_t
+| 52 = @float16               // _Float16
+| 53 = @complex_float16       // _Complex _Float16
+| 54 = @fp16                  // __fp16
+| 55 = @std_bfloat16          // __bf16
+| 56 = @std_float16           // std::float16_t
+| 57 = @complex_std_float32   // _Complex _Float32
+| 58 = @complex_float32x      // _Complex _Float32x
+| 59 = @complex_std_float64   // _Complex _Float64
+| 60 = @complex_float64x      // _Complex _Float64x
+| 61 = @complex_std_float128  // _Complex _Float128
+| 62 = @mfp8                  // __mfp8
+;
+
+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 or C23 `typeof`/`typeof_unqual`
+ * operator taking an expression as its argument.  For example:
+ * ```
+ * int a;
+ * decltype(1+a) b;
+ * typeof(1+a) c;
+ * ```
+ * Here `expr` is `1+a`.
+ *
+ * Sometimes an additional pair of parentheses around the expression
+ * changes the semantics of the decltype, e.g.
+ * ```
+ * struct A { double x; };
+ * const A* a = new A();
+ * decltype( a->x ); // type is double
+ * decltype((a->x)); // type is const double&
+ * ```
+ * (Please consult the C++11 standard for more details).
+ * `parentheses_would_change_meaning` is `true` iff that is the case.
+ */
+
+/*
+case @decltype.kind of
+|  0 = @decltype
+|  1 = @typeof // The frontend does not differentiate between typeof and typeof_unqual
+;
+*/
+
+#keyset[id, expr]
+decltypes(
+    int id: @decltype,
+    int expr: @expr ref,
+    int kind: int ref,
+    int base_type: @type ref,
+    boolean parentheses_would_change_meaning: boolean ref
+);
+
+/*
+case @type_operator.kind of
+|  0 = @typeof // The frontend does not differentiate between typeof and typeof_unqual
+|  1 = @underlying_type
+|  2 = @bases
+|  3 = @direct_bases
+|  4 = @add_lvalue_reference
+|  5 = @add_pointer
+|  6 = @add_rvalue_reference
+|  7 = @decay
+|  8 = @make_signed
+|  9 = @make_unsigned
+| 10 = @remove_all_extents
+| 11 = @remove_const
+| 12 = @remove_cv
+| 13 = @remove_cvref
+| 14 = @remove_extent
+| 15 = @remove_pointer
+| 16 = @remove_reference_t
+| 17 = @remove_restrict
+| 18 = @remove_volatile
+| 19 = @remove_reference
+;
+*/
+
+type_operators(
+    unique int id: @type_operator,
+    int arg_type: @type ref,
+    int kind: int ref,
+    int base_type: @type ref
+)
+
+/*
+case @usertype.kind of
+|  0 = @unknown_usertype
+|  1 = @struct
+|  2 = @class
+|  3 = @union
+|  4 = @enum
+// ... 5 = @typedef deprecated        // classic C: typedef typedef type name
+// ... 6 = @template deprecated
+|  7 = @template_parameter
+|  8 = @template_template_parameter
+|  9 = @proxy_class                   // a proxy class associated with a template parameter
+// ... 10 objc_class deprecated
+// ... 11 objc_protocol deprecated
+// ... 12 objc_category deprecated
+| 13 = @scoped_enum
+// ... 14 = @using_alias deprecated   // a using name = type style typedef
+| 15 = @template_struct
+| 16 = @template_class
+| 17 = @template_union
+| 18 = @alias
+;
+*/
+
+usertypes(
+    unique int id: @usertype,
+    string name: string ref,
+    int kind: int ref
+);
+
+usertypesize(
+    unique int id: @usertype ref,
+    int size: int ref,
+    int alignment: int ref
+);
+
+usertype_final(unique int id: @usertype ref);
+
+usertype_uuid(
+    unique int id: @usertype ref,
+    string uuid: string ref
+);
+
+/*
+case @usertype.alias_kind of
+| 0 = @typedef
+| 1 = @alias
+*/
+
+usertype_alias_kind(
+    int id: @usertype ref,
+    int alias_kind: int ref
+)
+
+nontype_template_parameters(
+    int id: @expr ref
+);
+
+type_template_type_constraint(
+    int id: @usertype ref,
+    int constraint: @expr ref
+);
+
+mangled_name(
+    unique int id: @declaration ref,
+    int mangled_name : @mangledname,
+    boolean is_complete: boolean ref
+);
+
+is_pod_class(unique int id: @usertype ref);
+is_standard_layout_class(unique int id: @usertype ref);
+
+is_complete(unique int id: @usertype ref);
+
+is_class_template(unique int id: @usertype ref);
+class_instantiation(
+    int to: @usertype ref,
+    int from: @usertype ref
+);
+class_template_argument(
+    int type_id: @usertype ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+class_template_argument_value(
+    int type_id: @usertype ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+
+@user_or_decltype = @usertype | @decltype;
+
+is_proxy_class_for(
+    unique int id: @usertype ref,
+    int templ_param_id: @user_or_decltype ref
+);
+
+type_mentions(
+    unique int id: @type_mention,
+    int type_id: @type ref,
+    int location: @location ref,
+    // a_symbol_reference_kind from the frontend.
+    int kind: int ref
+);
+
+is_function_template(unique int id: @function ref);
+function_instantiation(
+    unique int to: @function ref,
+    int from: @function ref
+);
+function_template_argument(
+    int function_id: @function ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+function_template_argument_value(
+    int function_id: @function ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+
+is_variable_template(unique int id: @variable ref);
+variable_instantiation(
+    unique int to: @variable ref,
+    int from: @variable ref
+);
+variable_template_argument(
+    int variable_id: @variable ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+variable_template_argument_value(
+    int variable_id: @variable ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+
+template_template_instantiation(
+    int to: @usertype ref,
+    int from: @usertype ref
+);
+template_template_argument(
+    int type_id: @usertype ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+template_template_argument_value(
+    int type_id: @usertype ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+
+@concept = @concept_template | @concept_id;
+
+concept_templates(
+    unique int concept_id: @concept_template,
+    string name: string ref,
+    int location: @location_default ref
+);
+concept_instantiation(
+    unique int to: @concept_id ref,
+    int from: @concept_template ref
+);
+is_type_constraint(int concept_id: @concept_id ref);
+concept_template_argument(
+    int concept_id: @concept ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+concept_template_argument_value(
+    int concept_id: @concept ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+
+routinetypes(
+    unique int id: @routinetype,
+    int return_type: @type ref
+);
+
+routinetypeargs(
+    int routine: @routinetype ref,
+    int index: int ref,
+    int type_id: @type ref
+);
+
+ptrtomembers(
+    unique int id: @ptrtomember,
+    int type_id: @type ref,
+    int class_id: @type ref
+);
+
+/*
+ specifiers for types, functions, and variables
+
+    "public",
+    "protected",
+    "private",
+
+    "const",
+    "volatile",
+    "static",
+
+    "pure",
+    "virtual",
+    "sealed", // Microsoft
+    "__interface", // Microsoft
+    "inline",
+    "explicit",
+
+    "near", // near far extension
+    "far", // near far extension
+    "__ptr32", // Microsoft
+    "__ptr64", // Microsoft
+    "__sptr", // Microsoft
+    "__uptr", // Microsoft
+    "dllimport", // Microsoft
+    "dllexport", // Microsoft
+    "thread", // Microsoft
+    "naked", // Microsoft
+    "microsoft_inline", // Microsoft
+    "forceinline", // Microsoft
+    "selectany", // Microsoft
+    "nothrow", // Microsoft
+    "novtable", // Microsoft
+    "noreturn", // Microsoft
+    "noinline", // Microsoft
+    "noalias", // Microsoft
+    "restrict", // Microsoft
+*/
+
+specifiers(
+    unique int id: @specifier,
+    unique string str: string ref
+);
+
+typespecifiers(
+    int type_id: @type ref,
+    int spec_id: @specifier ref
+);
+
+funspecifiers(
+    int func_id: @function ref,
+    int spec_id: @specifier ref
+);
+
+varspecifiers(
+    int var_id: @accessible ref,
+    int spec_id: @specifier ref
+);
+
+explicit_specifier_exprs(
+    unique int func_id: @function ref,
+    int constant: @expr ref
+)
+
+attributes(
+    unique int id: @attribute,
+    int kind: int ref,
+    string name: string ref,
+    string name_space: string ref,
+    int location: @location_default ref
+);
+
+case @attribute.kind of
+  0 = @gnuattribute
+| 1 = @stdattribute
+| 2 = @declspec
+| 3 = @msattribute
+| 4 = @alignas
+// ... 5 @objc_propertyattribute deprecated
+;
+
+attribute_args(
+    unique int id: @attribute_arg,
+    int kind: int ref,
+    int attribute: @attribute ref,
+    int index: int ref,
+    int location: @location_default ref
+);
+
+case @attribute_arg.kind of
+  0 = @attribute_arg_empty
+| 1 = @attribute_arg_token
+| 2 = @attribute_arg_constant
+| 3 = @attribute_arg_type
+| 4 = @attribute_arg_constant_expr
+| 5 = @attribute_arg_expr
+;
+
+attribute_arg_value(
+    unique int arg: @attribute_arg ref,
+    string value: string ref
+);
+attribute_arg_type(
+    unique int arg: @attribute_arg ref,
+    int type_id: @type ref
+);
+attribute_arg_constant(
+    unique int arg: @attribute_arg ref,
+    int constant: @expr ref
+)
+attribute_arg_expr(
+    unique int arg: @attribute_arg ref,
+    int expr: @expr ref
+)
+attribute_arg_name(
+    unique int arg: @attribute_arg ref,
+    string name: string ref
+);
+
+typeattributes(
+    int type_id: @type ref,
+    int spec_id: @attribute ref
+);
+
+funcattributes(
+    int func_id: @function ref,
+    int spec_id: @attribute ref
+);
+
+varattributes(
+    int var_id: @accessible ref,
+    int spec_id: @attribute ref
+);
+
+stmtattributes(
+    int stmt_id: @stmt ref,
+    int spec_id: @attribute ref
+);
+
+@type = @builtintype
+      | @derivedtype
+      | @usertype
+      | @routinetype
+      | @ptrtomember
+      | @decltype
+      | @type_operator;
+
+unspecifiedtype(
+    unique int type_id: @type ref,
+    int unspecified_type_id: @type ref
+);
+
+member(
+    int parent: @type ref,
+    int index: int ref,
+    int child: @member ref
+);
+
+@enclosingfunction_child = @usertype | @variable | @namespace
+
+enclosingfunction(
+    unique int child: @enclosingfunction_child ref,
+    int parent: @function ref
+);
+
+derivations(
+    unique int derivation: @derivation,
+    int sub: @type ref,
+    int index: int ref,
+    int super: @type ref,
+    int location: @location_default ref
+);
+
+derspecifiers(
+    int der_id: @derivation ref,
+    int spec_id: @specifier ref
+);
+
+/**
+ * Contains the byte offset of the base class subobject within the derived
+ * class. Only holds for non-virtual base classes, but see table
+ * `virtual_base_offsets` for offsets of virtual base class subobjects.
+ */
+direct_base_offsets(
+    unique int der_id: @derivation ref,
+    int offset: int ref
+);
+
+/**
+ * Contains the byte offset of the virtual base class subobject for class
+ * `super` within a most-derived object of class `sub`. `super` can be either a
+ * direct or indirect base class.
+ */
+#keyset[sub, super]
+virtual_base_offsets(
+    int sub: @usertype ref,
+    int super: @usertype ref,
+    int offset: int ref
+);
+
+frienddecls(
+    unique int id: @frienddecl,
+    int type_id: @type ref,
+    int decl_id: @declaration ref,
+    int location: @location_default ref
+);
+
+@declaredtype = @usertype ;
+
+@declaration = @function
+             | @declaredtype
+             | @variable
+             | @enumconstant
+             | @frienddecl
+             | @concept_template;
+
+@member = @membervariable
+        | @function
+        | @declaredtype
+        | @enumconstant;
+
+@locatable = @diagnostic
+           | @declaration
+           | @ppd_include
+           | @ppd_define
+           | @macroinvocation
+           /*| @funcall*/
+           | @xmllocatable
+           | @attribute
+           | @attribute_arg;
+
+@namedscope = @namespace | @usertype;
+
+@element = @locatable
+         | @file
+         | @folder
+         | @specifier
+         | @type
+         | @expr
+         | @namespace
+         | @initialiser
+         | @stmt
+         | @derivation
+         | @comment
+         | @preprocdirect
+         | @fun_decl
+         | @var_decl
+         | @type_decl
+         | @namespace_decl
+         | @using
+         | @namequalifier
+         | @specialnamequalifyingelement
+         | @static_assert
+         | @type_mention
+         | @lambdacapture;
+
+@exprparent = @element;
+
+comments(
+    unique int id: @comment,
+    string contents: string ref,
+    int location: @location_default ref
+);
+
+commentbinding(
+    int id: @comment ref,
+    int element: @element ref
+);
+
+exprconv(
+    int converted: @expr ref,
+    unique int conversion: @expr ref
+);
+
+compgenerated(unique int id: @element ref);
+
+/**
+ * `destructor_call` destructs the `i`'th entity that should be
+ * destructed following `element`. Note that entities should be
+ * destructed in reverse construction order, so for a given `element`
+ * these should be called from highest to lowest `i`.
+ */
+#keyset[element, destructor_call]
+#keyset[element, i]
+synthetic_destructor_call(
+    int element: @element ref,
+    int i: int ref,
+    int destructor_call: @routineexpr ref
+);
+
+namespaces(
+    unique int id: @namespace,
+    string name: string ref
+);
+
+namespace_inline(
+    unique int id: @namespace ref
+);
+
+namespacembrs(
+    int parentid: @namespace ref,
+    unique int memberid: @namespacembr ref
+);
+
+@namespacembr = @declaration | @namespace;
+
+exprparents(
+    int expr_id: @expr ref,
+    int child_index: int ref,
+    int parent_id: @exprparent ref
+);
+
+expr_isload(unique int expr_id: @expr ref);
+
+@cast = @c_style_cast
+      | @const_cast
+      | @dynamic_cast
+      | @reinterpret_cast
+      | @static_cast
+      ;
+
+/*
+case @conversion.kind of
+  0 = @simple_conversion           // a numeric conversion, qualification conversion, or a reinterpret_cast
+| 1 = @bool_conversion             // conversion to 'bool'
+| 2 = @base_class_conversion       // a derived-to-base conversion
+| 3 = @derived_class_conversion    // a base-to-derived conversion
+| 4 = @pm_base_class_conversion    // a derived-to-base conversion of a pointer to member
+| 5 = @pm_derived_class_conversion // a base-to-derived conversion of a pointer to member
+| 6 = @glvalue_adjust              // an adjustment of the type of a glvalue
+| 7 = @prvalue_adjust              // an adjustment of the type of a prvalue
+;
+*/
+/**
+ * Describes the semantics represented by a cast expression. This is largely
+ * independent of the source syntax of the cast, so it is separate from the
+ * regular expression kind.
+ */
+conversionkinds(
+    unique int expr_id: @cast ref,
+    int kind: int ref
+);
+
+@conversion = @cast
+            | @array_to_pointer
+            | @parexpr
+            | @reference_to
+            | @ref_indirect
+            | @temp_init
+            | @c11_generic
+            ;
+
+/*
+case @funbindexpr.kind of
+  0 = @normal_call  // a normal call
+| 1 = @virtual_call // a virtual call
+| 2 = @adl_call     // a call whose target is only found by ADL
+;
+*/
+iscall(
+    unique int caller: @funbindexpr ref,
+    int kind: int ref
+);
+
+numtemplatearguments(
+    unique int expr_id: @expr ref,
+    int num: int ref
+);
+
+specialnamequalifyingelements(
+    unique int id: @specialnamequalifyingelement,
+    unique string name: string ref
+);
+
+@namequalifiableelement = @expr | @namequalifier;
+@namequalifyingelement = @namespace
+                       | @specialnamequalifyingelement
+                       | @usertype;
+
+namequalifiers(
+    unique int id: @namequalifier,
+    unique int qualifiableelement: @namequalifiableelement ref,
+    int qualifyingelement: @namequalifyingelement ref,
+    int location: @location_default ref
+);
+
+varbind(
+    int expr: @varbindexpr ref,
+    int var: @accessible ref
+);
+
+funbind(
+    int expr: @funbindexpr ref,
+    int fun: @function ref
+);
+
+@any_new_expr = @new_expr
+              | @new_array_expr;
+
+@new_or_delete_expr = @any_new_expr
+                    | @delete_expr
+                    | @delete_array_expr;
+
+@prefix_crement_expr = @preincrexpr | @predecrexpr;
+
+@postfix_crement_expr = @postincrexpr | @postdecrexpr;
+
+@increment_expr = @preincrexpr | @postincrexpr;
+
+@decrement_expr = @predecrexpr | @postdecrexpr;
+
+@crement_expr = @increment_expr | @decrement_expr;
+
+@un_arith_op_expr = @arithnegexpr
+                  | @unaryplusexpr
+                  | @conjugation
+                  | @realpartexpr
+                  | @imagpartexpr
+                  | @crement_expr
+                  ;
+
+@un_bitwise_op_expr = @complementexpr;
+
+@un_log_op_expr = @notexpr;
+
+@un_op_expr = @address_of
+            | @indirect
+            | @un_arith_op_expr
+            | @un_bitwise_op_expr
+            | @builtinaddressof
+            | @vec_fill
+            | @un_log_op_expr
+            | @co_await
+            | @co_yield
+            ;
+
+@bin_log_op_expr = @andlogicalexpr | @orlogicalexpr;
+
+@cmp_op_expr = @eq_op_expr | @rel_op_expr;
+
+@eq_op_expr = @eqexpr | @neexpr;
+
+@rel_op_expr = @gtexpr
+             | @ltexpr
+             | @geexpr
+             | @leexpr
+             | @spaceshipexpr
+             ;
+
+@bin_bitwise_op_expr = @lshiftexpr
+                     | @rshiftexpr
+                     | @andexpr
+                     | @orexpr
+                     | @xorexpr
+                     ;
+
+@p_arith_op_expr = @paddexpr
+                 | @psubexpr
+                 | @pdiffexpr
+                 ;
+
+@bin_arith_op_expr = @addexpr
+                   | @subexpr
+                   | @mulexpr
+                   | @divexpr
+                   | @remexpr
+                   | @jmulexpr
+                   | @jdivexpr
+                   | @fjaddexpr
+                   | @jfaddexpr
+                   | @fjsubexpr
+                   | @jfsubexpr
+                   | @minexpr
+                   | @maxexpr
+                   | @p_arith_op_expr
+                   ;
+
+@bin_op_expr = @bin_arith_op_expr
+             | @bin_bitwise_op_expr
+             | @cmp_op_expr
+             | @bin_log_op_expr
+             ;
+
+@op_expr = @un_op_expr
+         | @bin_op_expr
+         | @assign_expr
+         | @conditionalexpr
+         ;
+
+@assign_arith_expr = @assignaddexpr
+                   | @assignsubexpr
+                   | @assignmulexpr
+                   | @assigndivexpr
+                   | @assignremexpr
+                   ;
+
+@assign_bitwise_expr = @assignandexpr
+                     | @assignorexpr
+                     | @assignxorexpr
+                     | @assignlshiftexpr
+                     | @assignrshiftexpr
+                     ;
+
+@assign_pointer_expr = @assignpaddexpr
+                     | @assignpsubexpr
+                     ;
+
+@assign_op_expr = @assign_arith_expr
+                | @assign_bitwise_expr
+                | @assign_pointer_expr
+                ;
+
+@assign_expr = @assignexpr | @assign_op_expr | @blockassignexpr
+
+/*
+  Binary encoding of the allocator form.
+
+  case @allocator.form of
+    0 = plain
+  | 1 = alignment
+  ;
+*/
+
+/**
+ * The allocator function associated with a `new` or `new[]` expression.
+ * The `form` column specified whether the allocation call contains an alignment
+ * argument.
+ */
+expr_allocator(
+    unique int expr: @any_new_expr ref,
+    int func: @function ref,
+    int form: int ref
+);
+
+/*
+  Binary encoding of the deallocator form.
+
+  case @deallocator.form of
+    0 = plain
+  | 1 = size
+  | 2 = alignment
+  | 4 = destroying_delete
+  ;
+*/
+
+/**
+ * The deallocator function associated with a `delete`, `delete[]`, `new`, or
+ * `new[]` expression. For a `new` or `new[]` expression, the deallocator is the
+ * one used to free memory if the initialization throws an exception.
+ * The `form` column specifies whether the deallocation call contains a size
+ * argument, and alignment argument, or both.
+ */
+expr_deallocator(
+    unique int expr: @new_or_delete_expr ref,
+    int func: @function ref,
+    int form: int ref
+);
+
+/**
+ * Holds if the `@conditionalexpr` is of the two operand form
+ * `guard ? : false`.
+ */
+expr_cond_two_operand(
+    unique int cond: @conditionalexpr ref
+);
+
+/**
+ * The guard of `@conditionalexpr` `guard ? true : false`
+ */
+expr_cond_guard(
+    unique int cond: @conditionalexpr ref,
+    int guard: @expr ref
+);
+
+/**
+ * The expression used when the guard of `@conditionalexpr`
+ * `guard ? true : false` holds. For the two operand form
+ * `guard ?: false` consider using `expr_cond_guard` instead.
+ */
+expr_cond_true(
+    unique int cond: @conditionalexpr ref,
+    int true: @expr ref
+);
+
+/**
+ * The expression used when the guard of `@conditionalexpr`
+ * `guard ? true : false` does not hold.
+ */
+expr_cond_false(
+    unique int cond: @conditionalexpr ref,
+    int false: @expr ref
+);
+
+/** A string representation of the value. */
+values(
+    unique int id: @value,
+    string str: string ref
+);
+
+/** The actual text in the source code for the value, if any. */
+valuetext(
+    unique int id: @value ref,
+    string text: string ref
+);
+
+valuebind(
+    int val: @value ref,
+    unique int expr: @expr ref
+);
+
+fieldoffsets(
+    unique int id: @variable ref,
+    int byteoffset: int ref,
+    int bitoffset: int ref
+);
+
+bitfield(
+    unique int id: @variable ref,
+    int bits: int ref,
+    int declared_bits: int ref
+);
+
+/* TODO
+memberprefix(
+    int member: @expr ref,
+    int prefix: @expr ref
+);
+*/
+
+/*
+   kind(1) = mbrcallexpr
+   kind(2) = mbrptrcallexpr
+   kind(3) = mbrptrmbrcallexpr
+   kind(4) = ptrmbrptrmbrcallexpr
+   kind(5) = mbrreadexpr // x.y
+   kind(6) = mbrptrreadexpr // p->y
+   kind(7) = mbrptrmbrreadexpr // x.*pm
+   kind(8) = mbrptrmbrptrreadexpr // x->*pm
+   kind(9) = staticmbrreadexpr // static x.y
+   kind(10) = staticmbrptrreadexpr // static p->y
+*/
+/* TODO
+memberaccess(
+    int member: @expr ref,
+    int kind: int ref
+);
+*/
+
+initialisers(
+    unique int init: @initialiser,
+    int var: @accessible ref,
+    unique int expr: @expr ref,
+    int location: @location_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
+| 391 = @nested_requirement
+| 392 = @compound_requirement
+| 393 = @concept_id
+;
+
+@var_args_expr = @vastartexpr
+               | @vaendexpr
+               | @vaargexpr
+               | @vacopyexpr
+               ;
+
+@builtin_op = @var_args_expr
+            | @noopexpr
+            | @offsetofexpr
+            | @intaddrexpr
+            | @hasassignexpr
+            | @hascopyexpr
+            | @hasnothrowassign
+            | @hasnothrowconstr
+            | @hasnothrowcopy
+            | @hastrivialassign
+            | @hastrivialconstr
+            | @hastrivialcopy
+            | @hastrivialdestructor
+            | @hasuserdestr
+            | @hasvirtualdestr
+            | @isabstractexpr
+            | @isbaseofexpr
+            | @isclassexpr
+            | @isconvtoexpr
+            | @isemptyexpr
+            | @isenumexpr
+            | @ispodexpr
+            | @ispolyexpr
+            | @isunionexpr
+            | @typescompexpr
+            | @builtinshufflevector
+            | @builtinconvertvector
+            | @builtinaddressof
+            | @istriviallyconstructibleexpr
+            | @isdestructibleexpr
+            | @isnothrowdestructibleexpr
+            | @istriviallydestructibleexpr
+            | @istriviallyassignableexpr
+            | @isnothrowassignableexpr
+            | @istrivialexpr
+            | @isstandardlayoutexpr
+            | @istriviallycopyableexpr
+            | @isliteraltypeexpr
+            | @hastrivialmoveconstructorexpr
+            | @hastrivialmoveassignexpr
+            | @hasnothrowmoveassignexpr
+            | @isconstructibleexpr
+            | @isnothrowconstructibleexpr
+            | @hasfinalizerexpr
+            | @isdelegateexpr
+            | @isinterfaceclassexpr
+            | @isrefarrayexpr
+            | @isrefclassexpr
+            | @issealedexpr
+            | @issimplevalueclassexpr
+            | @isvalueclassexpr
+            | @isfinalexpr
+            | @builtinchooseexpr
+            | @builtincomplex
+            | @isassignable
+            | @isaggregate
+            | @hasuniqueobjectrepresentations
+            | @builtinbitcast
+            | @builtinshuffle
+            | @issame
+            | @isfunction
+            | @islayoutcompatible
+            | @ispointerinterconvertiblebaseof
+            | @isarray
+            | @arrayrank
+            | @arrayextent
+            | @isarithmetic
+            | @iscompletetype
+            | @iscompound
+            | @isconst
+            | @isfloatingpoint
+            | @isfundamental
+            | @isintegral
+            | @islvaluereference
+            | @ismemberfunctionpointer
+            | @ismemberobjectpointer
+            | @ismemberpointer
+            | @isobject
+            | @ispointer
+            | @isreference
+            | @isrvaluereference
+            | @isscalar
+            | @issigned
+            | @isunsigned
+            | @isvoid
+            | @isvolatile
+            | @istriviallycopyassignable
+            | @isassignablenopreconditioncheck
+            | @referencebindstotemporary
+            | @issameas
+            | @builtinhasattribute
+            | @ispointerinterconvertiblewithclass
+            | @builtinispointerinterconvertiblewithclass
+            | @iscorrespondingmember
+            | @builtiniscorrespondingmember
+            | @isboundedarray
+            | @isunboundedarray
+            | @isreferenceable
+            | @isnothrowconvertible
+            | @referenceconstructsfromtemporary
+            | @referenceconvertsfromtemporary
+            | @isconvertible
+            | @isvalidwinrttype
+            | @iswinclass
+            | @iswininterface
+            | @istriviallyequalitycomparable
+            | @isscopedenum
+            | @istriviallyrelocatable
+            ;
+
+compound_requirement_is_noexcept(
+    int expr: @compound_requirement ref
+);
+
+new_allocated_type(
+    unique int expr: @new_expr ref,
+    int type_id: @type ref
+);
+
+new_array_allocated_type(
+    unique int expr: @new_array_expr ref,
+    int type_id: @type ref
+);
+
+/**
+ * The field being initialized by an initializer expression within an aggregate
+ * initializer for a class/struct/union. Position is used to sort repeated initializers.
+ */
+#keyset[aggregate, position]
+aggregate_field_init(
+    int aggregate: @aggregateliteral ref,
+    int initializer: @expr ref,
+    int field: @membervariable ref,
+    int position: int ref,
+    boolean is_designated: boolean ref
+);
+
+/**
+ * The index of the element being initialized by an initializer expression
+ * within an aggregate initializer for an array. Position is used to sort repeated initializers.
+ */
+#keyset[aggregate, position]
+aggregate_array_init(
+    int aggregate: @aggregateliteral ref,
+    int initializer: @expr ref,
+    int element_index: int ref,
+    int position: int ref,
+    boolean is_designated: boolean ref
+);
+
+@ctorinit = @ctordirectinit
+          | @ctorvirtualinit
+          | @ctorfieldinit
+          | @ctordelegatinginit;
+@dtordestruct = @dtordirectdestruct
+              | @dtorvirtualdestruct
+              | @dtorfielddestruct;
+
+
+condition_decl_bind(
+    unique int expr: @condition_decl ref,
+    unique int decl: @declaration ref
+);
+
+typeid_bind(
+    unique int expr: @type_id ref,
+    int type_id: @type ref
+);
+
+uuidof_bind(
+    unique int expr: @uuidof ref,
+    int type_id: @type ref
+);
+
+@sizeof_or_alignof = @runtime_sizeof | @runtime_alignof | @datasizeof | @sizeof_pack;
+
+sizeof_bind(
+    unique int expr: @sizeof_or_alignof ref,
+    int type_id: @type ref
+);
+
+code_block(
+    unique int block: @literal ref,
+    unique int routine: @function ref
+);
+
+lambdas(
+    unique int expr: @lambdaexpr ref,
+    string default_capture: string ref,
+    boolean has_explicit_return_type: boolean ref,
+    boolean has_explicit_parameter_list: boolean ref
+);
+
+lambda_capture(
+    unique int id: @lambdacapture,
+    int lambda: @lambdaexpr ref,
+    int index: int ref,
+    int field: @membervariable ref,
+    boolean captured_by_reference: boolean ref,
+    boolean is_implicit: boolean ref,
+    int location: @location_default ref
+);
+
+@funbindexpr = @routineexpr
+             | @new_expr
+             | @delete_expr
+             | @delete_array_expr
+             | @ctordirectinit
+             | @ctorvirtualinit
+             | @ctordelegatinginit
+             | @dtordirectdestruct
+             | @dtorvirtualdestruct;
+
+@varbindexpr = @varaccess | @ctorfieldinit | @dtorfielddestruct;
+@addressable = @function | @variable ;
+@accessible = @addressable | @enumconstant ;
+
+@access = @varaccess | @routineexpr ;
+
+fold(
+    int expr: @foldexpr ref,
+    string operator: string ref,
+    boolean is_left_fold: boolean ref
+);
+
+stmts(
+    unique int id: @stmt,
+    int kind: int ref,
+    int location: @location_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
+|  38 = @stmt_consteval_if
+|  39 = @stmt_not_consteval_if
+|  40 = @stmt_leave
+;
+
+type_vla(
+    int type_id: @type ref,
+    int decl: @stmt_vla_decl ref
+);
+
+variable_vla(
+    int var: @variable ref,
+    int decl: @stmt_vla_decl ref
+);
+
+type_is_vla(unique int type_id: @derivedtype ref)
+
+if_initialization(
+    unique int if_stmt: @stmt_if ref,
+    int init_id: @stmt ref
+);
+
+if_then(
+    unique int if_stmt: @stmt_if ref,
+    int then_id: @stmt ref
+);
+
+if_else(
+    unique int if_stmt: @stmt_if ref,
+    int else_id: @stmt ref
+);
+
+constexpr_if_initialization(
+    unique int constexpr_if_stmt: @stmt_constexpr_if ref,
+    int init_id: @stmt ref
+);
+
+constexpr_if_then(
+    unique int constexpr_if_stmt: @stmt_constexpr_if ref,
+    int then_id: @stmt ref
+);
+
+constexpr_if_else(
+    unique int constexpr_if_stmt: @stmt_constexpr_if ref,
+    int else_id: @stmt ref
+);
+
+@stmt_consteval_or_not_consteval_if = @stmt_consteval_if | @stmt_not_consteval_if;
+
+consteval_if_then(
+    unique int constexpr_if_stmt: @stmt_consteval_or_not_consteval_if ref,
+    int then_id: @stmt ref
+);
+
+consteval_if_else(
+    unique int constexpr_if_stmt: @stmt_consteval_or_not_consteval_if ref,
+    int else_id: @stmt ref
+);
+
+while_body(
+    unique int while_stmt: @stmt_while ref,
+    int body_id: @stmt ref
+);
+
+do_body(
+    unique int do_stmt: @stmt_end_test_while ref,
+    int body_id: @stmt ref
+);
+
+switch_initialization(
+    unique int switch_stmt: @stmt_switch ref,
+    int init_id: @stmt ref
+);
+
+#keyset[switch_stmt, index]
+switch_case(
+    int switch_stmt: @stmt_switch ref,
+    int index: int ref,
+    int case_id: @stmt_switch_case ref
+);
+
+switch_body(
+    unique int switch_stmt: @stmt_switch ref,
+    int body_id: @stmt ref
+);
+
+@stmt_for_or_range_based_for = @stmt_for
+                             | @stmt_range_based_for;
+
+for_initialization(
+    unique int for_stmt: @stmt_for_or_range_based_for ref,
+    int init_id: @stmt ref
+);
+
+for_condition(
+    unique int for_stmt: @stmt_for ref,
+    int condition_id: @expr ref
+);
+
+for_update(
+    unique int for_stmt: @stmt_for ref,
+    int update_id: @expr ref
+);
+
+for_body(
+    unique int for_stmt: @stmt_for ref,
+    int body_id: @stmt ref
+);
+
+@stmtparent = @stmt | @expr_stmt ;
+stmtparents(
+    unique int id: @stmt ref,
+    int index: int ref,
+    int parent: @stmtparent ref
+);
+
+ishandler(unique int block: @stmt_block ref);
+
+@cfgnode = @stmt | @expr | @function | @initialiser ;
+
+stmt_decl_bind(
+    int stmt: @stmt_decl ref,
+    int num: int ref,
+    int decl: @declaration ref
+);
+
+stmt_decl_entry_bind(
+    int stmt: @stmt_decl ref,
+    int num: int ref,
+    int decl_entry: @element ref
+);
+
+@parameterized_element = @function | @stmt_block | @requires_expr;
+
+blockscope(
+    unique int block: @stmt_block ref,
+    int enclosing: @parameterized_element ref
+);
+
+@jump = @stmt_goto | @stmt_break | @stmt_continue | @stmt_leave;
+
+@jumporlabel = @jump | @stmt_label | @literal;
+
+jumpinfo(
+    unique int id: @jumporlabel ref,
+    string str: string ref,
+    int target: @stmt ref
+);
+
+preprocdirects(
+    unique int id: @preprocdirect,
+    int kind: int ref,
+    int location: @location_default ref
+);
+case @preprocdirect.kind of
+   0 = @ppd_if
+|  1 = @ppd_ifdef
+|  2 = @ppd_ifndef
+|  3 = @ppd_elif
+|  4 = @ppd_else
+|  5 = @ppd_endif
+|  6 = @ppd_plain_include
+|  7 = @ppd_define
+|  8 = @ppd_undef
+|  9 = @ppd_line
+| 10 = @ppd_error
+| 11 = @ppd_pragma
+| 12 = @ppd_objc_import
+| 13 = @ppd_include_next
+| 14 = @ppd_ms_import
+| 15 = @ppd_elifdef
+| 16 = @ppd_elifndef
+| 18 = @ppd_warning
+;
+
+@ppd_include = @ppd_plain_include | @ppd_objc_import | @ppd_include_next | @ppd_ms_import;
+
+@ppd_branch = @ppd_if | @ppd_ifdef | @ppd_ifndef | @ppd_elif | @ppd_elifdef | @ppd_elifndef;
+
+preprocpair(
+    int begin : @ppd_branch ref,
+    int elseelifend : @preprocdirect ref
+);
+
+preproctrue(int branch : @ppd_branch ref);
+preprocfalse(int branch : @ppd_branch ref);
+
+preproctext(
+    unique int id: @preprocdirect ref,
+    string head: string ref,
+    string body: string ref
+);
+
+includes(
+    unique int id: @ppd_include ref,
+    int included: @file ref
+);
+
+link_targets(
+    int id: @link_target,
+    int binary: @file ref
+);
+
+link_parent(
+    int element : @element ref,
+    int link_target : @link_target ref
+);
+
+/* XML Files */
+
+xmlEncoding(unique int id: @file ref, string encoding: string ref);
+
+xmlDTDs(
+    unique int id: @xmldtd,
+    string root: string ref,
+    string publicId: string ref,
+    string systemId: string ref,
+    int fileid: @file ref
+);
+
+xmlElements(
+    unique int id: @xmlelement,
+    string name: string ref,
+    int parentid: @xmlparent ref,
+    int idx: int ref,
+    int fileid: @file ref
+);
+
+xmlAttrs(
+    unique int id: @xmlattribute,
+    int elementid: @xmlelement ref,
+    string name: string ref,
+    string value: string ref,
+    int idx: int ref,
+    int fileid: @file ref
+);
+
+xmlNs(
+    int id: @xmlnamespace,
+    string prefixName: string ref,
+    string URI: string ref,
+    int fileid: @file ref
+);
+
+xmlHasNs(
+    int elementId: @xmlnamespaceable ref,
+    int nsId: @xmlnamespace ref,
+    int fileid: @file ref
+);
+
+xmlComments(
+    unique int id: @xmlcomment,
+    string text: string ref,
+    int parentid: @xmlparent ref,
+    int fileid: @file ref
+);
+
+xmlChars(
+    unique int id: @xmlcharacters,
+    string text: string ref,
+    int parentid: @xmlparent ref,
+    int idx: int ref,
+    int isCDATA: int ref,
+    int fileid: @file ref
+);
+
+@xmlparent = @file | @xmlelement;
+@xmlnamespaceable = @xmlelement | @xmlattribute;
+
+xmllocations(
+    int xmlElement: @xmllocatable ref,
+    int location: @location_default ref
+);
+
+@xmllocatable = @xmlcharacters
+              | @xmlelement
+              | @xmlcomment
+              | @xmlattribute
+              | @xmldtd
+              | @file
+              | @xmlnamespace;
diff --git a/cpp/ql/lib/upgrades/3c45f8b9e71ec723bf50c40581e1f18f4f25e290/upgrade.properties b/cpp/ql/lib/upgrades/3c45f8b9e71ec723bf50c40581e1f18f4f25e290/upgrade.properties
new file mode 100644
index 000000000000..bd639edb8f24
--- /dev/null
+++ b/cpp/ql/lib/upgrades/3c45f8b9e71ec723bf50c40581e1f18f4f25e290/upgrade.properties
@@ -0,0 +1,2 @@
+description: Support `__leave` statement
+compatibility: partial

From ac1824aba77128a91df19172b6d609efbd09f8c0 Mon Sep 17 00:00:00 2001
From: idrissrio <idrissrio@github.com>
Date: Thu, 12 Jun 2025 16:52:58 +0200
Subject: [PATCH 6/7] C++: update stats file

---
 cpp/ql/lib/semmlecode.cpp.dbscheme.stats | 1505 +++++++++++-----------
 1 file changed, 752 insertions(+), 753 deletions(-)

diff --git a/cpp/ql/lib/semmlecode.cpp.dbscheme.stats b/cpp/ql/lib/semmlecode.cpp.dbscheme.stats
index 3672711aa41d..089d69c641cc 100644
--- a/cpp/ql/lib/semmlecode.cpp.dbscheme.stats
+++ b/cpp/ql/lib/semmlecode.cpp.dbscheme.stats
@@ -2,7 +2,7 @@
     <typesizes>
         <e>
             <k>@compilation</k>
-            <v>15784</v>
+            <v>15785</v>
         </e>
         <e>
             <k>@externalDataElement</k>
@@ -18,15 +18,15 @@
         </e>
         <e>
             <k>@location_default</k>
-            <v>36090715</v>
+            <v>36090723</v>
         </e>
         <e>
             <k>@location_stmt</k>
-            <v>5203174</v>
+            <v>5203175</v>
         </e>
         <e>
             <k>@location_expr</k>
-            <v>17959854</v>
+            <v>17959858</v>
         </e>
         <e>
             <k>@diagnostic</k>
@@ -34,7 +34,7 @@
         </e>
         <e>
             <k>@file</k>
-            <v>81416</v>
+            <v>81417</v>
         </e>
         <e>
             <k>@folder</k>
@@ -42,7 +42,7 @@
         </e>
         <e>
             <k>@macro_expansion</k>
-            <v>39233853</v>
+            <v>39234203</v>
         </e>
         <e>
             <k>@other_macro_reference</k>
@@ -50,19 +50,19 @@
         </e>
         <e>
             <k>@function</k>
-            <v>4000084</v>
+            <v>4000085</v>
         </e>
         <e>
             <k>@fun_decl</k>
-            <v>4138632</v>
+            <v>4138135</v>
         </e>
         <e>
             <k>@var_decl</k>
-            <v>9237883</v>
+            <v>9237636</v>
         </e>
         <e>
             <k>@type_decl</k>
-            <v>1840519</v>
+            <v>1840533</v>
         </e>
         <e>
             <k>@namespace_decl</k>
@@ -70,7 +70,7 @@
         </e>
         <e>
             <k>@using_declaration</k>
-            <v>334516</v>
+            <v>334532</v>
         </e>
         <e>
             <k>@using_directive</k>
@@ -86,7 +86,7 @@
         </e>
         <e>
             <k>@parameter</k>
-            <v>6939003</v>
+            <v>6939004</v>
         </e>
         <e>
             <k>@membervariable</k>
@@ -338,7 +338,7 @@
         </e>
         <e>
             <k>@type_with_specifiers</k>
-            <v>693862</v>
+            <v>693863</v>
         </e>
         <e>
             <k>@array</k>
@@ -350,7 +350,7 @@
         </e>
         <e>
             <k>@reference</k>
-            <v>966847</v>
+            <v>966848</v>
         </e>
         <e>
             <k>@gnu_vector</k>
@@ -368,25 +368,25 @@
             <k>@block</k>
             <v>10</v>
         </e>
-        <e>
-            <k>@type_operator</k>
-            <v>8519</v>
-        </e>
         <e>
             <k>@decltype</k>
             <v>102076</v>
         </e>
+        <e>
+            <k>@type_operator</k>
+            <v>8519</v>
+        </e>
         <e>
             <k>@usertype</k>
-            <v>4863327</v>
+            <v>4863363</v>
         </e>
         <e>
             <k>@mangledname</k>
-            <v>6313666</v>
+            <v>6313668</v>
         </e>
         <e>
             <k>@type_mention</k>
-            <v>5813148</v>
+            <v>5813149</v>
         </e>
         <e>
             <k>@concept_template</k>
@@ -430,7 +430,7 @@
         </e>
         <e>
             <k>@attribute_arg_constant_expr</k>
-            <v>86995</v>
+            <v>86916</v>
         </e>
         <e>
             <k>@attribute_arg_expr</k>
@@ -454,11 +454,11 @@
         </e>
         <e>
             <k>@frienddecl</k>
-            <v>881070</v>
+            <v>878379</v>
         </e>
         <e>
             <k>@comment</k>
-            <v>11190891</v>
+            <v>11190894</v>
         </e>
         <e>
             <k>@namespace</k>
@@ -470,11 +470,11 @@
         </e>
         <e>
             <k>@namequalifier</k>
-            <v>3255225</v>
+            <v>3255226</v>
         </e>
         <e>
             <k>@value</k>
-            <v>13438637</v>
+            <v>13438640</v>
         </e>
         <e>
             <k>@initialiser</k>
@@ -490,11 +490,11 @@
         </e>
         <e>
             <k>@array_to_pointer</k>
-            <v>1948651</v>
+            <v>1948652</v>
         </e>
         <e>
             <k>@parexpr</k>
-            <v>4902379</v>
+            <v>4902380</v>
         </e>
         <e>
             <k>@arithnegexpr</k>
@@ -546,7 +546,7 @@
         </e>
         <e>
             <k>@divexpr</k>
-            <v>58998</v>
+            <v>58999</v>
         </e>
         <e>
             <k>@remexpr</k>
@@ -586,7 +586,7 @@
         </e>
         <e>
             <k>@eqexpr</k>
-            <v>641654</v>
+            <v>641655</v>
         </e>
         <e>
             <k>@neexpr</k>
@@ -698,7 +698,7 @@
         </e>
         <e>
             <k>@varaccess</k>
-            <v>8232597</v>
+            <v>8232599</v>
         </e>
         <e>
             <k>@runtime_sizeof</k>
@@ -714,7 +714,7 @@
         </e>
         <e>
             <k>@routineexpr</k>
-            <v>6134315</v>
+            <v>6134317</v>
         </e>
         <e>
             <k>@type_operand</k>
@@ -730,7 +730,7 @@
         </e>
         <e>
             <k>@literal</k>
-            <v>6102022</v>
+            <v>6102027</v>
         </e>
         <e>
             <k>@aggregateliteral</k>
@@ -738,7 +738,7 @@
         </e>
         <e>
             <k>@c_style_cast</k>
-            <v>6026987</v>
+            <v>6026988</v>
         </e>
         <e>
             <k>@temp_init</k>
@@ -754,7 +754,7 @@
         </e>
         <e>
             <k>@ref_indirect</k>
-            <v>2642698</v>
+            <v>2642699</v>
         </e>
         <e>
             <k>@vacuous_destructor_call</k>
@@ -814,7 +814,7 @@
         </e>
         <e>
             <k>@thisaccess</k>
-            <v>1514600</v>
+            <v>1514601</v>
         </e>
         <e>
             <k>@new_expr</k>
@@ -1382,7 +1382,7 @@
         </e>
         <e>
             <k>@concept_id</k>
-            <v>96773</v>
+            <v>96774</v>
         </e>
         <e>
             <k>@lambdacapture</k>
@@ -1426,7 +1426,7 @@
         </e>
         <e>
             <k>@stmt_switch_case</k>
-            <v>894773</v>
+            <v>894774</v>
         </e>
         <e>
             <k>@stmt_switch</k>
@@ -1438,7 +1438,7 @@
         </e>
         <e>
             <k>@stmt_decl</k>
-            <v>767030</v>
+            <v>767031</v>
         </e>
         <e>
             <k>@stmt_empty</k>
@@ -1496,6 +1496,10 @@
             <k>@stmt_not_consteval_if</k>
             <v>3</v>
         </e>
+        <e>
+            <k>@stmt_leave</k>
+            <v>3</v>
+        </e>
         <e>
             <k>@ppd_if</k>
             <v>587335</v>
@@ -1522,7 +1526,7 @@
         </e>
         <e>
             <k>@ppd_plain_include</k>
-            <v>397722</v>
+            <v>397725</v>
         </e>
         <e>
             <k>@ppd_define</k>
@@ -1600,11 +1604,11 @@
     <stats>
         <relation>
             <name>compilations</name>
-            <cardinality>15784</cardinality>
+            <cardinality>15785</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>15784</v>
+                    <v>15785</v>
                 </e>
                 <e>
                     <k>cwd</k>
@@ -1622,7 +1626,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>15784</v>
+                                    <v>15785</v>
                                 </b>
                             </bs>
                         </hist>
@@ -1648,11 +1652,11 @@
         </relation>
         <relation>
             <name>compilation_args</name>
-            <cardinality>1263730</cardinality>
+            <cardinality>1263740</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>15784</v>
+                    <v>15785</v>
                 </e>
                 <e>
                     <k>num</k>
@@ -2039,11 +2043,11 @@
         </relation>
         <relation>
             <name>compilation_build_mode</name>
-            <cardinality>15784</cardinality>
+            <cardinality>15785</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>15784</v>
+                    <v>15785</v>
                 </e>
                 <e>
                     <k>mode</k>
@@ -2061,7 +2065,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>15784</v>
+                                    <v>15785</v>
                                 </b>
                             </bs>
                         </hist>
@@ -2087,11 +2091,11 @@
         </relation>
         <relation>
             <name>compilation_compiling_files</name>
-            <cardinality>15784</cardinality>
+            <cardinality>15785</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>15784</v>
+                    <v>15785</v>
                 </e>
                 <e>
                     <k>num</k>
@@ -2113,7 +2117,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>15784</v>
+                                    <v>15785</v>
                                 </b>
                             </bs>
                         </hist>
@@ -2129,7 +2133,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>15784</v>
+                                    <v>15785</v>
                                 </b>
                             </bs>
                         </hist>
@@ -2213,11 +2217,11 @@
         </relation>
         <relation>
             <name>compilation_time</name>
-            <cardinality>62875</cardinality>
+            <cardinality>62876</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>15718</v>
+                    <v>15719</v>
                 </e>
                 <e>
                     <k>num</k>
@@ -2229,7 +2233,7 @@
                 </e>
                 <e>
                     <k>seconds</k>
-                    <v>17604</v>
+                    <v>17473</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -2243,7 +2247,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>15718</v>
+                                    <v>15719</v>
                                 </b>
                             </bs>
                         </hist>
@@ -2259,7 +2263,7 @@
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>15718</v>
+                                    <v>15719</v>
                                 </b>
                             </bs>
                         </hist>
@@ -2275,17 +2279,17 @@
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>105</v>
+                                    <v>145</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>7661</v>
+                                    <v>7819</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>7951</v>
+                                    <v>7754</v>
                                 </b>
                             </bs>
                         </hist>
@@ -2331,8 +2335,8 @@
                             <budget>12</budget>
                             <bs>
                                 <b>
-                                    <a>1335</a>
-                                    <b>1336</b>
+                                    <a>1325</a>
+                                    <b>1326</b>
                                     <v>13</v>
                                 </b>
                             </bs>
@@ -2379,23 +2383,23 @@
                             <budget>12</budget>
                             <bs>
                                 <b>
-                                    <a>10</a>
-                                    <b>11</b>
+                                    <a>9</a>
+                                    <b>10</b>
                                     <v>13</v>
                                 </b>
                                 <b>
-                                    <a>11</a>
-                                    <b>12</b>
+                                    <a>12</a>
+                                    <b>13</b>
                                     <v>13</v>
                                 </b>
                                 <b>
-                                    <a>752</a>
-                                    <b>753</b>
+                                    <a>705</a>
+                                    <b>706</b>
                                     <v>13</v>
                                 </b>
                                 <b>
-                                    <a>775</a>
-                                    <b>776</b>
+                                    <a>795</a>
+                                    <b>796</b>
                                     <v>13</v>
                                 </b>
                             </bs>
@@ -2412,22 +2416,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>11327</v>
+                                    <v>11195</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>3494</v>
+                                    <v>3626</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>1463</v>
+                                    <v>1384</v>
                                 </b>
                                 <b>
                                     <a>4</a>
-                                    <b>695</b>
-                                    <v>1318</v>
+                                    <b>703</b>
+                                    <v>1265</v>
                                 </b>
                             </bs>
                         </hist>
@@ -2443,7 +2447,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>17604</v>
+                                    <v>17473</v>
                                 </b>
                             </bs>
                         </hist>
@@ -2459,12 +2463,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>14822</v>
+                                    <v>14914</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>2756</v>
+                                    <v>2531</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -2725,19 +2729,19 @@
         </relation>
         <relation>
             <name>compilation_finished</name>
-            <cardinality>15784</cardinality>
+            <cardinality>15785</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>15784</v>
+                    <v>15785</v>
                 </e>
                 <e>
                     <k>cpu_seconds</k>
-                    <v>11815</v>
+                    <v>11894</v>
                 </e>
                 <e>
                     <k>elapsed_seconds</k>
-                    <v>250</v>
+                    <v>224</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -2751,7 +2755,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>15784</v>
+                                    <v>15785</v>
                                 </b>
                             </bs>
                         </hist>
@@ -2767,7 +2771,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>15784</v>
+                                    <v>15785</v>
                                 </b>
                             </bs>
                         </hist>
@@ -2783,17 +2787,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>9877</v>
+                                    <v>10075</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>1397</v>
+                                    <v>1345</v>
                                 </b>
                                 <b>
                                     <a>3</a>
-                                    <b>37</b>
-                                    <v>540</v>
+                                    <b>36</b>
+                                    <v>474</v>
                                 </b>
                             </bs>
                         </hist>
@@ -2809,12 +2813,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>10998</v>
+                                    <v>10984</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>817</v>
+                                    <v>909</v>
                                 </b>
                             </bs>
                         </hist>
@@ -2827,15 +2831,10 @@
                         <hist>
                             <budget>12</budget>
                             <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>39</v>
-                                </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>39</v>
+                                    <v>52</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -2843,58 +2842,58 @@
                                     <v>13</v>
                                 </b>
                                 <b>
-                                    <a>4</a>
-                                    <b>5</b>
+                                    <a>5</a>
+                                    <b>6</b>
                                     <v>13</v>
                                 </b>
                                 <b>
-                                    <a>11</a>
-                                    <b>12</b>
-                                    <v>26</v>
+                                    <a>7</a>
+                                    <b>8</b>
+                                    <v>13</v>
                                 </b>
                                 <b>
-                                    <a>14</a>
-                                    <b>15</b>
+                                    <a>12</a>
+                                    <b>13</b>
                                     <v>13</v>
                                 </b>
                                 <b>
-                                    <a>18</a>
-                                    <b>19</b>
+                                    <a>13</a>
+                                    <b>14</b>
                                     <v>13</v>
                                 </b>
                                 <b>
-                                    <a>19</a>
-                                    <b>20</b>
-                                    <v>13</v>
+                                    <a>17</a>
+                                    <b>18</b>
+                                    <v>26</v>
                                 </b>
                                 <b>
-                                    <a>26</a>
-                                    <b>27</b>
+                                    <a>30</a>
+                                    <b>31</b>
                                     <v>13</v>
                                 </b>
                                 <b>
-                                    <a>50</a>
-                                    <b>51</b>
+                                    <a>52</a>
+                                    <b>53</b>
                                     <v>13</v>
                                 </b>
                                 <b>
-                                    <a>148</a>
-                                    <b>149</b>
+                                    <a>145</a>
+                                    <b>146</b>
                                     <v>13</v>
                                 </b>
                                 <b>
-                                    <a>250</a>
-                                    <b>251</b>
+                                    <a>261</a>
+                                    <b>262</b>
                                     <v>13</v>
                                 </b>
                                 <b>
-                                    <a>311</a>
-                                    <b>312</b>
+                                    <a>303</a>
+                                    <b>304</b>
                                     <v>13</v>
                                 </b>
                                 <b>
-                                    <a>323</a>
-                                    <b>324</b>
+                                    <a>324</a>
+                                    <b>325</b>
                                     <v>13</v>
                                 </b>
                             </bs>
@@ -2908,15 +2907,10 @@
                         <hist>
                             <budget>12</budget>
                             <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>39</v>
-                                </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>39</v>
+                                    <v>52</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -2924,33 +2918,33 @@
                                     <v>13</v>
                                 </b>
                                 <b>
-                                    <a>4</a>
-                                    <b>5</b>
+                                    <a>5</a>
+                                    <b>6</b>
                                     <v>13</v>
                                 </b>
                                 <b>
-                                    <a>11</a>
-                                    <b>12</b>
-                                    <v>26</v>
+                                    <a>7</a>
+                                    <b>8</b>
+                                    <v>13</v>
                                 </b>
                                 <b>
-                                    <a>14</a>
-                                    <b>15</b>
+                                    <a>12</a>
+                                    <b>13</b>
                                     <v>13</v>
                                 </b>
                                 <b>
-                                    <a>18</a>
-                                    <b>19</b>
+                                    <a>13</a>
+                                    <b>14</b>
                                     <v>13</v>
                                 </b>
                                 <b>
-                                    <a>19</a>
-                                    <b>20</b>
-                                    <v>13</v>
+                                    <a>17</a>
+                                    <b>18</b>
+                                    <v>26</v>
                                 </b>
                                 <b>
-                                    <a>26</a>
-                                    <b>27</b>
+                                    <a>30</a>
+                                    <b>31</b>
                                     <v>13</v>
                                 </b>
                                 <b>
@@ -2959,23 +2953,23 @@
                                     <v>13</v>
                                 </b>
                                 <b>
-                                    <a>143</a>
-                                    <b>144</b>
+                                    <a>141</a>
+                                    <b>142</b>
                                     <v>13</v>
                                 </b>
                                 <b>
-                                    <a>173</a>
-                                    <b>174</b>
+                                    <a>174</a>
+                                    <b>175</b>
                                     <v>13</v>
                                 </b>
                                 <b>
-                                    <a>220</a>
-                                    <b>221</b>
+                                    <a>239</a>
+                                    <b>240</b>
                                     <v>13</v>
                                 </b>
                                 <b>
-                                    <a>258</a>
-                                    <b>259</b>
+                                    <a>256</a>
+                                    <b>257</b>
                                     <v>13</v>
                                 </b>
                             </bs>
@@ -4748,11 +4742,11 @@
         </relation>
         <relation>
             <name>locations_default</name>
-            <cardinality>36090715</cardinality>
+            <cardinality>36090723</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>36090715</v>
+                    <v>36090723</v>
                 </e>
                 <e>
                     <k>container</k>
@@ -4760,7 +4754,7 @@
                 </e>
                 <e>
                     <k>startLine</k>
-                    <v>7467156</v>
+                    <v>7467157</v>
                 </e>
                 <e>
                     <k>startColumn</k>
@@ -4768,7 +4762,7 @@
                 </e>
                 <e>
                     <k>endLine</k>
-                    <v>7469149</v>
+                    <v>7469151</v>
                 </e>
                 <e>
                     <k>endColumn</k>
@@ -4786,7 +4780,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>36090715</v>
+                                    <v>36090723</v>
                                 </b>
                             </bs>
                         </hist>
@@ -4802,7 +4796,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>36090715</v>
+                                    <v>36090723</v>
                                 </b>
                             </bs>
                         </hist>
@@ -4818,7 +4812,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>36090715</v>
+                                    <v>36090723</v>
                                 </b>
                             </bs>
                         </hist>
@@ -4834,7 +4828,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>36090715</v>
+                                    <v>36090723</v>
                                 </b>
                             </bs>
                         </hist>
@@ -4850,7 +4844,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>36090715</v>
+                                    <v>36090723</v>
                                 </b>
                             </bs>
                         </hist>
@@ -5246,7 +5240,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4941390</v>
+                                    <v>4941391</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -5287,7 +5281,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4999451</v>
+                                    <v>4999452</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -5323,7 +5317,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5633882</v>
+                                    <v>5633884</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -5359,7 +5353,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7292974</v>
+                                    <v>7292975</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -5380,7 +5374,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5008048</v>
+                                    <v>5008049</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -5390,7 +5384,7 @@
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>557681</v>
+                                    <v>557682</v>
                                 </b>
                                 <b>
                                     <a>4</a>
@@ -5796,7 +5790,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4941016</v>
+                                    <v>4941017</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -5837,7 +5831,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4997956</v>
+                                    <v>4997957</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -5847,7 +5841,7 @@
                                 <b>
                                     <a>3</a>
                                     <b>6</b>
-                                    <v>661966</v>
+                                    <v>661967</v>
                                 </b>
                                 <b>
                                     <a>6</a>
@@ -5873,7 +5867,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7288488</v>
+                                    <v>7288490</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -5894,7 +5888,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5636499</v>
+                                    <v>5636500</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -5930,7 +5924,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5007923</v>
+                                    <v>5007924</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -5940,7 +5934,7 @@
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>553071</v>
+                                    <v>553072</v>
                                 </b>
                                 <b>
                                     <a>4</a>
@@ -6265,11 +6259,11 @@
         </relation>
         <relation>
             <name>locations_stmt</name>
-            <cardinality>5203174</cardinality>
+            <cardinality>5203175</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>5203174</v>
+                    <v>5203175</v>
                 </e>
                 <e>
                     <k>container</k>
@@ -6303,7 +6297,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5203174</v>
+                                    <v>5203175</v>
                                 </b>
                             </bs>
                         </hist>
@@ -6319,7 +6313,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5203174</v>
+                                    <v>5203175</v>
                                 </b>
                             </bs>
                         </hist>
@@ -6335,7 +6329,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5203174</v>
+                                    <v>5203175</v>
                                 </b>
                             </bs>
                         </hist>
@@ -6351,7 +6345,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5203174</v>
+                                    <v>5203175</v>
                                 </b>
                             </bs>
                         </hist>
@@ -6367,7 +6361,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5203174</v>
+                                    <v>5203175</v>
                                 </b>
                             </bs>
                         </hist>
@@ -7680,7 +7674,7 @@
                                 <b>
                                     <a>5</a>
                                     <b>6</b>
-                                    <v>18858</v>
+                                    <v>18859</v>
                                 </b>
                                 <b>
                                     <a>6</a>
@@ -8257,11 +8251,11 @@
         </relation>
         <relation>
             <name>locations_expr</name>
-            <cardinality>17959854</cardinality>
+            <cardinality>17959858</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>17959854</v>
+                    <v>17959858</v>
                 </e>
                 <e>
                     <k>container</k>
@@ -8295,7 +8289,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>17959854</v>
+                                    <v>17959858</v>
                                 </b>
                             </bs>
                         </hist>
@@ -8311,7 +8305,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>17959854</v>
+                                    <v>17959858</v>
                                 </b>
                             </bs>
                         </hist>
@@ -8327,7 +8321,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>17959854</v>
+                                    <v>17959858</v>
                                 </b>
                             </bs>
                         </hist>
@@ -8343,7 +8337,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>17959854</v>
+                                    <v>17959858</v>
                                 </b>
                             </bs>
                         </hist>
@@ -8359,7 +8353,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>17959854</v>
+                                    <v>17959858</v>
                                 </b>
                             </bs>
                         </hist>
@@ -11177,15 +11171,15 @@
         </relation>
         <relation>
             <name>files</name>
-            <cardinality>81416</cardinality>
+            <cardinality>81417</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>81416</v>
+                    <v>81417</v>
                 </e>
                 <e>
                     <k>name</k>
-                    <v>81416</v>
+                    <v>81417</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -11199,7 +11193,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>81416</v>
+                                    <v>81417</v>
                                 </b>
                             </bs>
                         </hist>
@@ -11215,7 +11209,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>81416</v>
+                                    <v>81417</v>
                                 </b>
                             </bs>
                         </hist>
@@ -11356,7 +11350,7 @@
         </relation>
         <relation>
             <name>fileannotations</name>
-            <cardinality>5244314</cardinality>
+            <cardinality>5244354</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
@@ -11368,11 +11362,11 @@
                 </e>
                 <e>
                     <k>name</k>
-                    <v>73306</v>
+                    <v>73307</v>
                 </e>
                 <e>
                     <k>value</k>
-                    <v>49332</v>
+                    <v>49333</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -11688,7 +11682,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>73306</v>
+                                    <v>73307</v>
                                 </b>
                             </bs>
                         </hist>
@@ -11729,7 +11723,7 @@
                                 <b>
                                     <a>8</a>
                                     <b>11</b>
-                                    <v>5920</v>
+                                    <v>5921</v>
                                 </b>
                                 <b>
                                     <a>11</a>
@@ -11775,7 +11769,7 @@
                                 <b>
                                     <a>2</a>
                                     <b>4</b>
-                                    <v>2043</v>
+                                    <v>2044</v>
                                 </b>
                                 <b>
                                     <a>4</a>
@@ -11851,7 +11845,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>49319</v>
+                                    <v>49320</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -11947,15 +11941,15 @@
         </relation>
         <relation>
             <name>inmacroexpansion</name>
-            <cardinality>149602958</cardinality>
+            <cardinality>149602994</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>24604993</v>
+                    <v>24604999</v>
                 </e>
                 <e>
                     <k>inv</k>
-                    <v>3694107</v>
+                    <v>3694108</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -11984,17 +11978,17 @@
                                 <b>
                                     <a>6</a>
                                     <b>7</b>
-                                    <v>6565364</v>
+                                    <v>6565365</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>8</b>
-                                    <v>8696243</v>
+                                    <v>8696245</v>
                                 </b>
                                 <b>
                                     <a>8</a>
                                     <b>9</b>
-                                    <v>3547764</v>
+                                    <v>3547765</v>
                                 </b>
                                 <b>
                                     <a>9</a>
@@ -12075,15 +12069,15 @@
         </relation>
         <relation>
             <name>affectedbymacroexpansion</name>
-            <cardinality>48608633</cardinality>
+            <cardinality>48608644</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>7026352</v>
+                    <v>7026354</v>
                 </e>
                 <e>
                     <k>inv</k>
-                    <v>3793195</v>
+                    <v>3793196</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -12097,12 +12091,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3836669</v>
+                                    <v>3836670</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>764304</v>
+                                    <v>764305</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -12213,19 +12207,19 @@
         </relation>
         <relation>
             <name>macroinvocations</name>
-            <cardinality>39527898</cardinality>
+            <cardinality>39528251</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>39527898</v>
+                    <v>39528251</v>
                 </e>
                 <e>
                     <k>macro_id</k>
-                    <v>106973</v>
+                    <v>106974</v>
                 </e>
                 <e>
                     <k>location</k>
-                    <v>1041646</v>
+                    <v>1041654</v>
                 </e>
                 <e>
                     <k>kind</k>
@@ -12243,7 +12237,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>39527898</v>
+                                    <v>39528251</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12259,7 +12253,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>39527898</v>
+                                    <v>39528251</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12275,7 +12269,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>39527898</v>
+                                    <v>39528251</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12296,7 +12290,7 @@
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>20017</v>
+                                    <v>20018</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -12306,7 +12300,7 @@
                                 <b>
                                     <a>4</a>
                                     <b>6</b>
-                                    <v>9797</v>
+                                    <v>9798</v>
                                 </b>
                                 <b>
                                     <a>6</a>
@@ -12352,7 +12346,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>58642</v>
+                                    <v>58643</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -12398,7 +12392,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>98744</v>
+                                    <v>98745</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -12419,32 +12413,32 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>414918</v>
+                                    <v>414921</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>246136</v>
+                                    <v>246099</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>110296</v>
+                                    <v>110337</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>6</b>
-                                    <v>75495</v>
+                                    <v>75496</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>11</b>
-                                    <v>79966</v>
+                                    <v>79967</v>
                                 </b>
                                 <b>
                                     <a>11</a>
                                     <b>41</b>
-                                    <v>78594</v>
+                                    <v>78595</v>
                                 </b>
                                 <b>
                                     <a>41</a>
@@ -12465,12 +12459,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>982806</v>
+                                    <v>982813</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>367</b>
-                                    <v>58840</v>
+                                    <v>58841</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12486,7 +12480,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1041646</v>
+                                    <v>1041654</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12505,8 +12499,8 @@
                                     <v>13</v>
                                 </b>
                                 <b>
-                                    <a>2975175</a>
-                                    <b>2975176</b>
+                                    <a>2975179</a>
+                                    <b>2975180</b>
                                     <v>13</v>
                                 </b>
                             </bs>
@@ -12559,15 +12553,15 @@
         </relation>
         <relation>
             <name>macroparent</name>
-            <cardinality>34858909</cardinality>
+            <cardinality>34859187</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>34858909</v>
+                    <v>34859187</v>
                 </e>
                 <e>
                     <k>parent_id</k>
-                    <v>27313925</v>
+                    <v>27314145</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -12581,7 +12575,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>34858909</v>
+                                    <v>34859187</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12597,17 +12591,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>21276645</v>
+                                    <v>21276819</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>5036789</v>
+                                    <v>5036827</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>91</b>
-                                    <v>1000490</v>
+                                    <v>1000497</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12617,15 +12611,15 @@
         </relation>
         <relation>
             <name>macrolocationbind</name>
-            <cardinality>5544605</cardinality>
+            <cardinality>5544606</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>3882778</v>
+                    <v>3882779</v>
                 </e>
                 <e>
                     <k>location</k>
-                    <v>2759100</v>
+                    <v>2759101</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -12670,7 +12664,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2198673</v>
+                                    <v>2198674</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -12695,11 +12689,11 @@
         </relation>
         <relation>
             <name>macro_argument_unexpanded</name>
-            <cardinality>100507131</cardinality>
+            <cardinality>100507893</cardinality>
             <columnsizes>
                 <e>
                     <k>invocation</k>
-                    <v>30398157</v>
+                    <v>30398388</v>
                 </e>
                 <e>
                     <k>argument_index</k>
@@ -12707,7 +12701,7 @@
                 </e>
                 <e>
                     <k>text</k>
-                    <v>428566</v>
+                    <v>428569</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -12721,22 +12715,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>9719757</v>
+                                    <v>9719830</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>12168847</v>
+                                    <v>12168939</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>6225802</v>
+                                    <v>6225849</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>67</b>
-                                    <v>2283750</v>
+                                    <v>2283768</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12752,22 +12746,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>9947774</v>
+                                    <v>9947850</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>12189775</v>
+                                    <v>12189867</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>6031187</v>
+                                    <v>6031233</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>67</b>
-                                    <v>2229419</v>
+                                    <v>2229436</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12840,7 +12834,7 @@
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>77882</v>
+                                    <v>77883</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -12855,7 +12849,7 @@
                                 <b>
                                     <a>5</a>
                                     <b>6</b>
-                                    <v>48844</v>
+                                    <v>48845</v>
                                 </b>
                                 <b>
                                     <a>6</a>
@@ -12901,12 +12895,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>303606</v>
+                                    <v>303608</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>112208</v>
+                                    <v>112209</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -12921,11 +12915,11 @@
         </relation>
         <relation>
             <name>macro_argument_expanded</name>
-            <cardinality>100507131</cardinality>
+            <cardinality>100507893</cardinality>
             <columnsizes>
                 <e>
                     <k>invocation</k>
-                    <v>30398157</v>
+                    <v>30398388</v>
                 </e>
                 <e>
                     <k>argument_index</k>
@@ -12933,7 +12927,7 @@
                 </e>
                 <e>
                     <k>text</k>
-                    <v>259600</v>
+                    <v>259602</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -12947,22 +12941,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>9719757</v>
+                                    <v>9719830</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>12168847</v>
+                                    <v>12168939</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>6225802</v>
+                                    <v>6225849</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>67</b>
-                                    <v>2283750</v>
+                                    <v>2283768</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12978,22 +12972,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>13402907</v>
+                                    <v>13403008</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>10499073</v>
+                                    <v>10499153</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>5260613</v>
+                                    <v>5260653</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>9</b>
-                                    <v>1235562</v>
+                                    <v>1235572</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13071,7 +13065,7 @@
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>56941</v>
+                                    <v>56942</v>
                                 </b>
                                 <b>
                                     <a>4</a>
@@ -13111,7 +13105,7 @@
                                 <b>
                                     <a>254</a>
                                     <b>990275</b>
-                                    <v>11630</v>
+                                    <v>11631</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13127,12 +13121,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>131198</v>
+                                    <v>131199</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>111008</v>
+                                    <v>111009</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -13147,15 +13141,15 @@
         </relation>
         <relation>
             <name>functions</name>
-            <cardinality>4000084</cardinality>
+            <cardinality>4000085</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>4000084</v>
+                    <v>4000085</v>
                 </e>
                 <e>
                     <k>name</k>
-                    <v>1644139</v>
+                    <v>1644140</v>
                 </e>
                 <e>
                     <k>kind</k>
@@ -13173,7 +13167,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4000084</v>
+                                    <v>4000085</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13189,7 +13183,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4000084</v>
+                                    <v>4000085</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13401,11 +13395,11 @@
         </relation>
         <relation>
             <name>function_return_type</name>
-            <cardinality>4017527</cardinality>
+            <cardinality>4017528</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>4000084</v>
+                    <v>4000085</v>
                 </e>
                 <e>
                     <k>return_type</k>
@@ -13423,7 +13417,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3982641</v>
+                                    <v>3982642</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -13777,11 +13771,11 @@
         </relation>
         <relation>
             <name>function_prototyped</name>
-            <cardinality>3998589</cardinality>
+            <cardinality>3998590</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>3998589</v>
+                    <v>3998590</v>
                 </e>
             </columnsizes>
             <dependencies/>
@@ -13861,11 +13855,11 @@
         </relation>
         <relation>
             <name>member_function_this_type</name>
-            <cardinality>840353</cardinality>
+            <cardinality>840354</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>840353</v>
+                    <v>840354</v>
                 </e>
                 <e>
                     <k>this_type</k>
@@ -13883,7 +13877,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>840353</v>
+                                    <v>840354</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13939,15 +13933,15 @@
         </relation>
         <relation>
             <name>fun_decls</name>
-            <cardinality>4144613</cardinality>
+            <cardinality>4144115</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>4138632</v>
+                    <v>4138135</v>
                 </e>
                 <e>
                     <k>function</k>
-                    <v>3975663</v>
+                    <v>3975664</v>
                 </e>
                 <e>
                     <k>type_id</k>
@@ -13955,11 +13949,11 @@
                 </e>
                 <e>
                     <k>name</k>
-                    <v>1642644</v>
+                    <v>1642645</v>
                 </e>
                 <e>
                     <k>location</k>
-                    <v>2762493</v>
+                    <v>2762494</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -13973,7 +13967,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4138632</v>
+                                    <v>4138135</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13989,7 +13983,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4132652</v>
+                                    <v>4132154</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -14010,7 +14004,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4138632</v>
+                                    <v>4138135</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14026,7 +14020,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4138632</v>
+                                    <v>4138135</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14042,12 +14036,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3826026</v>
+                                    <v>3826525</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>4</b>
-                                    <v>149637</v>
+                                    <v>149138</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14063,7 +14057,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3957223</v>
+                                    <v>3957224</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -14084,7 +14078,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3975663</v>
+                                    <v>3975664</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14100,7 +14094,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3832754</v>
+                                    <v>3832755</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -14140,7 +14134,7 @@
                                 </b>
                                 <b>
                                     <a>358</a>
-                                    <b>10246</b>
+                                    <b>10242</b>
                                     <v>1245</v>
                                 </b>
                             </bs>
@@ -14193,7 +14187,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>493266</v>
+                                    <v>493267</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -14224,7 +14218,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>456760</v>
+                                    <v>456761</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -14255,22 +14249,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1294280</v>
+                                    <v>1294529</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>183402</v>
+                                    <v>183152</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>10</b>
-                                    <v>125216</v>
+                                    <v>125341</v>
                                 </b>
                                 <b>
                                     <a>10</a>
                                     <b>3169</b>
-                                    <v>39745</v>
+                                    <v>39620</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14312,7 +14306,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1552812</v>
+                                    <v>1552813</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -14359,7 +14353,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2383728</v>
+                                    <v>2383729</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -14385,7 +14379,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2387466</v>
+                                    <v>2387467</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -14411,7 +14405,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2647493</v>
+                                    <v>2647494</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -14432,7 +14426,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2723371</v>
+                                    <v>2723372</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -14480,11 +14474,11 @@
         </relation>
         <relation>
             <name>fun_decl_specifiers</name>
-            <cardinality>4091286</cardinality>
+            <cardinality>4091287</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>1683760</v>
+                    <v>1683761</v>
                 </e>
                 <e>
                     <k>name</k>
@@ -14778,11 +14772,11 @@
         </relation>
         <relation>
             <name>fun_decl_empty_noexcept</name>
-            <cardinality>1160715</cardinality>
+            <cardinality>1160716</cardinality>
             <columnsizes>
                 <e>
                     <k>fun_decl</k>
-                    <v>1160715</v>
+                    <v>1160716</v>
                 </e>
             </columnsizes>
             <dependencies/>
@@ -15048,11 +15042,11 @@
         </relation>
         <relation>
             <name>param_decl_bind</name>
-            <cardinality>7170747</cardinality>
+            <cardinality>7170500</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>7170747</v>
+                    <v>7170500</v>
                 </e>
                 <e>
                     <k>index</k>
@@ -15060,7 +15054,7 @@
                 </e>
                 <e>
                     <k>fun_decl</k>
-                    <v>3468816</v>
+                    <v>3468567</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -15074,7 +15068,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7170747</v>
+                                    <v>7170500</v>
                                 </b>
                             </bs>
                         </hist>
@@ -15090,7 +15084,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7170747</v>
+                                    <v>7170500</v>
                                 </b>
                             </bs>
                         </hist>
@@ -15129,8 +15123,8 @@
                                     <v>622</v>
                                 </b>
                                 <b>
-                                    <a>27841</a>
-                                    <b>27842</b>
+                                    <a>27839</a>
+                                    <b>27840</b>
                                     <v>124</v>
                                 </b>
                             </bs>
@@ -15170,8 +15164,8 @@
                                     <v>622</v>
                                 </b>
                                 <b>
-                                    <a>27841</a>
-                                    <b>27842</b>
+                                    <a>27839</a>
+                                    <b>27840</b>
                                     <v>124</v>
                                 </b>
                             </bs>
@@ -15188,12 +15182,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1495250</v>
+                                    <v>1495001</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>954263</v>
+                                    <v>954264</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -15224,12 +15218,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1495250</v>
+                                    <v>1495001</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>954263</v>
+                                    <v>954264</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -15254,15 +15248,15 @@
         </relation>
         <relation>
             <name>var_decls</name>
-            <cardinality>9244736</cardinality>
+            <cardinality>9244489</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>9237883</v>
+                    <v>9237636</v>
                 </e>
                 <e>
                     <k>variable</k>
-                    <v>8948452</v>
+                    <v>8948454</v>
                 </e>
                 <e>
                     <k>type_id</k>
@@ -15274,7 +15268,7 @@
                 </e>
                 <e>
                     <k>location</k>
-                    <v>6187951</v>
+                    <v>6187953</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -15288,7 +15282,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>9237883</v>
+                                    <v>9237636</v>
                                 </b>
                             </bs>
                         </hist>
@@ -15304,7 +15298,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>9231030</v>
+                                    <v>9230783</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -15325,7 +15319,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>9237883</v>
+                                    <v>9237636</v>
                                 </b>
                             </bs>
                         </hist>
@@ -15341,7 +15335,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>9237883</v>
+                                    <v>9237636</v>
                                 </b>
                             </bs>
                         </hist>
@@ -15357,12 +15351,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>8671978</v>
+                                    <v>8672229</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>4</b>
-                                    <v>276473</v>
+                                    <v>276224</v>
                                 </b>
                             </bs>
                         </hist>
@@ -15378,7 +15372,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>8909827</v>
+                                    <v>8909830</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -15399,7 +15393,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>8843045</v>
+                                    <v>8843047</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -15420,7 +15414,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>8697270</v>
+                                    <v>8697272</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -15441,7 +15435,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>852470</v>
+                                    <v>852471</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -15585,7 +15579,7 @@
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>165335</v>
+                                    <v>165336</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -15604,7 +15598,7 @@
                                 </b>
                                 <b>
                                     <a>26</a>
-                                    <b>26622</b>
+                                    <b>26620</b>
                                     <v>30276</v>
                                 </b>
                             </bs>
@@ -15729,11 +15723,11 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5741531</v>
+                                    <v>5741533</v>
                                 </b>
                                 <b>
                                     <a>2</a>
-                                    <b>2943</b>
+                                    <b>2941</b>
                                     <v>446419</v>
                                 </b>
                             </bs>
@@ -15750,7 +15744,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5765453</v>
+                                    <v>5765455</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -15771,7 +15765,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5904749</v>
+                                    <v>5904751</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -15792,7 +15786,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>6175492</v>
+                                    <v>6175493</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -15807,11 +15801,11 @@
         </relation>
         <relation>
             <name>var_def</name>
-            <cardinality>3721866</cardinality>
+            <cardinality>3721867</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>3721866</v>
+                    <v>3721867</v>
                 </e>
             </columnsizes>
             <dependencies/>
@@ -15961,19 +15955,19 @@
         </relation>
         <relation>
             <name>type_decls</name>
-            <cardinality>1840519</cardinality>
+            <cardinality>1840533</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>1840519</v>
+                    <v>1840533</v>
                 </e>
                 <e>
                     <k>type_id</k>
-                    <v>1800220</v>
+                    <v>1800233</v>
                 </e>
                 <e>
                     <k>location</k>
-                    <v>1446041</v>
+                    <v>1446052</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -15987,7 +15981,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1840519</v>
+                                    <v>1840533</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16003,7 +15997,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1840519</v>
+                                    <v>1840533</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16019,7 +16013,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1771221</v>
+                                    <v>1771235</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -16040,7 +16034,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1772514</v>
+                                    <v>1772527</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -16061,12 +16055,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1371548</v>
+                                    <v>1371558</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>651</b>
-                                    <v>74493</v>
+                                    <v>74494</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16082,7 +16076,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1372853</v>
+                                    <v>1372863</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -16097,11 +16091,11 @@
         </relation>
         <relation>
             <name>type_def</name>
-            <cardinality>1262886</cardinality>
+            <cardinality>1262896</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>1262886</v>
+                    <v>1262896</v>
                 </e>
             </columnsizes>
             <dependencies/>
@@ -16558,15 +16552,15 @@
         </relation>
         <relation>
             <name>usings</name>
-            <cardinality>339699</cardinality>
+            <cardinality>339714</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>339699</v>
+                    <v>339714</v>
                 </e>
                 <e>
                     <k>element_id</k>
-                    <v>73728</v>
+                    <v>73742</v>
                 </e>
                 <e>
                     <k>location</k>
@@ -16588,7 +16582,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>339699</v>
+                                    <v>339714</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16604,7 +16598,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>339699</v>
+                                    <v>339714</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16620,7 +16614,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>339699</v>
+                                    <v>339714</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16636,7 +16630,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>64075</v>
+                                    <v>64089</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -16662,7 +16656,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>64075</v>
+                                    <v>64089</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -16688,7 +16682,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>73728</v>
+                                    <v>73742</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16709,12 +16703,12 @@
                                 <b>
                                     <a>2</a>
                                     <b>4</b>
-                                    <v>2874</v>
+                                    <v>2861</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>132</b>
-                                    <v>2426</v>
+                                    <v>2439</v>
                                 </b>
                                 <b>
                                     <a>145</a>
@@ -16740,12 +16734,12 @@
                                 <b>
                                     <a>2</a>
                                     <b>4</b>
-                                    <v>2874</v>
+                                    <v>2861</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>132</b>
-                                    <v>2426</v>
+                                    <v>2439</v>
                                 </b>
                                 <b>
                                     <a>145</a>
@@ -16785,8 +16779,8 @@
                                     <v>13</v>
                                 </b>
                                 <b>
-                                    <a>25367</a>
-                                    <b>25368</b>
+                                    <a>25368</a>
+                                    <b>25369</b>
                                     <v>13</v>
                                 </b>
                             </bs>
@@ -16806,8 +16800,8 @@
                                     <v>13</v>
                                 </b>
                                 <b>
-                                    <a>5377</a>
-                                    <b>5378</b>
+                                    <a>5378</a>
+                                    <b>5379</b>
                                     <v>13</v>
                                 </b>
                             </bs>
@@ -16839,7 +16833,7 @@
         </relation>
         <relation>
             <name>using_container</name>
-            <cardinality>722770</cardinality>
+            <cardinality>722789</cardinality>
             <columnsizes>
                 <e>
                     <k>parent</k>
@@ -16847,7 +16841,7 @@
                 </e>
                 <e>
                     <k>child</k>
-                    <v>339699</v>
+                    <v>339714</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -16912,12 +16906,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>121268</v>
+                                    <v>121282</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>150161</v>
+                                    <v>150162</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -17550,11 +17544,11 @@
         </relation>
         <relation>
             <name>params</name>
-            <cardinality>6965541</cardinality>
+            <cardinality>6965543</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>6939003</v>
+                    <v>6939004</v>
                 </e>
                 <e>
                     <k>function</k>
@@ -17580,7 +17574,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>6939003</v>
+                                    <v>6939004</v>
                                 </b>
                             </bs>
                         </hist>
@@ -17596,7 +17590,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>6939003</v>
+                                    <v>6939004</v>
                                 </b>
                             </bs>
                         </hist>
@@ -17612,7 +17606,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>6912464</v>
+                                    <v>6912466</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -18721,7 +18715,7 @@
                 </e>
                 <e>
                     <k>parent</k>
-                    <v>41180</v>
+                    <v>41181</v>
                 </e>
                 <e>
                     <k>index</k>
@@ -18963,7 +18957,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>41180</v>
+                                    <v>41181</v>
                                 </b>
                             </bs>
                         </hist>
@@ -20317,11 +20311,11 @@
         </relation>
         <relation>
             <name>derivedtypes</name>
-            <cardinality>3036226</cardinality>
+            <cardinality>3036227</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>3036226</v>
+                    <v>3036227</v>
                 </e>
                 <e>
                     <k>name</k>
@@ -20347,7 +20341,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3036226</v>
+                                    <v>3036227</v>
                                 </b>
                             </bs>
                         </hist>
@@ -20363,7 +20357,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3036226</v>
+                                    <v>3036227</v>
                                 </b>
                             </bs>
                         </hist>
@@ -20379,7 +20373,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3036226</v>
+                                    <v>3036227</v>
                                 </b>
                             </bs>
                         </hist>
@@ -20395,7 +20389,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1353711</v>
+                                    <v>1353712</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -21253,7 +21247,7 @@
         </relation>
         <relation>
             <name>decltypes</name>
-            <cardinality>812301</cardinality>
+            <cardinality>812302</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
@@ -21261,7 +21255,7 @@
                 </e>
                 <e>
                     <k>expr</k>
-                    <v>812301</v>
+                    <v>812302</v>
                 </e>
                 <e>
                     <k>kind</k>
@@ -21391,7 +21385,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>812301</v>
+                                    <v>812302</v>
                                 </b>
                             </bs>
                         </hist>
@@ -21407,7 +21401,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>812301</v>
+                                    <v>812302</v>
                                 </b>
                             </bs>
                         </hist>
@@ -21423,7 +21417,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>812301</v>
+                                    <v>812302</v>
                                 </b>
                             </bs>
                         </hist>
@@ -21439,7 +21433,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>812301</v>
+                                    <v>812302</v>
                                 </b>
                             </bs>
                         </hist>
@@ -22017,15 +22011,15 @@
         </relation>
         <relation>
             <name>usertypes</name>
-            <cardinality>4863327</cardinality>
+            <cardinality>4863363</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>4863327</v>
+                    <v>4863363</v>
                 </e>
                 <e>
                     <k>name</k>
-                    <v>1051154</v>
+                    <v>1051136</v>
                 </e>
                 <e>
                     <k>kind</k>
@@ -22043,7 +22037,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4863327</v>
+                                    <v>4863363</v>
                                 </b>
                             </bs>
                         </hist>
@@ -22059,7 +22053,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4863327</v>
+                                    <v>4863363</v>
                                 </b>
                             </bs>
                         </hist>
@@ -22075,17 +22069,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>727675</v>
+                                    <v>727655</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>192465</v>
+                                    <v>192440</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>7</b>
-                                    <v>83711</v>
+                                    <v>83738</v>
                                 </b>
                                 <b>
                                     <a>7</a>
@@ -22106,7 +22100,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>986551</v>
+                                    <v>986532</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -22241,8 +22235,8 @@
                                     <v>13</v>
                                 </b>
                                 <b>
-                                    <a>10840</a>
-                                    <b>10841</b>
+                                    <a>10838</a>
+                                    <b>10839</b>
                                     <v>13</v>
                                 </b>
                                 <b>
@@ -22263,11 +22257,11 @@
         </relation>
         <relation>
             <name>usertypesize</name>
-            <cardinality>1595570</cardinality>
+            <cardinality>1595582</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>1595570</v>
+                    <v>1595582</v>
                 </e>
                 <e>
                     <k>size</k>
@@ -22289,7 +22283,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1595570</v>
+                                    <v>1595582</v>
                                 </b>
                             </bs>
                         </hist>
@@ -22305,7 +22299,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1595570</v>
+                                    <v>1595582</v>
                                 </b>
                             </bs>
                         </hist>
@@ -22563,7 +22557,7 @@
         </relation>
         <relation>
             <name>usertype_alias_kind</name>
-            <cardinality>2162685</cardinality>
+            <cardinality>2162686</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
@@ -22621,11 +22615,11 @@
         </relation>
         <relation>
             <name>nontype_template_parameters</name>
-            <cardinality>960965</cardinality>
+            <cardinality>960966</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>960965</v>
+                    <v>960966</v>
                 </e>
             </columnsizes>
             <dependencies/>
@@ -22705,15 +22699,15 @@
         </relation>
         <relation>
             <name>mangled_name</name>
-            <cardinality>7805179</cardinality>
+            <cardinality>7805181</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>7805179</v>
+                    <v>7805181</v>
                 </e>
                 <e>
                     <k>mangled_name</k>
-                    <v>6313666</v>
+                    <v>6313668</v>
                 </e>
                 <e>
                     <k>is_complete</k>
@@ -22731,7 +22725,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7805179</v>
+                                    <v>7805181</v>
                                 </b>
                             </bs>
                         </hist>
@@ -22747,7 +22741,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7805179</v>
+                                    <v>7805181</v>
                                 </b>
                             </bs>
                         </hist>
@@ -22763,7 +22757,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5984988</v>
+                                    <v>5984989</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -22784,7 +22778,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>6313666</v>
+                                    <v>6313668</v>
                                 </b>
                             </bs>
                         </hist>
@@ -22847,48 +22841,48 @@
         </relation>
         <relation>
             <name>is_standard_layout_class</name>
-            <cardinality>1314777</cardinality>
+            <cardinality>1314787</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>1314777</v>
+                    <v>1314787</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>is_complete</name>
-            <cardinality>1574114</cardinality>
+            <cardinality>1574126</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>1574114</v>
+                    <v>1574126</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>is_class_template</name>
-            <cardinality>284418</cardinality>
+            <cardinality>284420</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>284418</v>
+                    <v>284420</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>class_instantiation</name>
-            <cardinality>1297977</cardinality>
+            <cardinality>1297973</cardinality>
             <columnsizes>
                 <e>
                     <k>to</k>
-                    <v>1294166</v>
+                    <v>1294176</v>
                 </e>
                 <e>
                     <k>from</k>
-                    <v>89302</v>
+                    <v>89303</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -22902,12 +22896,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1291489</v>
+                                    <v>1291512</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>8</b>
-                                    <v>2676</v>
+                                    <v>2663</v>
                                 </b>
                             </bs>
                         </hist>
@@ -22943,22 +22937,22 @@
                                 <b>
                                     <a>5</a>
                                     <b>7</b>
-                                    <v>7516</v>
+                                    <v>7529</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>10</b>
-                                    <v>6844</v>
+                                    <v>6830</v>
                                 </b>
                                 <b>
                                     <a>10</a>
                                     <b>17</b>
-                                    <v>7239</v>
+                                    <v>7226</v>
                                 </b>
                                 <b>
                                     <a>17</a>
                                     <b>53</b>
-                                    <v>6751</v>
+                                    <v>6765</v>
                                 </b>
                                 <b>
                                     <a>53</a>
@@ -22973,11 +22967,11 @@
         </relation>
         <relation>
             <name>class_template_argument</name>
-            <cardinality>3419896</cardinality>
+            <cardinality>3419922</cardinality>
             <columnsizes>
                 <e>
                     <k>type_id</k>
-                    <v>1594040</v>
+                    <v>1594052</v>
                 </e>
                 <e>
                     <k>index</k>
@@ -22985,7 +22979,7 @@
                 </e>
                 <e>
                     <k>arg_type</k>
-                    <v>1008969</v>
+                    <v>1008977</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -22999,22 +22993,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>663402</v>
+                                    <v>663407</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>479231</v>
+                                    <v>479235</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>302010</v>
+                                    <v>302012</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>7</b>
-                                    <v>120819</v>
+                                    <v>120820</v>
                                 </b>
                                 <b>
                                     <a>7</a>
@@ -23035,22 +23029,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>697648</v>
+                                    <v>697654</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>493644</v>
+                                    <v>493648</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>300045</v>
+                                    <v>300047</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>113</b>
-                                    <v>102700</v>
+                                    <v>102701</v>
                                 </b>
                             </bs>
                         </hist>
@@ -23158,22 +23152,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>633045</v>
+                                    <v>633050</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>206957</v>
+                                    <v>206959</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>60607</v>
+                                    <v>60608</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>11</b>
-                                    <v>76761</v>
+                                    <v>76762</v>
                                 </b>
                                 <b>
                                     <a>11</a>
@@ -23194,12 +23188,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>889441</v>
+                                    <v>889448</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>96885</v>
+                                    <v>96886</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -23440,15 +23434,15 @@
         </relation>
         <relation>
             <name>is_proxy_class_for</name>
-            <cardinality>60475</cardinality>
+            <cardinality>60476</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>60475</v>
+                    <v>60476</v>
                 </e>
                 <e>
                     <k>templ_param_id</k>
-                    <v>57139</v>
+                    <v>57140</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -23462,7 +23456,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>60475</v>
+                                    <v>60476</v>
                                 </b>
                             </bs>
                         </hist>
@@ -23478,7 +23472,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>56242</v>
+                                    <v>56243</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -23493,11 +23487,11 @@
         </relation>
         <relation>
             <name>type_mentions</name>
-            <cardinality>5813148</cardinality>
+            <cardinality>5813149</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>5813148</v>
+                    <v>5813149</v>
                 </e>
                 <e>
                     <k>type_id</k>
@@ -23505,7 +23499,7 @@
                 </e>
                 <e>
                     <k>location</k>
-                    <v>5767566</v>
+                    <v>5767568</v>
                 </e>
                 <e>
                     <k>kind</k>
@@ -23523,7 +23517,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5813148</v>
+                                    <v>5813149</v>
                                 </b>
                             </bs>
                         </hist>
@@ -23539,7 +23533,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5813148</v>
+                                    <v>5813149</v>
                                 </b>
                             </bs>
                         </hist>
@@ -23555,7 +23549,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5813148</v>
+                                    <v>5813149</v>
                                 </b>
                             </bs>
                         </hist>
@@ -23689,7 +23683,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5721985</v>
+                                    <v>5721986</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -23710,7 +23704,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5721985</v>
+                                    <v>5721986</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -23731,7 +23725,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5767566</v>
+                                    <v>5767568</v>
                                 </b>
                             </bs>
                         </hist>
@@ -23789,11 +23783,11 @@
         </relation>
         <relation>
             <name>is_function_template</name>
-            <cardinality>1382146</cardinality>
+            <cardinality>1382147</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>1382146</v>
+                    <v>1382147</v>
                 </e>
             </columnsizes>
             <dependencies/>
@@ -23868,7 +23862,7 @@
         </relation>
         <relation>
             <name>function_template_argument</name>
-            <cardinality>3116089</cardinality>
+            <cardinality>3116090</cardinality>
             <columnsizes>
                 <e>
                     <k>function_id</k>
@@ -23930,7 +23924,7 @@
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>515730</v>
+                                    <v>515731</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -24349,7 +24343,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>561061</v>
+                                    <v>561062</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -24479,11 +24473,11 @@
         </relation>
         <relation>
             <name>variable_template_argument</name>
-            <cardinality>766874</cardinality>
+            <cardinality>766875</cardinality>
             <columnsizes>
                 <e>
                     <k>variable_id</k>
-                    <v>399696</v>
+                    <v>399697</v>
                 </e>
                 <e>
                     <k>index</k>
@@ -25442,11 +25436,11 @@
         </relation>
         <relation>
             <name>concept_instantiation</name>
-            <cardinality>96773</cardinality>
+            <cardinality>96774</cardinality>
             <columnsizes>
                 <e>
                     <k>to</k>
-                    <v>96773</v>
+                    <v>96774</v>
                 </e>
                 <e>
                     <k>from</k>
@@ -25464,7 +25458,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>96773</v>
+                                    <v>96774</v>
                                 </b>
                             </bs>
                         </hist>
@@ -25995,7 +25989,7 @@
             <columnsizes>
                 <e>
                     <k>routine</k>
-                    <v>412135</v>
+                    <v>412136</v>
                 </e>
                 <e>
                     <k>index</k>
@@ -26032,7 +26026,7 @@
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>48623</v>
+                                    <v>48624</v>
                                 </b>
                                 <b>
                                     <a>5</a>
@@ -26561,15 +26555,15 @@
         </relation>
         <relation>
             <name>typespecifiers</name>
-            <cardinality>966335</cardinality>
+            <cardinality>969178</cardinality>
             <columnsizes>
                 <e>
                     <k>type_id</k>
-                    <v>959913</v>
+                    <v>962756</v>
                 </e>
                 <e>
                     <k>spec_id</k>
-                    <v>105</v>
+                    <v>118</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -26583,7 +26577,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>953491</v>
+                                    <v>956333</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -26606,6 +26600,11 @@
                                     <b>165</b>
                                     <v>13</v>
                                 </b>
+                                <b>
+                                    <a>215</a>
+                                    <b>216</b>
+                                    <v>13</v>
+                                </b>
                                 <b>
                                     <a>224</a>
                                     <b>225</b>
@@ -26649,11 +26648,11 @@
         </relation>
         <relation>
             <name>funspecifiers</name>
-            <cardinality>9674600</cardinality>
+            <cardinality>9674560</cardinality>
             <columnsizes>
                 <e>
                     <k>func_id</k>
-                    <v>3322022</v>
+                    <v>3322023</v>
                 </e>
                 <e>
                     <k>spec_id</k>
@@ -26676,12 +26675,12 @@
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>673513</v>
+                                    <v>673556</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>1416326</v>
+                                    <v>1416284</v>
                                 </b>
                                 <b>
                                     <a>4</a>
@@ -26785,8 +26784,8 @@
                                     <v>42</v>
                                 </b>
                                 <b>
-                                    <a>42407</a>
-                                    <b>42408</b>
+                                    <a>42406</a>
+                                    <b>42407</b>
                                     <v>42</v>
                                 </b>
                                 <b>
@@ -26807,11 +26806,11 @@
         </relation>
         <relation>
             <name>varspecifiers</name>
-            <cardinality>3043328</cardinality>
+            <cardinality>3064883</cardinality>
             <columnsizes>
                 <e>
                     <k>var_id</k>
-                    <v>2298382</v>
+                    <v>2308848</v>
                 </e>
                 <e>
                     <k>spec_id</k>
@@ -26829,12 +26828,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1655851</v>
+                                    <v>1655229</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>540612</v>
+                                    <v>551701</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -26853,13 +26852,13 @@
                             <budget>12</budget>
                             <bs>
                                 <b>
-                                    <a>67</a>
-                                    <b>68</b>
+                                    <a>97</a>
+                                    <b>98</b>
                                     <v>124</v>
                                 </b>
                                 <b>
-                                    <a>97</a>
-                                    <b>98</b>
+                                    <a>240</a>
+                                    <b>241</b>
                                     <v>124</v>
                                 </b>
                                 <b>
@@ -26953,11 +26952,11 @@
         </relation>
         <relation>
             <name>attributes</name>
-            <cardinality>649382</cardinality>
+            <cardinality>649383</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>649382</v>
+                    <v>649383</v>
                 </e>
                 <e>
                     <k>kind</k>
@@ -26987,7 +26986,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>649382</v>
+                                    <v>649383</v>
                                 </b>
                             </bs>
                         </hist>
@@ -27003,7 +27002,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>649382</v>
+                                    <v>649383</v>
                                 </b>
                             </bs>
                         </hist>
@@ -27019,7 +27018,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>649382</v>
+                                    <v>649383</v>
                                 </b>
                             </bs>
                         </hist>
@@ -27035,7 +27034,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>649382</v>
+                                    <v>649383</v>
                                 </b>
                             </bs>
                         </hist>
@@ -27443,7 +27442,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>637421</v>
+                                    <v>637422</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -27511,11 +27510,11 @@
         </relation>
         <relation>
             <name>attribute_args</name>
-            <cardinality>96265</cardinality>
+            <cardinality>96187</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>96265</v>
+                    <v>96187</v>
                 </e>
                 <e>
                     <k>kind</k>
@@ -27523,7 +27522,7 @@
                 </e>
                 <e>
                     <k>attribute</k>
-                    <v>83065</v>
+                    <v>83066</v>
                 </e>
                 <e>
                     <k>index</k>
@@ -27531,7 +27530,7 @@
                 </e>
                 <e>
                     <k>location</k>
-                    <v>89500</v>
+                    <v>89501</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -27545,7 +27544,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>96265</v>
+                                    <v>96187</v>
                                 </b>
                             </bs>
                         </hist>
@@ -27561,7 +27560,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>96265</v>
+                                    <v>96187</v>
                                 </b>
                             </bs>
                         </hist>
@@ -27577,7 +27576,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>96265</v>
+                                    <v>96187</v>
                                 </b>
                             </bs>
                         </hist>
@@ -27593,7 +27592,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>96265</v>
+                                    <v>96187</v>
                                 </b>
                             </bs>
                         </hist>
@@ -27622,8 +27621,8 @@
                                     <v>13</v>
                                 </b>
                                 <b>
-                                    <a>6597</a>
-                                    <b>6598</b>
+                                    <a>6591</a>
+                                    <b>6592</b>
                                     <v>13</v>
                                 </b>
                             </bs>
@@ -27728,12 +27727,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>75350</v>
+                                    <v>75430</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>4</b>
-                                    <v>6395</v>
+                                    <v>6316</v>
                                 </b>
                                 <b>
                                     <a>4</a>
@@ -27754,7 +27753,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>80823</v>
+                                    <v>80824</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -27775,7 +27774,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>76946</v>
+                                    <v>76947</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -27796,7 +27795,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>78515</v>
+                                    <v>78516</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -27835,8 +27834,8 @@
                                     <v>13</v>
                                 </b>
                                 <b>
-                                    <a>6480</a>
-                                    <b>6481</b>
+                                    <a>6474</a>
+                                    <b>6475</b>
                                     <v>13</v>
                                 </b>
                             </bs>
@@ -27951,12 +27950,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>87179</v>
+                                    <v>87259</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>23</b>
-                                    <v>2320</v>
+                                    <v>2241</v>
                                 </b>
                             </bs>
                         </hist>
@@ -27972,7 +27971,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>89289</v>
+                                    <v>89290</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -28185,15 +28184,15 @@
         </relation>
         <relation>
             <name>attribute_arg_constant</name>
-            <cardinality>86995</cardinality>
+            <cardinality>86916</cardinality>
             <columnsizes>
                 <e>
                     <k>arg</k>
-                    <v>86995</v>
+                    <v>86916</v>
                 </e>
                 <e>
                     <k>constant</k>
-                    <v>86995</v>
+                    <v>86916</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -28207,7 +28206,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>86995</v>
+                                    <v>86916</v>
                                 </b>
                             </bs>
                         </hist>
@@ -28223,7 +28222,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>86995</v>
+                                    <v>86916</v>
                                 </b>
                             </bs>
                         </hist>
@@ -28397,7 +28396,7 @@
         </relation>
         <relation>
             <name>funcattributes</name>
-            <cardinality>842627</cardinality>
+            <cardinality>842628</cardinality>
             <columnsizes>
                 <e>
                     <k>func_id</k>
@@ -28419,7 +28418,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>757654</v>
+                                    <v>757655</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -28586,15 +28585,15 @@
         </relation>
         <relation>
             <name>unspecifiedtype</name>
-            <cardinality>8145616</cardinality>
+            <cardinality>8145638</cardinality>
             <columnsizes>
                 <e>
                     <k>type_id</k>
-                    <v>8145616</v>
+                    <v>8145638</v>
                 </e>
                 <e>
                     <k>unspecified_type_id</k>
-                    <v>4690378</v>
+                    <v>4690387</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -28608,7 +28607,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>8145616</v>
+                                    <v>8145638</v>
                                 </b>
                             </bs>
                         </hist>
@@ -28624,17 +28623,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3130941</v>
+                                    <v>3130938</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>1275559</v>
+                                    <v>1275568</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>6277</b>
-                                    <v>283878</v>
+                                    <v>283880</v>
                                 </b>
                             </bs>
                         </hist>
@@ -28644,7 +28643,7 @@
         </relation>
         <relation>
             <name>member</name>
-            <cardinality>4659693</cardinality>
+            <cardinality>4659651</cardinality>
             <columnsizes>
                 <e>
                     <k>parent</k>
@@ -28656,7 +28655,7 @@
                 </e>
                 <e>
                     <k>child</k>
-                    <v>4543140</v>
+                    <v>4543098</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -28929,7 +28928,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4543140</v>
+                                    <v>4543098</v>
                                 </b>
                             </bs>
                         </hist>
@@ -28945,7 +28944,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4455767</v>
+                                    <v>4455726</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -29516,7 +29515,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>36016</v>
+                                    <v>36017</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -29609,11 +29608,11 @@
         </relation>
         <relation>
             <name>direct_base_offsets</name>
-            <cardinality>564308</cardinality>
+            <cardinality>564309</cardinality>
             <columnsizes>
                 <e>
                     <k>der_id</k>
-                    <v>564308</v>
+                    <v>564309</v>
                 </e>
                 <e>
                     <k>offset</k>
@@ -29631,7 +29630,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>564308</v>
+                                    <v>564309</v>
                                 </b>
                             </bs>
                         </hist>
@@ -29828,11 +29827,11 @@
         </relation>
         <relation>
             <name>frienddecls</name>
-            <cardinality>881070</cardinality>
+            <cardinality>878379</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>881070</v>
+                    <v>878379</v>
                 </e>
                 <e>
                     <k>type_id</k>
@@ -29840,7 +29839,7 @@
                 </e>
                 <e>
                     <k>decl_id</k>
-                    <v>97497</v>
+                    <v>97626</v>
                 </e>
                 <e>
                     <k>location</k>
@@ -29858,7 +29857,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>881070</v>
+                                    <v>878379</v>
                                 </b>
                             </bs>
                         </hist>
@@ -29874,7 +29873,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>881070</v>
+                                    <v>878379</v>
                                 </b>
                             </bs>
                         </hist>
@@ -29890,7 +29889,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>881070</v>
+                                    <v>878379</v>
                                 </b>
                             </bs>
                         </hist>
@@ -29906,47 +29905,47 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7733</v>
+                                    <v>7775</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>17517</v>
+                                    <v>17474</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>7</b>
-                                    <v>4229</v>
+                                    <v>4486</v>
                                 </b>
                                 <b>
                                     <a>7</a>
-                                    <b>11</b>
-                                    <v>4187</v>
+                                    <b>12</b>
+                                    <v>4315</v>
                                 </b>
                                 <b>
-                                    <a>11</a>
+                                    <a>12</a>
                                     <b>20</b>
                                     <v>4571</v>
                                 </b>
                                 <b>
                                     <a>20</a>
-                                    <b>31</b>
-                                    <v>4016</v>
+                                    <b>32</b>
+                                    <v>4144</v>
                                 </b>
                                 <b>
-                                    <a>31</a>
-                                    <b>43</b>
-                                    <v>4144</v>
+                                    <a>33</a>
+                                    <b>50</b>
+                                    <v>4742</v>
                                 </b>
                                 <b>
-                                    <a>43</a>
-                                    <b>78</b>
-                                    <v>3887</v>
+                                    <a>50</a>
+                                    <b>80</b>
+                                    <v>4742</v>
                                 </b>
                                 <b>
-                                    <a>79</a>
+                                    <a>101</a>
                                     <b>120</b>
-                                    <v>2905</v>
+                                    <v>939</v>
                                 </b>
                             </bs>
                         </hist>
@@ -29962,47 +29961,47 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7733</v>
+                                    <v>7775</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>17517</v>
+                                    <v>17474</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>7</b>
-                                    <v>4229</v>
+                                    <v>4486</v>
                                 </b>
                                 <b>
                                     <a>7</a>
-                                    <b>11</b>
-                                    <v>4187</v>
+                                    <b>12</b>
+                                    <v>4315</v>
                                 </b>
                                 <b>
-                                    <a>11</a>
+                                    <a>12</a>
                                     <b>20</b>
                                     <v>4571</v>
                                 </b>
                                 <b>
                                     <a>20</a>
-                                    <b>31</b>
-                                    <v>4016</v>
+                                    <b>32</b>
+                                    <v>4144</v>
                                 </b>
                                 <b>
-                                    <a>31</a>
-                                    <b>43</b>
-                                    <v>4144</v>
+                                    <a>33</a>
+                                    <b>50</b>
+                                    <v>4742</v>
                                 </b>
                                 <b>
-                                    <a>43</a>
-                                    <b>78</b>
-                                    <v>3887</v>
+                                    <a>50</a>
+                                    <b>80</b>
+                                    <v>4742</v>
                                 </b>
                                 <b>
-                                    <a>79</a>
+                                    <a>101</a>
                                     <b>120</b>
-                                    <v>2905</v>
+                                    <v>939</v>
                                 </b>
                             </bs>
                         </hist>
@@ -30039,32 +30038,32 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>59900</v>
+                                    <v>60327</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>7733</v>
+                                    <v>7434</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>8</b>
-                                    <v>7775</v>
+                                    <v>7519</v>
                                 </b>
                                 <b>
                                     <a>8</a>
-                                    <b>16</b>
-                                    <v>7476</v>
+                                    <b>15</b>
+                                    <v>7605</v>
                                 </b>
                                 <b>
-                                    <a>16</a>
+                                    <a>15</a>
                                     <b>40</b>
-                                    <v>7391</v>
+                                    <v>7605</v>
                                 </b>
                                 <b>
                                     <a>40</a>
                                     <b>164</b>
-                                    <v>7220</v>
+                                    <v>7135</v>
                                 </b>
                             </bs>
                         </hist>
@@ -30080,32 +30079,32 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>59900</v>
+                                    <v>60327</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>7733</v>
+                                    <v>7434</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>8</b>
-                                    <v>7775</v>
+                                    <v>7519</v>
                                 </b>
                                 <b>
                                     <a>8</a>
-                                    <b>16</b>
-                                    <v>7476</v>
+                                    <b>15</b>
+                                    <v>7605</v>
                                 </b>
                                 <b>
-                                    <a>16</a>
+                                    <a>15</a>
                                     <b>40</b>
-                                    <v>7391</v>
+                                    <v>7605</v>
                                 </b>
                                 <b>
                                     <a>40</a>
                                     <b>164</b>
-                                    <v>7220</v>
+                                    <v>7135</v>
                                 </b>
                             </bs>
                         </hist>
@@ -30121,7 +30120,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>96643</v>
+                                    <v>96771</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -30146,7 +30145,7 @@
                                 </b>
                                 <b>
                                     <a>2</a>
-                                    <b>20433</b>
+                                    <b>20370</b>
                                     <v>469</v>
                                 </b>
                             </bs>
@@ -30188,7 +30187,7 @@
                                 </b>
                                 <b>
                                     <a>2</a>
-                                    <b>2129</b>
+                                    <b>2132</b>
                                     <v>427</v>
                                 </b>
                             </bs>
@@ -30199,19 +30198,19 @@
         </relation>
         <relation>
             <name>comments</name>
-            <cardinality>11190891</cardinality>
+            <cardinality>11190894</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>11190891</v>
+                    <v>11190894</v>
                 </e>
                 <e>
                     <k>contents</k>
-                    <v>4279921</v>
+                    <v>4279922</v>
                 </e>
                 <e>
                     <k>location</k>
-                    <v>11190891</v>
+                    <v>11190894</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -30225,7 +30224,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>11190891</v>
+                                    <v>11190894</v>
                                 </b>
                             </bs>
                         </hist>
@@ -30241,7 +30240,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>11190891</v>
+                                    <v>11190894</v>
                                 </b>
                             </bs>
                         </hist>
@@ -30257,7 +30256,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3906888</v>
+                                    <v>3906889</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -30283,7 +30282,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3906888</v>
+                                    <v>3906889</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -30309,7 +30308,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>11190891</v>
+                                    <v>11190894</v>
                                 </b>
                             </bs>
                         </hist>
@@ -30325,7 +30324,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>11190891</v>
+                                    <v>11190894</v>
                                 </b>
                             </bs>
                         </hist>
@@ -30335,15 +30334,15 @@
         </relation>
         <relation>
             <name>commentbinding</name>
-            <cardinality>3828144</cardinality>
+            <cardinality>3828145</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>3342602</v>
+                    <v>3342603</v>
                 </e>
                 <e>
                     <k>element</k>
-                    <v>3662559</v>
+                    <v>3662560</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -30357,7 +30356,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3286535</v>
+                                    <v>3286536</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -30378,7 +30377,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3496974</v>
+                                    <v>3496975</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -30393,15 +30392,15 @@
         </relation>
         <relation>
             <name>exprconv</name>
-            <cardinality>9607944</cardinality>
+            <cardinality>9607946</cardinality>
             <columnsizes>
                 <e>
                     <k>converted</k>
-                    <v>9607839</v>
+                    <v>9607841</v>
                 </e>
                 <e>
                     <k>conversion</k>
-                    <v>9607944</v>
+                    <v>9607946</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -30415,7 +30414,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>9607734</v>
+                                    <v>9607736</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -30436,7 +30435,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>9607944</v>
+                                    <v>9607946</v>
                                 </b>
                             </bs>
                         </hist>
@@ -30446,18 +30445,18 @@
         </relation>
         <relation>
             <name>compgenerated</name>
-            <cardinality>10701576</cardinality>
+            <cardinality>10701538</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>10701576</v>
+                    <v>10701538</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>synthetic_destructor_call</name>
-            <cardinality>1788902</cardinality>
+            <cardinality>1788903</cardinality>
             <columnsizes>
                 <e>
                     <k>element</k>
@@ -30469,7 +30468,7 @@
                 </e>
                 <e>
                     <k>destructor_call</k>
-                    <v>1788902</v>
+                    <v>1788903</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -30667,7 +30666,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1788902</v>
+                                    <v>1788903</v>
                                 </b>
                             </bs>
                         </hist>
@@ -30683,7 +30682,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1788902</v>
+                                    <v>1788903</v>
                                 </b>
                             </bs>
                         </hist>
@@ -30870,11 +30869,11 @@
         </relation>
         <relation>
             <name>exprparents</name>
-            <cardinality>19402287</cardinality>
+            <cardinality>19402291</cardinality>
             <columnsizes>
                 <e>
                     <k>expr_id</k>
-                    <v>19402287</v>
+                    <v>19402291</v>
                 </e>
                 <e>
                     <k>child_index</k>
@@ -30882,7 +30881,7 @@
                 </e>
                 <e>
                     <k>parent_id</k>
-                    <v>12905447</v>
+                    <v>12905450</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -30896,7 +30895,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>19402287</v>
+                                    <v>19402291</v>
                                 </b>
                             </bs>
                         </hist>
@@ -30912,7 +30911,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>19402287</v>
+                                    <v>19402291</v>
                                 </b>
                             </bs>
                         </hist>
@@ -31030,12 +31029,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7375018</v>
+                                    <v>7375020</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>5069113</v>
+                                    <v>5069114</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -31056,12 +31055,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7375018</v>
+                                    <v>7375020</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>5069113</v>
+                                    <v>5069114</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -31076,22 +31075,22 @@
         </relation>
         <relation>
             <name>expr_isload</name>
-            <cardinality>6834842</cardinality>
+            <cardinality>6834844</cardinality>
             <columnsizes>
                 <e>
                     <k>expr_id</k>
-                    <v>6834842</v>
+                    <v>6834844</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>conversionkinds</name>
-            <cardinality>6050434</cardinality>
+            <cardinality>6050435</cardinality>
             <columnsizes>
                 <e>
                     <k>expr_id</k>
-                    <v>6050434</v>
+                    <v>6050435</v>
                 </e>
                 <e>
                     <k>kind</k>
@@ -31109,7 +31108,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>6050434</v>
+                                    <v>6050435</v>
                                 </b>
                             </bs>
                         </hist>
@@ -31153,8 +31152,8 @@
                                     <v>1</v>
                                 </b>
                                 <b>
-                                    <a>5831535</a>
-                                    <b>5831536</b>
+                                    <a>5831536</a>
+                                    <b>5831537</b>
                                     <v>1</v>
                                 </b>
                             </bs>
@@ -31165,11 +31164,11 @@
         </relation>
         <relation>
             <name>iscall</name>
-            <cardinality>6209630</cardinality>
+            <cardinality>6209631</cardinality>
             <columnsizes>
                 <e>
                     <k>caller</k>
-                    <v>6209630</v>
+                    <v>6209631</v>
                 </e>
                 <e>
                     <k>kind</k>
@@ -31187,7 +31186,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>6209630</v>
+                                    <v>6209631</v>
                                 </b>
                             </bs>
                         </hist>
@@ -31223,11 +31222,11 @@
         </relation>
         <relation>
             <name>numtemplatearguments</name>
-            <cardinality>719399</cardinality>
+            <cardinality>719400</cardinality>
             <columnsizes>
                 <e>
                     <k>expr_id</k>
-                    <v>719399</v>
+                    <v>719400</v>
                 </e>
                 <e>
                     <k>num</k>
@@ -31245,7 +31244,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>719399</v>
+                                    <v>719400</v>
                                 </b>
                             </bs>
                         </hist>
@@ -31354,15 +31353,15 @@
         </relation>
         <relation>
             <name>namequalifiers</name>
-            <cardinality>3255225</cardinality>
+            <cardinality>3255226</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>3255225</v>
+                    <v>3255226</v>
                 </e>
                 <e>
                     <k>qualifiableelement</k>
-                    <v>3255225</v>
+                    <v>3255226</v>
                 </e>
                 <e>
                     <k>qualifyingelement</k>
@@ -31384,7 +31383,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3255225</v>
+                                    <v>3255226</v>
                                 </b>
                             </bs>
                         </hist>
@@ -31400,7 +31399,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3255225</v>
+                                    <v>3255226</v>
                                 </b>
                             </bs>
                         </hist>
@@ -31416,7 +31415,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3255225</v>
+                                    <v>3255226</v>
                                 </b>
                             </bs>
                         </hist>
@@ -31432,7 +31431,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3255225</v>
+                                    <v>3255226</v>
                                 </b>
                             </bs>
                         </hist>
@@ -31448,7 +31447,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3255225</v>
+                                    <v>3255226</v>
                                 </b>
                             </bs>
                         </hist>
@@ -31464,7 +31463,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3255225</v>
+                                    <v>3255226</v>
                                 </b>
                             </bs>
                         </hist>
@@ -31670,11 +31669,11 @@
         </relation>
         <relation>
             <name>varbind</name>
-            <cardinality>8232597</cardinality>
+            <cardinality>8232599</cardinality>
             <columnsizes>
                 <e>
                     <k>expr</k>
-                    <v>8232597</v>
+                    <v>8232599</v>
                 </e>
                 <e>
                     <k>var</k>
@@ -31692,7 +31691,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>8232597</v>
+                                    <v>8232599</v>
                                 </b>
                             </bs>
                         </hist>
@@ -31763,11 +31762,11 @@
         </relation>
         <relation>
             <name>funbind</name>
-            <cardinality>6220037</cardinality>
+            <cardinality>6220039</cardinality>
             <columnsizes>
                 <e>
                     <k>expr</k>
-                    <v>6217389</v>
+                    <v>6217391</v>
                 </e>
                 <e>
                     <k>fun</k>
@@ -31785,7 +31784,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>6214741</v>
+                                    <v>6214743</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -32157,15 +32156,15 @@
         </relation>
         <relation>
             <name>expr_cond_true</name>
-            <cardinality>895532</cardinality>
+            <cardinality>895533</cardinality>
             <columnsizes>
                 <e>
                     <k>cond</k>
-                    <v>895532</v>
+                    <v>895533</v>
                 </e>
                 <e>
                     <k>true</k>
-                    <v>895532</v>
+                    <v>895533</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -32179,7 +32178,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>895532</v>
+                                    <v>895533</v>
                                 </b>
                             </bs>
                         </hist>
@@ -32195,7 +32194,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>895532</v>
+                                    <v>895533</v>
                                 </b>
                             </bs>
                         </hist>
@@ -32253,11 +32252,11 @@
         </relation>
         <relation>
             <name>values</name>
-            <cardinality>13438637</cardinality>
+            <cardinality>13438640</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>13438637</v>
+                    <v>13438640</v>
                 </e>
                 <e>
                     <k>str</k>
@@ -32275,7 +32274,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>13438637</v>
+                                    <v>13438640</v>
                                 </b>
                             </bs>
                         </hist>
@@ -32321,11 +32320,11 @@
         </relation>
         <relation>
             <name>valuetext</name>
-            <cardinality>6647443</cardinality>
+            <cardinality>6647587</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>6647443</v>
+                    <v>6647587</v>
                 </e>
                 <e>
                     <k>text</k>
@@ -32343,7 +32342,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>6647443</v>
+                                    <v>6647587</v>
                                 </b>
                             </bs>
                         </hist>
@@ -32384,15 +32383,15 @@
         </relation>
         <relation>
             <name>valuebind</name>
-            <cardinality>13546930</cardinality>
+            <cardinality>13546933</cardinality>
             <columnsizes>
                 <e>
                     <k>val</k>
-                    <v>13438637</v>
+                    <v>13438640</v>
                 </e>
                 <e>
                     <k>expr</k>
-                    <v>13546930</v>
+                    <v>13546933</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -32406,12 +32405,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>13348324</v>
+                                    <v>13348327</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>6</b>
-                                    <v>90312</v>
+                                    <v>90313</v>
                                 </b>
                             </bs>
                         </hist>
@@ -32427,7 +32426,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>13546930</v>
+                                    <v>13546933</v>
                                 </b>
                             </bs>
                         </hist>
@@ -32832,7 +32831,7 @@
                 </e>
                 <e>
                     <k>var</k>
-                    <v>988524</v>
+                    <v>988525</v>
                 </e>
                 <e>
                     <k>expr</k>
@@ -32840,7 +32839,7 @@
                 </e>
                 <e>
                     <k>location</k>
-                    <v>537812</v>
+                    <v>537813</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -33116,15 +33115,15 @@
         </relation>
         <relation>
             <name>expr_ancestor</name>
-            <cardinality>1795303</cardinality>
+            <cardinality>1795304</cardinality>
             <columnsizes>
                 <e>
                     <k>exp</k>
-                    <v>1795303</v>
+                    <v>1795304</v>
                 </e>
                 <e>
                     <k>ancestor</k>
-                    <v>898526</v>
+                    <v>898527</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -33138,7 +33137,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1795303</v>
+                                    <v>1795304</v>
                                 </b>
                             </bs>
                         </hist>
@@ -33174,11 +33173,11 @@
         </relation>
         <relation>
             <name>exprs</name>
-            <cardinality>25143280</cardinality>
+            <cardinality>25143286</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>25143280</v>
+                    <v>25143286</v>
                 </e>
                 <e>
                     <k>kind</k>
@@ -33186,7 +33185,7 @@
                 </e>
                 <e>
                     <k>location</k>
-                    <v>10554422</v>
+                    <v>10554424</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -33200,7 +33199,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>25143280</v>
+                                    <v>25143286</v>
                                 </b>
                             </bs>
                         </hist>
@@ -33216,7 +33215,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>25143280</v>
+                                    <v>25143286</v>
                                 </b>
                             </bs>
                         </hist>
@@ -33394,7 +33393,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>8876942</v>
+                                    <v>8876944</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -33425,7 +33424,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>9015972</v>
+                                    <v>9015974</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -33571,15 +33570,15 @@
         </relation>
         <relation>
             <name>expr_types</name>
-            <cardinality>25143280</cardinality>
+            <cardinality>25143286</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>25143280</v>
+                    <v>25143286</v>
                 </e>
                 <e>
                     <k>typeid</k>
-                    <v>213630</v>
+                    <v>213631</v>
                 </e>
                 <e>
                     <k>value_category</k>
@@ -33597,7 +33596,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>25143280</v>
+                                    <v>25143286</v>
                                 </b>
                             </bs>
                         </hist>
@@ -33613,7 +33612,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>25143280</v>
+                                    <v>25143286</v>
                                 </b>
                             </bs>
                         </hist>
@@ -37105,11 +37104,11 @@
         </relation>
         <relation>
             <name>stmts</name>
-            <cardinality>6243068</cardinality>
+            <cardinality>6243069</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>6243068</v>
+                    <v>6243069</v>
                 </e>
                 <e>
                     <k>kind</k>
@@ -37117,7 +37116,7 @@
                 </e>
                 <e>
                     <k>location</k>
-                    <v>2747714</v>
+                    <v>2747715</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -37131,7 +37130,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>6243068</v>
+                                    <v>6243069</v>
                                 </b>
                             </bs>
                         </hist>
@@ -37147,7 +37146,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>6243068</v>
+                                    <v>6243069</v>
                                 </b>
                             </bs>
                         </hist>
@@ -37385,12 +37384,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2346946</v>
+                                    <v>2346947</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>4</b>
-                                    <v>238474</v>
+                                    <v>238475</v>
                                 </b>
                                 <b>
                                     <a>4</a>
@@ -38061,7 +38060,7 @@
         </relation>
         <relation>
             <name>switch_case</name>
-            <cardinality>894773</cardinality>
+            <cardinality>894774</cardinality>
             <columnsizes>
                 <e>
                     <k>switch_stmt</k>
@@ -38073,7 +38072,7 @@
                 </e>
                 <e>
                     <k>case_id</k>
-                    <v>894773</v>
+                    <v>894774</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -38281,7 +38280,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>894773</v>
+                                    <v>894774</v>
                                 </b>
                             </bs>
                         </hist>
@@ -38297,7 +38296,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>894773</v>
+                                    <v>894774</v>
                                 </b>
                             </bs>
                         </hist>
@@ -38547,11 +38546,11 @@
         </relation>
         <relation>
             <name>stmtparents</name>
-            <cardinality>5509818</cardinality>
+            <cardinality>5509819</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>5509818</v>
+                    <v>5509819</v>
                 </e>
                 <e>
                     <k>index</k>
@@ -38573,7 +38572,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5509818</v>
+                                    <v>5509819</v>
                                 </b>
                             </bs>
                         </hist>
@@ -38589,7 +38588,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5509818</v>
+                                    <v>5509819</v>
                                 </b>
                             </bs>
                         </hist>
@@ -38747,7 +38746,7 @@
                                 <b>
                                     <a>6</a>
                                     <b>16</b>
-                                    <v>175329</v>
+                                    <v>175330</v>
                                 </b>
                                 <b>
                                     <a>16</a>
@@ -38788,7 +38787,7 @@
                                 <b>
                                     <a>6</a>
                                     <b>16</b>
-                                    <v>175329</v>
+                                    <v>175330</v>
                                 </b>
                                 <b>
                                     <a>16</a>
@@ -38818,7 +38817,7 @@
             <columnsizes>
                 <e>
                     <k>stmt</k>
-                    <v>682992</v>
+                    <v>682991</v>
                 </e>
                 <e>
                     <k>num</k>
@@ -38826,7 +38825,7 @@
                 </e>
                 <e>
                     <k>decl</k>
-                    <v>722965</v>
+                    <v>722964</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -39004,7 +39003,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>722941</v>
+                                    <v>722940</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -39025,7 +39024,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>722965</v>
+                                    <v>722964</v>
                                 </b>
                             </bs>
                         </hist>
@@ -39039,7 +39038,7 @@
             <columnsizes>
                 <e>
                     <k>stmt</k>
-                    <v>682992</v>
+                    <v>682991</v>
                 </e>
                 <e>
                     <k>num</k>
@@ -39259,7 +39258,7 @@
                 </e>
                 <e>
                     <k>enclosing</k>
-                    <v>1503348</v>
+                    <v>1503349</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -39490,11 +39489,11 @@
         </relation>
         <relation>
             <name>preprocdirects</name>
-            <cardinality>5386937</cardinality>
+            <cardinality>5386939</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>5386937</v>
+                    <v>5386939</v>
                 </e>
                 <e>
                     <k>kind</k>
@@ -39502,7 +39501,7 @@
                 </e>
                 <e>
                     <k>location</k>
-                    <v>5383698</v>
+                    <v>5383699</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -39516,7 +39515,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5386937</v>
+                                    <v>5386939</v>
                                 </b>
                             </bs>
                         </hist>
@@ -39532,7 +39531,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5386937</v>
+                                    <v>5386939</v>
                                 </b>
                             </bs>
                         </hist>
@@ -39680,7 +39679,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5383573</v>
+                                    <v>5383575</v>
                                 </b>
                                 <b>
                                     <a>27</a>
@@ -39701,7 +39700,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5383698</v>
+                                    <v>5383699</v>
                                 </b>
                             </bs>
                         </hist>
@@ -39791,15 +39790,15 @@
         </relation>
         <relation>
             <name>preproctext</name>
-            <cardinality>4335864</cardinality>
+            <cardinality>4335865</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>4335864</v>
+                    <v>4335865</v>
                 </e>
                 <e>
                     <k>head</k>
-                    <v>2943528</v>
+                    <v>2943529</v>
                 </e>
                 <e>
                     <k>body</k>
@@ -39817,7 +39816,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4335864</v>
+                                    <v>4335865</v>
                                 </b>
                             </bs>
                         </hist>
@@ -39833,7 +39832,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4335864</v>
+                                    <v>4335865</v>
                                 </b>
                             </bs>
                         </hist>
@@ -39849,7 +39848,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2747542</v>
+                                    <v>2747543</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -39870,7 +39869,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2864162</v>
+                                    <v>2864163</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -39937,15 +39936,15 @@
         </relation>
         <relation>
             <name>includes</name>
-            <cardinality>397814</cardinality>
+            <cardinality>397817</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>397814</v>
+                    <v>397817</v>
                 </e>
                 <e>
                     <k>included</k>
-                    <v>73280</v>
+                    <v>73281</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -39959,7 +39958,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>397814</v>
+                                    <v>397817</v>
                                 </b>
                             </bs>
                         </hist>
@@ -40063,11 +40062,11 @@
         </relation>
         <relation>
             <name>link_parent</name>
-            <cardinality>38113713</cardinality>
+            <cardinality>38113722</cardinality>
             <columnsizes>
                 <e>
                     <k>element</k>
-                    <v>4847511</v>
+                    <v>4847512</v>
                 </e>
                 <e>
                     <k>link_target</k>
@@ -40085,7 +40084,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>665224</v>
+                                    <v>665225</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -40095,7 +40094,7 @@
                                 <b>
                                     <a>9</a>
                                     <b>10</b>
-                                    <v>4148491</v>
+                                    <v>4148492</v>
                                 </b>
                             </bs>
                         </hist>

From 7af828720a0c3d03d319ad33cadb73588543dc5a Mon Sep 17 00:00:00 2001
From: idrissrio <idrissrio@github.com>
Date: Fri, 13 Jun 2025 09:41:19 +0200
Subject: [PATCH 7/7] C++: address review comments

---
 .../a8c2176e9a5cf9be8d17053a4c8e7e56b5aced6d/upgrade.properties | 2 +-
 cpp/ql/lib/change-notes/2025-06-11-leave-stmt.md                | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/cpp/downgrades/a8c2176e9a5cf9be8d17053a4c8e7e56b5aced6d/upgrade.properties b/cpp/downgrades/a8c2176e9a5cf9be8d17053a4c8e7e56b5aced6d/upgrade.properties
index 05a32c107602..beabef86257c 100644
--- a/cpp/downgrades/a8c2176e9a5cf9be8d17053a4c8e7e56b5aced6d/upgrade.properties
+++ b/cpp/downgrades/a8c2176e9a5cf9be8d17053a4c8e7e56b5aced6d/upgrade.properties
@@ -1,3 +1,3 @@
 description: Support `__leave` statement
-compatibility: backwards
+compatibility: full
 stmts.rel: run stmts.qlo
diff --git a/cpp/ql/lib/change-notes/2025-06-11-leave-stmt.md b/cpp/ql/lib/change-notes/2025-06-11-leave-stmt.md
index 3e410e574480..d06be5b77a9c 100644
--- a/cpp/ql/lib/change-notes/2025-06-11-leave-stmt.md
+++ b/cpp/ql/lib/change-notes/2025-06-11-leave-stmt.md
@@ -2,4 +2,4 @@
 category: feature
 ---
 * The Microsoft-specific `__leave` statement is now supported.
-* A new class `LeaveStmt` extending `JumpStmt` was added to represent these statements.
\ No newline at end of file
+* A new class `LeaveStmt` extending `JumpStmt` was added to represent `__leave` statements.
\ No newline at end of file