diff --git a/cpp/downgrades/159dbb330468991283454b1ac73b7f8411e97595/aggregate_array_init.ql b/cpp/downgrades/159dbb330468991283454b1ac73b7f8411e97595/aggregate_array_init.ql
new file mode 100644
index 000000000000..acf38e449509
--- /dev/null
+++ b/cpp/downgrades/159dbb330468991283454b1ac73b7f8411e97595/aggregate_array_init.ql
@@ -0,0 +1,11 @@
+class Expr extends @expr {
+  string toString() { none() }
+}
+
+class AggregateLiteral extends Expr, @aggregateliteral {
+  override string toString() { none() }
+}
+
+from AggregateLiteral aggregate, Expr initializer, int element_index, int position
+where aggregate_array_init(aggregate, initializer, element_index, position, _)
+select aggregate, initializer, element_index, position
diff --git a/cpp/downgrades/159dbb330468991283454b1ac73b7f8411e97595/aggregate_field_init.ql b/cpp/downgrades/159dbb330468991283454b1ac73b7f8411e97595/aggregate_field_init.ql
new file mode 100644
index 000000000000..47503cbfd17a
--- /dev/null
+++ b/cpp/downgrades/159dbb330468991283454b1ac73b7f8411e97595/aggregate_field_init.ql
@@ -0,0 +1,15 @@
+class Expr extends @expr {
+  string toString() { none() }
+}
+
+class AggregateLiteral extends Expr, @aggregateliteral {
+  override string toString() { none() }
+}
+
+class MemberVariable extends @membervariable {
+  string toString() { none() }
+}
+
+from AggregateLiteral aggregate, Expr initializer, MemberVariable field, int position
+where aggregate_field_init(aggregate, initializer, field, position, _)
+select aggregate, initializer, field, position
diff --git a/cpp/downgrades/159dbb330468991283454b1ac73b7f8411e97595/old.dbscheme b/cpp/downgrades/159dbb330468991283454b1ac73b7f8411e97595/old.dbscheme
new file mode 100644
index 000000000000..159dbb330468
--- /dev/null
+++ b/cpp/downgrades/159dbb330468991283454b1ac73b7f8411e97595/old.dbscheme
@@ -0,0 +1,2446 @@
+
+/**
+ * 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
+;
+
+builtintypes(
+    unique int id: @builtintype,
+    string name: string ref,
+    int kind: int ref,
+    int size: int ref,
+    int sign: int ref,
+    int alignment: int ref
+);
+
+/**
+ * Derived types are types that are directly derived from existing types and
+ * point to, refer to, transform type data to return a new type.
+ */
+case @derivedtype.kind of
+   1 = @pointer
+|  2 = @reference
+|  3 = @type_with_specifiers
+|  4 = @array
+|  5 = @gnu_vector
+|  6 = @routineptr
+|  7 = @routinereference
+|  8 = @rvalue_reference // C++11
+// ... 9 type_conforming_to_protocols deprecated
+| 10 = @block
+;
+
+derivedtypes(
+    unique int id: @derivedtype,
+    string name: string ref,
+    int kind: int ref,
+    int type_id: @type ref
+);
+
+pointerishsize(unique int id: @derivedtype ref,
+    int size: int ref,
+    int alignment: int ref);
+
+arraysizes(
+    unique int id: @derivedtype ref,
+    int num_elements: int ref,
+    int bytesize: int ref,
+    int alignment: int ref
+);
+
+typedefbase(
+    unique int id: @usertype ref,
+    int type_id: @type ref
+);
+
+/**
+ * An instance of the C++11 `decltype` operator.  For example:
+ * ```
+ * int a;
+ * decltype(1+a) b;
+ * ```
+ * Here `expr` is `1+a`.
+ *
+ * Sometimes an additional pair of parentheses around the expression
+ * would change the semantics of this decltype, e.g.
+ * ```
+ * struct A { double x; };
+ * const A* a = new A();
+ * decltype( a->x ); // type is double
+ * decltype((a->x)); // type is const double&
+ * ```
+ * (Please consult the C++11 standard for more details).
+ * `parentheses_would_change_meaning` is `true` iff that is the case.
+ */
+#keyset[id, expr]
+decltypes(
+    int id: @decltype,
+    int expr: @expr ref,
+    int base_type: @type ref,
+    boolean parentheses_would_change_meaning: boolean ref
+);
+
+/*
+case @usertype.kind of
+|  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
+      /* TODO | @fixedpointtype */
+      | @routinetype
+      | @ptrtomember
+      | @decltype;
+
+unspecifiedtype(
+    unique int type_id: @type ref,
+    int unspecified_type_id: @type ref
+);
+
+member(
+    int parent: @type ref,
+    int index: int ref,
+    int child: @member ref
+);
+
+@enclosingfunction_child = @usertype | @variable | @namespace
+
+enclosingfunction(
+    unique int child: @enclosingfunction_child ref,
+    int parent: @function ref
+);
+
+derivations(
+    unique int derivation: @derivation,
+    int sub: @type ref,
+    int index: int ref,
+    int super: @type ref,
+    int location: @location_default ref
+);
+
+derspecifiers(
+    int der_id: @derivation ref,
+    int spec_id: @specifier ref
+);
+
+/**
+ * Contains the byte offset of the base class subobject within the derived
+ * class. Only holds for non-virtual base classes, but see table
+ * `virtual_base_offsets` for offsets of virtual base class subobjects.
+ */
+direct_base_offsets(
+    unique int der_id: @derivation ref,
+    int offset: int ref
+);
+
+/**
+ * Contains the byte offset of the virtual base class subobject for class
+ * `super` within a most-derived object of class `sub`. `super` can be either a
+ * direct or indirect base class.
+ */
+#keyset[sub, super]
+virtual_base_offsets(
+    int sub: @usertype ref,
+    int super: @usertype ref,
+    int offset: int ref
+);
+
+frienddecls(
+    unique int id: @frienddecl,
+    int type_id: @type ref,
+    int decl_id: @declaration ref,
+    int location: @location_default ref
+);
+
+@declaredtype = @usertype ;
+
+@declaration = @function
+             | @declaredtype
+             | @variable
+             | @enumconstant
+             | @frienddecl
+             | @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 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 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
+);
+
+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
+);
+
+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/159dbb330468991283454b1ac73b7f8411e97595/semmlecode.cpp.dbscheme b/cpp/downgrades/159dbb330468991283454b1ac73b7f8411e97595/semmlecode.cpp.dbscheme
new file mode 100644
index 000000000000..e594389175c0
--- /dev/null
+++ b/cpp/downgrades/159dbb330468991283454b1ac73b7f8411e97595/semmlecode.cpp.dbscheme
@@ -0,0 +1,2444 @@
+
+/**
+ * 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
+;
+
+builtintypes(
+    unique int id: @builtintype,
+    string name: string ref,
+    int kind: int ref,
+    int size: int ref,
+    int sign: int ref,
+    int alignment: int ref
+);
+
+/**
+ * Derived types are types that are directly derived from existing types and
+ * point to, refer to, transform type data to return a new type.
+ */
+case @derivedtype.kind of
+   1 = @pointer
+|  2 = @reference
+|  3 = @type_with_specifiers
+|  4 = @array
+|  5 = @gnu_vector
+|  6 = @routineptr
+|  7 = @routinereference
+|  8 = @rvalue_reference // C++11
+// ... 9 type_conforming_to_protocols deprecated
+| 10 = @block
+;
+
+derivedtypes(
+    unique int id: @derivedtype,
+    string name: string ref,
+    int kind: int ref,
+    int type_id: @type ref
+);
+
+pointerishsize(unique int id: @derivedtype ref,
+    int size: int ref,
+    int alignment: int ref);
+
+arraysizes(
+    unique int id: @derivedtype ref,
+    int num_elements: int ref,
+    int bytesize: int ref,
+    int alignment: int ref
+);
+
+typedefbase(
+    unique int id: @usertype ref,
+    int type_id: @type ref
+);
+
+/**
+ * An instance of the C++11 `decltype` operator.  For example:
+ * ```
+ * int a;
+ * decltype(1+a) b;
+ * ```
+ * Here `expr` is `1+a`.
+ *
+ * Sometimes an additional pair of parentheses around the expression
+ * would change the semantics of this decltype, e.g.
+ * ```
+ * struct A { double x; };
+ * const A* a = new A();
+ * decltype( a->x ); // type is double
+ * decltype((a->x)); // type is const double&
+ * ```
+ * (Please consult the C++11 standard for more details).
+ * `parentheses_would_change_meaning` is `true` iff that is the case.
+ */
+#keyset[id, expr]
+decltypes(
+    int id: @decltype,
+    int expr: @expr ref,
+    int base_type: @type ref,
+    boolean parentheses_would_change_meaning: boolean ref
+);
+
+/*
+case @usertype.kind of
+|  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
+      /* TODO | @fixedpointtype */
+      | @routinetype
+      | @ptrtomember
+      | @decltype;
+
+unspecifiedtype(
+    unique int type_id: @type ref,
+    int unspecified_type_id: @type ref
+);
+
+member(
+    int parent: @type ref,
+    int index: int ref,
+    int child: @member ref
+);
+
+@enclosingfunction_child = @usertype | @variable | @namespace
+
+enclosingfunction(
+    unique int child: @enclosingfunction_child ref,
+    int parent: @function ref
+);
+
+derivations(
+    unique int derivation: @derivation,
+    int sub: @type ref,
+    int index: int ref,
+    int super: @type ref,
+    int location: @location_default ref
+);
+
+derspecifiers(
+    int der_id: @derivation ref,
+    int spec_id: @specifier ref
+);
+
+/**
+ * Contains the byte offset of the base class subobject within the derived
+ * class. Only holds for non-virtual base classes, but see table
+ * `virtual_base_offsets` for offsets of virtual base class subobjects.
+ */
+direct_base_offsets(
+    unique int der_id: @derivation ref,
+    int offset: int ref
+);
+
+/**
+ * Contains the byte offset of the virtual base class subobject for class
+ * `super` within a most-derived object of class `sub`. `super` can be either a
+ * direct or indirect base class.
+ */
+#keyset[sub, super]
+virtual_base_offsets(
+    int sub: @usertype ref,
+    int super: @usertype ref,
+    int offset: int ref
+);
+
+frienddecls(
+    unique int id: @frienddecl,
+    int type_id: @type ref,
+    int decl_id: @declaration ref,
+    int location: @location_default ref
+);
+
+@declaredtype = @usertype ;
+
+@declaration = @function
+             | @declaredtype
+             | @variable
+             | @enumconstant
+             | @frienddecl
+             | @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
+);
+
+/**
+ * The index of the element being initialized by an initializer expression
+ * within an aggregate initializer for an array. Position is used to sort repeated initializers.
+ */
+#keyset[aggregate, position]
+aggregate_array_init(
+    int aggregate: @aggregateliteral ref,
+    int initializer: @expr ref,
+    int element_index: int ref,
+    int position: int ref
+);
+
+@ctorinit = @ctordirectinit
+          | @ctorvirtualinit
+          | @ctorfieldinit
+          | @ctordelegatinginit;
+@dtordestruct = @dtordirectdestruct
+              | @dtorvirtualdestruct
+              | @dtorfielddestruct;
+
+
+condition_decl_bind(
+    unique int expr: @condition_decl ref,
+    unique int decl: @declaration ref
+);
+
+typeid_bind(
+    unique int expr: @type_id ref,
+    int type_id: @type ref
+);
+
+uuidof_bind(
+    unique int expr: @uuidof ref,
+    int type_id: @type ref
+);
+
+@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
+);
+
+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
+);
+
+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/159dbb330468991283454b1ac73b7f8411e97595/upgrade.properties b/cpp/downgrades/159dbb330468991283454b1ac73b7f8411e97595/upgrade.properties
new file mode 100644
index 000000000000..b7e78b39ee7a
--- /dev/null
+++ b/cpp/downgrades/159dbb330468991283454b1ac73b7f8411e97595/upgrade.properties
@@ -0,0 +1,4 @@
+description: add `isDesignatorInit`predicate to `ArrayOrVectorAggregateLiteral` and `ClassAggregateLiteral`
+compatibility: backwards
+aggregate_array_init.rel: run aggregate_array_init.qlo
+aggregate_field_init.rel: run aggregate_field_init.qlo
\ No newline at end of file
diff --git a/cpp/ql/lib/change-notes/2025-04-15-field-array-designator.md b/cpp/ql/lib/change-notes/2025-04-15-field-array-designator.md
new file mode 100644
index 000000000000..3598136973c5
--- /dev/null
+++ b/cpp/ql/lib/change-notes/2025-04-15-field-array-designator.md
@@ -0,0 +1,4 @@
+---
+category: feature
+---
+* Introduced `isDesignatorInit()` predicates to distinguish between designator-based and positional initializations for both struct\union fields and array elements.
\ No newline at end of file
diff --git a/cpp/ql/lib/semmle/code/cpp/exprs/Literal.qll b/cpp/ql/lib/semmle/code/cpp/exprs/Literal.qll
index a36758417bb9..fb79988c10f1 100644
--- a/cpp/ql/lib/semmle/code/cpp/exprs/Literal.qll
+++ b/cpp/ql/lib/semmle/code/cpp/exprs/Literal.qll
@@ -213,7 +213,27 @@ class ClassAggregateLiteral extends AggregateLiteral {
   Expr getFieldExpr(Field field, int position) {
     field = classType.getAField() and
     aggregate_field_init(underlyingElement(this), unresolveElement(result), unresolveElement(field),
-      position)
+      position, _)
+  }
+
+  /**
+   * Holds if the `position`-th initialization of `field` in this aggregate initializer
+   * uses a designator (e.g., `.x =`, `[42] =`) rather than a positional initializer.
+   *
+   * This can be used to distinguish explicitly designated initializations from
+   * implicit positional ones.
+   *
+   * For example, in the initializer:
+   * ```c
+   * struct S { int x, y; };
+   * struct S s = { .x = 1, 2 };
+   * ```
+   * - `.x = 1` is a designator init, therefore `isDesignatorInit(x, 0)` holds.
+   * - `2` is a positional init for `.y`, therefore `isDesignatorInit(y, 1)` does **not** hold.
+   */
+  predicate isDesignatorInit(Field field, int position) {
+    field = classType.getAField() and
+    aggregate_field_init(underlyingElement(this), _, unresolveElement(field), position, true)
   }
 
   /**
@@ -304,7 +324,24 @@ class ArrayOrVectorAggregateLiteral extends AggregateLiteral {
    * - `a.getElementExpr(0, 2)` gives `789`.
    */
   Expr getElementExpr(int elementIndex, int position) {
-    aggregate_array_init(underlyingElement(this), unresolveElement(result), elementIndex, position)
+    aggregate_array_init(underlyingElement(this), unresolveElement(result), elementIndex, position,
+      _)
+  }
+
+  /**
+   * Holds if the `position`-th initialization of the array element at `elementIndex`
+   * in this aggregate initializer uses a designator (e.g., `[0] = ...`) rather than
+   * an implicit positional initializer.
+   *
+   * For example, in:
+   * ```c
+   * int x[] = { [0] = 1, 2 };
+   * ```
+   * - `[0] = 1` is a designator init, therefore `isDesignatorInit(0, 0)` holds.
+   * - `2` is a positional init for `x[1]`, therefore `isDesignatorInit(1, 1)` does **not** hold.
+   */
+  predicate isDesignatorInit(int elementIndex, int position) {
+    aggregate_array_init(underlyingElement(this), _, elementIndex, position, true)
   }
 
   /**
diff --git a/cpp/ql/lib/semmlecode.cpp.dbscheme b/cpp/ql/lib/semmlecode.cpp.dbscheme
index 0f0a390468a5..5923d7e8351f 100644
--- a/cpp/ql/lib/semmlecode.cpp.dbscheme
+++ b/cpp/ql/lib/semmlecode.cpp.dbscheme
@@ -2039,7 +2039,8 @@ aggregate_field_init(
     int aggregate: @aggregateliteral ref,
     int initializer: @expr ref,
     int field: @membervariable ref,
-    int position: int ref
+    int position: int ref,
+    boolean designated: boolean ref
 );
 
 /**
@@ -2051,7 +2052,8 @@ aggregate_array_init(
     int aggregate: @aggregateliteral ref,
     int initializer: @expr ref,
     int element_index: int ref,
-    int position: int ref
+    int position: int ref,
+    boolean designated: boolean ref
 );
 
 @ctorinit = @ctordirectinit
diff --git a/cpp/ql/lib/semmlecode.cpp.dbscheme.stats b/cpp/ql/lib/semmlecode.cpp.dbscheme.stats
index 585e8f31e0a1..0e0894531621 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>16215</v>
+            <v>16222</v>
         </e>
         <e>
             <k>@externalDataElement</k>
@@ -34,15 +34,19 @@
         </e>
         <e>
             <k>@file</k>
-            <v>83639</v>
+            <v>83676</v>
         </e>
         <e>
             <k>@folder</k>
-            <v>15890</v>
+            <v>15897</v>
         </e>
         <e>
             <k>@macro_expansion</k>
+<<<<<<< HEAD
             <v>40299208</v>
+=======
+            <v>40316851</v>
+>>>>>>> d32eedeb48e (C++: update stats file)
         </e>
         <e>
             <k>@other_macro_reference</k>
@@ -58,11 +62,19 @@
         </e>
         <e>
             <k>@var_decl</k>
+<<<<<<< HEAD
             <v>6734225</v>
         </e>
         <e>
             <k>@type_decl</k>
             <v>1890777</v>
+=======
+            <v>6734091</v>
+        </e>
+        <e>
+            <k>@type_decl</k>
+            <v>1891510</v>
+>>>>>>> d32eedeb48e (C++: update stats file)
         </e>
         <e>
             <k>@namespace_decl</k>
@@ -70,7 +82,11 @@
         </e>
         <e>
             <k>@using_declaration</k>
+<<<<<<< HEAD
             <v>333244</v>
+=======
+            <v>333146</v>
+>>>>>>> d32eedeb48e (C++: update stats file)
         </e>
         <e>
             <k>@using_directive</k>
@@ -98,7 +114,7 @@
         </e>
         <e>
             <k>@localvariable</k>
-            <v>735324</v>
+            <v>735323</v>
         </e>
         <e>
             <k>@enumconstant</k>
@@ -366,11 +382,15 @@
         </e>
         <e>
             <k>@decltype</k>
-            <v>22068</v>
+            <v>21996</v>
         </e>
         <e>
             <k>@usertype</k>
+<<<<<<< HEAD
             <v>4987434</v>
+=======
+            <v>4988303</v>
+>>>>>>> d32eedeb48e (C++: update stats file)
         </e>
         <e>
             <k>@mangledname</k>
@@ -390,7 +410,7 @@
         </e>
         <e>
             <k>@ptrtomember</k>
-            <v>12083</v>
+            <v>12089</v>
         </e>
         <e>
             <k>@specifier</k>
@@ -422,11 +442,15 @@
         </e>
         <e>
             <k>@attribute_arg_constant_expr</k>
+<<<<<<< HEAD
             <v>89600</v>
+=======
+            <v>89571</v>
+>>>>>>> d32eedeb48e (C++: update stats file)
         </e>
         <e>
             <k>@attribute_arg_expr</k>
-            <v>1801</v>
+            <v>1802</v>
         </e>
         <e>
             <k>@attribute_arg_empty</k>
@@ -446,7 +470,11 @@
         </e>
         <e>
             <k>@frienddecl</k>
+<<<<<<< HEAD
             <v>883308</v>
+=======
+            <v>883351</v>
+>>>>>>> d32eedeb48e (C++: update stats file)
         </e>
         <e>
             <k>@comment</k>
@@ -454,7 +482,7 @@
         </e>
         <e>
             <k>@namespace</k>
-            <v>11095</v>
+            <v>11099</v>
         </e>
         <e>
             <k>@specialnamequalifyingelement</k>
@@ -538,7 +566,11 @@
         </e>
         <e>
             <k>@divexpr</k>
+<<<<<<< HEAD
             <v>60352</v>
+=======
+            <v>60365</v>
+>>>>>>> d32eedeb48e (C++: update stats file)
         </e>
         <e>
             <k>@remexpr</k>
@@ -614,7 +646,7 @@
         </e>
         <e>
             <k>@assignmulexpr</k>
-            <v>14129</v>
+            <v>14135</v>
         </e>
         <e>
             <k>@assigndivexpr</k>
@@ -722,7 +754,11 @@
         </e>
         <e>
             <k>@literal</k>
+<<<<<<< HEAD
             <v>6101411</v>
+=======
+            <v>6101410</v>
+>>>>>>> d32eedeb48e (C++: update stats file)
         </e>
         <e>
             <k>@aggregateliteral</k>
@@ -734,7 +770,11 @@
         </e>
         <e>
             <k>@temp_init</k>
+<<<<<<< HEAD
             <v>1076139</v>
+=======
+            <v>1076142</v>
+>>>>>>> d32eedeb48e (C++: update stats file)
         </e>
         <e>
             <k>@errorexpr</k>
@@ -926,7 +966,7 @@
         </e>
         <e>
             <k>@delete_array_expr</k>
-            <v>1598</v>
+            <v>1599</v>
         </e>
         <e>
             <k>@new_array_expr</k>
@@ -966,7 +1006,11 @@
         </e>
         <e>
             <k>@static_cast</k>
+<<<<<<< HEAD
             <v>335479</v>
+=======
+            <v>335572</v>
+>>>>>>> d32eedeb48e (C++: update stats file)
         </e>
         <e>
             <k>@reinterpret_cast</k>
@@ -986,7 +1030,11 @@
         </e>
         <e>
             <k>@param_ref</k>
+<<<<<<< HEAD
             <v>177993</v>
+=======
+            <v>177994</v>
+>>>>>>> d32eedeb48e (C++: update stats file)
         </e>
         <e>
             <k>@noopexpr</k>
@@ -1146,7 +1194,7 @@
         </e>
         <e>
             <k>@builtinshuffle</k>
-            <v>785</v>
+            <v>786</v>
         </e>
         <e>
             <k>@blockassignexpr</k>
@@ -1430,7 +1478,11 @@
         </e>
         <e>
             <k>@stmt_decl</k>
+<<<<<<< HEAD
             <v>770895</v>
+=======
+            <v>770894</v>
+>>>>>>> d32eedeb48e (C++: update stats file)
         </e>
         <e>
             <k>@stmt_empty</k>
@@ -1502,7 +1554,7 @@
         </e>
         <e>
             <k>@ppd_elif</k>
-            <v>28110</v>
+            <v>28122</v>
         </e>
         <e>
             <k>@ppd_else</k>
@@ -1514,7 +1566,11 @@
         </e>
         <e>
             <k>@ppd_plain_include</k>
+<<<<<<< HEAD
             <v>408579</v>
+=======
+            <v>408758</v>
+>>>>>>> d32eedeb48e (C++: update stats file)
         </e>
         <e>
             <k>@ppd_define</k>
@@ -1592,11 +1648,11 @@
     <stats>
         <relation>
             <name>compilations</name>
-            <cardinality>16215</cardinality>
+            <cardinality>16222</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>16215</v>
+                    <v>16222</v>
                 </e>
                 <e>
                     <k>cwd</k>
@@ -1614,7 +1670,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>16215</v>
+                                    <v>16222</v>
                                 </b>
                             </bs>
                         </hist>
@@ -1640,11 +1696,15 @@
         </relation>
         <relation>
             <name>compilation_args</name>
+<<<<<<< HEAD
             <cardinality>1298229</cardinality>
+=======
+            <cardinality>1298797</cardinality>
+>>>>>>> d32eedeb48e (C++: update stats file)
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>16215</v>
+                    <v>16222</v>
                 </e>
                 <e>
                     <k>num</k>
@@ -1652,7 +1712,7 @@
                 </e>
                 <e>
                     <k>arg</k>
-                    <v>37538</v>
+                    <v>37555</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -1666,12 +1726,12 @@
                                 <b>
                                     <a>36</a>
                                     <b>42</b>
-                                    <v>1286</v>
+                                    <v>1287</v>
                                 </b>
                                 <b>
                                     <a>42</a>
                                     <b>43</b>
-                                    <v>1408</v>
+                                    <v>1409</v>
                                 </b>
                                 <b>
                                     <a>43</a>
@@ -1696,12 +1756,12 @@
                                 <b>
                                     <a>71</a>
                                     <b>72</b>
-                                    <v>907</v>
+                                    <v>908</v>
                                 </b>
                                 <b>
                                     <a>72</a>
                                     <b>90</b>
-                                    <v>1151</v>
+                                    <v>1152</v>
                                 </b>
                                 <b>
                                     <a>94</a>
@@ -1711,7 +1771,7 @@
                                 <b>
                                     <a>98</a>
                                     <b>99</b>
-                                    <v>1720</v>
+                                    <v>1721</v>
                                 </b>
                                 <b>
                                     <a>100</a>
@@ -1721,7 +1781,7 @@
                                 <b>
                                     <a>103</a>
                                     <b>104</b>
-                                    <v>2560</v>
+                                    <v>2561</v>
                                 </b>
                                 <b>
                                     <a>104</a>
@@ -1757,12 +1817,12 @@
                                 <b>
                                     <a>38</a>
                                     <b>39</b>
-                                    <v>1923</v>
+                                    <v>1924</v>
                                 </b>
                                 <b>
                                     <a>39</a>
                                     <b>40</b>
-                                    <v>1259</v>
+                                    <v>1260</v>
                                 </b>
                                 <b>
                                     <a>40</a>
@@ -1777,22 +1837,22 @@
                                 <b>
                                     <a>53</a>
                                     <b>54</b>
-                                    <v>907</v>
+                                    <v>908</v>
                                 </b>
                                 <b>
                                     <a>54</a>
                                     <b>63</b>
-                                    <v>1151</v>
+                                    <v>1152</v>
                                 </b>
                                 <b>
                                     <a>64</a>
                                     <b>67</b>
-                                    <v>514</v>
+                                    <v>515</v>
                                 </b>
                                 <b>
                                     <a>67</a>
                                     <b>68</b>
-                                    <v>1801</v>
+                                    <v>1802</v>
                                 </b>
                                 <b>
                                     <a>68</a>
@@ -1802,7 +1862,7 @@
                                 <b>
                                     <a>70</a>
                                     <b>71</b>
-                                    <v>1801</v>
+                                    <v>1802</v>
                                 </b>
                                 <b>
                                     <a>73</a>
@@ -1812,7 +1872,7 @@
                                 <b>
                                     <a>79</a>
                                     <b>89</b>
-                                    <v>1449</v>
+                                    <v>1450</v>
                                 </b>
                                 <b>
                                     <a>89</a>
@@ -1980,22 +2040,26 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>17191</v>
+                                    <v>17198</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
+<<<<<<< HEAD
                                     <v>16270</v>
+=======
+                                    <v>16277</v>
+>>>>>>> d32eedeb48e (C++: update stats file)
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>103</b>
-                                    <v>2817</v>
+                                    <v>2819</v>
                                 </b>
                                 <b>
                                     <a>104</a>
                                     <b>1198</b>
-                                    <v>1259</v>
+                                    <v>1260</v>
                                 </b>
                             </bs>
                         </hist>
@@ -2011,12 +2075,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>24858</v>
+                                    <v>24869</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>11189</v>
+                                    <v>11194</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -2031,11 +2095,11 @@
         </relation>
         <relation>
             <name>compilation_build_mode</name>
-            <cardinality>16215</cardinality>
+            <cardinality>16222</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>16215</v>
+                    <v>16222</v>
                 </e>
                 <e>
                     <k>mode</k>
@@ -2053,7 +2117,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>16215</v>
+                                    <v>16222</v>
                                 </b>
                             </bs>
                         </hist>
@@ -2079,11 +2143,11 @@
         </relation>
         <relation>
             <name>compilation_compiling_files</name>
-            <cardinality>16215</cardinality>
+            <cardinality>16222</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>16215</v>
+                    <v>16222</v>
                 </e>
                 <e>
                     <k>num</k>
@@ -2091,7 +2155,7 @@
                 </e>
                 <e>
                     <k>file</k>
-                    <v>7423</v>
+                    <v>7427</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -2105,7 +2169,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>16215</v>
+                                    <v>16222</v>
                                 </b>
                             </bs>
                         </hist>
@@ -2121,7 +2185,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>16215</v>
+                                    <v>16222</v>
                                 </b>
                             </bs>
                         </hist>
@@ -2174,7 +2238,7 @@
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>7220</v>
+                                    <v>7223</v>
                                 </b>
                                 <b>
                                     <a>28</a>
@@ -2195,7 +2259,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7423</v>
+                                    <v>7427</v>
                                 </b>
                             </bs>
                         </hist>
@@ -2205,11 +2269,11 @@
         </relation>
         <relation>
             <name>compilation_time</name>
-            <cardinality>64592</cardinality>
+            <cardinality>64620</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>16148</v>
+                    <v>16155</v>
                 </e>
                 <e>
                     <k>num</k>
@@ -2221,7 +2285,11 @@
                 </e>
                 <e>
                     <k>seconds</k>
+<<<<<<< HEAD
                     <v>17407</v>
+=======
+                    <v>17727</v>
+>>>>>>> d32eedeb48e (C++: update stats file)
                 </e>
             </columnsizes>
             <dependencies>
@@ -2235,7 +2303,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>16148</v>
+                                    <v>16155</v>
                                 </b>
                             </bs>
                         </hist>
@@ -2251,7 +2319,7 @@
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>16148</v>
+                                    <v>16155</v>
                                 </b>
                             </bs>
                         </hist>
@@ -2267,17 +2335,25 @@
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
+<<<<<<< HEAD
                                     <v>149</v>
+=======
+                                    <v>257</v>
+>>>>>>> d32eedeb48e (C++: update stats file)
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>8277</v>
+                                    <v>8036</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
+<<<<<<< HEAD
                                     <v>7721</v>
+=======
+                                    <v>7860</v>
+>>>>>>> d32eedeb48e (C++: update stats file)
                                 </b>
                             </bs>
                         </hist>
@@ -2323,8 +2399,13 @@
                             <budget>12</budget>
                             <bs>
                                 <b>
+<<<<<<< HEAD
                                     <a>1285</a>
                                     <b>1286</b>
+=======
+                                    <a>1308</a>
+                                    <b>1309</b>
+>>>>>>> d32eedeb48e (C++: update stats file)
                                     <v>13</v>
                                 </b>
                             </bs>
@@ -2376,11 +2457,12 @@
                                     <v>13</v>
                                 </b>
                                 <b>
-                                    <a>11</a>
-                                    <b>12</b>
+                                    <a>12</a>
+                                    <b>13</b>
                                     <v>13</v>
                                 </b>
                                 <b>
+<<<<<<< HEAD
                                     <a>718</a>
                                     <b>719</b>
                                     <v>13</v>
@@ -2388,6 +2470,15 @@
                                 <b>
                                     <a>769</a>
                                     <b>770</b>
+=======
+                                    <a>727</a>
+                                    <b>728</b>
+                                    <v>13</v>
+                                </b>
+                                <b>
+                                    <a>768</a>
+                                    <b>769</b>
+>>>>>>> d32eedeb48e (C++: update stats file)
                                     <v>13</v>
                                 </b>
                             </bs>
@@ -2404,16 +2495,25 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
+<<<<<<< HEAD
                                     <v>10837</v>
+=======
+                                    <v>11194</v>
+>>>>>>> d32eedeb48e (C++: update stats file)
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
+<<<<<<< HEAD
                                     <v>3617</v>
+=======
+                                    <v>3699</v>
+>>>>>>> d32eedeb48e (C++: update stats file)
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
+<<<<<<< HEAD
                                     <v>1368</v>
                                 </b>
                                 <b>
@@ -2425,6 +2525,19 @@
                                     <a>10</a>
                                     <b>694</b>
                                     <v>257</v>
+=======
+                                    <v>1355</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>22</b>
+                                    <v>1341</v>
+                                </b>
+                                <b>
+                                    <a>22</a>
+                                    <b>699</b>
+                                    <v>135</v>
+>>>>>>> d32eedeb48e (C++: update stats file)
                                 </b>
                             </bs>
                         </hist>
@@ -2440,7 +2553,11 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
+<<<<<<< HEAD
                                     <v>17407</v>
+=======
+                                    <v>17727</v>
+>>>>>>> d32eedeb48e (C++: update stats file)
                                 </b>
                             </bs>
                         </hist>
@@ -2456,17 +2573,21 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>14414</v>
+                                    <v>14908</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
+<<<<<<< HEAD
                                     <v>2980</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
                                     <v>13</v>
+=======
+                                    <v>2819</v>
+>>>>>>> d32eedeb48e (C++: update stats file)
                                 </b>
                             </bs>
                         </hist>
@@ -2722,15 +2843,19 @@
         </relation>
         <relation>
             <name>compilation_finished</name>
-            <cardinality>16215</cardinality>
+            <cardinality>16222</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>16215</v>
+                    <v>16222</v>
                 </e>
                 <e>
                     <k>cpu_seconds</k>
+<<<<<<< HEAD
                     <v>12083</v>
+=======
+                    <v>11858</v>
+>>>>>>> d32eedeb48e (C++: update stats file)
                 </e>
                 <e>
                     <k>elapsed_seconds</k>
@@ -2748,7 +2873,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>16215</v>
+                                    <v>16222</v>
                                 </b>
                             </bs>
                         </hist>
@@ -2764,7 +2889,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>16215</v>
+                                    <v>16222</v>
                                 </b>
                             </bs>
                         </hist>
@@ -2780,17 +2905,30 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
+<<<<<<< HEAD
                                     <v>10241</v>
+=======
+                                    <v>9812</v>
+>>>>>>> d32eedeb48e (C++: update stats file)
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
+<<<<<<< HEAD
                                     <v>1246</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>35</b>
                                     <v>596</v>
+=======
+                                    <v>1355</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>23</b>
+                                    <v>691</v>
+>>>>>>> d32eedeb48e (C++: update stats file)
                                 </b>
                             </bs>
                         </hist>
@@ -2806,12 +2944,20 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
+<<<<<<< HEAD
                                     <v>11365</v>
+=======
+                                    <v>11059</v>
+>>>>>>> d32eedeb48e (C++: update stats file)
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
+<<<<<<< HEAD
                                     <v>717</v>
+=======
+                                    <v>799</v>
+>>>>>>> d32eedeb48e (C++: update stats file)
                                 </b>
                             </bs>
                         </hist>
@@ -2827,11 +2973,19 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
+<<<<<<< HEAD
                                     <v>67</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
+=======
+                                    <v>54</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>4</b>
+>>>>>>> d32eedeb48e (C++: update stats file)
                                     <v>13</v>
                                 </b>
                                 <b>
@@ -2840,6 +2994,7 @@
                                     <v>13</v>
                                 </b>
                                 <b>
+<<<<<<< HEAD
                                     <a>6</a>
                                     <b>7</b>
                                     <v>13</v>
@@ -2882,6 +3037,60 @@
                                 <b>
                                     <a>330</a>
                                     <b>331</b>
+=======
+                                    <a>8</a>
+                                    <b>9</b>
+                                    <v>13</v>
+                                </b>
+                                <b>
+                                    <a>9</a>
+                                    <b>10</b>
+                                    <v>27</v>
+                                </b>
+                                <b>
+                                    <a>12</a>
+                                    <b>13</b>
+                                    <v>13</v>
+                                </b>
+                                <b>
+                                    <a>16</a>
+                                    <b>17</b>
+                                    <v>13</v>
+                                </b>
+                                <b>
+                                    <a>19</a>
+                                    <b>20</b>
+                                    <v>13</v>
+                                </b>
+                                <b>
+                                    <a>24</a>
+                                    <b>25</b>
+                                    <v>13</v>
+                                </b>
+                                <b>
+                                    <a>48</a>
+                                    <b>49</b>
+                                    <v>13</v>
+                                </b>
+                                <b>
+                                    <a>147</a>
+                                    <b>148</b>
+                                    <v>13</v>
+                                </b>
+                                <b>
+                                    <a>263</a>
+                                    <b>264</b>
+                                    <v>13</v>
+                                </b>
+                                <b>
+                                    <a>303</a>
+                                    <b>304</b>
+                                    <v>13</v>
+                                </b>
+                                <b>
+                                    <a>325</a>
+                                    <b>326</b>
+>>>>>>> d32eedeb48e (C++: update stats file)
                                     <v>13</v>
                                 </b>
                             </bs>
@@ -2898,11 +3107,19 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
+<<<<<<< HEAD
                                     <v>67</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
+=======
+                                    <v>54</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>4</b>
+>>>>>>> d32eedeb48e (C++: update stats file)
                                     <v>13</v>
                                 </b>
                                 <b>
@@ -2911,6 +3128,7 @@
                                     <v>13</v>
                                 </b>
                                 <b>
+<<<<<<< HEAD
                                     <a>6</a>
                                     <b>7</b>
                                     <v>13</v>
@@ -2953,6 +3171,60 @@
                                 <b>
                                     <a>267</a>
                                     <b>268</b>
+=======
+                                    <a>8</a>
+                                    <b>9</b>
+                                    <v>13</v>
+                                </b>
+                                <b>
+                                    <a>9</a>
+                                    <b>10</b>
+                                    <v>27</v>
+                                </b>
+                                <b>
+                                    <a>12</a>
+                                    <b>13</b>
+                                    <v>13</v>
+                                </b>
+                                <b>
+                                    <a>16</a>
+                                    <b>17</b>
+                                    <v>13</v>
+                                </b>
+                                <b>
+                                    <a>19</a>
+                                    <b>20</b>
+                                    <v>13</v>
+                                </b>
+                                <b>
+                                    <a>24</a>
+                                    <b>25</b>
+                                    <v>13</v>
+                                </b>
+                                <b>
+                                    <a>48</a>
+                                    <b>49</b>
+                                    <v>13</v>
+                                </b>
+                                <b>
+                                    <a>143</a>
+                                    <b>144</b>
+                                    <v>13</v>
+                                </b>
+                                <b>
+                                    <a>159</a>
+                                    <b>160</b>
+                                    <v>13</v>
+                                </b>
+                                <b>
+                                    <a>232</a>
+                                    <b>233</b>
+                                    <v>13</v>
+                                </b>
+                                <b>
+                                    <a>241</a>
+                                    <b>242</b>
+>>>>>>> d32eedeb48e (C++: update stats file)
                                     <v>13</v>
                                 </b>
                             </bs>
@@ -11159,15 +11431,15 @@
         </relation>
         <relation>
             <name>files</name>
-            <cardinality>83639</cardinality>
+            <cardinality>83676</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>83639</v>
+                    <v>83676</v>
                 </e>
                 <e>
                     <k>name</k>
-                    <v>83639</v>
+                    <v>83676</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -11181,7 +11453,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>83639</v>
+                                    <v>83676</v>
                                 </b>
                             </bs>
                         </hist>
@@ -11197,7 +11469,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>83639</v>
+                                    <v>83676</v>
                                 </b>
                             </bs>
                         </hist>
@@ -11207,15 +11479,15 @@
         </relation>
         <relation>
             <name>folders</name>
-            <cardinality>15890</cardinality>
+            <cardinality>15897</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>15890</v>
+                    <v>15897</v>
                 </e>
                 <e>
                     <k>name</k>
-                    <v>15890</v>
+                    <v>15897</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -11229,7 +11501,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>15890</v>
+                                    <v>15897</v>
                                 </b>
                             </bs>
                         </hist>
@@ -11245,7 +11517,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>15890</v>
+                                    <v>15897</v>
                                 </b>
                             </bs>
                         </hist>
@@ -11255,15 +11527,23 @@
         </relation>
         <relation>
             <name>containerparent</name>
+<<<<<<< HEAD
             <cardinality>99503</cardinality>
+=======
+            <cardinality>99546</cardinality>
+>>>>>>> d32eedeb48e (C++: update stats file)
             <columnsizes>
                 <e>
                     <k>parent</k>
-                    <v>15890</v>
+                    <v>15897</v>
                 </e>
                 <e>
                     <k>child</k>
+<<<<<<< HEAD
                     <v>99503</v>
+=======
+                    <v>99546</v>
+>>>>>>> d32eedeb48e (C++: update stats file)
                 </e>
             </columnsizes>
             <dependencies>
@@ -11277,12 +11557,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7735</v>
+                                    <v>7738</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>1950</v>
+                                    <v>1951</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -11292,7 +11572,7 @@
                                 <b>
                                     <a>4</a>
                                     <b>6</b>
-                                    <v>1286</v>
+                                    <v>1287</v>
                                 </b>
                                 <b>
                                     <a>6</a>
@@ -11302,7 +11582,7 @@
                                 <b>
                                     <a>10</a>
                                     <b>16</b>
-                                    <v>1286</v>
+                                    <v>1287</v>
                                 </b>
                                 <b>
                                     <a>16</a>
@@ -11328,7 +11608,11 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
+<<<<<<< HEAD
                                     <v>99503</v>
+=======
+                                    <v>99546</v>
+>>>>>>> d32eedeb48e (C++: update stats file)
                                 </b>
                             </bs>
                         </hist>
@@ -11338,11 +11622,15 @@
         </relation>
         <relation>
             <name>fileannotations</name>
+<<<<<<< HEAD
             <cardinality>5387479</cardinality>
+=======
+            <cardinality>5389838</cardinality>
+>>>>>>> d32eedeb48e (C++: update stats file)
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>7396</v>
+                    <v>7399</v>
                 </e>
                 <e>
                     <k>kind</k>
@@ -11350,11 +11638,15 @@
                 </e>
                 <e>
                     <k>name</k>
+<<<<<<< HEAD
                     <v>75308</v>
+=======
+                    <v>75341</v>
+>>>>>>> d32eedeb48e (C++: update stats file)
                 </e>
                 <e>
                     <k>value</k>
-                    <v>50679</v>
+                    <v>50701</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -11373,7 +11665,7 @@
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>7139</v>
+                                    <v>7142</v>
                                 </b>
                             </bs>
                         </hist>
@@ -11399,7 +11691,7 @@
                                 <b>
                                     <a>212</a>
                                     <b>291</b>
-                                    <v>568</v>
+                                    <v>569</v>
                                 </b>
                                 <b>
                                     <a>291</a>
@@ -11424,7 +11716,7 @@
                                 <b>
                                     <a>550</a>
                                     <b>551</b>
-                                    <v>1706</v>
+                                    <v>1707</v>
                                 </b>
                                 <b>
                                     <a>553</a>
@@ -11439,7 +11731,7 @@
                                 <b>
                                     <a>753</a>
                                     <b>1231</b>
-                                    <v>568</v>
+                                    <v>569</v>
                                 </b>
                                 <b>
                                     <a>1234</a>
@@ -11475,12 +11767,12 @@
                                 <b>
                                     <a>352</a>
                                     <b>434</b>
-                                    <v>568</v>
+                                    <v>569</v>
                                 </b>
                                 <b>
                                     <a>434</a>
                                     <b>490</b>
-                                    <v>568</v>
+                                    <v>569</v>
                                 </b>
                                 <b>
                                     <a>490</a>
@@ -11495,7 +11787,7 @@
                                 <b>
                                     <a>706</a>
                                     <b>707</b>
-                                    <v>1706</v>
+                                    <v>1707</v>
                                 </b>
                                 <b>
                                     <a>710</a>
@@ -11599,62 +11891,62 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>14143</v>
+                                    <v>14149</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>5594</v>
+                                    <v>5597</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>5</b>
-                                    <v>6489</v>
+                                    <v>6491</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>7</b>
-                                    <v>5256</v>
+                                    <v>5258</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>9</b>
-                                    <v>5892</v>
+                                    <v>5895</v>
                                 </b>
                                 <b>
                                     <a>9</a>
                                     <b>16</b>
-                                    <v>5554</v>
+                                    <v>5556</v>
                                 </b>
                                 <b>
                                     <a>16</a>
                                     <b>19</b>
-                                    <v>6272</v>
+                                    <v>6275</v>
                                 </b>
                                 <b>
                                     <a>19</a>
                                     <b>27</b>
-                                    <v>5459</v>
+                                    <v>5461</v>
                                 </b>
                                 <b>
                                     <a>27</a>
                                     <b>47</b>
-                                    <v>6204</v>
+                                    <v>6207</v>
                                 </b>
                                 <b>
                                     <a>47</a>
                                     <b>128</b>
-                                    <v>6312</v>
+                                    <v>6315</v>
                                 </b>
                                 <b>
                                     <a>128</a>
                                     <b>459</b>
-                                    <v>5933</v>
+                                    <v>5936</v>
                                 </b>
                                 <b>
                                     <a>459</a>
                                     <b>546</b>
-                                    <v>2194</v>
+                                    <v>2195</v>
                                 </b>
                             </bs>
                         </hist>
@@ -11670,7 +11962,11 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
+<<<<<<< HEAD
                                     <v>75308</v>
+=======
+                                    <v>75341</v>
+>>>>>>> d32eedeb48e (C++: update stats file)
                                 </b>
                             </bs>
                         </hist>
@@ -11686,57 +11982,57 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>14861</v>
+                                    <v>14867</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>9862</v>
+                                    <v>9866</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>5256</v>
+                                    <v>5258</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>6</b>
-                                    <v>5215</v>
+                                    <v>5217</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>8</b>
-                                    <v>4389</v>
+                                    <v>4391</v>
                                 </b>
                                 <b>
                                     <a>8</a>
                                     <b>11</b>
-                                    <v>6082</v>
+                                    <v>6085</v>
                                 </b>
                                 <b>
                                     <a>11</a>
                                     <b>17</b>
-                                    <v>6922</v>
+                                    <v>6925</v>
                                 </b>
                                 <b>
                                     <a>17</a>
                                     <b>23</b>
-                                    <v>6028</v>
+                                    <v>6031</v>
                                 </b>
                                 <b>
                                     <a>23</a>
                                     <b>41</b>
-                                    <v>6001</v>
+                                    <v>6003</v>
                                 </b>
                                 <b>
                                     <a>41</a>
                                     <b>95</b>
-                                    <v>5730</v>
+                                    <v>5732</v>
                                 </b>
                                 <b>
                                     <a>95</a>
                                     <b>1726</b>
-                                    <v>4958</v>
+                                    <v>4960</v>
                                 </b>
                             </bs>
                         </hist>
@@ -11752,72 +12048,76 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4307</v>
+                                    <v>4309</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>4</b>
-                                    <v>2099</v>
+                                    <v>2100</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>4091</v>
+                                    <v>4093</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>8</b>
-                                    <v>3156</v>
+                                    <v>3157</v>
                                 </b>
                                 <b>
                                     <a>8</a>
                                     <b>14</b>
-                                    <v>3806</v>
+                                    <v>3808</v>
                                 </b>
                                 <b>
                                     <a>14</a>
                                     <b>17</b>
-                                    <v>2479</v>
+                                    <v>2480</v>
                                 </b>
                                 <b>
                                     <a>17</a>
                                     <b>24</b>
-                                    <v>3901</v>
+                                    <v>3903</v>
                                 </b>
                                 <b>
                                     <a>24</a>
                                     <b>51</b>
-                                    <v>4538</v>
+                                    <v>4540</v>
                                 </b>
                                 <b>
                                     <a>51</a>
                                     <b>58</b>
+<<<<<<< HEAD
                                     <v>3888</v>
+=======
+                                    <v>3889</v>
+>>>>>>> d32eedeb48e (C++: update stats file)
                                 </b>
                                 <b>
                                     <a>58</a>
                                     <b>80</b>
-                                    <v>3820</v>
+                                    <v>3821</v>
                                 </b>
                                 <b>
                                     <a>81</a>
                                     <b>151</b>
-                                    <v>3955</v>
+                                    <v>3957</v>
                                 </b>
                                 <b>
                                     <a>151</a>
                                     <b>334</b>
-                                    <v>3820</v>
+                                    <v>3821</v>
                                 </b>
                                 <b>
                                     <a>334</a>
                                     <b>473</b>
-                                    <v>3847</v>
+                                    <v>3849</v>
                                 </b>
                                 <b>
                                     <a>473</a>
                                     <b>547</b>
-                                    <v>2966</v>
+                                    <v>2968</v>
                                 </b>
                             </bs>
                         </hist>
@@ -11833,7 +12133,11 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
+<<<<<<< HEAD
                                     <v>50666</v>
+=======
+                                    <v>50688</v>
+>>>>>>> d32eedeb48e (C++: update stats file)
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -11854,67 +12158,71 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4362</v>
+                                    <v>4364</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>4</b>
-                                    <v>2452</v>
+                                    <v>2453</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>3915</v>
+                                    <v>3916</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>8</b>
-                                    <v>3183</v>
+                                    <v>3184</v>
                                 </b>
                                 <b>
                                     <a>8</a>
                                     <b>14</b>
-                                    <v>4470</v>
+                                    <v>4472</v>
                                 </b>
                                 <b>
                                     <a>14</a>
                                     <b>18</b>
-                                    <v>4429</v>
+                                    <v>4431</v>
                                 </b>
                                 <b>
                                     <a>18</a>
                                     <b>28</b>
-                                    <v>4104</v>
+                                    <v>4106</v>
                                 </b>
                                 <b>
                                     <a>28</a>
                                     <b>34</b>
-                                    <v>4037</v>
+                                    <v>4038</v>
                                 </b>
                                 <b>
                                     <a>34</a>
                                     <b>41</b>
-                                    <v>4104</v>
+                                    <v>4106</v>
                                 </b>
                                 <b>
                                     <a>41</a>
                                     <b>66</b>
-                                    <v>3833</v>
+                                    <v>3835</v>
                                 </b>
                                 <b>
                                     <a>66</a>
                                     <b>92</b>
-                                    <v>3942</v>
+                                    <v>3943</v>
                                 </b>
                                 <b>
                                     <a>92</a>
                                     <b>113</b>
-                                    <v>3833</v>
+                                    <v>3835</v>
                                 </b>
                                 <b>
                                     <a>113</a>
                                     <b>145</b>
+<<<<<<< HEAD
                                     <v>3888</v>
+=======
+                                    <v>3889</v>
+>>>>>>> d32eedeb48e (C++: update stats file)
                                 </b>
                                 <b>
                                     <a>145</a>
@@ -12002,7 +12310,11 @@
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
+<<<<<<< HEAD
                                     <v>743634</v>
+=======
+                                    <v>743632</v>
+>>>>>>> d32eedeb48e (C++: update stats file)
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -12037,7 +12349,11 @@
                                 <b>
                                     <a>11</a>
                                     <b>337</b>
+<<<<<<< HEAD
                                     <v>306934</v>
+=======
+                                    <v>306936</v>
+>>>>>>> d32eedeb48e (C++: update stats file)
                                 </b>
                                 <b>
                                     <a>339</a>
@@ -12195,6 +12511,7 @@
         </relation>
         <relation>
             <name>macroinvocations</name>
+<<<<<<< HEAD
             <cardinality>40601294</cardinality>
             <columnsizes>
                 <e>
@@ -12208,6 +12525,21 @@
                 <e>
                     <k>location</k>
                     <v>1070096</v>
+=======
+            <cardinality>40619070</cardinality>
+            <columnsizes>
+                <e>
+                    <k>id</k>
+                    <v>40619070</v>
+                </e>
+                <e>
+                    <k>macro_id</k>
+                    <v>109955</v>
+                </e>
+                <e>
+                    <k>location</k>
+                    <v>1070564</v>
+>>>>>>> d32eedeb48e (C++: update stats file)
                 </e>
                 <e>
                     <k>kind</k>
@@ -12225,7 +12557,11 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
+<<<<<<< HEAD
                                     <v>40601294</v>
+=======
+                                    <v>40619070</v>
+>>>>>>> d32eedeb48e (C++: update stats file)
                                 </b>
                             </bs>
                         </hist>
@@ -12241,7 +12577,11 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
+<<<<<<< HEAD
                                     <v>40601294</v>
+=======
+                                    <v>40619070</v>
+>>>>>>> d32eedeb48e (C++: update stats file)
                                 </b>
                             </bs>
                         </hist>
@@ -12257,7 +12597,11 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
+<<<<<<< HEAD
                                     <v>40601294</v>
+=======
+                                    <v>40619070</v>
+>>>>>>> d32eedeb48e (C++: update stats file)
                                 </b>
                             </bs>
                         </hist>
@@ -12273,52 +12617,52 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>23517</v>
+                                    <v>23528</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>20428</v>
+                                    <v>20437</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>7491</v>
+                                    <v>7494</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>6</b>
-                                    <v>10106</v>
+                                    <v>10110</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>11</b>
-                                    <v>9455</v>
+                                    <v>9459</v>
                                 </b>
                                 <b>
                                     <a>11</a>
                                     <b>21</b>
-                                    <v>9184</v>
+                                    <v>9188</v>
                                 </b>
                                 <b>
                                     <a>21</a>
                                     <b>48</b>
-                                    <v>8250</v>
+                                    <v>8253</v>
                                 </b>
                                 <b>
                                     <a>48</a>
                                     <b>145</b>
-                                    <v>8304</v>
+                                    <v>8307</v>
                                 </b>
                                 <b>
                                     <a>145</a>
                                     <b>952</b>
-                                    <v>8250</v>
+                                    <v>8253</v>
                                 </b>
                                 <b>
                                     <a>954</a>
                                     <b>175299</b>
-                                    <v>4917</v>
+                                    <v>4919</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12334,37 +12678,37 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>60257</v>
+                                    <v>60283</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>13641</v>
+                                    <v>13647</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>6881</v>
+                                    <v>6884</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>6</b>
-                                    <v>8724</v>
+                                    <v>8728</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>13</b>
-                                    <v>9442</v>
+                                    <v>9446</v>
                                 </b>
                                 <b>
                                     <a>13</a>
                                     <b>67</b>
-                                    <v>8290</v>
+                                    <v>8294</v>
                                 </b>
                                 <b>
                                     <a>67</a>
                                     <b>4815</b>
-                                    <v>2668</v>
+                                    <v>2669</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12380,12 +12724,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>101453</v>
+                                    <v>101498</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>8453</v>
+                                    <v>8457</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12401,37 +12745,61 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
+<<<<<<< HEAD
                                     <v>426610</v>
+=======
+                                    <v>426797</v>
+>>>>>>> d32eedeb48e (C++: update stats file)
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
+<<<<<<< HEAD
                                     <v>252707</v>
+=======
+                                    <v>252817</v>
+>>>>>>> d32eedeb48e (C++: update stats file)
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
+<<<<<<< HEAD
                                     <v>113199</v>
+=======
+                                    <v>113248</v>
+>>>>>>> d32eedeb48e (C++: update stats file)
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>6</b>
+<<<<<<< HEAD
                                     <v>77502</v>
+=======
+                                    <v>77536</v>
+>>>>>>> d32eedeb48e (C++: update stats file)
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>11</b>
+<<<<<<< HEAD
                                     <v>82759</v>
+=======
+                                    <v>82795</v>
+>>>>>>> d32eedeb48e (C++: update stats file)
                                 </b>
                                 <b>
                                     <a>11</a>
                                     <b>42</b>
+<<<<<<< HEAD
                                     <v>80456</v>
+=======
+                                    <v>80491</v>
+>>>>>>> d32eedeb48e (C++: update stats file)
                                 </b>
                                 <b>
                                     <a>42</a>
                                     <b>226288</b>
-                                    <v>36861</v>
+                                    <v>36877</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12447,12 +12815,20 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
+<<<<<<< HEAD
                                     <v>1009649</v>
+=======
+                                    <v>1010091</v>
+>>>>>>> d32eedeb48e (C++: update stats file)
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>367</b>
+<<<<<<< HEAD
                                     <v>60447</v>
+=======
+                                    <v>60473</v>
+>>>>>>> d32eedeb48e (C++: update stats file)
                                 </b>
                             </bs>
                         </hist>
@@ -12468,7 +12844,11 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
+<<<<<<< HEAD
                                     <v>1070096</v>
+=======
+                                    <v>1070564</v>
+>>>>>>> d32eedeb48e (C++: update stats file)
                                 </b>
                             </bs>
                         </hist>
@@ -12541,6 +12921,7 @@
         </relation>
         <relation>
             <name>macroparent</name>
+<<<<<<< HEAD
             <cardinality>35811023</cardinality>
             <columnsizes>
                 <e>
@@ -12550,6 +12931,17 @@
                 <e>
                     <k>parent_id</k>
                     <v>28060082</v>
+=======
+            <cardinality>35826702</cardinality>
+            <columnsizes>
+                <e>
+                    <k>id</k>
+                    <v>35826702</v>
+                </e>
+                <e>
+                    <k>parent_id</k>
+                    <v>28072367</v>
+>>>>>>> d32eedeb48e (C++: update stats file)
                 </e>
             </columnsizes>
             <dependencies>
@@ -12563,7 +12955,11 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
+<<<<<<< HEAD
                                     <v>35811023</v>
+=======
+                                    <v>35826702</v>
+>>>>>>> d32eedeb48e (C++: update stats file)
                                 </b>
                             </bs>
                         </hist>
@@ -12579,17 +12975,29 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
+<<<<<<< HEAD
                                     <v>21858004</v>
+=======
+                                    <v>21867574</v>
+>>>>>>> d32eedeb48e (C++: update stats file)
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
+<<<<<<< HEAD
                                     <v>5174275</v>
+=======
+                                    <v>5176540</v>
+>>>>>>> d32eedeb48e (C++: update stats file)
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>91</b>
+<<<<<<< HEAD
                                     <v>1027802</v>
+=======
+                                    <v>1028252</v>
+>>>>>>> d32eedeb48e (C++: update stats file)
                                 </b>
                             </bs>
                         </hist>
@@ -12677,11 +13085,19 @@
         </relation>
         <relation>
             <name>macro_argument_unexpanded</name>
+<<<<<<< HEAD
             <cardinality>103252337</cardinality>
             <columnsizes>
                 <e>
                     <k>invocation</k>
                     <v>31226086</v>
+=======
+            <cardinality>103297544</cardinality>
+            <columnsizes>
+                <e>
+                    <k>invocation</k>
+                    <v>31239757</v>
+>>>>>>> d32eedeb48e (C++: update stats file)
                 </e>
                 <e>
                     <k>argument_index</k>
@@ -12689,7 +13105,11 @@
                 </e>
                 <e>
                     <k>text</k>
+<<<<<<< HEAD
                     <v>440266</v>
+=======
+                    <v>440458</v>
+>>>>>>> d32eedeb48e (C++: update stats file)
                 </e>
             </columnsizes>
             <dependencies>
@@ -12703,22 +13123,38 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
+<<<<<<< HEAD
                                     <v>9979461</v>
+=======
+                                    <v>9983830</v>
+>>>>>>> d32eedeb48e (C++: update stats file)
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
+<<<<<<< HEAD
                                     <v>12505068</v>
+=======
+                                    <v>12510543</v>
+>>>>>>> d32eedeb48e (C++: update stats file)
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
+<<<<<<< HEAD
                                     <v>6395516</v>
+=======
+                                    <v>6398316</v>
+>>>>>>> d32eedeb48e (C++: update stats file)
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>67</b>
+<<<<<<< HEAD
                                     <v>2346040</v>
+=======
+                                    <v>2347067</v>
+>>>>>>> d32eedeb48e (C++: update stats file)
                                 </b>
                             </bs>
                         </hist>
@@ -12734,22 +13170,38 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
+<<<<<<< HEAD
                                     <v>10213703</v>
+=======
+                                    <v>10218175</v>
+>>>>>>> d32eedeb48e (C++: update stats file)
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
+<<<<<<< HEAD
                                     <v>12526567</v>
+=======
+                                    <v>12532051</v>
+>>>>>>> d32eedeb48e (C++: update stats file)
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
+<<<<<<< HEAD
                                     <v>6195602</v>
+=======
+                                    <v>6198315</v>
+>>>>>>> d32eedeb48e (C++: update stats file)
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>67</b>
+<<<<<<< HEAD
                                     <v>2290213</v>
+=======
+                                    <v>2291215</v>
+>>>>>>> d32eedeb48e (C++: update stats file)
                                 </b>
                             </bs>
                         </hist>
@@ -12765,7 +13217,7 @@
                                 <b>
                                     <a>46457</a>
                                     <b>46458</b>
-                                    <v>785</v>
+                                    <v>786</v>
                                 </b>
                                 <b>
                                     <a>46659</a>
@@ -12791,7 +13243,7 @@
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>785</v>
+                                    <v>786</v>
                                 </b>
                                 <b>
                                     <a>13</a>
@@ -12817,57 +13269,65 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>52020</v>
+                                    <v>52043</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>79995</v>
+                                    <v>80030</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>29681</v>
+                                    <v>29694</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>44447</v>
+                                    <v>44467</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>6</b>
-                                    <v>50218</v>
+                                    <v>50240</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>9</b>
-                                    <v>36590</v>
+                                    <v>36606</v>
                                 </b>
                                 <b>
                                     <a>9</a>
                                     <b>15</b>
+<<<<<<< HEAD
                                     <v>36848</v>
+=======
+                                    <v>36864</v>
+>>>>>>> d32eedeb48e (C++: update stats file)
                                 </b>
                                 <b>
                                     <a>15</a>
                                     <b>27</b>
-                                    <v>33515</v>
+                                    <v>33530</v>
                                 </b>
                                 <b>
                                     <a>27</a>
                                     <b>57</b>
+<<<<<<< HEAD
                                     <v>34125</v>
+=======
+                                    <v>34140</v>
+>>>>>>> d32eedeb48e (C++: update stats file)
                                 </b>
                                 <b>
                                     <a>57</a>
                                     <b>517</b>
-                                    <v>33244</v>
+                                    <v>33259</v>
                                 </b>
                                 <b>
                                     <a>518</a>
                                     <b>485091</b>
-                                    <v>9577</v>
+                                    <v>9581</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12883,17 +13343,29 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
+<<<<<<< HEAD
                                     <v>311894</v>
+=======
+                                    <v>312030</v>
+>>>>>>> d32eedeb48e (C++: update stats file)
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
+<<<<<<< HEAD
                                     <v>115272</v>
+=======
+                                    <v>115322</v>
+>>>>>>> d32eedeb48e (C++: update stats file)
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>9</b>
+<<<<<<< HEAD
                                     <v>13100</v>
+=======
+                                    <v>13105</v>
+>>>>>>> d32eedeb48e (C++: update stats file)
                                 </b>
                             </bs>
                         </hist>
@@ -12903,11 +13375,19 @@
         </relation>
         <relation>
             <name>macro_argument_expanded</name>
+<<<<<<< HEAD
             <cardinality>103252337</cardinality>
             <columnsizes>
                 <e>
                     <k>invocation</k>
                     <v>31226086</v>
+=======
+            <cardinality>103297544</cardinality>
+            <columnsizes>
+                <e>
+                    <k>invocation</k>
+                    <v>31239757</v>
+>>>>>>> d32eedeb48e (C++: update stats file)
                 </e>
                 <e>
                     <k>argument_index</k>
@@ -12915,7 +13395,11 @@
                 </e>
                 <e>
                     <k>text</k>
+<<<<<<< HEAD
                     <v>266687</v>
+=======
+                    <v>266804</v>
+>>>>>>> d32eedeb48e (C++: update stats file)
                 </e>
             </columnsizes>
             <dependencies>
@@ -12929,22 +13413,38 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
+<<<<<<< HEAD
                                     <v>9979461</v>
+=======
+                                    <v>9983830</v>
+>>>>>>> d32eedeb48e (C++: update stats file)
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
+<<<<<<< HEAD
                                     <v>12505068</v>
+=======
+                                    <v>12510543</v>
+>>>>>>> d32eedeb48e (C++: update stats file)
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
+<<<<<<< HEAD
                                     <v>6395516</v>
+=======
+                                    <v>6398316</v>
+>>>>>>> d32eedeb48e (C++: update stats file)
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>67</b>
+<<<<<<< HEAD
                                     <v>2346040</v>
+=======
+                                    <v>2347067</v>
+>>>>>>> d32eedeb48e (C++: update stats file)
                                 </b>
                             </bs>
                         </hist>
@@ -12960,22 +13460,38 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
+<<<<<<< HEAD
                                     <v>13763116</v>
+=======
+                                    <v>13769142</v>
+>>>>>>> d32eedeb48e (C++: update stats file)
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
+<<<<<<< HEAD
                                     <v>10789751</v>
+=======
+                                    <v>10794475</v>
+>>>>>>> d32eedeb48e (C++: update stats file)
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
+<<<<<<< HEAD
                                     <v>5403993</v>
+=======
+                                    <v>5406359</v>
+>>>>>>> d32eedeb48e (C++: update stats file)
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>9</b>
+<<<<<<< HEAD
                                     <v>1269224</v>
+=======
+                                    <v>1269780</v>
+>>>>>>> d32eedeb48e (C++: update stats file)
                                 </b>
                             </bs>
                         </hist>
@@ -12991,7 +13507,7 @@
                                 <b>
                                     <a>46457</a>
                                     <b>46458</b>
-                                    <v>785</v>
+                                    <v>786</v>
                                 </b>
                                 <b>
                                     <a>46659</a>
@@ -13043,57 +13559,57 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>28299</v>
+                                    <v>28312</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>35154</v>
+                                    <v>35170</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>58509</v>
+                                    <v>58535</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>20564</v>
+                                    <v>20573</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>6</b>
-                                    <v>3996</v>
+                                    <v>3998</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>7</b>
-                                    <v>23314</v>
+                                    <v>23324</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>10</b>
-                                    <v>21770</v>
+                                    <v>21779</v>
                                 </b>
                                 <b>
                                     <a>10</a>
                                     <b>19</b>
-                                    <v>22948</v>
+                                    <v>22958</v>
                                 </b>
                                 <b>
                                     <a>19</a>
                                     <b>51</b>
-                                    <v>20076</v>
+                                    <v>20085</v>
                                 </b>
                                 <b>
                                     <a>51</a>
                                     <b>253</b>
-                                    <v>20090</v>
+                                    <v>20099</v>
                                 </b>
                                 <b>
                                     <a>254</a>
                                     <b>990266</b>
-                                    <v>11962</v>
+                                    <v>11967</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13109,17 +13625,21 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>134779</v>
+                                    <v>134838</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
+<<<<<<< HEAD
                                     <v>114039</v>
+=======
+                                    <v>114089</v>
+>>>>>>> d32eedeb48e (C++: update stats file)
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>66</b>
-                                    <v>17868</v>
+                                    <v>17876</v>
                                 </b>
                             </bs>
                         </hist>
@@ -15296,11 +15816,19 @@
         </relation>
         <relation>
             <name>var_decls</name>
+<<<<<<< HEAD
             <cardinality>6739203</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
                     <v>6734225</v>
+=======
+            <cardinality>6739069</cardinality>
+            <columnsizes>
+                <e>
+                    <k>id</k>
+                    <v>6734091</v>
+>>>>>>> d32eedeb48e (C++: update stats file)
                 </e>
                 <e>
                     <k>variable</k>
@@ -15330,7 +15858,11 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
+<<<<<<< HEAD
                                     <v>6734225</v>
+=======
+                                    <v>6734091</v>
+>>>>>>> d32eedeb48e (C++: update stats file)
                                 </b>
                             </bs>
                         </hist>
@@ -15346,7 +15878,11 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
+<<<<<<< HEAD
                                     <v>6729247</v>
+=======
+                                    <v>6729112</v>
+>>>>>>> d32eedeb48e (C++: update stats file)
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -15367,7 +15903,11 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
+<<<<<<< HEAD
                                     <v>6734225</v>
+=======
+                                    <v>6734091</v>
+>>>>>>> d32eedeb48e (C++: update stats file)
                                 </b>
                             </bs>
                         </hist>
@@ -15383,7 +15923,11 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
+<<<<<<< HEAD
                                     <v>6734225</v>
+=======
+                                    <v>6734091</v>
+>>>>>>> d32eedeb48e (C++: update stats file)
                                 </b>
                             </bs>
                         </hist>
@@ -15399,12 +15943,16 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
+<<<<<<< HEAD
                                     <v>6408486</v>
+=======
+                                    <v>6408621</v>
+>>>>>>> d32eedeb48e (C++: update stats file)
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>4</b>
-                                    <v>157285</v>
+                                    <v>157151</v>
                                 </b>
                             </bs>
                         </hist>
@@ -15646,7 +16194,7 @@
                                 </b>
                                 <b>
                                     <a>28</a>
-                                    <b>6411</b>
+                                    <b>6410</b>
                                     <v>27716</v>
                                 </b>
                             </bs>
@@ -15780,7 +16328,7 @@
                                 </b>
                                 <b>
                                     <a>4</a>
-                                    <b>2760</b>
+                                    <b>2759</b>
                                     <v>194017</v>
                                 </b>
                             </bs>
@@ -16018,6 +16566,7 @@
         </relation>
         <relation>
             <name>type_decls</name>
+<<<<<<< HEAD
             <cardinality>1890777</cardinality>
             <columnsizes>
                 <e>
@@ -16031,6 +16580,21 @@
                 <e>
                     <k>location</k>
                     <v>1485517</v>
+=======
+            <cardinality>1891510</cardinality>
+            <columnsizes>
+                <e>
+                    <k>id</k>
+                    <v>1891510</v>
+                </e>
+                <e>
+                    <k>type_id</k>
+                    <v>1850079</v>
+                </e>
+                <e>
+                    <k>location</k>
+                    <v>1486167</v>
+>>>>>>> d32eedeb48e (C++: update stats file)
                 </e>
             </columnsizes>
             <dependencies>
@@ -16044,7 +16608,11 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
+<<<<<<< HEAD
                                     <v>1890777</v>
+=======
+                                    <v>1891510</v>
+>>>>>>> d32eedeb48e (C++: update stats file)
                                 </b>
                             </bs>
                         </hist>
@@ -16060,7 +16628,11 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
+<<<<<<< HEAD
                                     <v>1890777</v>
+=======
+                                    <v>1891510</v>
+>>>>>>> d32eedeb48e (C++: update stats file)
                                 </b>
                             </bs>
                         </hist>
@@ -16076,12 +16648,20 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
+<<<<<<< HEAD
                                     <v>1819574</v>
+=======
+                                    <v>1820276</v>
+>>>>>>> d32eedeb48e (C++: update stats file)
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>24</b>
+<<<<<<< HEAD
                                     <v>29790</v>
+=======
+                                    <v>29803</v>
+>>>>>>> d32eedeb48e (C++: update stats file)
                                 </b>
                             </bs>
                         </hist>
@@ -16097,12 +16677,16 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
+<<<<<<< HEAD
                                     <v>1820902</v>
+=======
+                                    <v>1821604</v>
+>>>>>>> d32eedeb48e (C++: update stats file)
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>24</b>
-                                    <v>28462</v>
+                                    <v>28474</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16118,12 +16702,16 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
+<<<<<<< HEAD
                                     <v>1408989</v>
+=======
+                                    <v>1409606</v>
+>>>>>>> d32eedeb48e (C++: update stats file)
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>651</b>
-                                    <v>76527</v>
+                                    <v>76560</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16139,12 +16727,20 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
+<<<<<<< HEAD
                                     <v>1410331</v>
+=======
+                                    <v>1410948</v>
+>>>>>>> d32eedeb48e (C++: update stats file)
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>651</b>
+<<<<<<< HEAD
                                     <v>75186</v>
+=======
+                                    <v>75219</v>
+>>>>>>> d32eedeb48e (C++: update stats file)
                                 </b>
                             </bs>
                         </hist>
@@ -16154,11 +16750,19 @@
         </relation>
         <relation>
             <name>type_def</name>
+<<<<<<< HEAD
             <cardinality>1297362</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
                     <v>1297362</v>
+=======
+            <cardinality>1297902</cardinality>
+            <columnsizes>
+                <e>
+                    <k>id</k>
+                    <v>1297902</v>
+>>>>>>> d32eedeb48e (C++: update stats file)
                 </e>
             </columnsizes>
             <dependencies/>
@@ -16234,7 +16838,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>8186</v>
+                                    <v>8187</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -16615,19 +17219,27 @@
         </relation>
         <relation>
             <name>usings</name>
+<<<<<<< HEAD
             <cardinality>338568</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
                     <v>338568</v>
+=======
+            <cardinality>338472</cardinality>
+            <columnsizes>
+                <e>
+                    <k>id</k>
+                    <v>338472</v>
+>>>>>>> d32eedeb48e (C++: update stats file)
                 </e>
                 <e>
                     <k>element_id</k>
-                    <v>65337</v>
+                    <v>65122</v>
                 </e>
                 <e>
                     <k>location</k>
-                    <v>33921</v>
+                    <v>33936</v>
                 </e>
                 <e>
                     <k>kind</k>
@@ -16645,7 +17257,11 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
+<<<<<<< HEAD
                                     <v>338568</v>
+=======
+                                    <v>338472</v>
+>>>>>>> d32eedeb48e (C++: update stats file)
                                 </b>
                             </bs>
                         </hist>
@@ -16661,7 +17277,11 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
+<<<<<<< HEAD
                                     <v>338568</v>
+=======
+                                    <v>338472</v>
+>>>>>>> d32eedeb48e (C++: update stats file)
                                 </b>
                             </bs>
                         </hist>
@@ -16677,7 +17297,11 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
+<<<<<<< HEAD
                                     <v>338568</v>
+=======
+                                    <v>338472</v>
+>>>>>>> d32eedeb48e (C++: update stats file)
                                 </b>
                             </bs>
                         </hist>
@@ -16693,17 +17317,21 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
+<<<<<<< HEAD
                                     <v>55421</v>
+=======
+                                    <v>55201</v>
+>>>>>>> d32eedeb48e (C++: update stats file)
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>4</b>
-                                    <v>5608</v>
+                                    <v>5610</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>134</b>
-                                    <v>4307</v>
+                                    <v>4309</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16719,17 +17347,21 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
+<<<<<<< HEAD
                                     <v>55421</v>
+=======
+                                    <v>55201</v>
+>>>>>>> d32eedeb48e (C++: update stats file)
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>4</b>
-                                    <v>5608</v>
+                                    <v>5610</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>134</b>
-                                    <v>4307</v>
+                                    <v>4309</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16745,7 +17377,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>65337</v>
+                                    <v>65122</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16761,22 +17393,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>26809</v>
+                                    <v>26821</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>4</b>
-                                    <v>2858</v>
+                                    <v>2859</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>145</b>
-                                    <v>2465</v>
+                                    <v>2480</v>
                                 </b>
                                 <b>
                                     <a>145</a>
-                                    <b>289</b>
-                                    <v>1788</v>
+                                    <b>287</b>
+                                    <v>1775</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16792,22 +17424,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>26809</v>
+                                    <v>26821</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>4</b>
-                                    <v>2858</v>
+                                    <v>2859</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>145</b>
-                                    <v>2465</v>
+                                    <v>2480</v>
                                 </b>
                                 <b>
                                     <a>145</a>
-                                    <b>289</b>
-                                    <v>1788</v>
+                                    <b>287</b>
+                                    <v>1775</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16823,7 +17455,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>33921</v>
+                                    <v>33936</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16842,8 +17474,8 @@
                                     <v>13</v>
                                 </b>
                                 <b>
-                                    <a>24599</a>
-                                    <b>24600</b>
+                                    <a>24581</a>
+                                    <b>24582</b>
                                     <v>13</v>
                                 </b>
                             </bs>
@@ -16863,8 +17495,8 @@
                                     <v>13</v>
                                 </b>
                                 <b>
-                                    <a>4609</a>
-                                    <b>4610</b>
+                                    <a>4591</a>
+                                    <b>4592</b>
                                     <v>13</v>
                                 </b>
                             </bs>
@@ -16896,15 +17528,23 @@
         </relation>
         <relation>
             <name>using_container</name>
+<<<<<<< HEAD
             <cardinality>732097</cardinality>
+=======
+            <cardinality>732173</cardinality>
+>>>>>>> d32eedeb48e (C++: update stats file)
             <columnsizes>
                 <e>
                     <k>parent</k>
-                    <v>26484</v>
+                    <v>26455</v>
                 </e>
                 <e>
                     <k>child</k>
+<<<<<<< HEAD
                     <v>338568</v>
+=======
+                    <v>338472</v>
+>>>>>>> d32eedeb48e (C++: update stats file)
                 </e>
             </columnsizes>
             <dependencies>
@@ -16918,27 +17558,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>12327</v>
+                                    <v>12333</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>4</b>
-                                    <v>2438</v>
+                                    <v>2439</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>6</b>
-                                    <v>1598</v>
+                                    <v>1599</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>7</b>
-                                    <v>2899</v>
+                                    <v>2859</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>27</b>
-                                    <v>1991</v>
+                                    <v>1992</v>
                                 </b>
                                 <b>
                                     <a>27</a>
@@ -16948,7 +17588,7 @@
                                 <b>
                                     <a>145</a>
                                     <b>146</b>
-                                    <v>3359</v>
+                                    <v>3361</v>
                                 </b>
                                 <b>
                                     <a>146</a>
@@ -16969,27 +17609,31 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>114174</v>
+                                    <v>113980</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
+<<<<<<< HEAD
                                     <v>154260</v>
+=======
+                                    <v>154328</v>
+>>>>>>> d32eedeb48e (C++: update stats file)
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>25238</v>
+                                    <v>25249</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>34233</v>
+                                    <v>34248</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>65</b>
-                                    <v>10661</v>
+                                    <v>10666</v>
                                 </b>
                             </bs>
                         </hist>
@@ -18553,11 +19197,11 @@
         </relation>
         <relation>
             <name>localvariables</name>
-            <cardinality>735324</cardinality>
+            <cardinality>735323</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>735324</v>
+                    <v>735323</v>
                 </e>
                 <e>
                     <k>type_id</k>
@@ -18565,7 +19209,7 @@
                 </e>
                 <e>
                     <k>name</k>
-                    <v>102827</v>
+                    <v>102826</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -18579,7 +19223,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>735324</v>
+                                    <v>735323</v>
                                 </b>
                             </bs>
                         </hist>
@@ -18595,7 +19239,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>735324</v>
+                                    <v>735323</v>
                                 </b>
                             </bs>
                         </hist>
@@ -21390,7 +22034,11 @@
         </relation>
         <relation>
             <name>decltypes</name>
+<<<<<<< HEAD
             <cardinality>175649</cardinality>
+=======
+            <cardinality>175650</cardinality>
+>>>>>>> d32eedeb48e (C++: update stats file)
             <columnsizes>
                 <e>
                     <k>id</k>
@@ -21711,6 +22359,7 @@
         </relation>
         <relation>
             <name>usertypes</name>
+<<<<<<< HEAD
             <cardinality>4987434</cardinality>
             <columnsizes>
                 <e>
@@ -21720,6 +22369,17 @@
                 <e>
                     <k>name</k>
                     <v>1074810</v>
+=======
+            <cardinality>4988303</cardinality>
+            <columnsizes>
+                <e>
+                    <k>id</k>
+                    <v>4988303</v>
+                </e>
+                <e>
+                    <k>name</k>
+                    <v>1075281</v>
+>>>>>>> d32eedeb48e (C++: update stats file)
                 </e>
                 <e>
                     <k>kind</k>
@@ -21737,7 +22397,11 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
+<<<<<<< HEAD
                                     <v>4987434</v>
+=======
+                                    <v>4988303</v>
+>>>>>>> d32eedeb48e (C++: update stats file)
                                 </b>
                             </bs>
                         </hist>
@@ -21753,7 +22417,11 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
+<<<<<<< HEAD
                                     <v>4987434</v>
+=======
+                                    <v>4988303</v>
+>>>>>>> d32eedeb48e (C++: update stats file)
                                 </b>
                             </bs>
                         </hist>
@@ -21769,22 +22437,38 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
+<<<<<<< HEAD
                                     <v>743259</v>
+=======
+                                    <v>743720</v>
+>>>>>>> d32eedeb48e (C++: update stats file)
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
+<<<<<<< HEAD
                                     <v>196974</v>
+=======
+                                    <v>196925</v>
+>>>>>>> d32eedeb48e (C++: update stats file)
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>7</b>
+<<<<<<< HEAD
                                     <v>85996</v>
+=======
+                                    <v>86034</v>
+>>>>>>> d32eedeb48e (C++: update stats file)
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>30181</b>
+<<<<<<< HEAD
                                     <v>48579</v>
+=======
+                                    <v>48601</v>
+>>>>>>> d32eedeb48e (C++: update stats file)
                                 </b>
                             </bs>
                         </hist>
@@ -21800,12 +22484,20 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
+<<<<<<< HEAD
                                     <v>1008457</v>
+=======
+                                    <v>1008898</v>
+>>>>>>> d32eedeb48e (C++: update stats file)
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>10</b>
+<<<<<<< HEAD
                                     <v>66353</v>
+=======
+                                    <v>66382</v>
+>>>>>>> d32eedeb48e (C++: update stats file)
                                 </b>
                             </bs>
                         </hist>
@@ -21839,8 +22531,8 @@
                                     <v>13</v>
                                 </b>
                                 <b>
-                                    <a>1476</a>
-                                    <b>1477</b>
+                                    <a>1475</a>
+                                    <b>1476</b>
                                     <v>13</v>
                                 </b>
                                 <b>
@@ -21854,13 +22546,18 @@
                                     <v>13</v>
                                 </b>
                                 <b>
-                                    <a>19666</a>
-                                    <b>19667</b>
+                                    <a>19665</a>
+                                    <b>19666</b>
                                     <v>13</v>
                                 </b>
                                 <b>
+<<<<<<< HEAD
                                     <a>20064</a>
                                     <b>20065</b>
+=======
+                                    <a>20058</a>
+                                    <b>20059</b>
+>>>>>>> d32eedeb48e (C++: update stats file)
                                     <v>13</v>
                                 </b>
                                 <b>
@@ -21869,6 +22566,7 @@
                                     <v>13</v>
                                 </b>
                                 <b>
+<<<<<<< HEAD
                                     <a>85548</a>
                                     <b>85549</b>
                                     <v>13</v>
@@ -21876,6 +22574,15 @@
                                 <b>
                                     <a>151139</a>
                                     <b>151140</b>
+=======
+                                    <a>85539</a>
+                                    <b>85540</b>
+                                    <v>13</v>
+                                </b>
+                                <b>
+                                    <a>151059</a>
+                                    <b>151060</b>
+>>>>>>> d32eedeb48e (C++: update stats file)
                                     <v>13</v>
                                 </b>
                             </bs>
@@ -21957,15 +22664,23 @@
         </relation>
         <relation>
             <name>usertypesize</name>
+<<<<<<< HEAD
             <cardinality>1632137</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
                     <v>1632137</v>
+=======
+            <cardinality>1632702</cardinality>
+            <columnsizes>
+                <e>
+                    <k>id</k>
+                    <v>1632702</v>
+>>>>>>> d32eedeb48e (C++: update stats file)
                 </e>
                 <e>
                     <k>size</k>
-                    <v>1896</v>
+                    <v>1897</v>
                 </e>
                 <e>
                     <k>alignment</k>
@@ -21983,7 +22698,11 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
+<<<<<<< HEAD
                                     <v>1632137</v>
+=======
+                                    <v>1632702</v>
+>>>>>>> d32eedeb48e (C++: update stats file)
                                 </b>
                             </bs>
                         </hist>
@@ -21999,7 +22718,11 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
+<<<<<<< HEAD
                                     <v>1632137</v>
+=======
+                                    <v>1632702</v>
+>>>>>>> d32eedeb48e (C++: update stats file)
                                 </b>
                             </bs>
                         </hist>
@@ -22054,12 +22777,16 @@
                                 </b>
                                 <b>
                                     <a>96</a>
-                                    <b>1592</b>
+                                    <b>1588</b>
                                     <v>149</v>
                                 </b>
                                 <b>
                                     <a>1733</a>
+<<<<<<< HEAD
                                     <b>92729</b>
+=======
+                                    <b>92728</b>
+>>>>>>> d32eedeb48e (C++: update stats file)
                                     <v>67</v>
                                 </b>
                             </bs>
@@ -22076,7 +22803,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1557</v>
+                                    <v>1558</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -22125,18 +22852,23 @@
                                     <v>13</v>
                                 </b>
                                 <b>
-                                    <a>1959</a>
-                                    <b>1960</b>
+                                    <a>1958</a>
+                                    <b>1959</b>
                                     <v>13</v>
                                 </b>
                                 <b>
-                                    <a>10484</a>
-                                    <b>10485</b>
+                                    <a>10475</a>
+                                    <b>10476</b>
                                     <v>13</v>
                                 </b>
                                 <b>
+<<<<<<< HEAD
                                     <a>107915</a>
                                     <b>107916</b>
+=======
+                                    <a>107914</a>
+                                    <b>107915</b>
+>>>>>>> d32eedeb48e (C++: update stats file)
                                     <v>13</v>
                                 </b>
                             </bs>
@@ -22334,7 +23066,7 @@
                 </e>
                 <e>
                     <k>constraint</k>
-                    <v>27881</v>
+                    <v>27882</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -22399,6 +23131,7 @@
         </relation>
         <relation>
             <name>mangled_name</name>
+<<<<<<< HEAD
             <cardinality>7776179</cardinality>
             <columnsizes>
                 <e>
@@ -22408,6 +23141,17 @@
                 <e>
                     <k>mangled_name</k>
                     <v>5325040</v>
+=======
+            <cardinality>7776588</cardinality>
+            <columnsizes>
+                <e>
+                    <k>id</k>
+                    <v>7776588</v>
+                </e>
+                <e>
+                    <k>mangled_name</k>
+                    <v>5327372</v>
+>>>>>>> d32eedeb48e (C++: update stats file)
                 </e>
                 <e>
                     <k>is_complete</k>
@@ -22425,7 +23169,11 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
+<<<<<<< HEAD
                                     <v>7776179</v>
+=======
+                                    <v>7776588</v>
+>>>>>>> d32eedeb48e (C++: update stats file)
                                 </b>
                             </bs>
                         </hist>
@@ -22441,7 +23189,11 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
+<<<<<<< HEAD
                                     <v>7776179</v>
+=======
+                                    <v>7776588</v>
+>>>>>>> d32eedeb48e (C++: update stats file)
                                 </b>
                             </bs>
                         </hist>
@@ -22457,17 +23209,29 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
+<<<<<<< HEAD
                                     <v>4731503</v>
+=======
+                                    <v>4736407</v>
+>>>>>>> d32eedeb48e (C++: update stats file)
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
+<<<<<<< HEAD
                                     <v>459353</v>
+=======
+                                    <v>456722</v>
+>>>>>>> d32eedeb48e (C++: update stats file)
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>9032</b>
+<<<<<<< HEAD
                                     <v>134183</v>
+=======
+                                    <v>134242</v>
+>>>>>>> d32eedeb48e (C++: update stats file)
                                 </b>
                             </bs>
                         </hist>
@@ -22483,7 +23247,11 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
+<<<<<<< HEAD
                                     <v>5325040</v>
+=======
+                                    <v>5327372</v>
+>>>>>>> d32eedeb48e (C++: update stats file)
                                 </b>
                             </bs>
                         </hist>
@@ -22502,8 +23270,13 @@
                                     <v>13</v>
                                 </b>
                                 <b>
+<<<<<<< HEAD
                                     <a>570633</a>
                                     <b>570634</b>
+=======
+                                    <a>570412</a>
+                                    <b>570413</b>
+>>>>>>> d32eedeb48e (C++: update stats file)
                                     <v>13</v>
                                 </b>
                             </bs>
@@ -22546,39 +23319,64 @@
         </relation>
         <relation>
             <name>is_standard_layout_class</name>
+<<<<<<< HEAD
             <cardinality>1344858</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
                     <v>1344858</v>
+=======
+            <cardinality>1345352</cardinality>
+            <columnsizes>
+                <e>
+                    <k>id</k>
+                    <v>1345352</v>
+>>>>>>> d32eedeb48e (C++: update stats file)
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>is_complete</name>
+<<<<<<< HEAD
             <cardinality>1611274</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
                     <v>1611274</v>
+=======
+            <cardinality>1611844</cardinality>
+            <columnsizes>
+                <e>
+                    <k>id</k>
+                    <v>1611844</v>
+>>>>>>> d32eedeb48e (C++: update stats file)
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>is_class_template</name>
+<<<<<<< HEAD
             <cardinality>292183</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
                     <v>292183</v>
+=======
+            <cardinality>292297</cardinality>
+            <columnsizes>
+                <e>
+                    <k>id</k>
+                    <v>292297</v>
+>>>>>>> d32eedeb48e (C++: update stats file)
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>class_instantiation</name>
+<<<<<<< HEAD
             <cardinality>1327030</cardinality>
             <columnsizes>
                 <e>
@@ -22588,6 +23386,17 @@
                 <e>
                     <k>from</k>
                     <v>91605</v>
+=======
+            <cardinality>1327367</cardinality>
+            <columnsizes>
+                <e>
+                    <k>to</k>
+                    <v>1323504</v>
+                </e>
+                <e>
+                    <k>from</k>
+                    <v>91645</v>
+>>>>>>> d32eedeb48e (C++: update stats file)
                 </e>
             </columnsizes>
             <dependencies>
@@ -22601,12 +23410,20 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
+<<<<<<< HEAD
                                     <v>1320392</v>
+=======
+                                    <v>1320807</v>
+>>>>>>> d32eedeb48e (C++: update stats file)
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>8</b>
+<<<<<<< HEAD
                                     <v>2736</v>
+=======
+                                    <v>2697</v>
+>>>>>>> d32eedeb48e (C++: update stats file)
                                 </b>
                             </bs>
                         </hist>
@@ -22622,47 +23439,79 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
+<<<<<<< HEAD
                                     <v>26728</v>
+=======
+                                    <v>26740</v>
+>>>>>>> d32eedeb48e (C++: update stats file)
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
+<<<<<<< HEAD
                                     <v>16622</v>
+=======
+                                    <v>16629</v>
+>>>>>>> d32eedeb48e (C++: update stats file)
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
+<<<<<<< HEAD
                                     <v>9103</v>
+=======
+                                    <v>9107</v>
+>>>>>>> d32eedeb48e (C++: update stats file)
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
+<<<<<<< HEAD
                                     <v>5974</v>
+=======
+                                    <v>5976</v>
+>>>>>>> d32eedeb48e (C++: update stats file)
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>7</b>
+<<<<<<< HEAD
                                     <v>7694</v>
+=======
+                                    <v>7698</v>
+>>>>>>> d32eedeb48e (C++: update stats file)
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>10</b>
+<<<<<<< HEAD
                                     <v>6949</v>
+=======
+                                    <v>6952</v>
+>>>>>>> d32eedeb48e (C++: update stats file)
                                 </b>
                                 <b>
                                     <a>10</a>
                                     <b>17</b>
+<<<<<<< HEAD
                                     <v>7356</v>
+=======
+                                    <v>7372</v>
+>>>>>>> d32eedeb48e (C++: update stats file)
                                 </b>
                                 <b>
                                     <a>17</a>
                                     <b>53</b>
+<<<<<<< HEAD
                                     <v>6936</v>
+=======
+                                    <v>6925</v>
+>>>>>>> d32eedeb48e (C++: update stats file)
                                 </b>
                                 <b>
                                     <a>53</a>
                                     <b>4219</b>
-                                    <v>4240</v>
+                                    <v>4242</v>
                                 </b>
                             </bs>
                         </hist>
@@ -22672,11 +23521,19 @@
         </relation>
         <relation>
             <name>class_template_argument</name>
+<<<<<<< HEAD
             <cardinality>3501700</cardinality>
             <columnsizes>
                 <e>
                     <k>type_id</k>
                     <v>1631215</v>
+=======
+            <cardinality>3502921</cardinality>
+            <columnsizes>
+                <e>
+                    <k>type_id</k>
+                    <v>1631781</v>
+>>>>>>> d32eedeb48e (C++: update stats file)
                 </e>
                 <e>
                     <k>index</k>
@@ -22684,7 +23541,11 @@
                 </e>
                 <e>
                     <k>arg_type</k>
+<<<<<<< HEAD
                     <v>1034467</v>
+=======
+                    <v>1034879</v>
+>>>>>>> d32eedeb48e (C++: update stats file)
                 </e>
             </columnsizes>
             <dependencies>
@@ -22698,22 +23559,38 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
+<<<<<<< HEAD
                                     <v>678884</v>
+=======
+                                    <v>679154</v>
+>>>>>>> d32eedeb48e (C++: update stats file)
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
+<<<<<<< HEAD
                                     <v>490105</v>
+=======
+                                    <v>490211</v>
+>>>>>>> d32eedeb48e (C++: update stats file)
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
+<<<<<<< HEAD
                                     <v>308751</v>
+=======
+                                    <v>308886</v>
+>>>>>>> d32eedeb48e (C++: update stats file)
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>7</b>
+<<<<<<< HEAD
                                     <v>124118</v>
+=======
+                                    <v>124159</v>
+>>>>>>> d32eedeb48e (C++: update stats file)
                                 </b>
                                 <b>
                                     <a>7</a>
@@ -22734,22 +23611,38 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
+<<<<<<< HEAD
                                     <v>713442</v>
+=======
+                                    <v>713728</v>
+>>>>>>> d32eedeb48e (C++: update stats file)
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
+<<<<<<< HEAD
                                     <v>505454</v>
+=======
+                                    <v>505567</v>
+>>>>>>> d32eedeb48e (C++: update stats file)
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
+<<<<<<< HEAD
                                     <v>306813</v>
+=======
+                                    <v>306948</v>
+>>>>>>> d32eedeb48e (C++: update stats file)
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>113</b>
+<<<<<<< HEAD
                                     <v>105504</v>
+=======
+                                    <v>105537</v>
+>>>>>>> d32eedeb48e (C++: update stats file)
                                 </b>
                             </bs>
                         </hist>
@@ -22770,7 +23663,7 @@
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>961</v>
+                                    <v>962</v>
                                 </b>
                                 <b>
                                     <a>5</a>
@@ -22789,12 +23682,21 @@
                                 </b>
                                 <b>
                                     <a>643</a>
+<<<<<<< HEAD
                                     <b>6819</b>
                                     <v>121</v>
                                 </b>
                                 <b>
                                     <a>11329</a>
                                     <b>120409</b>
+=======
+                                    <b>6818</b>
+                                    <v>121</v>
+                                </b>
+                                <b>
+                                    <a>11328</a>
+                                    <b>120398</b>
+>>>>>>> d32eedeb48e (C++: update stats file)
                                     <v>54</v>
                                 </b>
                             </bs>
@@ -22816,7 +23718,7 @@
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>961</v>
+                                    <v>962</v>
                                 </b>
                                 <b>
                                     <a>5</a>
@@ -22840,7 +23742,11 @@
                                 </b>
                                 <b>
                                     <a>10035</a>
+<<<<<<< HEAD
                                     <b>43710</b>
+=======
+                                    <b>43708</b>
+>>>>>>> d32eedeb48e (C++: update stats file)
                                     <v>40</v>
                                 </b>
                             </bs>
@@ -22857,27 +23763,48 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
+<<<<<<< HEAD
                                     <v>649080</v>
+=======
+                                    <v>649364</v>
+>>>>>>> d32eedeb48e (C++: update stats file)
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
+<<<<<<< HEAD
                                     <v>212187</v>
+=======
+                                    <v>212253</v>
+>>>>>>> d32eedeb48e (C++: update stats file)
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
+<<<<<<< HEAD
                                     <v>62153</v>
+=======
+                                    <v>62167</v>
+>>>>>>> d32eedeb48e (C++: update stats file)
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>11</b>
+<<<<<<< HEAD
                                     <v>78667</v>
                                 </b>
                                 <b>
                                     <a>11</a>
                                     <b>11553</b>
                                     <v>32377</v>
+=======
+                                    <v>78702</v>
+                                </b>
+                                <b>
+                                    <a>11</a>
+                                    <b>11551</b>
+                                    <v>32391</v>
+>>>>>>> d32eedeb48e (C++: update stats file)
                                 </b>
                             </bs>
                         </hist>
@@ -22893,17 +23820,25 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
+<<<<<<< HEAD
                                     <v>912381</v>
+=======
+                                    <v>912740</v>
+>>>>>>> d32eedeb48e (C++: update stats file)
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
+<<<<<<< HEAD
                                     <v>98852</v>
+=======
+                                    <v>98896</v>
+>>>>>>> d32eedeb48e (C++: update stats file)
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>22</b>
-                                    <v>23233</v>
+                                    <v>23243</v>
                                 </b>
                             </bs>
                         </hist>
@@ -23139,6 +24074,7 @@
         </relation>
         <relation>
             <name>is_proxy_class_for</name>
+<<<<<<< HEAD
             <cardinality>62059</cardinality>
             <columnsizes>
                 <e>
@@ -23148,6 +24084,17 @@
                 <e>
                     <k>templ_param_id</k>
                     <v>58631</v>
+=======
+            <cardinality>62086</cardinality>
+            <columnsizes>
+                <e>
+                    <k>id</k>
+                    <v>62086</v>
+                </e>
+                <e>
+                    <k>templ_param_id</k>
+                    <v>58657</v>
+>>>>>>> d32eedeb48e (C++: update stats file)
                 </e>
             </columnsizes>
             <dependencies>
@@ -23161,7 +24108,11 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
+<<<<<<< HEAD
                                     <v>62059</v>
+=======
+                                    <v>62086</v>
+>>>>>>> d32eedeb48e (C++: update stats file)
                                 </b>
                             </bs>
                         </hist>
@@ -23177,7 +24128,11 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
+<<<<<<< HEAD
                                     <v>57710</v>
+=======
+                                    <v>57735</v>
+>>>>>>> d32eedeb48e (C++: update stats file)
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -24590,15 +25545,15 @@
         </relation>
         <relation>
             <name>template_template_instantiation</name>
-            <cardinality>7437</cardinality>
+            <cardinality>7440</cardinality>
             <columnsizes>
                 <e>
                     <k>to</k>
-                    <v>6976</v>
+                    <v>6979</v>
                 </e>
                 <e>
                     <k>from</k>
-                    <v>4931</v>
+                    <v>4933</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -24612,7 +25567,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>6827</v>
+                                    <v>6830</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -24633,12 +25588,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3224</v>
+                                    <v>3225</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>1530</v>
+                                    <v>1531</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -24653,11 +25608,11 @@
         </relation>
         <relation>
             <name>template_template_argument</name>
-            <cardinality>12409</cardinality>
+            <cardinality>12414</cardinality>
             <columnsizes>
                 <e>
                     <k>type_id</k>
-                    <v>7843</v>
+                    <v>7847</v>
                 </e>
                 <e>
                     <k>index</k>
@@ -24665,7 +25620,7 @@
                 </e>
                 <e>
                     <k>arg_type</k>
-                    <v>11650</v>
+                    <v>11655</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -24679,12 +25634,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>6434</v>
+                                    <v>6437</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>541</v>
+                                    <v>542</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -24710,12 +25665,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>6461</v>
+                                    <v>6464</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>4</b>
-                                    <v>717</v>
+                                    <v>718</v>
                                 </b>
                                 <b>
                                     <a>4</a>
@@ -24863,7 +25818,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>11609</v>
+                                    <v>11614</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -24884,7 +25839,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>11623</v>
+                                    <v>11628</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -26066,19 +27021,19 @@
         </relation>
         <relation>
             <name>ptrtomembers</name>
-            <cardinality>12083</cardinality>
+            <cardinality>12089</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>12083</v>
+                    <v>12089</v>
                 </e>
                 <e>
                     <k>type_id</k>
-                    <v>10160</v>
+                    <v>10164</v>
                 </e>
                 <e>
                     <k>class_id</k>
-                    <v>5987</v>
+                    <v>5990</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -26092,7 +27047,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>12083</v>
+                                    <v>12089</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26108,7 +27063,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>12083</v>
+                                    <v>12089</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26124,7 +27079,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>9875</v>
+                                    <v>9880</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -26145,7 +27100,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>9875</v>
+                                    <v>9880</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -26166,17 +27121,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4876</v>
+                                    <v>4879</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>541</v>
+                                    <v>542</v>
                                 </b>
                                 <b>
                                     <a>8</a>
                                     <b>9</b>
-                                    <v>514</v>
+                                    <v>515</v>
                                 </b>
                                 <b>
                                     <a>10</a>
@@ -26197,17 +27152,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4876</v>
+                                    <v>4879</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>541</v>
+                                    <v>542</v>
                                 </b>
                                 <b>
                                     <a>8</a>
                                     <b>9</b>
-                                    <v>514</v>
+                                    <v>515</v>
                                 </b>
                                 <b>
                                     <a>10</a>
@@ -26270,11 +27225,19 @@
         </relation>
         <relation>
             <name>typespecifiers</name>
+<<<<<<< HEAD
             <cardinality>991496</cardinality>
             <columnsizes>
                 <e>
                     <k>type_id</k>
                     <v>984912</v>
+=======
+            <cardinality>991510</cardinality>
+            <columnsizes>
+                <e>
+                    <k>type_id</k>
+                    <v>984923</v>
+>>>>>>> d32eedeb48e (C++: update stats file)
                 </e>
                 <e>
                     <k>spec_id</k>
@@ -26292,12 +27255,16 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
+<<<<<<< HEAD
                                     <v>978328</v>
+=======
+                                    <v>978336</v>
+>>>>>>> d32eedeb48e (C++: update stats file)
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>6583</v>
+                                    <v>6586</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26321,8 +27288,8 @@
                                     <v>13</v>
                                 </b>
                                 <b>
-                                    <a>532</a>
-                                    <b>533</b>
+                                    <a>529</a>
+                                    <b>530</b>
                                     <v>13</v>
                                 </b>
                                 <b>
@@ -26336,18 +27303,23 @@
                                     <v>13</v>
                                 </b>
                                 <b>
-                                    <a>4150</a>
-                                    <b>4151</b>
+                                    <a>4147</a>
+                                    <b>4148</b>
                                     <v>13</v>
                                 </b>
                                 <b>
+<<<<<<< HEAD
                                     <a>17408</a>
                                     <b>17409</b>
+=======
+                                    <a>17406</a>
+                                    <b>17407</b>
+>>>>>>> d32eedeb48e (C++: update stats file)
                                     <v>13</v>
                                 </b>
                                 <b>
-                                    <a>48323</a>
-                                    <b>48324</b>
+                                    <a>48300</a>
+                                    <b>48301</b>
                                     <v>13</v>
                                 </b>
                             </bs>
@@ -26358,7 +27330,11 @@
         </relation>
         <relation>
             <name>funspecifiers</name>
+<<<<<<< HEAD
             <cardinality>9728427</cardinality>
+=======
+            <cardinality>9728556</cardinality>
+>>>>>>> d32eedeb48e (C++: update stats file)
             <columnsizes>
                 <e>
                     <k>func_id</k>
@@ -26385,17 +27361,29 @@
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
+<<<<<<< HEAD
                                     <v>677260</v>
+=======
+                                    <v>677303</v>
+>>>>>>> d32eedeb48e (C++: update stats file)
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
+<<<<<<< HEAD
                                     <v>1424206</v>
+=======
+                                    <v>1424163</v>
+>>>>>>> d32eedeb48e (C++: update stats file)
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
+<<<<<<< HEAD
                                     <v>459483</v>
+=======
+                                    <v>459397</v>
+>>>>>>> d32eedeb48e (C++: update stats file)
                                 </b>
                                 <b>
                                     <a>5</a>
@@ -26405,7 +27393,11 @@
                                 <b>
                                     <a>6</a>
                                     <b>8</b>
+<<<<<<< HEAD
                                     <v>116600</v>
+=======
+                                    <v>116686</v>
+>>>>>>> d32eedeb48e (C++: update stats file)
                                 </b>
                             </bs>
                         </hist>
@@ -26494,8 +27486,13 @@
                                     <v>42</v>
                                 </b>
                                 <b>
+<<<<<<< HEAD
                                     <a>42407</a>
                                     <b>42408</b>
+=======
+                                    <a>42410</a>
+                                    <b>42411</b>
+>>>>>>> d32eedeb48e (C++: update stats file)
                                     <v>42</v>
                                 </b>
                                 <b>
@@ -27185,11 +28182,11 @@
         </relation>
         <relation>
             <name>attribute_args</name>
-            <cardinality>99123</cardinality>
+            <cardinality>99099</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>99123</v>
+                    <v>99099</v>
                 </e>
                 <e>
                     <k>kind</k>
@@ -27197,7 +28194,7 @@
                 </e>
                 <e>
                     <k>attribute</k>
-                    <v>85332</v>
+                    <v>85370</v>
                 </e>
                 <e>
                     <k>index</k>
@@ -27205,7 +28202,7 @@
                 </e>
                 <e>
                     <k>location</k>
-                    <v>91943</v>
+                    <v>91984</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -27219,7 +28216,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>99123</v>
+                                    <v>99099</v>
                                 </b>
                             </bs>
                         </hist>
@@ -27235,7 +28232,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>99123</v>
+                                    <v>99099</v>
                                 </b>
                             </bs>
                         </hist>
@@ -27251,7 +28248,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>99123</v>
+                                    <v>99099</v>
                                 </b>
                             </bs>
                         </hist>
@@ -27267,7 +28264,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>99123</v>
+                                    <v>99099</v>
                                 </b>
                             </bs>
                         </hist>
@@ -27296,8 +28293,8 @@
                                     <v>13</v>
                                 </b>
                                 <b>
-                                    <a>6614</a>
-                                    <b>6615</b>
+                                    <a>6609</a>
+                                    <b>6610</b>
                                     <v>13</v>
                                 </b>
                             </bs>
@@ -27402,17 +28399,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>77177</v>
+                                    <v>77279</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>4</b>
-                                    <v>6800</v>
+                                    <v>6735</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>18</b>
-                                    <v>1354</v>
+                                    <v>1355</v>
                                 </b>
                             </bs>
                         </hist>
@@ -27428,12 +28425,16 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>83029</v>
+                                    <v>83066</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
+<<<<<<< HEAD
                                     <v>2303</v>
+=======
+                                    <v>2304</v>
+>>>>>>> d32eedeb48e (C++: update stats file)
                                 </b>
                             </bs>
                         </hist>
@@ -27449,12 +28450,16 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
+<<<<<<< HEAD
                                     <v>79047</v>
+=======
+                                    <v>79081</v>
+>>>>>>> d32eedeb48e (C++: update stats file)
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>6</b>
-                                    <v>6285</v>
+                                    <v>6288</v>
                                 </b>
                             </bs>
                         </hist>
@@ -27470,12 +28475,16 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
+<<<<<<< HEAD
                                     <v>80659</v>
+=======
+                                    <v>80694</v>
+>>>>>>> d32eedeb48e (C++: update stats file)
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>6</b>
-                                    <v>4673</v>
+                                    <v>4675</v>
                                 </b>
                             </bs>
                         </hist>
@@ -27509,8 +28518,8 @@
                                     <v>13</v>
                                 </b>
                                 <b>
-                                    <a>6497</a>
-                                    <b>6498</b>
+                                    <a>6492</a>
+                                    <b>6493</b>
                                     <v>13</v>
                                 </b>
                             </bs>
@@ -27625,12 +28634,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>89329</v>
+                                    <v>89436</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>23</b>
-                                    <v>2614</v>
+                                    <v>2547</v>
                                 </b>
                             </bs>
                         </hist>
@@ -27646,7 +28655,11 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
+<<<<<<< HEAD
                                     <v>91727</v>
+=======
+                                    <v>91767</v>
+>>>>>>> d32eedeb48e (C++: update stats file)
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -27667,7 +28680,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>91537</v>
+                                    <v>91577</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -27688,7 +28701,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>91388</v>
+                                    <v>91428</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -27859,6 +28872,7 @@
         </relation>
         <relation>
             <name>attribute_arg_constant</name>
+<<<<<<< HEAD
             <cardinality>89600</cardinality>
             <columnsizes>
                 <e>
@@ -27868,6 +28882,17 @@
                 <e>
                     <k>constant</k>
                     <v>89600</v>
+=======
+            <cardinality>89571</cardinality>
+            <columnsizes>
+                <e>
+                    <k>arg</k>
+                    <v>89571</v>
+                </e>
+                <e>
+                    <k>constant</k>
+                    <v>89571</v>
+>>>>>>> d32eedeb48e (C++: update stats file)
                 </e>
             </columnsizes>
             <dependencies>
@@ -27881,7 +28906,11 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
+<<<<<<< HEAD
                                     <v>89600</v>
+=======
+                                    <v>89571</v>
+>>>>>>> d32eedeb48e (C++: update stats file)
                                 </b>
                             </bs>
                         </hist>
@@ -27897,7 +28926,11 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
+<<<<<<< HEAD
                                     <v>89600</v>
+=======
+                                    <v>89571</v>
+>>>>>>> d32eedeb48e (C++: update stats file)
                                 </b>
                             </bs>
                         </hist>
@@ -27907,15 +28940,15 @@
         </relation>
         <relation>
             <name>attribute_arg_expr</name>
-            <cardinality>1801</cardinality>
+            <cardinality>1802</cardinality>
             <columnsizes>
                 <e>
                     <k>arg</k>
-                    <v>1801</v>
+                    <v>1802</v>
                 </e>
                 <e>
                     <k>expr</k>
-                    <v>1801</v>
+                    <v>1802</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -27929,7 +28962,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1801</v>
+                                    <v>1802</v>
                                 </b>
                             </bs>
                         </hist>
@@ -27945,7 +28978,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1801</v>
+                                    <v>1802</v>
                                 </b>
                             </bs>
                         </hist>
@@ -28265,6 +29298,7 @@
         </relation>
         <relation>
             <name>unspecifiedtype</name>
+<<<<<<< HEAD
             <cardinality>8345603</cardinality>
             <columnsizes>
                 <e>
@@ -28274,6 +29308,17 @@
                 <e>
                     <k>unspecified_type_id</k>
                     <v>4799035</v>
+=======
+            <cardinality>8345991</cardinality>
+            <columnsizes>
+                <e>
+                    <k>type_id</k>
+                    <v>8345991</v>
+                </e>
+                <e>
+                    <k>unspecified_type_id</k>
+                    <v>4799808</v>
+>>>>>>> d32eedeb48e (C++: update stats file)
                 </e>
             </columnsizes>
             <dependencies>
@@ -28287,7 +29332,11 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
+<<<<<<< HEAD
                                     <v>8345603</v>
+=======
+                                    <v>8345991</v>
+>>>>>>> d32eedeb48e (C++: update stats file)
                                 </b>
                             </bs>
                         </hist>
@@ -28303,17 +29352,29 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
+<<<<<<< HEAD
                                     <v>3198462</v>
+=======
+                                    <v>3199036</v>
+>>>>>>> d32eedeb48e (C++: update stats file)
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
+<<<<<<< HEAD
                                     <v>1309012</v>
+=======
+                                    <v>1309301</v>
+>>>>>>> d32eedeb48e (C++: update stats file)
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>6271</b>
+<<<<<<< HEAD
                                     <v>291559</v>
+=======
+                                    <v>291470</v>
+>>>>>>> d32eedeb48e (C++: update stats file)
                                 </b>
                             </bs>
                         </hist>
@@ -29507,11 +30568,19 @@
         </relation>
         <relation>
             <name>frienddecls</name>
+<<<<<<< HEAD
             <cardinality>883308</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
                     <v>883308</v>
+=======
+            <cardinality>883351</cardinality>
+            <columnsizes>
+                <e>
+                    <k>id</k>
+                    <v>883351</v>
+>>>>>>> d32eedeb48e (C++: update stats file)
                 </e>
                 <e>
                     <k>type_id</k>
@@ -29537,7 +30606,11 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
+<<<<<<< HEAD
                                     <v>883308</v>
+=======
+                                    <v>883351</v>
+>>>>>>> d32eedeb48e (C++: update stats file)
                                 </b>
                             </bs>
                         </hist>
@@ -29553,7 +30626,11 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
+<<<<<<< HEAD
                                     <v>883308</v>
+=======
+                                    <v>883351</v>
+>>>>>>> d32eedeb48e (C++: update stats file)
                                 </b>
                             </bs>
                         </hist>
@@ -29569,7 +30646,11 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
+<<<<<<< HEAD
                                     <v>883308</v>
+=======
+                                    <v>883351</v>
+>>>>>>> d32eedeb48e (C++: update stats file)
                                 </b>
                             </bs>
                         </hist>
@@ -29585,12 +30666,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7776</v>
+                                    <v>7819</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>17614</v>
+                                    <v>17571</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -29641,12 +30722,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7776</v>
+                                    <v>7819</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>17614</v>
+                                    <v>17571</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -29718,17 +30799,25 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
+<<<<<<< HEAD
                                     <v>60620</v>
+=======
+                                    <v>60748</v>
+>>>>>>> d32eedeb48e (C++: update stats file)
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
+<<<<<<< HEAD
                                     <v>7518</v>
+=======
+                                    <v>7303</v>
+>>>>>>> d32eedeb48e (C++: update stats file)
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>8</b>
-                                    <v>7561</v>
+                                    <v>7647</v>
                                 </b>
                                 <b>
                                     <a>8</a>
@@ -29759,17 +30848,25 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
+<<<<<<< HEAD
                                     <v>60620</v>
+=======
+                                    <v>60748</v>
+>>>>>>> d32eedeb48e (C++: update stats file)
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
+<<<<<<< HEAD
                                     <v>7518</v>
+=======
+                                    <v>7303</v>
+>>>>>>> d32eedeb48e (C++: update stats file)
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>8</b>
-                                    <v>7561</v>
+                                    <v>7647</v>
                                 </b>
                                 <b>
                                     <a>8</a>
@@ -29825,7 +30922,7 @@
                                 </b>
                                 <b>
                                     <a>2</a>
-                                    <b>20371</b>
+                                    <b>20372</b>
                                     <v>472</v>
                                 </b>
                             </bs>
@@ -30125,11 +31222,19 @@
         </relation>
         <relation>
             <name>compgenerated</name>
+<<<<<<< HEAD
             <cardinality>10714334</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
                     <v>10714334</v>
+=======
+            <cardinality>10714329</cardinality>
+            <columnsizes>
+                <e>
+                    <k>id</k>
+                    <v>10714329</v>
+>>>>>>> d32eedeb48e (C++: update stats file)
                 </e>
             </columnsizes>
             <dependencies/>
@@ -30372,15 +31477,15 @@
         </relation>
         <relation>
             <name>namespaces</name>
-            <cardinality>11095</cardinality>
+            <cardinality>11099</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>11095</v>
+                    <v>11099</v>
                 </e>
                 <e>
                     <k>name</k>
-                    <v>5865</v>
+                    <v>5868</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -30394,7 +31499,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>11095</v>
+                                    <v>11099</v>
                                 </b>
                             </bs>
                         </hist>
@@ -30410,7 +31515,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4795</v>
+                                    <v>4797</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -30420,7 +31525,7 @@
                                 <b>
                                     <a>3</a>
                                     <b>149</b>
-                                    <v>392</v>
+                                    <v>393</v>
                                 </b>
                             </bs>
                         </hist>
@@ -30441,15 +31546,23 @@
         </relation>
         <relation>
             <name>namespacembrs</name>
+<<<<<<< HEAD
             <cardinality>2025652</cardinality>
+=======
+            <cardinality>2026308</cardinality>
+>>>>>>> d32eedeb48e (C++: update stats file)
             <columnsizes>
                 <e>
                     <k>parentid</k>
-                    <v>10363</v>
+                    <v>10368</v>
                 </e>
                 <e>
                     <k>memberid</k>
+<<<<<<< HEAD
                     <v>2025652</v>
+=======
+                    <v>2026308</v>
+>>>>>>> d32eedeb48e (C++: update stats file)
                 </e>
             </columnsizes>
             <dependencies>
@@ -30468,7 +31581,7 @@
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>988</v>
+                                    <v>989</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -30493,6 +31606,7 @@
                                 <b>
                                     <a>14</a>
                                     <b>22</b>
+<<<<<<< HEAD
                                     <v>812</v>
                                 </b>
                                 <b>
@@ -30509,10 +31623,29 @@
                                     <a>57</a>
                                     <b>118</b>
                                     <v>785</v>
+=======
+                                    <v>813</v>
+                                </b>
+                                <b>
+                                    <a>22</a>
+                                    <b>37</b>
+                                    <v>799</v>
+                                </b>
+                                <b>
+                                    <a>37</a>
+                                    <b>57</b>
+                                    <v>799</v>
+                                </b>
+                                <b>
+                                    <a>57</a>
+                                    <b>118</b>
+                                    <v>786</v>
+>>>>>>> d32eedeb48e (C++: update stats file)
                                 </b>
                                 <b>
                                     <a>118</a>
                                     <b>255</b>
+<<<<<<< HEAD
                                     <v>812</v>
                                 </b>
                                 <b>
@@ -30523,6 +31656,18 @@
                                 <b>
                                     <a>829</a>
                                     <b>42759</b>
+=======
+                                    <v>813</v>
+                                </b>
+                                <b>
+                                    <a>256</a>
+                                    <b>828</b>
+                                    <v>786</v>
+                                </b>
+                                <b>
+                                    <a>829</a>
+                                    <b>42747</b>
+>>>>>>> d32eedeb48e (C++: update stats file)
                                     <v>338</v>
                                 </b>
                             </bs>
@@ -30539,7 +31684,11 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
+<<<<<<< HEAD
                                     <v>2025652</v>
+=======
+                                    <v>2026308</v>
+>>>>>>> d32eedeb48e (C++: update stats file)
                                 </b>
                             </bs>
                         </hist>
@@ -32000,11 +33149,19 @@
         </relation>
         <relation>
             <name>valuetext</name>
+<<<<<<< HEAD
             <cardinality>6605626</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
                     <v>6605626</v>
+=======
+            <cardinality>6605630</cardinality>
+            <columnsizes>
+                <e>
+                    <k>id</k>
+                    <v>6605630</v>
+>>>>>>> d32eedeb48e (C++: update stats file)
                 </e>
                 <e>
                     <k>text</k>
@@ -32022,7 +33179,11 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
+<<<<<<< HEAD
                                     <v>6605626</v>
+=======
+                                    <v>6605630</v>
+>>>>>>> d32eedeb48e (C++: update stats file)
                                 </b>
                             </bs>
                         </hist>
@@ -33616,6 +34777,10 @@
                     <k>position</k>
                     <v>32</v>
                 </e>
+                <e>
+                    <k>designated</k>
+                    <v>2</v>
+                </e>
             </columnsizes>
             <dependencies>
                 <dep>
@@ -33771,6 +34936,27 @@
                         </hist>
                     </val>
                 </dep>
+                <dep>
+                    <src>aggregate</src>
+                    <trg>designated</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>1242986</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>82</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
                 <dep>
                     <src>initializer</src>
                     <trg>aggregate</trg>
@@ -33824,6 +35010,22 @@
                         </hist>
                     </val>
                 </dep>
+                <dep>
+                    <src>initializer</src>
+                    <trg>designated</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>5717202</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
                 <dep>
                     <src>field</src>
                     <trg>aggregate</trg>
@@ -33957,6 +35159,27 @@
                         </hist>
                     </val>
                 </dep>
+                <dep>
+                    <src>field</src>
+                    <trg>designated</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>3201</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>26</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
                 <dep>
                     <src>position</src>
                     <trg>aggregate</trg>
@@ -34170,6 +35393,111 @@
                         </hist>
                     </val>
                 </dep>
+                <dep>
+                    <src>position</src>
+                    <trg>designated</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>24</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>8</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>designated</src>
+                    <trg>aggregate</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>480</a>
+                                    <b>481</b>
+                                    <v>1</v>
+                                </b>
+                                <b>
+                                    <a>1242670</a>
+                                    <b>1242671</b>
+                                    <v>1</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>designated</src>
+                    <trg>initializer</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>710</a>
+                                    <b>711</b>
+                                    <v>1</v>
+                                </b>
+                                <b>
+                                    <a>5716492</a>
+                                    <b>5716493</b>
+                                    <v>1</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>designated</src>
+                    <trg>field</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>218</a>
+                                    <b>219</b>
+                                    <v>1</v>
+                                </b>
+                                <b>
+                                    <a>3035</a>
+                                    <b>3036</b>
+                                    <v>1</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>designated</src>
+                    <trg>position</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>8</a>
+                                    <b>9</b>
+                                    <v>1</v>
+                                </b>
+                                <b>
+                                    <a>32</a>
+                                    <b>33</b>
+                                    <v>1</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
             </dependencies>
         </relation>
         <relation>
@@ -34192,6 +35520,10 @@
                     <k>position</k>
                     <v>62922</v>
                 </e>
+                <e>
+                    <k>designated</k>
+                    <v>2</v>
+                </e>
             </columnsizes>
             <dependencies>
                 <dep>
@@ -34347,6 +35679,22 @@
                         </hist>
                     </val>
                 </dep>
+                <dep>
+                    <src>aggregate</src>
+                    <trg>designated</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>152356</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
                 <dep>
                     <src>initializer</src>
                     <trg>aggregate</trg>
@@ -34395,6 +35743,22 @@
                         </hist>
                     </val>
                 </dep>
+                <dep>
+                    <src>initializer</src>
+                    <trg>designated</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>1349246</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
                 <dep>
                     <src>element_index</src>
                     <trg>aggregate</trg>
@@ -34498,6 +35862,27 @@
                         </hist>
                     </val>
                 </dep>
+                <dep>
+                    <src>element_index</src>
+                    <trg>designated</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>62914</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>8</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
                 <dep>
                     <src>position</src>
                     <trg>aggregate</trg>
@@ -34601,6 +35986,111 @@
                         </hist>
                     </val>
                 </dep>
+                <dep>
+                    <src>position</src>
+                    <trg>designated</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>62915</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>7</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>designated</src>
+                    <trg>aggregate</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>1</v>
+                                </b>
+                                <b>
+                                    <a>152353</a>
+                                    <b>152354</b>
+                                    <v>1</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>designated</src>
+                    <trg>initializer</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>16</a>
+                                    <b>17</b>
+                                    <v>1</v>
+                                </b>
+                                <b>
+                                    <a>1349230</a>
+                                    <b>1349231</b>
+                                    <v>1</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>designated</src>
+                    <trg>element_index</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>8</a>
+                                    <b>9</b>
+                                    <v>1</v>
+                                </b>
+                                <b>
+                                    <a>62922</a>
+                                    <b>62923</b>
+                                    <v>1</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>designated</src>
+                    <trg>position</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>7</a>
+                                    <b>8</b>
+                                    <v>1</v>
+                                </b>
+                                <b>
+                                    <a>62922</a>
+                                    <b>62923</b>
+                                    <v>1</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
             </dependencies>
         </relation>
         <relation>
@@ -38074,11 +39564,11 @@
         </relation>
         <relation>
             <name>stmt_decl_bind</name>
-            <cardinality>730761</cardinality>
+            <cardinality>730759</cardinality>
             <columnsizes>
                 <e>
                     <k>stmt</k>
-                    <v>690291</v>
+                    <v>690290</v>
                 </e>
                 <e>
                     <k>num</k>
@@ -38086,7 +39576,7 @@
                 </e>
                 <e>
                     <k>decl</k>
-                    <v>730692</v>
+                    <v>730690</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -38100,7 +39590,11 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
+<<<<<<< HEAD
                                     <v>668062</v>
+=======
+                                    <v>668061</v>
+>>>>>>> d32eedeb48e (C++: update stats file)
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -38121,7 +39615,11 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
+<<<<<<< HEAD
                                     <v>668062</v>
+=======
+                                    <v>668061</v>
+>>>>>>> d32eedeb48e (C++: update stats file)
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -38264,7 +39762,11 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
+<<<<<<< HEAD
                                     <v>730667</v>
+=======
+                                    <v>730666</v>
+>>>>>>> d32eedeb48e (C++: update stats file)
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -38285,7 +39787,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>730692</v>
+                                    <v>730690</v>
                                 </b>
                             </bs>
                         </hist>
@@ -38295,11 +39797,11 @@
         </relation>
         <relation>
             <name>stmt_decl_entry_bind</name>
-            <cardinality>730761</cardinality>
+            <cardinality>730759</cardinality>
             <columnsizes>
                 <e>
                     <k>stmt</k>
-                    <v>690291</v>
+                    <v>690290</v>
                 </e>
                 <e>
                     <k>num</k>
@@ -38307,7 +39809,7 @@
                 </e>
                 <e>
                     <k>decl_entry</k>
-                    <v>730761</v>
+                    <v>730759</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -38321,7 +39823,11 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
+<<<<<<< HEAD
                                     <v>668062</v>
+=======
+                                    <v>668061</v>
+>>>>>>> d32eedeb48e (C++: update stats file)
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -38342,7 +39848,11 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
+<<<<<<< HEAD
                                     <v>668062</v>
+=======
+                                    <v>668061</v>
+>>>>>>> d32eedeb48e (C++: update stats file)
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -38485,7 +39995,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>730761</v>
+                                    <v>730759</v>
                                 </b>
                             </bs>
                         </hist>
@@ -38501,7 +40011,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>730761</v>
+                                    <v>730759</v>
                                 </b>
                             </bs>
                         </hist>
@@ -39197,6 +40707,7 @@
         </relation>
         <relation>
             <name>includes</name>
+<<<<<<< HEAD
             <cardinality>408674</cardinality>
             <columnsizes>
                 <e>
@@ -39206,6 +40717,17 @@
                 <e>
                     <k>included</k>
                     <v>75281</v>
+=======
+            <cardinality>408853</cardinality>
+            <columnsizes>
+                <e>
+                    <k>id</k>
+                    <v>408853</v>
+                </e>
+                <e>
+                    <k>included</k>
+                    <v>75314</v>
+>>>>>>> d32eedeb48e (C++: update stats file)
                 </e>
             </columnsizes>
             <dependencies>
@@ -39219,7 +40741,11 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
+<<<<<<< HEAD
                                     <v>408674</v>
+=======
+                                    <v>408853</v>
+>>>>>>> d32eedeb48e (C++: update stats file)
                                 </b>
                             </bs>
                         </hist>
@@ -39235,32 +40761,32 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>37254</v>
+                                    <v>37270</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>12111</v>
+                                    <v>12116</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>6353</v>
+                                    <v>6356</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>6</b>
-                                    <v>6868</v>
+                                    <v>6871</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>11</b>
-                                    <v>5798</v>
+                                    <v>5800</v>
                                 </b>
                                 <b>
                                     <a>11</a>
                                     <b>47</b>
-                                    <v>5649</v>
+                                    <v>5651</v>
                                 </b>
                                 <b>
                                     <a>47</a>
diff --git a/cpp/ql/lib/upgrades/e594389175c098d7225683d0fd8cefcc47d84bc1/aggregate_array_init.ql b/cpp/ql/lib/upgrades/e594389175c098d7225683d0fd8cefcc47d84bc1/aggregate_array_init.ql
new file mode 100644
index 000000000000..9d09506d2d46
--- /dev/null
+++ b/cpp/ql/lib/upgrades/e594389175c098d7225683d0fd8cefcc47d84bc1/aggregate_array_init.ql
@@ -0,0 +1,11 @@
+class Expr extends @expr {
+  string toString() { none() }
+}
+
+class AggregateLiteral extends Expr, @aggregateliteral {
+  override string toString() { none() }
+}
+
+from AggregateLiteral aggregate, Expr initializer, int element_index, int position
+where aggregate_array_init(aggregate, initializer, element_index, position)
+select aggregate, initializer, element_index, position, false
diff --git a/cpp/ql/lib/upgrades/e594389175c098d7225683d0fd8cefcc47d84bc1/aggregate_field_init.ql b/cpp/ql/lib/upgrades/e594389175c098d7225683d0fd8cefcc47d84bc1/aggregate_field_init.ql
new file mode 100644
index 000000000000..7422fdcbc853
--- /dev/null
+++ b/cpp/ql/lib/upgrades/e594389175c098d7225683d0fd8cefcc47d84bc1/aggregate_field_init.ql
@@ -0,0 +1,16 @@
+class Expr extends @expr {
+  string toString() { none() }
+}
+
+
+class AggregateLiteral extends Expr, @aggregateliteral {
+  override string toString() { none() }
+}
+
+class MemberVariable extends @membervariable {
+  string toString() { none() }
+}
+
+from AggregateLiteral aggregate, Expr initializer, MemberVariable field, int position
+where aggregate_field_init(aggregate, initializer, field, position)
+select aggregate, initializer, field, position, false
diff --git a/cpp/ql/lib/upgrades/e594389175c098d7225683d0fd8cefcc47d84bc1/semmlecode.cpp.dbscheme b/cpp/ql/lib/upgrades/e594389175c098d7225683d0fd8cefcc47d84bc1/semmlecode.cpp.dbscheme
index 0f0a390468a5..5923d7e8351f 100644
--- a/cpp/ql/lib/upgrades/e594389175c098d7225683d0fd8cefcc47d84bc1/semmlecode.cpp.dbscheme
+++ b/cpp/ql/lib/upgrades/e594389175c098d7225683d0fd8cefcc47d84bc1/semmlecode.cpp.dbscheme
@@ -2039,7 +2039,8 @@ aggregate_field_init(
     int aggregate: @aggregateliteral ref,
     int initializer: @expr ref,
     int field: @membervariable ref,
-    int position: int ref
+    int position: int ref,
+    boolean designated: boolean ref
 );
 
 /**
@@ -2051,7 +2052,8 @@ aggregate_array_init(
     int aggregate: @aggregateliteral ref,
     int initializer: @expr ref,
     int element_index: int ref,
-    int position: int ref
+    int position: int ref,
+    boolean designated: boolean ref
 );
 
 @ctorinit = @ctordirectinit
diff --git a/cpp/ql/lib/upgrades/e594389175c098d7225683d0fd8cefcc47d84bc1/upgrade.properties b/cpp/ql/lib/upgrades/e594389175c098d7225683d0fd8cefcc47d84bc1/upgrade.properties
index f6105ce157b4..ad88f004e98d 100644
--- a/cpp/ql/lib/upgrades/e594389175c098d7225683d0fd8cefcc47d84bc1/upgrade.properties
+++ b/cpp/ql/lib/upgrades/e594389175c098d7225683d0fd8cefcc47d84bc1/upgrade.properties
@@ -1,2 +1,5 @@
-description:  Add a new predicate `isVla()` to the `ArrayType` class
-compatibility: backwards
\ No newline at end of file
+description: add `isDesignatorInit`predicate to `ArrayOrVectorAggregateLiteral` and `ClassAggregateLiteral`
+compatibility: backwards
+aggregate_array_init.rel: run aggregate_array_init.qlo
+aggregate_field_init.rel: run aggregate_field_init.qlo
+